From 32116be1f2858d295f25aa4b2ebb0d267314365e Mon Sep 17 00:00:00 2001 From: xiaoma <735878602@qq.com> Date: Fri, 4 Nov 2022 10:18:51 +0800 Subject: [PATCH] fix icon error --- build/vite/plugin/styleImport.ts | 22 ---------------------- src/router/modules/about.ts | 7 +++---- src/router/modules/docs.ts | 2 +- src/router/modules/newVersion.ts | 20 ++++++++++++++++++++ src/views/about/index.vue | 8 ++------ src/views/list/basicList/index.vue | 1 - src/views/system/role/role.vue | 1 - 7 files changed, 26 insertions(+), 35 deletions(-) delete mode 100644 build/vite/plugin/styleImport.ts create mode 100644 src/router/modules/newVersion.ts diff --git a/build/vite/plugin/styleImport.ts b/build/vite/plugin/styleImport.ts deleted file mode 100644 index f09d35d..0000000 --- a/build/vite/plugin/styleImport.ts +++ /dev/null @@ -1,22 +0,0 @@ -/** - * Introduces component library styles on demand. - * https://github.com/anncwb/vite-plugin-style-import - */ - -import styleImport from 'vite-plugin-style-import'; - -export function configStyleImportPlugin(isBuild: boolean) { - if (!isBuild) return []; - const styleImportPlugin = styleImport({ - libs: [ - { - libraryName: 'ant-design-vue', - esModule: true, - resolveStyle: (name) => { - return `ant-design-vue/es/${name}/style/index`; - }, - }, - ], - }); - return styleImportPlugin; -} diff --git a/src/router/modules/about.ts b/src/router/modules/about.ts index d0b36ca..a5ea1da 100644 --- a/src/router/modules/about.ts +++ b/src/router/modules/about.ts @@ -1,7 +1,7 @@ import { RouteRecordRaw } from 'vue-router'; import { Layout } from '@/router/constant'; import { ProjectOutlined } from '@vicons/antd'; -import { renderIcon, renderNew } from '@/utils/index'; +import { renderIcon } from '@/utils/index'; const routes: Array = [ { @@ -9,7 +9,7 @@ const routes: Array = [ name: 'about', component: Layout, meta: { - sort: 10, + sort: 9, isRoot: true, activeMenu: 'about_index', icon: renderIcon(ProjectOutlined), @@ -19,8 +19,7 @@ const routes: Array = [ path: 'index', name: `about_index`, meta: { - title: '关于', - extra: renderNew(), + title: '关于项目', activeMenu: 'about_index', }, component: () => import('@/views/about/index.vue'), diff --git a/src/router/modules/docs.ts b/src/router/modules/docs.ts index 8bb98c6..237cadb 100644 --- a/src/router/modules/docs.ts +++ b/src/router/modules/docs.ts @@ -6,7 +6,7 @@ import { renderIcon } from '@/utils/index'; const routes: Array = [ { path: '/external', - name: 'https://jekip.github.io/docs', + name: 'https://docs.naiveadmin.com', component: Layout, meta: { title: '项目文档', diff --git a/src/router/modules/newVersion.ts b/src/router/modules/newVersion.ts new file mode 100644 index 0000000..2cbc45d --- /dev/null +++ b/src/router/modules/newVersion.ts @@ -0,0 +1,20 @@ +import { RouteRecordRaw } from 'vue-router'; +import { Layout } from '@/router/constant'; +import { SketchOutlined } from '@vicons/antd'; +import { renderIcon, renderNew } from '@/utils/index'; + +const routes: Array = [ + { + path: '/newversion', + name: 'https://www.naiveadmin.com', + component: Layout, + meta: { + title: 'Pro 版本', + extra: renderNew(), + icon: renderIcon(SketchOutlined), + sort: 10, + }, + }, +]; + +export default routes; diff --git a/src/views/about/index.vue b/src/views/about/index.vue index 9d04089..062ac55 100644 --- a/src/views/about/index.vue +++ b/src/views/about/index.vue @@ -22,16 +22,12 @@ diff --git a/src/views/list/basicList/index.vue b/src/views/list/basicList/index.vue index dd802ea..10075b9 100644 --- a/src/views/list/basicList/index.vue +++ b/src/views/list/basicList/index.vue @@ -243,7 +243,6 @@ actions: [ { label: '删除', - icon: 'ic:outline-delete-outline', onClick: handleDelete.bind(null, record), // 根据业务控制是否显示 isShow 和 auth 是并且关系 ifShow: () => { diff --git a/src/views/system/role/role.vue b/src/views/system/role/role.vue index 42cc2e7..c8b9326 100644 --- a/src/views/system/role/role.vue +++ b/src/views/system/role/role.vue @@ -120,7 +120,6 @@ }, { label: '删除', - icon: 'ic:outline-delete-outline', onClick: handleDelete.bind(null, record), // 根据业务控制是否显示 isShow 和 auth 是并且关系 ifShow: () => {