diff --git a/smart-admin-web-javascript/src/assets/images/nav/active_bg2.svg b/smart-admin-web-javascript/src/assets/images/nav/active_bg2.svg
new file mode 100644
index 00000000..60a4b362
--- /dev/null
+++ b/smart-admin-web-javascript/src/assets/images/nav/active_bg2.svg
@@ -0,0 +1,3 @@
+
diff --git a/smart-admin-web-javascript/src/assets/images/nav/active_bg2_default.svg b/smart-admin-web-javascript/src/assets/images/nav/active_bg2_default.svg
new file mode 100644
index 00000000..5a555277
--- /dev/null
+++ b/smart-admin-web-javascript/src/assets/images/nav/active_bg2_default.svg
@@ -0,0 +1,3 @@
+
diff --git a/smart-admin-web-javascript/src/config/app-config.js b/smart-admin-web-javascript/src/config/app-config.js
index 183620f7..a08098b4 100644
--- a/smart-admin-web-javascript/src/config/app-config.js
+++ b/smart-admin-web-javascript/src/config/app-config.js
@@ -24,7 +24,7 @@ export const appDefaultConfig = {
borderRadius: 6,
// 标签页
pageTagFlag: true,
- // 标签页样式: default、 antd
+ // 标签页样式: default、 antd、naive
pageTagStyle: 'default',
// 面包屑
breadCrumbFlag: true,
diff --git a/smart-admin-web-javascript/src/constants/layout-const.js b/smart-admin-web-javascript/src/constants/layout-const.js
index b5f124e0..cd597c06 100644
--- a/smart-admin-web-javascript/src/constants/layout-const.js
+++ b/smart-admin-web-javascript/src/constants/layout-const.js
@@ -31,4 +31,8 @@ export const PAGE_TAG_ENUM = {
value: 'antd',
desc: 'Ant Design',
},
+ NAIVE: {
+ value: 'naive',
+ desc: 'NAIVE',
+ },
};
diff --git a/smart-admin-web-javascript/src/layout/components/header-user-space/header-setting.vue b/smart-admin-web-javascript/src/layout/components/header-user-space/header-setting.vue
index d77f5473..bb663d91 100644
--- a/smart-admin-web-javascript/src/layout/components/header-user-space/header-setting.vue
+++ b/smart-admin-web-javascript/src/layout/components/header-user-space/header-setting.vue
@@ -73,7 +73,8 @@
默认
- Ant Design
+ ANTD
+ NAIVE
diff --git a/smart-admin-web-javascript/src/layout/components/page-tag/components/naive-tab.vue b/smart-admin-web-javascript/src/layout/components/page-tag/components/naive-tab.vue
new file mode 100644
index 00000000..cbce3a35
--- /dev/null
+++ b/smart-admin-web-javascript/src/layout/components/page-tag/components/naive-tab.vue
@@ -0,0 +1,340 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.menuTitle }}
+
+
+
+
+
+
+
+
+ 关闭其他
+ 关闭所有
+
+
+
+
+
+
+
+
+
+ 关闭其他
+ 关闭所有
+
+
+
+
+
+
+
+
+
diff --git a/smart-admin-web-javascript/src/layout/components/page-tag/index.vue b/smart-admin-web-javascript/src/layout/components/page-tag/index.vue
index 048d2c01..5e659364 100644
--- a/smart-admin-web-javascript/src/layout/components/page-tag/index.vue
+++ b/smart-admin-web-javascript/src/layout/components/page-tag/index.vue
@@ -11,6 +11,7 @@
@@ -19,6 +20,7 @@
import { useAppConfigStore } from '/@/store/modules/system/app-config';
import DefaultTab from './components/default-tab.vue';
import AntdTab from './components/antd-tab.vue';
+ import NaiveTab from './components/naive-tab.vue';
import { PAGE_TAG_ENUM } from '/@/constants/layout-const.js';
const pageTagStyle = computed(() => useAppConfigStore().$state.pageTagStyle);
diff --git a/smart-admin-web-javascript/src/store/modules/system/user.js b/smart-admin-web-javascript/src/store/modules/system/user.js
index 3c5ed6c9..d31f6f71 100644
--- a/smart-admin-web-javascript/src/store/modules/system/user.js
+++ b/smart-admin-web-javascript/src/store/modules/system/user.js
@@ -206,6 +206,7 @@ export const useUserStore = defineStore({
// @ts-ignore
menuTitle: route.meta.title,
menuQuery: route.query,
+ menuIcon:route.meta?.icon,
// @ts-ignore
fromMenuName: from.name,
fromMenuQuery: from.query,