From 9ba6d71780a2b95852c86fd46f8f2f964c6c4ef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?= <1262327911@qq.com> Date: Thu, 21 Apr 2022 22:35:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9E=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/icon.ts | 7 +- src/styles/common/format.scss | 3 + src/styles/common/style.scss | 8 + .../components/ChartsItemBox/index.ts | 3 + .../{ItemBox => ChartsItemBox}/index.vue | 0 .../components/ChartsOptionContent/index.ts | 3 + .../index.vue | 6 +- .../components/ChartsSearch/index.ts | 3 + .../components/ChartsSearch/index.vue | 139 ++++++++++++++++++ .../ContentCharts/components/ItemBox/index.ts | 3 - .../components/OptionContent/index.ts | 3 - .../ContentCharts/hooks/useAside.hook.ts | 9 +- src/views/chart/ContentCharts/index.vue | 19 ++- 13 files changed, 185 insertions(+), 21 deletions(-) create mode 100644 src/views/chart/ContentCharts/components/ChartsItemBox/index.ts rename src/views/chart/ContentCharts/components/{ItemBox => ChartsItemBox}/index.vue (100%) create mode 100644 src/views/chart/ContentCharts/components/ChartsOptionContent/index.ts rename src/views/chart/ContentCharts/components/{OptionContent => ChartsOptionContent}/index.vue (95%) create mode 100644 src/views/chart/ContentCharts/components/ChartsSearch/index.ts create mode 100644 src/views/chart/ContentCharts/components/ChartsSearch/index.vue delete mode 100644 src/views/chart/ContentCharts/components/ItemBox/index.ts delete mode 100644 src/views/chart/ContentCharts/components/OptionContent/index.ts diff --git a/src/plugins/icon.ts b/src/plugins/icon.ts index fac68f4d..03bdfa43 100644 --- a/src/plugins/icon.ts +++ b/src/plugins/icon.ts @@ -51,7 +51,8 @@ import { ColorWand as ColorWandIcon, ArrowBack as ArrowBackIcon, ArrowForward as ArrowForwardIcon, - Planet as PawIcon + Planet as PawIcon, + Search as SearchIcon } from '@vicons/ionicons5' import { @@ -183,7 +184,9 @@ const ionicons5 = { // 前进 ArrowForwardIcon, // 狗爪 - PawIcon + PawIcon, + // 搜索(放大镜) + SearchIcon } const carbon = { diff --git a/src/styles/common/format.scss b/src/styles/common/format.scss index 93559397..30163c51 100644 --- a/src/styles/common/format.scss +++ b/src/styles/common/format.scss @@ -2,6 +2,9 @@ body { overflow: hidden; } +* { + list-style: none; +} /* 设置滚动条的样式 */ ::-webkit-scrollbar { width: 8px; diff --git a/src/styles/common/style.scss b/src/styles/common/style.scss index 72f1b9c2..a57d9e60 100644 --- a/src/styles/common/style.scss +++ b/src/styles/common/style.scss @@ -72,6 +72,14 @@ background-size: 15px 15px, 15px 15px; } +// 省略号 +.ellipsis-1 { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + word-break: break-all; +} + // todo 使用 scss 循环写一套完整的 // margin .go-mt-0 { diff --git a/src/views/chart/ContentCharts/components/ChartsItemBox/index.ts b/src/views/chart/ContentCharts/components/ChartsItemBox/index.ts new file mode 100644 index 00000000..e9fe1d41 --- /dev/null +++ b/src/views/chart/ContentCharts/components/ChartsItemBox/index.ts @@ -0,0 +1,3 @@ +import ChartsItemBox from './index.vue' + +export { ChartsItemBox } diff --git a/src/views/chart/ContentCharts/components/ItemBox/index.vue b/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue similarity index 100% rename from src/views/chart/ContentCharts/components/ItemBox/index.vue rename to src/views/chart/ContentCharts/components/ChartsItemBox/index.vue diff --git a/src/views/chart/ContentCharts/components/ChartsOptionContent/index.ts b/src/views/chart/ContentCharts/components/ChartsOptionContent/index.ts new file mode 100644 index 00000000..8fffb84d --- /dev/null +++ b/src/views/chart/ContentCharts/components/ChartsOptionContent/index.ts @@ -0,0 +1,3 @@ +import ChartsOptionContent from './index.vue' + +export { ChartsOptionContent } diff --git a/src/views/chart/ContentCharts/components/OptionContent/index.vue b/src/views/chart/ContentCharts/components/ChartsOptionContent/index.vue similarity index 95% rename from src/views/chart/ContentCharts/components/OptionContent/index.vue rename to src/views/chart/ContentCharts/components/ChartsOptionContent/index.vue index e673acd0..ec123885 100644 --- a/src/views/chart/ContentCharts/components/OptionContent/index.vue +++ b/src/views/chart/ContentCharts/components/ChartsOptionContent/index.vue @@ -12,7 +12,7 @@ >
- +
@@ -24,8 +24,8 @@ import { ConfigType } from '@/packages/index.d' import { useSettingStore } from '@/store/modules/settingStore/settingStore' import { loadAsyncComponent } from '@/utils' -const ItemBox = loadAsyncComponent(() => - import('../ItemBox/index.vue') +const ChartsItemBox = loadAsyncComponent(() => + import('../ChartsItemBox/index.vue') ) const props = defineProps({ diff --git a/src/views/chart/ContentCharts/components/ChartsSearch/index.ts b/src/views/chart/ContentCharts/components/ChartsSearch/index.ts new file mode 100644 index 00000000..119c9989 --- /dev/null +++ b/src/views/chart/ContentCharts/components/ChartsSearch/index.ts @@ -0,0 +1,3 @@ +import ChartsSearch from './index.vue' + +export { ChartsSearch } diff --git a/src/views/chart/ContentCharts/components/ChartsSearch/index.vue b/src/views/chart/ContentCharts/components/ChartsSearch/index.vue new file mode 100644 index 00000000..945b3d8f --- /dev/null +++ b/src/views/chart/ContentCharts/components/ChartsSearch/index.vue @@ -0,0 +1,139 @@ + + + + + \ No newline at end of file diff --git a/src/views/chart/ContentCharts/components/ItemBox/index.ts b/src/views/chart/ContentCharts/components/ItemBox/index.ts deleted file mode 100644 index 8ec7f82e..00000000 --- a/src/views/chart/ContentCharts/components/ItemBox/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import ItemBox from './index.vue' - -export { ItemBox } diff --git a/src/views/chart/ContentCharts/components/OptionContent/index.ts b/src/views/chart/ContentCharts/components/OptionContent/index.ts deleted file mode 100644 index 5bfd99ec..00000000 --- a/src/views/chart/ContentCharts/components/OptionContent/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import OptionContent from './index.vue' - -export { OptionContent } diff --git a/src/views/chart/ContentCharts/hooks/useAside.hook.ts b/src/views/chart/ContentCharts/hooks/useAside.hook.ts index 0bc6a259..eb69d0c1 100644 --- a/src/views/chart/ContentCharts/hooks/useAside.hook.ts +++ b/src/views/chart/ContentCharts/hooks/useAside.hook.ts @@ -15,14 +15,17 @@ const { GraphicalDataFlowIcon, } = icon.carbon + // 图表 -const { getPackagesList } = usePackagesStore() -const menuOptions:{ +export type MenuOptionsType = { key: string icon: ReturnType label: ReturnType list: PackagesType -}[] = [] +} + +const { getPackagesList } = usePackagesStore() +const menuOptions: MenuOptionsType[] = [] const packagesListObj = { [PackagesCategoryEnum.CHARTS]: { diff --git a/src/views/chart/ContentCharts/index.vue b/src/views/chart/ContentCharts/index.vue index 75a6cda3..cc3b00d7 100644 --- a/src/views/chart/ContentCharts/index.vue +++ b/src/views/chart/ContentCharts/index.vue @@ -12,6 +12,10 @@ + + @@ -44,7 +48,8 @@