diff --git a/.gitignore b/.gitignore index 70b62152baa38d9f39a6746af4354cec1c52ad92..53eb3c254819e4baaca93f182961b94bbbbc8f60 100644 --- a/.gitignore +++ b/.gitignore @@ -125,4 +125,4 @@ docs/.vitepress/cache docs/.vitepress/public/menu/menu.json docs/.vitepress/public/menu/menu-en.json -temp \ No newline at end of file +temp-docs \ No newline at end of file diff --git a/docs/.vitepress/config.ts b/docs/.vitepress/config.ts index 941babf9b23bb454132b20ab3f27676e3c496237..46c9fac771222863052dd4620b37c95a896de29c 100644 --- a/docs/.vitepress/config.ts +++ b/docs/.vitepress/config.ts @@ -62,6 +62,17 @@ export default { // 处理双花括号 return `${escapedContent}`; }; + + // 替换 {{ }} 内容 + md.renderer.rules.text = (tokens, idx) => { + const content = tokens[idx].content; + const escapedContent = md.utils.escapeHtml(content); + if (/{{(.*?)}}/g.test(content)) { + return `${escapedContent}`; + } + return escapedContent; + }; + }, }, }; diff --git a/docs/.vitepress/src/@types/type-doc-menu.ts b/docs/.vitepress/src/@types/type-doc-menu.ts index 86a39eb82b6107f4a5853963f987dd7d6175b818..6523fb9ea06ab1631e5696ed34d9459f06e795b9 100644 --- a/docs/.vitepress/src/@types/type-doc-menu.ts +++ b/docs/.vitepress/src/@types/type-doc-menu.ts @@ -4,6 +4,6 @@ export interface DocMenuT { href?: string; description?: string; type: string; - ismanual?: string; + isManual?: boolean; children?: Array; } diff --git a/docs/.vitepress/src/assets/style/markdown.scss b/docs/.vitepress/src/assets/style/markdown.scss index 432f2f8964ee7fd3a58ecf72100b91fd560c1ecb..9dfac97402df384e375724018dfa0e572ccc579e 100644 --- a/docs/.vitepress/src/assets/style/markdown.scss +++ b/docs/.vitepress/src/assets/style/markdown.scss @@ -52,7 +52,6 @@ } .markdown-body { - background: var(--o-color-fill2); color: var(--o-color-info2); font-family: inherit; min-height: auto; @@ -68,25 +67,21 @@ } p { + margin-top: 0 !important; margin-bottom: var(--o-gap-2); } ol { list-style-type: decimal !important; - padding-left: var(--o-gap-5); } ul { list-style-type: disc; - padding-left: var(--o-gap-5); - } - li > p { - margin-bottom: var(--o-gap-2); - margin-top: var(--o-gap-2); } ol, ul { + padding-left: var(--o-gap-5); margin-top: var(--o-gap-2); } @@ -94,6 +89,15 @@ margin-top: 0; } + li li { + &:first-child { + margin-top: 8px !important; + } + &:last-child { + margin-bottom: 8px; + } + } + h1, h2, h3, @@ -104,22 +108,23 @@ color: var(--o-color-info1); padding: 0; border: none; + font-weight: 500; } h1 { - @include h1; - margin-top: calc(var(--o-gap-4) + var(--o-gap-4)); - margin-bottom: var(--o-gap-4); + @include h2; + margin-top: calc(var(--o-gap-6)); + margin-bottom: var(--o-gap-6); } h2 { - @include h2; - margin-top: calc(var(--o-gap-4) + var(--o-gap-4)); + @include h4; + margin-top: calc(var(--o-gap-6)); margin-bottom: var(--o-gap-3); } h3 { - @include h3; + @include text2; margin-top: var(--o-gap-3); margin-bottom: var(--o-gap-3); } @@ -148,8 +153,9 @@ padding: var(--o-gap-2); margin: 0 auto; background-color: var(--o-color-fill2); + margin-left: -8px; } - + code { border-radius: var(--layout-pkg-radius); background-color: var(--o-color-control2-light); @@ -162,6 +168,7 @@ blockquote { color: var(--o-color-info2); padding: 12px 16px; + margin: var(--o-gap-3) 0 0; border-left: 0; background-color: var(--o-color-control2-light); border-radius: var(--layout-pkg-radius); @@ -170,6 +177,7 @@ } img { padding: 0; + margin-left: 0; background-color: transparent; } } @@ -195,6 +203,7 @@ --table-padding: var(--o-gap-3) var(--o-gap-6); --table-radius: var(--layout-pkg-radius); border-spacing: 0; + border-radius: var(--table-radius); @include respond-to('<=laptop') { --table-head-cell-padding: 8px 16px; @@ -208,20 +217,19 @@ --table-head-cell-padding: 7px 12px; } - border-radius: var(--table-radius); - th { background-color: var(--o-color-control3-light); text-align: left; border-color: var(--o-color-control3-light) !important; } + th, td { box-sizing: border-box; padding: var(--table-padding); - @include text1; color: var(--o-color-info1); border-color: var(--o-color-control4); + @include text1; } tr { background: var(--o-color-fill2) !important; @@ -238,6 +246,15 @@ * + * { margin-top: var(--o-gap-2); } + + li { + &:first-child { + margin-top: 0 !important; + } + &:last-child { + margin-bottom: 0; + } + } } .lang { @@ -291,50 +308,6 @@ } } - // 详情安装指引修改 &.installation - &.download, - &.installation { - ul { - list-style: none; - padding-left: 0; - counter-reset: num; - > li { - position: relative; - counter-increment: num 1; - padding-left: 32px; - overflow: hidden; - margin: 0; - > p:first-child { - font-weight: 500; - } - &::after { - height: 24px; - width: 24px; - background: var(--o-color-primary1); - content: counter(num); - position: absolute; - border-radius: 50%; - color: var(--o-color-white); - @include text1; - text-align: center; - top: 0; - left: 0; - display: block; - } - &:not(:last-child):before { - width: 1px; - background: var(--o-color-primary1); - content: ''; - position: absolute; - top: 32px; - left: 11px; - bottom: 8px; - display: block; - } - } - } - } - .vp-code { &.shiki { span { diff --git a/docs/.vitepress/src/components/DocFooter.vue b/docs/.vitepress/src/components/DocFooter.vue index e46b27accf14ab10fe6961ad967151345eeb6eb1..18ab94c181832b408af7d2f57728f6bc9b182e15 100644 --- a/docs/.vitepress/src/components/DocFooter.vue +++ b/docs/.vitepress/src/components/DocFooter.vue @@ -77,6 +77,7 @@ const config = computed(() => {