diff --git a/src/assets/images/project/project-top-bg.png b/src/assets/images/project/project-top-bg.png deleted file mode 100644 index 96da55e9..00000000 Binary files a/src/assets/images/project/project-top-bg.png and /dev/null differ diff --git a/src/plugins/icon.ts b/src/plugins/icon.ts index a5c58c12..adc92501 100644 --- a/src/plugins/icon.ts +++ b/src/plugins/icon.ts @@ -12,10 +12,8 @@ import { Open as OpenIcon, Send as SendIcon, InformationCircleOutline as InformationCircleIcon, - Beer as BeerIcon, Grid as GridIcon, TvOutline as DesktopIcon, - LaptopOutline as LaptopOutlineIcon, DocumentText as DocumentTextIcon, Language as LanguageIcon, Moon as MoonIcon, @@ -45,7 +43,10 @@ import { TableSplit as TableSplitIcon, Roadmap as RoadmapIcon, SpellCheck as SpellCheckIcon, - GraphicalDataFlow as GraphicalDataFlowIcon + GraphicalDataFlow as GraphicalDataFlowIcon, + Store as StoreIcon, + Devices as DevicesIcon, + ObjectStorage as ObjectStorageIcon } from '@vicons/carbon' const ionicons5 = { @@ -97,14 +98,10 @@ const ionicons5 = { SendIcon, // 信息 InformationCircleIcon, - // 物料（颜色混合） - BeerIcon, // 项目 GridIcon, // 电脑1 DesktopIcon, - // 电脑2 - LaptopOutlineIcon, // 文档 DocumentTextIcon, // 语言 @@ -139,7 +136,13 @@ const carbon = { // 表格 TableSplitIcon, // 装饰 - GraphicalDataFlowIcon + GraphicalDataFlowIcon, + // 项目 + DevicesIcon, + // 模板市场 + StoreIcon, + // 我的模板 + ObjectStorageIcon } // https://www.xicons.org/#/ 还有很多 diff --git a/src/settings/designSetting.ts b/src/settings/designSetting.ts index a6b90067..8bbc62d7 100644 --- a/src/settings/designSetting.ts +++ b/src/settings/designSetting.ts @@ -41,7 +41,7 @@ export const dialogIconSize = '20' export const asideWidth = '270' // 侧边栏折叠后的宽度，支持全部折叠会覆盖为 0 -export const asideCollapsedWidth = '60' +export const asideCollapsedWidth = 60 // 弹窗是否可以通过点击遮罩关闭 export const maskClosable = false diff --git a/src/store/modules/settingStore/settingStore.ts b/src/store/modules/settingStore/settingStore.ts index 166f9638..604f094a 100644 --- a/src/store/modules/settingStore/settingStore.ts +++ b/src/store/modules/settingStore/settingStore.ts @@ -31,8 +31,8 @@ export const useSettingStore = defineStore({ getAsideAllCollapsed(): boolean { return this.asideAllCollapsed }, - getAsideCollapsedWidth(): string { - return this.asideAllCollapsed ? '0' : asideCollapsedWidth + getAsideCollapsedWidth(): number { + return this.asideAllCollapsed ? 0 : asideCollapsedWidth } }, actions: { diff --git a/src/styles/common/_dark.scss b/src/styles/common/_dark.scss index fa74992e..52128916 100644 --- a/src/styles/common/_dark.scss +++ b/src/styles/common/_dark.scss @@ -23,9 +23,6 @@ $dark: ( linear-gradient($--color-dark-bg-1 14px, transparent 0), linear-gradient(90deg, transparent 14px, $--color-text-2 0) ), - // 物料市场背景 - items-top-bg: - linear-gradient(180deg, $--color-dark-bg-1, rgba(23, 23, 26, 0)), // hover 边框颜色 hover-border-color: #55606e, ); diff --git a/src/views/project/layout/components/Sider/menu.ts b/src/views/project/layout/components/Sider/menu.ts index c3e6a7a3..5b73fb62 100644 --- a/src/views/project/layout/components/Sider/menu.ts +++ b/src/views/project/layout/components/Sider/menu.ts @@ -5,7 +5,8 @@ import { PageEnum } from '@/enums/pageEnum' import { MenuOption, MenuGroupOption } from 'naive-ui' import { icon } from '@/plugins' -const { GridIcon, BeerIcon, DesktopIcon, LaptopOutlineIcon } = icon.ionicons5 +const { GridIcon, DesktopIcon } = icon.ionicons5 +const { StoreIcon, ObjectStorageIcon, DevicesIcon } = icon.carbon export const renderMenuLabel = (option: MenuOption | MenuGroupOption) => { return option.label } @@ -18,12 +19,12 @@ export const menuOptionsInit = () => { return reactive([ { key: 'divider-1', - type: 'divider' + type: 'divider', }, { label: () => h('span', null, { default: () => t('project.project') }), key: 'all-project', - icon: renderIcon(GridIcon), + icon: renderIcon(DevicesIcon), children: [ { type: 'group', @@ -36,13 +37,13 @@ export const menuOptionsInit = () => { RouterLink, { to: { - name: PageEnum.BASE_HOME_ITEMS_NAME - } + name: PageEnum.BASE_HOME_ITEMS_NAME, + }, }, { default: () => t('project.all_project') } ), key: PageEnum.BASE_HOME_ITEMS_NAME, - icon: renderIcon(DesktopIcon) + icon: renderIcon(DesktopIcon), }, { label: () => @@ -50,22 +51,22 @@ export const menuOptionsInit = () => { RouterLink, { to: { - name: PageEnum.BASE_HOME_TEMPLATE_NAME - } + name: PageEnum.BASE_HOME_TEMPLATE_NAME, + }, }, { default: () => t('project.my_templete') } ), key: PageEnum.BASE_HOME_TEMPLATE_NAME, - icon: renderIcon(LaptopOutlineIcon) - } - ] - } - ] + icon: renderIcon(ObjectStorageIcon), + }, + ], + }, + ], }, { key: 'divider-2', - type: 'divider' + type: 'divider', }, { label: () => @@ -73,13 +74,13 @@ export const menuOptionsInit = () => { RouterLink, { to: { - name: PageEnum.BASE_HOME_TEMPLATE_MARKET_NAME - } + name: PageEnum.BASE_HOME_TEMPLATE_MARKET_NAME, + }, }, { default: () => t('project.template_market') } ), key: PageEnum.BASE_HOME_TEMPLATE_MARKET_NAME, - icon: renderIcon(BeerIcon) - } + icon: renderIcon(StoreIcon), + }, ]) } diff --git a/src/views/project/templateMarket/components/TopCarousel/index.ts b/src/views/project/templateMarket/components/TopCarousel/index.ts deleted file mode 100644 index 62db284d..00000000 --- a/src/views/project/templateMarket/components/TopCarousel/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import TopCarousel from './index.vue' - -export { TopCarousel } diff --git a/src/views/project/templateMarket/components/TopCarousel/index.vue b/src/views/project/templateMarket/components/TopCarousel/index.vue deleted file mode 100644 index 488d76eb..00000000 --- a/src/views/project/templateMarket/components/TopCarousel/index.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/src/views/project/templateMarket/index.vue b/src/views/project/templateMarket/index.vue index 9b360a6b..f225a451 100644 --- a/src/views/project/templateMarket/index.vue +++ b/src/views/project/templateMarket/index.vue @@ -1,74 +1,19 @@ - +