From cb411e2ee12dcab962baef3d88a061b072d81d31 Mon Sep 17 00:00:00 2001 From: kagol Date: Sun, 28 Nov 2021 22:37:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E7=BE=8E=E5=8C=96=E7=BD=91?= =?UTF-8?q?=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devui-theme/components/BackToTop.vue | 5 +- .../devui-theme/components/NavBar.vue | 60 ++++++++++--------- .../devui-theme/components/NavBarTitle.vue | 2 + .../devui-theme/components/PageToc.vue | 5 +- .../devui-theme/components/SideBar.vue | 5 +- .../devui-theme/styles/demo-block.scss | 2 +- .../.vitepress/devui-theme/styles/layout.scss | 28 +++++++++ .../devui-theme/styles/sidebar-links.scss | 2 - 8 files changed, 69 insertions(+), 40 deletions(-) diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/BackToTop.vue b/packages/devui-vue/docs/.vitepress/devui-theme/components/BackToTop.vue index 79b2a4c1..91c519cd 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/components/BackToTop.vue +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/BackToTop.vue @@ -82,9 +82,8 @@ export default defineComponent({ position: fixed; display: flex; bottom: 2rem; - right: 2.5rem; - width: 2rem; - height: 28px; + right: calc((100vw - 1440px) / 2 + 144px); + width: 22px; color: var(--devui-brand); z-index: 1; } diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/NavBar.vue b/packages/devui-vue/docs/.vitepress/devui-theme/components/NavBar.vue index 0655d4b2..250bfe84 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/components/NavBar.vue +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/NavBar.vue @@ -36,42 +36,44 @@ defineEmits(['toggle']) diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/NavBarTitle.vue b/packages/devui-vue/docs/.vitepress/devui-theme/components/NavBarTitle.vue index 608e0ec3..bbed5db9 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/components/NavBarTitle.vue +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/NavBarTitle.vue @@ -27,6 +27,8 @@ function gopage (){ @import '@devui/styles-var/devui-var'; .nav-bar-title { + display: flex; + align-items: center; font-size: 1.3rem; font-weight: 600; color: $devui-text; diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/PageToc.vue b/packages/devui-vue/docs/.vitepress/devui-theme/components/PageToc.vue index 11236979..be07d2fb 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/components/PageToc.vue +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/PageToc.vue @@ -36,7 +36,7 @@ useActiveSidebarLinks(container, marker) width: 200px; position: fixed; top: 50px; - right: 0; + right: calc((100vw - 1440px) / 2 - 10px); z-index: 1; .devui-fast-forward { @@ -46,8 +46,7 @@ useActiveSidebarLinks(container, marker) line-height: 24px; font-weight: bold; padding-bottom: 10px; - margin-left: 20px; - border-bottom: 1px solid $devui-dividing-line; + margin-left: 17px; } .devui-step-nav { diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/SideBar.vue b/packages/devui-vue/docs/.vitepress/devui-theme/components/SideBar.vue index 288c76b6..0860c4f0 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/components/SideBar.vue +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/SideBar.vue @@ -26,9 +26,8 @@ defineProps({ position: fixed; top: var(--header-height); bottom: 0; - left: 0; + left: calc((100vw - 1440px) / 2); z-index: var(--z-index-sidebar); - border-right: 1px solid $devui-dividing-line; width: 16.4rem; background-color: $devui-base-bg; overflow-y: auto; @@ -50,6 +49,8 @@ defineProps({ .sidebar.open { transform: translateX(0); + left: 0; + border-right: 1px solid $devui-dividing-line; } .nav { diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/styles/demo-block.scss b/packages/devui-vue/docs/.vitepress/devui-theme/styles/demo-block.scss index facd32f7..b9e49c8a 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/styles/demo-block.scss +++ b/packages/devui-vue/docs/.vitepress/devui-theme/styles/demo-block.scss @@ -4,7 +4,7 @@ border: solid 1px $devui-dividing-line !important; &.hover { - box-shadow: $devui-shadow-length-base $devui-shadow !important; + box-shadow: none !important; } } diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/styles/layout.scss b/packages/devui-vue/docs/.vitepress/devui-theme/styles/layout.scss index 172bcdc5..7a81ed5a 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/styles/layout.scss +++ b/packages/devui-vue/docs/.vitepress/devui-theme/styles/layout.scss @@ -240,3 +240,31 @@ form { width: 100vw; height: 100vh; } + +$max-width: 1440px; + +.theme { + max-width: $max-width; + margin: 0 auto; + + .nav-bar-inner { + max-width: $max-width; + width: 100%; + display: flex; + margin: 0 auto; + padding-left: 18px; + } +} + +@media (max-width: 1000px) { + .theme { + .nav-bar-inner { + padding-left: 0; + + .custom-nav { + margin-left: 0; + } + } + } +} + diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/styles/sidebar-links.scss b/packages/devui-vue/docs/.vitepress/devui-theme/styles/sidebar-links.scss index 7e08ff0a..e9286262 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/styles/sidebar-links.scss +++ b/packages/devui-vue/docs/.vitepress/devui-theme/styles/sidebar-links.scss @@ -49,7 +49,6 @@ a.sidebar-link-item.active { } .sidebar > .sidebar-links > .sidebar-link > a.sidebar-link-item.active { - border-left-color: $devui-brand; font-weight: 600; } @@ -72,7 +71,6 @@ a.sidebar-link-item.active { > .sidebar-links > .sidebar-link > a.sidebar-link-item.active { - border-left-color: $devui-brand; font-weight: 600; } -- Gitee From 48cc4b6caa921734e6025f832201f0a0f49f0eed Mon Sep 17 00:00:00 2001 From: kagol Date: Sun, 28 Nov 2021 23:18:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=AE=8C=E6=88=90=E8=BF=9B=E5=BA=A6=E7=9A=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/devui-vue/devui/alert/index.ts | 2 +- packages/devui-vue/devui/avatar/index.ts | 2 +- packages/devui-vue/devui/badge/index.ts | 2 +- packages/devui-vue/devui/button/index.ts | 2 +- packages/devui-vue/devui/card/index.ts | 2 +- packages/devui-vue/devui/checkbox/index.ts | 2 +- packages/devui-vue/devui/dropdown/index.ts | 2 +- .../devui-vue/devui/editable-select/index.ts | 2 +- packages/devui-vue/devui/fullscreen/index.ts | 2 +- packages/devui-vue/devui/grid/index.ts | 2 +- packages/devui-vue/devui/icon/index.ts | 2 +- .../devui-vue/devui/image-preview/index.ts | 2 +- packages/devui-vue/devui/input/index.ts | 2 +- packages/devui-vue/devui/layout/index.ts | 2 +- packages/devui-vue/devui/loading/index.ts | 2 +- packages/devui-vue/devui/modal/index.ts | 2 +- packages/devui-vue/devui/overlay/index.ts | 2 +- packages/devui-vue/devui/pagination/index.ts | 2 +- packages/devui-vue/devui/popover/index.ts | 2 +- packages/devui-vue/devui/progress/index.ts | 2 +- packages/devui-vue/devui/radio/index.ts | 2 +- packages/devui-vue/devui/rate/index.ts | 2 +- packages/devui-vue/devui/ripple/index.ts | 2 +- packages/devui-vue/devui/search/index.ts | 2 +- packages/devui-vue/devui/skeleton/index.ts | 2 +- packages/devui-vue/devui/slider/index.ts | 2 +- packages/devui-vue/devui/splitter/index.ts | 2 +- packages/devui-vue/devui/status/index.ts | 2 +- packages/devui-vue/devui/switch/index.ts | 2 +- packages/devui-vue/devui/tag-input/index.ts | 2 +- packages/devui-vue/devui/textarea/index.ts | 2 +- packages/devui-vue/devui/time-axis/index.ts | 2 +- packages/devui-vue/devui/toast/index.ts | 2 +- packages/devui-vue/devui/upload/index.ts | 2 +- .../devui-theme/components/SideBarLink.js | 34 ++++++++++++++++--- .../devui-theme/styles/sidebar-links.scss | 14 ++++---- 36 files changed, 70 insertions(+), 46 deletions(-) diff --git a/packages/devui-vue/devui/alert/index.ts b/packages/devui-vue/devui/alert/index.ts index 9d4b1075..afbfed0c 100644 --- a/packages/devui-vue/devui/alert/index.ts +++ b/packages/devui-vue/devui/alert/index.ts @@ -10,7 +10,7 @@ export { Alert } export default { title: 'Alert 警告', category: '反馈', - status: '已完成', + status: '100%', install(app: App): void { app.use(Alert as any) }, diff --git a/packages/devui-vue/devui/avatar/index.ts b/packages/devui-vue/devui/avatar/index.ts index ea509fcd..d7700bf7 100644 --- a/packages/devui-vue/devui/avatar/index.ts +++ b/packages/devui-vue/devui/avatar/index.ts @@ -10,7 +10,7 @@ export { Avatar } export default { title: 'Avatar 头像', category: '数据展示', - status: '已完成', + status: '100%', install(app: App): void { app.use(Avatar as any) }, diff --git a/packages/devui-vue/devui/badge/index.ts b/packages/devui-vue/devui/badge/index.ts index ff57b314..8657a733 100644 --- a/packages/devui-vue/devui/badge/index.ts +++ b/packages/devui-vue/devui/badge/index.ts @@ -10,7 +10,7 @@ export { Badge } export default { title: 'Badge 徽标', category: '数据展示', - status: '已完成', + status: '100%', install(app: App): void { app.use(Badge as any) } diff --git a/packages/devui-vue/devui/button/index.ts b/packages/devui-vue/devui/button/index.ts index 0fa3b4a2..2888c545 100644 --- a/packages/devui-vue/devui/button/index.ts +++ b/packages/devui-vue/devui/button/index.ts @@ -12,7 +12,7 @@ export { Button } export default { title: 'Button 按钮', category: '通用', - status: '已完成', + status: '100%', install(app: App): void { app.use(Button as any) } diff --git a/packages/devui-vue/devui/card/index.ts b/packages/devui-vue/devui/card/index.ts index f7e3961f..69032ab0 100644 --- a/packages/devui-vue/devui/card/index.ts +++ b/packages/devui-vue/devui/card/index.ts @@ -10,7 +10,7 @@ export { Card } export default { title: 'Card 卡片', category: '数据展示', - status: '已完成', + status: '100%', install(app: App): void { app.use(Card as any) } diff --git a/packages/devui-vue/devui/checkbox/index.ts b/packages/devui-vue/devui/checkbox/index.ts index dc25995f..a602139f 100644 --- a/packages/devui-vue/devui/checkbox/index.ts +++ b/packages/devui-vue/devui/checkbox/index.ts @@ -15,7 +15,7 @@ export { Checkbox } export default { title: 'Checkbox 复选框', category: '数据录入', - status: '已完成', + status: '100%', install(app: App): void { app.use(Checkbox as any); app.use(CheckboxGroup as any); diff --git a/packages/devui-vue/devui/dropdown/index.ts b/packages/devui-vue/devui/dropdown/index.ts index d3bf24e7..0075b1cb 100644 --- a/packages/devui-vue/devui/dropdown/index.ts +++ b/packages/devui-vue/devui/dropdown/index.ts @@ -11,7 +11,7 @@ export { Dropdown } export default { title: 'Dropdown 下拉菜单', category: '导航', - status: undefined, // TODO: 组件若开发完成则填入"已完成"，并删除该注释 + status: '10%', // TODO: 组件若开发完成则填入"已完成"，并删除该注释 install(app: App): void { app.use(Dropdown as any) } diff --git a/packages/devui-vue/devui/editable-select/index.ts b/packages/devui-vue/devui/editable-select/index.ts index 41172831..5c1a9c9c 100644 --- a/packages/devui-vue/devui/editable-select/index.ts +++ b/packages/devui-vue/devui/editable-select/index.ts @@ -10,7 +10,7 @@ export { EditableSelect } export default { title: 'EditableSelect 可输入下拉选择框', category: '数据录入', - status: undefined, // TODO: 组件若开发完成则填入"已完成"，并删除该注释 + status: '10%', // TODO: 组件若开发完成则填入"已完成"，并删除该注释 install(app: App): void { app.use(EditableSelect as any) } diff --git a/packages/devui-vue/devui/fullscreen/index.ts b/packages/devui-vue/devui/fullscreen/index.ts index b73d21fe..49214f0f 100644 --- a/packages/devui-vue/devui/fullscreen/index.ts +++ b/packages/devui-vue/devui/fullscreen/index.ts @@ -10,7 +10,7 @@ export { Fullscreen } export default { title: 'Fullscreen 全屏', category: '通用', - status: '已完成', + status: '100%', install(app: App): void { app.use(Fullscreen as any) } diff --git a/packages/devui-vue/devui/grid/index.ts b/packages/devui-vue/devui/grid/index.ts index cb957715..d5f01ab2 100644 --- a/packages/devui-vue/devui/grid/index.ts +++ b/packages/devui-vue/devui/grid/index.ts @@ -14,7 +14,7 @@ export { Row, Col } export default { title: 'Grid 栅格', category: '布局', - status: '已完成', + status: '100%', install(app: App): void { app.use(Col as any) app.use(Row as any) diff --git a/packages/devui-vue/devui/icon/index.ts b/packages/devui-vue/devui/icon/index.ts index 29998954..fd1972ad 100644 --- a/packages/devui-vue/devui/icon/index.ts +++ b/packages/devui-vue/devui/icon/index.ts @@ -10,7 +10,7 @@ export { Icon } export default { title: 'Icon 图标', category: '通用', - status: '已完成', + status: '100%', install(app: App): void { app.use(Icon as any) } diff --git a/packages/devui-vue/devui/image-preview/index.ts b/packages/devui-vue/devui/image-preview/index.ts index e1b883b9..375a16e5 100644 --- a/packages/devui-vue/devui/image-preview/index.ts +++ b/packages/devui-vue/devui/image-preview/index.ts @@ -7,7 +7,7 @@ export { ImagePreviewDirective, ImagePreviewService } export default { title: 'ImagePreview 图片预览', category: '数据展示', - status: '已完成', + status: '100%', install(app: App): void { app.directive('d-image-preview', ImagePreviewDirective) app.config.globalProperties.$imagePreviewService = ImagePreviewService diff --git a/packages/devui-vue/devui/input/index.ts b/packages/devui-vue/devui/input/index.ts index cd150ad0..94c018b8 100644 --- a/packages/devui-vue/devui/input/index.ts +++ b/packages/devui-vue/devui/input/index.ts @@ -10,7 +10,7 @@ export { Input } export default { title: 'Input 输入框', category: '数据录入', - status: '已完成', + status: '100%', install(app: App): void { app.use(Input as any) } diff --git a/packages/devui-vue/devui/layout/index.ts b/packages/devui-vue/devui/layout/index.ts index 8f6ec9b6..fe207d20 100644 --- a/packages/devui-vue/devui/layout/index.ts +++ b/packages/devui-vue/devui/layout/index.ts @@ -30,7 +30,7 @@ export { Layout, Content, Header, Footer, Aside } export default { title: 'Layout 布局', category: '布局', - status: '已完成', + status: '100%', install(app: App): void { app.use(Layout as any) app.use(Content as any) diff --git a/packages/devui-vue/devui/loading/index.ts b/packages/devui-vue/devui/loading/index.ts index 61cf3112..64c98597 100644 --- a/packages/devui-vue/devui/loading/index.ts +++ b/packages/devui-vue/devui/loading/index.ts @@ -10,7 +10,7 @@ export { export default { title: 'Loading 加载提示', category: '反馈', - status: '已完成', + status: '100%', install(app: App): void { app.directive('dLoading', Loading) app.config.globalProperties.$loadingService = LoadingService diff --git a/packages/devui-vue/devui/modal/index.ts b/packages/devui-vue/devui/modal/index.ts index 806c2cc7..8fed1156 100644 --- a/packages/devui-vue/devui/modal/index.ts +++ b/packages/devui-vue/devui/modal/index.ts @@ -13,7 +13,7 @@ export { Modal } export default { title: 'Modal 弹窗', category: '反馈', - status: '已完成', + status: '100%', install(app: App): void { app.use(Modal as any) diff --git a/packages/devui-vue/devui/overlay/index.ts b/packages/devui-vue/devui/overlay/index.ts index c995acc9..7c9592b7 100644 --- a/packages/devui-vue/devui/overlay/index.ts +++ b/packages/devui-vue/devui/overlay/index.ts @@ -16,7 +16,7 @@ export { FlexibleOverlay, FixedOverlay } export default { title: 'Overlay 遮罩层', category: '通用', - status: '已完成', + status: '100%', install(app: App): void { app.use(FixedOverlay as any); app.use(FlexibleOverlay as any); diff --git a/packages/devui-vue/devui/pagination/index.ts b/packages/devui-vue/devui/pagination/index.ts index fa7e383c..e881885c 100644 --- a/packages/devui-vue/devui/pagination/index.ts +++ b/packages/devui-vue/devui/pagination/index.ts @@ -10,7 +10,7 @@ export { Pagination } export default { title: 'Pagination 分页', category: '导航', - status: '已完成', + status: '100%', install(app: App): void { app.use(Pagination as any) } diff --git a/packages/devui-vue/devui/popover/index.ts b/packages/devui-vue/devui/popover/index.ts index 6d9070c3..671476ac 100644 --- a/packages/devui-vue/devui/popover/index.ts +++ b/packages/devui-vue/devui/popover/index.ts @@ -10,7 +10,7 @@ export { Popover } export default { title: 'Popover 悬浮提示', category: '反馈', - status: '已完成', + status: '100%', install(app: App): void { app.use(Popover as any); } diff --git a/packages/devui-vue/devui/progress/index.ts b/packages/devui-vue/devui/progress/index.ts index d96a7ec9..420816c0 100644 --- a/packages/devui-vue/devui/progress/index.ts +++ b/packages/devui-vue/devui/progress/index.ts @@ -10,7 +10,7 @@ export { Progress } export default { title: 'Progress 进度条', category: '数据展示', - status: '已完成', + status: '100%', install(app: App): void { app.use(Progress as any) } diff --git a/packages/devui-vue/devui/radio/index.ts b/packages/devui-vue/devui/radio/index.ts index 154cdf12..75c93739 100644 --- a/packages/devui-vue/devui/radio/index.ts +++ b/packages/devui-vue/devui/radio/index.ts @@ -15,7 +15,7 @@ export { Radio, RadioGroup } export default { title: 'Radio 单选框', category: '数据录入', - status: '已完成', + status: '100%', install(app: App): void { app.use(Radio as any) app.use(RadioGroup as any) diff --git a/packages/devui-vue/devui/rate/index.ts b/packages/devui-vue/devui/rate/index.ts index ae9d10d1..e9829330 100644 --- a/packages/devui-vue/devui/rate/index.ts +++ b/packages/devui-vue/devui/rate/index.ts @@ -10,7 +10,7 @@ export { Rate } export default { title: 'Rate 评分', category: '数据展示', - status: '已完成', + status: '100%', install(app: App): void { app.use(Rate as any); }, diff --git a/packages/devui-vue/devui/ripple/index.ts b/packages/devui-vue/devui/ripple/index.ts index 3ff7ce72..d7602a35 100644 --- a/packages/devui-vue/devui/ripple/index.ts +++ b/packages/devui-vue/devui/ripple/index.ts @@ -6,7 +6,7 @@ export { RippleDirective } export default { title: 'Ripple 水波纹', category: '通用', - status: '已完成', + status: '100%', install(app: App): void { app.directive('Ripple', RippleDirective) } diff --git a/packages/devui-vue/devui/search/index.ts b/packages/devui-vue/devui/search/index.ts index 72e9f8f7..16f4e751 100644 --- a/packages/devui-vue/devui/search/index.ts +++ b/packages/devui-vue/devui/search/index.ts @@ -10,7 +10,7 @@ export { Search } export default { title: 'Search 搜索框', category: '通用', - status: '已完成', + status: '100%', install(app: App): void { app.use(Search as any) } diff --git a/packages/devui-vue/devui/skeleton/index.ts b/packages/devui-vue/devui/skeleton/index.ts index e27275e6..7ede8655 100644 --- a/packages/devui-vue/devui/skeleton/index.ts +++ b/packages/devui-vue/devui/skeleton/index.ts @@ -12,7 +12,7 @@ export { Skeleton,SkeletonItem } export default { title: 'Skeleton 骨架屏', category: '数据展示', - status: '已完成', + status: '100%', install(app: App): void { app.use(Skeleton as any) } diff --git a/packages/devui-vue/devui/slider/index.ts b/packages/devui-vue/devui/slider/index.ts index f4596b77..800f8c1f 100644 --- a/packages/devui-vue/devui/slider/index.ts +++ b/packages/devui-vue/devui/slider/index.ts @@ -10,7 +10,7 @@ export { Slider } export default { title: 'Slider 滑块', category: '数据录入', - status: '已完成', + status: '100%', install(app: App): void { app.use(Slider as any) } diff --git a/packages/devui-vue/devui/splitter/index.ts b/packages/devui-vue/devui/splitter/index.ts index 2815770b..db6651c4 100644 --- a/packages/devui-vue/devui/splitter/index.ts +++ b/packages/devui-vue/devui/splitter/index.ts @@ -12,7 +12,7 @@ export { Splitter } export default { title: 'Splitter 分割器', category: '布局', - status: '已完成', + status: '100%', install(app: App): void { app.use(Splitter as any) }, diff --git a/packages/devui-vue/devui/status/index.ts b/packages/devui-vue/devui/status/index.ts index 89c07437..43bcf996 100644 --- a/packages/devui-vue/devui/status/index.ts +++ b/packages/devui-vue/devui/status/index.ts @@ -10,7 +10,7 @@ export { Status } export default { title: 'Status 状态', category: '通用', - status: '已完成', + status: '100%', install(app: App): void { app.use(Status as any) } diff --git a/packages/devui-vue/devui/switch/index.ts b/packages/devui-vue/devui/switch/index.ts index f220103c..c834c231 100644 --- a/packages/devui-vue/devui/switch/index.ts +++ b/packages/devui-vue/devui/switch/index.ts @@ -10,7 +10,7 @@ export { Switch } export default { title: 'Switch 开关', category: '数据录入', - status: '已完成', + status: '100%', install(app: App): void { app.use(Switch as any) } diff --git a/packages/devui-vue/devui/tag-input/index.ts b/packages/devui-vue/devui/tag-input/index.ts index 414add7d..45a127cf 100644 --- a/packages/devui-vue/devui/tag-input/index.ts +++ b/packages/devui-vue/devui/tag-input/index.ts @@ -10,7 +10,7 @@ export { TagInput } export default { title: 'TagInput 标签输入框', category: '数据录入', - status: '已完成', + status: '100%', install(app: App): void { app.use(TagInput as any) } diff --git a/packages/devui-vue/devui/textarea/index.ts b/packages/devui-vue/devui/textarea/index.ts index 03e83245..ef2b47cc 100644 --- a/packages/devui-vue/devui/textarea/index.ts +++ b/packages/devui-vue/devui/textarea/index.ts @@ -10,7 +10,7 @@ export { Textarea } export default { title: 'Textarea 多行文本框', category: '数据录入', - status: '已完成', // TODO: 组件若开发完成则填入"已完成"，并删除该注释 + status: '100%', // TODO: 组件若开发完成则填入"已完成"，并删除该注释 install(app: App): void { app.use(Textarea as any) } diff --git a/packages/devui-vue/devui/time-axis/index.ts b/packages/devui-vue/devui/time-axis/index.ts index 7b63ef9a..511794c2 100644 --- a/packages/devui-vue/devui/time-axis/index.ts +++ b/packages/devui-vue/devui/time-axis/index.ts @@ -13,7 +13,7 @@ export { TimeAxis, TimeAxisItem } export default { title: 'TimeAxis 时间轴', category: '数据展示', - status: '已完成', + status: '100%', install(app: App): void { app.use(TimeAxis as any) app.use(TimeAxisItem as any) diff --git a/packages/devui-vue/devui/toast/index.ts b/packages/devui-vue/devui/toast/index.ts index 6d091b15..705ee20d 100644 --- a/packages/devui-vue/devui/toast/index.ts +++ b/packages/devui-vue/devui/toast/index.ts @@ -11,7 +11,7 @@ export { Toast, ToastService } export default { title: 'Toast 全局提示', category: '反馈', - status: '已完成', + status: '100%', install(app: App): void { app.use(Toast as any) app.config.globalProperties.$toastService = ToastService diff --git a/packages/devui-vue/devui/upload/index.ts b/packages/devui-vue/devui/upload/index.ts index e23e3dec..3eed211d 100644 --- a/packages/devui-vue/devui/upload/index.ts +++ b/packages/devui-vue/devui/upload/index.ts @@ -14,7 +14,7 @@ export { Upload, MultiUpload } export default { title: 'Upload 上传', category: '数据录入', - status: '已完成', + status: '100%', install(app: App): void { app.use(Upload as any) } diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/components/SideBarLink.js b/packages/devui-vue/docs/.vitepress/devui-theme/components/SideBarLink.js index 70488e7b..69251f05 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/components/SideBarLink.js +++ b/packages/devui-vue/docs/.vitepress/devui-theme/components/SideBarLink.js @@ -1,6 +1,24 @@ import { h } from 'vue'; import { useRoute, useData } from 'vitepress'; import { joinUrl, isActive } from '../utils'; + +// 阶梯访问表 +const stairStepAccessTable = function(source, sourceRangeArray, targetArray) { + const maxTarget = targetArray.length - 1; + let targetIndex = 0; + let target = targetArray[maxTarget]; + while(target === targetArray[maxTarget] && targetIndex < maxTarget) { + if (source <= sourceRangeArray[targetIndex]) { // <= 意味着包含右边界 + target = targetArray[targetIndex]; + } + targetIndex += 1; + } + return target; +} + +const statusRange = [ 49, 99 ]; +const colors = [ 'var(--devui-danger, #f66f6a)', 'var(--devui-warning, #fac20a)', 'var(--devui-success, #50d4ab)' ]; + export const SideBarLink = (props) => { const route = useRoute(); const { site, frontmatter } = useData(); @@ -8,7 +26,14 @@ export const SideBarLink = (props) => { const maxDepth = frontmatter.value.sidebarDepth || Infinity; const headers = route.data.headers; const text = props.item.text; - const status = props.item.status; + let status = props.item.status; + let dotColor = ''; + + if (status !== undefined) { + status = parseInt(props.item.status, 10); + dotColor = stairStepAccessTable(status, statusRange, colors); + } + const link = resolveLink(site.value.base, props.item.link); const children = props.item.children; const active = isActive(route, props.item.link); @@ -20,10 +45,11 @@ export const SideBarLink = (props) => { class: { 'sidebar-link-item': true, active }, href: link }, [ - text, status && h('span', { - class: 'sidebar-link-status' - }, status), + class: 'sidebar-link-status', + style: `background-color: ${dotColor}` + }), + text, ]), childItems ]); diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/styles/sidebar-links.scss b/packages/devui-vue/docs/.vitepress/devui-theme/styles/sidebar-links.scss index e9286262..23afbb07 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/styles/sidebar-links.scss +++ b/packages/devui-vue/docs/.vitepress/devui-theme/styles/sidebar-links.scss @@ -58,7 +58,8 @@ a.sidebar-link-item.active { > .sidebar-links > .sidebar-link > .sidebar-link-item { - display: block; + display: flex; + align-items: center; padding: 0.35rem 1.5rem 0.35rem 2rem; line-height: 1.4; font-size: 1rem; @@ -108,11 +109,8 @@ a.sidebar-link-item.active { .sidebar .sidebar-link-status { display: inline-block; - min-height: 20px; - margin: 0 8px; - padding: 0 8px; - border: solid 1px $devui-brand; - border-radius: 2px; - color: $devui-brand; - font-size: 12px; + width: 6px; + height: 6px; + margin-right: 8px; + border-radius: 50px; } \ No newline at end of file -- Gitee