feat: redis支持flushdb、菜单资源支持拖拽排序、禁用等

Merge pull request !44 from zongyangleo/dev_20230613

README.md

@@ -9,6 +9,9 @@
     <img src="https://img.shields.io/github/stars/may-fly/mayfly-go.svg?style=social" alt="github star"/>
     <img src="https://img.shields.io/github/forks/may-fly/mayfly-go.svg?style=social" alt="github fork"/>
   </a>
+  <a href="https://hub.docker.com/r/mayflygo/mayfly-go/tags" target="_blank">
+    <img src="https://img.shields.io/docker/pulls/mayflygo/mayfly-go.svg?label=docker%20pulls&color=fac858" alt="docker pulls"/>
+  </a>
   <a href="https://github.com/golang/go" target="_blank">
     <img src="https://img.shields.io/badge/Golang-1.18%2B-yellow.svg" alt="golang"/>
   </a>

build_release.sh

@@ -115,7 +115,7 @@ function buildxDocker() {
     echo_yellow "-------------------docker buildx构建镜像开始-------------------"
     imageVersion=$1
     cd ${server_folder}
-    imageName="mayflygo/mayfly-go:${imageVersion}"
+    imageName="ccr.ccs.tencentyun.com/mayfly/mayfly-go:${imageVersion}"
     docker buildx build --push --platform linux/amd64,linux/arm64 -t "${imageName}" .
     echo_green "docker多版本镜像构建完成->[${imageName}]"
     echo_yellow "-------------------docker buildx构建镜像结束-------------------"

mayfly_go_web/.env.production

@@ -2,4 +2,4 @@
 ENV = 'production'
 
 # 线上环境接口地址
-VITE_API_URL = 'http://api.mayflygo.1yue.net/api'
+VITE_API_URL = '/api'

mayfly_go_web/.eslintrc.js

@@ -11,21 +11,33 @@ module.exports = {
 		parser: '@typescript-eslint/parser',
 		sourceType: 'module',
 	},
-	extends: ['plugin:vue/essential'],
-	// plugins: ['vue', '@typescript-eslint'],
+	extends: ['plugin:vue/vue3-essential', 'plugin:vue/essential', 'eslint:recommended'],
+	plugins: ['vue', '@typescript-eslint'],
+	overrides: [
+		{
+			files: ['*.ts', '*.tsx', '*.vue'],
+			rules: {
+				'no-undef': 'off',
+			},
+		},
+	],
 	rules: {
 		// http://eslint.cn/docs/rules/
 		// https://eslint.vuejs.org/rules/
-		'@type-eslint/ban-ts-ignore': 'off',
-		'@type-eslint/explicit-function-return-type': 'off',
-		'@type-eslint/no-explicit-any': 'off',
-		'@type-eslint/no-var-requires': 'off',
-		'@type-eslint/no-empty-function': 'off',
-		'@type-eslint/no-use-before-define': 'off',
-		'@type-eslint/ban-ts-comment': 'off',
-		'@type-eslint/ban-types': 'off',
-		'@type-eslint/no-non-null-assertion': 'off',
-		'@type-eslint/explicit-module-boundary-types': 'off',
+		// https://typescript-eslint.io/rules/no-unused-vars/
+		'@typescript-eslint/ban-ts-ignore': 'off',
+		'@typescript-eslint/explicit-function-return-type': 'off',
+		'@typescript-eslint/no-explicit-any': 'off',
+		'@typescript-eslint/no-var-requires': 'off',
+		'@typescript-eslint/no-empty-function': 'off',
+		'@typescript-eslint/no-use-before-define': 'off',
+		'@typescript-eslint/ban-ts-comment': 'off',
+		'@typescript-eslint/ban-types': 'off',
+		'@typescript-eslint/no-non-null-assertion': 'off',
+		'@typescript-eslint/explicit-module-boundary-types': 'off',
+		'@typescript-eslint/no-redeclare': 'error',
+		'@typescript-eslint/no-non-null-asserted-optional-chain': 'off',
+		'@typescript-eslint/no-unused-vars': [2],
 		'vue/custom-event-name-casing': 'off',
 		'vue/attributes-order': 'off',
 		'vue/one-component-per-file': 'off',
@@ -43,6 +55,12 @@ module.exports = {
 		'vue/no-v-html': 'off',
 		'vue/comment-directive': 'off',
 		'vue/no-parsing-error': 'off',
+		'vue/no-deprecated-v-on-native-modifier': 'off',
+		'vue/multi-word-component-names': 'off',
+		'no-useless-escape': 'off',
+		'no-sparse-arrays': 'off',
+		'no-prototype-builtins': 'off',
+		'no-constant-condition': 'off',
 		'no-use-before-define': 'off',
 		'no-restricted-globals': 'off',
 		'no-restricted-syntax': 'off',
@@ -51,5 +69,8 @@ module.exports = {
 		'no-multiple-template-root': 'off',
 		'no-unused-vars': 'error',
 		'no-v-model-argument': 'off',
+		'no-case-declarations': 'off',
+		'no-console': 'error',
+		'no-redeclare': 'off',
 	},
-};
+};

mayfly_go_web/package.json

@@ -9,28 +9,28 @@
     "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
   },
   "dependencies": {
-    "@element-plus/icons-vue": "^2.0.10",
-    "asciinema-player": "^3.0.1",
-    "axios": "^1.3.2",
+    "@element-plus/icons-vue": "^2.1.0",
+    "asciinema-player": "^3.3.0",
+    "axios": "^1.4.0",
     "countup.js": "^2.0.7",
     "cropperjs": "^1.5.11",
     "echarts": "^5.4.0",
-    "element-plus": "^2.2.30",
-    "jsencrypt": "^3.2.1",
+    "element-plus": "^2.3.5",
+    "jsencrypt": "^3.3.1",
     "lodash": "^4.17.21",
     "mitt": "^3.0.0",
-    "monaco-editor": "^0.35.0",
+    "monaco-editor": "^0.38.0",
     "monaco-sql-languages": "^0.11.0",
-    "monaco-themes": "^0.4.2",
+    "monaco-themes": "^0.4.4",
     "nprogress": "^0.2.0",
+    "pinia": "^2.1.3",
     "screenfull": "^6.0.2",
     "sortablejs": "^1.13.0",
-    "sql-formatter": "^9.2.0",
-    "vue": "^3.2.47",
+    "sql-formatter": "^12.1.2",
+    "vue": "^3.3.4",
     "vue-clipboard3": "^1.0.1",
-    "vue-router": "^4.1.6",
-    "vuex": "^4.0.2",
-    "xterm": "^5.1.0",
+    "vue-router": "^4.2.2",
+    "xterm": "^5.2.1",
     "xterm-addon-fit": "^0.7.0"
   },
   "devDependencies": {
@@ -40,17 +40,17 @@
     "@types/sortablejs": "^1.10.6",
     "@typescript-eslint/eslint-plugin": "^4.23.0",
     "@typescript-eslint/parser": "^4.23.0",
-    "@vitejs/plugin-vue": "^2.3.3",
+    "@vitejs/plugin-vue": "^4.0.0",
     "@vue/compiler-sfc": "^3.0.11",
     "dotenv": "^10.0.0",
-    "eslint": "^8.5.0",
+    "eslint": "^8.35.0",
     "eslint-plugin-vue": "^8.2.0",
     "prettier": "^2.3.0",
-    "sass": "^1.58.0",
+    "sass": "^1.62.0",
     "sass-loader": "^13.2.0",
-    "typescript": "^4.7.4",
-    "vite": "^4.1.1",
-    "vue-eslint-parser": "^8.0.1"
+    "typescript": "^5.0.2",
+    "vite": "^4.3.9",
+    "vue-eslint-parser": "^9.1.1"
   },
   "browserslist": [
     "> 1%",

mayfly_go_web/plugins.d.ts

@@ -1 +0,0 @@
-declare module 'vue-grid-layout';

mayfly_go_web/src/App.vue

@@ -1,74 +1,69 @@
 <template>
-    <router-view v-show="getThemeConfig.lockScreenTime !== 0" />
-    <LockScreen v-if="getThemeConfig.isLockScreen" />
-    <Setings ref="setingsRef" v-show="getThemeConfig.lockScreenTime !== 0" />
+    <router-view v-show="themeConfig.lockScreenTime !== 0" />
+    <LockScreen v-if="themeConfig.isLockScreen" />
+    <Setings ref="setingsRef" v-show="themeConfig.lockScreenTime !== 0" />
 </template>
 
-<script lang="ts">
-import { computed, ref, getCurrentInstance, onBeforeMount, onMounted, onUnmounted, nextTick, defineComponent, watch } from 'vue';
+<script setup lang="ts" name="app">
+import { ref, onBeforeMount, onMounted, onUnmounted, nextTick, watch } from 'vue';
 import { useRoute } from 'vue-router';
-import { useStore } from '@/store/index.ts';
-import { getLocal } from '@/common/utils/storage.ts';
+// import { useTagsViewRoutes } from '@/store/tagsViewRoutes';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '@/store/themeConfig';
+import { getLocal } from '@/common/utils/storage';
 import LockScreen from '@/views/layout/lockScreen/index.vue';
 import Setings from '@/views/layout/navBars/breadcrumb/setings.vue';
-import Watermark from '@/common/utils/wartermark.ts';
+import Watermark from '@/common/utils/wartermark';
+import mittBus from '@/common/utils/mitt';
 
-export default defineComponent({
-    name: 'app',
-    components: { LockScreen, Setings },
-    setup() {
-        const { proxy } = getCurrentInstance() as any;
-        const setingsRef = ref();
-        const route = useRoute();
-        const store = useStore();
-        // 获取布局配置信息
-        const getThemeConfig = computed(() => {
-            return store.state.themeConfig.themeConfig;
-        });
-        // 布局配置弹窗打开
-        const openSetingsDrawer = () => {
-            setingsRef.value.openDrawer();
-        };
-        // 设置初始化，防止刷新时恢复默认
-        onBeforeMount(() => {
-            // 设置批量第三方 icon 图标
-            // setIntroduction.cssCdn();
-            // // 设置批量第三方 js
-            // setIntroduction.jsCdn();
-        });
-        // 页面加载时
-        onMounted(() => {
-            nextTick(() => {
-                // 监听布局配置弹窗点击打开
-                proxy.mittBus.on('openSetingsDrawer', () => {
-                    openSetingsDrawer();
-                });
-                // 获取缓存中的布局配置
-                if (getLocal('themeConfig')) {
-                    store.dispatch('themeConfig/setThemeConfig', getLocal('themeConfig'));
-                    document.documentElement.style.cssText = getLocal('themeConfigStyle');
-                }
-            });
-        });
-        // 页面销毁时，关闭监听布局配置
-        onUnmounted(() => {
-            proxy.mittBus.off('openSetingsDrawer', () => {});
-        });
-        // 监听路由的变化，设置网站标题
-        watch(
-            () => route.path,
-            () => {
-                nextTick(() => {
-                    // 路由变化更新水印
-                    Watermark.use();
-                    document.title = `${route.meta.title} - ${getThemeConfig.value.globalTitle}` || getThemeConfig.value.globalTitle;
-                });
-            }
-        );
-        return {
-            setingsRef,
-            getThemeConfig,
-        };
-    },
+const setingsRef = ref();
+const route = useRoute();
+
+const themeConfigStores = useThemeConfig();
+const { themeConfig } = storeToRefs(themeConfigStores);
+
+// 布局配置弹窗打开
+const openSetingsDrawer = () => {
+    setingsRef.value.openDrawer();
+};
+
+// 设置初始化，防止刷新时恢复默认
+onBeforeMount(() => {
+    // 设置批量第三方 icon 图标
+    // setIntroduction.cssCdn();
+    // // 设置批量第三方 js
+    // setIntroduction.jsCdn();
 });
+
+// 页面加载时
+onMounted(() => {
+    nextTick(() => {
+        // 监听布局配置弹窗点击打开
+        mittBus.on('openSetingsDrawer', () => {
+            openSetingsDrawer();
+        });
+        // 获取缓存中的布局配置
+        if (getLocal('themeConfig')) {
+            themeConfigStores.setThemeConfig({ themeConfig: getLocal('themeConfig') })
+            document.documentElement.style.cssText = getLocal('themeConfigStyle');
+        }
+    });
+});
+
+// 页面销毁时，关闭监听布局配置
+onUnmounted(() => {
+    mittBus.off('openSetingsDrawer', () => { });
+});
+
+// 监听路由的变化，设置网站标题
+watch(
+    () => route.path,
+    () => {
+        nextTick(() => {
+            // 路由变化更新水印
+            Watermark.use();
+            document.title = `${route.meta.title} - ${themeConfig.value.globalTitle}` || themeConfig.value.globalTitle;
+        });
+    }
+);
 </script>

mayfly_go_web/src/assets/iconfont/iconfont.json

@@ -0,0 +1,51 @@
+{
+  "id": "3953964",
+  "name": "mayfly-go",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "23957582",
+      "name": "MongoDB",
+      "font_class": "mongo",
+      "unicode": "e646",
+      "unicode_decimal": 58950
+    },
+    {
+      "icon_id": "4969649",
+      "name": "Redis",
+      "font_class": "op-redis",
+      "unicode": "e728",
+      "unicode_decimal": 59176
+    },
+    {
+      "icon_id": "22442993",
+      "name": "PostgreSQL",
+      "font_class": "op-postgres",
+      "unicode": "e8b7",
+      "unicode_decimal": 59575
+    },
+    {
+      "icon_id": "10055634",
+      "name": "云数据库MongoDB",
+      "font_class": "op-mongo",
+      "unicode": "e7d7",
+      "unicode_decimal": 59351
+    },
+    {
+      "icon_id": "10055642",
+      "name": "云数据库 RDS MySQL",
+      "font_class": "op-mysql",
+      "unicode": "e7d8",
+      "unicode_decimal": 59352
+    },
+    {
+      "icon_id": "3876165",
+      "name": "redis",
+      "font_class": "redis",
+      "unicode": "e619",
+      "unicode_decimal": 58905
+    }
+  ]
+}

mayfly_go_web/src/common/Api.ts

@@ -19,24 +19,6 @@ class Api {
         this.method = method;
     }
 
-    /**
-     * 设置rl
-     * @param {String} uri 请求url
-     */
-    setUrl(url: string) {
-        this.url = url;
-        return this;
-    }
-
-    /**
-     * url的请求方法
-     * @param {String} method 请求方法
-     */
-    setMethod(method: string) {
-        this.method = method;
-        return this;
-    }
-
     /**
      * 获取权限的完整url
      */
@@ -46,7 +28,7 @@ class Api {
 
     /**
      * 操作该权限，即请求对应的url
-     * @param {Object} param 请求该权限的参数
+     * @param {Object} param 请求该api的参数
      */
     request(param: any = null, options: any = null): Promise<any> {
         return request.send(this, param, options);
@@ -54,7 +36,8 @@ class Api {
 
     /**
     * 操作该权限，即请求对应的url
-    * @param {Object} param 请求该权限的参数
+    * @param {Object} param 请求该api的参数
+    * @param headers headers
     */
     requestWithHeaders(param: any, headers: any): Promise<any> {
         return request.sendWithHeaders(this, param, headers);
@@ -68,9 +51,41 @@ class Api {
      * @param url url
      * @param method 请求方法(get,post,put,delete...)
      */
-    static create(url: string, method: string) {
+    static create(url: string, method: string) :Api {
         return new Api(url, method);
     }
+
+    /**
+     * 创建get api
+     * @param url url
+     */
+    static newGet(url: string): Api {
+        return Api.create(url, 'get');
+    }
+
+    /**
+     * new post api
+     * @param url url
+     */
+    static newPost(url: string): Api {
+        return Api.create(url, 'post');
+    }
+
+    /**
+     * new put api
+     * @param url url
+     */
+    static newPut(url: string): Api {
+        return Api.create(url, 'put');
+    }
+
+    /**
+     * new delete api
+     * @param url url
+     */
+    static newDelete(url: string): Api {
+        return Api.create(url, 'delete');
+    }
 }
 
 

mayfly_go_web/src/common/config.ts

@@ -11,7 +11,7 @@ const config = {
     baseWsUrl: `${(window as any).globalConfig.BaseWsUrl || `${location.protocol == 'https:' ? 'wss:' : 'ws:'}//${getBaseApiUrl()}`}/api`,
 
     // 系统版本
-    version: 'v1.4.0'
+    version: 'v1.4.3'
 }
 
 export default config

mayfly_go_web/src/common/openApi.ts

@@ -1,11 +1,11 @@
-import request from './request'
+import Api from './Api'
 
 export default {
-    login: (param: any) => request.request('POST', '/sys/accounts/login', param),
-    changePwd: (param: any) => request.request('POST', '/sys/accounts/change-pwd', param),
-    getPublicKey: () => request.request('GET', '/common/public-key'),
-    getConfigValue: (param: any) => request.request('GET', '/sys/configs/value', param),
-    captcha: () => request.request('GET', '/sys/captcha'),
-    logout: (param: any) => request.request('POST', '/sys/accounts/logout/{token}', param),
-    getMenuRoute: (param: any) => request.request('Get', '/sys/resources/account', param)
+    login: Api.newPost("/sys/accounts/login"),
+    changePwd: Api.newPost("/sys/accounts/change-pwd"),
+    getPublicKey: Api.newGet("/common/public-key"),
+    getConfigValue: Api.newGet("/sys/configs/value"),
+    captcha: Api.newGet("/sys/captcha"),
+    logout: Api.newPost("/sys/accounts/logout/{token}"),
+    getPermissions: Api.newGet("/sys/accounts/permissions")
 }

mayfly_go_web/src/common/request.ts

@@ -22,7 +22,8 @@ export interface Result {
     data?: any;
 }
 
-const baseUrl: string = config.baseApiUrl as string
+const baseUrl: string = config.baseApiUrl
+const baseWsUrl: string = config.baseWsUrl
 
 /**
  * 通知错误消息
@@ -115,9 +116,8 @@ function request(method: string, url: string, params: any = null, headers: any =
         query.headers = headers
     }
 
-    const lowMethod = method.toLowerCase();
     // post和put使用json格式传参
-    if (lowMethod === 'post' || lowMethod === 'put') {
+    if (method === 'post' || method === 'put') {
         query.data = params;
     } else {
         query.params = params;
@@ -155,6 +155,7 @@ function getApiUrl(url: string) {
     return baseUrl + url + '?token=' + getSession('token');
 }
 
+
 export default {
     request,
     send,

mayfly_go_web/src/common/rsa.ts

@@ -9,7 +9,7 @@ export async function getRsaPublicKey() {
     if (publicKey) {
         return publicKey
     }
-    publicKey = await openApi.getPublicKey() as string
+    publicKey = await openApi.getPublicKey.request() as string
     sessionStorage.setItem('RsaPublicKey', publicKey)
     return publicKey
 }

mayfly_go_web/src/common/sysconfig.ts

@@ -11,7 +11,7 @@ const UseWartermarkConfigKey = "UseWartermark"
  * @returns 配置值
  */
 export async function getConfigValue(key: string) : Promise<string> {
-    return await openApi.getConfigValue({key}) as string
+    return await openApi.getConfigValue.request({key}) as string
 }
 
 /**

mayfly_go_web/src/common/utils/authFunction.ts

@@ -1,23 +0,0 @@
-import { store } from '@/store/index.ts';
-import { judementSameArr } from '@/common/utils/arrayOperation.ts';
-
-// 单个权限验证
-export function auth(value: string) {
-    return store.state.userInfos.userInfos.permissions.some((v: any) => v === value);
-}
-
-// 多个权限验证，满足一个则为 true
-export function auths(value: Array<string>) {
-    let flag = false;
-    store.state.userInfos.userInfos.permissions.map((val: any) => {
-        value.map((v: any) => {
-            if (val === v) flag = true;
-        });
-    });
-    return flag;
-}
-
-// 多个权限验证，全部满足则为 true
-export function authAll(value: Array<string>) {
-    return judementSameArr(value, store.state.userInfos.userInfos.permissions);
-}

mayfly_go_web/src/common/utils/format.ts

@@ -72,4 +72,124 @@ export function formatJsonString(txt: string, compress: boolean) {
         indent = 0;
     notify('', data, isLast, indent, false);
     return draw.join('');
+}
+
+/*
+ * 年(Y) 可用1-4个占位符
+ * 月(m)、日(d)、小时(H)、分(M)、秒(S) 可用1-2个占位符
+ * 星期(W) 可用1-3个占位符
+ * 季度(q为阿拉伯数字，Q为中文数字)可用1或4个占位符
+ *
+ * let date = new Date()
+ * formatDate(date, "YYYY-mm-dd HH:MM:SS")           // 2020-02-09 14:04:23
+ * formatDate(date, "YYYY-mm-dd HH:MM:SS Q")         // 2020-02-09 14:09:03 一
+ * formatDate(date, "YYYY-mm-dd HH:MM:SS WWW")       // 2020-02-09 14:45:12 星期日
+ * formatDate(date, "YYYY-mm-dd HH:MM:SS QQQQ")      // 2020-02-09 14:09:36 第一季度
+ * formatDate(date, "YYYY-mm-dd HH:MM:SS WWW QQQQ")  // 2020-02-09 14:46:12 星期日 第一季度
+ */
+export function formatDate(date: Date, format: string) {
+    let we = date.getDay(); // 星期
+    let qut = Math.floor((date.getMonth() + 3) / 3).toString(); // 季度
+    const opt: any = {
+        'Y+': date.getFullYear().toString(), // 年
+        'm+': (date.getMonth() + 1).toString(), // 月(月份从0开始，要+1)
+        'd+': date.getDate().toString(), // 日
+        'H+': date.getHours().toString(), // 时
+        'M+': date.getMinutes().toString(), // 分
+        'S+': date.getSeconds().toString(), // 秒
+        'q+': qut, // 季度
+    };
+    // 中文数字 (星期)
+    const week: any = {
+        '0': '日',
+        '1': '一',
+        '2': '二',
+        '3': '三',
+        '4': '四',
+        '5': '五',
+        '6': '六',
+    };
+    // 中文数字（季度）
+    const quarter: any = {
+        '1': '一',
+        '2': '二',
+        '3': '三',
+        '4': '四',
+    };
+    if (/(W+)/.test(format))
+        format = format.replace(RegExp.$1, RegExp.$1.length > 1 ? (RegExp.$1.length > 2 ? '星期' + week[we] : '周' + week[we]) : week[we]);
+    if (/(Q+)/.test(format)) format = format.replace(RegExp.$1, RegExp.$1.length == 4 ? '第' + quarter[qut] + '季度' : quarter[qut]);
+    for (let k in opt) {
+        let r = new RegExp('(' + k + ')').exec(format);
+        // 若输入的长度不为1，则前面补零
+        if (r) format = format.replace(r[1], RegExp.$1.length == 1 ? opt[k] : opt[k].padStart(RegExp.$1.length, '0'));
+    }
+    return format;
+}
+
+/**
+ * 10秒：  10 * 1000
+ * 1分：   60 * 1000
+ * 1小时： 60 * 60 * 1000
+ * 24小时：60 * 60 * 24 * 1000
+ * 3天：   60 * 60* 24 * 1000 * 3
+ *
+ * let data = new Date()
+ * formatPast(data)                                           // 刚刚
+ * formatPast(data - 11 * 1000)                               // 11秒前
+ * formatPast(data - 2 * 60 * 1000)                           // 2分钟前
+ * formatPast(data - 60 * 60 * 2 * 1000)                      // 2小时前
+ * formatPast(data - 60 * 60 * 2 * 1000)                      // 2小时前
+ * formatPast(data - 60 * 60 * 71 * 1000)                     // 2天前
+ * formatPast("2020-06-01")                                   // 2020-06-01
+ * formatPast("2020-06-01", "YYYY-mm-dd HH:MM:SS WWW QQQQ")   // 2020-06-01 08:00:00 星期一 第二季度
+ */
+export function formatPast(param: any, format: string = 'YYYY-mm-dd') {
+    // 传入格式处理、存储转换值
+    let t: any, s: any;
+    // 获取js 时间戳
+    let time: any = new Date().getTime();
+    // 是否是对象
+    typeof param === 'string' || 'object' ? (t = new Date(param).getTime()) : (t = param);
+    // 当前时间戳 - 传入时间戳
+    time = Number.parseInt(`${time - t}`);
+    if (time < 10000) {
+        // 10秒内
+        return '刚刚';
+    } else if (time < 60000 && time >= 10000) {
+        // 超过10秒少于1分钟内
+        s = Math.floor(time / 1000);
+        return `${s}秒前`;
+    } else if (time < 3600000 && time >= 60000) {
+        // 超过1分钟少于1小时
+        s = Math.floor(time / 60000);
+        return `${s}分钟前`;
+    } else if (time < 86400000 && time >= 3600000) {
+        // 超过1小时少于24小时
+        s = Math.floor(time / 3600000);
+        return `${s}小时前`;
+    } else if (time < 259200000 && time >= 86400000) {
+        // 超过1天少于3天内
+        s = Math.floor(time / 86400000);
+        return `${s}天前`;
+    } else {
+        // 超过3天
+        let date = typeof param === 'string' || 'object' ? new Date(param) : param;
+        return formatDate(date, format);
+    }
+}
+
+/**
+ * formatAxis(new Date())   // 上午好
+ */
+export function formatAxis(param: any) {
+    let hour: number = new Date(param).getHours();
+    if (hour < 6) return '凌晨好';
+    else if (hour < 9) return '早上好';
+    else if (hour < 12) return '上午好';
+    else if (hour < 14) return '中午好';
+    else if (hour < 17) return '下午好';
+    else if (hour < 19) return '傍晚好';
+    else if (hour < 22) return '晚上好';
+    else return '夜里好';
 }

mayfly_go_web/src/common/utils/formatTime.ts

@@ -1,119 +0,0 @@
-/*
- * 年(Y) 可用1-4个占位符
- * 月(m)、日(d)、小时(H)、分(M)、秒(S) 可用1-2个占位符
- * 星期(W) 可用1-3个占位符
- * 季度(q为阿拉伯数字，Q为中文数字)可用1或4个占位符
- *
- * let date = new Date()
- * formatDate(date, "YYYY-mm-dd HH:MM:SS")           // 2020-02-09 14:04:23
- * formatDate(date, "YYYY-mm-dd HH:MM:SS Q")         // 2020-02-09 14:09:03 一
- * formatDate(date, "YYYY-mm-dd HH:MM:SS WWW")       // 2020-02-09 14:45:12 星期日
- * formatDate(date, "YYYY-mm-dd HH:MM:SS QQQQ")      // 2020-02-09 14:09:36 第一季度
- * formatDate(date, "YYYY-mm-dd HH:MM:SS WWW QQQQ")  // 2020-02-09 14:46:12 星期日 第一季度
- */
-export function formatDate(date: Date, format: string) {
-    let we = date.getDay(); // 星期
-    let qut = Math.floor((date.getMonth() + 3) / 3).toString(); // 季度
-    const opt: any = {
-        'Y+': date.getFullYear().toString(), // 年
-        'm+': (date.getMonth() + 1).toString(), // 月(月份从0开始，要+1)
-        'd+': date.getDate().toString(), // 日
-        'H+': date.getHours().toString(), // 时
-        'M+': date.getMinutes().toString(), // 分
-        'S+': date.getSeconds().toString(), // 秒
-        'q+': qut, // 季度
-    };
-    // 中文数字 (星期)
-    const week: any = {
-        '0': '日',
-        '1': '一',
-        '2': '二',
-        '3': '三',
-        '4': '四',
-        '5': '五',
-        '6': '六',
-    };
-    // 中文数字（季度）
-    const quarter: any = {
-        '1': '一',
-        '2': '二',
-        '3': '三',
-        '4': '四',
-    };
-    if (/(W+)/.test(format))
-        format = format.replace(RegExp.$1, RegExp.$1.length > 1 ? (RegExp.$1.length > 2 ? '星期' + week[we] : '周' + week[we]) : week[we]);
-    if (/(Q+)/.test(format)) format = format.replace(RegExp.$1, RegExp.$1.length == 4 ? '第' + quarter[qut] + '季度' : quarter[qut]);
-    for (let k in opt) {
-        let r = new RegExp('(' + k + ')').exec(format);
-        // 若输入的长度不为1，则前面补零
-        if (r) format = format.replace(r[1], RegExp.$1.length == 1 ? opt[k] : opt[k].padStart(RegExp.$1.length, '0'));
-    }
-    return format;
-}
-
-/**
- * 10秒：  10 * 1000
- * 1分：   60 * 1000
- * 1小时： 60 * 60 * 1000
- * 24小时：60 * 60 * 24 * 1000
- * 3天：   60 * 60* 24 * 1000 * 3
- *
- * let data = new Date()
- * formatPast(data)                                           // 刚刚
- * formatPast(data - 11 * 1000)                               // 11秒前
- * formatPast(data - 2 * 60 * 1000)                           // 2分钟前
- * formatPast(data - 60 * 60 * 2 * 1000)                      // 2小时前
- * formatPast(data - 60 * 60 * 2 * 1000)                      // 2小时前
- * formatPast(data - 60 * 60 * 71 * 1000)                     // 2天前
- * formatPast("2020-06-01")                                   // 2020-06-01
- * formatPast("2020-06-01", "YYYY-mm-dd HH:MM:SS WWW QQQQ")   // 2020-06-01 08:00:00 星期一 第二季度
- */
-export function formatPast(param: any, format: string = 'YYYY-mm-dd') {
-    // 传入格式处理、存储转换值
-    let t: any, s: any;
-    // 获取js 时间戳
-    let time: any = new Date().getTime();
-    // 是否是对象
-    typeof param === 'string' || 'object' ? (t = new Date(param).getTime()) : (t = param);
-    // 当前时间戳 - 传入时间戳
-    time = Number.parseInt(`${time - t}`);
-    if (time < 10000) {
-        // 10秒内
-        return '刚刚';
-    } else if (time < 60000 && time >= 10000) {
-        // 超过10秒少于1分钟内
-        s = Math.floor(time / 1000);
-        return `${s}秒前`;
-    } else if (time < 3600000 && time >= 60000) {
-        // 超过1分钟少于1小时
-        s = Math.floor(time / 60000);
-        return `${s}分钟前`;
-    } else if (time < 86400000 && time >= 3600000) {
-        // 超过1小时少于24小时
-        s = Math.floor(time / 3600000);
-        return `${s}小时前`;
-    } else if (time < 259200000 && time >= 86400000) {
-        // 超过1天少于3天内
-        s = Math.floor(time / 86400000);
-        return `${s}天前`;
-    } else {
-        // 超过3天
-        let date = typeof param === 'string' || 'object' ? new Date(param) : param;
-        return formatDate(date, format);
-    }
-}
-
-/**
- * formatAxis(new Date())   // 上午好
- */
-export function formatAxis(param: any) {
-    let hour: number = new Date(param).getHours();
-    if (hour < 6) return '凌晨好';
-    else if (hour < 9) return '早上好';
-    else if (hour < 12) return '上午好';
-    else if (hour < 14) return '中午好';
-    else if (hour < 17) return '下午好';
-    else if (hour < 19) return '傍晚好';
-    else if (hour < 22) return '晚上好';
-    else return '夜里好';
-}

mayfly_go_web/src/common/utils/mitt.ts

@@ -0,0 +1,8 @@
+// https://www.npmjs.com/package/mitt
+import mitt, { Emitter } from 'mitt';
+
+// 类型
+const emitter: Emitter<any> = mitt<any>();
+
+// 导出
+export default emitter;

mayfly_go_web/src/common/utils/setIconfont.ts

@@ -1,42 +1,47 @@
 // 字体图标 url
 const cssCdnUrlList: Array<string> = [
-    '//at.alicdn.com/t/font_2298093_ysc3z187xhh.css',
-    '//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css',
+	
 ];
 // 第三方 js url
 const jsCdnUrlList: Array<string> = [];
 
-// 动态设置字体图标
+// 动态批量设置字体图标
 export function setCssCdn() {
-    if (cssCdnUrlList.length <= 0) return false;
-    cssCdnUrlList.map((v) => {
-        let link = document.createElement('link');
-        link.rel = 'stylesheet';
-        link.href = v;
-        link.crossOrigin = 'anonymous';
-        document.getElementsByTagName('head')[0].appendChild(link);
-    });
+	if (cssCdnUrlList.length <= 0) return false;
+	cssCdnUrlList.map((v) => {
+		let link = document.createElement('link');
+		link.rel = 'stylesheet';
+		link.href = v;
+		link.crossOrigin = 'anonymous';
+		document.getElementsByTagName('head')[0].appendChild(link);
+	});
 }
 
-// 批量设置第三方js
+// 动态批量设置第三方js
 export function setJsCdn() {
-    if (jsCdnUrlList.length <= 0) return false;
-    jsCdnUrlList.map((v) => {
-        let link = document.createElement('script');
-        link.src = v;
-        document.body.appendChild(link);
-    });
+	if (jsCdnUrlList.length <= 0) return false;
+	jsCdnUrlList.map((v) => {
+		let link = document.createElement('script');
+		link.src = v;
+		document.body.appendChild(link);
+	});
 }
 
-// 设置执行函数
+/**
+ * 批量设置字体图标、动态js
+ * @method cssCdn 动态批量设置字体图标
+ * @method jsCdn 动态批量设置第三方js
+ */
 const setIntroduction = {
-    cssCdn: () => {
-        setCssCdn();
-    },
-    jsCdn: () => {
-        setJsCdn();
-    },
+	// 设置css
+	cssCdn: () => {
+		setCssCdn();
+	},
+	// 设置js
+	jsCdn: () => {
+		setJsCdn();
+	},
 };
 
 // 导出函数方法
-export default setIntroduction;
+export default setIntroduction;

mayfly_go_web/src/common/utils/svgIcons.ts

@@ -1,5 +1,20 @@
 import { nextTick } from 'vue';
 import * as svg from '@element-plus/icons-vue';
+import iconfontJson from '@/assets/iconfont/iconfont.json'
+import SvgIcon from '@/components/svgIcon/index.vue';
+
+/**
+ * 导出全局注册 element plus svg 图标
+ * @param app vue 实例
+ * @description 使用：https://element-plus.gitee.io/zh-CN/component/icon.html
+ */
+export function registElSvgIcon(app: any) {
+    const icons = svg as any;
+    for (const i in icons) {
+        app.component(`${icons[i].name}`, icons[i]);
+    }
+    app.component('SvgIcon', SvgIcon);
+}
 
 // 获取阿里字体图标
 const getAlicdnIconfont = () => {
@@ -9,7 +24,8 @@ const getAlicdnIconfont = () => {
             let sheetsList = [];
             let sheetsIconList = [];
             for (let i = 0; i < styles.length; i++) {
-                if (styles[i].href && styles[i].href.indexOf('at.alicdn.com') > -1) {
+                console.log(styles[i]);
+                if (styles[i].href && styles[i].href.indexOf('iconfont') > -1) {
                     sheetsList.push(styles[i]);
                 }
             }
@@ -28,6 +44,16 @@ const getAlicdnIconfont = () => {
     });
 };
 
+// 获取本地阿里icons
+const getLocalAliIconfont = () => {
+    return new Promise((resolve, reject) => {
+        nextTick(() => {
+            const prefix = iconfontJson.css_prefix_text;
+            resolve(iconfontJson.glyphs.map((x: any) => prefix + x.font_class));
+        });
+    });
+}
+
 // 初始化获取 css 样式，获取 element plus 自带图标
 const elementPlusIconfont = () => {
     return new Promise((resolve, reject) => {
@@ -76,9 +102,9 @@ const awesomeIconfont = () => {
 
 // 定义导出方法集合
 const initIconfont = {
-    // ali: () => {
-    // 	return getAlicdnIconfont();
-    // },
+    ali: () => {
+    	return getLocalAliIconfont();
+    },
     ele: () => {
         return elementPlusIconfont();
     },

mayfly_go_web/src/components/auth/auth.vue

@@ -6,7 +6,7 @@
 
 <script lang="ts">
 import { computed } from 'vue';
-import { useStore } from '/@/store/index.ts';
+import { useUserInfo } from '@/store/userInfo';
 export default {
     name: 'auth',
     props: {
@@ -16,10 +16,9 @@ export default {
         },
     },
     setup(props) {
-        const store = useStore();
         // 获取 vuex 中的用户权限
         const getUserAuthBtnList = computed(() => {
-            return store.state.userInfos.userInfos.authBtnList.some((v: any) => v === props.value);
+            return useUserInfo().userInfo.authBtnList.some((v: any) => v === props.value);
         });
         return {
             getUserAuthBtnList,

mayfly_go_web/src/components/auth/authAll.vue

@@ -6,7 +6,7 @@
 
 <script lang="ts">
 import { computed } from 'vue';
-import { useStore } from '/@/store/index.ts';
+import { useUserInfo } from '@/store/userInfo';
 import { judementSameArr } from '/@/utils/arrayOperation.ts';
 export default {
     name: 'authAll',
@@ -17,10 +17,9 @@ export default {
         },
     },
     setup(props) {
-        const store = useStore();
         // 获取 vuex 中的用户权限
         const getUserAuthBtnList = computed(() => {
-            return judementSameArr(props.value, store.state.userInfos.userInfos.authBtnList);
+            return judementSameArr(props.value, useUserInfo().userInfo.authBtnList);
         });
         return {
             getUserAuthBtnList,

mayfly_go_web/src/components/auth/auths.vue

@@ -6,7 +6,7 @@
 
 <script lang="ts">
 import { computed } from 'vue';
-import { useStore } from '/@/store/index.ts';
+import { useUserInfo } from '@/store/userInfo';
 export default {
     name: 'auths',
     props: {
@@ -16,11 +16,10 @@ export default {
         },
     },
     setup(props) {
-        const store = useStore();
         // 获取 vuex 中的用户权限
         const getUserAuthBtnList = computed(() => {
             let flag = false;
-            store.state.userInfos.userInfos.authBtnList.map((val: any) => {
+            useUserInfo().userInfo.authBtnList.map((val: any) => {
                 props.value.map((v) => {
                     if (val === v) flag = true;
                 });

mayfly_go_web/src/components/contextmenu/index.vue

@@ -0,0 +1,132 @@
+<template>
+    <transition name="el-zoom-in-center">
+        <div aria-hidden="true" class="el-dropdown__popper el-popper is-light is-pure custom-contextmenu" role="tooltip"
+            data-popper-placement="bottom" :style="`top: ${dropdowns.y + 5}px;left: ${dropdowns.x}px;`" :key="Math.random()"
+            v-show="state.isShow">
+            <ul class="el-dropdown-menu">
+                <template v-for="(v, k) in state.dropdownList">
+                    <li class="el-dropdown-menu__item" aria-disabled="false" tabindex="-1" :key="k" v-if="!v.affix"
+                        @click="onCurrentContextmenuClick(v.contextMenuClickId)">
+                        <SvgIcon :name="v.icon" />
+                        <span>{{ v.txt }}</span>
+                    </li>
+                </template>
+            </ul>
+            <div class="el-popper__arrow" :style="{ left: `${state.arrowLeft}px` }"></div>
+        </div>
+    </transition>
+</template>
+
+<script setup lang="ts" name="layoutTagsViewContextmenu">
+import { computed, reactive, onMounted, onUnmounted, watch } from 'vue';
+
+// 定义父组件传过来的值
+const props = defineProps({
+    dropdown: {
+        type: Object,
+        default: () => {
+            return {
+                x: 0,
+                y: 0,
+            };
+        },
+    },
+    items: {
+        type: Array,
+        default: [],
+    },
+});
+
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['currentContextmenuClick']);
+
+// 定义变量内容
+const state = reactive({
+    isShow: false,
+    dropdownList: [
+        { contextMenuClickId: 0, txt: '刷新', affix: false, icon: 'RefreshRight' },
+    ],
+    item: {} as any,
+    arrowLeft: 10,
+});
+
+// 父级传过来的坐标 x,y 值
+const dropdowns = computed(() => {
+    // 117 为 `Dropdown 下拉菜单` 的宽度
+    if (props.dropdown.x + 117 > document.documentElement.clientWidth) {
+        return {
+            x: document.documentElement.clientWidth - 117 - 5,
+            y: props.dropdown.y,
+        };
+    } else {
+        return props.dropdown;
+    }
+});
+// 当前项菜单点击
+const onCurrentContextmenuClick = (contextMenuClickId: number) => {
+    emit('currentContextmenuClick', { id: contextMenuClickId, item: state.item });
+};
+// 打开右键菜单：判断是否固定，固定则不显示关闭按钮
+const openContextmenu = (item: any) => {
+    state.item = item;
+    closeContextmenu();
+    setTimeout(() => {
+        state.isShow = true;
+    }, 10);
+};
+// 关闭右键菜单
+const closeContextmenu = () => {
+    state.isShow = false;
+};
+// 监听页面监听进行右键菜单的关闭
+onMounted(() => {
+    document.body.addEventListener('click', closeContextmenu);
+});
+// 页面卸载时，移除右键菜单监听事件
+onUnmounted(() => {
+    document.body.removeEventListener('click', closeContextmenu);
+});
+// 监听下拉菜单位置
+watch(
+    () => props.dropdown,
+    ({ x }) => {
+        if (x + 117 > document.documentElement.clientWidth) state.arrowLeft = 117 - (document.documentElement.clientWidth - x);
+        else state.arrowLeft = 10;
+    },
+    {
+        deep: true,
+    }
+);
+watch(
+    () => props.items,
+    (x: any) => {
+        state.dropdownList = x
+    },
+    {
+        deep: true,
+    }
+);
+
+// 暴露变量
+defineExpose({
+    openContextmenu,
+    closeContextmenu,
+});
+</script>
+
+<style scoped lang="scss">
+.custom-contextmenu {
+    transform-origin: center top;
+    z-index: 2190;
+    position: fixed;
+
+    .el-dropdown-menu__item {
+        font-size: 12px !important;
+        white-space: nowrap;
+
+        i {
+            font-size: 12px !important;
+        }
+    }
+}
+</style>

mayfly_go_web/src/components/iconSelector/index.vue

@@ -1,261 +1,242 @@
 <template>
-    <div class="icon-selector">
-        <el-popover placement="bottom" :width="450" v-model:visible="fontIconVisible" popper-class="icon-selector-popper">
-            <template #reference>
-                <el-input
-                    v-model="fontIconSearch"
-                    :placeholder="fontIconPlaceholder"
-                    :clearable="clearable"
-                    :disabled="disabled"
-                    :size="size"
-                    ref="inputWidthRef"
-                    @clear="onClearFontIcon"
-                    @focus="onIconFocus"
-                    @blur="onIconBlur"
-                >
-                    <template #prepend>
-                        <SvgIcon :name="prepend" class="font14" />
-                    </template>
-                </el-input>
-            </template>
-            <transition name="el-zoom-in-top">
-                <div class="icon-selector-warp" v-show="fontIconVisible">
-                    <div class="icon-selector-warp-title flex">
-                        <div class="flex-auto">{{ title }}</div>
-                        <div class="icon-selector-warp-title-tab" v-if="type === 'all'">
-                            <span :class="{ 'span-active': fontIconType === 'ali' }" @click="onIconChange('ali')" class="ml10" title="iconfont 图标"
-                                >ali</span
-                            >
-                            <span
-                                :class="{ 'span-active': fontIconType === 'ele' }"
-                                @click="onIconChange('ele')"
-                                class="ml10"
-                                title="elementPlus 图标"
-                                >ele</span
-                            >
-                            <span
-                                :class="{ 'span-active': fontIconType === 'awe' }"
-                                @click="onIconChange('awe')"
-                                class="ml10"
-                                title="fontawesome 图标"
-                                >awe</span
-                            >
-                        </div>
-                    </div>
-                    <div class="icon-selector-warp-row">
-                        <el-scrollbar ref="selectorScrollbarRef">
-                            <el-row :gutter="10" v-if="fontIconSheetsFilterList.length > 0">
-                                <el-col
-                                    :xs="6"
-                                    :sm="4"
-                                    :md="4"
-                                    :lg="4"
-                                    :xl="4"
-                                    @click="onColClick(v)"
-                                    v-for="(v, k) in fontIconSheetsFilterList"
-                                    :key="k"
-                                >
-                                    <div class="icon-selector-warp-item" :class="{ 'icon-selector-active': fontIconPrefix === v }">
-                                        <div class="flex-margin">
-                                            <div class="icon-selector-warp-item-value">
-                                                <SvgIcon :name="v" />
-                                            </div>
-                                        </div>
-                                    </div>
-                                </el-col>
-                            </el-row>
-                            <el-empty :image-size="100" v-if="fontIconSheetsFilterList.length <= 0" :description="emptyDescription"></el-empty>
-                        </el-scrollbar>
-                    </div>
-                </div>
-            </transition>
-        </el-popover>
-    </div>
+	<div class="icon-selector w100 h100">
+		<el-input
+			v-model="state.fontIconSearch"
+			:placeholder="state.fontIconPlaceholder"
+			:clearable="clearable"
+			:disabled="disabled"
+			:size="size"
+			ref="inputWidthRef"
+			@clear="onClearFontIcon"
+			@focus="onIconFocus"
+			@blur="onIconBlur"
+		>
+			<template #prepend>
+				<SvgIcon
+					:name="state.fontIconPrefix === '' ? prepend : state.fontIconPrefix"
+					class="font14"
+				/>
+			</template>
+		</el-input>
+		<el-popover
+			placement="bottom"
+			:width="state.fontIconWidth"
+			transition="el-zoom-in-top"
+			popper-class="icon-selector-popper"
+			trigger="click"
+			:virtual-ref="inputWidthRef"
+			virtual-triggering
+		>
+			<template #default>
+				<div class="icon-selector-warp">
+					<div class="icon-selector-warp-title">{{ title }}</div>
+					<el-tabs v-model="state.fontIconTabActive" @tab-click="onIconClick">
+						<el-tab-pane lazy label="ele" name="ele">
+							<IconList :list="fontIconSheetsFilterList" :empty="emptyDescription" :prefix="state.fontIconPrefix" @get-icon="onColClick" />
+						</el-tab-pane>
+                        <el-tab-pane lazy label="ali" name="ali">
+							<IconList :list="fontIconSheetsFilterList" :empty="emptyDescription" :prefix="state.fontIconPrefix" @get-icon="onColClick" />
+						</el-tab-pane>
+						<!-- <el-tab-pane lazy label="awe" name="awe">
+							<IconList :list="fontIconSheetsFilterList" :empty="emptyDescription" :prefix="state.fontIconPrefix" @get-icon="onColClick" />
+						</el-tab-pane> -->
+					</el-tabs>
+				</div>
+			</template>
+		</el-popover>
+	</div>
 </template>
 
-<script lang="ts">
-import { ref, toRefs, reactive, onMounted, nextTick, computed, watch } from 'vue';
-import initIconfont from '@/common/utils/getStyleSheets';
-export default {
-    name: 'iconSelector',
-    emits: ['update:modelValue', 'get', 'clear'],
-    props: {
-        // 输入框前置内容
-        prepend: {
-            type: String,
-            default: () => 'Pointer',
-        },
-        // 输入框占位文本
-        placeholder: {
-            type: String,
-            default: () => '请输入内容搜索图标或者选择图标',
-        },
-        // 输入框占位文本
-        size: {
-            type: String,
-            default: () => 'default',
-        },
-        // 弹窗标题
-        title: {
-            type: String,
-            default: () => '请选择图标',
-        },
-        // icon 图标类型
-        type: {
-            type: String,
-            default: () => 'ele',
-        },
-        // 禁用
-        disabled: {
-            type: Boolean,
-            default: () => false,
-        },
-        // 是否可清空
-        clearable: {
-            type: Boolean,
-            default: () => true,
-        },
-        // 自定义空状态描述文字
-        emptyDescription: {
-            type: String,
-            default: () => '无相关图标',
-        },
-        // 双向绑定值，字段名为固定，改了之后将不生效
-        // 参考：https://v3.cn.vuejs.org/guide/migration/v-model.html#%E8%BF%81%E7%A7%BB%E7%AD%96%E7%95%A5
-        modelValue: String,
-    },
-    setup(props, { emit }) {
-        const inputWidthRef = ref();
-        const selectorScrollbarRef = ref();
-        const state: any = reactive({
-            fontIconPrefix: '',
-            fontIconVisible: false,
-            fontIconWidth: 0,
-            fontIconSearch: '',
-            fontIconTabsIndex: 0,
-            fontIconSheetsList: [],
-            fontIconPlaceholder: '',
-            fontIconType: 'ali',
-            fontIconShow: true,
-        });
-        // 处理 input 获取焦点时，modelValue 有值时，改变 input 的 placeholder 值
-        const onIconFocus = () => {
-            state.fontIconVisible = true;
-            if (!props.modelValue) return false;
-            state.fontIconSearch = '';
-            state.fontIconPlaceholder = props.modelValue;
-        };
-        // 处理 input 失去焦点时，为空将清空 input 值，为点击选中图标时，将取原先值
-        const onIconBlur = () => {
-            state.fontIconVisible = false;
-            setTimeout(() => {
-                const icon = state.fontIconSheetsList.filter((icon: string) => icon === state.fontIconSearch);
-                if (icon.length <= 0) state.fontIconSearch = '';
-            }, 300);
-        };
-        // 处理 icon 双向绑定数值回显
-        const initModeValueEcho = () => {
-            if (props.modelValue === '') return false;
-            state.fontIconPlaceholder = props.modelValue;
-            state.fontIconPrefix = props.modelValue;
-        };
-        // 图标搜索及图标数据显示
-        const fontIconSheetsFilterList = computed(() => {
-            if (!state.fontIconSearch) return state.fontIconSheetsList;
-            let search = state.fontIconSearch.trim().toLowerCase();
-            return state.fontIconSheetsList.filter((item: any) => {
-                if (item.toLowerCase().indexOf(search) !== -1) return item;
-            });
-        });
-        // 获取 input 的宽度
-        const getInputWidth = () => {
-            nextTick(() => {
-                state.fontIconWidth = inputWidthRef.value.$el.offsetWidth;
-            });
-        };
-        // 监听页面宽度改变
-        const initResize = () => {
-            window.addEventListener('resize', () => {
-                getInputWidth();
-            });
-        };
-        // 初始化数据
-        const initFontIconData = async (type: string) => {
-            state.fontIconSheetsList = [];
-            if (type === 'ali') {
-                // await initIconfont.ali().then((res: any) => {
-                //     // 阿里字体图标使用 `iconfont xxx`
-                //     state.fontIconSheetsList = res.map((i) => `iconfont ${i}`);
-                // });
-            } else if (type === 'ele') {
-                await initIconfont.ele().then((res: any) => {
-                    state.fontIconSheetsList = res;
-                });
-            } else if (type === 'awe') {
-                // await initIconfont.awe().then((res: any) => {
-                //     // fontawesome字体图标使用 `fa xxx`
-                //     state.fontIconSheetsList = res.map((i) => `fa ${i}`);
-                // });
-            }
-            // 初始化 input 的 placeholder
-            // 参考（单项数据流）：https://cn.vuejs.org/v2/guide/components-props.html?#%E5%8D%95%E5%90%91%E6%95%B0%E6%8D%AE%E6%B5%81
-            state.fontIconPlaceholder = props.placeholder;
-            // 初始化双向绑定回显
-            initModeValueEcho();
-            // 切换时，滚动条置顶。感兴趣可以使用 keep-alive <component :is="xxx"/> 进行缓存
-            selectorScrollbarRef.value.wrap$.scrollTop = 0;
-        };
-        // 图标点击切换
-        const onIconChange = (type: string) => {
-            state.fontIconType = type;
-            initFontIconData(type);
-        };
-        // 获取当前点击的 icon 图标
-        const onColClick = (v: any) => {
-            state.fontIconPlaceholder = v;
-            state.fontIconVisible = false;
-            state.fontIconPrefix = v;
-            emit('get', state.fontIconPrefix);
-            emit('update:modelValue', state.fontIconPrefix);
-        };
-        // 清空当前点击的 icon 图标
-        const onClearFontIcon = () => {
-            state.fontIconPrefix = '';
-            emit('clear', state.fontIconPrefix);
-            emit('update:modelValue', state.fontIconPrefix);
-        };
-        // 页面加载时
-        onMounted(() => {
-            // 判断默认进来是什么类型图标，进行 tab 回显
-            if (props.type === 'all') {
-                // if (props.modelValue?.indexOf('iconfont') > -1) onIconChange('ali');
-                // else if (props.modelValue?.indexOf('element') > -1) onIconChange('ele');
-                // else if (props.modelValue?.indexOf('fa') > -1) onIconChange('awe');
-                // else onIconChange('ali');
-            } else {
-                onIconChange(props.type);
-            }
-            initResize();
-            getInputWidth();
-        });
-        // 监听双向绑定 modelValue 的变化
-        watch(
-            () => props.modelValue,
-            () => {
-                initModeValueEcho();
-            }
-        );
-        return {
-            inputWidthRef,
-            selectorScrollbarRef,
-            fontIconSheetsFilterList,
-            onColClick,
-            onIconChange,
-            onClearFontIcon,
-            onIconFocus,
-            onIconBlur,
-            ...toRefs(state),
-        };
-    },
+<script setup lang="ts" name="iconSelector">
+import { defineAsyncComponent, ref, reactive, onMounted, nextTick, computed, watch } from 'vue';
+import type { TabsPaneContext } from 'element-plus';
+import initIconfont from '@/common/utils/svgIcons';
+import '@/theme/iconSelector.scss';
+
+// 定义父组件传过来的值
+const props = defineProps({
+	// 输入框前置内容
+	prepend: {
+		type: String,
+		default: () => 'Pointer',
+	},
+	// 输入框占位文本
+	placeholder: {
+		type: String,
+		default: () => '请输入内容搜索图标或者选择图标',
+	},
+	// 输入框占位文本
+	size: {
+		type: String,
+		default: () => 'default',
+	},
+	// 弹窗标题
+	title: {
+		type: String,
+		default: () => '请选择图标',
+	},
+	// 禁用
+	disabled: {
+		type: Boolean,
+		default: () => false,
+	},
+	// 是否可清空
+	clearable: {
+		type: Boolean,
+		default: () => true,
+	},
+	// 自定义空状态描述文字
+	emptyDescription: {
+		type: String,
+		default: () => '无相关图标',
+	},
+	// 双向绑定值，默认为 modelValue，
+	// 参考：https://v3.cn.vuejs.org/guide/migration/v-model.html#%E8%BF%81%E7%A7%BB%E7%AD%96%E7%95%A5
+	// 参考：https://v3.cn.vuejs.org/guide/component-custom-events.html#%E5%A4%9A%E4%B8%AA-v-model-%E7%BB%91%E5%AE%9A
+	modelValue: String,
+});
+
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['update:modelValue', 'get', 'clear']);
+
+// 引入组件
+const IconList = defineAsyncComponent(() => import('@/components/iconSelector/list.vue'));
+
+// 定义变量内容
+const inputWidthRef = ref();
+const state = reactive({
+	fontIconPrefix: '',
+	fontIconWidth: 0,
+	fontIconSearch: '',
+	fontIconPlaceholder: '',
+	fontIconTabActive: 'ele',
+	fontIconList: {
+		ali: [],
+		ele: [],
+		awe: [],
+	},
+});
+
+// 处理 input 获取焦点时，modelValue 有值时，改变 input 的 placeholder 值
+const onIconFocus = () => {
+	if (!props.modelValue) return false;
+	state.fontIconSearch = '';
+	state.fontIconPlaceholder = props.modelValue;
 };
+// 处理 input 失去焦点时，为空将清空 input 值，为点击选中图标时，将取原先值
+const onIconBlur = () => {
+	const list = fontIconTabNameList();
+	setTimeout(() => {
+		const icon = list.filter((icon: string) => icon === state.fontIconSearch);
+		if (icon.length <= 0) state.fontIconSearch = '';
+	}, 300);
+};
+// 图标搜索及图标数据显示
+const fontIconSheetsFilterList = computed(() => {
+	const list = fontIconTabNameList();
+	if (!state.fontIconSearch) return list;
+	let search = state.fontIconSearch.trim().toLowerCase();
+	return list.filter((item: string) => {
+		if (item.toLowerCase().indexOf(search) !== -1) return item;
+	});
+});
+// 根据 tab name 类型设置图标
+const fontIconTabNameList = () => {
+	let iconList: any = [];
+	if (state.fontIconTabActive === 'ali') iconList = state.fontIconList.ali;
+	else if (state.fontIconTabActive === 'ele') iconList = state.fontIconList.ele;
+	else if (state.fontIconTabActive === 'awe') iconList = state.fontIconList.awe;
+	return iconList;
+};
+// 处理 icon 双向绑定数值回显
+const initModeValueEcho = () => {
+	if (props.modelValue === '') return ((<string | undefined>state.fontIconPlaceholder) = props.placeholder);
+	(<string | undefined>state.fontIconPlaceholder) = props.modelValue;
+	(<string | undefined>state.fontIconPrefix) = props.modelValue;
+};
+// 处理 icon 类型，用于回显时，tab 高亮与初始化数据
+const initFontIconName = () => {
+	let name = 'ele';
+	if (props.modelValue!.indexOf('iconfont') > -1) {
+        name = 'ali';
+    } else {
+        name = 'ele';
+    }
+	// else if (props.modelValue!.indexOf('ele-') > -1) name = 'ele';
+	// else if (props.modelValue!.indexOf('fa') > -1) name = 'awe';
+	// 初始化 tab 高亮回显
+	state.fontIconTabActive = name;
+	return name;
+};
+// 初始化数据
+const initFontIconData = async (name: string) => {
+	if (name === 'ali') {
+		// 阿里字体图标使用 `iconfont xxx`
+		if (state.fontIconList.ali.length > 0) return;
+		const res: any = await initIconfont.ali();
+        state.fontIconList.ali = res.map((i: string) => `iconfont ${i}`);
+	} else if (name === 'ele') {
+		// element plus 图标
+		if (state.fontIconList.ele.length > 0) return;
+		await initIconfont.ele().then((res: any) => {
+			state.fontIconList.ele = res;
+		});
+	} else if (name === 'awe') {
+		// fontawesome字体图标使用 `fa xxx`
+		// if (state.fontIconList.awe.length > 0) return;
+		// await initIconfont.awe().then((res: any) => {
+		// 	state.fontIconList.awe = res.map((i: string) => `fa ${i}`);
+		// });
+	}
+	// 初始化 input 的 placeholder
+	// 参考（单项数据流）：https://cn.vuejs.org/v2/guide/components-props.html?#%E5%8D%95%E5%90%91%E6%95%B0%E6%8D%AE%E6%B5%81
+	state.fontIconPlaceholder = props.placeholder;
+	// 初始化双向绑定回显
+	initModeValueEcho();
+};
+// 图标点击切换
+const onIconClick = (pane: TabsPaneContext) => {
+	initFontIconData(pane.paneName as string);
+	inputWidthRef.value.focus();
+};
+// 获取当前点击的 icon 图标
+const onColClick = (v: string) => {
+	state.fontIconPlaceholder = v;
+	state.fontIconPrefix = v;
+	emit('get', state.fontIconPrefix);
+	emit('update:modelValue', state.fontIconPrefix);
+	inputWidthRef.value.focus();
+};
+// 清空当前点击的 icon 图标
+const onClearFontIcon = () => {
+	state.fontIconPrefix = '';
+	emit('clear', state.fontIconPrefix);
+	emit('update:modelValue', state.fontIconPrefix);
+};
+// 获取 input 的宽度
+const getInputWidth = () => {
+	nextTick(() => {
+		state.fontIconWidth = inputWidthRef.value.$el.offsetWidth;
+	});
+};
+// 监听页面宽度改变
+const initResize = () => {
+	window.addEventListener('resize', () => {
+		getInputWidth();
+	});
+};
+// 页面加载时
+onMounted(() => {
+	initFontIconData(initFontIconName());
+	initResize();
+	getInputWidth();
+});
+// 监听双向绑定 modelValue 的变化
+watch(
+	() => props.modelValue,
+	() => {
+		initModeValueEcho();
+		initFontIconName();
+	}
+);
 </script>

mayfly_go_web/src/components/iconSelector/list.vue

@@ -0,0 +1,84 @@
+<template>
+	<div class="icon-selector-warp-row">
+		<el-scrollbar ref="selectorScrollbarRef">
+			<el-row :gutter="10" v-if="props.list.length > 0">
+				<el-col :xs="6" :sm="4" :md="4" :lg="4" :xl="4" v-for="(v, k) in list" :key="k" @click="onColClick(v)">
+					<div class="icon-selector-warp-item" :class="{ 'icon-selector-active': prefix === v }">
+						<SvgIcon :name="v" />
+					</div>
+				</el-col>
+			</el-row>
+			<el-empty :image-size="100" v-if="list.length <= 0" :description="empty"></el-empty>
+		</el-scrollbar>
+	</div>
+</template>
+
+<script setup lang="ts" name="iconSelectorList">
+// 定义父组件传过来的值
+const props = defineProps({
+	// 图标列表数据
+	list: {
+		type: Array,
+		default: () => [],
+	},
+	// 自定义空状态描述文字
+	empty: {
+		type: String,
+		default: () => '无相关图标',
+	},
+	// 高亮当前选中图标
+	prefix: {
+		type: String,
+		default: () => '',
+	},
+});
+
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['get-icon']);
+
+// 当前 icon 图标点击时
+const onColClick = (v: unknown | string) => {
+	emit('get-icon', v);
+};
+</script>
+
+<style scoped lang="scss">
+.icon-selector-warp-row {
+	height: 230px;
+	overflow: hidden;
+	.el-row {
+		padding: 15px;
+	}
+	.el-scrollbar__bar.is-horizontal {
+		display: none;
+	}
+	.icon-selector-warp-item {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border: 1px solid var(--el-border-color);
+		border-radius: 5px;
+		margin-bottom: 10px;
+		height: 30px;
+		i {
+			font-size: 20px;
+			color: var(--el-text-color-regular);
+		}
+		&:hover {
+			cursor: pointer;
+			background-color: var(--el-color-primary-light-9);
+			border: 1px solid var(--el-color-primary-light-5);
+			i {
+				color: var(--el-color-primary);
+			}
+		}
+	}
+	.icon-selector-active {
+		background-color: var(--el-color-primary-light-9);
+		border: 1px solid var(--el-color-primary-light-5);
+		i {
+			color: var(--el-color-primary);
+		}
+	}
+}
+</style>

mayfly_go_web/src/components/monaco/MonacoEditor.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="monaco-editor" style="border: 1px solid #ccc;">
-        <div ref="monacoTextarea" :style="{ height: height }"></div>
+        <div class="monaco-editor-content" ref="monacoTextarea" :style="{ height: height }"></div>
         <el-select v-if="canChangeMode" class="code-mode-select" v-model="languageMode" @change="changeLanguage">
-            <el-option v-for="mode in languages" :key="mode.value" :label="mode.label" :value="mode.value"> </el-option>
+            <el-option v-for="mode in languageArr" :key="mode.value" :label="mode.label" :value="mode.value"> </el-option>
         </el-select>
     </div>
 </template>
@@ -54,7 +54,7 @@ const props = defineProps({
 //定义事件
 const emit = defineEmits(['update:modelValue'])
 
-const languages = [
+const languageArr = [
     {
         value: 'shell',
         label: 'Shell',

mayfly_go_web/src/components/svgIcon/index.vue

@@ -1,24 +1,105 @@
-<script lang="ts">
-// 渲染函数：https://v3.cn.vuejs.org/guide/render-function.html
-import { h, resolveComponent, defineComponent } from 'vue';
-export default defineComponent({
-	name: 'svgIcon',
-	props: {
-		// svg 图标组件名字
-		name: {
-			type: String,
-		},
-		// svg 大小
-		size: {
-			type: Number,
-		},
-		// svg 颜色
-		color: {
-			type: String,
-		},
-	},
-	setup(props: any) {
-        return () => h('i', { class: 'el-icon', style: `--font-size: ${props.size};--color: ${props.color}` }, [h(resolveComponent(`${props.name}`))]);
-	},
+<template>
+    <i v-if="isShowIconSvg" class="el-icon icon-middle" :style="setIconSvgStyle">
+        <component :is="getIconName" :style="setIconSvgStyle" />
+    </i>
+
+    <svg v-else-if="isIconfont()" class="el-icon iconfont-icon icon-middle" aria-hidden="true" :style="setIconSvgStyle">
+        <use :xlink:href="'#' + getIconfontName()"></use>
+    </svg>
+
+    <div v-else-if="isShowIconImg" :style="setIconImgOutStyle">
+        <img :src="getIconName" :style="setIconSvgInsStyle" />
+    </div>
+
+    <i v-else :class="getIconName" :style="setIconSvgStyle" />
+</template>
+
+<script setup lang="ts" name="svgIcon">
+import { computed } from 'vue';
+
+// 定义父组件传过来的值
+const props = defineProps({
+    // svg 图标组件名字
+    name: {
+        type: String,
+    },
+    // svg 大小
+    size: {
+        type: Number,
+        default: () => 14,
+    },
+    // svg 颜色
+    color: {
+        type: String,
+    },
+    isEle: {
+        type: Boolean,
+        default: true,
+    }
 });
-</script>
+
+// 在线链接、本地引入地址前缀
+const linesString = ['https', 'http', '/src', '/assets', 'data:image', import.meta.env.VITE_PUBLIC_PATH];
+
+// 获取 icon 图标名称
+const getIconName = computed(() => {
+    return props?.name as any;
+});
+
+// 用于判断 element plus 自带 svg 图标的显示、隐藏。不存在 空格分隔的icon name即为element plus自带icon
+const isShowIconSvg = computed(() => {
+    const ss = props?.name?.split(" ")
+    if (!ss) {
+        return true;
+    }
+    return ss.length == 1;
+});
+
+const isIconfont = () => {
+    return props?.name?.startsWith("iconfont")
+}
+
+const getIconfontName = () => {
+    // iconfont icon-xxxx 获取icon-xxx即可
+    return props?.name?.split(" ")[1]
+}
+
+// 用于判断在线链接、本地引入等图标显示、隐藏
+const isShowIconImg = computed(() => {
+    return linesString.find((str) => props.name?.startsWith(str));
+});
+
+// 设置图标样式
+const setIconSvgStyle = computed(() => {
+    return `font-size: ${props.size}px;color: ${props.color};width: ${props.size}px;height: ${props.size}px;`;
+});
+
+// 设置图片样式
+const setIconImgOutStyle = computed(() => {
+    return `width: ${props.size}px;height: ${props.size}px;display: inline-block;overflow: hidden;`;
+});
+
+// 设置图片样式
+const setIconSvgInsStyle = computed(() => {
+    const filterStyle: string[] = [];
+    const compatibles: string[] = ['-webkit', '-ms', '-o', '-moz'];
+    compatibles.forEach((j) => filterStyle.push(`${j}-filter: drop-shadow(${props.color} 30px 0);`));
+    return `width: ${props.size}px;height: ${props.size}px;position: relative;left: -${props.size}px;${filterStyle.join('')}`;
+});
+</script>
+
+<style type="text/css">
+.iconfont-icon {
+    vertical-align: -0.15em;
+    fill: currentColor;
+    overflow: hidden;
+}
+
+.icon-middle {
+    display: inline-flex;
+    justify-content: center;
+    align-items: center;
+    cursor: pointer;
+    vertical-align: middle;
+}
+</style>

mayfly_go_web/src/directive/auth.ts

@@ -1,12 +1,13 @@
 import type { App } from 'vue';
-import { auth, auths, authAll } from './authFunction'
+import { useUserInfo } from '@/store/userInfo';
+import { judementSameArr } from '@/common/utils/arrayOperation';
 
 // 用户权限指令
 export function authDirective(app: App) {
     // 单个权限验证（v-auth="xxx"）
     app.directive('auth', {
         mounted(el, binding) {
-            if (!auth(binding.value)) {
+            if (!useUserInfo().userInfo.permissions.some((v: any) => v === binding.value)) {
                 parseNoAuth(el, binding);
             };
         },
@@ -14,7 +15,14 @@ export function authDirective(app: App) {
     // 多个权限验证，满足一个则显示（v-auths="[xxx,xxx]"）
     app.directive('auths', {
         mounted(el, binding) {
-            if (!auths(binding.value)) {
+            const value = binding.value
+            let flag = false;
+            useUserInfo().userInfo.permissions.map((val: any) => {
+                value.map((v: any) => {
+                    if (val === v) flag = true;
+                });
+            });
+            if (!flag) {
                 parseNoAuth(el, binding);
             }
         },
@@ -22,7 +30,7 @@ export function authDirective(app: App) {
     // 多个权限验证，全部满足则显示（v-auth-all="[xxx,xxx]"）
     app.directive('auth-all', {
         mounted(el, binding) {
-            if (!authAll(binding.value)) {
+            if (!judementSameArr(binding.value, useUserInfo().userInfo.permissions)) {
                 parseNoAuth(el, binding);
             };
         },

mayfly_go_web/src/directive/index.ts

@@ -1,6 +1,6 @@
 import type { App } from 'vue';
-import { authDirective } from '@/common/utils/authDirective.ts';
-import { wavesDirective } from '@/common/utils/customDirective.ts';
+import { authDirective } from './auth';
+import { wavesDirective } from './waves';
 
 // 导出指令方法
 export function directive(app: App) {

mayfly_go_web/src/main.ts

@@ -1,58 +1,33 @@
 import { createApp } from 'vue';
-import App from './App.vue';
+import App from '@/App.vue';
+
 import router from './router';
-import { store, key } from './store';
-import { directive } from '@/common/utils/directive.ts';
-import { globalComponentSize } from '@/common/utils/componentSize.ts';
-import { dateStrFormat } from '@/common/utils/date.ts'
+import pinia from '@/store/index';
+import { directive } from '@/directive/index';
+import { globalComponentSize } from '@/common/utils/componentSize';
+import { registElSvgIcon } from '@/common/utils/svgIcons';
 
 import ElementPlus from 'element-plus';
 import 'element-plus/dist/index.css';
 import zhCn from 'element-plus/es/locale/lang/zh-cn'
-import '@/theme/index.scss';
-import mitt from 'mitt';
 import { ElMessage } from 'element-plus';
 
-import * as svg from '@element-plus/icons-vue';
-import SvgIcon from '@/components/svgIcon/index.vue';
+import '@/theme/index.scss';
 import '@/assets/font/font.css'
+import '@/assets/iconfont/iconfont.js'
 
 const app = createApp(App);
-// 屏蔽警告信息
-app.config.warnHandler = () => null;
 
-/**
- * 导出全局注册 element plus svg 图标
- * @param app vue 实例
- * @description 使用：https://element-plus.gitee.io/zh-CN/component/icon.html
- */
- function elSvg(app: any) {
-    const icons = svg as any;
-    for (const i in icons) {
-        app.component(`${icons[i].name}`, icons[i]);
-    }
-    app.component('SvgIcon', SvgIcon);
-}
-
-elSvg(app);
+registElSvgIcon(app);
 directive(app);
 
-app.use(router)
-    .use(store, key)
-    .use(ElementPlus, { size: globalComponentSize, locale: zhCn})
+app.use(pinia)
+    .use(router)
+    .use(ElementPlus, { size: globalComponentSize, locale: zhCn })
     .mount('#app');
 
-
-// 自定义全局过滤器
-app.config.globalProperties.$filters = {
-    dateFormat(value: any) {
-        if (!value) {
-            return ""
-        }
-        return dateStrFormat('yyyy-MM-dd HH:mm:ss', value)
-    }
-}
-
+// 屏蔽警告信息
+app.config.warnHandler = () => null;
 // 全局error处理
 app.config.errorHandler = function (err: any, vm, info) {
     // 如果是断言错误，则进行提示即可
@@ -62,5 +37,3 @@ app.config.errorHandler = function (err: any, vm, info) {
         console.error(err, info)
     }
 }
-
-app.config.globalProperties.mittBus = mitt();

mayfly_go_web/src/router/imports.ts

@@ -1,30 +0,0 @@
-import RouterParent from '@/views/layout/routerView/parent.vue';
-
-export const imports = {
-    'RouterParent': RouterParent,
-    
-    "Home": () => import('@/views/home/Home.vue'),
-    'Personal': () => import('@/views/personal/index.vue'),
-    // machine
-    "MachineList": () => import('@/views/ops/machine'),
-    // sys
-    "ResourceList": () => import('@/views/system/resource'),
-    "RoleList": () => import('@/views/system/role'),
-    "AccountList": () => import('@/views/system/account'),
-    "SyslogList": () => import('@/views/system/syslog/SyslogList.vue'),
-    "ConfigList": () => import('@/views/system/config/ConfigList.vue'),
-
-    // tag
-    "TagTreeList": () => import('@/views/ops/tag/TagTreeList.vue'),
-    "TeamList": () => import('@/views/ops/tag/TeamList.vue'),
-    // db
-    "DbList": () => import('@/views/ops/db/DbList.vue'),
-    "SqlExec": () => import('@/views/ops/db'),
-    // redis
-    "RedisList": () => import('@/views/ops/redis'),
-    "DataOperation": () => import('@/views/ops/redis/DataOperation.vue'),
-    // mongo
-    "MongoDataOp": () => import('@/views/ops/mongo/MongoDataOp.vue'),
-    // redis
-    "MongoList": () => import('@/views/ops/mongo/MongoList.vue'),
-}

mayfly_go_web/src/router/index.ts

@@ -1,14 +1,25 @@
 import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
-import { store } from '@/store/index.ts';
-import { getSession, clearSession } from '@/common/utils/storage.ts';
-import { templateResolve } from '@/common/utils/string.ts'
-import { NextLoading } from '@/common/utils/loading.ts';
-import { dynamicRoutes, staticRoutes, pathMatch } from './route.ts'
-import { imports } from './imports';
+import { getSession, clearSession } from '@/common/utils/storage';
+import { templateResolve } from '@/common/utils/string'
+import { NextLoading } from '@/common/utils/loading';
+import { dynamicRoutes, staticRoutes, pathMatch } from './route'
 import openApi from '@/common/openApi';
 import sockets from '@/common/sockets';
+import pinia from '@/store/index';
+import { useThemeConfig } from '@/store/themeConfig';
+import { useUserInfo } from '@/store/userInfo';
+import { useRoutesList } from '@/store/routesList';
+import { useKeepALiveNames } from '@/store/keepAliveNames';
+
+/**
+ * 获取目录下的 .vue、.tsx 全部文件
+ * @method import.meta.glob
+ * @link 参考：https://cn.vitejs.dev/guide/features.html#json
+ */
+const viewsModules: any = import.meta.glob('../views/**/*.{vue,tsx}');
+const dynamicViewsModules: Record<string, Function> = Object.assign({}, { ...viewsModules });
 
 // 添加静态路由
 const router = createRouter({
@@ -24,7 +35,7 @@ export function initAllFun() {
         // 无 token 停止执行下一步
         return false
     }
-    store.dispatch('userInfos/setUserInfos'); // 触发初始化用户信息
+    useUserInfo().setUserInfo({});
     router.addRoute(pathMatch); // 添加404界面
     resetRoute(); // 删除/重置路由
     // 添加动态路由
@@ -32,23 +43,20 @@ export function initAllFun() {
         router.addRoute((route as unknown) as RouteRecordRaw);
     });
     // 过滤权限菜单
-    store.dispatch('routesList/setRoutesList', setFilterMenuFun(dynamicRoutes[0].children, store.state.userInfos.userInfos.menus));
+    useRoutesList().setRoutesList(setFilterMenuFun(dynamicRoutes[0].children, useUserInfo().userInfo.menus))
 }
 
-// 后端控制路由：模拟执行路由数据初始化
-export function initBackEndControlRoutesFun() {
+// 后端控制路由：执行路由数据初始化
+export async function initBackEndControlRoutesFun() {
     NextLoading.start(); // 界面 loading 动画开始执行
     const token = getSession('token'); // 获取浏览器缓存 token 值
     if (!token) {
         // 无 token 停止执行下一步
         return false
     }
-    store.dispatch('userInfos/setUserInfos'); // 触发初始化用户信息
-    let menuRoute = getSession('menus')
-    if (!menuRoute) {
-        menuRoute = getBackEndControlRoutes(); // 获取路由
-        // const oldRoutes = res; // 获取接口原始路由（未处理component）
-    }
+    useUserInfo().setUserInfo({});
+    // 获取路由
+    let menuRoute = await getBackEndControlRoutes();
     dynamicRoutes[0].children = backEndRouterConverter(menuRoute); // 处理路由（component）
     // 添加404界面
     router.addRoute(pathMatch);
@@ -57,12 +65,20 @@ export function initBackEndControlRoutesFun() {
     formatTwoStageRoutes(formatFlatteningRoutes(dynamicRoutes)).forEach((route: any) => {
         router.addRoute((route as unknown) as RouteRecordRaw);
     });
-    store.dispatch('routesList/setRoutesList', dynamicRoutes[0].children);
+    useRoutesList().setRoutesList(dynamicRoutes[0].children)
 }
 
 // 后端控制路由，isRequestRoutes 为 true，则开启后端控制路由
-export function getBackEndControlRoutes() {
-    return openApi.getMenuRoute({});
+export async function getBackEndControlRoutes() {
+    try {
+        const menuAndPermission = await openApi.getPermissions.request();
+        // 赋值权限码，用于控制按钮等
+        useUserInfo().userInfo.permissions = menuAndPermission.permissions;
+        return menuAndPermission.menus;
+    } catch (e: any) {
+        console.error(e);
+        return []
+    }
 }
 
 // 后端控制路由，后端返回路由 转换为vue route
@@ -76,7 +92,7 @@ export function backEndRouterConverter(routes: any, parentPath: string = "/") {
         item.meta = JSON.parse(item.meta)
         // 将meta.comoponet 解析为route.component
         if (item.meta.component) {
-            item.component = imports[item.meta.component as string]
+            item.component = dynamicImport(dynamicViewsModules, item.meta.component)
             delete item.meta['component']
         }
         // route.path == resource.code
@@ -106,6 +122,27 @@ export function backEndRouterConverter(routes: any, parentPath: string = "/") {
     });
 }
 
+/**
+ * 后端路由 component 转换函数
+ * @param dynamicViewsModules 获取目录下的 .vue、.tsx 全部文件
+ * @param component 当前要处理项 component
+ * @returns 返回处理成函数后的 component
+ */
+export function dynamicImport(dynamicViewsModules: Record<string, Function>, component: string) {
+    const keys = Object.keys(dynamicViewsModules);
+    const matchKeys = keys.filter((key) => {
+        const k = key.replace(/..\/views|../, '');
+        return k.startsWith(`${component}`) || k.startsWith(`/${component}`);
+    });
+    if (matchKeys?.length === 1) {
+        const matchKey = matchKeys[0];
+        return dynamicViewsModules[matchKey];
+    }
+    if (matchKeys?.length > 1) {
+        return false;
+    }
+}
+
 // 多级嵌套数组处理成一维数组
 export function formatFlatteningRoutes(arr: any) {
     if (arr.length <= 0) return false;
@@ -134,7 +171,7 @@ export function formatTwoStageRoutes(arr: any) {
             }
         }
     });
-    store.dispatch('keepAliveNames/setCacheKeepAlive', cacheList);
+    useKeepALiveNames().setCacheKeepAlive(cacheList);
     return newArr;
 }
 
@@ -167,7 +204,7 @@ export function setFilterRoute(chil: any) {
     chil.forEach((route: any) => {
         // 如果路由需要拥有指定code才可访问，则校验该用户菜单是否存在该code
         if (route.meta.code) {
-            store.state.userInfos.userInfos.menus.forEach((m: any) => {
+            useUserInfo().userInfo.menus.forEach((m: any) => {
                 if (route.meta.code == m) {
                     filterRoute.push({ ...route })
                 }
@@ -188,33 +225,35 @@ export function setFilterRouteEnd() {
 
 // 删除/重置路由
 export function resetRoute() {
-    store.state.routesList.routesList.forEach((route: any) => {
+    useRoutesList().routesList.forEach((route: any) => {
         const { name } = route;
         router.hasRoute(name) && router.removeRoute(name);
     });
 }
 
-// 初始化方法执行
-const { isRequestRoutes } = store.state.themeConfig.themeConfig;
-if (!isRequestRoutes) {
-    // 未开启后端控制路由
-    initAllFun();
-} else if (isRequestRoutes) {
-    // 后端控制路由，isRequestRoutes 为 true，则开启后端控制路由
-    initBackEndControlRoutesFun();
+export async function initRouter() {
+    // 初始化方法执行
+    const { isRequestRoutes } = useThemeConfig(pinia).themeConfig;
+    if (!isRequestRoutes) {
+        // 未开启后端控制路由
+        initAllFun();
+    } else if (isRequestRoutes) {
+        // 后端控制路由，isRequestRoutes 为 true，则开启后端控制路由
+        await initBackEndControlRoutesFun();
+    }
 }
 
-
 let SysWs: any;
+let loadRouter = false;
 
 // 路由加载前
-router.beforeEach((to, from, next) => {
+router.beforeEach(async (to, from, next) => {
     NProgress.configure({ showSpinner: false });
     if (to.meta.title) NProgress.start();
 
     // 如果有标题参数，则再原标题后加上参数来区别
     if (to.meta.titleRename) {
-        to.meta.title = templateResolve(to.meta.title, to.query)
+        to.meta.title = templateResolve(to.meta.title as string, to.query)
     }
 
     const token = getSession('token');
@@ -245,7 +284,12 @@ router.beforeEach((to, from, next) => {
     if (!SysWs && to.path != '/machine/terminal') {
         SysWs = sockets.sysMsgSocket();
     }
-    if (store.state.routesList.routesList.length > 0) {
+    // 不存在路由（避免刷新页面找不到路由）并且未加载过（避免token过期，导致获取权限接口报权限不足，无限获取），则重新初始化路由
+    if (useRoutesList().routesList.length == 0 && !loadRouter) {
+        await initRouter();
+        loadRouter = true;
+        next({ path: to.path, query: to.query });
+    } else {
         next();
     }
 });

mayfly_go_web/src/router/route.ts

@@ -1,6 +1,5 @@
 import { RouteRecordRaw } from 'vue-router';
 import Layout from '@/views/layout/index.vue'
-// import RouterParent from '@/views/layout/routerView/parent.vue';
 
 // 定义动态路由
 export const dynamicRoutes = [
@@ -12,6 +11,7 @@ export const dynamicRoutes = [
         meta: {
             isKeepAlive: true,
         },
+        children: []
     //     children: [
     //         {
     //             path: '/home',

mayfly_go_web/src/store/index.ts

@@ -1,28 +1,8 @@
-import { InjectionKey } from 'vue';
-import { createStore, useStore as baseUseStore, Store } from 'vuex';
-import { RootStateTypes } from '@/store/interface/index';
-import themeConfig from '@/store/modules/themeConfig.ts';
-import routesList from '@/store/modules/routesList.ts';
-import keepAliveNames from '@/store/modules/keepAliveNames.ts';
-import userInfos from '@/store/modules/userInfos.ts';
-import sqlExecInfo from '@/store/modules/mysqlDbOptInfo.ts';
-import redisDbOptInfo  from '@/store/modules/redisDbOptInfo.ts';
-import mongoDbOptInfo from '@/store/modules/mongoDbOptInfo.ts';
+// https://pinia.vuejs.org/
+import { createPinia } from 'pinia';
 
-export const key: InjectionKey<Store<RootStateTypes>> = Symbol();
+// 创建
+const pinia = createPinia();
 
-export const store = createStore<RootStateTypes>({
-    modules: {
-        themeConfig,
-        routesList,
-        keepAliveNames,
-        userInfos,
-        sqlExecInfo,
-        redisDbOptInfo,
-        mongoDbOptInfo,
-    },
-});
-
-export function useStore() {
-    return baseUseStore(key);
-}
+// 导出
+export default pinia;

mayfly_go_web/src/store/keepAliveNames.ts

@@ -0,0 +1,35 @@
+import { defineStore } from 'pinia';
+
+/**
+ * 路由缓存列表
+ * @methods setCacheKeepAlive 设置要缓存的路由 names（开启 Tagsview）
+ * @methods addCachedView 添加要缓存的路由 names（关闭 Tagsview）
+ * @methods delCachedView 删除要缓存的路由 names（关闭 Tagsview）
+ * @methods delOthersCachedViews 右键菜单`关闭其它`，删除要缓存的路由 names（关闭 Tagsview）
+ * @methods delAllCachedViews 右键菜单`全部关闭`，删除要缓存的路由 names（关闭 Tagsview）
+ */
+export const useKeepALiveNames = defineStore('keepALiveNames', {
+	state: (): KeepAliveNamesState => ({
+		keepAliveNames: [],
+		cachedViews: [],
+	}),
+	actions: {
+		async setCacheKeepAlive(data: Array<string>) {
+			this.keepAliveNames = data;
+		},
+		async addCachedView(view: any) {
+			if (view.meta.isKeepAlive) this.cachedViews?.push(view.name);
+		},
+		async delCachedView(view: any) {
+			const index = this.cachedViews.indexOf(view.name);
+			index > -1 && this.cachedViews.splice(index, 1);
+		},
+		async delOthersCachedViews(view: any) {
+			if (view.meta.isKeepAlive) this.cachedViews = [view.name];
+			else this.cachedViews = [];
+		},
+		async delAllCachedViews() {
+			this.cachedViews = [];
+		},
+	},
+});

mayfly_go_web/src/store/modules/keepAliveNames.ts

@@ -1,24 +0,0 @@
-import { Module } from 'vuex';
-// 此处加上 `.ts` 后缀报错，具体原因不详
-import { KeepAliveNamesState, RootStateTypes } from '@/store/interface/index';
-
-const keepAliveNamesModule: Module<KeepAliveNamesState, RootStateTypes> = {
-    namespaced: true,
-    state: {
-        keepAliveNames: [],
-    },
-    mutations: {
-        // 设置路由缓存（name字段）
-        getCacheKeepAlive(state: any, data: Array<string>) {
-            state.keepAliveNames = data;
-        },
-    },
-    actions: {
-        // 设置路由缓存（name字段）
-        async setCacheKeepAlive({ commit }, data: Array<string>) {
-            commit('getCacheKeepAlive', data);
-        },
-    },
-};
-
-export default keepAliveNamesModule;

mayfly_go_web/src/store/modules/mongoDbOptInfo.ts

@@ -1,30 +0,0 @@
-import { Module } from 'vuex';
-// 此处加上 `.ts` 后缀报错，具体原因不详
-import {DbOptInfoState, RootStateTypes} from '@/store/interface';
-
-const mongoDbOptInfoModule: Module<DbOptInfoState, RootStateTypes> = {
-    namespaced: true,
-    state: {
-        dbOptInfo: {
-            tagPath: '',
-            dbId: 0,
-            db: '0',
-        },
-    },
-    mutations: {
-        // 设置用户信息
-        getMongoDbOptInfo(state: any, data: object) {
-            state.dbOptInfo = data;
-        },
-    },
-    actions: {
-        // 设置用户信息
-        async setMongoDbOptInfo({ commit }, data: object) {
-            if (data) {
-                commit('getMongoDbOptInfo', data);
-            }
-        },
-    },
-};
-
-export default mongoDbOptInfoModule;

mayfly_go_web/src/store/modules/mysqlDbOptInfo.ts

@@ -1,30 +0,0 @@
-import { Module } from 'vuex';
-// 此处加上 `.ts` 后缀报错，具体原因不详
-import { DbOptInfoState, RootStateTypes } from '@/store/interface';
-
-const sqlExecInfoModule: Module<DbOptInfoState, RootStateTypes> = {
-    namespaced: true,
-    state: {
-        dbOptInfo: {
-            tagPath: '',
-            dbId: 0,
-            db: '0',
-        }
-    },
-    mutations: {
-        // 设置用户信息
-        getSqlExecInfo(state: any, data: object) {
-            state.dbOptInfo = data;
-        },
-    },
-    actions: {
-        // 设置用户信息
-        async setSqlExecInfo({ commit }, data: object) {
-            if (data) {
-                commit('getSqlExecInfo', data);
-            }
-        },
-    },
-};
-
-export default sqlExecInfoModule;

mayfly_go_web/src/store/modules/redisDbOptInfo.ts

@@ -1,30 +0,0 @@
-import { Module } from 'vuex';
-// 此处加上 `.ts` 后缀报错，具体原因不详
-import {DbOptInfoState, RootStateTypes} from '@/store/interface';
-
-const redisDbOptInfoModule: Module<DbOptInfoState, RootStateTypes> = {
-    namespaced: true,
-    state: {
-        dbOptInfo: {
-            tagPath: '',
-            dbId: 0,
-            db: '0',
-        },
-    },
-    mutations: {
-        // 设置用户信息
-        getRedisDbOptInfo(state: any, data: object) {
-            state.dbOptInfo = data;
-        },
-    },
-    actions: {
-        // 设置用户信息
-        async setRedisDbOptInfo({ commit }, data: object) {
-            if (data) {
-                commit('getRedisDbOptInfo', data);
-            }
-        },
-    },
-};
-
-export default redisDbOptInfoModule;

mayfly_go_web/src/store/modules/routesList.ts

@@ -1,24 +0,0 @@
-import { Module } from 'vuex';
-// 此处加上 `.ts` 后缀报错，具体原因不详
-import { RoutesListState, RootStateTypes } from '@/store/interface/index';
-
-const routesListModule: Module<RoutesListState, RootStateTypes> = {
-    namespaced: true,
-    state: {
-        routesList: [],
-    },
-    mutations: {
-        // 设置路由，菜单中使用到
-        getRoutesList(state: any, data: Array<object>) {
-            state.routesList = data;
-        },
-    },
-    actions: {
-        // 设置路由，菜单中使用到
-        async setRoutesList({ commit }, data: any) {
-            commit('getRoutesList', data);
-        },
-    },
-};
-
-export default routesListModule;

mayfly_go_web/src/store/modules/userInfos.ts

@@ -1,29 +0,0 @@
-import { Module } from 'vuex';
-import { getSession } from '@/common/utils/storage.ts';
-// 此处加上 `.ts` 后缀报错，具体原因不详
-import { UserInfosState, RootStateTypes } from '@/store/interface/index';
-
-const userInfosModule: Module<UserInfosState, RootStateTypes> = {
-    namespaced: true,
-    state: {
-        userInfos: {},
-    },
-    mutations: {
-        // 设置用户信息
-        getUserInfos(state: any, data: object) {
-            state.userInfos = data;
-        },
-    },
-    actions: {
-        // 设置用户信息
-        async setUserInfos({ commit }, data: object) {
-            if (data) {
-                commit('getUserInfos', data);
-            } else {
-                if (getSession('userInfo')) commit('getUserInfos', getSession('userInfo'));
-            }
-        },
-    },
-};
-
-export default userInfosModule;

mayfly_go_web/src/store/routesList.ts

@@ -0,0 +1,18 @@
+import { defineStore } from 'pinia';
+
+/**
+ * 路由列表
+ * @methods setRoutesList 设置路由数据
+ * @methods setColumnsMenuHover 设置分栏布局菜单鼠标移入 boolean
+ * @methods setColumnsNavHover 设置分栏布局最左侧导航鼠标移入 boolean
+ */
+export const useRoutesList = defineStore('routesList', {
+	state: (): RoutesListState => ({
+		routesList: [],
+	}),
+	actions: {
+		async setRoutesList(data: Array<string>) {
+			this.routesList = data;
+		},
+	},
+});

mayfly_go_web/src/store/themeConfig.ts

@@ -1,10 +1,7 @@
-import { Module } from 'vuex';
-// 此处加上 `.ts` 后缀报错，具体原因不详
-import { ThemeConfigState, RootStateTypes } from '@/store/interface/index';
+import { defineStore } from 'pinia';
 
-const themeConfigModule: Module<ThemeConfigState, RootStateTypes> = {
-    namespaced: true,
-    state: {
+export const useThemeConfig = defineStore('themeConfig', {
+    state: (): ThemeConfigState => ({
         themeConfig: {
             // 是否开启布局配置抽屉
             isDrawer: false,
@@ -73,12 +70,13 @@ const themeConfigModule: Module<ThemeConfigState, RootStateTypes> = {
             isBreadcrumb: true,
             // 是否开启 Tagsview
             isTagsview: true,
+            isShareTagsView: false,
             // 是否开启 Breadcrumb 图标
             isBreadcrumbIcon: true,
             // 是否开启 Tagsview 图标
             isTagsviewIcon: true,
             // 是否开启 TagsView 缓存
-            isCacheTagsView: false,
+            isCacheTagsView: true,
             // 是否开启 TagsView 拖拽
             isSortableTagsView: true,
             // 是否开启 Footer 底部版权信息
@@ -94,8 +92,8 @@ const themeConfigModule: Module<ThemeConfigState, RootStateTypes> = {
 
             /* 其它设置
             ------------------------------- */
-            // 默认 Tagsview 风格，可选 1、 tags-style-one 2、 tags-style-two 3、 tags-style-three 4、 tags-style-four
-            tagsStyle: 'tags-style-one',
+            // 默认 Tagsview 风格，可选 1、 tags-style-one 2、 tags-style-two 3、 tags-style-three
+            tagsStyle: 'tags-style-three',
             // 默认主页面切换动画，可选 1、 slide-right 2、 slide-left 3、 opacitys
             animation: 'slide-right',
             // 默认分栏高亮风格，可选 1、 圆角 columns-round 2、 卡片 columns-card
@@ -107,11 +105,11 @@ const themeConfigModule: Module<ThemeConfigState, RootStateTypes> = {
             layout: 'classic',
 
             // ssh终端字体颜色
-            terminalForeground: '#50583E',
+            terminalForeground: '#C5C8C6',
             // ssh终端背景色
-            terminalBackground: '#FFFFDD',
+            terminalBackground: '#121212',
             // ssh终端cursor色
-            terminalCursor: '#979b7c',
+            terminalCursor: '#F0CC09',
             terminalFontSize: 14,
             terminalFontWeight: 'bold',
 
@@ -135,19 +133,11 @@ const themeConfigModule: Module<ThemeConfigState, RootStateTypes> = {
             // 默认全局组件大小，可选值"<|large|default|small>"，默认 ''
             globalComponentSize: '',
         },
-    },
-    mutations: {
-        // 设置布局配置
-        getThemeConfig(state: any, data: object) {
-            state.themeConfig = data;
-        },
-    },
+    }),
     actions: {
         // 设置布局配置
-        setThemeConfig({ commit }, data: object) {
-            commit('getThemeConfig', data);
+        setThemeConfig(data: ThemeConfigState) {
+            this.themeConfig = data.themeConfig;
         },
     },
-};
-
-export default themeConfigModule;
+})

mayfly_go_web/src/store/userInfo.ts

@@ -0,0 +1,19 @@
+import { defineStore } from 'pinia';
+import { getSession } from '@/common/utils/storage';
+
+export const useUserInfo = defineStore('userInfo', {
+    state: (): UserInfoState => ({
+        userInfo: {},
+    }),
+    actions: {
+        // 设置用户信息
+        async setUserInfo(data: object) {
+            const ui = getSession('userInfo')
+			if (ui) {
+				this.userInfo = ui;
+			} else {
+				this.userInfo = data;
+			}
+        },
+    }
+})

mayfly_go_web/src/theme/app.scss

@@ -1,225 +1,261 @@
 /* 初始化样式
 ------------------------------- */
 * {
-	margin: 0;
-	padding: 0;
-	box-sizing: border-box;
-	outline: none !important;
+    margin: 0;
+    padding: 0;
+    box-sizing: border-box;
+    outline: none !important;
 }
 
 html,
 body,
 #app {
-	margin: 0;
-	padding: 0;
-	width: 100%;
-	height: 100%;
-	font-family: 'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif;
-	font-weight: 450;
-	-webkit-font-smoothing: antialiased;
-	-webkit-tap-highlight-color: transparent;
-	background-color: #f8f8f8;
-	font-size: 14px;
-	overflow: hidden;
-	position: relative;
+    margin: 0;
+    padding: 0;
+    width: 100%;
+    height: 100%;
+    font-family: 'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif;
+    font-weight: 450;
+    -webkit-font-smoothing: antialiased;
+    -webkit-tap-highlight-color: transparent;
+    background-color: #f8f8f8;
+    font-size: 14px;
+    overflow: hidden;
+    position: relative;
 }
 
 /* 主布局样式
 ------------------------------- */
 .layout-container {
-	width: 100%;
-	height: 100%;
-	.layout-aside {
-		background: var(--bg-menuBar);
-		box-shadow: 2px 0 6px rgb(0 21 41 / 1%);
-		height: inherit;
-		position: relative;
-		z-index: 1;
-		display: flex;
-		flex-direction: column;
-		overflow-x: hidden !important;
-		.el-scrollbar__view {
-			overflow: hidden;
-		}
-	}
-	.layout-header {
-		padding: 0 !important;
-	}
-	.layout-main {
-		padding: 0 !important;
-		overflow: hidden;
-		width: 100%;
-		background-color: #f8f8f8;
-	}
-	.el-scrollbar {
-		width: 100%;
-	}
-	.layout-view-bg-white {
-		background: white;
-		width: 100%;
-		height: 100%;
-		border-radius: 4px;
-		border: 1px solid #ebeef5;
-	}
-	.layout-el-aside-br-color {
-		border-right: 1px solid rgb(238, 238, 238);
-	}
-	.layout-aside-width-default {
-		width: 220px !important;
-		transition: width 0.3s ease;
-	}
-	.layout-aside-width64 {
-		width: 64px !important;
-		transition: width 0.3s ease;
-	}
-	.layout-aside-width1 {
-		width: 1px !important;
-		transition: width 0.3s ease;
-	}
-	.layout-scrollbar {
-		@extend .el-scrollbar;
-		padding: 10px;
-	}
-	.layout-mian-height-50 {
-		height: calc(100vh - 50px);
-	}
-	.layout-columns-warp {
-		flex: 1;
-		display: flex;
-		overflow: hidden;
-	}
-	.layout-hide {
-		display: none;
-	}
+    width: 100%;
+    height: 100%;
+
+    .layout-aside {
+        background: var(--bg-menuBar);
+        box-shadow: 2px 0 6px rgb(0 21 41 / 1%);
+        height: inherit;
+        position: relative;
+        z-index: 1;
+        display: flex;
+        flex-direction: column;
+        overflow-x: hidden !important;
+
+        .el-scrollbar__view {
+            overflow: hidden;
+        }
+    }
+
+    .layout-header {
+        padding: 0 !important;
+    }
+
+    .layout-main {
+        padding: 0 !important;
+        overflow: hidden;
+        width: 100%;
+        background-color: #f8f8f8;
+    }
+
+    .el-scrollbar {
+        width: 100%;
+    }
+
+    .layout-view-bg-white {
+        background: white;
+        width: 100%;
+        height: 100%;
+        border-radius: 4px;
+        border: 1px solid #ebeef5;
+    }
+
+    .layout-el-aside-br-color {
+        border-right: 1px solid rgb(238, 238, 238);
+    }
+
+    .layout-aside-width-default {
+        width: 220px !important;
+        transition: width 0.3s ease;
+    }
+
+    .layout-aside-width64 {
+        width: 64px !important;
+        transition: width 0.3s ease;
+    }
+
+    .layout-aside-width1 {
+        width: 1px !important;
+        transition: width 0.3s ease;
+    }
+
+    .layout-scrollbar {
+        @extend .el-scrollbar;
+        padding: 10px;
+    }
+
+    .layout-mian-height-50 {
+        height: calc(100vh - 50px);
+    }
+
+    .layout-columns-warp {
+        flex: 1;
+        display: flex;
+        overflow: hidden;
+    }
+
+    .layout-hide {
+        display: none;
+    }
 }
 
 /* element plus 全局样式
 ------------------------------- */
 .layout-breadcrumb-seting {
-	.el-drawer__header {
-		padding: 0 15px !important;
-		height: 50px;
-		display: flex;
-		align-items: center;
-		margin-bottom: 0 !important;
-		border-bottom: 1px solid rgb(230, 230, 230);
-	}
-	.el-divider {
-		background-color: rgb(230, 230, 230);
-	}
+    .el-drawer__header {
+        padding: 0 15px !important;
+        height: 50px;
+        display: flex;
+        align-items: center;
+        margin-bottom: 0 !important;
+        border-bottom: 1px solid rgb(230, 230, 230);
+    }
+
+    .el-divider {
+        background-color: rgb(230, 230, 230);
+    }
 }
 
 /* nprogress 进度条跟随主题颜色
 ------------------------------- */
 #nprogress {
-	.bar {
-		background: var(--color-primary) !important;
-		z-index: 9999999 !important;
-	}
+    .bar {
+        background: var(--color-primary) !important;
+        z-index: 9999999 !important;
+    }
 }
 
 /* flex 弹性布局
 ------------------------------- */
 .flex {
-	display: flex;
+    display: flex;
 }
+
 .flex-auto {
-	flex: 1;
+    flex: 1;
 }
+
 .flex-center {
-	@extend .flex;
-	flex-direction: column;
-	width: 100%;
-	overflow: hidden;
+    @extend .flex;
+    flex-direction: column;
+    width: 100%;
+    overflow: hidden;
 }
+
 .flex-margin {
-	margin: auto;
+    margin: auto;
 }
+
 .flex-warp {
-	display: flex;
-	flex-wrap: wrap;
-	align-content: flex-start;
-	margin: 0 -5px;
-	.flex-warp-item {
-		padding: 5px;
-		.flex-warp-item-box {
-			width: 100%;
-			height: 100%;
-		}
-	}
+    display: flex;
+    flex-wrap: wrap;
+    align-content: flex-start;
+    margin: 0 -5px;
+
+    .flex-warp-item {
+        padding: 5px;
+
+        .flex-warp-item-box {
+            width: 100%;
+            height: 100%;
+        }
+    }
 }
 
 /* 宽高 100%
 ------------------------------- */
 .w100 {
-	width: 100% !important;
+    width: 100% !important;
 }
+
 .h100 {
-	height: 100% !important;
+    height: 100% !important;
 }
+
 .vh100 {
-	height: 100vh !important;
+    height: 100vh !important;
 }
+
 .max100vh {
-	max-height: 100vh !important;
+    max-height: 100vh !important;
 }
+
 .min100vh {
-	min-height: 100vh !important;
+    min-height: 100vh !important;
 }
 
 /* 颜色值
 ------------------------------- */
 .color-primary {
-	color: var(--color-primary);
+    color: var(--color-primary);
 }
+
 .color-success {
-	color: var(--color-success);
+    color: var(--color-success);
 }
+
 .color-warning {
-	color: var(--color-warning);
+    color: var(--color-warning);
 }
+
 .color-danger {
-	color: var(--color-danger);
+    color: var(--color-danger);
 }
+
 .color-info {
-	color: var(--color-info);
+    color: var(--color-info);
 }
 
 /* 字体大小全局样式
 ------------------------------- */
 @for $i from 10 through 32 {
-	.font#{$i} {
-		font-size: #{$i}px !important;
-	}
+    .font#{$i} {
+        font-size: #{$i}px !important;
+    }
 }
 
 /* 外边距、内边距全局样式
 ------------------------------- */
 @for $i from 1 through 35 {
-	.mt#{$i} {
-		margin-top: #{$i}px !important;
-	}
-	.mr#{$i} {
-		margin-right: #{$i}px !important;
-	}
-	.mb#{$i} {
-		margin-bottom: #{$i}px !important;
-	}
-	.ml#{$i} {
-		margin-left: #{$i}px !important;
-	}
-	.pt#{$i} {
-		padding-top: #{$i}px !important;
-	}
-	.pr#{$i} {
-		padding-right: #{$i}px !important;
-	}
-	.pb#{$i} {
-		padding-bottom: #{$i}px !important;
-	}
-	.pl#{$i} {
-		padding-left: #{$i}px !important;
-	}
+    .mt#{$i} {
+        margin-top: #{$i}px !important;
+    }
+
+    .mr#{$i} {
+        margin-right: #{$i}px !important;
+    }
+
+    .mb#{$i} {
+        margin-bottom: #{$i}px !important;
+    }
+
+    .ml#{$i} {
+        margin-left: #{$i}px !important;
+    }
+
+    .pt#{$i} {
+        padding-top: #{$i}px !important;
+    }
+
+    .pr#{$i} {
+        padding-right: #{$i}px !important;
+    }
+
+    .pb#{$i} {
+        padding-bottom: #{$i}px !important;
+    }
+
+    .pl#{$i} {
+        padding-left: #{$i}px !important;
+    }
 }
 
 
@@ -249,15 +285,22 @@ body,
 .el-menu .fa:not(.is-children) {
     font-size: 14px;
 }
-.gray-mode{
+
+.gray-mode {
     filter: grayscale(100%);
 }
 
 
-.fade-enter-active, .fade-leave-active {
+.fade-enter-active,
+.fade-leave-active {
     transition: opacity .2s ease-in-out;
 }
-.fade-enter, .fade-leave-to /* .fade-leave-active below version 2.1.8 */ {
+
+.fade-enter,
+.fade-leave-to
+
+/* .fade-leave-active below version 2.1.8 */
+    {
     opacity: 0;
 }
 
@@ -270,7 +313,7 @@ body,
     -webkit-user-select: none;
     -ms-user-select: none;
     user-select: none;
-  }
+}
 
 .toolbar {
     width: 100%;
@@ -285,6 +328,10 @@ body,
     float: left;
 }
 
+.fr {
+    float: right;
+}
+
 .search-form {
     .el-form-item {
         margin-bottom: 3px;

mayfly_go_web/src/theme/iconSelector.scss

@@ -3,85 +3,29 @@
 .icon-selector-popper {
 	padding: 0 !important;
 	.icon-selector-warp {
+		height: 260px;
+		overflow: hidden;
+		position: relative;
 		.icon-selector-warp-title {
+			position: absolute;
 			height: 40px;
 			line-height: 40px;
+			left: 15px;
+		}
+		.el-tabs__header {
+			display: flex;
+			justify-content: flex-end;
 			padding: 0 15px;
-		}
-		.icon-selector-warp-row {
-			max-height: 260px;
-			overflow-y: auto;
-			padding: 15px 15px 5px;
-			border-top: 1px solid #ebeef5;
-			.ele-col:nth-last-child(1),
-			.ele-col:nth-last-child(2) {
-				display: none;
-			}
-			.awe-col:nth-child(-n + 24) {
-				display: none;
-			}
-			.icon-selector-warp-item {
-				display: flex;
-				border: 1px solid #ebeef5;
-				padding: 10px;
-				border-radius: 5px;
-				margin-bottom: 10px;
-				transition: all 0.3s ease;
-				.icon-selector-warp-item-value {
-					transition: all 0.3s ease;
-					i {
-						font-size: 20px;
-						color: #606266;
-					}
+			border-bottom: 1px solid var(--el-border-color-light);
+			margin: 0 !important;
+			.el-tabs__nav-wrap {
+				&::after {
+					height: 0 !important;
 				}
-				&:hover {
-					border: 1px solid var(--color-primary);
-					cursor: pointer;
-					transition: all 0.3s ease;
-					.icon-selector-warp-item-value {
-						i {
-							color: var(--color-primary);
-							transition: all 0.3s ease;
-						}
-					}
-				}
-			}
-			.icon-selector-active {
-				border: 1px solid var(--color-primary);
-				.icon-selector-warp-item-value {
-					i {
-						color: var(--color-primary);
-					}
-				}
-			}
-		}
-		.icon-selector-all {
-			.el-input {
-				padding: 0 15px;
-				margin-bottom: 10px;
-			}
-			&-tabs {
-				display: flex;
-				height: 30px;
-				line-height: 30px;
-				padding: 0 15px;
-				margin-bottom: 5px;
-				&-item {
-					flex: 1;
-					text-align: center;
-					cursor: pointer;
-					&:hover {
-						color: var(--color-primary);
-					}
-				}
-				&-active {
-					background: var(--color-primary);
-					border-radius: 5px;
-					.label {
-						color: #ffffff;
-					}
+				.el-tabs__item {
+					padding: 0 5px !important;
 				}
 			}
 		}
 	}
-}
+}

mayfly_go_web/src/types/env.d.ts

@@ -0,0 +1,5 @@
+declare module '*.vue' {
+	import type { DefineComponent } from 'vue';
+	const component: DefineComponent<{}, {}, any>;
+	export default component;
+}

mayfly_go_web/src/types/pinia.d.ts

@@ -1,7 +1,8 @@
-// 接口类型声明
+declare interface UserInfoState<T = any> {
+    userInfo: any
+}
 
-// 布局配置
-export interface ThemeConfigState {
+declare interface ThemeConfigState {
     themeConfig: {
         isDrawer: boolean;
         primary: string;
@@ -30,6 +31,7 @@ export interface ThemeConfigState {
         isShowLogoChange: boolean;
         isBreadcrumb: boolean;
         isTagsview: boolean;
+        isShareTagsView: boolean;
         isBreadcrumbIcon: boolean;
         isTagsviewIcon: boolean;
         isCacheTagsView: boolean;
@@ -52,48 +54,24 @@ export interface ThemeConfigState {
         terminalBackground: string;
         terminalCursor: string;
         terminalFontSize: number;
-        terminalFontWeight: string;
+        terminalFontWeight: string | any;
         editorTheme: string;
     };
 }
 
+// TagsView 路由列表
+declare interface TagsViewRoutesState<T = any> {
+	tagsViewRoutes: T[];
+	isTagsViewCurrenFull: Boolean;
+}
+
 // 路由列表
-export interface RoutesListState {
-    routesList: Array<object>;
+declare interface RoutesListState {
+    routesList: T[];
 }
 
 // 路由缓存列表
-export interface KeepAliveNamesState {
-    keepAliveNames: Array<string>;
-}
-
-// 用户信息
-export interface UserInfosState {
-    userInfos: object;
-}
-
-// 数据操作信息
-export interface DbOptInfoState {
-    dbOptInfo: {
-        tagPath?: string,
-        dbId?: number,
-        db?: string,
-    }
-}
-
-// 后端返回原始路由(未处理时)
-// export interface RequestOldRoutesState {
-//     requestOldRoutes: Array<object>;
-// }
-
-// 主接口(顶级类型声明)
-export interface RootStateTypes {
-    themeConfig: ThemeConfigState;
-    routesList: RoutesListState;
-    keepAliveNames: KeepAliveNamesState;
-    userInfos: UserInfosState;
-    sqlExecInfo: DbOptInfoState;
-    redisDbOptInfo: DbOptInfoState;
-    mongoDbOptInfo: DbOptInfoState;
-    // requestOldRoutes: RequestOldRoutesState;
-}
+declare interface KeepAliveNamesState {
+    keepAliveNames: string[];
+    cachedViews: string[];
+}

mayfly_go_web/src/types/shim.d.ts

@@ -1,21 +1,14 @@
 /* eslint-disable */
 import {IDisposable} from 'monaco-editor';
-
-declare module '*.vue' {
-	import type { DefineComponent } from 'vue';
-	const component: DefineComponent<{}, {}, any>;
-	export default component;
-}
-
-
 declare global {
 	interface Window {
 		completionItemProvider?: IDisposable | undefined;
 	}
 }
 
-
+// 申明外部 npm 插件模块
 declare module 'sql-formatter';
 declare module 'jsoneditor';
 declare module 'asciinema-player';
 declare module 'monaco-editor';
+declare module 'vue-grid-layout';

mayfly_go_web/src/types/source.d.ts

@@ -1,6 +1,7 @@
+// 声明一个模块，防止引入文件时报错
 declare module '*.json';
 declare module '*.png';
 declare module '*.jpg';
 declare module '*.scss';
 declare module '*.ts';
-declare module '*.js';
+declare module '*.js';

mayfly_go_web/src/views/home/Home.vue

@@ -4,10 +4,10 @@
             <el-col :sm="6" class="mb15">
                 <div @click="toPage({ id: 'personal' })" class="home-card-item home-card-first">
                     <div class="flex-margin flex">
-                        <img :src="getUserInfos.photo" />
+                        <img :src="userInfo.photo" />
                         <div class="home-card-first-right ml15">
                             <div class="flex-margin">
-                                <div class="home-card-first-right-title">{{ `${currentTime}, ${getUserInfos.username}`
+                                <div class="home-card-first-right-title">{{ `${currentTime}, ${userInfo.username}`
                                 }}</div>
                             </div>
                         </div>
@@ -29,15 +29,17 @@
 
 <script lang="ts" setup>
 import { toRefs, reactive, onMounted, nextTick, computed } from 'vue';
-import { useStore } from '@/store/index.ts';
 // import * as echarts from 'echarts';
 import { CountUp } from 'countup.js';
-import { formatAxis } from '@/common/utils/formatTime.ts';
+import { formatAxis } from '@/common/utils/format.ts';
 import { indexApi } from './api';
 import { useRouter } from 'vue-router';
+import { storeToRefs } from 'pinia';
+import { useUserInfo } from '@/store/userInfo';
 
 const router = useRouter();
-const store = useStore();
+const { userInfo } = storeToRefs(useUserInfo());
+
 const state = reactive({
     topCardItemList: [
         {
@@ -114,11 +116,6 @@ onMounted(() => {
     // initHomeLaboratory();
     // initHomeOvertime();
 });
-
-// 获取用户信息 vuex
-const getUserInfos = computed(() => {
-    return store.state.userInfos.userInfos;
-});
 </script>
 
 <style scoped lang="scss">

mayfly_go_web/src/views/home/api.ts

@@ -1,6 +1,6 @@
 import Api from '@/common/Api';
 
 export const indexApi = {
-    getIndexCount: Api.create("/common/index/count", 'get'),
+    getIndexCount: Api.newGet("/common/index/count"),
 }
 

mayfly_go_web/src/views/layout/component/aside.vue

@@ -1,132 +1,131 @@
 <template>
-    <el-aside class="layout-aside" :class="setCollapseWidth" v-if="clientWidth > 1000">
+    <el-aside class="layout-aside" :class="setCollapseWidth" v-if="state.clientWidth > 1000">
         <Logo v-if="setShowLogo" />
         <el-scrollbar class="flex-auto" ref="layoutAsideScrollbarRef">
-            <Vertical :menuList="menuList" :class="setCollapseWidth" />
+            <Vertical :menuList="state.menuList" :class="setCollapseWidth" />
         </el-scrollbar>
     </el-aside>
-    <el-drawer v-model="getThemeConfig.isCollapse" :with-header="false" direction="ltr" size="220px" v-else>
+    <el-drawer v-model="themeConfig.isCollapse" :with-header="false" direction="ltr" size="220px" v-else>
         <el-aside class="layout-aside w100 h100">
             <Logo v-if="setShowLogo" />
             <el-scrollbar class="flex-auto" ref="layoutAsideScrollbarRef">
-                <Vertical :menuList="menuList" />
+                <Vertical :menuList="state.menuList" />
             </el-scrollbar>
         </el-aside>
     </el-drawer>
 </template>
 
-<script lang="ts">
-import { toRefs, reactive, computed, watch, getCurrentInstance, onBeforeMount, onUnmounted } from 'vue';
-import { useStore } from '@/store/index.ts';
+<script lang="ts" setup name="layoutAside">
+import { reactive, computed, watch, getCurrentInstance, onBeforeMount, onUnmounted } from 'vue';
+import pinia from '@/store/index';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '@/store/themeConfig';
+import { useRoutesList } from '@/store/routesList';
 import Logo from '@/views/layout/logo/index.vue';
 import Vertical from '@/views/layout/navMenu/vertical.vue';
-export default {
-    name: 'layoutAside',
-    components: { Logo, Vertical },
-    setup() {
-        const { proxy } = getCurrentInstance() as any;
-        const store = useStore();
-        const state: any = reactive({
-            menuList: [],
-            clientWidth: '',
-        });
-        // 获取布局配置信息
-        const getThemeConfig = computed(() => {
-            return store.state.themeConfig.themeConfig;
-        });
-        // 设置菜单展开/收起时的宽度
-        const setCollapseWidth = computed(() => {
-            let { layout, isCollapse, menuBar } = store.state.themeConfig.themeConfig;
-            let asideBrColor =
-                menuBar === '#FFFFFF' || menuBar === '#FFF' || menuBar === '#fff' || menuBar === '#ffffff' ? 'layout-el-aside-br-color' : '';
-            if (layout === 'columns') {
-                // 分栏布局，菜单收起时宽度给 1px
-                if (isCollapse) {
-                    return ['layout-aside-width1', asideBrColor];
-                } else {
-                    return ['layout-aside-width-default', asideBrColor];
-                }
-            } else {
-                // 其它布局给 64px
-                if (isCollapse) {
-                    return ['layout-aside-width64', asideBrColor];
-                } else {
-                    return ['layout-aside-width-default', asideBrColor];
-                }
-            }
-        });
-        // 设置显示/隐藏 logo
-        const setShowLogo = computed(() => {
-            let { layout, isShowLogo } = store.state.themeConfig.themeConfig;
-            return (isShowLogo && layout === 'defaults') || (isShowLogo && layout === 'columns');
-        });
-        // 设置/过滤路由（非静态路由/是否显示在菜单中）
-        const setFilterRoutes = () => {
-            if (store.state.themeConfig.themeConfig.layout === 'columns') return false;
-            state.menuList = filterRoutesFun(store.state.routesList.routesList);
-        };
-        // 路由过滤递归函数
-        const filterRoutesFun = (arr: Array<object>) => {
-            return arr
-                .filter((item: any) => !item.meta.isHide)
-                .map((item: any) => {
-                    item = Object.assign({}, item);
-                    if (item.children) item.children = filterRoutesFun(item.children);
-                    return item;
-                });
-        };
-        // 设置菜单导航是否固定（移动端）
-        const initMenuFixed = (clientWidth: number) => {
-            state.clientWidth = clientWidth;
-        };
-        // 监听 themeConfig 配置文件的变化，更新菜单 el-scrollbar 的高度
-        watch(store.state.themeConfig.themeConfig, (val) => {
-            if (val.isShowLogoChange !== val.isShowLogo) {
-                if (!proxy.$refs.layoutAsideScrollbarRef) return false;
-                proxy.$refs.layoutAsideScrollbarRef.update();
-            }
-        });
-        // 监听路由的变化，动态赋值给菜单中
-        watch(store.state, (val) => {
-            if (val.routesList.routesList.length === state.menuList.length) return false;
-            let { layout, isClassicSplitMenu } = val.themeConfig.themeConfig;
-            if (layout === 'classic' && isClassicSplitMenu) return false;
-            setFilterRoutes();
-        });
-        // 页面加载前
-        onBeforeMount(() => {
-            initMenuFixed(document.body.clientWidth);
-            setFilterRoutes();
-            proxy.mittBus.on('setSendColumnsChildren', (res: any) => {
-                state.menuList = res.children;
-            });
-            proxy.mittBus.on('setSendClassicChildren', (res: any) => {
-                let { layout, isClassicSplitMenu } = store.state.themeConfig.themeConfig;
-                if (layout === 'classic' && isClassicSplitMenu) {
-                    state.menuList = [];
-                    state.menuList = res.children;
-                }
-            });
-            proxy.mittBus.on('getBreadcrumbIndexSetFilterRoutes', () => {
-                setFilterRoutes();
-            });
-            proxy.mittBus.on('layoutMobileResize', (res: any) => {
-                initMenuFixed(res.clientWidth);
-            });
-        });
-        // 页面卸载时
-        onUnmounted(() => {
-            proxy.mittBus.off('setSendColumnsChildren');
-            proxy.mittBus.off('setSendClassicChildren');
-            proxy.mittBus.off('getBreadcrumbIndexSetFilterRoutes');
-            proxy.mittBus.off('layoutMobileResize');
-        });
-        return {
-            setCollapseWidth,
-            setShowLogo,
-            getThemeConfig,
-            ...toRefs(state),
-        };
-    },
+import mittBus from '@/common/utils/mitt';
+
+const { proxy } = getCurrentInstance() as any;
+
+const { themeConfig } = storeToRefs(useThemeConfig());
+const { routesList } = storeToRefs(useRoutesList());
+
+const state: any = reactive({
+    menuList: [],
+    clientWidth: '',
+});
+
+// 设置菜单展开/收起时的宽度
+const setCollapseWidth = computed(() => {
+    let { layout, isCollapse, menuBar } = themeConfig.value;
+    let asideBrColor =
+        menuBar === '#FFFFFF' || menuBar === '#FFF' || menuBar === '#fff' || menuBar === '#ffffff' ? 'layout-el-aside-br-color' : '';
+    if (layout === 'columns') {
+        // 分栏布局，菜单收起时宽度给 1px
+        if (isCollapse) {
+            return ['layout-aside-width1', asideBrColor];
+        } else {
+            return ['layout-aside-width-default', asideBrColor];
+        }
+    } else {
+        // 其它布局给 64px
+        if (isCollapse) {
+            return ['layout-aside-width64', asideBrColor];
+        } else {
+            return ['layout-aside-width-default', asideBrColor];
+        }
+    }
+});
+
+// 设置显示/隐藏 logo
+const setShowLogo = computed(() => {
+    let { layout, isShowLogo } = themeConfig.value;
+    return (isShowLogo && layout === 'defaults') || (isShowLogo && layout === 'columns');
+});
+
+// 设置/过滤路由（非静态路由/是否显示在菜单中）
+const setFilterRoutes = () => {
+    if (themeConfig.value.layout === 'columns') return false;
+    state.menuList = filterRoutesFun(routesList.value);
 };
+
+// 路由过滤递归函数
+const filterRoutesFun = (arr: Array<object>) => {
+    return arr
+        .filter((item: any) => !item.meta.isHide)
+        .map((item: any) => {
+            item = Object.assign({}, item);
+            if (item.children) item.children = filterRoutesFun(item.children);
+            return item;
+        });
+};
+// 设置菜单导航是否固定（移动端）
+const initMenuFixed = (clientWidth: number) => {
+    state.clientWidth = clientWidth;
+};
+
+// 监听 themeConfig 配置文件的变化，更新菜单 el-scrollbar 的高度
+watch(themeConfig.value, (val) => {
+    if (val.isShowLogoChange !== val.isShowLogo) {
+        if (!proxy.$refs.layoutAsideScrollbarRef) return false;
+        proxy.$refs.layoutAsideScrollbarRef.update();
+    }
+});
+
+// 监听路由的变化，动态赋值给菜单中
+watch(pinia.state, (val) => {
+    if (val.routesList.routesList.length === state.menuList.length) return false;
+    let { layout, isClassicSplitMenu } = val.themeConfig.themeConfig;
+    if (layout === 'classic' && isClassicSplitMenu) return false;
+    setFilterRoutes();
+});
+
+// 页面加载前
+onBeforeMount(() => {
+    initMenuFixed(document.body.clientWidth);
+    setFilterRoutes();
+    mittBus.on('setSendColumnsChildren', (res: any) => {
+        state.menuList = res.children;
+    });
+    mittBus.on('setSendClassicChildren', (res: any) => {
+        let { layout, isClassicSplitMenu } = themeConfig.value;
+        if (layout === 'classic' && isClassicSplitMenu) {
+            state.menuList = [];
+            state.menuList = res.children;
+        }
+    });
+    mittBus.on('getBreadcrumbIndexSetFilterRoutes', () => {
+        setFilterRoutes();
+    });
+    mittBus.on('layoutMobileResize', (res: any) => {
+        initMenuFixed(res.clientWidth);
+    });
+});
+// 页面卸载时
+onUnmounted(() => {
+    mittBus.off('setSendColumnsChildren');
+    mittBus.off('setSendClassicChildren');
+    mittBus.off('getBreadcrumbIndexSetFilterRoutes');
+    mittBus.off('layoutMobileResize');
+});
 </script>

mayfly_go_web/src/views/layout/component/columnsAside.vue

@@ -2,19 +2,12 @@
     <div class="layout-columns-aside">
         <el-scrollbar>
             <ul>
-                <li
-                    v-for="(v, k) in columnsAsideList"
-                    :key="k"
-                    @click="onColumnsAsideMenuClick(v, k)"
-                    :ref="
-                        (el) => {
-                            if (el) columnsAsideOffsetTopRefs[k] = el;
-                        }
-                    "
-                    :class="{ 'layout-columns-active': liIndex === k }"
-                    :title="v.meta.title"
-                >
-                    <div class="layout-columns-aside-li-box" v-if="!v.meta.link || (v.meta.link && v.meta.isIframe)">
+                <li v-for="(v, k) in state.columnsAsideList" :key="k" @click="onColumnsAsideMenuClick(v, k)" :ref="
+                    (el) => {
+                        if (el) columnsAsideOffsetTopRefs[k] = el;
+                    }
+                " :class="{ 'layout-columns-active': state.liIndex === k }" :title="v.meta.title">
+                    <div class="layout-columns-aside-li-box" v-if="!v.meta.link || (v.meta.link && v.meta.linkType == 1)">
                         <i :class="v.meta.icon"></i>
                         <div class="layout-columns-aside-li-box-title font12">
                             {{ v.meta.title && v.meta.title.length >= 4 ? v.meta.title.substr(0, 4) : v.meta.title }}
@@ -35,114 +28,103 @@
     </div>
 </template>
 
-<script lang="ts">
-import { reactive, toRefs, ref, computed, onMounted, nextTick, getCurrentInstance, watch } from 'vue';
+<script lang="ts" setup name="layoutColumnsAside">
+import { reactive, ref, computed, onMounted, nextTick, getCurrentInstance, watch } from 'vue';
 import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
-import { useStore } from '@/store/index.ts';
-export default {
-    name: 'layoutColumnsAside',
-    setup() {
-        const columnsAsideOffsetTopRefs: any = ref([]);
-        const columnsAsideActiveRef = ref();
-        const { proxy } = getCurrentInstance() as any;
-        const store = useStore();
-        const route = useRoute();
-        const router = useRouter();
-        const state: any = reactive({
-            columnsAsideList: [],
-            liIndex: 0,
-            difference: 0,
-            routeSplit: [],
-        });
-        // 设置高亮样式
-        const setColumnsAsideStyle = computed(() => {
-            return store.state.themeConfig.themeConfig.columnsAsideStyle;
-        });
-        // 设置菜单高亮位置移动
-        const setColumnsAsideMove = (k: number) => {
-            state.liIndex = k;
-            columnsAsideActiveRef.value.style.top = `${columnsAsideOffsetTopRefs.value[k].offsetTop + state.difference}px`;
-        };
-        // 菜单高亮点击事件
-        const onColumnsAsideMenuClick = (v: Object, k: number) => {
-            setColumnsAsideMove(k);
-            let { path, redirect } = v as any;
-            if (redirect) router.push(redirect);
-            else router.push(path);
-        };
-        // 设置高亮动态位置
-        const onColumnsAsideDown = (k: number) => {
-            nextTick(() => {
-                setColumnsAsideMove(k);
-            });
-        };
-        // 设置/过滤路由（非静态路由/是否显示在菜单中）
-        const setFilterRoutes = () => {
-            state.columnsAsideList = filterRoutesFun(store.state.routesList.routesList);
-            const resData: any = setSendChildren(route.path);
-            onColumnsAsideDown(resData.item[0].k);
-            proxy.mittBus.emit('setSendColumnsChildren', resData);
-        };
-        // 传送当前子级数据到菜单中
-        const setSendChildren = (path: string) => {
-            const currentPathSplit = path.split('/');
-            let currentData: any = {};
-            state.columnsAsideList.map((v: any, k: number) => {
-                if (v.path === `/${currentPathSplit[1]}`) {
-                    v['k'] = k;
-                    currentData['item'] = [{ ...v }];
-                    currentData['children'] = [{ ...v }];
-                    if (v.children) currentData['children'] = v.children;
-                }
-            });
-            return currentData;
-        };
-        // 路由过滤递归函数
-        const filterRoutesFun = (arr: Array<object>) => {
-            return arr
-                .filter((item: any) => !item.meta.isHide)
-                .map((item: any) => {
-                    item = Object.assign({}, item);
-                    if (item.children) item.children = filterRoutesFun(item.children);
-                    return item;
-                });
-        };
-        // tagsView 点击时，根据路由查找下标 columnsAsideList，实现左侧菜单高亮
-        const setColumnsMenuHighlight = (path: string) => {
-            state.routeSplit = path.split('/');
-            state.routeSplit.shift();
-            const routeFirst = `/${state.routeSplit[0]}`;
-            const currentSplitRoute = state.columnsAsideList.find((v: any) => v.path === routeFirst);
-            // 延迟拿值，防止取不到
-            setTimeout(() => {
-                onColumnsAsideDown(currentSplitRoute.k);
-            }, 0);
-        };
-        // 监听路由的变化，动态赋值给菜单中
-        watch(store.state, (val) => {
-            val.themeConfig.themeConfig.columnsAsideStyle === 'columnsRound' ? (state.difference = 3) : (state.difference = 0);
-            if (val.routesList.routesList.length === state.columnsAsideList.length) return false;
-            setFilterRoutes();
-        });
-        // 页面加载时
-        onMounted(() => {
-            setFilterRoutes();
-        });
-        // 路由更新时
-        onBeforeRouteUpdate((to) => {
-            setColumnsMenuHighlight(to.path);
-            proxy.mittBus.emit('setSendColumnsChildren', setSendChildren(to.path));
-        });
-        return {
-            columnsAsideOffsetTopRefs,
-            columnsAsideActiveRef,
-            onColumnsAsideDown,
-            setColumnsAsideStyle,
-            onColumnsAsideMenuClick,
-            ...toRefs(state),
-        };
-    },
+import pinia from '@/store/index';
+import { useThemeConfig } from '@/store/themeConfig';
+import { useRoutesList } from '@/store/routesList';
+import mittBus from '@/common/utils/mitt';
+
+const columnsAsideOffsetTopRefs: any = ref([]);
+const columnsAsideActiveRef = ref();
+const route = useRoute();
+const router = useRouter();
+const state: any = reactive({
+    columnsAsideList: [],
+    liIndex: 0,
+    difference: 0,
+    routeSplit: [],
+});
+// 设置高亮样式
+const setColumnsAsideStyle = computed(() => {
+    return useThemeConfig().themeConfig.columnsAsideStyle;
+});
+// 设置菜单高亮位置移动
+const setColumnsAsideMove = (k: number) => {
+    state.liIndex = k;
+    columnsAsideActiveRef.value.style.top = `${columnsAsideOffsetTopRefs.value[k].offsetTop + state.difference}px`;
 };
+// 菜单高亮点击事件
+const onColumnsAsideMenuClick = (v: Object, k: number) => {
+    setColumnsAsideMove(k);
+    let { path, redirect } = v as any;
+    if (redirect) router.push(redirect);
+    else router.push(path);
+};
+// 设置高亮动态位置
+const onColumnsAsideDown = (k: number) => {
+    nextTick(() => {
+        setColumnsAsideMove(k);
+    });
+};
+// 设置/过滤路由（非静态路由/是否显示在菜单中）
+const setFilterRoutes = () => {
+    state.columnsAsideList = filterRoutesFun(useRoutesList().routesList);
+    const resData: any = setSendChildren(route.path);
+    onColumnsAsideDown(resData.item[0].k);
+    mittBus.emit('setSendColumnsChildren', resData);
+};
+// 传送当前子级数据到菜单中
+const setSendChildren = (path: string) => {
+    const currentPathSplit = path.split('/');
+    let currentData: any = {};
+    state.columnsAsideList.map((v: any, k: number) => {
+        if (v.path === `/${currentPathSplit[1]}`) {
+            v['k'] = k;
+            currentData['item'] = [{ ...v }];
+            currentData['children'] = [{ ...v }];
+            if (v.children) currentData['children'] = v.children;
+        }
+    });
+    return currentData;
+};
+// 路由过滤递归函数
+const filterRoutesFun = (arr: Array<object>) => {
+    return arr
+        .filter((item: any) => !item.meta.isHide)
+        .map((item: any) => {
+            item = Object.assign({}, item);
+            if (item.children) item.children = filterRoutesFun(item.children);
+            return item;
+        });
+};
+// tagsView 点击时，根据路由查找下标 columnsAsideList，实现左侧菜单高亮
+const setColumnsMenuHighlight = (path: string) => {
+    state.routeSplit = path.split('/');
+    state.routeSplit.shift();
+    const routeFirst = `/${state.routeSplit[0]}`;
+    const currentSplitRoute = state.columnsAsideList.find((v: any) => v.path === routeFirst);
+    // 延迟拿值，防止取不到
+    setTimeout(() => {
+        onColumnsAsideDown(currentSplitRoute.k);
+    }, 0);
+};
+// 监听路由的变化，动态赋值给菜单中
+watch(pinia.state, (val) => {
+    val.themeConfig.themeConfig.columnsAsideStyle === 'columnsRound' ? (state.difference = 3) : (state.difference = 0);
+    if (val.routesList.routesList.length === state.columnsAsideList.length) return false;
+    setFilterRoutes();
+});
+// 页面加载时
+onMounted(() => {
+    setFilterRoutes();
+});
+// 路由更新时
+onBeforeRouteUpdate((to) => {
+    setColumnsMenuHighlight(to.path);
+    mittBus.emit('setSendColumnsChildren', setSendChildren(to.path));
+});
 </script>
 
 <style scoped lang="scss">
@@ -150,8 +132,10 @@ export default {
     width: 64px;
     height: 100%;
     background: var(--bg-columnsMenuBar);
+
     ul {
         position: relative;
+
         li {
             color: var(--bg-columnsMenuBarColor);
             width: 100%;
@@ -161,21 +145,26 @@ export default {
             cursor: pointer;
             position: relative;
             z-index: 1;
+
             .layout-columns-aside-li-box {
                 margin: auto;
+
                 .layout-columns-aside-li-box-title {
                     padding-top: 1px;
                 }
             }
+
             a {
                 text-decoration: none;
                 color: var(--bg-columnsMenuBarColor);
             }
         }
+
         .layout-columns-active {
             color: #ffffff;
             transition: 0.3s ease-in-out;
         }
+
         .columns-round {
             background: var(--color-primary);
             color: #ffffff;
@@ -189,6 +178,7 @@ export default {
             transition: 0.3s ease-in-out;
             border-radius: 5px;
         }
+
         .columns-card {
             @extend .columns-round;
             top: 0;

mayfly_go_web/src/views/layout/component/header.vue

@@ -6,16 +6,15 @@
 
 <script lang="ts">
 import { computed } from 'vue';
-import { useStore } from '@/store/index.ts';
 import NavBarsIndex from '@/views/layout/navBars/index.vue';
+import { useThemeConfig } from '@/store/themeConfig';
 export default {
     name: 'layoutHeader',
     components: { NavBarsIndex },
     setup() {
-        const store = useStore();
         // 设置 header 的高度
         const setHeaderHeight = computed(() => {
-            let { isTagsview, layout } = store.state.themeConfig.themeConfig;
+            let { isTagsview, layout } = useThemeConfig().themeConfig;
             if (isTagsview && layout !== 'classic') return '84px';
             else return '50px';
         });

mayfly_go_web/src/views/layout/component/main.vue

@@ -1,97 +1,75 @@
 <template>
     <el-main class="layout-main">
-        <el-scrollbar
-            class="layout-scrollbar"
-            ref="layoutScrollbarRef"
-            v-show="!currentRouteMeta.link && !currentRouteMeta.isIframe"
-            :style="{ minHeight: `calc(100vh - ${headerHeight}` }"
-        >
+        <el-scrollbar class="layout-scrollbar" ref="layoutScrollbarRef"
+            v-show="!state.currentRouteMeta.link && state.currentRouteMeta.linkType != 1"
+            :style="{ minHeight: `calc(100vh - ${state.headerHeight}` }">
             <LayoutParentView />
-            <Footer v-if="getThemeConfig.isFooter" />
+            <Footer v-if="themeConfig.isFooter" />
         </el-scrollbar>
-        <Link
-            :style="{ height: `calc(100vh - ${headerHeight}` }"
-            :meta="currentRouteMeta"
-            v-if="currentRouteMeta.link && !currentRouteMeta.isIframe"
-        />
-        <Iframes
-            :style="{ height: `calc(100vh - ${headerHeight}` }"
-            :meta="currentRouteMeta"
-            v-if="currentRouteMeta.link && currentRouteMeta.isIframe && isShowLink"
-            @getCurrentRouteMeta="onGetCurrentRouteMeta"
-        />
+        <Link :style="{ height: `calc(100vh - ${state.headerHeight}` }" :meta="state.currentRouteMeta"
+            v-if="state.currentRouteMeta.link && state.currentRouteMeta.linkType == 2" />
+        <Iframes :style="{ height: `calc(100vh - ${state.headerHeight}` }" :meta="state.currentRouteMeta"
+            v-if="state.currentRouteMeta.link && state.currentRouteMeta.linkType == 1 && state.isShowLink"
+            @getCurrentRouteMeta="onGetCurrentRouteMeta" />
     </el-main>
 </template>
 
-<script lang="ts">
-import { computed, defineComponent, toRefs, reactive, getCurrentInstance, watch, onBeforeMount } from 'vue';
+<script setup lang="ts" name="layoutMain">
+import { reactive, getCurrentInstance, watch, onBeforeMount } from 'vue';
 import { useRoute } from 'vue-router';
-import { useStore } from '@/store/index.ts';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '@/store/themeConfig';
 import LayoutParentView from '@/views/layout/routerView/parent.vue';
 import Footer from '@/views/layout/footer/index.vue';
 import Link from '@/views/layout/routerView/link.vue';
 import Iframes from '@/views/layout/routerView/iframes.vue';
-export default defineComponent({
-    name: 'layoutMain',
-    components: { LayoutParentView, Footer, Link, Iframes },
-    setup() {
-        const { proxy } = getCurrentInstance() as any;
-        const store = useStore();
-        const route = useRoute();
-        const state = reactive({
-            headerHeight: '',
-            currentRouteMeta: {},
-            isShowLink: false,
-        });
-        // 获取布局配置信息
-        const getThemeConfig = computed(() => {
-            return store.state.themeConfig.themeConfig;
-        });
-        // 子组件触发更新
-        const onGetCurrentRouteMeta = () => {
-            initCurrentRouteMeta(route.meta);
-        };
-        // 初始化当前路由 meta 信息
-        const initCurrentRouteMeta = (meta: object) => {
-            state.isShowLink = false;
-            state.currentRouteMeta = meta;
-            setTimeout(() => {
-                state.isShowLink = true;
-            }, 100);
-        };
-        // 设置 main 的高度
-        const initHeaderHeight = () => {
-            let { isTagsview } = store.state.themeConfig.themeConfig;
-            if (isTagsview) return (state.headerHeight = `84px`);
-            else return (state.headerHeight = `50px`);
-        };
-        // 页面加载前
-        onBeforeMount(() => {
-            initCurrentRouteMeta(route.meta);
-            initHeaderHeight();
-        });
-        // 监听 themeConfig 配置文件的变化，更新菜单 el-scrollbar 的高度
-        watch(store.state.themeConfig.themeConfig, (val) => {
-            state.headerHeight = val.isTagsview ? '84px' : '50px';
-            if (val.isFixedHeaderChange !== val.isFixedHeader) {
-                if (!proxy.$refs.layoutScrollbarRef) return false;
-                proxy.$refs.layoutScrollbarRef.update();
-            }
-        });
-        // 监听路由的变化
-        watch(
-            () => route.path,
-            () => {
-                initCurrentRouteMeta(route.meta);
-                proxy.$refs.layoutScrollbarRef.wrapRef.scrollTop = 0;
-            }
-        );
-        return {
-            getThemeConfig,
-            initCurrentRouteMeta,
-            onGetCurrentRouteMeta,
-            ...toRefs(state),
-        };
-    },
+
+const { proxy } = getCurrentInstance() as any;
+const { themeConfig } = storeToRefs(useThemeConfig());
+const route = useRoute();
+const state = reactive({
+    headerHeight: '',
+    currentRouteMeta: {} as any,
+    isShowLink: false,
 });
+
+// 子组件触发更新
+const onGetCurrentRouteMeta = () => {
+    initCurrentRouteMeta(route.meta);
+};
+// 初始化当前路由 meta 信息
+const initCurrentRouteMeta = (meta: object) => {
+    state.isShowLink = false;
+    state.currentRouteMeta = meta;
+    setTimeout(() => {
+        state.isShowLink = true;
+    }, 100);
+};
+// 设置 main 的高度
+const initHeaderHeight = () => {
+    let { isTagsview } = themeConfig.value;
+    if (isTagsview) return (state.headerHeight = `84px`);
+    else return (state.headerHeight = `50px`);
+};
+// 页面加载前
+onBeforeMount(() => {
+    initCurrentRouteMeta(route.meta);
+    initHeaderHeight();
+});
+// 监听 themeConfig 配置文件的变化，更新菜单 el-scrollbar 的高度
+watch(themeConfig.value, (val) => {
+    state.headerHeight = val.isTagsview ? '84px' : '50px';
+    if (val.isFixedHeaderChange !== val.isFixedHeader) {
+        if (!proxy.$refs.layoutScrollbarRef) return false;
+        proxy.$refs.layoutScrollbarRef.update();
+    }
+});
+// 监听路由的变化
+watch(
+    () => route.path,
+    () => {
+        initCurrentRouteMeta(route.meta);
+        proxy.$refs.layoutScrollbarRef.wrapRef.scrollTop = 0;
+    }
+);
 </script>

mayfly_go_web/src/views/layout/footer/index.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="layout-footer mt15" v-show="isDelayFooter">
         <div class="layout-footer-warp">
-            <div>vue-next-admin，Made by lyt with ❤️</div>
-            <div class="mt5">mayfly</div>
+            <div>Made by mayfly with ❤️</div>
+            <div class="mt5">mayfly-go</div>
         </div>
     </div>
 </template>

mayfly_go_web/src/views/layout/index.vue

@@ -1,57 +1,47 @@
 <template>
-    <Defaults v-if="getThemeConfig.layout === 'defaults'" />
-    <Classic v-else-if="getThemeConfig.layout === 'classic'" />
-    <Transverse v-else-if="getThemeConfig.layout === 'transverse'" />
-    <Columns v-else-if="getThemeConfig.layout === 'columns'" />
+    <Defaults v-if="themeConfig.layout === 'defaults'" />
+    <Classic v-else-if="themeConfig.layout === 'classic'" />
+    <Transverse v-else-if="themeConfig.layout === 'transverse'" />
+    <Columns v-else-if="themeConfig.layout === 'columns'" />
 </template>
 
-<script lang="ts">
-import { computed, onBeforeMount, onUnmounted, getCurrentInstance } from 'vue';
-import { useStore } from '@/store/index.ts';
-import { getLocal, setLocal } from '@/common/utils/storage.ts';
+<script setup lang="ts" name="layout">
+import { onBeforeMount, onUnmounted } from 'vue';
+import { getLocal, setLocal } from '@/common/utils/storage';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '@/store/themeConfig';
 import Defaults from '@/views/layout/main/defaults.vue';
 import Classic from '@/views/layout/main/classic.vue';
 import Transverse from '@/views/layout/main/transverse.vue';
 import Columns from '@/views/layout/main/columns.vue';
-export default {
-    name: 'layout',
-    components: { Defaults, Classic, Transverse, Columns },
-    setup() {
-        const { proxy } = getCurrentInstance() as any;
-        const store = useStore();
-        // 获取布局配置信息
-        const getThemeConfig = computed(() => {
-            return store.state.themeConfig.themeConfig;
+import mittBus from '@/common/utils/mitt';
+
+const { themeConfig } = storeToRefs(useThemeConfig());
+
+// 窗口大小改变时(适配移动端)
+const onLayoutResize = () => {
+    if (!getLocal('oldLayout')) setLocal('oldLayout', themeConfig.value.layout);
+    const clientWidth = document.body.clientWidth;
+    if (clientWidth < 1000) {
+        themeConfig.value.isCollapse = false;
+        mittBus.emit('layoutMobileResize', {
+            layout: 'defaults',
+            clientWidth,
         });
-        // 窗口大小改变时(适配移动端)
-        const onLayoutResize = () => {
-            if (!getLocal('oldLayout')) setLocal('oldLayout', getThemeConfig.value.layout);
-            const clientWidth = document.body.clientWidth;
-            if (clientWidth < 1000) {
-                getThemeConfig.value.isCollapse = false;
-                proxy.mittBus.emit('layoutMobileResize', {
-                    layout: 'defaults',
-                    clientWidth,
-                });
-            } else {
-                proxy.mittBus.emit('layoutMobileResize', {
-                    layout: getLocal('oldLayout') ? getLocal('oldLayout') : 'defaults',
-                    clientWidth,
-                });
-            }
-        };
-        // 页面加载前
-        onBeforeMount(() => {
-            onLayoutResize();
-            window.addEventListener('resize', onLayoutResize);
+    } else {
+        mittBus.emit('layoutMobileResize', {
+            layout: getLocal('oldLayout') ? getLocal('oldLayout') : 'defaults',
+            clientWidth,
         });
-        // 页面卸载时
-        onUnmounted(() => {
-            window.removeEventListener('resize', onLayoutResize);
-        });
-        return {
-            getThemeConfig,
-        };
-    },
+    }
 };
+// 页面加载前
+onBeforeMount(() => {
+    onLayoutResize();
+    window.addEventListener('resize', onLayoutResize);
+});
+// 页面卸载时
+onUnmounted(() => {
+    window.removeEventListener('resize', onLayoutResize);
+});
 </script>

mayfly_go_web/src/views/layout/lockScreen/index.vue

@@ -1,294 +1,352 @@
 <template>
-    <div v-show="isShowLockScreen">
-        <div class="layout-lock-screen-mask"></div>
-        <div class="layout-lock-screen-img" :class="{ 'layout-lock-screen-filter': isShowLoockLogin }"></div>
-        <div class="layout-lock-screen">
-            <div
-                class="layout-lock-screen-date"
-                ref="layoutLockScreenDateRef"
-                @mousedown="onDown"
-                @mousemove="onMove"
-                @mouseup="onEnd"
-                @touchstart.stop="onDown"
-                @touchmove.stop="onMove"
-                @touchend.stop="onEnd"
-            >
-                <div class="layout-lock-screen-date-box">
-                    <div class="layout-lock-screen-date-box-time">
-                        {{ time.hm }}<span class="layout-lock-screen-date-box-minutes">{{ time.s }}</span>
-                    </div>
-                    <div class="layout-lock-screen-date-box-info">{{ time.mdq }}</div>
-                </div>
-            </div>
-            <transition name="el-zoom-in-center">
-                <div v-show="isShowLoockLogin" class="layout-lock-screen-login">
-                    <div class="layout-lock-screen-login-box">
-                        <div class="layout-lock-screen-login-box-img">
-                            <img src="https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1813762643,1914315241&fm=26&gp=0.jpg" />
-                        </div>
-                        <div class="layout-lock-screen-login-box-name">Administrator</div>
-                        <div class="layout-lock-screen-login-box-value">
-                            <el-input
-                                placeholder="请输入密码"
-                                ref="layoutLockScreenInputRef"
-                                v-model="lockScreenPassword"
-                                @keyup.enter.stop="onLockScreenSubmit()"
-                            >
-                                <template #append>
-                                    <el-button icon="el-icon-right" @click="onLockScreenSubmit"></el-button>
-                                </template>
-                            </el-input>
-                        </div>
-                    </div>
-                    <div class="layout-lock-screen-login-icon">
-                        <i class="el-icon-microphone"></i>
-                        <i class="el-icon-alarm-clock"></i>
-                        <i class="el-icon-switch-button"></i>
-                    </div>
-                </div>
-            </transition>
-        </div>
-    </div>
+	<div v-show="state.isShowLockScreen">
+		<div class="layout-lock-screen-mask"></div>
+		<div class="layout-lock-screen-img" :class="{ 'layout-lock-screen-filter': state.isShowLoockLogin }"></div>
+		<div class="layout-lock-screen">
+			<div
+				class="layout-lock-screen-date"
+				ref="layoutLockScreenDateRef"
+				@mousedown="onDownPc"
+				@mousemove="onMovePc"
+				@mouseup="onEnd"
+				@touchstart.stop="onDownApp"
+				@touchmove.stop="onMoveApp"
+				@touchend.stop="onEnd"
+			>
+				<div class="layout-lock-screen-date-box">
+					<div class="layout-lock-screen-date-box-time">
+						{{ state.time.hm }}<span class="layout-lock-screen-date-box-minutes">{{ state.time.s }}</span>
+					</div>
+					<div class="layout-lock-screen-date-box-info">{{ state.time.mdq }}</div>
+				</div>
+				<div class="layout-lock-screen-date-top">
+					<SvgIcon name="ele-Top" />
+					<div class="layout-lock-screen-date-top-text">上滑解锁</div>
+				</div>
+			</div>
+			<transition name="el-zoom-in-center">
+				<div v-show="state.isShowLoockLogin" class="layout-lock-screen-login">
+					<div class="layout-lock-screen-login-box">
+						<div class="layout-lock-screen-login-box-img">
+							<img src="https://img2.baidu.com/it/u=1978192862,2048448374&fm=253&fmt=auto&app=138&f=JPEG?w=504&h=500" />
+						</div>
+						<div class="layout-lock-screen-login-box-name">Administrator</div>
+						<div class="layout-lock-screen-login-box-value">
+							<el-input
+								placeholder="请输入密码"
+								ref="layoutLockScreenInputRef"
+								v-model="state.lockScreenPassword"
+								@keyup.enter.native.stop="onLockScreenSubmit()"
+							>
+								<template #append>
+									<el-button @click="onLockScreenSubmit">
+										<el-icon class="el-input__icon">
+											<ele-Right />
+										</el-icon>
+									</el-button>
+								</template>
+							</el-input>
+						</div>
+					</div>
+					<div class="layout-lock-screen-login-icon">
+						<SvgIcon name="ele-Microphone" :size="20" />
+						<SvgIcon name="ele-AlarmClock" :size="20" />
+						<SvgIcon name="ele-SwitchButton" :size="20" />
+					</div>
+				</div>
+			</transition>
+		</div>
+	</div>
 </template>
 
-<script lang="ts">
-import { nextTick, onMounted, reactive, toRefs, ref, onUnmounted, getCurrentInstance } from 'vue';
-import { useStore } from '@/store/index.ts';
-import { formatDate } from '@/common/utils/formatTime.ts';
-import { setLocal } from '@/common/utils/storage.ts';
-export default {
-    name: 'layoutLockScreen',
-    setup() {
-        const { proxy } = getCurrentInstance() as any;
-        const layoutLockScreenInputRef = ref();
-        const store = useStore();
-        const state: any = reactive({
-            transparency: 1,
-            downClientY: 0,
-            moveDifference: 0,
-            isShowLoockLogin: false,
-            isFlags: false,
-            querySelectorEl: '',
-            time: {
-                hm: '',
-                s: '',
-                mdq: '',
-            },
-            setIntervalTime: 0,
-            isShowLockScreen: false,
-            isShowLockScreenIntervalTime: 0,
-            lockScreenPassword: '',
-        });
-        // 鼠标按下
-        const onDown = (down: any) => {
-            state.isFlags = true;
-            state.downClientY = down.touches ? down.touches[0].clientY : down.clientY;
-        };
-        // 鼠标移动
-        const onMove = (move: any) => {
-            if (state.isFlags) {
-                const el = state.querySelectorEl;
-                const opacitys = (state.transparency -= 1 / 200);
-                if (move.touches) {
-                    state.moveDifference = move.touches[0].clientY - state.downClientY;
-                } else {
-                    state.moveDifference = move.clientY - state.downClientY;
-                }
-                if (state.moveDifference >= 0) return false;
-                el.setAttribute('style', `top:${state.moveDifference}px;cursor:pointer;opacity:${opacitys};`);
-                if (state.moveDifference < -400) {
-                    el.setAttribute('style', `top:${-el.clientHeight}px;cursor:pointer;transition:all 0.3s ease;`);
-                    state.moveDifference = -el.clientHeight;
-                    setTimeout(() => {
-                        el && el.parentNode?.removeChild(el);
-                    }, 300);
-                }
-                if (state.moveDifference === -el.clientHeight) {
-                    state.isShowLoockLogin = true;
-                    layoutLockScreenInputRef.value.focus();
-                }
-            }
-        };
-        // 鼠标松开
-        const onEnd = () => {
-            state.isFlags = false;
-            state.transparency = 1;
-            if (state.moveDifference >= -400) {
-                state.querySelectorEl.setAttribute('style', `top:0px;opacity:1;transition:all 0.3s ease;`);
-            }
-        };
-        // 获取要拖拽的初始元素
-        const initGetElement = () => {
-            nextTick(() => {
-                state.querySelectorEl = proxy.$refs.layoutLockScreenDateRef;
-            });
-        };
-        // 时间初始化
-        const initTime = () => {
-            state.time.hm = formatDate(new Date(), 'HH:MM');
-            state.time.s = formatDate(new Date(), 'SS');
-            state.time.mdq = formatDate(new Date(), 'mm月dd日，WWW');
-        };
-        // 时间初始化定时器
-        const initSetTime = () => {
-            initTime();
-            state.setIntervalTime = window.setInterval(() => {
-                initTime();
-            }, 1000);
-        };
-        // 锁屏时间定时器
-        const initLockScreen = () => {
-            if (store.state.themeConfig.themeConfig.isLockScreen) {
-                state.isShowLockScreenIntervalTime = window.setInterval(() => {
-                    if (store.state.themeConfig.themeConfig.lockScreenTime <= 0) {
-                        state.isShowLockScreen = true;
-                        setLocalThemeConfig();
-                        return false;
-                    }
-                    store.state.themeConfig.themeConfig.lockScreenTime--;
-                }, 1000);
-            } else {
-                clearInterval(state.isShowLockScreenIntervalTime);
-            }
-        };
-        // 存储布局配置
-        const setLocalThemeConfig = () => {
-            store.state.themeConfig.themeConfig.isDrawer = false;
-            setLocal('themeConfig', store.state.themeConfig.themeConfig);
-        };
-        // 密码输入点击事件
-        const onLockScreenSubmit = () => {
-            store.state.themeConfig.themeConfig.isLockScreen = false;
-            store.state.themeConfig.themeConfig.lockScreenTime = 30;
-            setLocalThemeConfig();
-        };
-        // 页面加载时
-        onMounted(() => {
-            initGetElement();
-            initSetTime();
-            initLockScreen();
-        });
-        // 页面卸载时
-        onUnmounted(() => {
-            window.clearInterval(state.setIntervalTime);
-            window.clearInterval(state.isShowLockScreenIntervalTime);
-        });
-        return {
-            layoutLockScreenInputRef,
-            onDown,
-            onMove,
-            onEnd,
-            onLockScreenSubmit,
-            ...toRefs(state),
-        };
-    },
+<script setup lang="ts" name="layoutLockScreen">
+import { nextTick, onMounted, reactive, ref, onUnmounted } from 'vue';
+import { formatDate } from '@/common/utils/format';
+import { setLocal } from '@/common/utils/storage';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '@/store/themeConfig';
+
+// 定义变量内容
+const layoutLockScreenDateRef = ref<null>();
+const layoutLockScreenInputRef = ref();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+const state = reactive({
+	transparency: 1,
+	downClientY: 0,
+	moveDifference: 0,
+	isShowLoockLogin: false,
+	isFlags: false,
+	querySelectorEl: '' as any,
+	time: {
+		hm: '',
+		s: '',
+		mdq: '',
+	},
+	setIntervalTime: 0,
+	isShowLockScreen: false,
+	isShowLockScreenIntervalTime: 0,
+	lockScreenPassword: '',
+});
+
+// 鼠标按下 pc
+const onDownPc = (down: MouseEvent) => {
+	state.isFlags = true;
+	state.downClientY = down.clientY;
 };
+// 鼠标按下 app
+const onDownApp = (down: TouchEvent) => {
+	state.isFlags = true;
+	state.downClientY = down.touches[0].clientY;
+};
+// 鼠标移动 pc
+const onMovePc = (move: MouseEvent) => {
+	state.moveDifference = move.clientY - state.downClientY;
+	onMove();
+};
+// 鼠标移动 app
+const onMoveApp = (move: TouchEvent) => {
+	state.moveDifference = move.touches[0].clientY - state.downClientY;
+	onMove();
+};
+// 鼠标移动事件
+const onMove = () => {
+	if (state.isFlags) {
+		const el = <HTMLElement>state.querySelectorEl;
+		const opacitys = (state.transparency -= 1 / 200);
+		if (state.moveDifference >= 0) return false;
+		el.setAttribute('style', `top:${state.moveDifference}px;cursor:pointer;opacity:${opacitys};`);
+		if (state.moveDifference < -400) {
+			el.setAttribute('style', `top:${-el.clientHeight}px;cursor:pointer;transition:all 0.3s ease;`);
+			state.moveDifference = -el.clientHeight;
+			setTimeout(() => {
+				el && el.parentNode?.removeChild(el);
+			}, 300);
+		}
+		if (state.moveDifference === -el.clientHeight) {
+			state.isShowLoockLogin = true;
+			layoutLockScreenInputRef.value.focus();
+		}
+	}
+};
+// 鼠标松开
+const onEnd = () => {
+	state.isFlags = false;
+	state.transparency = 1;
+	if (state.moveDifference >= -400) {
+		(<HTMLElement>state.querySelectorEl).setAttribute('style', `top:0px;opacity:1;transition:all 0.3s ease;`);
+	}
+};
+// 获取要拖拽的初始元素
+const initGetElement = () => {
+	nextTick(() => {
+		state.querySelectorEl = layoutLockScreenDateRef.value;
+	});
+};
+// 时间初始化
+const initTime = () => {
+	state.time.hm = formatDate(new Date(), 'HH:MM');
+	state.time.s = formatDate(new Date(), 'SS');
+	state.time.mdq = formatDate(new Date(), 'mm月dd日，WWW');
+};
+// 时间初始化定时器
+const initSetTime = () => {
+	initTime();
+	state.setIntervalTime = window.setInterval(() => {
+		initTime();
+	}, 1000);
+};
+// 锁屏时间定时器
+const initLockScreen = () => {
+	if (themeConfig.value.isLockScreen) {
+		state.isShowLockScreenIntervalTime = window.setInterval(() => {
+			if (themeConfig.value.lockScreenTime <= 1) {
+				state.isShowLockScreen = true;
+				setLocalThemeConfig();
+				return false;
+			}
+			themeConfig.value.lockScreenTime--;
+		}, 1000);
+	} else {
+		clearInterval(state.isShowLockScreenIntervalTime);
+	}
+};
+// 存储布局配置
+const setLocalThemeConfig = () => {
+	themeConfig.value.isDrawer = false;
+	setLocal('themeConfig', themeConfig.value);
+};
+// 密码输入点击事件
+const onLockScreenSubmit = () => {
+	themeConfig.value.isLockScreen = false;
+	themeConfig.value.lockScreenTime = 30;
+	setLocalThemeConfig();
+};
+// 页面加载时
+onMounted(() => {
+	initGetElement();
+	initSetTime();
+	initLockScreen();
+});
+// 页面卸载时
+onUnmounted(() => {
+	window.clearInterval(state.setIntervalTime);
+	window.clearInterval(state.isShowLockScreenIntervalTime);
+});
 </script>
 
 <style scoped lang="scss">
 .layout-lock-screen-fixed {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
 }
 .layout-lock-screen-filter {
-    filter: blur(5px);
-    transform: scale(1.2);
+	filter: blur(1px);
 }
 .layout-lock-screen-mask {
-    background: rgba(255, 255, 255, 1);
-    @extend .layout-lock-screen-fixed;
-    z-index: 9999990;
+	background: var(--el-color-white);
+	@extend .layout-lock-screen-fixed;
+	z-index: 9999990;
 }
 .layout-lock-screen-img {
-    @extend .layout-lock-screen-fixed;
-    background-image: url('https://img6.bdstatic.com/img/image/pcindex/sunjunpchuazhoutu.JPG');
-    background-size: 100% 100%;
-    z-index: 9999991;
-    transition: all ease 0.3s 0.3s;
+	@extend .layout-lock-screen-fixed;
+	background-image: url('@/assets/image/bg-login.png');
+	background-size: 100% 100%;
+	z-index: 9999991;
 }
 .layout-lock-screen {
-    @extend .layout-lock-screen-fixed;
-    z-index: 9999992;
-    &-date {
-        position: absolute;
-        left: 0;
-        top: 0;
-        width: 100%;
-        height: 100%;
-        color: #ffffff;
-        z-index: 9999993;
-        user-select: none;
-        &-box {
-            position: absolute;
-            left: 30px;
-            bottom: 50px;
-            &-time {
-                font-size: 100px;
-            }
-            &-info {
-                font-size: 40px;
-            }
-            &-minutes {
-                font-size: 16px;
-            }
-        }
-    }
-    &-login {
-        position: relative;
-        z-index: 9999994;
-        width: 100%;
-        height: 100%;
-        left: 0;
-        top: 0;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        color: #ffffff;
-        &-box {
-            text-align: center;
-            margin: auto;
-            &-img {
-                width: 180px;
-                height: 180px;
-                margin: auto;
-                img {
-                    width: 100%;
-                    height: 100%;
-                    border-radius: 100%;
-                }
-            }
-            &-name {
-                font-size: 26px;
-                margin: 15px 0 30px;
-            }
-        }
-        &-icon {
-            position: absolute;
-            right: 30px;
-            bottom: 30px;
-            i {
-                font-size: 20px;
-                margin-left: 15px;
-                cursor: pointer;
-                opacity: 0.8;
-                &:hover {
-                    opacity: 1;
-                }
-            }
-        }
-    }
+	@extend .layout-lock-screen-fixed;
+	z-index: 9999992;
+	&-date {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		color: var(--el-color-white);
+		z-index: 9999993;
+		user-select: none;
+		&-box {
+			position: absolute;
+			left: 30px;
+			bottom: 50px;
+			&-time {
+				font-size: 100px;
+				color: var(--el-color-white);
+			}
+			&-info {
+				font-size: 40px;
+				color: var(--el-color-white);
+			}
+			&-minutes {
+				font-size: 16px;
+			}
+		}
+		&-top {
+			width: 40px;
+			height: 40px;
+			line-height: 40px;
+			border-radius: 100%;
+			border: 1px solid var(--el-border-color-light, #ebeef5);
+			background: rgba(255, 255, 255, 0.1);
+			color: var(--el-color-white);
+			opacity: 0.8;
+			position: absolute;
+			right: 30px;
+			bottom: 50px;
+			text-align: center;
+			overflow: hidden;
+			transition: all 0.3s ease;
+			i {
+				transition: all 0.3s ease;
+			}
+			&-text {
+				opacity: 0;
+				position: absolute;
+				top: 150%;
+				font-size: 12px;
+				color: var(--el-color-white);
+				left: 50%;
+				line-height: 1.2;
+				transform: translate(-50%, -50%);
+				transition: all 0.3s ease;
+				width: 35px;
+			}
+			&:hover {
+				border: 1px solid rgba(255, 255, 255, 0.5);
+				background: rgba(255, 255, 255, 0.2);
+				box-shadow: 0 0 12px 0 rgba(255, 255, 255, 0.5);
+				color: var(--el-color-white);
+				opacity: 1;
+				transition: all 0.3s ease;
+				i {
+					transform: translateY(-40px);
+					transition: all 0.3s ease;
+				}
+				.layout-lock-screen-date-top-text {
+					opacity: 1;
+					top: 50%;
+					transition: all 0.3s ease;
+				}
+			}
+		}
+	}
+	&-login {
+		position: relative;
+		z-index: 9999994;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top: 0;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		color: var(--el-color-white);
+		&-box {
+			text-align: center;
+			margin: auto;
+			&-img {
+				width: 180px;
+				height: 180px;
+				margin: auto;
+				img {
+					width: 100%;
+					height: 100%;
+					border-radius: 100%;
+				}
+			}
+			&-name {
+				font-size: 26px;
+				margin: 15px 0 30px;
+			}
+		}
+		&-icon {
+			position: absolute;
+			right: 30px;
+			bottom: 30px;
+			i {
+				font-size: 20px;
+				margin-left: 15px;
+				cursor: pointer;
+				opacity: 0.8;
+				&:hover {
+					opacity: 1;
+				}
+			}
+		}
+	}
 }
-::v-deep(.el-input-group__append) {
-    background: #ffffff;
-    padding: 0px 15px;
+:deep(.el-input-group__append) {
+	background: var(--el-color-white);
+	padding: 0px 15px;
 }
-::v-deep(.el-input__inner) {
-    border-right-color: #f6f6f6;
-    &:hover {
-        border-color: #f6f6f6;
-    }
+:deep(.el-input__inner) {
+	border-right-color: var(--el-border-color-extra-light);
+	&:hover {
+		border-color: var(--el-border-color-extra-light);
+	}
 }
-</style>
+</style>

mayfly_go_web/src/views/layout/logo/index.vue

@@ -2,7 +2,7 @@
     <div class="layout-logo" v-if="setShowLogo" @click="onThemeConfigChange">
         <img src="@/assets/image/logo.svg" class="layout-logo-medium-img" />
         <span>
-            {{ `${getThemeConfig.globalTitle}` }}
+            {{ `${themeConfig.globalTitle}` }}
             <sub><span style="font-size: 10px;color:goldenrod">{{ ` ${config.version}` }}</span></sub>
         </span>
     </div>
@@ -11,37 +11,25 @@
     </div>
 </template>
 
-<script lang="ts">
-import { computed, getCurrentInstance } from 'vue';
-import { useStore } from '@/store/index.ts';
-import config from '@/common/config.ts';
-export default {
-    name: 'layoutLogo',
-    setup() {
-        const { proxy } = getCurrentInstance() as any;
-        const store = useStore();
-        // 获取布局配置信息
-        const getThemeConfig = computed(() => {
-            return store.state.themeConfig.themeConfig;
-        });
-        // 设置 logo 的显示。classic 经典布局默认显示 logo
-        const setShowLogo = computed(() => {
-            let { isCollapse, layout } = store.state.themeConfig.themeConfig;
-            return !isCollapse || layout === 'classic' || document.body.clientWidth < 1000;
-        });
-        // logo 点击实现菜单展开/收起
-        const onThemeConfigChange = () => {
-            if (store.state.themeConfig.themeConfig.layout === 'transverse') return false;
-            proxy.mittBus.emit('onMenuClick');
-            store.state.themeConfig.themeConfig.isCollapse = !store.state.themeConfig.themeConfig.isCollapse;
-        };
-        return {
-            config,
-            setShowLogo,
-            getThemeConfig,
-            onThemeConfigChange,
-        };
-    },
+<script setup lang="ts" name="layoutLogo">
+import { computed } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '@/store/themeConfig';
+import config from '@/common/config';
+import mittBus from '@/common/utils/mitt';
+
+const { themeConfig } = storeToRefs(useThemeConfig());
+
+// 设置 logo 的显示。classic 经典布局默认显示 logo
+const setShowLogo = computed(() => {
+    let { isCollapse, layout } = themeConfig.value;
+    return !isCollapse || layout === 'classic' || document.body.clientWidth < 1000;
+});
+// logo 点击实现菜单展开/收起
+const onThemeConfigChange = () => {
+    if (themeConfig.value.layout === 'transverse') return false;
+    mittBus.emit('onMenuClick');
+    themeConfig.value.isCollapse = !themeConfig.value.isCollapse;
 };
 </script>
 

mayfly_go_web/src/views/layout/main/classic.vue

@@ -4,7 +4,7 @@
         <el-container class="layout-mian-height-50">
             <Aside />
             <div class="flex-center layout-backtop">
-                <TagsView v-if="getThemeConfig.isTagsview" />
+                <TagsView v-if="themeConfig.isTagsview" />
                 <Main />
             </div>
         </el-container>
@@ -12,25 +12,13 @@
     </el-container>
 </template>
 
-<script lang="ts">
-import { computed } from 'vue';
-import { useStore } from '@/store/index.ts';
+<script lang="ts" setup name="layoutClassic">
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '@/store/themeConfig';
 import Aside from '@/views/layout/component/aside.vue';
 import Header from '@/views/layout/component/header.vue';
 import Main from '@/views/layout/component/main.vue';
 import TagsView from '@/views/layout/navBars/tagsView/tagsView.vue';
-export default {
-    name: 'layoutClassic',
-    components: { Aside, Header, Main, TagsView },
-    setup() {
-        const store = useStore();
-        // 获取布局配置信息
-        const getThemeConfig = computed(() => {
-            return store.state.themeConfig.themeConfig;
-        });
-        return {
-            getThemeConfig,
-        };
-    },
-};
+
+const { themeConfig } = storeToRefs(useThemeConfig());
 </script>

mayfly_go_web/src/views/layout/main/columns.vue

@@ -17,18 +17,17 @@
 
 <script lang="ts">
 import { computed } from 'vue';
-import { useStore } from '@/store/index.ts';
 import Aside from '@/views/layout/component/aside.vue';
 import Header from '@/views/layout/component/header.vue';
 import Main from '@/views/layout/component/main.vue';
 import ColumnsAside from '@/views/layout/component/columnsAside.vue';
+import { useThemeConfig } from '@/store/themeConfig';
 export default {
     name: 'layoutColumns',
     components: { Aside, Header, Main, ColumnsAside },
     setup() {
-        const store = useStore();
         const isFixedHeader = computed(() => {
-            return store.state.themeConfig.themeConfig.isFixedHeader;
+            return useThemeConfig().themeConfig.isFixedHeader;
         });
         return {
             isFixedHeader,

mayfly_go_web/src/views/layout/main/defaults.vue

@@ -15,19 +15,18 @@
 <script lang="ts">
 import { computed, getCurrentInstance, watch } from 'vue';
 import { useRoute } from 'vue-router';
-import { useStore } from '@/store/index.ts';
 import Aside from '@/views/layout/component/aside.vue';
 import Header from '@/views/layout/component/header.vue';
 import Main from '@/views/layout/component/main.vue';
+import { useThemeConfig } from '@/store/themeConfig';
 export default {
     name: 'layoutDefaults',
     components: { Aside, Header, Main },
     setup() {
         const { proxy } = getCurrentInstance() as any;
-        const store = useStore();
         const route = useRoute();
         const isFixedHeader = computed(() => {
-            return store.state.themeConfig.themeConfig.isFixedHeader;
+            return useThemeConfig().themeConfig.isFixedHeader;
         });
         // 监听路由的变化
         watch(

mayfly_go_web/src/views/layout/navBars/breadcrumb/breadcrumb.vue

@@ -1,15 +1,18 @@
 <template>
-    <div class="layout-navbars-breadcrumb" v-show="getThemeConfig.isBreadcrumb">
-        <SvgIcon class="layout-navbars-breadcrumb-icon" :name="getThemeConfig.isCollapse ? 'expand' : 'fold'" @click="onThemeConfigChange" />
+    <div class="layout-navbars-breadcrumb" v-show="themeConfig.isBreadcrumb">
+        <SvgIcon class="layout-navbars-breadcrumb-icon" :name="themeConfig.isCollapse ? 'expand' : 'fold'"
+            @click="onThemeConfigChange" />
         <el-breadcrumb class="layout-navbars-breadcrumb-hide">
             <transition-group name="breadcrumb" mode="out-in">
-                <el-breadcrumb-item v-for="(v, k) in breadcrumbList" :key="v.meta.title">
-                    <span v-if="k === breadcrumbList.length - 1" class="layout-navbars-breadcrumb-span">
-                        <SvgIcon :name="v.meta.icon" class="layout-navbars-breadcrumb-iconfont" v-if="getThemeConfig.isBreadcrumbIcon" />
+                <el-breadcrumb-item v-for="(v, k) in state.breadcrumbList" :key="v.meta.title">
+                    <span v-if="k === state.breadcrumbList.length - 1" class="layout-navbars-breadcrumb-span">
+                        <SvgIcon :name="v.meta.icon" class="layout-navbars-breadcrumb-iconfont"
+                            v-if="themeConfig.isBreadcrumbIcon" />
                         {{ v.meta.title }}
                     </span>
                     <a v-else @click.prevent="onBreadcrumbClick(v)">
-                        <SvgIcon :name="v.meta.icon" class="layout-navbars-breadcrumb-iconfont" v-if="getThemeConfig.isBreadcrumbIcon" />
+                        <SvgIcon :name="v.meta.icon" class="layout-navbars-breadcrumb-iconfont"
+                            v-if="themeConfig.isBreadcrumbIcon" />
                         {{ v.meta.title }}
                     </a>
                 </el-breadcrumb-item>
@@ -18,77 +21,67 @@
     </div>
 </template>
 
-<script lang="ts">
-import { toRefs, reactive, computed, getCurrentInstance, onMounted } from 'vue';
+<script lang="ts" setup name="layoutBreadcrumb">
+import { reactive, onMounted } from 'vue';
 import { onBeforeRouteUpdate, useRoute, useRouter } from 'vue-router';
-import { useStore } from '@/store/index.ts';
-export default {
-    name: 'layoutBreadcrumb',
-    setup() {
-        const { proxy } = getCurrentInstance() as any;
-        const store = useStore();
-        const route = useRoute();
-        const router = useRouter();
-        const state: any = reactive({
-            breadcrumbList: [],
-            routeSplit: [],
-            routeSplitFirst: '',
-            routeSplitIndex: 1,
-        });
-        // 获取布局配置信息
-        const getThemeConfig = computed(() => {
-            return store.state.themeConfig.themeConfig;
-        });
-        // 面包屑点击时
-        const onBreadcrumbClick = (v: any) => {
-            const { redirect, path } = v;
-            if (redirect) router.push(redirect);
-            else router.push(path);
-        };
-        // 展开/收起左侧菜单点击
-        const onThemeConfigChange = () => {
-            proxy.mittBus.emit('onMenuClick');
-            store.state.themeConfig.themeConfig.isCollapse = !store.state.themeConfig.themeConfig.isCollapse;
-        };
-        // 处理面包屑数据
-        const getBreadcrumbList = (arr: Array<object>) => {
-            arr.map((item: any) => {
-                state.routeSplit.map((v: any, k: number, arrs: any) => {
-                    if (state.routeSplitFirst === item.path) {
-                        state.routeSplitFirst += `/${arrs[state.routeSplitIndex]}`;
-                        state.breadcrumbList.push(item);
-                        state.routeSplitIndex++;
-                        if (item.children) getBreadcrumbList(item.children);
-                    }
-                });
-            });
-        };
-        // 当前路由字符串切割成数组，并删除第一项空内容
-        const initRouteSplit = (path: string) => {
-            if (!store.state.themeConfig.themeConfig.isBreadcrumb) return false;
-            state.breadcrumbList = [store.state.routesList.routesList[0]];
-            state.routeSplit = path.split('/');
-            state.routeSplit.shift();
-            state.routeSplitFirst = `/${state.routeSplit[0]}`;
-            state.routeSplitIndex = 1;
-            getBreadcrumbList(store.state.routesList.routesList);
-        };
-        // 页面加载时
-        onMounted(() => {
-            initRouteSplit(route.path);
-        });
-        // 路由更新时
-        onBeforeRouteUpdate((to) => {
-            initRouteSplit(to.path);
-        });
-        return {
-            onThemeConfigChange,
-            getThemeConfig,
-            onBreadcrumbClick,
-            ...toRefs(state),
-        };
-    },
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '@/store/themeConfig';
+import { useRoutesList } from '@/store/routesList';
+import mittBus from '@/common/utils/mitt';
+
+const { themeConfig } = storeToRefs(useThemeConfig());
+const { routesList } = storeToRefs(useRoutesList());
+const route = useRoute();
+const router = useRouter();
+const state: any = reactive({
+    breadcrumbList: [],
+    routeSplit: [],
+    routeSplitFirst: '',
+    routeSplitIndex: 1,
+});
+
+// 面包屑点击时
+const onBreadcrumbClick = (v: any) => {
+    const { redirect, path } = v;
+    if (redirect) router.push(redirect);
+    else router.push(path);
 };
+// 展开/收起左侧菜单点击
+const onThemeConfigChange = () => {
+    mittBus.emit('onMenuClick');
+    themeConfig.value.isCollapse = !themeConfig.value.isCollapse;
+};
+// 处理面包屑数据
+const getBreadcrumbList = (arr: Array<object>) => {
+    arr.map((item: any) => {
+        state.routeSplit.map((v: any, k: number, arrs: any) => {
+            if (state.routeSplitFirst === item.path) {
+                state.routeSplitFirst += `/${arrs[state.routeSplitIndex]}`;
+                state.breadcrumbList.push(item);
+                state.routeSplitIndex++;
+                if (item.children) getBreadcrumbList(item.children);
+            }
+        });
+    });
+};
+// 当前路由字符串切割成数组，并删除第一项空内容
+const initRouteSplit = (path: string) => {
+    if (!themeConfig.value.isBreadcrumb) return false;
+    state.breadcrumbList = [routesList.value[0]];
+    state.routeSplit = path.split('/');
+    state.routeSplit.shift();
+    state.routeSplitFirst = `/${state.routeSplit[0]}`;
+    state.routeSplitIndex = 1;
+    getBreadcrumbList(routesList.value);
+};
+// 页面加载时
+onMounted(() => {
+    initRouteSplit(route.path);
+});
+// 路由更新时
+onBeforeRouteUpdate((to) => {
+    initRouteSplit(to.path);
+});
 </script>
 
 <style scoped lang="scss">
@@ -98,20 +91,24 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 15px;
+
     .layout-navbars-breadcrumb-icon {
         cursor: pointer;
         font-size: 18px;
         margin-right: 15px;
         color: var(--bg-topBarColor);
     }
+
     .layout-navbars-breadcrumb-span {
         opacity: 0.7;
         color: var(--bg-topBarColor);
     }
+
     .layout-navbars-breadcrumb-iconfont {
         font-size: 14px;
         margin-right: 5px;
     }
+
     ::v-deep(.el-breadcrumb__separator) {
         opacity: 0.7;
         color: var(--bg-topBarColor);

mayfly_go_web/src/views/layout/navBars/breadcrumb/index.vue

@@ -2,109 +2,100 @@
     <div class="layout-navbars-breadcrumb-index">
         <Logo v-if="setIsShowLogo" />
         <Breadcrumb />
-        <Horizontal :menuList="menuList" v-if="isLayoutTransverse" />
+        <Horizontal :menuList="state.menuList" v-if="isLayoutTransverse" />
         <User />
     </div>
 </template>
 
-<script lang="ts">
-import { computed, reactive, toRefs, onMounted, onUnmounted, getCurrentInstance, watch } from 'vue';
+<script lang="ts" setup name="layoutBreadcrumbIndex">
+import { computed, reactive, onMounted, onUnmounted, watch } from 'vue';
 import { useRoute } from 'vue-router';
-import { useStore } from '@/store/index.ts';
+import pinia from '@/store/index';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '@/store/themeConfig';
+import { useRoutesList } from '@/store/routesList';
 import Breadcrumb from '@/views/layout/navBars/breadcrumb/breadcrumb.vue';
 import User from '@/views/layout/navBars/breadcrumb/user.vue';
 import Logo from '@/views/layout/logo/index.vue';
 import Horizontal from '@/views/layout/navMenu/horizontal.vue';
-export default {
-    name: 'layoutBreadcrumbIndex',
-    components: { Breadcrumb, User, Logo, Horizontal },
-    setup() {
-        const { proxy } = getCurrentInstance() as any;
-        const store = useStore();
-        const route = useRoute();
-        const state: any = reactive({
-            menuList: [],
-        });
-        // 获取布局配置信息
-        const getThemeConfig = computed(() => {
-            return store.state.themeConfig.themeConfig;
-        });
-        // 设置 logo 显示/隐藏
-        const setIsShowLogo = computed(() => {
-            let { isShowLogo, layout } = store.state.themeConfig.themeConfig;
-            return (isShowLogo && layout === 'classic') || (isShowLogo && layout === 'transverse');
-        });
-        // 设置是否显示横向导航菜单
-        const isLayoutTransverse = computed(() => {
-            let { layout, isClassicSplitMenu } = store.state.themeConfig.themeConfig;
-            return layout === 'transverse' || (isClassicSplitMenu && layout === 'classic');
-        });
-        // 设置/过滤路由（非静态路由/是否显示在菜单中）
-        const setFilterRoutes = () => {
-            let { layout, isClassicSplitMenu } = store.state.themeConfig.themeConfig;
-            if (layout === 'classic' && isClassicSplitMenu) {
-                state.menuList = delClassicChildren(filterRoutesFun(store.state.routesList.routesList));
-                const resData = setSendClassicChildren(route.path);
-                proxy.mittBus.emit('setSendClassicChildren', resData);
-            } else {
-                state.menuList = filterRoutesFun(store.state.routesList.routesList);
-            }
-        };
-        // 设置了分割菜单时，删除底下 children
-        const delClassicChildren = (arr: Array<object>) => {
-            arr.map((v: any) => {
-                if (v.children) delete v.children;
-            });
-            return arr;
-        };
-        // 路由过滤递归函数
-        const filterRoutesFun = (arr: Array<object>) => {
-            return arr
-                .filter((item: any) => !item.meta.isHide)
-                .map((item: any) => {
-                    item = Object.assign({}, item);
-                    if (item.children) item.children = filterRoutesFun(item.children);
-                    return item;
-                });
-        };
-        // 传送当前子级数据到菜单中
-        const setSendClassicChildren = (path: string) => {
-            const currentPathSplit = path.split('/');
-            let currentData: any = {};
-            filterRoutesFun(store.state.routesList.routesList).map((v, k) => {
-                if (v.path === `/${currentPathSplit[1]}`) {
-                    v['k'] = k;
-                    currentData['item'] = [{ ...v }];
-                    currentData['children'] = [{ ...v }];
-                    if (v.children) currentData['children'] = v.children;
-                }
-            });
-            return currentData;
-        };
-        // 监听路由的变化，动态赋值给菜单中
-        watch(store.state, (val) => {
-            if (val.routesList.routesList.length === state.menuList.length) return false;
-            setFilterRoutes();
-        });
-        // 页面加载时
-        onMounted(() => {
-            setFilterRoutes();
-            proxy.mittBus.on('getBreadcrumbIndexSetFilterRoutes', () => {
-                setFilterRoutes();
-            });
-        });
-        // 页面卸载时
-        onUnmounted(() => {
-            proxy.mittBus.off('getBreadcrumbIndexSetFilterRoutes');
-        });
-        return {
-            getThemeConfig,
-            setIsShowLogo,
-            isLayoutTransverse,
-            ...toRefs(state),
-        };
-    },
+import mittBus from '@/common/utils/mitt';
+
+
+const { themeConfig } = storeToRefs(useThemeConfig());
+const { routesList } = storeToRefs(useRoutesList());
+const route = useRoute();
+const state: any = reactive({
+    menuList: [],
+});
+
+// 设置 logo 显示/隐藏
+const setIsShowLogo = computed(() => {
+    let { isShowLogo, layout } = themeConfig.value;
+    return (isShowLogo && layout === 'classic') || (isShowLogo && layout === 'transverse');
+});
+// 设置是否显示横向导航菜单
+const isLayoutTransverse = computed(() => {
+    let { layout, isClassicSplitMenu } = themeConfig.value;
+    return layout === 'transverse' || (isClassicSplitMenu && layout === 'classic');
+});
+// 设置/过滤路由（非静态路由/是否显示在菜单中）
+const setFilterRoutes = () => {
+    let { layout, isClassicSplitMenu } = themeConfig.value;
+    if (layout === 'classic' && isClassicSplitMenu) {
+        state.menuList = delClassicChildren(filterRoutesFun(routesList.value));
+        const resData = setSendClassicChildren(route.path);
+        mittBus.emit('setSendClassicChildren', resData);
+    } else {
+        state.menuList = filterRoutesFun(routesList.value);
+    }
 };
+// 设置了分割菜单时，删除底下 children
+const delClassicChildren = (arr: Array<object>) => {
+    arr.map((v: any) => {
+        if (v.children) delete v.children;
+    });
+    return arr;
+};
+// 路由过滤递归函数
+const filterRoutesFun = (arr: Array<object>) => {
+    return arr
+        .filter((item: any) => !item.meta.isHide)
+        .map((item: any) => {
+            item = Object.assign({}, item);
+            if (item.children) item.children = filterRoutesFun(item.children);
+            return item;
+        });
+};
+// 传送当前子级数据到菜单中
+const setSendClassicChildren = (path: string) => {
+    const currentPathSplit = path.split('/');
+    let currentData: any = {};
+    filterRoutesFun(routesList.value).map((v, k) => {
+        if (v.path === `/${currentPathSplit[1]}`) {
+            v['k'] = k;
+            currentData['item'] = [{ ...v }];
+            currentData['children'] = [{ ...v }];
+            if (v.children) currentData['children'] = v.children;
+        }
+    });
+    return currentData;
+};
+// 监听路由的变化，动态赋值给菜单中
+watch(pinia.state, (val) => {
+    if (val.routesList.routesList.length === state.menuList.length) return false;
+    setFilterRoutes();
+});
+// 页面加载时
+onMounted(() => {
+    setFilterRoutes();
+    mittBus.on('getBreadcrumbIndexSetFilterRoutes', () => {
+        setFilterRoutes();
+    });
+});
+// 页面卸载时
+onUnmounted(() => {
+    mittBus.off('getBreadcrumbIndexSetFilterRoutes');
+});
 </script>
 
 <style scoped lang="scss">

mayfly_go_web/src/views/layout/navBars/breadcrumb/search.vue

@@ -1,120 +1,103 @@
 <template>
     <div class="layout-search-dialog">
-        <el-dialog v-model="isShowSearch" width="300px" destroy-on-close :modal="false" fullscreen :show-close="false">
-            <el-autocomplete
-                v-model="menuQuery"
-                :fetch-suggestions="menuSearch"
-                placeholder="菜单搜索"
-                prefix-icon="el-icon-search"
-                ref="layoutMenuAutocompleteRef"
-                @select="onHandleSelect"
-                @blur="onSearchBlur"
-            >
+        <el-dialog v-model="state.isShowSearch" width="300px" destroy-on-close :modal="false" fullscreen :show-close="false">
+            <el-autocomplete v-model="state.menuQuery" :fetch-suggestions="menuSearch" placeholder="菜单搜索"
+                prefix-icon="el-icon-search" ref="layoutMenuAutocompleteRef" @select="onHandleSelect" @blur="onSearchBlur">
                 <template #prefix>
                     <el-icon class="el-input__icon">
                         <search />
                     </el-icon>
                 </template>
                 <template #default="{ item }">
-                    <div><SvgIcon :name="item.meta.icon" class="mr5" />{{ item.meta.title }}</div>
+                    <div>
+                        <SvgIcon :name="item.meta.icon" class="mr5" />{{ item.meta.title }}
+                    </div>
                 </template>
             </el-autocomplete>
         </el-dialog>
     </div>
 </template>
 
-<script lang="ts">
-import { reactive, toRefs, defineComponent, ref, nextTick } from 'vue';
+<script lang="ts" setup name="layoutBreadcrumbSearch">
+import { reactive, ref, nextTick } from 'vue';
 import { useRouter } from 'vue-router';
-import { useStore } from '@/store/index.ts';
-export default defineComponent({
-    name: 'layoutBreadcrumbSearch',
-    setup() {
-        const layoutMenuAutocompleteRef: any = ref(null);
-        const store = useStore();
-        const router = useRouter();
-        const state: any = reactive({
-            isShowSearch: false,
-            menuQuery: '',
-            tagsViewList: [],
-        });
-        // 搜索弹窗打开
-        const openSearch = () => {
-            state.menuQuery = '';
-            state.isShowSearch = true;
-            initTageView();
-            nextTick(() => {
-                setTimeout(() => {
-                    layoutMenuAutocompleteRef.value.focus();
-                });
-            });
-        };
-        // 搜索弹窗关闭
-        const closeSearch = () => {
-            state.isShowSearch = false;
-        };
-        // 菜单搜索数据过滤
-        const menuSearch = (queryString: any, cb: any) => {
-            let results = queryString ? state.tagsViewList.filter(createFilter(queryString)) : state.tagsViewList;
-            cb(results);
-        };
-        // 菜单搜索过滤
-        const createFilter = (queryString: any) => {
-            return (restaurant: any) => {
-                return (
-                    restaurant.path.toLowerCase().indexOf(queryString.toLowerCase()) > -1 ||
-                    restaurant.meta.title.toLowerCase().indexOf(queryString.toLowerCase()) > -1
-                );
-            };
-        };
-        // 初始化菜单数据
-        const initTageView = () => {
-            if (state.tagsViewList.length > 0) return false;
-            getRoutes(store.state.routesList.routesList).map((v: any) => {
-                if (!v.meta.isHide) {
-                    state.tagsViewList.push({ ...v });
-                }
-            });
-        };
-        // 获取所有根节点的route，即可访问的route
-        const getRoutes = (routes: any) => {
-            const menu: any = [];
-            for (let i = 0; i < routes.length; i++) {
-                const item = { ...routes[i] };
-                if (item.children) {
-                    getRoutes(item.children).forEach((r: any) => {
-                        menu.push(r);
-                    });
-                    continue;
-                }
-                menu.push(item);
-            }
-            return menu;
-        };
+import { useRoutesList } from '@/store/routesList';
 
-        // 当前菜单选中时
-        const onHandleSelect = (item: any) => {
-            let { path, redirect } = item;
-            if (item.meta.link && !item.meta.isIframe) window.open(item.meta.link);
-            else if (redirect) router.push(redirect);
-            else router.push(path);
-            closeSearch();
-        };
-        // input 失去焦点时
-        const onSearchBlur = () => {
-            closeSearch();
-        };
-        return {
-            layoutMenuAutocompleteRef,
-            openSearch,
-            closeSearch,
-            menuSearch,
-            onHandleSelect,
-            onSearchBlur,
-            ...toRefs(state),
-        };
-    },
+const layoutMenuAutocompleteRef: any = ref(null);;
+const router = useRouter();
+const state: any = reactive({
+    isShowSearch: false,
+    menuQuery: '',
+    tagsViewList: [],
 });
+// 搜索弹窗打开
+const openSearch = () => {
+    state.menuQuery = '';
+    state.isShowSearch = true;
+    initTageView();
+    nextTick(() => {
+        setTimeout(() => {
+            layoutMenuAutocompleteRef.value.focus();
+        });
+    });
+};
+// 搜索弹窗关闭
+const closeSearch = () => {
+    state.isShowSearch = false;
+};
+// 菜单搜索数据过滤
+const menuSearch = (queryString: any, cb: any) => {
+    let results = queryString ? state.tagsViewList.filter(createFilter(queryString)) : state.tagsViewList;
+    cb(results);
+};
+// 菜单搜索过滤
+const createFilter = (queryString: any) => {
+    return (restaurant: any) => {
+        return (
+            restaurant.path.toLowerCase().indexOf(queryString.toLowerCase()) > -1 ||
+            restaurant.meta.title.toLowerCase().indexOf(queryString.toLowerCase()) > -1
+        );
+    };
+};
+// 初始化菜单数据
+const initTageView = () => {
+    if (state.tagsViewList.length > 0) return false;
+    getRoutes(useRoutesList().routesList).map((v: any) => {
+        if (!v.meta.isHide) {
+            state.tagsViewList.push({ ...v });
+        }
+    });
+};
+// 获取所有根节点的route，即可访问的route
+const getRoutes = (routes: any) => {
+    const menu: any = [];
+    for (let i = 0; i < routes.length; i++) {
+        const item = { ...routes[i] };
+        if (item.children) {
+            getRoutes(item.children).forEach((r: any) => {
+                menu.push(r);
+            });
+            continue;
+        }
+        menu.push(item);
+    }
+    return menu;
+};
+
+// 当前菜单选中时
+const onHandleSelect = (item: any) => {
+    let { path, redirect } = item;
+    if (item.meta.link && item.meta.linkType == 2) window.open(item.meta.link);
+    else if (redirect) router.push(redirect);
+    else router.push(path);
+    closeSearch();
+};
+// input 失去焦点时
+const onSearchBlur = () => {
+    closeSearch();
+};
+
+defineExpose({openSearch})
 </script>
 
 <style scoped lang="scss">
@@ -124,6 +107,7 @@ export default defineComponent({
         border-radius: 0 !important;
         background: rgba(0, 0, 0, 0.5);
     }
+
     ::v-deep(.el-autocomplete) {
         width: 560px;
         position: absolute;

mayfly_go_web/src/views/layout/navBars/breadcrumb/user.vue

@@ -8,44 +8,39 @@
             </div>
             <template #dropdown>
                 <el-dropdown-menu>
-                    <el-dropdown-item command="" :disabled="disabledSize === ''">默认</el-dropdown-item>
-                    <el-dropdown-item command="large" :disabled="disabledSize === 'large'">大型</el-dropdown-item>
-                    <el-dropdown-item command="small" :disabled="disabledSize === 'small'">小型</el-dropdown-item>
+                    <el-dropdown-item command="" :disabled="state.disabledSize === ''">默认</el-dropdown-item>
+                    <el-dropdown-item command="large" :disabled="state.disabledSize === 'large'">大型</el-dropdown-item>
+                    <el-dropdown-item command="small" :disabled="state.disabledSize === 'small'">小型</el-dropdown-item>
                 </el-dropdown-menu>
             </template>
         </el-dropdown>
-        <!-- <div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">
+        <div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">
             <el-icon title="菜单搜索">
                 <search />
             </el-icon>
-        </div> -->
+        </div>
         <div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">
             <el-icon title="布局设置">
                 <setting />
             </el-icon>
         </div>
         <div class="layout-navbars-breadcrumb-user-icon">
-            <el-popover
-                placement="bottom"
-                trigger="click"
-                :visible="isShowUserNewsPopover"
-                :width="300"
-                popper-class="el-popover-pupop-user-news"
-            >
+            <el-popover placement="bottom" trigger="click" :visible="state.isShowUserNewsPopover" :width="300"
+                popper-class="el-popover-pupop-user-news">
                 <template #reference>
-                    <el-badge :is-dot="false" @click="isShowUserNewsPopover = !isShowUserNewsPopover">
+                    <el-badge :is-dot="false" @click="state.isShowUserNewsPopover = !state.isShowUserNewsPopover">
                         <el-icon title="消息">
                             <bell />
                         </el-icon>
                     </el-badge>
                 </template>
                 <transition name="el-zoom-in-top">
-                    <UserNews v-show="isShowUserNewsPopover" />
+                    <UserNews v-show="state.isShowUserNewsPopover" />
                 </transition>
             </el-popover>
         </div>
         <div class="layout-navbars-breadcrumb-user-icon mr10" @click="onScreenfullClick">
-            <el-icon v-if="!isScreenfull" title="关全屏">
+            <el-icon v-if="!state.isScreenfull" title="关全屏">
                 <full-screen />
             </el-icon>
             <el-icon v-else title="开全屏">
@@ -54,8 +49,8 @@
         </div>
         <el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
             <span class="layout-navbars-breadcrumb-user-link" style="cursor: pointer">
-                <img :src="getUserInfos.photo" class="layout-navbars-breadcrumb-user-link-photo mr5" />
-                {{ getUserInfos.name || getUserInfos.username }}
+                <img :src="userInfo.photo" class="layout-navbars-breadcrumb-user-link-photo mr5" />
+                {{ userInfo.name || userInfo.username }}
                 <i class="el-icon-arrow-down el-icon--right"></i>
             </span>
             <template #dropdown>
@@ -70,147 +65,131 @@
     </div>
 </template>
 
-<script lang="ts">
-import { ref, getCurrentInstance, computed, reactive, toRefs, onMounted } from 'vue';
+<script setup lang="ts" name="layoutBreadcrumbUser">
+import { ref, computed, reactive, onMounted } from 'vue';
 import { useRouter } from 'vue-router';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import screenfull from 'screenfull';
 import { resetRoute } from '@/router/index.ts';
-import { useStore } from '@/store/index.ts';
+import { storeToRefs } from 'pinia';
+import { useUserInfo } from '@/store/userInfo';
+import { useThemeConfig } from '@/store/themeConfig';
 import { clearSession, setLocal, getLocal, removeLocal } from '@/common/utils/storage.ts';
 import UserNews from '@/views/layout/navBars/breadcrumb/userNews.vue';
-import Search from '@/views/layout/navBars/breadcrumb/search.vue';
-export default {
-    name: 'layoutBreadcrumbUser',
-    components: { UserNews, SearchMenu: Search },
-    setup() {
-        const { proxy } = getCurrentInstance() as any;
-        const router = useRouter();
-        const store = useStore();
-        const searchRef = ref();
-        const state = reactive({
-            isScreenfull: false,
-            isShowUserNewsPopover: false,
-            disabledI18n: 'zh-cn',
-            disabledSize: '',
-        });
-        // 获取用户信息 vuex
-        const getUserInfos = computed(() => {
-            return store.state.userInfos.userInfos;
-        });
-        // 获取布局配置信息
-        const getThemeConfig = computed(() => {
-            return store.state.themeConfig.themeConfig;
-        });
-        // 设置分割样式
-        const layoutUserFlexNum = computed(() => {
-            let { layout, isClassicSplitMenu } = getThemeConfig.value;
-            let num = '';
-            if (layout === 'defaults' || (layout === 'classic' && !isClassicSplitMenu) || layout === 'columns') num = '1';
-            else num = '';
-            return num;
-        });
-        // 全屏点击时
-        const onScreenfullClick = () => {
-            if (!screenfull.isEnabled) {
-                ElMessage.warning('暂不不支持全屏');
-                return false;
-            }
-            screenfull.toggle();
-            state.isScreenfull = !state.isScreenfull;
-        };
-        // 布局配置 icon 点击时
-        const onLayoutSetingClick = () => {
-            proxy.mittBus.emit('openSetingsDrawer');
-        };
-        // 下拉菜单点击时
-        const onHandleCommandClick = (path: string) => {
-            if (path === 'logOut') {
-                ElMessageBox({
-                    closeOnClickModal: false,
-                    closeOnPressEscape: false,
-                    title: '提示',
-                    message: '此操作将退出登录, 是否继续?',
-                    showCancelButton: true,
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    beforeClose: (action, instance, done) => {
-                        if (action === 'confirm') {
-                            instance.confirmButtonLoading = true;
-                            instance.confirmButtonText = '退出中';
-                            setTimeout(() => {
-                                done();
-                                setTimeout(() => {
-                                    instance.confirmButtonLoading = false;
-                                }, 300);
-                            }, 700);
-                        } else {
-                            done();
-                        }
-                    },
-                })
-                    .then(() => {
-                        clearSession(); // 清除缓存/token等
-                        resetRoute(); // 删除/重置路由
-                        router.push('/login');
-                        setTimeout(() => {
-                            ElMessage.success('安全退出成功！');
-                        }, 300);
-                    })
-                    .catch(() => {});
-            } else {
-                router.push(path);
-            }
-        };
-        // 菜单搜索点击
-        const onSearchClick = () => {
-            searchRef.value.openSearch();
-        };
-        // 组件大小改变
-        const onComponentSizeChange = (size: string) => {
-            removeLocal('themeConfig');
-            getThemeConfig.value.globalComponentSize = size;
-            setLocal('themeConfig', getThemeConfig.value);
-            // proxy.$ELEMENT.size = size;
-            initComponentSize();
-            window.location.reload();
-        };
-        // 初始化全局组件大小
-        const initComponentSize = () => {
-            switch (getLocal('themeConfig').globalComponentSize) {
-                case '':
-                    state.disabledSize = '';
-                    break;
-                case 'default':
-                    state.disabledSize = 'default';
-                    break;
-                case 'small':
-                    state.disabledSize = 'small';
-                    break;
-                case 'large':
-                    state.disabledSize = 'large';
-                    break;
-            }
-        };
-        // 页面加载时
-        onMounted(() => {
-            if (getLocal('themeConfig')) {
-                initComponentSize();
-            }
-        });
-        return {
-            getUserInfos,
-            onLayoutSetingClick,
-            onHandleCommandClick,
-            onScreenfullClick,
-            onSearchClick,
-            onComponentSizeChange,
-            searchRef,
-            layoutUserFlexNum,
-            ...toRefs(state),
-        };
-    },
+import SearchMenu from '@/views/layout/navBars/breadcrumb/search.vue';
+import mittBus from '@/common/utils/mitt';
+
+const router = useRouter();
+const searchRef = ref();
+const state = reactive({
+    isScreenfull: false,
+    isShowUserNewsPopover: false,
+    disabledI18n: 'zh-cn',
+    disabledSize: '',
+});
+const { userInfo } = storeToRefs(useUserInfo());
+const { themeConfig } = storeToRefs(useThemeConfig());
+
+// 设置分割样式
+const layoutUserFlexNum = computed(() => {
+    let { layout, isClassicSplitMenu } = themeConfig.value;
+    let num = '';
+    if (layout === 'defaults' || (layout === 'classic' && !isClassicSplitMenu) || layout === 'columns') num = '1';
+    else num = '';
+    return num;
+});
+// 全屏点击时
+const onScreenfullClick = () => {
+    if (!screenfull.isEnabled) {
+        ElMessage.warning('暂不不支持全屏');
+        return false;
+    }
+    screenfull.toggle();
+    state.isScreenfull = !state.isScreenfull;
 };
+// 布局配置 icon 点击时
+const onLayoutSetingClick = () => {
+    mittBus.emit('openSetingsDrawer');
+};
+// 下拉菜单点击时
+const onHandleCommandClick = (path: string) => {
+    if (path === 'logOut') {
+        ElMessageBox({
+            closeOnClickModal: false,
+            closeOnPressEscape: false,
+            title: '提示',
+            message: '此操作将退出登录, 是否继续?',
+            showCancelButton: true,
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            beforeClose: (action, instance, done) => {
+                if (action === 'confirm') {
+                    instance.confirmButtonLoading = true;
+                    instance.confirmButtonText = '退出中';
+                    setTimeout(() => {
+                        done();
+                        setTimeout(() => {
+                            instance.confirmButtonLoading = false;
+                        }, 300);
+                    }, 700);
+                } else {
+                    done();
+                }
+            },
+        })
+            .then(() => {
+                clearSession(); // 清除缓存/token等
+                resetRoute(); // 删除/重置路由
+                router.push('/login');
+                setTimeout(() => {
+                    ElMessage.success('安全退出成功！');
+                }, 300);
+            })
+            .catch(() => { });
+    } else {
+        router.push(path);
+    }
+};
+
+// // 菜单搜索点击
+const onSearchClick = () => {
+    searchRef.value.openSearch();
+};
+
+// 组件大小改变
+const onComponentSizeChange = (size: string) => {
+    removeLocal('themeConfig');
+    themeConfig.value.globalComponentSize = size;
+    setLocal('themeConfig', themeConfig.value);
+    // proxy.$ELEMENT.size = size;
+    initComponentSize();
+    window.location.reload();
+};
+
+// 初始化全局组件大小
+const initComponentSize = () => {
+    switch (getLocal('themeConfig').globalComponentSize) {
+        case '':
+            state.disabledSize = '';
+            break;
+        case 'default':
+            state.disabledSize = 'default';
+            break;
+        case 'small':
+            state.disabledSize = 'small';
+            break;
+        case 'large':
+            state.disabledSize = 'large';
+            break;
+    }
+};
+
+// 页面加载时
+onMounted(() => {
+    if (getLocal('themeConfig')) {
+        initComponentSize();
+    }
+});
 </script>
 
 <style scoped lang="scss">
@@ -218,17 +197,20 @@ export default {
     display: flex;
     align-items: center;
     justify-content: flex-end;
+
     &-link {
         height: 100%;
         display: flex;
         align-items: center;
         white-space: nowrap;
+
         &-photo {
             width: 25px;
             height: 25px;
             border-radius: 100%;
         }
     }
+
     &-icon {
         padding: 0 10px;
         cursor: pointer;
@@ -237,25 +219,29 @@ export default {
         line-height: 50px;
         display: flex;
         align-items: center;
+
         &:hover {
             background: rgba(0, 0, 0, 0.04);
+
             i {
                 display: inline-block;
                 animation: logoAnimation 0.3s ease-in-out;
             }
         }
     }
+
     ::v-deep(.el-dropdown) {
         color: var(--bg-topBarColor);
     }
+
     ::v-deep(.el-badge) {
         height: 40px;
         line-height: 40px;
         display: flex;
         align-items: center;
     }
+
     ::v-deep(.el-badge__content.is-fixed) {
         top: 12px;
     }
-}
-</style>
+}</style>

mayfly_go_web/src/views/layout/navBars/index.vue

@@ -7,17 +7,16 @@
 
 <script lang="ts">
 import { computed } from 'vue';
-import { useStore } from '@/store/index.ts';
+import { useThemeConfig } from '@/store/themeConfig';
 import BreadcrumbIndex from '@/views/layout/navBars/breadcrumb/index.vue';
 import TagsView from '@/views/layout/navBars/tagsView/tagsView.vue';
 export default {
     name: 'layoutNavBars',
     components: { BreadcrumbIndex, TagsView },
     setup() {
-        const store = useStore();
         // 是否显示 tagsView
         const setShowTagsView = computed(() => {
-            let { layout, isTagsview } = store.state.themeConfig.themeConfig;
+            let { layout, isTagsview } = useThemeConfig().themeConfig;
             return layout !== 'classic' && isTagsview;
         });
         return {

mayfly_go_web/src/views/layout/navBars/tagsView/contextmenu.vue

@@ -1,110 +1,138 @@
 <template>
-    <transition name="el-zoom-in-center">
-        <div
-            aria-hidden="true"
-            class="el-dropdown__popper el-popper is-light is-pure custom-contextmenu"
-            role="tooltip"
-            data-popper-placement="bottom"
-            :style="`top: ${dropdowns.y + 5}px;left: ${dropdowns.x}px;`"
-            :key="Math.random()"
-            v-show="isShow"
-        >
-            <ul class="el-dropdown-menu">
-                <template v-for="(v, k) in dropdownList">
-                    <li
-                        class="el-dropdown-menu__item"
-                        aria-disabled="false"
-                        tabindex="-1"
-                        :key="k"
-                        v-if="!v.affix"
-                        @click="onCurrentContextmenuClick(v.id)"
-                    >
-                        <i :class="v.icon"></i>
-                        <span>{{ v.txt }}</span>
-                    </li>
-                </template>
-            </ul>
-            <div class="el-popper__arrow" style="left: 10px"></div>
-        </div>
-    </transition>
+	<transition name="el-zoom-in-center">
+		<div
+			aria-hidden="true"
+			class="el-dropdown__popper el-popper is-light is-pure custom-contextmenu"
+			role="tooltip"
+			data-popper-placement="bottom"
+			:style="`top: ${dropdowns.y + 5}px;left: ${dropdowns.x}px;`"
+			:key="Math.random()"
+			v-show="state.isShow"
+		>
+			<ul class="el-dropdown-menu">
+				<template v-for="(v, k) in state.dropdownList">
+					<li
+						class="el-dropdown-menu__item"
+						aria-disabled="false"
+						tabindex="-1"
+						:key="k"
+						v-if="!v.affix"
+						@click="onCurrentContextmenuClick(v.contextMenuClickId)"
+					>
+						<SvgIcon :name="v.icon" />
+						<span>{{ v.txt }}</span>
+					</li>
+				</template>
+			</ul>
+			<div class="el-popper__arrow" :style="{ left: `${state.arrowLeft}px` }"></div>
+		</div>
+	</transition>
 </template>
 
-<script lang="ts">
-import { computed, defineComponent, reactive, toRefs, onMounted, onUnmounted } from 'vue';
-export default defineComponent({
-    name: 'layoutTagsViewContextmenu',
-    props: {
-        dropdown: {
-            type: Object,
-        },
-    },
-    setup(props, { emit }) {
-        const state = reactive({
-            isShow: false,
-            dropdownList: [
-                { id: 0, txt: '刷新', affix: false, icon: 'el-icon-refresh-right' },
-                { id: 1, txt: '关闭', affix: false, icon: 'el-icon-close' },
-                { id: 2, txt: '关闭其他', affix: false, icon: 'el-icon-circle-close' },
-                { id: 3, txt: '关闭所有', affix: false, icon: 'el-icon-folder-delete' },
-                {
-                    id: 4,
-                    txt: '当前页全屏',
-                    affix: false,
-                    icon: 'el-icon-full-screen',
-                },
-            ],
-            path: {},
-        });
-        // 父级传过来的坐标 x,y 值
-        const dropdowns = computed(() => {
-            return props.dropdown;
-        });
-        // 当前项菜单点击
-        const onCurrentContextmenuClick = (id: number) => {
-            emit('currentContextmenuClick', { id, path: state.path });
-        };
-        // 打开右键菜单：判断是否固定，固定则不显示关闭按钮
-        const openContextmenu = (item: any) => {
-            state.path = item.fullPath;
-            item.meta.isAffix ? (state.dropdownList[1].affix = true) : (state.dropdownList[1].affix = false);
-            closeContextmenu();
-            setTimeout(() => {
-                state.isShow = true;
-            }, 10);
-        };
-        // 关闭右键菜单
-        const closeContextmenu = () => {
-            state.isShow = false;
-        };
-        // 监听页面监听进行右键菜单的关闭
-        onMounted(() => {
-            document.body.addEventListener('click', closeContextmenu);
-        });
-        // 页面卸载时，移除右键菜单监听事件
-        onUnmounted(() => {
-            document.body.removeEventListener('click', closeContextmenu);
-        });
-        return {
-            dropdowns,
-            openContextmenu,
-            closeContextmenu,
-            onCurrentContextmenuClick,
-            ...toRefs(state),
-        };
-    },
+<script setup lang="ts" name="layoutTagsViewContextmenu">
+import { computed, reactive, onMounted, onUnmounted, watch } from 'vue';
+
+// 定义父组件传过来的值
+const props = defineProps({
+	dropdown: {
+		type: Object,
+		default: () => {
+			return {
+				x: 0,
+				y: 0,
+			};
+		},
+	},
+});
+
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['currentContextmenuClick']);
+
+// 定义变量内容
+const state = reactive({
+	isShow: false,
+	dropdownList: [
+		{ contextMenuClickId: 0, txt: '刷新', affix: false, icon: 'RefreshRight' },
+		{ contextMenuClickId: 1, txt: '关闭', affix: false, icon: 'Close' },
+		{ contextMenuClickId: 2, txt: '关闭其他', affix: false, icon: 'CircleClose' },
+		{ contextMenuClickId: 3, txt: '关闭所有', affix: false, icon: 'FolderDelete' },
+		{
+			contextMenuClickId: 4,
+			txt: '当前页全屏',
+			affix: false,
+			icon: 'full-screen',
+		},
+	],
+	item: {} as any,
+	arrowLeft: 10,
+});
+
+// 父级传过来的坐标 x,y 值
+const dropdowns = computed(() => {
+	// 117 为 `Dropdown 下拉菜单` 的宽度
+	if (props.dropdown.x + 117 > document.documentElement.clientWidth) {
+		return {
+			x: document.documentElement.clientWidth - 117 - 5,
+			y: props.dropdown.y,
+		};
+	} else {
+		return props.dropdown;
+	}
+});
+// 当前项菜单点击
+const onCurrentContextmenuClick = (contextMenuClickId: number) => {
+	emit('currentContextmenuClick', { id: contextMenuClickId, path: state.item.fullPath });
+};
+// 打开右键菜单：判断是否固定，固定则不显示关闭按钮
+const openContextmenu = (item: any) => {
+	state.item = item;
+	item.meta?.isAffix ? (state.dropdownList[1].affix = true) : (state.dropdownList[1].affix = false);
+	closeContextmenu();
+	setTimeout(() => {
+		state.isShow = true;
+	}, 10);
+};
+// 关闭右键菜单
+const closeContextmenu = () => {
+	state.isShow = false;
+};
+// 监听页面监听进行右键菜单的关闭
+onMounted(() => {
+	document.body.addEventListener('click', closeContextmenu);
+});
+// 页面卸载时，移除右键菜单监听事件
+onUnmounted(() => {
+	document.body.removeEventListener('click', closeContextmenu);
+});
+// 监听下拉菜单位置
+watch(
+	() => props.dropdown,
+	({ x }) => {
+		if (x + 117 > document.documentElement.clientWidth) state.arrowLeft = 117 - (document.documentElement.clientWidth - x);
+		else state.arrowLeft = 10;
+	},
+	{
+		deep: true,
+	}
+);
+
+// 暴露变量
+defineExpose({
+	openContextmenu,
 });
 </script>
 
 <style scoped lang="scss">
 .custom-contextmenu {
-    transform-origin: center top;
-    z-index: 2190;
-    position: fixed;
-    .el-dropdown-menu__item {
-        font-size: 12px !important;
-        i {
-            font-size: 12px !important;
-        }
-    }
+	transform-origin: center top;
+	z-index: 2190;
+	position: fixed;
+	.el-dropdown-menu__item {
+		font-size: 12px !important;
+		white-space: nowrap;
+		i {
+			font-size: 12px !important;
+		}
+	}
 }
-</style>
+</style>

mayfly_go_web/src/views/layout/navBars/tagsView/tagsView.vue

@@ -1,389 +1,380 @@
 <template>
-    <div class="layout-navbars-tagsview" :class="{ 'layout-navbars-tagsview-shadow': getThemeConfig.layout === 'classic' }">
+    <div class="layout-navbars-tagsview" :class="{ 'layout-navbars-tagsview-shadow': themeConfig.layout === 'classic' }">
         <el-scrollbar ref="scrollbarRef" @wheel.prevent="onHandleScroll">
             <ul class="layout-navbars-tagsview-ul" :class="setTagsStyle" ref="tagsUlRef">
-                <li
-                    v-for="(v, k) in tagsViewList"
-                    :key="k"
-                    class="layout-navbars-tagsview-ul-li"
-                    :data-name="v.name"
-                    :class="{ 'is-active': isActive(v) }"
-                    @contextmenu.prevent="onContextmenu(v, $event)"
-                    @click="onTagsClick(v, k)"
-                    :ref="
+                <li v-for="(v, k) in state.tagsViewList" :key="k" class="layout-navbars-tagsview-ul-li" :data-name="v.name"
+                    :class="{ 'is-active': isActive(v) }" @contextmenu.prevent="onContextmenu(v, $event)"
+                    @click="onTagsClick(v, k)" :ref="
                         (el) => {
                             if (el) tagsRefs[k] = el;
                         }
-                    "
-                >
-                    <i class="iconfont icon-webicon318 layout-navbars-tagsview-ul-li-iconfont font14" v-if="isActive(v)"></i>
-                    <SvgIcon
-                        :name="v.meta.icon"
-                        class="layout-navbars-tagsview-ul-li-iconfont"
-                        v-if="!isActive(v) && getThemeConfig.isTagsviewIcon"
-                    />
+                    ">
+                    <SvgIcon name="iconfont icon-tag-view-active" class="layout-navbars-tagsview-ul-li-iconfont font14"
+                        v-if="isActive(v)" />
+                    <SvgIcon :name="v.meta.icon" class="layout-navbars-tagsview-ul-li-iconfont"
+                        v-if="!isActive(v) && themeConfig.isTagsviewIcon" />
                     <span>{{ v.meta.title }}</span>
                     <template v-if="isActive(v)">
-                        <SvgIcon
-                            name="RefreshRight"
-                            class="ml5 layout-navbars-tagsview-ul-li-refresh"
-                            @click.stop="refreshCurrentTagsView($route.fullPath)"
-                        />
-                        <SvgIcon
-                            name="Close"
-                            class="layout-navbars-tagsview-ul-li-icon layout-icon-active"
+                        <SvgIcon name="RefreshRight" class="font14 ml5 layout-navbars-tagsview-ul-li-refresh"
+                            @click.stop="refreshCurrentTagsView($route.fullPath)" />
+                        <SvgIcon name="Close" class="font14 layout-navbars-tagsview-ul-li-icon layout-icon-active"
                             v-if="!v.meta.isAffix"
-                            @click.stop="closeCurrentTagsView(getThemeConfig.isShareTagsView ? v.path : v.path)"
-                        />
+                            @click.stop="closeCurrentTagsView(themeConfig.isShareTagsView ? v.path : v.path)" />
                     </template>
-                    <SvgIcon
-                        name="Close"
-                        class="layout-navbars-tagsview-ul-li-icon layout-icon-three"
+
+                    <SvgIcon name="Close" class="font14 layout-navbars-tagsview-ul-li-icon layout-icon-three"
                         v-if="!v.meta.isAffix"
-                        @click.stop="closeCurrentTagsView(getThemeConfig.isShareTagsView ? v.path : v.path)"
-                    />
+                        @click.stop="closeCurrentTagsView(themeConfig.isShareTagsView ? v.path : v.path)" />
                 </li>
             </ul>
         </el-scrollbar>
-        <Contextmenu :dropdown="dropdown" ref="contextmenuRef" @currentContextmenuClick="onCurrentContextmenuClick" />
+        <Contextmenu :dropdown="state.dropdown" ref="contextmenuRef" @currentContextmenuClick="onCurrentContextmenuClick" />
     </div>
 </template>
 
-<script lang="ts">
-import { toRefs, reactive, onMounted, computed, ref, nextTick, onBeforeUpdate, onBeforeMount, onUnmounted, getCurrentInstance, watch } from 'vue';
+<script lang="ts" setup name="layoutTagsView">
+import { reactive, onMounted, computed, ref, nextTick, onBeforeUpdate, onBeforeMount, onUnmounted, getCurrentInstance, watch } from 'vue';
 import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
 import screenfull from 'screenfull';
-import { useStore } from '@/store/index.ts';
-import { setSession, getSession, removeSession } from '@/common/utils/storage.ts';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '@/store/themeConfig';
+import { getSession, setSession, removeSession } from '@/common/utils/storage';
+import mittBus from '@/common/utils/mitt';
 import Sortable from 'sortablejs';
 import Contextmenu from '@/views/layout/navBars/tagsView/contextmenu.vue';
-export default {
-    name: 'layoutTagsView',
-    components: { Contextmenu },
-    setup() {
-        const { proxy } = getCurrentInstance() as any;
-        const tagsRefs = ref([]);
-        const scrollbarRef = ref();
-        const contextmenuRef = ref();
-        const tagsUlRef = ref();
-        const store = useStore();
-        const route = useRoute();
-        const router = useRouter();
-        const state: any = reactive({
-            routePath: route.fullPath,
-            dropdown: { x: '', y: '' },
-            tagsRefsIndex: 0,
-            tagsViewList: [],
-            sortable: '',
-        });
-        // 动态设置 tagsView 风格样式
-        const setTagsStyle = computed(() => {
-            return store.state.themeConfig.themeConfig.tagsStyle;
-        });
-        // 获取布局配置信息
-        const getThemeConfig = computed(() => {
-            return store.state.themeConfig.themeConfig;
-        });
-        // 存储 tagsViewList 到浏览器临时缓存中，页面刷新时，保留记录
-        const addBrowserSetSession = (tagsViewList: Array<object>) => {
-            setSession('tagsViewList', tagsViewList);
-        };
-        // 获取 vuex 中的 tagsViewRoutes 列表
-        const getTagsViewRoutes = () => {
-            state.routePath = route.fullPath;
-            state.tagsViewList = [];
-            if (!store.state.themeConfig.themeConfig.isCacheTagsView) removeSession('tagsViewList');
-            initTagsView();
-        };
-        // vuex 中获取路由信息：如果是设置了固定的（isAffix），进行初始化显示
-        const initTagsView = () => {
-            if (getSession('tagsViewList') && store.state.themeConfig.themeConfig.isCacheTagsView) {
-                state.tagsViewList = getSession('tagsViewList');
-            } else {
-                // state.tagsViews.map((v: any) => {
-                // 	if (v.meta.isAffix && !v.meta.isHide) state.tagsViewList.push({ ...v });
-                // });
-                addTagsView(route.fullPath);
-            }
-            // 初始化当前元素(li)的下标
-            getTagsRefsIndex(route.fullPath);
-            // 添加初始化横向滚动条移动到对应位置
-            tagsViewmoveToCurrentTag();
-        };
 
-        // 1、添加 tagsView：未设置隐藏（isHide）也添加到在 tagsView 中
-        // path为fullPath
-        const addTagsView = (path: string, to: any = null) => {
-            if (!to) {
-                to = route;
-            }
-            path = decodeURI(path);
-            for (let tv of state.tagsViewList) {
-                if (tv.fullPath === path) {
-                    return false;
-                }
-            }
-            state.tagsViewList.push({ ...to });
-            // addBrowserSetSession(state.tagsViewList);
-        };
+const { proxy } = getCurrentInstance() as any;
+const tagsRefs = ref([]) as any;
+const scrollbarRef = ref();
+const contextmenuRef = ref();
+const tagsUlRef = ref();
+const { themeConfig } = storeToRefs(useThemeConfig());
+const route = useRoute();
+const router = useRouter();
 
-        // 2、刷新当前 tagsView：
-        // path为fullPath
-        const refreshCurrentTagsView = (path: string) => {
-            proxy.mittBus.emit('onTagsViewRefreshRouterView', path);
-        };
+const state = reactive({
+    routePath: route.fullPath,
+    dropdown: { x: '', y: '' },
+    tagsRefsIndex: 0,
+    tagsViewList: [] as any,
+    sortable: '' as any,
+});
 
-        // 3、关闭当前 tagsView：如果是设置了固定的（isAffix），不可以关闭
-        // path为fullPath
-        const closeCurrentTagsView = (path: string) => {
-            console.log(path)
-            state.tagsViewList.map((v: any, k: number, arr: any) => {
-                if (!v.meta.isAffix) {
-                    if (v.fullPath === path) {
-                        state.tagsViewList.splice(k, 1);
-                        setTimeout(() => {
-                            // 最后一个
-                            if (state.tagsViewList.length === k) router.push({ path: arr[arr.length - 1].path, query: arr[arr.length - 1].query });
-                            // 否则，跳转到下一个
-                            else router.push({ path: arr[k].path, query: arr[k].query });
-                        }, 0);
-                    }
-                }
-            });
-            // addBrowserSetSession(state.tagsViewList);
-        };
+// 动态设置 tagsView 风格样式
+const setTagsStyle = computed(() => {
+    return themeConfig.value.tagsStyle;
+});
 
-        // 4、关闭其它 tagsView：如果是设置了固定的（isAffix），不进行关闭
-        const closeOtherTagsView = (path: string) => {
-            const oldTagViews = state.tagsViewList;
-            state.tagsViewList = [];
-            oldTagViews.map((v: any) => {
-                if (v.meta.isAffix && !v.meta.isHide) state.tagsViewList.push({ ...v });
-            });
-            addTagsView(path);
-        };
-
-        // 5、关闭全部 tagsView：如果是设置了固定的（isAffix），不进行关闭
-        const closeAllTagsView = (path: string) => {
-            const oldTagViews = state.tagsViewList;
-            state.tagsViewList = [];
-            oldTagViews.map((v: any) => {
-                if (v.meta.isAffix && !v.meta.isHide) {
-                    state.tagsViewList.push({ ...v });
-                    if (state.tagsViewList.some((v: any) => v.path === path)) router.push({ path, query: route.query });
-                    else router.push({ path: v.path, query: route.query });
-                }
-            });
-            // addBrowserSetSession(state.tagsViewList);
-        };
-        // 6、开启当前页面全屏
-        const openCurrenFullscreen = (path: string) => {
-            const item = state.tagsViewList.find((v: any) => v.fullPath === path);
-            nextTick(() => {
-                router.push({ path, query: item.query });
-                const element = document.querySelector('.layout-main');
-                const screenfulls: any = screenfull;
-                screenfulls.request(element);
-            });
-        };
-        // 当前项右键菜单点击
-        const onCurrentContextmenuClick = (data: any) => {
-            // path为fullPath
-            let { id, path } = data;
-            let currentTag = state.tagsViewList.find((v: any) => v.fullPath === path);
-            switch (id) {
-                case 0:
-                    refreshCurrentTagsView(path);
-                    router.push({ path, query: currentTag.query });
-                    break;
-                case 1:
-                    closeCurrentTagsView(path);
-                    break;
-                case 2:
-                    router.push({ path, query: currentTag.query });
-                    closeOtherTagsView(path);
-                    break;
-                case 3:
-                    closeAllTagsView(path);
-                    break;
-                case 4:
-                    openCurrenFullscreen(path);
-                    break;
-            }
-        };
-        // 判断页面高亮
-        const isActive = (route: any) => {
-            return route.fullPath === state.routePath;
-        };
-        // 右键点击时：传 x,y 坐标值到子组件中（props）
-        const onContextmenu = (v: any, e: any) => {
-            const { clientX, clientY } = e;
-            state.dropdown.x = clientX;
-            state.dropdown.y = clientY;
-            contextmenuRef.value.openContextmenu(v);
-        };
-        // 当前的 tagsView 项点击时
-        const onTagsClick = (v: any, k: number) => {
-            state.routePath = decodeURI(v.fullPath);
-            state.tagsRefsIndex = k;
-            router.push(v);
-        };
-        // 更新滚动条显示
-        const updateScrollbar = () => {
-            proxy.$refs.scrollbarRef.update();
-        };
-        // 鼠标滚轮滚动
-        const onHandleScroll = (e: any) => {
-            proxy.$refs.scrollbarRef.$refs.wrapRef.scrollLeft += e.wheelDelta / 4;
-        };
-        // tagsView 横向滚动
-        const tagsViewmoveToCurrentTag = () => {
-            nextTick(() => {
-                if (tagsRefs.value.length <= 0) return false;
-                // 当前 li 元素
-                let liDom = tagsRefs.value[state.tagsRefsIndex];
-                // 当前 li 元素下标
-                let liIndex = state.tagsRefsIndex;
-                // 当前 ul 下 li 元素总长度
-                let liLength = tagsRefs.value.length;
-                // 最前 li
-                let liFirst: any = tagsRefs.value[0];
-                // 最后 li
-                let liLast: any = tagsRefs.value[tagsRefs.value.length - 1];
-                // 当前滚动条的值
-                let scrollRefs = proxy.$refs.scrollbarRef.$refs.wrapRef;
-                // 当前滚动条滚动宽度
-                let scrollS = scrollRefs.scrollWidth;
-                // 当前滚动条偏移宽度
-                let offsetW = scrollRefs.offsetWidth;
-                // 当前滚动条偏移距离
-                let scrollL = scrollRefs.scrollLeft;
-                // 上一个 tags li dom
-                let liPrevTag: any = tagsRefs.value[state.tagsRefsIndex - 1];
-                // 下一个 tags li dom
-                let liNextTag: any = tagsRefs.value[state.tagsRefsIndex + 1];
-                // 上一个 tags li dom 的偏移距离
-                let beforePrevL: any = '';
-                // 下一个 tags li dom 的偏移距离
-                let afterNextL: any = '';
-                if (liDom === liFirst) {
-                    // 头部
-                    scrollRefs.scrollLeft = 0;
-                } else if (liDom === liLast) {
-                    // 尾部
-                    scrollRefs.scrollLeft = scrollS - offsetW;
-                } else {
-                    // 非头/尾部
-                    if (liIndex === 0) beforePrevL = liFirst.offsetLeft - 5;
-                    else beforePrevL = liPrevTag?.offsetLeft - 5;
-                    if (liIndex === liLength) afterNextL = liLast.offsetLeft + liLast.offsetWidth + 5;
-                    else afterNextL = liNextTag.offsetLeft + liNextTag.offsetWidth + 5;
-                    if (afterNextL > scrollL + offsetW) {
-                        scrollRefs.scrollLeft = afterNextL - offsetW;
-                    } else if (beforePrevL < scrollL) {
-                        scrollRefs.scrollLeft = beforePrevL;
-                    }
-                }
-                // 更新滚动条，防止不出现
-                updateScrollbar();
-            });
-        };
-        // 获取 tagsView 的下标：用于处理 tagsView 点击时的横向滚动
-        const getTagsRefsIndex = (path: string) => {
-            if (state.tagsViewList.length > 0) {
-                state.tagsRefsIndex = state.tagsViewList.findIndex((item: any) => item.fullPath === path);
-            }
-        };
-        // 设置 tagsView 可以进行拖拽
-        const initSortable = () => {
-            const el: any = document.querySelector('.layout-navbars-tagsview-ul');
-            if (!el) return false;
-            if (!getThemeConfig.value.isSortableTagsView) state.sortable && state.sortable.destroy();
-            if (getThemeConfig.value.isSortableTagsView) {
-                state.sortable = Sortable.create(el, {
-                    animation: 300,
-                    dataIdAttr: 'data-name',
-                    onEnd: () => {
-                        const sortEndList: any = [];
-                        state.sortable.toArray().map((val: any) => {
-                            state.tagsViewList.map((v: any) => {
-                                if (v.name === val) sortEndList.push({ ...v });
-                            });
-                        });
-                        // addBrowserSetSession(sortEndList);
-                    },
-                });
-            }
-        };
-        // 监听路由的变化，动态赋值给 tagsView
-        // watch(store.state, (val) => {
-        // 	if (val.tagsViews.tagsViews.length === state.tagsViewList.length) return false;
-        // 	getTagsViewRoutes();
-        // });
-        // 页面加载前
-        onBeforeMount(() => {
-            // 监听非本页面调用 0 刷新当前，1 关闭当前，2 关闭其它，3 关闭全部 4 当前页全屏
-            proxy.mittBus.on('onCurrentContextmenuClick', (data: object) => {
-                onCurrentContextmenuClick(data);
-            });
-            // 监听布局配置界面开启/关闭拖拽
-            proxy.mittBus.on('openOrCloseSortable', () => {
-                initSortable();
-            });
-        });
-        // 页面卸载时
-        onUnmounted(() => {
-            // 取消非本页面调用监听
-            proxy.mittBus.off('onCurrentContextmenuClick');
-            // 取消监听布局配置界面开启/关闭拖拽
-            proxy.mittBus.off('openOrCloseSortable');
-        });
-        // 页面更新时
-        onBeforeUpdate(() => {
-            tagsRefs.value = [];
-        });
-        // 页面加载时
-        onMounted(() => {
-            // 初始化 tagsViewRoutes 列表
-            getTagsViewRoutes();
-            initSortable();
-        });
-        // 路由更新时
-        onBeforeRouteUpdate((to) => {
-            state.routePath = decodeURI(to.fullPath);
-            addTagsView(to.fullPath, to);
-            getTagsRefsIndex(to.fullPath);
-            tagsViewmoveToCurrentTag();
-        });
-        return {
-            isActive,
-            onContextmenu,
-            getTagsViewRoutes,
-            onTagsClick,
-            tagsRefs,
-            contextmenuRef,
-            scrollbarRef,
-            tagsUlRef,
-            onHandleScroll,
-            getThemeConfig,
-            setTagsStyle,
-            refreshCurrentTagsView,
-            closeCurrentTagsView,
-            onCurrentContextmenuClick,
-            ...toRefs(state),
-        };
-    },
+// 存储 tagsViewList 到浏览器临时缓存中，页面刷新时，保留记录
+const addBrowserSetSession = (tagsViewList: Array<object>) => {
+    setSession('tagsViewList', tagsViewList);
 };
+
+// 获取 vuex 中的 tagsViewRoutes 列表
+const getTagsViewRoutes = () => {
+    state.routePath = route.fullPath;
+    state.tagsViewList = [];
+    if (!themeConfig.value.isCacheTagsView) removeSession('tagsViewList');
+    initTagsView();
+};
+// vuex 中获取路由信息：如果是设置了固定的（isAffix），进行初始化显示
+const initTagsView = () => {
+    if (getSession('tagsViewList') && themeConfig.value.isCacheTagsView) {
+        state.tagsViewList = getSession('tagsViewList');
+    } else {
+        state.tagsViewList?.map((v: any) => {
+            if (v.meta.isAffix && !v.meta.isHide) state.tagsViewList.push({ ...v });
+        });
+        addTagsView(route.fullPath);
+    }
+    // 初始化当前元素(li)的下标
+    getTagsRefsIndex(route.fullPath);
+    // 添加初始化横向滚动条移动到对应位置
+    tagsViewmoveToCurrentTag();
+};
+
+// 1、添加 tagsView：未设置隐藏（isHide）也添加到在 tagsView 中
+// path为fullPath
+const addTagsView = (path: string, to: any = null) => {
+    if (!to) {
+        to = route;
+    }
+
+    path = decodeURI(path);
+    for (let tv of state.tagsViewList) {
+        if (tv.fullPath === path) {
+            return false;
+        }
+    }
+    
+    const tagView = { ...to }
+    // 防止Converting circular structure to JSON错误
+    tagView.matched = null;
+    tagView.redirectedFrom = null;
+    state.tagsViewList.push(tagView);
+    addBrowserSetSession(state.tagsViewList);
+};
+
+// 2、刷新当前 tagsView：
+// path为fullPath
+const refreshCurrentTagsView = (path: string) => {
+    mittBus.emit('onTagsViewRefreshRouterView', path);
+};
+
+// 3、关闭当前 tagsView：如果是设置了固定的（isAffix），不可以关闭
+// path为fullPath
+const closeCurrentTagsView = (path: string) => {
+    state.tagsViewList.map((v: any, k: number, arr: any) => {
+        if (!v.meta.isAffix) {
+            if (v.fullPath === path) {
+                state.tagsViewList.splice(k, 1);
+                setTimeout(() => {
+                    if (state.routePath !== path) {
+                        return;
+                    }
+                    let next;
+                    // 最后一个且高亮时
+                    if (state.tagsViewList.length === k) {
+                        next = k !== arr.length ? arr[k] : arr[arr.length - 1]
+                    } else {
+                        next = arr[k];
+                    }
+
+                    if (next.meta.isDynamic) {
+                        router.push({ name: next.name, params: next.params });
+                    } else {
+                        router.push({ path: next.path, query: next.query });
+                    }
+                }, 0);
+            }
+        }
+    });
+    addBrowserSetSession(state.tagsViewList);
+};
+
+// 4、关闭其它 tagsView：如果是设置了固定的（isAffix），不进行关闭
+const closeOtherTagsView = (path: string) => {
+    const oldTagViews = state.tagsViewList;
+    state.tagsViewList = [];
+    oldTagViews.map((v: any) => {
+        if (v.meta.isAffix && !v.meta.isHide) state.tagsViewList.push({ ...v });
+    });
+    addTagsView(path);
+};
+
+// 5、关闭全部 tagsView：如果是设置了固定的（isAffix），不进行关闭
+const closeAllTagsView = (path: string) => {
+    const oldTagViews = state.tagsViewList;
+    state.tagsViewList = [];
+    oldTagViews.map((v: any) => {
+        if (v.meta.isAffix && !v.meta.isHide) {
+            state.tagsViewList.push({ ...v });
+            if (state.tagsViewList.some((v: any) => v.path === path)) router.push({ path, query: route.query });
+            else router.push({ path: v.path, query: route.query });
+        }
+    });
+    addBrowserSetSession(state.tagsViewList);
+};
+// 6、开启当前页面全屏
+const openCurrenFullscreen = (path: string) => {
+    const item = state.tagsViewList.find((v: any) => v.fullPath === path);
+    nextTick(() => {
+        router.push({ path, query: item.query });
+        const element = document.querySelector('.layout-main');
+        const screenfulls: any = screenfull;
+        screenfulls.request(element);
+    });
+};
+// 当前项右键菜单点击
+const onCurrentContextmenuClick = (data: any) => {
+    // path为fullPath
+    let { id, path } = data;
+    let currentTag = state.tagsViewList.find((v: any) => v.fullPath === path);
+    switch (id) {
+        case 0:
+            refreshCurrentTagsView(path);
+            router.push({ path, query: currentTag.query });
+            break;
+        case 1:
+            closeCurrentTagsView(path);
+            break;
+        case 2:
+            router.push({ path, query: currentTag.query });
+            closeOtherTagsView(path);
+            break;
+        case 3:
+            closeAllTagsView(path);
+            break;
+        case 4:
+            openCurrenFullscreen(path);
+            break;
+    }
+};
+// 判断页面高亮
+const isActive = (route: any) => {
+    return route.fullPath === state.routePath;
+};
+// 右键点击时：传 x,y 坐标值到子组件中（props）
+const onContextmenu = (v: any, e: any) => {
+    const { clientX, clientY } = e;
+    state.dropdown.x = clientX;
+    state.dropdown.y = clientY;
+    contextmenuRef.value.openContextmenu(v);
+};
+// 当前的 tagsView 项点击时
+const onTagsClick = (v: any, k: number) => {
+    state.routePath = decodeURI(v.fullPath);
+    state.tagsRefsIndex = k;
+    router.push(v);
+};
+// 更新滚动条显示
+const updateScrollbar = () => {
+    proxy.$refs.scrollbarRef.update();
+};
+// 鼠标滚轮滚动
+const onHandleScroll = (e: any) => {
+    proxy.$refs.scrollbarRef.$refs.wrapRef.scrollLeft += e.wheelDelta / 4;
+};
+// tagsView 横向滚动
+const tagsViewmoveToCurrentTag = () => {
+    nextTick(() => {
+        if (tagsRefs.value.length <= 0) return false;
+        // 当前 li 元素
+        let liDom = tagsRefs.value[state.tagsRefsIndex];
+        // 当前 li 元素下标
+        let liIndex = state.tagsRefsIndex;
+        // 当前 ul 下 li 元素总长度
+        let liLength = tagsRefs.value.length;
+        // 最前 li
+        let liFirst: any = tagsRefs.value[0];
+        // 最后 li
+        let liLast: any = tagsRefs.value[tagsRefs.value.length - 1];
+        // 当前滚动条的值
+        let scrollRefs = proxy.$refs.scrollbarRef.$refs.wrapRef;
+        // 当前滚动条滚动宽度
+        let scrollS = scrollRefs.scrollWidth;
+        // 当前滚动条偏移宽度
+        let offsetW = scrollRefs.offsetWidth;
+        // 当前滚动条偏移距离
+        let scrollL = scrollRefs.scrollLeft;
+        // 上一个 tags li dom
+        let liPrevTag: any = tagsRefs.value[state.tagsRefsIndex - 1];
+        // 下一个 tags li dom
+        let liNextTag: any = tagsRefs.value[state.tagsRefsIndex + 1];
+        // 上一个 tags li dom 的偏移距离
+        let beforePrevL: any = '';
+        // 下一个 tags li dom 的偏移距离
+        let afterNextL: any = '';
+        if (liDom === liFirst) {
+            // 头部
+            scrollRefs.scrollLeft = 0;
+        } else if (liDom === liLast) {
+            // 尾部
+            scrollRefs.scrollLeft = scrollS - offsetW;
+        } else {
+            // 非头/尾部
+            if (liIndex === 0) beforePrevL = liFirst.offsetLeft - 5;
+            else beforePrevL = liPrevTag?.offsetLeft - 5;
+            if (liIndex === liLength) afterNextL = liLast.offsetLeft + liLast.offsetWidth + 5;
+            else afterNextL = liNextTag.offsetLeft + liNextTag.offsetWidth + 5;
+            if (afterNextL > scrollL + offsetW) {
+                scrollRefs.scrollLeft = afterNextL - offsetW;
+            } else if (beforePrevL < scrollL) {
+                scrollRefs.scrollLeft = beforePrevL;
+            }
+        }
+        // 更新滚动条，防止不出现
+        updateScrollbar();
+    });
+};
+// 获取 tagsView 的下标：用于处理 tagsView 点击时的横向滚动
+const getTagsRefsIndex = (path: string) => {
+    if (state.tagsViewList.length > 0) {
+        state.tagsRefsIndex = state.tagsViewList.findIndex((item: any) => item.fullPath === path);
+    }
+};
+// 设置 tagsView 可以进行拖拽
+const initSortable = () => {
+    const el: any = document.querySelector('.layout-navbars-tagsview-ul');
+    if (!el) return false;
+    if (!themeConfig.value.isSortableTagsView) state.sortable && state.sortable.destroy();
+    if (themeConfig.value.isSortableTagsView) {
+        state.sortable = Sortable.create(el, {
+            animation: 300,
+            dataIdAttr: 'data-name',
+            onEnd: () => {
+                const sortEndList: any = [];
+                state.sortable.toArray().map((val: any) => {
+                    state.tagsViewList.map((v: any) => {
+                        if (v.name === val) sortEndList.push({ ...v });
+                    });
+                });
+                addBrowserSetSession(sortEndList);
+            },
+        });
+    }
+};
+
+// 监听路由的变化，动态赋值给 tagsView
+// watch(
+// 	pinia.state,
+// 	(val) => {
+// 		if (val.tagsViewRoutes.tagsViewRoutes.length === state.tagsViewRoutesList.length) return false;
+// 		getTagsViewRoutes();
+// 	},
+// 	{
+// 		deep: true,
+// 	}
+// );
+
+// 页面加载前
+onBeforeMount(() => {
+    // 监听非本页面调用 0 刷新当前，1 关闭当前，2 关闭其它，3 关闭全部 4 当前页全屏
+    mittBus.on('onCurrentContextmenuClick', (data: object) => {
+        onCurrentContextmenuClick(data);
+    });
+    // 监听布局配置界面开启/关闭拖拽
+    mittBus.on('openOrCloseSortable', () => {
+        initSortable();
+    });
+});
+// 页面卸载时
+onUnmounted(() => {
+    // 取消非本页面调用监听
+    mittBus.off('onCurrentContextmenuClick');
+    // 取消监听布局配置界面开启/关闭拖拽
+    mittBus.off('openOrCloseSortable');
+});
+// 页面更新时
+onBeforeUpdate(() => {
+    tagsRefs.value = [];
+});
+// 页面加载时
+onMounted(() => {
+    // 初始化 tagsViewRoutes 列表
+    getTagsViewRoutes();
+    initSortable();
+});
+// 路由更新时
+onBeforeRouteUpdate((to) => {
+    state.routePath = decodeURI(to.fullPath);
+    addTagsView(to.fullPath, to);
+    getTagsRefsIndex(to.fullPath);
+    tagsViewmoveToCurrentTag();
+});
 </script>
 
 <style scoped lang="scss">
 .layout-navbars-tagsview {
-    flex: 1;
-    background-color: #ffffff;
-    border-bottom: 1px solid #f1f2f3;
-    ::v-deep(.el-scrollbar__wrap) {
+    background-color: var(--el-color-white);
+    border-bottom: 1px solid var(--next-border-color-light);
+    position: relative;
+    z-index: 4;
+
+    :deep(.el-scrollbar__wrap) {
         overflow-x: auto !important;
     }
+
     &-ul {
         list-style: none;
         margin: 0;
@@ -391,16 +382,17 @@ export default {
         height: 34px;
         display: flex;
         align-items: center;
-        color: #606266;
+        color: var(--el-text-color-regular);
         font-size: 12px;
         white-space: nowrap;
         padding: 0 15px;
+
         &-li {
             height: 26px;
             line-height: 26px;
             display: flex;
             align-items: center;
-            border: 1px solid #e6e6e6;
+            border: 1px solid var(--el-border-color-lighter);
             padding: 0 15px;
             margin-right: 5px;
             border-radius: 2px;
@@ -408,16 +400,19 @@ export default {
             z-index: 0;
             cursor: pointer;
             justify-content: space-between;
+
             &:hover {
-                background-color: var(--color-primary-light-9);
-                color: var(--color-primary);
-                border-color: var(--color-primary-light-6);
+                background-color: var(--el-color-primary-light-9);
+                color: var(--el-color-primary);
+                border-color: var(--el-color-primary-light-5);
             }
+
             &-iconfont {
                 position: relative;
                 left: -5px;
                 font-size: 12px;
             }
+
             &-icon {
                 border-radius: 100%;
                 position: relative;
@@ -426,99 +421,101 @@ export default {
                 text-align: center;
                 line-height: 14px;
                 right: -5px;
+
                 &:hover {
-                    color: #fff;
-                    background-color: var(--color-primary-light-3);
+                    color: var(--el-color-white);
+                    background-color: var(--el-color-primary-light-3);
                 }
             }
+
             .layout-icon-active {
                 display: block;
             }
+
             .layout-icon-three {
                 display: none;
             }
         }
+
         .is-active {
-            color: #ffffff;
-            background: var(--color-primary);
-            border-color: var(--color-primary);
+            color: var(--el-color-white);
+            background: var(--el-color-primary);
+            border-color: var(--el-color-primary);
+            transition: border-color 3s ease;
         }
     }
+
     // 风格2
     .tags-style-two {
-        .layout-navbars-tagsview-ul-li {
-            height: 34px !important;
-            line-height: 34px !important;
-            border: none !important;
-            .layout-navbars-tagsview-ul-li-iconfont {
-                display: none;
-            }
-            .layout-icon-active {
-                display: none;
-            }
-            .layout-icon-three {
-                display: block;
-            }
-        }
-        .is-active {
-            background: none !important;
-            color: var(--color-primary) !important;
-            border-bottom: 2px solid !important;
-            border-color: var(--color-primary) !important;
-            border-radius: 0 !important;
-        }
-    }
-    // 风格3
-    .tags-style-three {
-        .layout-navbars-tagsview-ul-li {
-            height: 34px !important;
-            line-height: 34px !important;
-            border-right: 1px solid #f6f6f6 !important;
-            border-top: none !important;
-            border-bottom: none !important;
-            border-left: none !important;
-            border-radius: 0 !important;
-            margin-right: 0 !important;
-            &:first-of-type {
-                border-left: 1px solid #f6f6f6 !important;
-            }
-            .layout-icon-active {
-                display: none;
-            }
-            .layout-icon-three {
-                display: block;
-            }
-        }
-        .is-active {
-            background: white !important;
-            color: var(--color-primary) !important;
-            border-top: 1px solid !important;
-            border-top-color: var(--color-primary) !important;
-        }
-    }
-    // 风格4
-    .tags-style-four {
         .layout-navbars-tagsview-ul-li {
             margin-right: 0 !important;
             border: none !important;
             position: relative;
             border-radius: 3px !important;
+
             .layout-icon-active {
                 display: none;
             }
+
             .layout-icon-three {
                 display: block;
             }
+
             &:hover {
                 background: none !important;
             }
         }
+
         .is-active {
             background: none !important;
-            color: var(--color-primary) !important;
+            color: var(--el-color-primary) !important;
+        }
+    }
+
+    // 风格3
+    .tags-style-three {
+        align-items: flex-end;
+
+        .tgs-style-three-svg {
+            -webkit-mask-image: url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNzAiIGhlaWdodD0iNzAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgZmlsbD0ibm9uZSI+CgogPGc+CiAgPHRpdGxlPkxheWVyIDE8L3RpdGxlPgogIDxwYXRoIHRyYW5zZm9ybT0icm90YXRlKC0wLjEzMzUwNiA1MC4xMTkyIDUwKSIgaWQ9InN2Z18xIiBkPSJtMTAwLjExOTE5LDEwMGMtNTUuMjI4LDAgLTEwMCwtNDQuNzcyIC0xMDAsLTEwMGwwLDEwMGwxMDAsMHoiIG9wYWNpdHk9InVuZGVmaW5lZCIgc3Ryb2tlPSJudWxsIiBmaWxsPSIjRjhFQUU3Ii8+CiAgPHBhdGggZD0ibS0wLjYzNzY2LDcuMzEyMjhjMC4xMTkxOSwwIDAuMjE3MzcsMC4wNTc5NiAwLjQ3Njc2LDAuMTE5MTljMC4yMzIsMC4wNTQ3NyAwLjI3MzI5LDAuMDM0OTEgMC4zNTc1NywwLjExOTE5YzAuMDg0MjgsMC4wODQyOCAwLjM1NzU3LDAgMC40NzY3NiwwbDAuMTE5MTksMGwwLjIzODM4LDAiIGlkPSJzdmdfMiIgc3Ryb2tlPSJudWxsIiBmaWxsPSJub25lIi8+CiAgPHBhdGggZD0ibTI4LjkyMTM0LDY5LjA1MjQ0YzAsMC4xMTkxOSAwLDAuMjM4MzggMCwwLjM1NzU3bDAsMC4xMTkxOWwwLDAuMTE5MTkiIGlkPSJzdmdfMyIgc3Ryb2tlPSJudWxsIiBmaWxsPSJub25lIi8+CiAgPHJlY3QgaWQ9InN2Z180IiBoZWlnaHQ9IjAiIHdpZHRoPSIxLjMxMTA4IiB5PSI2LjgzNTUyIiB4PSItMC4wNDE3MSIgc3Ryb2tlPSJudWxsIiBmaWxsPSJub25lIi8+CiAgPHJlY3QgaWQ9InN2Z181IiBoZWlnaHQ9IjEuNzg3ODQiIHdpZHRoPSIwLjExOTE5IiB5PSI2OC40NTY1IiB4PSIyOC45MjEzNCIgc3Ryb2tlPSJudWxsIiBmaWxsPSJub25lIi8+CiAgPHJlY3QgaWQ9InN2Z182IiBoZWlnaHQ9IjQuODg2NzciIHdpZHRoPSIxOS4wNzAzMiIgeT0iNTEuMjkzMjEiIHg9IjM2LjY2ODY2IiBzdHJva2U9Im51bGwiIGZpbGw9Im5vbmUiLz4KIDwvZz4KPC9zdmc+'),
+                url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNzAiIGhlaWdodD0iNzAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgZmlsbD0ibm9uZSI+CiA8Zz4KICA8dGl0bGU+TGF5ZXIgMTwvdGl0bGU+CiAgPHBhdGggdHJhbnNmb3JtPSJyb3RhdGUoLTg5Ljc2MjQgNy4zMzAxNCA1NS4xMjUyKSIgc3Ryb2tlPSJudWxsIiBpZD0ic3ZnXzEiIGZpbGw9IiNGOEVBRTciIGQ9Im02Mi41NzQ0OSwxMTcuNTIwODZjLTU1LjIyOCwwIC0xMDAsLTQ0Ljc3MiAtMTAwLC0xMDBsMCwxMDBsMTAwLDB6IiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPgogIDxwYXRoIGQ9Im0tMC42Mzc2Niw3LjMxMjI4YzAuMTE5MTksMCAwLjIxNzM3LDAuMDU3OTYgMC40NzY3NiwwLjExOTE5YzAuMjMyLDAuMDU0NzcgMC4yNzMyOSwwLjAzNDkxIDAuMzU3NTcsMC4xMTkxOWMwLjA4NDI4LDAuMDg0MjggMC4zNTc1NywwIDAuNDc2NzYsMGwwLjExOTE5LDBsMC4yMzgzOCwwIiBpZD0ic3ZnXzIiIHN0cm9rZT0ibnVsbCIgZmlsbD0ibm9uZSIvPgogIDxwYXRoIGQ9Im0yOC45MjEzNCw2OS4wNTI0NGMwLDAuMTE5MTkgMCwwLjIzODM4IDAsMC4zNTc1N2wwLDAuMTE5MTlsMCwwLjExOTE5IiBpZD0ic3ZnXzMiIHN0cm9rZT0ibnVsbCIgZmlsbD0ibm9uZSIvPgogIDxyZWN0IGlkPSJzdmdfNCIgaGVpZ2h0PSIwIiB3aWR0aD0iMS4zMTEwOCIgeT0iNi44MzU1MiIgeD0iLTAuMDQxNzEiIHN0cm9rZT0ibnVsbCIgZmlsbD0ibm9uZSIvPgogIDxyZWN0IGlkPSJzdmdfNSIgaGVpZ2h0PSIxLjc4Nzg0IiB3aWR0aD0iMC4xMTkxOSIgeT0iNjguNDU2NSIgeD0iMjguOTIxMzQiIHN0cm9rZT0ibnVsbCIgZmlsbD0ibm9uZSIvPgogIDxyZWN0IGlkPSJzdmdfNiIgaGVpZ2h0PSI0Ljg4Njc3IiB3aWR0aD0iMTkuMDcwMzIiIHk9IjUxLjI5MzIxIiB4PSIzNi42Njg2NiIgc3Ryb2tlPSJudWxsIiBmaWxsPSJub25lIi8+CiA8L2c+Cjwvc3ZnPg=='),
+                url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'><rect rx='8' width='100%' height='100%' fill='%23F8EAE7'/></svg>");
+            -webkit-mask-size: 18px 30px, 20px 30px, calc(100% - 30px) calc(100% + 17px);
+            -webkit-mask-position: right bottom, left bottom, center top;
+            -webkit-mask-repeat: no-repeat;
+        }
+
+        .layout-navbars-tagsview-ul-li {
+            padding: 0 5px;
+            border-width: 15px 27px 15px;
+            border-style: solid;
+            border-color: transparent;
+            margin: 0 -15px;
+
+            .layout-icon-active {
+                display: none;
+            }
+
+            .layout-icon-three {
+                display: block;
+            }
+
+            &:hover {
+                @extend .tgs-style-three-svg;
+                background: var(--el-color-primary-light-9);
+                color: unset;
+            }
+        }
+
+        .is-active {
+            @extend .tgs-style-three-svg;
+            background: var(--el-color-primary-light-9) !important;
+            color: var(--el-color-primary) !important;
+            z-index: 1;
         }
     }
 }
+
 .layout-navbars-tagsview-shadow {
     box-shadow: rgb(0 21 41 / 4%) 0px 1px 4px;
 }

mayfly_go_web/src/views/layout/navMenu/horizontal.vue

@@ -1,23 +1,24 @@
 <template>
     <div class="el-menu-horizontal-warp">
         <el-scrollbar @wheel.prevent="onElMenuHorizontalScroll" ref="elMenuHorizontalScrollRef">
-            <el-menu router :default-active="defaultActive" background-color="transparent" mode="horizontal" @select="onHorizontalSelect">
+            <el-menu router :default-active="state.defaultActive" background-color="transparent" mode="horizontal"
+                @select="onHorizontalSelect">
                 <template v-for="val in menuLists">
-                    <el-submenu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
+                    <el-sub-menu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
                         <template #title>
-                            <i :class="val.meta.icon ? val.meta.icon : ''"></i>
+                            <SvgIcon :name="val.meta.icon"/>
                             <span>{{ val.meta.title }}</span>
                         </template>
                         <SubItem :chil="val.children" />
-                    </el-submenu>
-                    <el-menu-item :index="val.path" :key="val.path" v-else>
-                        <template #title v-if="!val.meta.link || (val.meta.link && val.meta.isIframe)">
-                            <i :class="val.meta.icon ? val.meta.icon : ''"></i>
+                    </el-sub-menu>
+                    <el-menu-item :index="val.path" :key="val?.path" v-else>
+                        <template #title v-if="!val.meta.link || (val.meta.link && val.meta.linkType == 1)">
+                            <SvgIcon :name="val.meta.icon"/>
                             {{ val.meta.title }}
                         </template>
                         <template #title v-else>
                             <a :href="val.meta.link" target="_blank">
-                                <i :class="val.meta.icon ? val.meta.icon : ''"></i>
+                                <SvgIcon :name="val.meta.icon"/>
                                 {{ val.meta.title }}
                             </a>
                         </template>
@@ -28,99 +29,92 @@
     </div>
 </template>
 
-<script lang="ts">
-import { toRefs, reactive, computed, defineComponent, getCurrentInstance, onMounted, nextTick } from 'vue';
+<script lang="ts" setup name="navMenuHorizontal">
+import { reactive, computed, getCurrentInstance, onMounted, nextTick } from 'vue';
 import { useRoute, onBeforeRouteUpdate } from 'vue-router';
-import { useStore } from '@/store/index.ts';
 import SubItem from '@/views/layout/navMenu/subItem.vue';
-export default defineComponent({
-    name: 'navMenuHorizontal',
-    components: { SubItem },
-    props: {
-        menuList: {
-            type: Array,
-            default: () => [],
-        },
+import { useRoutesList } from '@/store/routesList';
+import { useThemeConfig } from '@/store/themeConfig';
+import mittBus from '@/common/utils/mitt';
+
+// 定义父组件传过来的值
+const props = defineProps({
+    // 菜单列表
+    menuList: {
+        type: Array<any>,
+        default: () => [],
     },
-    setup(props) {
-        const { proxy } = getCurrentInstance() as any;
-        const route = useRoute();
-        const store = useStore();
-        const state: any = reactive({
-            defaultActive: null,
+});
+
+const { proxy } = getCurrentInstance() as any;
+const route = useRoute();
+const state: any = reactive({
+    defaultActive: null,
+});
+// 获取父级菜单数据
+const menuLists = computed(() => {
+    return props.menuList;
+});
+// 设置横向滚动条可以鼠标滚轮滚动
+const onElMenuHorizontalScroll = (e: any) => {
+    const eventDelta = e.wheelDelta || -e.deltaY * 40;
+    proxy.$refs.elMenuHorizontalScrollRef.$refs.wrapRef.scrollLeft =
+        proxy.$refs.elMenuHorizontalScrollRef.$refs.wrapRef.scrollLeft + eventDelta / 4;
+};
+// 初始化数据，页面刷新时，滚动条滚动到对应位置
+const initElMenuOffsetLeft = () => {
+    nextTick(() => {
+        let els: any = document.querySelector('.el-menu.el-menu--horizontal li.is-active');
+        if (!els) return false;
+        proxy.$refs.elMenuHorizontalScrollRef.$refs.wrapRef.scrollLeft = els.offsetLeft;
+    });
+};
+// 设置页面当前路由高亮
+const setCurrentRouterHighlight = (path: string) => {
+    const currentPathSplit = path.split('/');
+    if (useThemeConfig().themeConfig.layout === 'classic') {
+        state.defaultActive = `/${currentPathSplit[1]}`;
+    } else {
+        state.defaultActive = path;
+    }
+};
+// 路由过滤递归函数
+const filterRoutesFun = (arr: Array<object>) => {
+    return arr
+        .filter((item: any) => !item.meta.isHide)
+        .map((item: any) => {
+            item = Object.assign({}, item);
+            if (item.children) item.children = filterRoutesFun(item.children);
+            return item;
         });
-        // 获取父级菜单数据
-        const menuLists = computed(() => {
-            return props.menuList;
-        });
-        // 设置横向滚动条可以鼠标滚轮滚动
-        const onElMenuHorizontalScroll = (e: any) => {
-            const eventDelta = e.wheelDelta || -e.deltaY * 40;
-            proxy.$refs.elMenuHorizontalScrollRef.$refs.wrap.scrollLeft =
-                proxy.$refs.elMenuHorizontalScrollRef.$refs.wrap.scrollLeft + eventDelta / 4;
-        };
-        // 初始化数据，页面刷新时，滚动条滚动到对应位置
-        const initElMenuOffsetLeft = () => {
-            nextTick(() => {
-                let els: any = document.querySelector('.el-menu.el-menu--horizontal li.is-active');
-                if (!els) return false;
-                proxy.$refs.elMenuHorizontalScrollRef.$refs.wrap.scrollLeft = els.offsetLeft;
-            });
-        };
-        // 设置页面当前路由高亮
-        const setCurrentRouterHighlight = (path: string) => {
-            const currentPathSplit = path.split('/');
-            if (store.state.themeConfig.themeConfig.layout === 'classic') {
-                state.defaultActive = `/${currentPathSplit[1]}`;
-            } else {
-                state.defaultActive = path;
-            }
-        };
-        // 路由过滤递归函数
-        const filterRoutesFun = (arr: Array<object>) => {
-            return arr
-                .filter((item: any) => !item.meta.isHide)
-                .map((item: any) => {
-                    item = Object.assign({}, item);
-                    if (item.children) item.children = filterRoutesFun(item.children);
-                    return item;
-                });
-        };
-        // 传送当前子级数据到菜单中
-        const setSendClassicChildren = (path: string) => {
-            const currentPathSplit = path.split('/');
-            let currentData: any = {};
-            filterRoutesFun(store.state.routesList.routesList).map((v, k) => {
-                if (v.path === `/${currentPathSplit[1]}`) {
-                    v['k'] = k;
-                    currentData['item'] = [{ ...v }];
-                    currentData['children'] = [{ ...v }];
-                    if (v.children) currentData['children'] = v.children;
-                }
-            });
-            return currentData;
-        };
-        // 菜单激活回调
-        const onHorizontalSelect = (path: string) => {
-            proxy.mittBus.emit('setSendClassicChildren', setSendClassicChildren(path));
-        };
-        // 页面加载时
-        onMounted(() => {
-            initElMenuOffsetLeft();
-            setCurrentRouterHighlight(route.path);
-        });
-        // 路由更新时
-        onBeforeRouteUpdate((to) => {
-            setCurrentRouterHighlight(to.path);
-            proxy.mittBus.emit('onMenuClick');
-        });
-        return {
-            menuLists,
-            onElMenuHorizontalScroll,
-            onHorizontalSelect,
-            ...toRefs(state),
-        };
-    },
+};
+// 传送当前子级数据到菜单中
+const setSendClassicChildren = (path: string) => {
+    const currentPathSplit = path.split('/');
+    let currentData: any = {};
+    filterRoutesFun(useRoutesList().routesList).map((v, k) => {
+        if (v.path === `/${currentPathSplit[1]}`) {
+            v['k'] = k;
+            currentData['item'] = [{ ...v }];
+            currentData['children'] = [{ ...v }];
+            if (v.children) currentData['children'] = v.children;
+        }
+    });
+    return currentData;
+};
+// 菜单激活回调
+const onHorizontalSelect = (path: string) => {
+    mittBus.emit('setSendClassicChildren', setSendClassicChildren(path));
+};
+// 页面加载时
+onMounted(() => {
+    initElMenuOffsetLeft();
+    setCurrentRouterHighlight(route.path);
+});
+// 路由更新时
+onBeforeRouteUpdate((to) => {
+    setCurrentRouterHighlight(to.path);
+    mittBus.emit('onMenuClick');
 });
 </script>
 
@@ -129,12 +123,15 @@ export default defineComponent({
     flex: 1;
     overflow: hidden;
     margin-right: 30px;
+
     ::v-deep(.el-scrollbar__bar.is-vertical) {
         display: none;
     }
+
     ::v-deep(a) {
         width: 100%;
     }
+
     .el-menu.el-menu--horizontal {
         display: flex;
         height: 100%;

mayfly_go_web/src/views/layout/navMenu/subItem.vue

@@ -2,19 +2,19 @@
     <template v-for="val in chils">
         <el-sub-menu :index="val.path" :key="val.path" v-if="val.children && val.children.length > 0">
             <template #title>
-                <SvgIcon :name="val.meta.icon" />
+                <SvgIcon :name="val.meta.icon"/>
                 <span>{{ val.meta.title }}</span>
             </template>
             <sub-item :chil="val.children" />
         </el-sub-menu>
-        <el-menu-item :index="val.path" :key="val.path" v-else>
-            <template v-if="!val.meta.link || (val.meta.link && val.meta.isIframe)">
-                <SvgIcon :name="val.meta.icon" />
+        <el-menu-item :index="val.path" :key="val?.path" v-else>
+            <template v-if="!val.meta.link || (val.meta.link && val.meta.linkType == 1)">
+                <SvgIcon :name="val.meta.icon"/>
                 <span>{{ val.meta.title }}</span>
             </template>
             <template v-else>
                 <a :href="val.meta.link" target="_blank">
-                    <SvgIcon :name="val.meta.icon" />
+                    <SvgIcon :name="val.meta.icon"/>
                     {{ val.meta.title }}
                 </a>
             </template>
@@ -24,6 +24,7 @@
 
 <script lang="ts">
 import { computed, defineComponent } from 'vue';
+import SvgIcon from '@/components/svgIcon/index.vue';
 export default defineComponent({
     name: 'navMenuSubItem',
     props: {
@@ -35,7 +36,7 @@ export default defineComponent({
     setup(props) {
         // 获取父级菜单数据
         const chils = computed(() => {
-            return props.chil;
+            return props.chil as any;
         });
         return {
             chils,

mayfly_go_web/src/views/layout/navMenu/vertical.vue

@@ -1,79 +1,61 @@
 <template>
-    <el-menu
-        router
-        :default-active="defaultActive"
-        background-color="transparent"
-        :collapse="setIsCollapse"
-        :unique-opened="getThemeConfig.isUniqueOpened"
-        :collapse-transition="false"
-    >
+    <el-menu router :default-active="state.defaultActive" background-color="transparent" :collapse="setIsCollapse"
+        :unique-opened="themeConfig.isUniqueOpened" :collapse-transition="false">
         <template v-for="val in menuLists">
             <el-sub-menu :index="val.path" v-if="val.children && val.children.length > 0" :key="val.path">
                 <template #title>
-                    <SvgIcon :name="val.meta.icon" />
+                    <SvgIcon :name="val.meta.icon"/>
                     <span>{{ val.meta.title }}</span>
                 </template>
                 <SubItem :chil="val.children" />
             </el-sub-menu>
-            <el-menu-item :index="val.path" :key="val.path" v-else>
-                <SvgIcon :name="val.meta.icon" />
-                <template #title v-if="!val.meta.link || (val.meta.link && val.meta.isIframe)">
+            <el-menu-item :index="val.path" :key="val?.path" v-else>
+                <SvgIcon :name="val.meta.icon"/>
+                <template #title v-if="!val.meta.link || (val.meta.link && val.meta.linkType == 1)">
                     <span>{{ val.meta.title }}</span>
                 </template>
                 <template #title v-else>
-                    <a :href="val.meta.link" target="_blank">{{ val.meta.title }}</a></template
-                >
+                    <a :href="val.meta.link" target="_blank">{{ val.meta.title }}</a></template>
             </el-menu-item>
         </template>
     </el-menu>
 </template>
 
-<script lang="ts">
-import { toRefs, reactive, computed, defineComponent, getCurrentInstance } from 'vue';
+<script lang="ts" setup name="navMenuVertical">
+import { reactive, computed } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '@/store/themeConfig';
 import { useRoute, onBeforeRouteUpdate } from 'vue-router';
-import { useStore } from '@/store/index.ts';
 import SubItem from '@/views/layout/navMenu/subItem.vue';
-export default defineComponent({
-    name: 'navMenuVertical',
-    components: { SubItem },
-    props: {
-        menuList: {
-            type: Array,
-            default: () => [],
-        },
-    },
-    setup(props) {
-        const { proxy } = getCurrentInstance() as any;
-        const store = useStore();
-        const route = useRoute();
-        const state = reactive({
-            defaultActive: route.path,
-        });
-        // 获取父级菜单数据
-        const menuLists = computed(() => {
-            return props.menuList;
-        });
-        // 获取布局配置信息
-        const getThemeConfig = computed(() => {
-            return store.state.themeConfig.themeConfig;
-        });
-        // 设置菜单的收起/展开
-        const setIsCollapse = computed(() => {
-            return document.body.clientWidth < 1000 ? false : getThemeConfig.value.isCollapse;
-        });
-        // 路由更新时
-        onBeforeRouteUpdate((to) => {
-            state.defaultActive = to.path;
-            proxy.mittBus.emit('onMenuClick');
-            const clientWidth = document.body.clientWidth;
-            if (clientWidth < 1000) getThemeConfig.value.isCollapse = false;
-        });
-        return {
-            menuLists,
-            getThemeConfig,
-            setIsCollapse,
-            ...toRefs(state),
-        };
+import mittBus from '@/common/utils/mitt';
+
+// 定义父组件传过来的值
+const props = defineProps({
+    // 菜单列表
+    menuList: {
+        type: Array<any>,
+        default: () => [],
     },
 });
+
+const { themeConfig } = storeToRefs(useThemeConfig());
+const route = useRoute();
+const state = reactive({
+    defaultActive: route.path,
+});
+// 获取父级菜单数据
+const menuLists = computed(() => {
+    return props.menuList;
+});
+// 设置菜单的收起/展开
+const setIsCollapse = computed(() => {
+    return document.body.clientWidth < 1000 ? false : themeConfig.value.isCollapse;
+});
+// 路由更新时
+onBeforeRouteUpdate((to) => {
+    state.defaultActive = to.path;
+    mittBus.emit('onMenuClick');
+    const clientWidth = document.body.clientWidth;
+    if (clientWidth < 1000) themeConfig.value.isCollapse = false;
+});
 </script>

mayfly_go_web/src/views/layout/routerView/iframes.vue

@@ -9,6 +9,7 @@
 <script lang="ts">
 import { defineComponent, reactive, toRefs, onMounted, onBeforeMount, onUnmounted, nextTick, getCurrentInstance } from 'vue';
 import { useRoute } from 'vue-router';
+import mittBus from '@/common/utils/mitt';
 export default defineComponent({
     name: 'layoutIfameView',
     props: {
@@ -18,7 +19,6 @@ export default defineComponent({
         },
     },
     setup(props, { emit }) {
-        const { proxy } = getCurrentInstance() as any;
         const route = useRoute();
         const state = reactive({
             iframeLoading: true,
@@ -38,7 +38,7 @@ export default defineComponent({
         // 页面加载前
         onBeforeMount(() => {
             state.iframeUrl = props.meta.link;
-            proxy.mittBus.on('onTagsViewRefreshRouterView', (path: string) => {
+            mittBus.on('onTagsViewRefreshRouterView', (path: string) => {
                 if (route.path !== path) return false;
                 emit('getCurrentRouteMeta');
             });
@@ -49,7 +49,7 @@ export default defineComponent({
         });
         // 页面卸载时
         onUnmounted(() => {
-            proxy.mittBus.off('onTagsViewRefreshRouterView', () => {});
+            mittBus.off('onTagsViewRefreshRouterView', () => {});
         });
         return {
             ...toRefs(state),

mayfly_go_web/src/views/layout/routerView/parent.vue

@@ -2,68 +2,53 @@
     <div class="h100">
         <router-view v-slot="{ Component }">
             <transition :name="setTransitionName" mode="out-in">
-                <keep-alive :include="keepAliveNameList">
-                    <component :is="Component" :key="refreshRouterViewKey" class="w100" />
+                <keep-alive :include="state.keepAliveNameList">
+                    <component :is="Component" :key="state.refreshRouterViewKey" class="w100" />
                 </keep-alive>
             </transition>
         </router-view>
     </div>
 </template>
 
-<script lang="ts">
-import { computed, defineComponent, toRefs, reactive, getCurrentInstance, onBeforeMount, onUnmounted, nextTick, ref } from 'vue';
-import { useRoute, onBeforeRouteUpdate } from 'vue-router';
-import { useStore } from '@/store/index.ts';
-export default defineComponent({
-    name: 'layoutParentView',
-    setup() {
-        const { proxy } = getCurrentInstance() as any;
-        const route = useRoute();
-        const store = useStore();
-        const state: any = reactive({
-            refreshRouterViewKey: null,
-            keepAliveNameList: [],
-            keepAliveNameNewList: [],
+<script lang="ts" setup name="layoutParentView">
+import { computed, reactive, onBeforeMount, onUnmounted, nextTick } from 'vue';
+import { useRoute } from 'vue-router';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '@/store/themeConfig';
+import { useKeepALiveNames } from '@/store/keepAliveNames';
+import mittBus from '@/common/utils/mitt';
+
+const route = useRoute();
+const { themeConfig } = storeToRefs(useThemeConfig());
+const { keepAliveNames } = storeToRefs(useKeepALiveNames());
+const state: any = reactive({
+    refreshRouterViewKey: null,
+    keepAliveNameList: [],
+    keepAliveNameNewList: [],
+});
+// 监听路由的变化，动态赋值给refreshRouterViewKey
+// onBeforeRouteUpdate((to: any) => {
+// 	state.refreshRouterViewKey = decodeURI(to.fullPath);
+// });
+// 页面加载前，处理缓存，页面刷新时路由缓存处理
+onBeforeMount(() => {
+    state.keepAliveNameList = keepAliveNames.value;
+    mittBus.on('onTagsViewRefreshRouterView', (path: string) => {
+        if (decodeURI(route.fullPath) !== path) return false;
+        state.keepAliveNameList = keepAliveNames.value.filter((name: string) => route.name !== name);
+        state.refreshRouterViewKey = route.path;
+        nextTick(() => {
+            state.refreshRouterViewKey = null;
+            state.keepAliveNameList = keepAliveNames.value;
         });
-        // 监听路由的变化，动态赋值给refreshRouterViewKey
-        // onBeforeRouteUpdate((to: any) => {
-        // 	state.refreshRouterViewKey = decodeURI(to.fullPath);
-        // });
-        // 设置主界面切换动画
-        const setTransitionName = computed(() => {
-            return store.state.themeConfig.themeConfig.animation;
-        });
-        // 获取布局配置信息
-        const getThemeConfig = computed(() => {
-            return store.state.themeConfig.themeConfig;
-        });
-        // 获取组件缓存列表(name值)
-        const getKeepAliveNames = computed(() => {
-            return store.state.keepAliveNames.keepAliveNames;
-        });
-        // 页面加载前，处理缓存，页面刷新时路由缓存处理
-        onBeforeMount(() => {
-            state.keepAliveNameList = getKeepAliveNames.value;
-            proxy.mittBus.on('onTagsViewRefreshRouterView', (path: string) => {
-                if (decodeURI(route.fullPath) !== path) return false;
-                state.keepAliveNameList = getKeepAliveNames.value.filter((name: string) => route.name !== name);
-                state.refreshRouterViewKey = route.path;
-                nextTick(() => {
-                    state.refreshRouterViewKey = null;
-                    state.keepAliveNameList = getKeepAliveNames.value;
-                });
-            });
-        });
-        // 页面卸载时
-        onUnmounted(() => {
-            proxy.mittBus.off('onTagsViewRefreshRouterView');
-        });
-        return {
-            getThemeConfig,
-            getKeepAliveNames,
-            setTransitionName,
-            ...toRefs(state),
-        };
-    },
+    });
+});
+// 设置主界面切换动画
+const setTransitionName = computed(() => {
+    return themeConfig.value.animation;
+});
+// 页面卸载时
+onUnmounted(() => {
+    mittBus.off('onTagsViewRefreshRouterView');
 });
 </script>

mayfly_go_web/src/views/login/component/AccountLogin.vue

@@ -8,7 +8,7 @@
             </el-form-item>
             <el-form-item prop="password">
                 <el-input type="password" placeholder="请输入密码" prefix-icon="lock" v-model="loginForm.password"
-                    autocomplete="off" show-password>
+                    autocomplete="off" @keyup.enter="login" show-password>
                 </el-input>
             </el-form-item>
             <el-form-item v-if="isUseLoginCaptcha" prop="captcha">
@@ -63,14 +63,14 @@
 import { nextTick, onMounted, ref, toRefs, reactive, computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { ElMessage } from 'element-plus';
-import { initBackEndControlRoutesFun } from '@/router/index.ts';
-import { useStore } from '@/store/index.ts';
-import { setSession, setUserInfo2Session, setUseWatermark2Session } from '@/common/utils/storage.ts';
-import { formatAxis } from '@/common/utils/formatTime.ts';
+import { initRouter } from '@/router/index';
+import { setSession, setUserInfo2Session, setUseWatermark2Session } from '@/common/utils/storage';
+import { formatAxis } from '@/common/utils/format';
 import openApi from '@/common/openApi';
 import { RsaEncrypt } from '@/common/rsa';
 import { useLoginCaptcha, useWartermark } from '@/common/sysconfig';
 import { letterAvatar } from '@/common/utils/string';
+import { useUserInfo } from '@/store/userInfo';
 
 const rules = {
     username: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
@@ -78,7 +78,6 @@ const rules = {
     captcha: [{ required: true, message: '请输入验证码', trigger: 'blur' }],
 }
 
-const store = useStore();
 const route = useRoute();
 const router = useRouter();
 const loginFormRef: any = ref(null);
@@ -138,7 +137,7 @@ const getCaptcha = async () => {
     if (!state.isUseLoginCaptcha) {
         return;
     }
-    let res: any = await openApi.captcha();
+    let res: any = await openApi.captcha.request();
     state.captchaImage = res.base64Captcha;
     state.loginForm.cid = res.cid;
 };
@@ -167,10 +166,9 @@ const onSignIn = async () => {
     try {
         const loginReq = { ...state.loginForm };
         loginReq.password = await RsaEncrypt(originPwd);
-        loginRes = await openApi.login(loginReq);
+        loginRes = await openApi.login.request(loginReq);
         // 存储 token 到浏览器缓存
         setSession('token', loginRes.token);
-        setSession('menus', loginRes.menus);
     } catch (e: any) {
         state.loading.signIn = false;
         state.loginForm.captcha = '';
@@ -192,8 +190,6 @@ const onSignIn = async () => {
         // 头像
         photo: letterAvatar(state.loginForm.username),
         time: new Date().getTime(),
-        // // 菜单资源code数组
-        // menus: loginRes.menus,
         permissions: loginRes.permissions,
         lastLoginTime: loginRes.lastLoginTime,
         lastLoginIp: loginRes.lastLoginIp,
@@ -202,19 +198,9 @@ const onSignIn = async () => {
     // 存储用户信息到浏览器缓存
     setUserInfo2Session(userInfos);
     // 1、请注意执行顺序(存储用户信息到vuex)
-    store.dispatch('userInfos/setUserInfos', userInfos);
-    if (!store.state.themeConfig.themeConfig.isRequestRoutes) {
-        // 前端控制路由，2、请注意执行顺序
-        // await initAllFun();
-        await initBackEndControlRoutesFun();
-        signInSuccess();
-    } else {
-        // 模拟后端控制路由，isRequestRoutes 为 true，则开启后端控制路由
-        // 添加完动态路由，再进行 router 跳转，否则可能报错 No match found for location with path "/"
-        await initBackEndControlRoutesFun();
-        // 执行完 initBackEndControlRoutesFun，再执行 signInSuccess
-        signInSuccess();
-    }
+    useUserInfo().setUserInfo(userInfos);
+    await initRouter();
+    signInSuccess();
 };
 
 // 登录成功后的跳转
@@ -247,7 +233,7 @@ const changePwd = () => {
             const changePwdReq: any = { ...form };
             changePwdReq.oldPassword = await RsaEncrypt(form.oldPassword);
             changePwdReq.newPassword = await RsaEncrypt(form.newPassword);
-            await openApi.changePwd(changePwdReq);
+            await openApi.changePwd.request(changePwdReq);
             ElMessage.success('密码修改成功, 新密码已填充至登录密码框');
             state.loginForm.password = state.changePwdDialog.form.newPassword;
             state.changePwdDialog.visible = false;

mayfly_go_web/src/views/login/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="login-container">
         <div class="login-logo">
-            <span>{{ getThemeConfig.globalViceTitle }}</span>
+            <span>{{ themeConfig.globalViceTitle }}</span>
         </div>
         <div class="login-content" :class="{ 'login-content-mobile': tabsActiveName === 'mobile' }">
             <div class="login-content-main">
@@ -24,19 +24,20 @@
                 </div> -->
             </div>
         </div>
-        <div class="login-copyright">
+        <!-- <div class="login-copyright">
             <div class="mb5 login-copyright-company">mayfly</div>
             <div class="login-copyright-msg">mayfly</div>
-        </div>
+        </div> -->
     </div>
 </template>
 
 <script lang="ts" setup>
-import { toRefs, reactive, computed } from 'vue';
+import { toRefs, reactive } from 'vue';
 import Account from '@/views/login/component/AccountLogin.vue';
-import { useStore } from '@/store/index.ts';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '@/store/themeConfig';
 
-const store = useStore();
+const { themeConfig } = storeToRefs(useThemeConfig());
 const state = reactive({
     tabsActiveName: 'account',
     isTabPaneShow: true,
@@ -47,10 +48,6 @@ const {
     tabsActiveName,
 } = toRefs(state)
 
-// 获取布局配置信息
-const getThemeConfig = computed(() => {
-    return store.state.themeConfig.themeConfig;
-});
 
 // 切换密码、手机登录
 const onTabsClick = () => {

mayfly_go_web/src/views/ops/component/SshTunnelSelect.vue

@@ -0,0 +1,61 @@
+<template>
+    <div style="width: 100%">
+        <el-select @focus="getSshTunnelMachines" @change="change" style="width: 100%" v-model="sshTunnelMachineId"
+            @clear="clear" placeholder="请选择SSH隧道机器" clearable>
+            <el-option v-for="item in sshTunnelMachineList" :key="item.id" :label="`${item.ip}:${item.port} [${item.name}]`"
+                :value="item.id">
+            </el-option>
+        </el-select>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { toRefs, reactive, onMounted } from 'vue';
+import { machineApi } from '../machine/api';
+
+const props = defineProps({
+    modelValue: {
+        type: Number,
+    },
+})
+
+//定义事件
+const emit = defineEmits(['update:modelValue'])
+
+const state = reactive({
+    // 单选则为id，多选为id数组
+    sshTunnelMachineId: null as any,
+    sshTunnelMachineList: [] as any,
+});
+
+const {
+    sshTunnelMachineId,
+    sshTunnelMachineList,
+} = toRefs(state)
+
+onMounted(async () => {
+    if (!props.modelValue || props.modelValue <= 0) {
+        state.sshTunnelMachineId = null;
+    } else {
+        state.sshTunnelMachineId = props.modelValue;
+    }
+    await getSshTunnelMachines();
+});
+
+const getSshTunnelMachines = async () => {
+    if (state.sshTunnelMachineList.length == 0) {
+        const res = await machineApi.list.request({ pageNum: 1, pageSize: 100 });
+        state.sshTunnelMachineList = res.list;
+    }
+};
+
+const clear = () => {
+    state.sshTunnelMachineId = null;
+    change();
+}
+
+const change = () => {
+    emit('update:modelValue', state.sshTunnelMachineId);
+};
+</script>
+<style lang="scss"></style>

mayfly_go_web/src/views/ops/component/TagInfo.vue

@@ -1,7 +1,7 @@
 <template>
     <div
         style="display: inline-flex;  justify-content: center;  align-items: center; cursor: pointer;vertical-align: middle;">
-        <el-popover @show="showTagInfo" placement="right-end" title="标签信息" :width="300" trigger="hover">
+        <el-popover @show="showTagInfo" placement="top-start" title="标签信息" :width="300" trigger="hover">
             <template #reference>
                 <el-icon>
                     <InfoFilled />
@@ -48,14 +48,17 @@ const showTagInfo = async () => {
     const tagPaths = [];
     let nowTag = '';
     for (let tagStr of tagStrs) {
-        if (nowTag) {
-            nowTag = `${nowTag}/${tagStr}`
-        } else {
-            nowTag = tagStr
+        if (!tagStr) {
+            continue;
         }
-        tagPaths.push(nowTag)
+        if (nowTag) {
+            nowTag = `${nowTag}${tagStr}/`;
+        } else {
+            nowTag = tagStr + '/';
+        }
+        tagPaths.push(nowTag);
     }
-    state.tags = await tagApi.listByQuery.request({ tagPaths: tagPaths.join(',') })
+    state.tags = await tagApi.listByQuery.request({ tagPaths: tagPaths.join(',') });
 }
 
 </script>

mayfly_go_web/src/views/ops/component/TagMenu.vue

@@ -1,124 +0,0 @@
-<template>
-    <div class="instances-box layout-aside">
-        <el-row type="flex" justify="space-between">
-            <el-col :span="24"
-                :style="{ maxHeight: instanceMenuMaxHeight, height: instanceMenuMaxHeight, overflow: 'auto' }"
-                class="el-scrollbar flex-auto">
-                <el-menu background-color="transparent" :collapse-transition="false" ref="menuRef">
-                    <!-- 第一级：tag -->
-                    <el-sub-menu v-for="tag of tags" :index="tag.tagPath" :key="tag.tagPath"
-                        @click.stop="clickTag(tag.tagPath)">
-                        <template #title>
-                            <tag-info :tag-path="tag.tagPath" />
-
-                            <el-icon>
-                                <FolderOpened v-if="opend[tag.tagPath]" color="#e6a23c" />
-                                <Folder v-else />
-                            </el-icon>
-                            <span>{{ tag.tagPath }}</span>
-                        </template>
-                        <slot :tag="tag" name="submenu"></slot>
-                    </el-sub-menu>
-                </el-menu>
-            </el-col>
-        </el-row>
-    </div>
-</template>
-
-<script lang="ts" setup>
-import { reactive, ref, Ref, toRefs } from 'vue';
-import TagInfo from './TagInfo.vue';
-
-const props = defineProps({
-    instanceMenuMaxHeight: {
-        type: [Number, String],
-    },
-    tags: {
-        type: Object, required: true
-    },
-})
-
-const menuRef = ref(null) as Ref
-
-const state = reactive({
-    instanceMenuMaxHeight: props.instanceMenuMaxHeight,
-    tags: props.tags,
-    opend: {},
-})
-
-const {
-    opend,
-} = toRefs(state)
-
-const clickTag = (tagPath: string) => {
-    if (state.opend[tagPath] === undefined) {
-        state.opend[tagPath] = true;
-        return;
-    }
-    const opend = state.opend[tagPath]
-    state.opend[tagPath] = !opend
-}
-
-const open = (index: string, isTag: boolean = false) => {
-    if (!index) {
-        return;
-    }
-    menuRef.value.open(index)
-    if (isTag) {
-        clickTag(index)
-    }
-}
-
-defineExpose({
-    open
-})
-
-</script>
-
-<style lang="scss">
-.instances-box {
-    .el-menu {
-        width: 100%;
-    }
-
-    .el-sub-menu {
-        .checked {
-            .checked-schema {
-                color: var(--el-color-primary);
-            }
-        }
-    }
-
-    .el-sub-menu__title {
-        padding-left: 0 !important;
-        height: 30px !important;
-        line-height: 30px !important;
-    }
-
-    .el-menu--vertical:not(.el-menu--collapse):not(.el-menu--popup-container) .el-sub-menu__title {
-        padding-right: 10px;
-    }
-
-    .el-menu-item {
-        padding-left: 0 !important;
-        height: 20px !important;
-        line-height: 20px !important;
-    }
-
-    .el-icon {
-        margin: 0;
-    }
-
-    .el-sub-menu__icon-arrow {
-        top: inherit;
-        right: 10px;
-    }
-
-}
-
-.instances-pop-form {
-    .el-form-item {
-        margin-bottom: unset;
-    }
-}
-</style>

mayfly_go_web/src/views/ops/component/TagSelect.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-tree-select @check="changeTag" style="width: 100%" v-model="selectTags" :data="tags"
+        <el-tree-select @check="changeTag" style="width: 100%" v-model="selectTags" :data="tags" placeholder="请选择关联标签"
             :render-after-expand="true" :default-expanded-keys="[selectTags]" show-checkbox check-strictly node-key="id"
             :props="{
                 value: 'id',

mayfly_go_web/src/views/ops/component/TagTree.vue

@@ -0,0 +1,166 @@
+<template>
+    <div class="instances-box">
+        <el-row type="flex" justify="space-between">
+            <el-col :span="24" class="el-scrollbar flex-auto" style="overflow: auto">
+                <el-input v-model="filterText" placeholder="输入关键字->搜索已展开节点信息" clearable size="small" class="mb5" />
+
+                <el-tree ref="treeRef" :style="{ maxHeight: state.height, height: state.height, overflow: 'auto' }"
+                    :highlight-current="true" :indent="7" :load="loadNode" :props="treeProps" lazy node-key="key"
+                    :expand-on-click-node="true" :filter-node-method="filterNode" @node-click="treeNodeClick"
+                    @node-expand="treeNodeClick" @node-contextmenu="nodeContextmenu">
+                    <template #default="{ node, data }">
+                        <span>
+                            <span v-if="data.type == TagTreeNode.TagPath">
+                                <tag-info :tag-path="data.label" />
+                            </span>
+
+                            <slot v-else :node="node" :data="data" name="prefix"></slot>
+
+                            <span class="ml3">
+                                <slot name="label" :data="data"> {{ data.label }}</slot>
+                            </span>
+                        </span>
+                    </template>
+                </el-tree>
+            </el-col>
+        </el-row>
+        <contextmenu :dropdown="state.dropdown" :items="state.contextmenuItems" ref="contextmenuRef"
+            @currentContextmenuClick="onCurrentContextmenuClick" />
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { onMounted, reactive, ref, watch, toRefs } from 'vue';
+import { TagTreeNode } from './tag';
+import TagInfo from './TagInfo.vue';
+import Contextmenu from '@/components/contextmenu/index.vue';
+
+const props = defineProps({
+    height: {
+        type: [Number, String],
+        default: 0
+    },
+    load: {
+        type: Function,
+        required: true,
+    },
+    loadContextmenuItems: {
+        type: Function,
+        required: false,
+    }
+})
+
+const treeProps = {
+    label: 'name',
+    children: 'zones',
+    isLeaf: 'isLeaf',
+}
+
+const emit = defineEmits(['nodeClick', 'currentContextmenuClick'])
+const treeRef: any = ref(null)
+const contextmenuRef = ref();
+
+const state = reactive({
+    height: 600 as any,
+    filterText: '',
+    dropdown: {
+        x: 0,
+        y: 0,
+    },
+    contextmenuItems: [],
+    opend: {},
+})
+const { filterText } = toRefs(state)
+
+onMounted(async () => {
+    if (!props.height) {
+        state.height = window.innerHeight - 147 + 'px';
+    } else {
+        state.height = props.height;
+    }
+})
+
+watch(filterText, (val) => {
+    treeRef.value?.filter(val)
+})
+
+const filterNode = (value: string, data: any) => {
+    if (!value) return true
+    return data.label.includes(value)
+}
+
+/**
+* 加载树节点
+* @param { Object } node
+* @param { Object } resolve
+*/
+const loadNode = async (node: any, resolve: any) => {
+    if (typeof resolve !== 'function') {
+        return;
+    }
+    let nodes = []
+    try {
+        nodes = await props.load(node)
+    } catch (e: any) {
+        console.error(e);
+    }
+    return resolve(nodes)
+};
+
+const treeNodeClick = (data: any) => {
+    emit('nodeClick', data);
+    // 关闭可能存在的右击菜单
+    contextmenuRef.value.closeContextmenu();
+}
+
+// 树节点右击事件
+const nodeContextmenu = (event: any, data: any) => {
+    if (!props.loadContextmenuItems) {
+        return;
+    }
+    // 加载当前节点是否需要显示右击菜单
+    const items = props.loadContextmenuItems(data)
+    if (!items || items.length == 0) {
+        return;
+    }
+    state.contextmenuItems = items;
+    const { clientX, clientY } = event;
+    state.dropdown.x = clientX;
+    state.dropdown.y = clientY;
+    contextmenuRef.value.openContextmenu(data);
+}
+
+const onCurrentContextmenuClick = (clickData: any) => {
+    emit('currentContextmenuClick', clickData);
+}
+
+const reloadNode = (nodeKey: any) => {
+    let node = getNode(nodeKey);
+    node.loaded = false;
+    node.expand();
+}
+
+const getNode = (nodeKey: any) => {
+    let node = treeRef.value.getNode(nodeKey);
+    if (!node) {
+        throw new Error('未找到节点: ' + nodeKey);
+    }
+    return node;
+}
+
+defineExpose({
+    reloadNode,
+})
+</script>
+
+<style lang="scss">
+.instances-box {
+    overflow: 'auto';
+    position: relative;
+
+    .el-tree {
+        display: inline-block;
+        min-width: 100%;
+    }
+}
+</style>

mayfly_go_web/src/views/ops/component/tag.ts

@@ -0,0 +1,38 @@
+export class TagTreeNode {
+    /**
+     * 节点id
+     */
+    key: any
+
+    /**
+     * 节点名称
+     */
+    label: string
+
+    /**
+     * 树节点类型
+     */
+    type: any
+
+    isLeaf: boolean = false;
+
+    params: any;
+
+    static TagPath = -1;
+
+    constructor(key: any, label: string, type?: any) {
+        this.key = key;
+        this.label = label;
+        this.type = type || TagTreeNode.TagPath;
+    }
+
+    withIsLeaf(isLeaf: boolean) {
+        this.isLeaf = isLeaf;
+        return this;
+    }
+
+    withParams(params: any) {
+        this.params = params;
+        return this;
+    }
+}

mayfly_go_web/src/views/ops/db/CreateTable.vue

@@ -311,10 +311,10 @@ const addDefaultRows = () => {
         { name: 'id', type: 'bigint', length: '20', value: '', notNull: true, pri: true, auto_increment: true, remark: '主键ID' },
         { name: 'creator_id', type: 'bigint', length: '20', value: '', notNull: true, pri: false, auto_increment: false, remark: '创建人id' },
         { name: 'creator', type: 'varchar', length: '100', value: '', notNull: true, pri: false, auto_increment: false, remark: '创建人姓名' },
-        { name: 'creat_time', type: 'datetime', length: '', value: '', notNull: true, pri: false, auto_increment: false, remark: '创建时间' },
-        { name: 'updater_id', type: 'bigint', length: '20', value: '', notNull: true, pri: false, auto_increment: false, remark: '修改人id' },
-        { name: 'updater', type: 'varchar', length: '100', value: '', notNull: true, pri: false, auto_increment: false, remark: '修改人姓名' },
-        { name: 'update_time', type: 'datetime', length: '', value: '', notNull: true, pri: false, auto_increment: false, remark: '修改时间' },
+        { name: 'create_time', type: 'datetime', length: '', value: 'CURRENT_TIMESTAMP', notNull: true, pri: false, auto_increment: false, remark: '创建时间' },
+        { name: 'updator_id', type: 'bigint', length: '20', value: '', notNull: true, pri: false, auto_increment: false, remark: '修改人id' },
+        { name: 'updator', type: 'varchar', length: '100', value: '', notNull: true, pri: false, auto_increment: false, remark: '修改人姓名' },
+        { name: 'update_time', type: 'datetime', length: '', value: 'CURRENT_TIMESTAMP', notNull: true, pri: false, auto_increment: false, remark: '修改时间' },
     );
 };
 
@@ -406,7 +406,8 @@ const genSql = () => {
         let val = cl.value ? (cl.value === 'CURRENT_TIMESTAMP' ? cl.value : '\'' + cl.value + '\'') : '';
         let defVal = `${val ? ('DEFAULT ' + val) : ''}`;
         let length = cl.length ? `(${cl.length})` : '';
-        return ` ${cl.name} ${cl.type}${length} ${cl.notNull ? 'NOT NULL' : 'NULL'} ${cl.auto_increment ? 'AUTO_INCREMENT' : ''} ${defVal} comment '${cl.remark || ''}' `
+        let onUpdate = 'update_time' === cl.name ? ' ON UPDATE CURRENT_TIMESTAMP ' : ''
+        return ` ${cl.name} ${cl.type}${length} ${cl.notNull ? 'NOT NULL' : 'NULL'} ${cl.auto_increment ? 'AUTO_INCREMENT' : ''} ${defVal} ${onUpdate} comment '${cl.remark || ''}' `
     }
 
     let data = state.tableData;
@@ -416,7 +417,7 @@ const genSql = () => {
             let primary_key = '';
             let fields: string[] = [];
             data.fields.res.forEach((item) => {
-                fields.push(genColumnBasicSql(item));
+              item.name && fields.push(genColumnBasicSql(item));
                 if (item.pri) {
                     primary_key += `${item.name},`;
                 }

mayfly_go_web/src/views/ops/db/DbEdit.vue

@@ -3,88 +3,85 @@
         <el-dialog :title="title" v-model="dialogVisible" :before-close="cancel" :close-on-click-modal="false"
             :destroy-on-close="true" width="38%">
             <el-form :model="form" ref="dbForm" :rules="rules" label-width="95px">
-                <el-form-item prop="tagId" label="标签:" required>
-                    <tag-select v-model:tag-id="form.tagId" v-model:tag-path="form.tagPath" style="width: 100%" />
-                </el-form-item>
+                <el-tabs v-model="tabActiveName">
+                    <el-tab-pane label="基础信息" name="basic">
+                        <el-form-item prop="tagId" label="标签:" required>
+                            <tag-select v-model:tag-id="form.tagId" v-model:tag-path="form.tagPath" style="width: 100%" />
+                        </el-form-item>
 
-                <el-form-item prop="name" label="别名:" required>
-                    <el-input v-model.trim="form.name" placeholder="请输入数据库别名" auto-complete="off"></el-input>
-                </el-form-item>
-                <el-form-item prop="type" label="类型:" required>
-                    <el-select style="width: 100%" v-model="form.type" placeholder="请选择数据库类型">
-                        <el-option key="item.id" label="mysql" value="mysql"> </el-option>
-                        <el-option key="item.id" label="postgres" value="postgres"> </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item prop="host" label="host:" required>
-                    <el-col :span="18">
-                        <el-input :disabled="form.id !== undefined" v-model.trim="form.host" placeholder="请输入主机ip"
-                            auto-complete="off"></el-input>
-                    </el-col>
-                    <el-col style="text-align: center" :span="1">:</el-col>
-                    <el-col :span="5">
-                        <el-input type="number" v-model.number="form.port" placeholder="请输入端口"></el-input>
-                    </el-col>
-                </el-form-item>
-                <el-form-item prop="username" label="用户名:" required>
-                    <el-input v-model.trim="form.username" placeholder="请输入用户名"></el-input>
-                </el-form-item>
-                <el-form-item prop="password" label="密码:">
-                    <el-input type="password" show-password v-model.trim="form.password" placeholder="请输入密码，修改操作可不填"
-                        autocomplete="new-password">
-                        <template v-if="form.id && form.id != 0" #suffix>
-                            <el-popover @hide="pwd = ''" placement="right" title="原密码" :width="200" trigger="click"
-                                :content="pwd">
-                                <template #reference>
-                                    <el-link @click="getDbPwd" :underline="false" type="primary" class="mr5">原密码
-                                    </el-link>
+                        <el-form-item prop="name" label="别名:" required>
+                            <el-input v-model.trim="form.name" placeholder="请输入数据库别名" auto-complete="off"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="type" label="类型:" required>
+                            <el-select style="width: 100%" v-model="form.type" placeholder="请选择数据库类型">
+                                <el-option key="item.id" label="mysql" value="mysql"> </el-option>
+                                <el-option key="item.id" label="postgres" value="postgres"> </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item prop="host" label="host:" required>
+                            <el-col :span="18">
+                                <el-input :disabled="form.id !== undefined" v-model.trim="form.host" placeholder="请输入主机ip"
+                                    auto-complete="off"></el-input>
+                            </el-col>
+                            <el-col style="text-align: center" :span="1">:</el-col>
+                            <el-col :span="5">
+                                <el-input type="number" v-model.number="form.port" placeholder="请输入端口"></el-input>
+                            </el-col>
+                        </el-form-item>
+                        <el-form-item prop="username" label="用户名:" required>
+                            <el-input v-model.trim="form.username" placeholder="请输入用户名"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="password" label="密码:">
+                            <el-input type="password" show-password v-model.trim="form.password" placeholder="请输入密码，修改操作可不填"
+                                autocomplete="new-password">
+                                <template v-if="form.id && form.id != 0" #suffix>
+                                    <el-popover @hide="pwd = ''" placement="right" title="原密码" :width="200" trigger="click"
+                                        :content="pwd">
+                                        <template #reference>
+                                            <el-link @click="getDbPwd" :underline="false" type="primary" class="mr5">原密码
+                                            </el-link>
+                                        </template>
+                                    </el-popover>
                                 </template>
-                            </el-popover>
-                        </template>
-                    </el-input>
-                </el-form-item>
-                <el-form-item prop="params" label="连接参数:">
-                    <el-input v-model.trim="form.params" placeholder="其他连接参数，形如: key1=value1&key2=value2">
-                        <template #suffix>
-                            <el-link target="_blank" href="https://github.com/go-sql-driver/mysql#parameters"
-                                :underline="false" type="primary" class="mr5">参数参考</el-link>
-                        </template>
-                    </el-input>
-                </el-form-item>
-                <el-form-item prop="database" label="数据库名:" required>
-                    <el-col :span="19">
-                        <el-select @change="changeDatabase" v-model="databaseList" multiple clearable collapse-tags
-                            collapse-tags-tooltip filterable allow-create placeholder="请确保数据库实例信息填写完整后获取库名"
-                            style="width: 100%">
-                            <el-option v-for="db in allDatabases" :key="db" :label="db" :value="db" />
-                        </el-select>
-                    </el-col>
-                    <el-col style="text-align: center" :span="1">
-                        <el-divider direction="vertical" border-style="dashed" />
-                    </el-col>
-                    <el-col :span="4">
-                        <el-link @click="getAllDatabase" :underline="false" type="success">获取库名</el-link>
-                    </el-col>
-                </el-form-item>
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item prop="database" label="数据库名:" required>
+                            <el-col :span="19">
+                                <el-select @change="changeDatabase" v-model="databaseList" multiple clearable collapse-tags
+                                    collapse-tags-tooltip filterable allow-create placeholder="请确保数据库实例信息填写完整后获取库名"
+                                    style="width: 100%">
+                                    <el-option v-for="db in allDatabases" :key="db" :label="db" :value="db" />
+                                </el-select>
+                            </el-col>
+                            <el-col style="text-align: center" :span="1">
+                                <el-divider direction="vertical" border-style="dashed" />
+                            </el-col>
+                            <el-col :span="4">
+                                <el-link @click="getAllDatabase" :underline="false" type="success">获取库名</el-link>
+                            </el-col>
+                        </el-form-item>
 
-                <el-form-item prop="remark" label="备注:">
-                    <el-input v-model.trim="form.remark" auto-complete="off" type="textarea"></el-input>
-                </el-form-item>
+                        <el-form-item prop="remark" label="备注:">
+                            <el-input v-model.trim="form.remark" auto-complete="off" type="textarea"></el-input>
+                        </el-form-item>
+                    </el-tab-pane>
 
-                <el-form-item prop="enableSshTunnel" label="SSH隧道:">
-                    <el-col :span="3">
-                        <el-checkbox @change="getSshTunnelMachines" v-model="form.enableSshTunnel" :true-label="1"
-                            :false-label="-1"></el-checkbox>
-                    </el-col>
-                    <el-col :span="5" v-if="form.enableSshTunnel == 1"> 机器: </el-col>
-                    <el-col :span="16" v-if="form.enableSshTunnel == 1">
-                        <el-select style="width: 100%" v-model="form.sshTunnelMachineId" placeholder="请选择SSH隧道机器">
-                            <el-option v-for="item in sshTunnelMachineList" :key="item.id"
-                                :label="`${item.ip}:${item.port} [${item.name}]`" :value="item.id">
-                            </el-option>
-                        </el-select>
-                    </el-col>
-                </el-form-item>
+                    <el-tab-pane label="其他配置" name="other">
+                        <el-form-item prop="params" label="连接参数:">
+                            <el-input v-model.trim="form.params" placeholder="其他连接参数，形如: key1=value1&key2=value2">
+                                <template #suffix>
+                                    <el-link target="_blank" href="https://github.com/go-sql-driver/mysql#parameters"
+                                        :underline="false" type="primary" class="mr5">参数参考</el-link>
+                                </template>
+                            </el-input>
+                        </el-form-item>
+
+
+                        <el-form-item prop="sshTunnelMachineId" label="SSH隧道:">
+                            <ssh-tunnel-select v-model="form.sshTunnelMachineId" />
+                        </el-form-item>
+                    </el-tab-pane>
+                </el-tabs>
             </el-form>
 
             <template #footer>
@@ -100,11 +97,11 @@
 <script lang="ts" setup>
 import { toRefs, reactive, watch, ref } from 'vue';
 import { dbApi } from './api';
-import { machineApi } from '../machine/api.ts';
 import { ElMessage } from 'element-plus';
 import { notBlank } from '@/common/assert';
 import { RsaEncrypt } from '@/common/rsa';
 import TagSelect from '../component/TagSelect.vue';
+import SshTunnelSelect from '../component/SshTunnelSelect.vue';
 
 const props = defineProps({
     visible: {
@@ -170,9 +167,9 @@ const dbForm: any = ref(null);
 
 const state = reactive({
     dialogVisible: false,
+    tabActiveName: 'basic',
     allDatabases: [] as any,
     databaseList: [] as any,
-    sshTunnelMachineList: [] as any,
     form: {
         id: null,
         tagId: null as any,
@@ -185,13 +182,8 @@ const state = reactive({
         password: null,
         params: null,
         database: '',
-        project: null,
-        projectId: null,
-        envId: null,
-        env: null,
         remark: '',
-        enableSshTunnel: null,
-        sshTunnelMachineId: null,
+        sshTunnelMachineId: null as any,
     },
     // 原密码
     pwd: '',
@@ -200,9 +192,9 @@ const state = reactive({
 
 const {
     dialogVisible,
+    tabActiveName,
     allDatabases,
     databaseList,
-    sshTunnelMachineList,
     form,
     pwd,
     btnLoading,
@@ -213,15 +205,15 @@ watch(props, (newValue: any) => {
     if (!state.dialogVisible) {
         return;
     }
+    state.tabActiveName = 'basic';
     if (newValue.db) {
         state.form = { ...newValue.db };
         // 将数据库名使用空格切割，获取所有数据库列表
         state.databaseList = newValue.db.database.split(' ');
     } else {
-        state.form = { port: 3306, enableSshTunnel: -1 } as any;
+        state.form = { port: 3306 } as any;
         state.databaseList = [];
     }
-    getSshTunnelMachines();
 });
 
 /**
@@ -231,13 +223,6 @@ const changeDatabase = () => {
     state.form.database = state.databaseList.length == 0 ? '' : state.databaseList.join(' ');
 };
 
-const getSshTunnelMachines = async () => {
-    if (state.form.enableSshTunnel == 1 && state.sshTunnelMachineList.length == 0) {
-        const res = await machineApi.list.request({ pageNum: 1, pageSize: 100 });
-        state.sshTunnelMachineList = res.list;
-    }
-};
-
 const getAllDatabase = async () => {
     const reqForm = { ...state.form };
     reqForm.password = await RsaEncrypt(reqForm.password);
@@ -257,6 +242,9 @@ const btnOk = async () => {
         if (valid) {
             const reqForm = { ...state.form };
             reqForm.password = await RsaEncrypt(reqForm.password);
+            if (!state.form.sshTunnelMachineId) {
+                reqForm.sshTunnelMachineId = -1;
+            }
             dbApi.saveDb.request(reqForm).then(() => {
                 ElMessage.success('保存成功');
                 emit('val-change', state.form);
@@ -287,6 +275,4 @@ const cancel = () => {
     }, 500);
 };
 </script>
-<style lang="scss">
-
-</style>
+<style lang="scss"></style>

mayfly_go_web/src/views/ops/db/DbList.vue

@@ -10,7 +10,7 @@
                 <el-select @focus="getTags" v-model="query.tagPath" placeholder="请选择标签" filterable clearable>
                     <el-option v-for="item in tags" :key="item" :label="item" :value="item"> </el-option>
                 </el-select>
-                <el-button v-waves type="primary" icon="search" @click="search()" class="ml5">查询</el-button>
+                <el-button type="success" icon="search" @click="search()" class="ml5"></el-button>
             </div>
             <el-table :data="datas" ref="table" @current-change="choose" show-overflow-tooltip stripe>
                 <el-table-column label="选择" width="60px">
@@ -264,7 +264,7 @@
                 <el-descriptions-item :span="3" label="备注">{{ infoDialog.data.remark }}</el-descriptions-item>
                 <el-descriptions-item :span="3" label="数据库">{{ infoDialog.data.database }}</el-descriptions-item>
 
-                <el-descriptions-item :span="3" label="SSH隧道">{{ infoDialog.data.enableSshTunnel == 1 ? '是' : '否' }}
+                <el-descriptions-item :span="3" label="SSH隧道">{{ infoDialog.data.sshTunnelMachineId > 0 ? '是' : '否' }}
                 </el-descriptions-item>
 
                 <el-descriptions-item :span="2" label="创建时间">{{ dateFormat(infoDialog.data.createTime) }}
@@ -286,22 +286,23 @@
 </template>
 
 <script lang='ts' setup>
-import { toRefs, reactive, computed, onMounted } from 'vue';
+import { toRefs, reactive, computed, onMounted, defineAsyncComponent } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { formatByteSize } from '@/common/utils/format';
-import DbEdit from './DbEdit.vue';
-import CreateTable from './CreateTable.vue';
 import { dbApi } from './api';
 import enums from './enums';
-import SqlExecBox from './component/SqlExecBox.ts';
+import SqlExecBox from './component/SqlExecBox';
 import config from '@/common/config';
 import { getSession } from '@/common/utils/storage';
 import { isTrue } from '@/common/assert';
 import { Search as SearchIcon } from '@element-plus/icons-vue'
-import { tagApi } from '../tag/api.ts';
+import { tagApi } from '../tag/api';
 import { dateFormat } from '@/common/utils/date';
 import TagInfo from '../component/TagInfo.vue';
 
+const DbEdit = defineAsyncComponent(() => import('./DbEdit.vue'));
+const CreateTable = defineAsyncComponent(() => import('./CreateTable.vue'));
+
 const permissions = {
     saveDb: 'db:save',
     delDb: 'db:del',
@@ -322,7 +323,6 @@ const state = reactive({
      */
     query: {
         tagPath: null,
-        projectId: null,
         pageNum: 1,
         pageSize: 10,
     },
@@ -677,7 +677,7 @@ const showCreateDdl = async (row: any) => {
         db: state.db,
         tableName: row.tableName,
     });
-    state.ddlDialog.ddl = res[0]['Create Table'];
+    state.ddlDialog.ddl = res;
     state.ddlDialog.visible = true;
 };
 

mayfly_go_web/src/views/ops/db/SqlExec.vue

@@ -2,7 +2,8 @@
     <div>
         <el-row>
             <el-col :span="4">
-                <el-button type="primary" icon="plus" @click="addQueryTab({ id: nowDbInst.id }, state.db)"
+                <el-button type="primary" icon="plus"
+                    @click="addQueryTab({ id: nowDbInst.id, dbs: nowDbInst.databases }, state.db)"
                     size="small">新建查询</el-button>
             </el-col>
             <el-col :span="20" v-if="state.db">
@@ -23,8 +24,47 @@
         </el-row>
         <el-row type="flex">
             <el-col :span="4" style="border-left: 1px solid #eee; margin-top: 10px">
-                <InstanceTree ref="instanceTreeRef" @change-instance="changeInstance" @change-schema="changeSchema"
-                    @clickSqlName="onClickSqlName" @clickSchemaTable="loadTableData" />
+                <tag-tree ref="tagTreeRef" @node-click="nodeClick" :load="loadNode"
+                    :load-contextmenu-items="getContextmenuItems" @current-contextmenu-click="onCurrentContextmenuClick"
+                    :height="state.tagTreeHeight">
+                    <template #prefix="{ data }">
+                        <span v-if="data.type == NodeType.DbInst">
+                            <el-popover placement="right-start" title="数据库实例信息" trigger="hover" :width="210">
+                                <template #reference>
+                                    <SvgIcon v-if="data.params.type === 'mysql'" name="iconfont icon-op-mysql" :size="18" />
+                                    <SvgIcon v-if="data.params.type === 'postgres'" name="iconfont icon-op-postgres"
+                                        :size="18" />
+
+                                    <SvgIcon name="InfoFilled" v-else />
+                                </template>
+                                <template #default>
+                                    <el-form class="instances-pop-form" label-width="55px" :size="'small'">
+                                        <el-form-item label="类型:">{{ data.params.type }}</el-form-item>
+                                        <el-form-item label="链接:">{{ data.params.host }}:{{
+                                            data.params.port
+                                        }}</el-form-item>
+                                        <el-form-item label="用户:">{{ data.params.username }}</el-form-item>
+                                        <el-form-item v-if="data.params.remark" label="备注:">{{
+                                            data.params.remark
+                                        }}</el-form-item>
+                                    </el-form>
+                                </template>
+                            </el-popover>
+                        </span>
+
+                        <SvgIcon v-if="data.type == NodeType.Db" name="Coin" color="#67c23a" />
+
+                        <SvgIcon name="Calendar" v-if="data.type == NodeType.TableMenu" color="#409eff" />
+
+                        <el-tooltip v-if="data.type == NodeType.Table" effect="customized"
+                            :content="data.params.tableComment" placement="top-end">
+                            <SvgIcon name="Calendar" color="#409eff" />
+                        </el-tooltip>
+
+                        <SvgIcon name="Files" v-if="data.type == NodeType.SqlMenu || data.type == NodeType.Sql"
+                            color="#f56c6c" />
+                    </template>
+                </tag-tree>
             </el-col>
             <el-col :span="20">
                 <el-container id="data-exec" style="border-left: 1px solid #eee; margin-top: 10px">
@@ -53,19 +93,37 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, reactive, ref, Ref, toRefs } from 'vue';
+import { defineAsyncComponent, onMounted, reactive, ref, toRefs } from 'vue';
 import { ElMessage } from 'element-plus';
 
 import { language as sqlLanguage } from 'monaco-editor/esm/vs/basic-languages/mysql/mysql.js';
 import * as monaco from 'monaco-editor';
 import { editor, languages, Position } from 'monaco-editor';
-import InstanceTree from '@/views/ops/db/component/InstanceTree.vue';
 
 import { DbInst, TabInfo, TabType } from './db'
-import TableData from './component/tab/TableData.vue'
-import Query from './component/tab/Query.vue'
+import { TagTreeNode } from '../component/tag';
+import TagTree from '../component/TagTree.vue';
+import { dbApi } from './api';
 
-const instanceTreeRef = ref(null) as Ref;
+const Query = defineAsyncComponent(() => import('./component/tab/Query.vue'));
+const TableData = defineAsyncComponent(() => import('./component/tab/TableData.vue'));
+
+/**
+ * 树节点类型
+ */
+class NodeType {
+    static DbInst = 1
+    static Db = 2
+    static TableMenu = 3;
+    static SqlMenu = 4;
+    static Table = 5;
+    static Sql = 6;
+}
+class ContextmenuClickId {
+    static ReloadTable = 0
+}
+
+const tagTreeRef: any = ref(null)
 
 const tabs: Map<string, TabInfo> = new Map();
 const state = reactive({
@@ -74,10 +132,12 @@ const state = reactive({
      */
     nowDbInst: {} as DbInst,
     db: '', // 当前操作的数据库
-    activeName: 'Query',
+    activeName: '',
+    reloadStatus: false,
     tabs,
     dataTabsTableHeight: '600',
     editorHeight: '600',
+    tagTreeHeight: window.innerHeight - 178 + 'px',
     genSqlDialog: {
         visible: false,
         sql: '',
@@ -99,15 +159,159 @@ onMounted(() => {
  * 设置editor高度和数据表高度
  */
 const setHeight = () => {
-    // 默认300px
-    // state.monacoOptions.height = window.innerHeight - 518 + 'px'
     state.editorHeight = window.innerHeight - 518 + 'px';
     state.dataTabsTableHeight = window.innerHeight - 219 - 36 + 'px';
+    state.tagTreeHeight = window.innerHeight - 165 + 'px';
 };
 
-// 选择数据库实例
-const changeInstance = (inst: any, fn?: Function) => {
-    fn && fn()
+/**
+* instmap; tagPaht -> info[]
+*/
+const instMap: Map<string, any[]> = new Map();
+
+const getInsts = async () => {
+    const res = await dbApi.dbs.request({ pageNum: 1, pageSize: 1000, })
+    if (!res.total) return
+    for (const db of res.list) {
+        const tagPath = db.tagPath;
+        let dbInsts = instMap.get(tagPath) || [];
+        dbInsts.push(db);
+        instMap.set(tagPath, dbInsts?.sort());
+    }
+}
+
+/**
+ * 加载树节点
+ * @param {Object} node
+ * @param {Object} resolve
+ */
+const loadNode = async (node: any) => {
+    // 一级为tagPath
+    if (node.level === 0) {
+        await getInsts();
+        const tagPaths = instMap.keys();
+        const tagNodes = [];
+        for (let tagPath of tagPaths) {
+            tagNodes.push(new TagTreeNode(tagPath, tagPath));
+        }
+        return tagNodes;
+    }
+
+    const data = node.data;
+    const nodeType = data.type;
+    const params = data.params;
+
+    // 点击tagPath -> 加载数据库实例信息列表
+    if (nodeType === TagTreeNode.TagPath) {
+        const dbInfos = instMap.get(data.key)
+        return dbInfos?.map((x: any) => {
+            return new TagTreeNode(`${data.key}.${x.id}`, x.name, NodeType.DbInst).withParams(x);
+        });
+    }
+
+    // 点击数据库实例 -> 加载库列表
+    if (nodeType === NodeType.DbInst) {
+        const dbs = params.database.split(' ')?.sort();
+        return dbs.map((x: any) => {
+            return new TagTreeNode(`${data.key}.${x}`, x, NodeType.Db).withParams({
+                tagPath: params.tagPath,
+                id: params.id,
+                name: params.name,
+                type: params.type,
+                dbs: dbs,
+                db: x
+            })
+        })
+    }
+
+    // 点击数据库 -> 加载 表&Sql 菜单
+    if (nodeType === NodeType.Db) {
+        return [new TagTreeNode(`${params.id}.${params.db}.table-menu`, '表', NodeType.TableMenu).withParams(params),
+        new TagTreeNode(getSqlMenuNodeKey(params.id, params.db), 'SQL', NodeType.SqlMenu).withParams(params)];
+    }
+
+    // 点击表菜单 -> 加载表列表
+    if (nodeType === NodeType.TableMenu) {
+        return await getTables(params);
+    }
+
+    if (nodeType === NodeType.SqlMenu) {
+        return await loadSqls(params.id, params.db, params.dbs);
+    }
+
+    return [];
+};
+
+const nodeClick = async (data: any) => {
+    const params = data.params;
+    const nodeKey = data.key;
+    const dataType = data.type;
+    // 点击数据库，修改当前数据库信息
+    if (dataType === NodeType.Db || dataType === NodeType.SqlMenu || dataType === NodeType.TableMenu || dataType === NodeType.DbInst) {
+        changeSchema({ id: params.id, name: params.name, type: params.type, tagPath: params.tagPath, databases: params.database }, params.db);
+        return;
+    }
+
+    // 点击表加载表数据tab
+    if (dataType === NodeType.Table) {
+        await loadTableData({ id: params.id, nodeKey: nodeKey }, params.db, params.tableName);
+        return;
+    }
+
+    // 点击表加载表数据tab
+    if (dataType === NodeType.Sql) {
+        await addQueryTab({ id: params.id, nodeKey: nodeKey, dbs: params.dbs }, params.db, params.sqlName);
+    }
+}
+
+const getContextmenuItems = (data: any) => {
+    const dataType = data.type;
+    if (dataType === NodeType.TableMenu) {
+        return [
+            { contextMenuClickId: ContextmenuClickId.ReloadTable, txt: '刷新', icon: 'RefreshRight' }
+        ]
+    }
+    return [];
+}
+
+// 当前右击菜单点击事件
+const onCurrentContextmenuClick = (clickData: any) => {
+    const clickId = clickData.id;
+    if (clickId == ContextmenuClickId.ReloadTable) {
+        reloadTables(clickData.item.key)
+    }
+}
+
+const getTables = async (params: any) => {
+    const { id, db } = params;
+    let tables = await DbInst.getInst(id).loadTables(db, state.reloadStatus);
+    state.reloadStatus = false
+    return tables.map((x: any) => {
+        return new TagTreeNode(`${id}.${db}.${x.tableName}`, x.tableName, NodeType.Table).withIsLeaf(true).withParams({
+            id,
+            db,
+            tableName: x.tableName,
+            tableComment: x.tableComment,
+        });
+    })
+}
+
+/**
+ * 加载用户保存的sql脚本
+ *
+ * @param inst
+ * @param schema
+ */
+const loadSqls = async (id: any, db: string, dbs: any) => {
+    const sqls = await dbApi.getSqlNames.request({ id: id, db: db, })
+    return sqls.map((x: any) => {
+        return new TagTreeNode(`${id}.${db}.${x.name}`, x.name, NodeType.Sql).withIsLeaf(true).withParams({
+            id,
+            db,
+            dbs,
+            sqlName: x.name,
+        });
+    });
 }
 
 // 选择数据库
@@ -132,6 +336,7 @@ const loadTableData = async (inst: any, schema: string, tableName: string) => {
     }
     tab = new TabInfo();
     tab.key = label;
+    tab.treeNodeKey = inst.nodeKey;
     tab.dbId = inst.id;
     tab.db = schema;
     tab.type = TabType.TableData;
@@ -147,6 +352,7 @@ const addQueryTab = async (inst: any, db: string, sqlName: string = '') => {
         ElMessage.warning('请选择数据库实例及对应的schema')
         return
     }
+
     const dbId = inst.id;
     let label;
     // 存在sql模板名，则该模板名只允许一个tab
@@ -168,12 +374,13 @@ const addQueryTab = async (inst: any, db: string, sqlName: string = '') => {
     }
     tab = new TabInfo();
     tab.key = label;
+    tab.treeNodeKey = inst.nodeKey;
     tab.dbId = dbId;
     tab.db = db;
     tab.type = TabType.Query;
     tab.params = {
         sqlName: sqlName,
-        dbs: instanceTreeRef.value.getSchemas(dbId)
+        dbs: inst.dbs,
     }
     state.tabs.set(label, tab)
     registerSqlCompletionItemProvider();
@@ -204,7 +411,9 @@ const onTabChange = () => {
         state.db = '';
         return;
     }
-    state.nowDbInst = DbInst.getInst(state.tabs.get(state.activeName)?.dbId);
+    const nowTab = state.tabs.get(state.activeName);
+    state.nowDbInst = DbInst.getInst(nowTab?.dbId);
+    state.db = nowTab?.db as string;
 }
 
 const onGenerateInsertSql = async (sql: string) => {
@@ -212,23 +421,28 @@ const onGenerateInsertSql = async (sql: string) => {
     state.genSqlDialog.visible = true;
 };
 
-const onClickSqlName = (inst: any, schema: string, sqlName: string) => {
-    addQueryTab(inst, schema, sqlName);
-}
-
 const reloadSqls = (dbId: number, db: string) => {
-    instanceTreeRef.value.reloadSqls({ id: dbId }, db);
+    tagTreeRef.value.reloadNode(getSqlMenuNodeKey(dbId, db));
 }
 
 const deleteSqlScript = (ti: TabInfo) => {
-    instanceTreeRef.value.reloadSqls({ id: ti.dbId }, ti.db);
+    reloadSqls(ti.dbId, ti.db);
     onRemoveTab(ti.key);
 }
 
+const getSqlMenuNodeKey = (dbId: number, db: string) => {
+    return `${dbId}.${db}.sql-menu`
+}
+
+const reloadTables = (nodeKey: string) => {
+    state.reloadStatus = true
+    tagTreeRef.value.reloadNode(nodeKey);
+}
+
 const registerSqlCompletionItemProvider = () => {
     // 参考 https://microsoft.github.io/monaco-editor/playground.html#extending-language-services-completion-provider-example
     self.completionItemProvider = self.completionItemProvider || monaco.languages.registerCompletionItemProvider('sql', {
-        triggerCharacters: ['.'],
+        triggerCharacters: ['.', ' '],
         provideCompletionItems: async (model: editor.ITextModel, position: Position): Promise<languages.CompletionList | null | undefined> => {
             let word = model.getWordUntilPosition(position);
             const nowTab = state.tabs.get(state.activeName);
@@ -278,17 +492,47 @@ const registerSqlCompletionItemProvider = () => {
             // // const nextToken = nextTokens[0].toLowerCase()
             const tokens = textBeforePointer.trim().split(/\s+/)
             const lastToken = tokens[tokens.length - 1].toLowerCase()
+            const secondToken = tokens.length > 2 && tokens[tokens.length - 2].toLowerCase() || ''
 
-            const dbs = nowTab.params && nowTab.params.dbs;
+            const dbs = nowTab.params?.dbs?.split(' ') || [];
             // console.log("光标前文本：=>" + textBeforePointerMulti)
-
             // console.log("最后输入的：=>" + lastToken)
-            if (lastToken.endsWith('.')) {
+
+            let suggestions: languages.CompletionItem[] = []
+            const tables = await dbInst.loadTables(db);
+
+            async function hintTableColumns(tableName: any, db: any) {
+                let dbHits = await dbInst.loadDbHints(db)
+                let columns = dbHits[tableName]
+                let suggestions: languages.CompletionItem[] = []
+                columns?.forEach((a: string, index: any) => {
+                    // 字段数据格式  字段名 字段注释，  如： create_time  [datetime][创建时间]
+                    const nameAndComment = a.split("  ")
+                    const fieldName = nameAndComment[0]
+                    suggestions.push({
+                        label: {
+                            label: a,
+                            description: 'column'
+                        },
+                        kind: monaco.languages.CompletionItemKind.Property,
+                        detail: '', // 不显示detail, 否则选中时备注等会被遮挡
+                        insertText: fieldName + ' ', // create_time
+                        range,
+                        sortText: 100 + index + '' // 使用表字段声明顺序排序,排序需为字符串类型
+                    });
+                })
+                return suggestions
+            }
+
+            if (lastToken.indexOf('.') > -1 || secondToken.indexOf('.') > -1) {
                 // 如果是.触发代码提示，则进行【 库.表名联想 】 或 【 表别名.表字段联想 】
                 let str = lastToken.substring(0, lastToken.lastIndexOf('.'))
-                // 库.表名联想
+                if (lastToken.trim().startsWith('.')) {
+                    str = secondToken
+                }
 
-                if (dbs.filter((a: any) => a.name === str)?.length > 0) {
+                // 库.表名联想
+                if (dbs && dbs.filter((a: any) => a === str)?.length > 0) {
                     let tables = await dbInst.loadTables(str)
                     let suggestions: languages.CompletionItem[] = []
                     for (let item of tables) {
@@ -310,36 +554,43 @@ const registerSqlCompletionItemProvider = () => {
                 // 表别名.表字段联想
                 let tableInfo = getTableByAlias(sql, db, str)
                 if (tableInfo.tableName) {
-                    let table = tableInfo.tableName
+                    let tableName = tableInfo.tableName
                     let db = tableInfo.dbName;
                     // 取出表名并提示
-                    let dbHits = await dbInst.loadDbHints(db)
-                    let columns = dbHits[table]
-                    let suggestions: languages.CompletionItem[] = []
-                    columns?.forEach((a: string, index: any) => {
-                        // 字段数据格式  字段名 字段注释，  如： create_time  [datetime][创建时间]
-                        const nameAndComment = a.split("  ")
-                        const fieldName = nameAndComment[0]
-                        suggestions.push({
-                            label: {
-                                label: a,
-                                description: 'column'
-                            },
-                            kind: monaco.languages.CompletionItemKind.Property,
-                            detail: '', // 不显示detail, 否则选中时备注等会被遮挡
-                            insertText: fieldName + ' ', // create_time
-                            range,
-                            sortText: 100 + index + '' // 使用表字段声明顺序排序,排序需为字符串类型
-                        });
-                    })
-                    return { suggestions }
+                    let suggestions = await hintTableColumns(tableName, db);
+                    if (suggestions.length > 0) {
+                        return { suggestions };
+                    }
                 }
                 return { suggestions: [] }
+            } else {
+                // 如果sql里含有表名，则提示表字段
+                let mat = textBeforePointerMulti.match(/from\n*\s+\n*(\w+)\n*\s+\n*/i)
+                if (mat && mat.length > 1) {
+                    let tableName = mat[1]
+                    // 取出表名并提示
+                    let addSuggestions = await hintTableColumns(tableName, db);
+                    if (addSuggestions.length > 0) {
+                        suggestions = suggestions.concat(addSuggestions)
+                    }
+                }
             }
 
-            // 库名联想
+            // 表名联想
+            tables.forEach((tableMeta: any) => {
+                const { tableName, tableComment } = tableMeta;
+                suggestions.push({
+                    label: {
+                        label: tableName + ' - ' + tableComment,
+                        description: 'table'
+                    },
+                    kind: monaco.languages.CompletionItemKind.File,
+                    detail: tableComment,
+                    insertText: tableName + ' ',
+                    range
+                });
+            });
 
-            let suggestions: languages.CompletionItem[] = []
             // mysql关键字
             sqlLanguage.keywords.forEach((item: any) => {
                 suggestions.push({
@@ -390,33 +641,19 @@ const registerSqlCompletionItemProvider = () => {
             })
 
             // 库名提示
-            dbs.forEach((a: any) => {
-                suggestions.push({
-                    label: {
-                        label: a.name,
-                        description: 'schema'
-                    },
-                    kind: monaco.languages.CompletionItemKind.Folder,
-                    insertText: a.name,
-                    range
-                });
-            })
-
-            const tables = await dbInst.loadTables(db);
-            // 表名联想
-            tables.forEach((tableMeta: any) => {
-                const { tableName, tableComment } = tableMeta
-                suggestions.push({
-                    label: {
-                        label: tableName + ' - ' + tableComment,
-                        description: 'table'
-                    },
-                    kind: monaco.languages.CompletionItemKind.File,
-                    detail: tableComment,
-                    insertText: tableName + ' ',
-                    range
-                });
-            })
+            if (dbs && dbs.length > 0) {
+                dbs.forEach((a: any) => {
+                    suggestions.push({
+                        label: {
+                            label: a,
+                            description: 'schema'
+                        },
+                        kind: monaco.languages.CompletionItemKind.Folder,
+                        insertText: a,
+                        range
+                    });
+                })
+            }
 
             // 默认提示
             return {
@@ -518,4 +755,10 @@ select * from invisit v where`.match(/(join|from)\s+(\w*-?\w*\.?\w+)\s*(as)?\s*(
 .update_field_active {
     background-color: var(--el-color-success)
 }
+
+.instances-pop-form {
+    .el-form-item {
+        margin-bottom: unset;
+    }
+}
 </style>

mayfly_go_web/src/views/ops/db/api.ts

@@ -2,27 +2,27 @@ import Api from '@/common/Api';
 
 export const dbApi = {
     // 获取权限列表
-    dbs: Api.create("/dbs", 'get'),
-    saveDb: Api.create("/dbs", 'post'),
-    getAllDatabase: Api.create("/dbs/databases", 'post'),
-    getDbPwd: Api.create("/dbs/{id}/pwd", 'get'),
-    deleteDb: Api.create("/dbs/{id}", 'delete'),
-    dumpDb: Api.create("/dbs/{id}/dump", 'post'),
-    tableInfos: Api.create("/dbs/{id}/t-infos", 'get'),
-    tableIndex: Api.create("/dbs/{id}/t-index", 'get'),
-    tableDdl: Api.create("/dbs/{id}/t-create-ddl", 'get'),
-    tableMetadata: Api.create("/dbs/{id}/t-metadata", 'get'),
-    columnMetadata: Api.create("/dbs/{id}/c-metadata", 'get'),
+    dbs: Api.newGet("/dbs"),
+    saveDb: Api.newPost("/dbs"),
+    getAllDatabase: Api.newPost("/dbs/databases"),
+    getDbPwd: Api.newGet("/dbs/{id}/pwd"),
+    deleteDb: Api.newDelete("/dbs/{id}"),
+    dumpDb: Api.newPost("/dbs/{id}/dump"),
+    tableInfos: Api.newGet("/dbs/{id}/t-infos"),
+    tableIndex: Api.newGet("/dbs/{id}/t-index"),
+    tableDdl: Api.newGet("/dbs/{id}/t-create-ddl"),
+    tableMetadata: Api.newGet("/dbs/{id}/t-metadata"),
+    columnMetadata: Api.newGet("/dbs/{id}/c-metadata"),
     // 获取表即列提示
-    hintTables: Api.create("/dbs/{id}/hint-tables", 'get'),
-    sqlExec: Api.create("/dbs/{id}/exec-sql", 'post'),
+    hintTables: Api.newGet("/dbs/{id}/hint-tables"),
+    sqlExec: Api.newPost("/dbs/{id}/exec-sql"),
     // 保存sql
-    saveSql: Api.create("/dbs/{id}/sql", 'post'),
+    saveSql: Api.newPost("/dbs/{id}/sql"),
     // 获取保存的sql
-    getSql: Api.create("/dbs/{id}/sql", 'get'),
+    getSql: Api.newGet("/dbs/{id}/sql"),
     // 获取保存的sql names
-    getSqlNames: Api.create("/dbs/{id}/sql-names", 'get'),
-    deleteDbSql: Api.create("/dbs/{id}/sql", 'delete'),
+    getSqlNames: Api.newGet("/dbs/{id}/sql-names"),
+    deleteDbSql: Api.newDelete("/dbs/{id}/sql"),
     // 获取数据库sql执行记录
-    getSqlExecs: Api.create("/dbs/{dbId}/sql-execs", 'get'),
+    getSqlExecs: Api.newGet("/dbs/{dbId}/sql-execs"),
 }

mayfly_go_web/src/views/ops/db/component/DbTable.vue

@@ -268,6 +268,10 @@ const submitUpdateFields = () => {
         let primaryKeyName = a.primaryKeyName;
         a.fields.forEach(f => {
             sql += ` ${f.fieldName} = ${DbInst.wrapColumnValue(f.fieldType, f.newValue)},`
+            // 如果修改的字段是主键
+            if(f.fieldName === primaryKeyName){
+                primaryKey = f.oldValue
+            }
             divs.push(f.div)
         })
         sql = sql.substring(0, sql.length - 1)

mayfly_go_web/src/views/ops/db/component/InstanceTree.vue

@@ -1,346 +0,0 @@
-<template>
-    <tag-menu :instanceMenuMaxHeight="instanceMenuMaxHeight" :tags="tags" ref="menuRef">
-        <template #submenu="props">
-            <!-- 第二级：数据库实例 -->
-            <el-sub-menu v-for="inst in tree[props.tag.tagId]" :index="'instance-' + inst.id"
-                :key="'instance-' + inst.id" @click.stop="changeInstance(inst, () => { })">
-                <template #title>
-                    <el-popover placement="right-start" title="数据库实例信息" trigger="hover" :width="210">
-                        <template #reference>
-                            <span class="ml10">
-                                <el-icon>
-                                    <MostlyCloudy color="#409eff" />
-                                </el-icon>{{ inst.name }}
-                            </span>
-                        </template>
-                        <template #default>
-                            <el-form class="instances-pop-form" label-width="55px" :size="'small'">
-                                <el-form-item label="类型:">{{ inst.type }}</el-form-item>
-                                <el-form-item label="链接:">{{ inst.host }}:{{ inst.port }}</el-form-item>
-                                <el-form-item label="用户:">{{ inst.username }}</el-form-item>
-                                <el-form-item v-if="inst.remark" label="备注:">{{ inst.remark }}</el-form-item>
-                            </el-form>
-                        </template>
-                    </el-popover>
-                </template>
-                <el-menu-item v-if="dbs[inst.id]?.length > 20" :index="'schema-filter-' + inst.id"
-                    :key="'schema-filter-' + inst.id">
-                    <template #title>
-                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                        <el-input size="small" placeholder="过滤数据库" clearable @change="filterSchemaName(inst.id)"
-                            @keyup="(e: any) => filterSchemaName(inst.id, e)"
-                            v-model="state.schemaFilterParam[inst.id]" />
-                    </template>
-                </el-menu-item>
-                <!-- 第三级：数据库 -->
-                <el-sub-menu v-show="schema.show" v-for="schema in dbs[inst.id]" :index="inst.id + schema.name"
-                    :key="inst.id + schema.name" :class="state.nowSchema === (inst.id + schema.name) && 'checked'"
-                    @click.stop="changeSchema(inst, schema.name)">
-                    <template #title>
-                        <span class="checked-schema ml20">
-                            <el-icon>
-                                <Coin color="#67c23a" />
-                            </el-icon>
-                            <span v-html="schema.showName || schema.name"></span>
-                        </span>
-                    </template>
-                    <!-- 第四级 01：表 -->
-                    <el-sub-menu :index="inst.id + schema.name + '-table'">
-                        <template #title>
-                            <div class="ml30" style="width: 100%" @click="loadSchemaTables(inst, schema.name)">
-                                <el-icon>
-                                    <Calendar color="#409eff" />
-                                </el-icon>
-                                <span>表</span>
-                                <el-icon v-show="state.loading[inst.id + schema.name]" class="is-loading">
-                                    <Loading />
-                                </el-icon>
-                            </div>
-                        </template>
-                        <el-menu-item v-if="tables[inst.id + schema.name]?.length > 20"
-                            :index="inst.id + schema.name + '-tableSearch'"
-                            :key="inst.id + schema.name + '-tableSearch'">
-                            <template #title>
-                                <span class="ml35">
-                                    <el-input size="small" placeholder="表名、备注过滤表" clearable
-                                        @change="filterTableName(inst.id, schema.name)"
-                                        @keyup="(e: any) => filterTableName(inst.id, schema.name, e)"
-                                        v-model="state.filterParam[inst.id + schema.name]" />
-                                </span>
-                            </template>
-                        </el-menu-item>
-
-                        <template v-for="tb in tables[inst.id + schema.name]">
-                            <el-menu-item :index="inst.id + schema.name + tb.tableName"
-                                :key="inst.id + schema.name + tb.tableName" v-if="tb.show"
-                                @click="clickSchemaTable(inst, schema.name, tb.tableName)">
-                                <template #title>
-                                    <div class="ml35" style="width: 100%">
-                                        <el-icon>
-                                            <Calendar color="#409eff" />
-                                        </el-icon>
-                                        <el-tooltip v-if="tb.tableComment" effect="customized"
-                                            :content="tb.tableComment" placement="right">
-                                            <span v-html="tb.showName || tb.tableName"></span>
-                                        </el-tooltip>
-                                        <span v-else v-html="tb.showName || tb.tableName"></span>
-                                    </div>
-                                </template>
-                            </el-menu-item>
-                        </template>
-                    </el-sub-menu>
-                    <!-- 第四级 02：sql -->
-                    <el-sub-menu @click.stop="loadSqls(inst, schema.name)" :index="inst.id + schema.name + '-sql'">
-                        <template #title>
-                            <span class="ml30">
-                                <el-icon>
-                                    <List color="#f56c6c" />
-                                </el-icon>
-                                <span>sql</span>
-                            </span>
-                        </template>
-
-                        <template v-for="sql in sqls[inst.id + schema.name]">
-                            <el-menu-item v-if="sql.show" :index="inst.id + schema.name + sql.name"
-                                :key="inst.id + schema.name + sql.name"
-                                @click="clickSqlName(inst, schema.name, sql.name)">
-                                <template #title>
-                                    <div class="ml35" style="width: 100%">
-                                        <el-icon>
-                                            <Document />
-                                        </el-icon>
-                                        <span>{{ sql.name }}</span>
-                                    </div>
-                                </template>
-                            </el-menu-item>
-                        </template>
-                    </el-sub-menu>
-                </el-sub-menu>
-            </el-sub-menu>
-        </template>
-    </tag-menu>
-</template>
-
-<script lang="ts" setup>
-import { onBeforeMount, reactive, toRefs } from 'vue';
-import TagMenu from '../../component/TagMenu.vue';
-import { dbApi } from '../api';
-import { DbInst } from '../db';
-
-const emits = defineEmits(['changeInstance', 'clickSqlName', 'clickSchemaTable', 'changeSchema', 'loadSqlNames'])
-
-onBeforeMount(async () => {
-    await loadInstances();
-    state.instanceMenuMaxHeight = window.innerHeight - 140 + 'px';
-})
-
-const state = reactive({
-    tags: {},
-    tree: {},
-    dbs: {},
-    tables: {},
-    sqls: {},
-    nowSchema: '',
-    filterParam: {},
-    schemaFilterParam: {},
-    loading: {},
-    instanceMenuMaxHeight: '850px',
-})
-
-const {
-    instanceMenuMaxHeight,
-    tags,
-    tree,
-    dbs,
-    sqls,
-    tables,
-} = toRefs(state)
-
-// 加载实例数据
-const loadInstances = async () => {
-    const res = await dbApi.dbs.request({ pageNum: 1, pageSize: 1000, })
-    if (!res.total) return
-    // state.instances = { tags: {}, tree: {}, dbs: {}, tables: {}, sqls: {} }; // 初始化变量
-    for (const db of res.list) {
-        let arr = state.tree[db.tagId] || []
-        const { tagId, tagPath } = db
-        // tags
-        state.tags[db.tagId] = { tagId, tagPath }
-
-        // tree
-        arr.push(db)
-        state.tree[db.tagId] = arr;
-
-        // dbs
-        let databases = db.database.split(' ')
-        let dbs = [] as any[];
-        databases.forEach((a: string) => dbs.push({ name: a, show: true }))
-        state.dbs[db.id] = dbs
-    }
-}
-
-/**
- * 改变选中的数据库实例
- * @param inst 选中的实例对象
- * @param fn 选中的实例对象后的回调函数
- */
-const changeInstance = (inst: any, fn: Function) => {
-    emits('changeInstance', inst, fn)
-}
-/**
- * 改变选中的数据库schema
- * @param inst 选中的实例对象
- * @param schema 选中的数据库schema
- */
-const changeSchema = (inst: any, schema: string) => {
-    state.nowSchema = inst.id + schema
-    emits('changeSchema', inst, schema)
-}
-
-/** 加载schema下所有表
- * 
- * @param inst 数据库实例
- * @param schema database名
- */
-const loadSchemaTables = async (inst: any, schema: string) => {
-    const key = getSchemaKey(inst.id, schema);
-    state.loading[key] = true
-    try {
-        let { id } = inst
-        let tables = await DbInst.getInst(id).loadTables(schema);
-        tables && tables.forEach((a: any) => a.show = true)
-        state.tables[key] = tables;
-        changeSchema(inst, schema);
-    } finally {
-        state.loading[key] = false
-    }
-}
-
-/**
- * 加载选中表数据
- * @param inst 数据库实例
- * @param schema database名
- * @param tableName 表名
- */
-const clickSchemaTable = (inst: any, schema: string, tableName: string) => {
-    emits('clickSchemaTable', inst, schema, tableName)
-}
-
-const filterTableName = (instId: number, schema: string, event?: any) => {
-    const key = getSchemaKey(instId, schema)
-    if (event) {
-        state.filterParam[key] = event.target.value
-    }
-    let param = state.filterParam[key] as string
-    state.tables[key].forEach((a: any) => {
-        let { match, showName } = matchAndHighLight(param, a.tableName + a.tableComment, a.tableName)
-        a.show = match;
-        a.showName = showName
-    })
-}
-
-const filterSchemaName = (instId: number, event?: any) => {
-    if (event) {
-        state.schemaFilterParam[instId] = event.target.value
-    }
-    let param = state.schemaFilterParam[instId] as string
-    param = param?.replace('/', '\/')
-    state.dbs[instId].forEach((a: any) => {
-        let { match, showName } = matchAndHighLight(param, a.name, a.name)
-        a.show = match
-        a.showName = showName
-    })
-}
-
-const matchAndHighLight = (searchParam: string, param: string, title: string): { match: boolean, showName: string } => {
-    if (!searchParam) {
-        return { match: true, showName: '' }
-    }
-    let str = '';
-    for (let c of searchParam?.replace('/', '\/')) {
-        str += `(${c}).*`
-    }
-    let regex = eval(`/${str}/i`)
-    let res = param.match(regex);
-    if (res?.length) {
-        if (res?.length) {
-            let tmp = '', showName = '';
-            for (let i = 1; i <= res.length - 1; i++) {
-                let head = (tmp || title).replace(res[i], `###${res[i]}!!!`);
-                let idx = head.lastIndexOf('!!!') + 3;
-                tmp = head.substring(idx);
-                showName += head.substring(0, idx)
-                if (!tmp) {
-                    break
-                }
-            }
-            showName += tmp;
-            showName = showName.replaceAll('###', '<span style="color: red">')
-            showName = showName.replaceAll('!!!', '</span>')
-            return { match: true, showName }
-        }
-    }
-
-    return { match: false, showName: '' }
-
-}
-
-/**
- * 加载用户保存的sql脚本
- * 
- * @param inst 
- * @param schema 
- */
-const loadSqls = async (inst: any, schema: string) => {
-    const key = getSchemaKey(inst.id, schema)
-    let sqls = state.sqls[key];
-    if (!sqls) {
-        const sqls = await dbApi.getSqlNames.request({ id: inst.id, db: schema, })
-        sqls && sqls.forEach((a: any) => a.show = true)
-        state.sqls[key] = sqls;
-    } else {
-        sqls.forEach((a: any) => a.show = true);
-    }
-}
-
-const reloadSqls = async (inst: any, schema: string) => {
-    const sqls = await dbApi.getSqlNames.request({ id: inst.id, db: schema, })
-    sqls && sqls.forEach((a: any) => a.show = true)
-    state.sqls[getSchemaKey(inst.id, schema)] = sqls;
-}
-
-/**
- * 点击sql模板名称时间，加载用户保存的指定名称的sql内容，并回调子组件指定事件
- */
-const clickSqlName = async (inst: any, schema: string, sqlName: string) => {
-    emits('clickSqlName', inst, schema, sqlName)
-    changeSchema(inst, schema);
-}
-
-/**
- * 根据实例以及库获取对应的唯一id
- * 
- * @param inst  数据库实例
- * @param schema 数据库
- */
-const getSchemaKey = (instId: any, schema: string) => {
-    return instId + schema;
-}
-
-const getSchemas = (dbId: any) => {
-    return state.dbs[dbId] || []
-}
-
-defineExpose({
-    getSchemas,
-    reloadSqls,
-})
-</script>
-
-<style lang="scss">
-.instances-pop-form {
-    .el-form-item {
-        margin-bottom: unset;
-    }
-}
-</style>

mayfly_go_web/src/views/ops/db/component/tab/Query.vue

@@ -41,6 +41,13 @@
             <div :id="'MonacoTextarea-' + ti.key" :style="{ height: editorHeight }">
             </div>
         </div>
+
+        <div class="editor-move-resize" @mousedown="onDragSetHeight">
+            <el-icon>
+                <Minus />
+            </el-icon>
+        </div>
+
         <div class="mt5">
             <el-row>
                 <el-link v-if="table" @click="onDeleteData()" class="ml5" type="danger" icon="delete"
@@ -62,18 +69,19 @@
                             style="font-size: 12px">取消</span></el-link>
                 </span>
             </el-row>
-            <db-table ref="dbTableRef" :db-id="state.ti.dbId" :db="state.ti.db"
-                :data="execRes.data" :table="state.table" :column-names="execRes.tableColumn" :loading="loading"
-                height="250" empty-text="tips: select *开头的单表查询或点击表名默认查询的数据,可双击数据在线修改"
-                @selection-change="onDataSelectionChange" @change-updated-field="changeUpdatedField"></db-table>
+            <db-table ref="dbTableRef" :db-id="state.ti.dbId" :db="state.ti.db" :data="execRes.data" :table="state.table"
+                :column-names="execRes.tableColumn" :loading="loading" :height="tableDataHeight"
+                empty-text="tips: select *开头的单表查询或点击表名默认查询的数据,可双击数据在线修改" @selection-change="onDataSelectionChange"
+                @change-updated-field="changeUpdatedField"></db-table>
         </div>
 
     </div>
 </template>
 
 <script lang="ts" setup>
-import { nextTick, watch, onMounted, computed, reactive, toRefs, ref, Ref } from 'vue';
-import { useStore } from '@/store/index.ts';
+import { nextTick, watch, onMounted, reactive, toRefs, ref, Ref } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '@/store/themeConfig';
 import { getSession } from '@/common/utils/storage';
 import { isTrue, notBlank } from '@/common/assert';
 import { format as sqlFormatter } from 'sql-formatter';
@@ -110,8 +118,7 @@ const props = defineProps({
     }
 })
 
-
-const store = useStore();
+const { themeConfig } = storeToRefs(useThemeConfig());
 const token = getSession('token');
 let monacoEditor = {} as editor.IStandaloneCodeEditor;
 const dbTableRef = ref(null) as Ref;
@@ -131,10 +138,12 @@ const state = reactive({
     },
     selectionDatas: [] as any,
     editorHeight: '500',
+    tableDataHeight: 250 as any,
     hasUpdatedFileds: false,
 });
 
 const {
+    tableDataHeight,
     editorHeight,
     ti,
     execRes,
@@ -166,11 +175,6 @@ onMounted(async () => {
     await state.ti.getNowDbInst().loadDbHints(state.ti.db);
 })
 
-// 获取布局配置信息
-const getThemeConfig: any = computed(() => {
-    return store.state.themeConfig.themeConfig;
-});
-
 self.MonacoEnvironment = {
     getWorker() {
         return new EditorWorker();
@@ -184,7 +188,7 @@ const initMonacoEditor = () => {
     monaco.editor.defineTheme('SolarizedLight', SolarizedLight);
     monacoEditor = monaco.editor.create(monacoTextarea, {
         language: 'sql',
-        theme: getThemeConfig.value.editorTheme,
+        theme: themeConfig.value.editorTheme,
         automaticLayout: true, //自适应宽高布局
         folding: false,
         roundedSelection: false, // 禁用选择文本背景的圆角
@@ -266,6 +270,21 @@ const initMonacoEditor = () => {
     }
 };
 
+/**
+ * 拖拽改变sql编辑区和查询结果区高度
+*/
+const onDragSetHeight = () => {
+    document.onmousemove = (e) => {
+        e.preventDefault();
+        //得到鼠标拖动的宽高距离：取绝对值
+        state.editorHeight = `${document.getElementById('MonacoTextarea-' + state.ti.key)!.offsetHeight + e.movementY}px`
+        state.tableDataHeight -= e.movementY
+    }
+    document.onmouseup = () => {
+        document.onmousemove = null;
+    }
+}
+
 /**
  * 执行sql
  */
@@ -324,7 +343,7 @@ const onRunSql = async () => {
         state.selectionDatas = [];
         const tableName = sql.split(/from/i)[1];
         if (tableName) {
-            const tn = tableName.trim().split(' ')[0];
+            const tn = tableName.trim().split(' ')[0].split('\n')[0];
             state.table = tn;
             state.table = tn;
         } else {
@@ -545,4 +564,10 @@ const cancelUpdateFields = () => {
 .update_field_active {
     background-color: var(--el-color-success)
 }
+
+.editor-move-resize {
+    cursor: n-resize;
+    height: 3px;
+    text-align: center;
+}
 </style>

mayfly_go_web/src/views/ops/db/component/tab/TableData.vue

@@ -6,7 +6,7 @@
                 </el-link>
                 <el-divider direction="vertical" border-style="dashed" />
 
-                <el-link @click="addRow()" type="primary" icon="plus" :underline="false"></el-link>
+                <el-link @click="onShowAddDataDialog()" type="primary" icon="plus" :underline="false"></el-link>
                 <el-divider direction="vertical" border-style="dashed" />
 
                 <el-link @click="onDeleteData()" type="danger" icon="delete" :underline="false"></el-link>
@@ -37,8 +37,8 @@
                 </el-tooltip>
             </el-col>
             <el-col :span="16">
-                <el-input v-model="condition" placeholder="若需条件过滤，可选择列并点击对应的字段并输入需要过滤的内容点击查询按钮即可" clearable size="small"
-                    style="width: 100%">
+                <el-input v-model="condition" placeholder="若需条件过滤，可选择列并点击对应的字段并输入需要过滤的内容点击查询按钮即可" clearable
+                    @clear="selectData" size="small" style="width: 100%">
                     <template #prepend>
                         <el-popover trigger="click" :width="320" placement="right">
                             <template #reference>
@@ -64,9 +64,9 @@
             </el-col>
         </el-row>
 
-        <db-table ref="dbTableRef" :db-id="state.ti.dbId" :db="state.ti.db" :data="datas"
-            :table="state.table" :column-names="columnNames" :loading="loading" :height="tableHeight"
-            :show-column-tip="true" :sortable="'custom'" @sort-change="(sort: any) => onTableSortChange(sort)"
+        <db-table ref="dbTableRef" :db-id="state.ti.dbId" :db="state.ti.db" :data="datas" :table="state.table"
+            :column-names="columnNames" :loading="loading" :height="tableHeight" :show-column-tip="true"
+            :sortable="'custom'" @sort-change="(sort: any) => onTableSortChange(sort)"
             @selection-change="onDataSelectionChange" @change-updated-field="changeUpdatedField"></db-table>
 
         <el-row type="flex" class="mt5" justify="center">
@@ -99,6 +99,26 @@
                 </span>
             </template>
         </el-dialog>
+
+        <el-dialog v-model="addDataDialog.visible" :title="addDataDialog.title" :destroy-on-close="true" width="600px">
+            <el-form ref="dataForm" :model="addDataDialog.data" label-width="160px" size="small">
+                <el-form-item v-for="column in columns" class="w100" :prop="column.columnName" :label="column.columnName"
+                    :required="column.nullable != 'YES' && column.columnKey != 'PRI'">
+                    <el-input-number v-if="DbInst.isNumber(column.columnType)"
+                        v-model="addDataDialog.data[`${column.columnName}`]"
+                        :placeholder="`${column.columnType}  ${column.columnComment}`" class="w100" />
+
+                    <el-input v-else v-model="addDataDialog.data[`${column.columnName}`]"
+                        :placeholder="`${column.columnType}  ${column.columnComment}`" />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="closeAddDataDialog">取消</el-button>
+                    <el-button type="primary" @click="addRow">确定</el-button>
+                </span>
+            </template>
+        </el-dialog>
     </div>
 </template>
 
@@ -113,6 +133,7 @@ import { dateStrFormat } from '@/common/utils/date';
 import DbTable from '../DbTable.vue'
 
 const emits = defineEmits(['genInsertSql'])
+const dataForm: any = ref(null);
 
 const props = defineProps({
     data: {
@@ -120,7 +141,7 @@ const props = defineProps({
         required: true
     },
     tableHeight: {
-        type: String,
+        type: [String],
         default: '600'
     }
 })
@@ -136,7 +157,7 @@ const state = reactive({
     condition: '', // 当前条件框的条件
     loading: false, // 是否在加载数据
     columnNames: [],
-    columns: [],
+    columns: [] as any,
     pageNum: 1,
     count: 0,
     selectionDatas: [] as any,
@@ -149,6 +170,12 @@ const state = reactive({
         condition: '=',
         value: null
     },
+    addDataDialog: {
+        data: {},
+        title: '',
+        placeholder: '',
+        visible: false,
+    },
     tableHeight: '600',
     hasUpdatedFileds: false,
 });
@@ -163,6 +190,7 @@ const {
     count,
     hasUpdatedFileds,
     conditionDialog,
+    addDataDialog,
 } = toRefs(state);
 
 watch(() => props.tableHeight, (newValue: any) => {
@@ -204,7 +232,7 @@ const selectData = async () => {
     const dbInst = state.ti.getNowDbInst();
     const { db } = state.ti;
     try {
-        const countRes = await dbInst.runSql(db, DbInst.getDefaultCountSql(state.table));
+        const countRes = await dbInst.runSql(db, DbInst.getDefaultCountSql(state.table, state.condition));
         state.count = countRes.res[0].count;
         let sql = dbInst.getDefaultSelectSql(state.table, state.condition, state.orderBy, state.pageNum);
         state.sql = sql;
@@ -323,20 +351,43 @@ const cancelUpdateFields = () => {
     dbTableRef.value.cancelUpdateFields();
 }
 
+const onShowAddDataDialog = async () => {
+    state.addDataDialog.title = `添加'${state.table}'表数据`
+    state.addDataDialog.visible = true;
+};
+
+const closeAddDataDialog = () => {
+    state.addDataDialog.visible = false;
+    state.addDataDialog.data = {};
+}
+
 // 添加新数据行
 const addRow = async () => {
-    const columns = state.ti.getNowDb().getColumns(state.table);
-    // key: 字段名，value: 字段名提示
-    let obj: any = {};
-    columns.forEach((item: any) => {
-        obj[`${item.columnName}`] = `'${item.columnComment || ''} ${item.columnName}[${item.columnType}]${item.nullable == 'YES' ? '' : '[not null]'}'`;
-    });
-    let columnNames = Object.keys(obj).join(',');
-    let values = Object.values(obj).join(',');
-    let sql = `INSERT INTO ${state.table} (${columnNames}) VALUES (${values});`;
-    state.ti.getNowDbInst().promptExeSql(state.ti.db, sql, null, () => {
-        onRefresh();
+    dataForm.value.validate(async (valid: boolean) => {
+        if (valid) {
+            const data = state.addDataDialog.data;
+            // key: 字段名，value: 字段名提示
+            let obj: any = {};
+            for (let item of state.columns) {
+                const value = data[item.columnName]
+                if (!value) {
+                    continue
+                }
+                obj[`${item.columnName}`] = DbInst.wrapValueByType(value);
+            }
+            let columnNames = Object.keys(obj).join(',');
+            let values = Object.values(obj).join(',');
+            let sql = `INSERT INTO ${state.table} (${columnNames}) VALUES (${values});`;
+            state.ti.getNowDbInst().promptExeSql(state.ti.db, sql, null, () => {
+                closeAddDataDialog();
+                onRefresh();
+            });
+        } else {
+            ElMessage.error('请正确填写数据信息');
+            return false;
+        }
     });
+
 };
 
 </script>

mayfly_go_web/src/views/ops/db/db.ts

@@ -30,6 +30,9 @@ export class DbInst {
      */
     dbs: Map<string, Db> = new Map()
 
+    /** 数据库schema，多个用空格隔开 */
+    databases: string
+
     /**
      * 默认查询分页数量
      */
@@ -58,15 +61,19 @@ export class DbInst {
     /**
      * 加载数据库表信息
      * @param dbName 数据库名
+     * @param reload 是否重新请求接口获取数据
      * @returns 表信息
      */
-    async loadTables(dbName: string) {
+    async loadTables(dbName: string, reload?: boolean) {
         const db = this.getDb(dbName);
         // 优先从 table map中获取
         let tables = db.tables;
-        if (tables) {
+        if (!reload && tables) {
             return tables;
         }
+        // 重置列信息缓存与表提示信息
+        db.columnsMap?.clear();
+        db.tableHints = null;
         console.log(`load tables -> dbName: ${dbName}`);
         tables = await dbApi.tableMetadata.request({ id: this.id, db: dbName });
         db.tables = tables;
@@ -120,7 +127,7 @@ export class DbInst {
 
     /**
     * 执行sql
-    * 
+    *
     * @param sql sql
     * @param remark 执行备注
     */
@@ -182,7 +189,7 @@ export class DbInst {
         return `DELETE FROM ${table} WHERE ${primaryKeyColumnName} IN (${ids})`;
     }
 
-    /* 
+    /*
     * 弹框提示是否执行sql
     */
     promptExeSql = (db: string, sql: string, cancelFunc: any = null, successFunc: any = null) => {
@@ -212,6 +219,7 @@ export class DbInst {
         dbInst.id = inst.id;
         dbInst.name = inst.name;
         dbInst.type = inst.type;
+        dbInst.databases = inst.databases;
 
         dbInstCache.set(dbInst.id, dbInst);
         return dbInst;
@@ -270,14 +278,23 @@ export class DbInst {
     * 根据字段类型包装字段值，如为字符串等则添加‘’，数字类型则直接返回即可
     */
     static wrapColumnValue(columnType: string, value: any) {
-        if (columnType.match(/int|double|float|nubmer|decimal|byte|bit/gi)) {
+        if (this.isNumber(columnType)) {
             return value;
         }
         return `'${value}'`;
     };
 
     /**
-     * 
+     * 判断字段类型是否为数字类型
+     * @param columnType 字段类型
+     * @returns
+     */
+    static isNumber(columnType: string) {
+        return columnType.match(/int|double|float|nubmer|decimal|byte|bit/gi);
+    };
+
+    /**
+     *
      * @param str 字符串
      * @param tableData 表数据
      * @param flag 标志
@@ -411,6 +428,11 @@ export class TabInfo {
      */
     key: string
 
+    /**
+     * 菜单树节点key
+     */
+    treeNodeKey: string
+
     /**
      * 数据库实例id
      */
@@ -465,4 +487,4 @@ export type FieldsMeta = {
     oldValue: string
     // 新值
     newValue: string
-}
+}

mayfly_go_web/src/views/ops/machine/FileManage.vue

@@ -446,7 +446,6 @@ const showCreateFileDialog = (node: any) => {
 
 const createFile = async () => {
     const node = state.createFileDialog.node;
-    console.log(node.data);
     const name = state.createFileDialog.name;
     const type = state.createFileDialog.type;
     const path = node.data.path + '/' + name;

mayfly_go_web/src/views/ops/machine/MachineEdit.vue

@@ -1,76 +1,73 @@
 <template>
     <div>
         <el-dialog :title="title" v-model="dialogVisible" :close-on-click-modal="false" :destroy-on-close="true"
-            :before-close="cancel" width="38%">
+            :before-close="cancel" width="650px">
             <el-form :model="form" ref="machineForm" :rules="rules" label-width="85px">
-                <el-form-item prop="tagId" label="标签:" required>
-                    <tag-select v-model:tag-id="form.tagId" v-model:tag-path="form.tagPath" style="width: 100%" />
-                </el-form-item>
-                <el-form-item prop="name" label="名称:" required>
-                    <el-input v-model.trim="form.name" placeholder="请输入机器别名" auto-complete="off"></el-input>
-                </el-form-item>
-                <el-form-item prop="ip" label="ip:" required>
-                    <el-col :span="18">
-                        <el-input :disabled="form.id" v-model.trim="form.ip" placeholder="主机ip" auto-complete="off">
-                        </el-input>
-                    </el-col>
-                    <el-col style="text-align: center" :span="1">:</el-col>
-                    <el-col :span="5">
-                        <el-input type="number" v-model.number="form.port" placeholder="端口"></el-input>
-                    </el-col>
-                </el-form-item>
-                <el-form-item prop="username" label="用户名:" required>
-                    <el-input v-model.trim="form.username" placeholder="请输入用户名"></el-input>
-                </el-form-item>
-                <el-form-item prop="authMethod" label="认证方式:" required>
-                    <el-select style="width: 100%" v-model="form.authMethod" placeholder="请选择认证方式">
-                        <el-option key="1" label="Password" :value="1"> </el-option>
-                        <el-option key="2" label="PublicKey" :value="2"> </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item v-if="form.authMethod == 1" prop="password" label="密码:">
-                    <el-input type="password" show-password v-model.trim="form.password" placeholder="请输入密码，修改操作可不填"
-                        autocomplete="new-password">
-                        <template v-if="form.id && form.id != 0" #suffix>
-                            <el-popover @hide="pwd = ''" placement="right" title="原密码" :width="200" trigger="click"
-                                :content="pwd">
-                                <template #reference>
-                                    <el-link @click="getPwd" :underline="false" type="primary" class="mr5">原密码</el-link>
-                                </template>
-                            </el-popover>
-                        </template>
-                    </el-input>
-                </el-form-item>
-                <el-form-item v-if="form.authMethod == 2" prop="password" label="秘钥:">
-                    <el-input type="textarea" :rows="3" v-model="form.password" placeholder="请将私钥文件内容拷贝至此，修改操作可不填">
-                    </el-input>
-                </el-form-item>
-                <el-form-item prop="remark" label="备注:">
-                    <el-input type="textarea" v-model="form.remark"></el-input>
-                </el-form-item>
+                <el-tabs v-model="tabActiveName">
+                    <el-tab-pane label="基础信息" name="basic">
+                        <el-form-item prop="tagId" label="标签:" required :rules="{
+                            required: true,
+                            message: '请选择标签',
+                            trigger: ['change', 'blur'],
+                        }">
+                            <tag-select v-model:tag-id="form.tagId" v-model:tag-path="form.tagPath" style="width: 100%" />
+                        </el-form-item>
+                        <el-form-item prop="name" label="名称:" required>
+                            <el-input v-model.trim="form.name" placeholder="请输入机器别名" auto-complete="off"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="ip" label="ip:" required>
+                            <el-col :span="18">
+                                <el-input :disabled="form.id" v-model.trim="form.ip" placeholder="主机ip" auto-complete="off">
+                                </el-input>
+                            </el-col>
+                            <el-col style="text-align: center" :span="1">:</el-col>
+                            <el-col :span="5">
+                                <el-input type="number" v-model.number="form.port" placeholder="端口"></el-input>
+                            </el-col>
+                        </el-form-item>
 
-                <el-form-item prop="enableRecorder" label="终端回放:">
-                    <el-checkbox v-model="form.enableRecorder" :true-label="1" :false-label="-1"></el-checkbox>
-                </el-form-item>
+                        <el-form-item prop="username" label="用户名:">
+                            <el-input v-model.trim="form.username" placeholder="请输授权用户名" autocomplete="new-password">
+                            </el-input>
+                        </el-form-item>
 
-                <el-form-item prop="enableSshTunnel" label="SSH隧道:">
-                    <el-col :span="3">
-                        <el-checkbox @change="getSshTunnelMachines" v-model="form.enableSshTunnel" :true-label="1"
-                            :false-label="-1"></el-checkbox>
-                    </el-col>
-                    <el-col :span="2" v-if="form.enableSshTunnel == 1"> 机器: </el-col>
-                    <el-col :span="19" v-if="form.enableSshTunnel == 1">
-                        <el-select style="width: 100%" v-model="form.sshTunnelMachineId" placeholder="请选择SSH隧道机器">
-                            <el-option v-for="item in sshTunnelMachineList" :key="item.id"
-                                :label="`${item.ip}:${item.port} [${item.name}]`" :value="item.id">
-                            </el-option>
-                        </el-select>
-                    </el-col>
-                </el-form-item>
+                        <el-form-item label="认证方式:">
+                            <el-select @change="changeAuthMethod" style="width: 100%" v-model="state.authType"
+                                placeholder="请选认证方式">
+                                <el-option key="1" label="密码" :value="1"> </el-option>
+                                <el-option key="2" label="授权凭证" :value="2"> </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item v-if="state.authType == 1" prop="password" label="密码:">
+                            <el-input type="password" show-password v-model.trim="form.password" placeholder="请输入密码"
+                                autocomplete="new-password">
+                            </el-input>
+                        </el-form-item>
+
+                        <el-form-item v-if="state.authType == 2" prop="authCertId" label="授权凭证:" required>
+                            <auth-cert-select ref="authCertSelectRef" v-model="form.authCertId" />
+                        </el-form-item>
+
+                        <el-form-item prop="remark" label="备注:">
+                            <el-input type="textarea" v-model="form.remark"></el-input>
+                        </el-form-item>
+                    </el-tab-pane>
+
+                    <el-tab-pane label="其他配置" name="other">
+                        <el-form-item prop="enableRecorder" label="终端回放:">
+                            <el-checkbox v-model="form.enableRecorder" :true-label="1" :false-label="-1"></el-checkbox>
+                        </el-form-item>
+
+                        <el-form-item prop="sshTunnelMachineId" label="SSH隧道:">
+                            <ssh-tunnel-select v-model="form.sshTunnelMachineId" />
+                        </el-form-item>
+                    </el-tab-pane>
+                </el-tabs>
             </el-form>
 
             <template #footer>
                 <div>
+                    <el-button @click="testConn" :loading="testConnBtnLoading" type="success">测试连接</el-button>
                     <el-button @click="cancel()">取 消</el-button>
                     <el-button type="primary" :loading="btnLoading" @click="btnOk">确 定</el-button>
                 </div>
@@ -83,17 +80,14 @@
 import { toRefs, reactive, watch, ref } from 'vue';
 import { machineApi } from './api';
 import { ElMessage } from 'element-plus';
-import { notBlank } from '@/common/assert';
-import { RsaEncrypt } from '@/common/rsa';
 import TagSelect from '../component/TagSelect.vue';
+import SshTunnelSelect from '../component/SshTunnelSelect.vue';
+import AuthCertSelect from './authcert/AuthCertSelect.vue'
 
 const props = defineProps({
     visible: {
         type: Boolean,
     },
-    projects: {
-        type: Array,
-    },
     machine: {
         type: [Boolean, Object],
     },
@@ -106,13 +100,6 @@ const props = defineProps({
 const emit = defineEmits(['update:visible', 'cancel', 'val-change'])
 
 const rules = {
-    tagId: [
-        {
-            required: true,
-            message: '请选择标签',
-            trigger: ['change', 'blur'],
-        },
-    ],
     name: [
         {
             required: true,
@@ -127,50 +114,62 @@ const rules = {
             trigger: ['change', 'blur'],
         },
     ],
-    username: [
+    authCertId: [
         {
             required: true,
-            message: '请输入用户名',
+            message: '请选择授权凭证',
             trigger: ['change', 'blur'],
         },
     ],
-    authMethod: [
+    username: [
         {
             required: true,
-            message: '请选择认证方式',
+            message: '请输入授权用户名',
+            trigger: ['change', 'blur'],
+        },
+    ],
+    password: [
+        {
+            required: true,
+            message: '请输入授权密码',
             trigger: ['change', 'blur'],
         },
     ],
 }
 
 const machineForm: any = ref(null);
+const authCertSelectRef: any = ref(null);
+
 const state = reactive({
     dialogVisible: false,
+    tabActiveName: 'basic',
     sshTunnelMachineList: [] as any,
+    authCerts: [] as any,
+    authType: 1,
     form: {
         id: null,
-        tagId: null as any,
-        tagPath: '',
         ip: null,
-        name: null,
-        authMethod: 1,
         port: 22,
+        name: null,
+        authCertId: null as any,
         username: '',
         password: '',
+        tagId: null as any,
+        tagPath: null as any,
         remark: '',
-        enableSshTunnel: null,
-        sshTunnelMachineId: null,
+        sshTunnelMachineId: null as any,
         enableRecorder: -1,
     },
     pwd: '',
+    testConnBtnLoading: false,
     btnLoading: false,
 });
 
 const {
     dialogVisible,
-    sshTunnelMachineList,
+    tabActiveName,
     form,
-    pwd,
+    testConnBtnLoading,
     btnLoading,
 } = toRefs(state)
 
@@ -179,53 +178,65 @@ watch(props, async (newValue: any) => {
     if (!state.dialogVisible) {
         return;
     }
+    state.tabActiveName = 'basic';
     if (newValue.machine) {
         state.form = { ...newValue.machine };
+        // 如果凭证类型为公共的，则表示使用授权凭证认证
+        const authCertId = (state.form as any).authCertId
+        if (authCertId > 0) {
+            state.authType = 2;
+        } else {
+            state.authType = 1;
+        }
     } else {
-        state.form = { port: 22, authMethod: 1 } as any;
+        state.form = { port: 22 } as any;
+        state.authType = 1;
     }
-    getSshTunnelMachines();
 });
 
-const getSshTunnelMachines = async () => {
-    if (state.form.enableSshTunnel == 1 && state.sshTunnelMachineList.length == 0) {
-        const res = await machineApi.list.request({ pageNum: 1, pageSize: 100 });
-        state.sshTunnelMachineList = res.list;
+const changeAuthMethod = (val: any) => {
+    if (state.form.id) {
+        if (val == 2) {
+            state.form.authCertId = null;
+        } else {
+            state.form.password = '';
+        }
     }
-};
+}
 
-const getSshTunnelMachine = (machineId: any) => {
-    notBlank(machineId, '请选择或先创建一台隧道机器');
-    return state.sshTunnelMachineList.find((x: any) => x.id == machineId);
-};
-
-const getPwd = async () => {
-    state.pwd = await machineApi.getMachinePwd.request({ id: state.form.id });
-};
-
-const btnOk = async () => {
-    if (!state.form.id) {
-        notBlank(state.form.password, '新增操作，密码不可为空');
-    }
+const testConn = async () => {
     machineForm.value.validate(async (valid: boolean) => {
         if (valid) {
-            const form: any = state.form;
-            if (form.enableSshTunnel == 1) {
-                const tunnelMachine: any = getSshTunnelMachine(form.sshTunnelMachineId);
-                if (tunnelMachine.ip == form.ip && tunnelMachine.port == form.port) {
-                    ElMessage.error('隧道机器不能与本机器一致');
-                    return;
-                }
+            const form = getReqForm();
+            if (!form) {
+                return;
             }
-            const reqForm: any = { ...form };
-            if (reqForm.authMethod == 1) {
-                reqForm.password = await RsaEncrypt(state.form.password);
+            state.testConnBtnLoading = true;
+            try {
+                await machineApi.testConn.request(form);
+                ElMessage.success('连接成功');
+            } finally {
+                state.testConnBtnLoading = false;
+            }
+        } else {
+            ElMessage.error('请正确填写信息');
+            return false;
+        }
+    });
+}
+
+const btnOk = async () => {
+    machineForm.value.validate(async (valid: boolean) => {
+        if (valid) {
+            const form = getReqForm();
+            if (!form) {
+                return;
             }
             state.btnLoading = true;
             try {
-                await machineApi.saveMachine.request(reqForm);
+                await machineApi.saveMachine.request(form);
                 ElMessage.success('保存成功');
-                emit('val-change', state.form);
+                emit('val-change', form);
                 cancel();
             } finally {
                 state.btnLoading = false;
@@ -237,11 +248,22 @@ const btnOk = async () => {
     });
 };
 
+const getReqForm = () => {
+    const reqForm: any = { ...state.form };
+    debugger
+    // 如果为密码认证，则置空授权凭证id
+    if (state.authType == 1) {
+        reqForm.authCertId = -1;
+    }
+    if (!state.form.sshTunnelMachineId || state.form.sshTunnelMachineId <= 0) {
+        reqForm.sshTunnelMachineId = -1
+    }
+    return reqForm
+}
+
 const cancel = () => {
     emit('update:visible', false);
     emit('cancel');
 };
 </script>
-<style lang="scss">
-
-</style>
+<style lang="scss"></style>

mayfly_go_web/src/views/ops/machine/MachineList.vue

@@ -15,8 +15,8 @@
                     </el-select>
                     <el-input class="ml5" placeholder="请输入名称" style="width: 150px" v-model="params.name" @clear="search"
                         plain clearable></el-input>
-                    <el-input class="ml5" placeholder="请输入ip" style="width: 150px" v-model="params.ip" @clear="search"
-                        plain clearable></el-input>
+                    <el-input class="ml5" placeholder="请输入ip" style="width: 150px" v-model="params.ip" @clear="search" plain
+                        clearable></el-input>
                     <el-button class="ml5" @click="search" type="success" icon="search"></el-button>
                 </div>
             </div>
@@ -38,14 +38,19 @@
                     </template>
                 </el-table-column>
                 <el-table-column prop="name" label="名称" min-width="140" show-overflow-tooltip></el-table-column>
+
                 <el-table-column prop="ip" label="ip:port" min-width="150">
                     <template #default="scope">
                         <el-link :disabled="scope.row.status == -1" @click="showMachineStats(scope.row)" type="primary"
                             :underline="false">
-                            {{ `${scope.row.ip}:${scope.row.port}`}}
+                            {{ `${scope.row.ip}:${scope.row.port}` }}
                         </el-link>
                     </template>
                 </el-table-column>
+
+                <el-table-column prop="username" label="用户名" min-width="100">
+                </el-table-column>
+
                 <el-table-column prop="status" label="状态" min-width="80">
                     <template #default="scope">
                         <el-switch v-auth:disabled="'machine:update'" :width="52" v-model="scope.row.status"
@@ -54,7 +59,7 @@
                             @change="changeStatus(scope.row)"></el-switch>
                     </template>
                 </el-table-column>
-                <el-table-column prop="username" label="用户名" min-width="90"></el-table-column>
+
                 <el-table-column prop="remark" label="备注" min-width="250" show-overflow-tooltip></el-table-column>
 
                 <el-table-column label="操作" min-width="235" fixed="right">
@@ -66,13 +71,13 @@
                         </span>
 
                         <span v-auth="'machine:file'">
-                            <el-link type="success" :disabled="scope.row.status == -1"
-                                @click="showFileManage(scope.row)" plain size="small" :underline="false">文件</el-link>
+                            <el-link type="success" :disabled="scope.row.status == -1" @click="showFileManage(scope.row)"
+                                plain size="small" :underline="false">文件</el-link>
                             <el-divider direction="vertical" border-style="dashed" />
                         </span>
 
-                        <el-link :disabled="scope.row.status == -1" type="warning" @click="serviceManager(scope.row)"
-                            plain size="small" :underline="false">脚本</el-link>
+                        <el-link :disabled="scope.row.status == -1" type="warning" @click="serviceManager(scope.row)" plain
+                            size="small" :underline="false">脚本</el-link>
                         <el-divider direction="vertical" border-style="dashed" />
 
                         <el-dropdown>
@@ -90,8 +95,8 @@
                                     </el-dropdown-item>
 
                                     <el-dropdown-item>
-                                        <el-link @click="showProcess(scope.row)" :disabled="scope.row.status == -1"
-                                            plain :underline="false" size="small">进程</el-link>
+                                        <el-link @click="showProcess(scope.row)" :disabled="scope.row.status == -1" plain
+                                            :underline="false" size="small">进程</el-link>
                                     </el-dropdown-item>
 
                                     <el-dropdown-item v-if="scope.row.enableRecorder == 1">
@@ -100,7 +105,8 @@
                                     </el-dropdown-item>
 
                                     <el-dropdown-item>
-                                        <el-link :disabled="!scope.row.hasCli || scope.row.status == -1" type="danger"
+                                        <el-link v-auth="'machine:close-cli'"
+                                            :disabled="!scope.row.hasCli || scope.row.status == -1" type="danger"
                                             @click="closeCli(scope.row)" plain size="small" :underline="false">关闭连接
                                         </el-link>
                                     </el-dropdown-item>
@@ -128,14 +134,13 @@
                 <el-descriptions-item :span="1" label="端口">{{ infoDialog.data.port }}</el-descriptions-item>
 
                 <el-descriptions-item :span="2" label="用户名">{{ infoDialog.data.username }}</el-descriptions-item>
-                <el-descriptions-item :span="1" label="认证方式">{{
-                    infoDialog.data.authMethod == 1 ? 'Password' :
-                        'PublicKey'
-                }}</el-descriptions-item>
+                <el-descriptions-item :span="1" label="认证方式">
+                    {{ infoDialog.data.authCertId > 1 ? '授权凭证' : '密码' }}
+                </el-descriptions-item>
 
                 <el-descriptions-item :span="3" label="备注">{{ infoDialog.data.remark }}</el-descriptions-item>
 
-                <el-descriptions-item :span="1.5" label="SSH隧道">{{ infoDialog.data.enableSshTunnel == 1 ? '是' : '否' }}
+                <el-descriptions-item :span="1.5" label="SSH隧道">{{ infoDialog.data.sshTunnelMachineId > 0 ? '是' : '否' }}
                 </el-descriptions-item>
                 <el-descriptions-item :span="1.5" label="终端回放">{{ infoDialog.data.enableRecorder == 1 ? '是' : '否' }}
                 </el-descriptions-item>
@@ -157,7 +162,7 @@
 
         <process-list v-model:visible="processDialog.visible" v-model:machineId="processDialog.machineId" />
 
-        <service-manage :title="serviceDialog.title" v-model:visible="serviceDialog.visible"
+        <script-manage :title="serviceDialog.title" v-model:visible="serviceDialog.visible"
             v-model:machineId="serviceDialog.machineId" />
 
         <file-manage :title="fileDialog.title" v-model:visible="fileDialog.visible"
@@ -172,20 +177,22 @@
 </template>
 
 <script lang="ts" setup>
-import { toRefs, reactive, onMounted } from 'vue';
+import { toRefs, reactive, onMounted, defineAsyncComponent } from 'vue';
 import { useRouter } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { machineApi } from './api';
-import { tagApi } from '../tag/api.ts';
-import ServiceManage from './ServiceManage.vue';
-import FileManage from './FileManage.vue';
-import MachineEdit from './MachineEdit.vue';
-import ProcessList from './ProcessList.vue';
-import MachineStats from './MachineStats.vue';
-import MachineRec from './MachineRec.vue';
+import { tagApi } from '../tag/api';
 import { dateFormat } from '@/common/utils/date';
 import TagInfo from '../component/TagInfo.vue';
 
+// 组件
+const MachineEdit = defineAsyncComponent(() => import('./MachineEdit.vue'));
+const ScriptManage = defineAsyncComponent(() => import('./ScriptManage.vue'));
+const FileManage = defineAsyncComponent(() => import('./FileManage.vue'));
+const MachineStats = defineAsyncComponent(() => import('./MachineStats.vue'));
+const MachineRec = defineAsyncComponent(() => import('./MachineRec.vue'));
+const ProcessList = defineAsyncComponent(() => import('./ProcessList.vue'));
+
 const router = useRouter();
 const state = reactive({
     tags: [] as any,