refactor: 界面小优化

fix: 前端 DBMS->数据操作->新建查询，页面不显示查询结果

.gitignore

@@ -17,4 +17,10 @@
 */node_modules/
 **/vendor/
 .idea
+.vscode
 out
+
+server/docs/docker-compose
+server/config.yml
+server/ip2region.xdb
+mayfly-go.log

Dockerfile

@@ -0,0 +1,41 @@
+# 构建前端资源
+FROM node:18-alpine3.16 as fe-builder
+
+WORKDIR /mayfly
+
+COPY mayfly_go_web .
+
+RUN yarn
+
+RUN yarn build
+
+# 构建后端资源
+FROM golang:1.21.0 as be-builder
+
+ENV GOPROXY https://goproxy.cn
+WORKDIR /mayfly
+
+# Copy the go source for building server
+COPY server .
+
+RUN go mod download
+
+COPY --from=fe-builder /mayfly/dist /mayfly/static/static
+
+# Build
+RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux \
+    go build -a \
+    -o mayfly-go main.go
+
+FROM alpine:3.16
+
+RUN apk add --no-cache ca-certificates bash expat
+
+ENV TZ=Asia/Shanghai
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+WORKDIR /mayfly
+
+COPY --from=be-builder /mayfly/mayfly-go /usr/local/bin/mayfly-go
+
+CMD ["mayfly-go"]

Makefile

@@ -0,0 +1,3 @@
+
+docker:
+	docker build . -t mayfly-go

README.md

@@ -9,76 +9,95 @@
     <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"/>
+    <img src="https://img.shields.io/badge/Golang-1.20%2B-yellow.svg" alt="golang"/>
   </a>
   <a href="https://cn.vuejs.org" target="_blank">
     <img src="https://img.shields.io/badge/Vue-3.x-green.svg" alt="vue">
   </a>
 </p>
 
-
 ### 介绍
-web版 **linux(终端[终端回放] 文件 脚本 进程)、数据库（mysql postgres）、redis(单机 哨兵 集群)、mongo统一管理操作平台**
 
+web 版 **linux(终端[终端回放] 文件 脚本 进程)、数据库（mysql postgres）、redis(单机 哨兵 集群)、mongo 统一管理操作平台**
 
 ### 开发语言与主要框架
+
 - 前端：typescript、vue3、element-plus
 - 后端：golang、gin、gorm
 
-
 ### 交流及问题反馈加 QQ 群
+
 <a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=IdJSHW0jTMhmWFHBUS9a83wxtrxDDhFj&jump_from=webapi">119699946</a>
 
-
 ### 系统相关资料
-- 项目文档: https://objs.gitee.io/mayfly-go-docs
-- 系统操作视频: https://space.bilibili.com/484091081/channel/collectiondetail?sid=392854
-- 安装包下载：https://gitee.com/objs/mayfly-go/releases
 
+- 项目文档: https://www.yuque.com/may-fly/mayfly-go
+- 系统操作视频: https://space.bilibili.com/484091081/channel/collectiondetail?sid=392854
+
+### 演示环境
+
+http://go.mayfly.run
+账号/密码：test/test123.
 
 ### 系统核心功能截图
 
 ##### 记录操作记录
-![记录操作记录](https://images.gitee.com/uploads/images/2021/0508/204608_83ef7c33_1240250.png "屏幕截图.png")
+
+![记录操作记录](https://objs.gitee.io/mayfly-go-docs/home/log.jpg "屏幕截图.png")
 
 #### 机器操作
+
 ##### 状态查看
+
 ![状态查看](https://objs.gitee.io/mayfly-go-docs/home/machine-status.jpg "屏幕截图.png")
 
-##### ssh终端
+##### ssh 终端
+
 ![ssh终端](https://objs.gitee.io/mayfly-go-docs/home/machine-ssh.jpg "屏幕截图.png")
 
 ##### 文件操作
+
 ![文件操作](https://objs.gitee.io/mayfly-go-docs/home/file-dir.jpg "屏幕截图.png")
 ![文件操作](https://objs.gitee.io/mayfly-go-docs/home/file-content-update.jpg "屏幕截图.png")
 
-
 #### 数据库操作
-##### sql编辑器
+
+##### sql 编辑器
+
 ![sql编辑器](https://objs.gitee.io/mayfly-go-docs/home/dbms-sql-editor.jpg "屏幕截图.png")
 
 ##### 在线增删改查数据
+
 ![选表查数据](https://objs.gitee.io/mayfly-go-docs/home/dbms-show-table-data.jpg "屏幕截图.png")
 
+#### Redis 操作
 
-#### Redis操作
 ![数据](https://objs.gitee.io/mayfly-go-docs/home/redis-data-list.jpg "屏幕截图.png")
 
+#### Mongo 操作
 
-#### Mongo操作
 ![数据](https://objs.gitee.io/mayfly-go-docs/home/mongo-op.jpg "屏幕截图.png")
 
-
 ##### 系统管理
+
 ##### 账号管理
+
 ![账号管理](https://images.gitee.com/uploads/images/2021/0607/173919_a8d7dc18_1240250.png "屏幕截图.png")
 
 ##### 角色管理
+
 ![角色管理](https://images.gitee.com/uploads/images/2021/0607/174028_3654fb28_1240250.png "屏幕截图.png")
 
 ##### 资源管理
+
 ![资源管理](https://images.gitee.com/uploads/images/2021/0607/174436_e9e1535c_1240250.png "屏幕截图.png")
 
+**其他更多功能&操作指南可查看在线文档**: https://www.yuque.com/may-fly/mayfly-go
 
-**其他更多功能&操作指南可查看在线文档**:  https://objs.gitee.io/mayfly-go-docs
+#### 💌 支持作者
+
+如果觉得项目不错，或者已经在使用了，希望你可以去 <a target="_blank" href="https://github.com/may-fly/mayfly-go">Github</a> 或者 <a target="_blank" href="https://gitee.com/objs/mayfly-go">Gitee</a> 帮我点个 ⭐ Star，这将是对我极大的鼓励与支持。

build_release.sh

@@ -44,7 +44,7 @@ function build() {
     toFolder=$1
     os=$2
     arch=$3
-    copyStatic=$4
+    copyDocScript=$4
 
     echo_yellow "-------------------${os}-${arch}打包构建开始-------------------"
 
@@ -68,17 +68,19 @@ function build() {
     echo_green "移动二进制文件至'${toFolder}'"
     mv ${server_folder}/${execFileName} ${toFolder}
 
-    if [ "${copy2Server}" == "1" ] ; then
+    # if [ "${copy2Server}" == "1" ] ; then
-        echo_green "拷贝前端静态页面至'${toFolder}/static'"
+    #     echo_green "拷贝前端静态页面至'${toFolder}/static'"
-        mkdir -p ${toFolder}/static && cp -r ${web_folder}/dist/* ${toFolder}/static
+    #     mkdir -p ${toFolder}/static && cp -r ${web_folder}/dist/* ${toFolder}/static
-    fi
+    # fi
 
-    echo_green "拷贝脚本等资源文件[config.yml、mayfly-go.sql、readme.txt、startup.sh、shutdown.sh]"
+    if [ "${copyDocScript}" == "1" ] ; then
-    cp ${server_folder}/config.yml ${toFolder}
+        echo_green "拷贝脚本等资源文件[config.yml.example、mayfly-go.sql、readme.txt、startup.sh、shutdown.sh]"
-    cp ${server_folder}/mayfly-go.sql ${toFolder}
+        cp ${server_folder}/config.yml.example ${toFolder}
-    cp ${server_folder}/readme.txt ${toFolder}
+        cp ${server_folder}/mayfly-go.sql ${toFolder}
-    cp ${server_folder}/startup.sh ${toFolder}
+        cp ${server_folder}/readme.txt ${toFolder}
-    cp ${server_folder}/shutdown.sh ${toFolder}
+        cp ${server_folder}/startup.sh ${toFolder}
+        cp ${server_folder}/shutdown.sh ${toFolder}
+    fi
 
     echo_yellow ">>>>>>>>>>>>>>>>>>>${os}-${arch}打包构建完成<<<<<<<<<<<<<<<<<<<<\n"
 }
@@ -99,45 +101,99 @@ function buildMac() {
     build "$1/mayfly-go-mac" "darwin" "amd64" $2
 }
 
+function buildDocker() {
+    echo_yellow "-------------------构建docker镜像开始-------------------"
+    imageVersion=$1
+    imageName="mayflygo/mayfly-go:${imageVersion}"
+    docker build --platform linux/amd64 -t "${imageName}" .
+    echo_green "docker镜像构建完成->[${imageName}]"
+    echo_yellow "-------------------构建docker镜像结束-------------------"
+}
+
+function buildxDocker() {
+    echo_yellow "-------------------docker buildx构建镜像开始-------------------"
+    imageVersion=$1
+    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构建镜像结束-------------------"
+}
+
 function runBuild() {
-    # 构建结果的目的路径
+    read -p "请选择构建版本[0|其他->除docker镜像外其他 1->linux-amd64 2->linux-arm64 3->windows 4->mac 5->docker 6->docker buildx]: " buildType
-    read -p "请输入构建产物输出目录: " toPath
-    if [ ! -d ${toPath} ] ; then
-        echo_red "构建产物输出目录不存在!"
-        exit;
-    fi
-    # 进入目标路径,并赋值全路径
-    cd ${toPath}
-    toPath=`pwd`
 
-    read -p "是否构建前端[0|其他->否 1->是 2->构建并拷贝至server/static/static]: " runBuildWeb
+    toPath="."
-    read -p "请选择构建版本[0|其他->全部 1->linux-amd64 2->linux-arm64 3->windows 4->mac]: " buildType
+    imageVersion="latest"
+    copyDocScript="1"
 
+    if [[ "${buildType}" != "5" ]] && [[ "${buildType}" != "6" ]] ; then
+        # 构建结果的目的路径
+        read -p "请输入构建产物输出目录[默认当前路径]: " toPath
+        if [ ! -d ${toPath} ] ; then
+            echo_red "构建产物输出目录不存在!"
+            exit;
+        fi
+        if [ "${toPath}" == "" ] ; then
+            toPath="."
+        fi
 
-    if [ "${runBuildWeb}" == "1" ] || [ "${runBuildWeb}" == "2" ] ; then
+        read -p "是否拷贝文档&脚本[0->否 1->是][默认是]: " copyDocScript
+        if [ "${copyDocScript}" == "" ] ; then
+            copyDocScript="1"
+        fi
+
+        # 进入目标路径,并赋值全路径
+        cd ${toPath}
+        toPath=`pwd`
+
+        # read -p "是否构建前端[0|其他->否 1->是 2->构建并拷贝至server/static/static]: " runBuildWeb
+        runBuildWeb="2"
+        # 编译web前端
         buildWeb ${runBuildWeb}
     fi
 
+    if [[ "${buildType}" == "5" ]] || [[ "${buildType}" == "6" ]] ; then
+        read -p "请输入docker镜像版本号[默认latest]: " imageVersion
+
+        if [ "${imageVersion}" == "" ] ; then
+            imageVersion="latest"
+        fi
+    fi
+
     case ${buildType} in
          "1")
-            buildLinuxAmd64 ${toPath} ${runBuildWeb}
+            buildLinuxAmd64 ${toPath} ${copyDocScript}
         ;;
          "2")
-            buildLinuxArm64 ${toPath} ${runBuildWeb}
+            buildLinuxArm64 ${toPath} ${copyDocScript}
         ;;
         "3")
-            buildWindows ${toPath} ${runBuildWeb}
+            buildWindows ${toPath} ${copyDocScript}
         ;;
         "4")
-            buildMac ${toPath} ${runBuildWeb}
+            buildMac ${toPath} ${copyDocScript}
+        ;;
+        "5")
+            buildDocker ${imageVersion}
+        ;;
+        "6")
+            buildxDocker ${imageVersion}
         ;;
         *)
-            buildLinuxAmd64 ${toPath} ${runBuildWeb}
+            buildLinuxAmd64 ${toPath} ${copyDocScript}
-            buildLinuxArm64 ${toPath} ${runBuildWeb}
+            buildLinuxArm64 ${toPath} ${copyDocScript}
-            buildWindows ${toPath} ${runBuildWeb}
+            buildWindows ${toPath} ${copyDocScript}
-            buildMac ${toPath} ${runBuildWeb}
+            buildMac ${toPath} ${copyDocScript}
         ;;
     esac
+
+    if [[ "${buildType}" != "5" ]] && [[ "${buildType}" != "6" ]] ; then
+        echo_green "删除['${server_folder}/static/static']下静态资源文件."
+        # 删除静态资源文件，保留一个favicon.ico，否则后端启动会报错
+        rm -rf ${server_folder}/static/static/assets
+        rm -rf ${server_folder}/static/static/config.js
+        rm -rf ${server_folder}/static/static/index.html
+    fi
 }
 
 runBuild

docker-compose.yaml

@@ -0,0 +1,31 @@
+version: "3.9"
+
+services:
+  mysql:
+    image: "mysql:8"
+    container_name: mayfly-go-mysql
+    environment:
+      MYSQL_ROOT_PASSWORD: 111049
+      MYSQL_DATABASE: mayfly-go
+      TZ: Asia/Shanghai
+    volumes:
+      - ./server/docs/docker-compose/mysql/data/mydir:/mydir
+      - ./server/docs/docker-compose/mysql/data/datadir:/var/lib/mysql
+    restart: always
+
+  server:
+    image: mayfly-go:v1.3.1
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: mayfly-go-server
+    ports:
+      - "8888:8888"
+    environment:
+      TZ: Asia/Shanghai
+      WAIT_HOSTS: mysql:3306
+    volumes:
+      - ./server/config.yml.example:/mayfly/config.yml
+    depends_on:
+      - mysql
+    restart: always

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'],
+	extends: ['plugin:vue/vue3-essential', 'plugin:vue/essential', 'eslint:recommended'],
-	// plugins: ['vue', '@typescript-eslint'],
+	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',
+		// https://typescript-eslint.io/rules/no-unused-vars/
-		'@type-eslint/explicit-function-return-type': 'off',
+		'@typescript-eslint/ban-ts-ignore': 'off',
-		'@type-eslint/no-explicit-any': 'off',
+		'@typescript-eslint/explicit-function-return-type': 'off',
-		'@type-eslint/no-var-requires': 'off',
+		'@typescript-eslint/no-explicit-any': 'off',
-		'@type-eslint/no-empty-function': 'off',
+		'@typescript-eslint/no-var-requires': 'off',
-		'@type-eslint/no-use-before-define': 'off',
+		'@typescript-eslint/no-empty-function': 'off',
-		'@type-eslint/ban-ts-comment': 'off',
+		'@typescript-eslint/no-use-before-define': 'off',
-		'@type-eslint/ban-types': 'off',
+		'@typescript-eslint/ban-ts-comment': 'off',
-		'@type-eslint/no-non-null-assertion': 'off',
+		'@typescript-eslint/ban-types': 'off',
-		'@type-eslint/explicit-module-boundary-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/.prettierrc.js

@@ -1,39 +1,39 @@
 module.exports = {
-	// 一行最多多少个字符
+    // 一行最多多少个字符
-	printWidth: 150,
+    printWidth: 160,
-	// 指定每个缩进级别的空格数
+    // 指定每个缩进级别的空格数
-	tabWidth: 4,
+    tabWidth: 4,
-	// 使用制表符而不是空格缩进行
+    // 使用制表符而不是空格缩进行
-	useTabs: false,
+    useTabs: false,
-	// 在语句末尾打印分号
+    // 在语句末尾打印分号
-	semi: true,
+    semi: true,
-	// 使用单引号而不是双引号
+    // 使用单引号而不是双引号
-	singleQuote: true,
+    singleQuote: true,
-	// 更改引用对象属性的时间 可选值"<as-needed|consistent|preserve>"
+    // 更改引用对象属性的时间 可选值"<as-needed|consistent|preserve>"
-	quoteProps: 'as-needed',
+    quoteProps: 'as-needed',
-	// 在JSX中使用单引号而不是双引号
+    // 在JSX中使用单引号而不是双引号
-	jsxSingleQuote: false,
+    jsxSingleQuote: false,
-	// 多行时尽可能打印尾随逗号。（例如，单行数组永远不会出现逗号结尾。） 可选值"<none|es5|all>"，默认none
+    // 多行时尽可能打印尾随逗号。（例如，单行数组永远不会出现逗号结尾。） 可选值"<none|es5|all>"，默认none
-	trailingComma: 'es5',
+    trailingComma: 'es5',
-	// 在对象文字中的括号之间打印空格
+    // 在对象文字中的括号之间打印空格
-	bracketSpacing: true,
+    bracketSpacing: true,
-	// jsx 标签的反尖括号需要换行
+    // jsx 标签的反尖括号需要换行
-	jsxBracketSameLine: false,
+    jsxBracketSameLine: false,
-	// 在单独的箭头函数参数周围包括括号 always：(x) => x \ avoid：x => x
+    // 在单独的箭头函数参数周围包括括号 always：(x) => x \ avoid：x => x
-	arrowParens: 'always',
+    arrowParens: 'always',
-	// 这两个选项可用于格式化以给定字符偏移量（分别包括和不包括）开始和结束的代码
+    // 这两个选项可用于格式化以给定字符偏移量（分别包括和不包括）开始和结束的代码
-	rangeStart: 0,
+    rangeStart: 0,
-	rangeEnd: Infinity,
+    rangeEnd: Infinity,
-	// 指定要使用的解析器，不需要写文件开头的 @prettier
+    // 指定要使用的解析器，不需要写文件开头的 @prettier
-	requirePragma: false,
+    requirePragma: false,
-	// 不需要自动在文件开头插入 @prettier
+    // 不需要自动在文件开头插入 @prettier
-	insertPragma: false,
+    insertPragma: false,
-	// 使用默认的折行标准 always\never\preserve
+    // 使用默认的折行标准 always\never\preserve
-	proseWrap: 'preserve',
+    proseWrap: 'preserve',
-	// 指定HTML文件的全局空格敏感度 css\strict\ignore
+    // 指定HTML文件的全局空格敏感度 css\strict\ignore
-	htmlWhitespaceSensitivity: 'css',
+    htmlWhitespaceSensitivity: 'css',
-	// Vue文件脚本和样式标签缩进
+    // Vue文件脚本和样式标签缩进
-	vueIndentScriptAndStyle: false,
+    vueIndentScriptAndStyle: false,
-	// 换行符使用 lf 结尾是 可选值"<auto|lf|crlf|cr>"
+    // 换行符使用 lf 结尾是 可选值"<auto|lf|crlf|cr>"
-	endOfLine: 'lf',
+    endOfLine: 'lf',
 };

mayfly_go_web/package.json

@@ -4,32 +4,37 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
+    "preview": "vite preview",
+    "build-preview": "npm run build && npm run preview",
     "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
   },
   "dependencies": {
-    "@element-plus/icons-vue": "^2.0.10",
+    "@element-plus/icons-vue": "^2.1.0",
-    "asciinema-player": "^3.0.1",
+    "asciinema-player": "^3.5.0",
-    "axios": "^1.2.0",
+    "axios": "^1.5.0",
-    "countup.js": "^2.0.7",
+    "countup.js": "^2.7.0",
     "cropperjs": "^1.5.11",
     "echarts": "^5.4.0",
-    "element-plus": "^2.2.26",
+    "element-plus": "^2.3.12",
-    "jsencrypt": "^3.2.1",
+    "jsencrypt": "^3.3.1",
     "lodash": "^4.17.21",
-    "mitt": "^3.0.0",
+    "mitt": "^3.0.1",
-    "monaco-editor": "^0.34.1",
+    "monaco-editor": "^0.43.0",
-    "monaco-sql-languages": "^0.9.5",
+    "monaco-sql-languages": "^0.11.0",
-    "monaco-themes": "^0.4.2",
+    "monaco-themes": "^0.4.4",
     "nprogress": "^0.2.0",
+    "pinia": "^2.1.6",
+    "qrcode.vue": "^3.4.0",
     "screenfull": "^6.0.2",
     "sortablejs": "^1.13.0",
-    "sql-formatter": "^9.2.0",
+    "sql-formatter": "^12.1.2",
-    "vue": "^3.2.45",
+    "vue": "^3.3.4",
     "vue-clipboard3": "^1.0.1",
-    "vue-router": "^4.1.6",
+    "vue-router": "^4.2.4",
-    "vuex": "^4.0.2",
+    "xterm": "^5.3.0",
-    "xterm": "^5.0.0",
+    "xterm-addon-fit": "^0.8.0",
-    "xterm-addon-fit": "^0.6.0"
+    "xterm-addon-search": "^0.13.0",
+    "xterm-addon-web-links": "^0.9.0"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.178",
@@ -38,17 +43,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.45.1",
+    "sass": "^1.62.0",
-    "sass-loader": "^12.4.0",
+    "sass-loader": "^13.2.0",
-    "typescript": "^4.7.4",
+    "typescript": "^5.0.2",
-    "vite": "^2.9.13",
+    "vite": "^4.4.9",
-    "vue-eslint-parser": "^8.0.1"
+    "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/public/config.js

@@ -1,24 +1,25 @@
 window.globalConfig = {
     // 默认为空，以访问根目录为api请求地址。若前后端分离部署可单独配置该后端api请求地址
-    "BaseApiUrl": "",
+    BaseApiUrl: '',
-    "BaseWsUrl": ""
+    BaseWsUrl: '',
-}
+};
 
 // index.html添加百秒级时间戳，防止被浏览器缓存
-!function () {
+// !(function () {
-    let t = "t=" + new Date().getTime().toString().substring(0, 8)
+//     let t = 't=' + new Date().getTime().toString().substring(0, 8);
-    let search = location.search;
+//     let search = location.search;
-    let m = search && search.match(/t=\d*/g)
+//     let m = search && search.match(/t=\d*/g);
 
-    if (m[0]) {
+//     console.log(location);
-        if (m[0] !== t) {
+//     if (m[0]) {
-            location.search = search.replace(m[0], t)
+//         if (m[0] !== t) {
-        }
+//             location.search = search.replace(m[0], t);
-    } else {
+//         }
-        if (search.indexOf('?') > -1) {
+//     } else {
-            location.search = search + '&' + t
+//         if (search.indexOf('?') > -1) {
-        } else {
+//             location.search = search + '&' + t;
-            location.search = t
+//         } else {
-        }
+//             location.search = t;
-    }
+//         }
-}()
+//     }
+// })();

mayfly_go_web/src/App.vue

@@ -1,74 +1,69 @@
 <template>
-    <router-view v-show="getThemeConfig.lockScreenTime !== 0" />
+    <router-view v-show="themeConfig.lockScreenTime !== 0" />
-    <LockScreen v-if="getThemeConfig.isLockScreen" />
+    <LockScreen v-if="themeConfig.isLockScreen" />
-    <Setings ref="setingsRef" v-show="getThemeConfig.lockScreenTime !== 0" />
+    <Setings ref="setingsRef" v-show="themeConfig.lockScreenTime !== 0" />
 </template>
 
-<script lang="ts">
+<script setup lang="ts" name="app">
-import { computed, ref, getCurrentInstance, onBeforeMount, onMounted, onUnmounted, nextTick, defineComponent, watch } from 'vue';
+import { ref, onBeforeMount, onMounted, onUnmounted, nextTick, watch } from 'vue';
 import { useRoute } from 'vue-router';
-import { useStore } from '@/store/index.ts';
+// import { useTagsViewRoutes } from '@/store/tagsViewRoutes';
-import { getLocal } from '@/common/utils/storage.ts';
+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({
+const setingsRef = ref();
-    name: 'app',
+const route = useRoute();
-    components: { LockScreen, Setings },
+
-    setup() {
+const themeConfigStores = useThemeConfig();
-        const { proxy } = getCurrentInstance() as any;
+const { themeConfig } = storeToRefs(themeConfigStores);
-        const setingsRef = ref();
+
-        const route = useRoute();
+// 布局配置弹窗打开
-        const store = useStore();
+const openSetingsDrawer = () => {
-        // 获取布局配置信息
+    setingsRef.value.openDrawer();
-        const getThemeConfig = computed(() => {
+};
-            return store.state.themeConfig.themeConfig;
+
-        });
+// 设置初始化，防止刷新时恢复默认
-        // 布局配置弹窗打开
+onBeforeMount(() => {
-        const openSetingsDrawer = () => {
+    // 设置批量第三方 icon 图标
-            setingsRef.value.openDrawer();
+    // setIntroduction.cssCdn();
-        };
+    // // 设置批量第三方 js
-        // 设置初始化，防止刷新时恢复默认
+    // setIntroduction.jsCdn();
-        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,
-        };
-    },
 });
+
+// 页面加载时
+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

@@ -1,4 +1,4 @@
-import request from './request'
+import request from './request';
 
 /**
  * 可用于各模块定义各自api请求
@@ -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
      */
@@ -45,22 +27,13 @@ class Api {
     }
 
     /**
-     * 操作该权限，即请求对应的url
+     * 请求对应的该api
-     * @param {Object} param 请求该权限的参数
+     * @param {Object} param 请求该api的参数
      */
-    request(param: any = null, options: any = null): Promise<any> {
+    request(param: any = null, options: any = null, headers: any = null): Promise<any> {
-        return request.send(this, param, options);
+        return request.request(this.method, this.url, param, headers, options);
     }
 
-    /**
-    * 操作该权限，即请求对应的url
-    * @param {Object} param 请求该权限的参数
-    */
-    requestWithHeaders(param: any, headers: any): Promise<any> {
-        return request.sendWithHeaders(this, param, headers);
-    }
-
-
     /**    静态方法     **/
 
     /**
@@ -68,10 +41,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');
+    }
 }
 
-
+export default Api;
-export default Api

mayfly_go_web/src/common/Enum.ts

@@ -1,37 +1,94 @@
+export interface EnumValueTag {
+    color?: string;
+    type?: string;
+}
+
 /**
- * 枚举类
+ * 枚举值
- * @author meilin.huang
  */
-export class Enum {
+export class EnumValue {
     /**
-     * 添加枚举字段
+     * 枚举值
-     * 
-     * @param {string} field  枚举字段名
-     * @param {string} label  枚举名称
-     * @param {Object} value  枚举值
      */
-    add(field: string, label: string, value: any) {
+    value: any;
-        this[field] = { label, value }
+
-        return this
+    /**
+     * 枚举描述
+     */
+    label: string;
+
+    /**
+     * 展示的标签信息
+     */
+    tag: EnumValueTag;
+
+    constructor(value: any, label: string) {
+        this.value = value;
+        this.label = label;
+    }
+
+    setTagType(type: string = 'primary'): EnumValue {
+        this.tag = { type };
+        return this;
+    }
+
+    tagTypeInfo(): EnumValue {
+        return this.setTagType('info');
+    }
+
+    tagTypeSuccess(): EnumValue {
+        return this.setTagType('success');
+    }
+
+    tagTypeDanger(): EnumValue {
+        return this.setTagType('danger');
+    }
+
+    tagTypeWarning(): EnumValue {
+        return this.setTagType('warning');
+    }
+
+    setTagColor(color: string): EnumValue {
+        this.tag = { color };
+        return this;
+    }
+
+    public static of(value: any, label: string): EnumValue {
+        return new EnumValue(value, label);
     }
 
     /**
-     * 根据枚举value获取其label
+     * 根据枚举值获取指定枚举值对象
      *
-     * @param {Object} value 
+     * @param enumValues 所有枚举值
+     * @param value 需要匹配的枚举值
+     * @returns 枚举值对象
      */
-    getLabelByValue(value: any) {
+    static getEnumByValue(enumValues: EnumValue[], value: any): EnumValue | null {
-        // 字段不存在返回‘’
+        for (let enumValue of enumValues) {
-        if (value === undefined || value === null) {
+            if (enumValue.value == value) {
-            return ''
+                return enumValue;
-        }
-        for (const i in this) {
-            const e: any = this[i]
-            if (e && e.value === value) {
-                return e.label
             }
         }
+        return null;
+    }
 
-        return ''
+    /**
+     * 根据枚举值获取枚举描述
+     *
+     * @param enums 枚举对象
+     * @param value 枚举值
+     * @returns 枚举描述
+     */
+    static getLabelByValue(enums: any, value: any) {
+        const enumValues = Object.values(enums) as any;
+        for (let enumValue of enumValues) {
+            if (enumValue['value'] == value) {
+                return enumValue['label'];
+            }
+        }
+        return '';
     }
 }
+
+export default EnumValue;

mayfly_go_web/src/common/SocketBuilder.ts

@@ -1,46 +1,43 @@
 class SocketBuilder {
-
     websocket: WebSocket;
 
     constructor(url: string) {
-      if (typeof (WebSocket) === "undefined") {
+        if (typeof WebSocket === 'undefined') {
-        throw new Error('不支持websocket');
+            throw new Error('不支持websocket');
-      }
+        }
-      if (!url) {
+        if (!url) {
-        throw new Error('websocket url不能为空');
+            throw new Error('websocket url不能为空');
-      }
+        }
-      this.websocket = new WebSocket(url);
+        this.websocket = new WebSocket(url);
     }
 
     static builder(url: string) {
-      return new SocketBuilder(url);
+        return new SocketBuilder(url);
     }
 
     open(onopen: any) {
-      this.websocket.onopen = onopen;
+        this.websocket.onopen = onopen;
-      return this;
+        return this;
     }
 
     error(onerror: any) {
-      this.websocket.onerror = onerror;
+        this.websocket.onerror = onerror;
-      return this;
+        return this;
     }
 
     message(onmessage: any) {
-      this.websocket.onmessage = onmessage;
+        this.websocket.onmessage = onmessage;
-      return this;
+        return this;
     }
 
     close(onclose: any) {
-      this.websocket.onclose = onclose;
+        this.websocket.onclose = onclose;
-      return this;
+        return this;
     }
 
     build() {
-      return this.websocket;
+        return this.websocket;
     }
-  }
+}
-
-  
-  export default SocketBuilder;
 
+export default SocketBuilder;

mayfly_go_web/src/common/assert.ts

@@ -5,7 +5,7 @@ class AssertError extends Error {
     constructor(message: string) {
         super(message);
         // 错误类名
-        this.name = "AssertError";
+        this.name = 'AssertError';
     }
 }
 
@@ -15,7 +15,7 @@ class AssertError extends Error {
  * @param condition 条件表达式
  * @param msg 错误消息
  */
- export function isTrue(condition: boolean, msg: string) {
+export function isTrue(condition: boolean, msg: string) {
     if (!condition) {
         throw new AssertError(msg);
     }
@@ -27,8 +27,8 @@ class AssertError extends Error {
  * @param obj 对象1
  * @param msg 错误消息
  */
- export function notBlank(obj: any, msg: string) {
+export function notBlank(obj: any, msg: string) {
-    isTrue(obj, msg)
+    isTrue(obj, msg);
 }
 
 /**
@@ -38,7 +38,7 @@ class AssertError extends Error {
  * @param obj2 对象2
  * @param msg 错误消息
  */
- export function isEquals(obj1: any, obj2: any, msg: string) {
+export function isEquals(obj1: any, obj2: any, msg: string) {
     isTrue(obj1 === obj2, msg);
 }
 
@@ -50,16 +50,16 @@ class AssertError extends Error {
  */
 export function notNull(obj: any, msg: string) {
     if (obj == null || obj == undefined) {
-        throw new AssertError(msg)
+        throw new AssertError(msg);
     }
 }
 
 /**
-* 断言字符串不能为空
+ * 断言字符串不能为空
-* 
+ *
-* @param str 字符串
+ * @param str 字符串
-* @param msg 错误提示
+ * @param msg 错误提示
-*/
+ */
 export function notEmpty(str: string, msg: string) {
     if (str == null || str == undefined || str == '') {
         throw new AssertError(msg);

mayfly_go_web/src/common/config.ts

@@ -1,9 +1,17 @@
-const config = {
+function getBaseApiUrl() {
-    baseApiUrl: `${(window as any).globalConfig.BaseApiUrl}/api`,
+    let path = window.location.pathname;
-    baseWsUrl: `${(window as any).globalConfig.BaseWsUrl || `${location.protocol == 'https:' ? 'wss:' : 'ws:'}//${location.host}`}/api`,
+    if (path == '/') {
-
+        return window.location.host;
-    // 系统版本
+    }
-    version: 'v1.3.1'
+    return window.location.host + path;
 }
 
-export default config
+const config = {
+    baseApiUrl: `${(window as any).globalConfig.BaseApiUrl || location.protocol + '//' + getBaseApiUrl()}/api`,
+    baseWsUrl: `${(window as any).globalConfig.BaseWsUrl || `${location.protocol == 'https:' ? 'wss:' : 'ws:'}//${getBaseApiUrl()}`}/api`,
+
+    // 系统版本
+    version: 'v1.5.2',
+};
+
+export default config;

mayfly_go_web/src/common/echarts/useEcharts.ts

@@ -1,44 +1,37 @@
 // import * as echarts from 'echarts'
 
 // 引入 echarts 核心模块，核心模块提供了 echarts 使用必须要的接口。
-import * as echarts from "echarts/core";
+import * as echarts from 'echarts/core';
 
 /** 图表后缀都为 Chart  */
-import { PieChart } from "echarts/charts";
+import { PieChart } from 'echarts/charts';
 
 // 引入提示框，标题，直角坐标系，数据集，内置数据转换器组件，组件后缀都为 Component
-import {
+import { TitleComponent, TooltipComponent, GridComponent, DatasetComponent, TransformComponent, LegendComponent } from 'echarts/components';
-  TitleComponent,
-  TooltipComponent,
-  GridComponent,
-  DatasetComponent,
-  TransformComponent,
-  LegendComponent,
-} from "echarts/components";
 
 // 标签自动布局，全局过渡动画等特性
-import { LabelLayout, UniversalTransition } from "echarts/features";
+import { LabelLayout, UniversalTransition } from 'echarts/features';
 
 // 引入 Canvas 渲染器，注意引入 CanvasRenderer 或者 SVGRenderer 是必须的一步
-import { CanvasRenderer } from "echarts/renderers";
+import { CanvasRenderer } from 'echarts/renderers';
 
 // 注册必须的组件
 echarts.use([
-  TitleComponent,
+    TitleComponent,
-  TooltipComponent,
+    TooltipComponent,
-  GridComponent,
+    GridComponent,
-  DatasetComponent,
+    DatasetComponent,
-  TransformComponent,
+    TransformComponent,
-  LegendComponent,
+    LegendComponent,
-//   BarChart,
+    //   BarChart,
-  LabelLayout,
+    LabelLayout,
-  UniversalTransition,
+    UniversalTransition,
-  CanvasRenderer,
+    CanvasRenderer,
-//   LineChart,
+    //   LineChart,
-  PieChart,
+    PieChart,
 ]);
 
-export default function(dom: any, theme: any = null,  option: any) {
+export default function (dom: any, theme: any = null, option: any) {
     let chart = echarts.init(dom, theme);
     chart.setOption(option);
     return chart;

mayfly_go_web/src/common/enums.ts

@@ -1,27 +0,0 @@
-interface BaseEnum {
-    name: string
-    value: any
-}
-
-const success: BaseEnum = {
-    name: 'success',
-    value: 200
-}
-
-export enum ResultEnum {
-    SUCCESS = 200,
-    ERROR = 400,
-    PARAM_ERROR = 405,
-    SERVER_ERROR = 500,
-    NO_PERMISSION = 501
-}
-// /**
-//  * 全局公共枚举类
-//  */
-// export default {
-//   // uri请求方法
-//   requestMethod: new Enum().add('GET', 'GET', 1).add('POST', 'POST', 2).add('PUT', 'PUT', 3).add('DELETE', 'DELETE', 4),
-//   // 结果枚举
-//   ResultEnum: new Enum().add('SUCCESS', '操作成功', 200).add('ERROR', '操作失败', 400).add('PARAM_ERROR', '参数错误', 405).add('SERVER_ERROR', '服务器异常', 500)
-//     .add('NO_PERMISSION', '没有权限', 501)
-// }

mayfly_go_web/src/common/openApi.ts

@@ -1,11 +1,16 @@
-import request from './request'
+import request from './request';
 
 export default {
-    login: (param: any) => request.request('POST', '/sys/accounts/login', param),
+    login: (param: any) => request.post('/auth/accounts/login', param),
-    changePwd: (param: any) => request.request('POST', '/sys/accounts/change-pwd', param),
+    otpVerify: (param: any) => request.post('/auth/accounts/otp-verify', param),
-    getPublicKey: () => request.request('GET', '/common/public-key'),
+    getPublicKey: () => request.get('/common/public-key'),
-    getConfigValue: (param: any) => request.request('GET', '/sys/configs/value', param),
+    getConfigValue: (params: any) => request.get('/sys/configs/value', params),
-    captcha: () => request.request('GET', '/sys/captcha'),
+    oauth2LoginConfig: () => request.get('/auth/oauth2-config'),
-    logout: (param: any) => request.request('POST', '/sys/accounts/logout/{token}', param),
+    changePwd: (param: any) => request.post('/sys/accounts/change-pwd', param),
-    getMenuRoute: (param: any) => request.request('Get', '/sys/resources/account', param)
+    captcha: () => request.get('/sys/captcha'),
-}
+    logout: () => request.post('/auth/accounts/logout'),
+    getPermissions: () => request.get('/sys/accounts/permissions'),
+    oauth2Callback: (params: any) => request.get('/auth/oauth2/callback', params),
+    getLdapEnabled: () => request.get('/auth/ldap/enabled'),
+    ldapLogin: (param: any) => request.post('/auth/ldap/login', param),
+};

mayfly_go_web/src/common/pattern.ts

@@ -0,0 +1,4 @@
+export const AccountUsernamePattern = {
+    pattern: /^[a-zA-Z0-9_]{5,20}$/g,
+    message: '只允许输入5-20位大小写字母、数字、下划线',
+};

mayfly_go_web/src/common/request.ts

@@ -1,7 +1,5 @@
-import router from "../router";
+import router from '../router';
 import Axios from 'axios';
-import { ResultEnum } from './enums'
-import Api from './Api';
 import config from './config';
 import { getSession } from './utils/storage';
 import { templateResolve } from './utils/string';
@@ -22,7 +20,16 @@ export interface Result {
     data?: any;
 }
 
-const baseUrl: string = config.baseApiUrl as string
+enum ResultEnum {
+    SUCCESS = 200,
+    ERROR = 400,
+    PARAM_ERROR = 405,
+    SERVER_ERROR = 500,
+    NO_PERMISSION = 501,
+}
+
+const baseUrl: string = config.baseApiUrl;
+const baseWsUrl: string = config.baseWsUrl;
 
 /**
  * 通知错误消息
@@ -36,60 +43,72 @@ function notifyErrorMsg(msg: string) {
 // create an axios instance
 const service = Axios.create({
     baseURL: baseUrl, // url = base url + request url
-    timeout: 20000 // request timeout
+    timeout: 20000, // request timeout
-})
+});
 
 // request interceptor
 service.interceptors.request.use(
     (config: any) => {
         // do something before request is sent
-        const token = getSession("token")
+        const token = getSession('token');
         if (token) {
             // 设置token
-            config.headers['Authorization'] = token
+            config.headers['Authorization'] = token;
         }
-        return config
+        return config;
     },
-    error => {
+    (error) => {
-        return Promise.reject(error)
+        return Promise.reject(error);
     }
-)
+);
 
 // response interceptor
 service.interceptors.response.use(
-    response => {
+    (response) => {
         // 获取请求返回结果
         const data: Result = response.data;
+        if (data.code === ResultEnum.SUCCESS) {
+            return data.data;
+        }
         // 如果提示没有权限，则移除token，使其重新登录
         if (data.code === ResultEnum.NO_PERMISSION) {
             router.push({
                 path: '/401',
             });
         }
-        if (data.code === ResultEnum.SUCCESS) {
+        return Promise.reject(data);
-            return data.data;
-        } else {
-            return Promise.reject(data);
-        }
     },
     (e: any) => {
+        const rejectPromise = Promise.reject(e);
+
+        const statusCode = e.response?.status;
+        if (statusCode == 500) {
+            notifyErrorMsg('服务器未知异常');
+            return rejectPromise;
+        }
+
+        if (statusCode == 404) {
+            notifyErrorMsg('请求接口未找到');
+            return rejectPromise;
+        }
+
         if (e.message) {
             // 对响应错误做点什么
             if (e.message.indexOf('timeout') != -1) {
-                notifyErrorMsg('网络超时');
+                notifyErrorMsg('网络请求超时');
-            } else if (e.message == 'Network Error') {
+                return rejectPromise;
+            }
+
+            if (e.message == 'Network Error') {
                 notifyErrorMsg('网络连接错误');
-            } else if (e.message.indexOf('404')) {
+                return rejectPromise;
-                notifyErrorMsg('请求接口找不到');
-            } else {
-                if (e.response.data) ElMessage.error(e.response.statusText);
-                else notifyErrorMsg('接口路径找不到');
             }
         }
 
-        return Promise.reject(e)
+        notifyErrorMsg('网络请求错误');
+        return rejectPromise;
     }
-)
+);
 
 /**
  * 请求uri
@@ -100,54 +119,59 @@ service.interceptors.response.use(
  * @param {Object} params 参数
  */
 function request(method: string, url: string, params: any = null, headers: any = null, options: any = null): Promise<any> {
-    if (!url)
+    if (!url) throw new Error('请求url不能为空');
-        throw new Error('请求url不能为空');
     // 简单判断该url是否是restful风格
-    if (url.indexOf("{") != -1) {
+    if (url.indexOf('{') != -1) {
         url = templateResolve(url, params);
     }
     const query: any = {
         method,
         url: url,
-        ...options
+        ...options,
     };
     if (headers) {
-        query.headers = headers
+        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;
     }
-    return service.request(query).then(res => res)
+    return service
-        .catch(e => {
+        .request(query)
+        .then((res) => res)
+        .catch((e) => {
             // 如果返回的code不为成功，则会返回对应的错误msg，则直接统一通知即可
             if (e.msg) {
-                notifyErrorMsg(e.msg)
+                notifyErrorMsg(e.msg);
             }
             return Promise.reject(e);
         });
 }
 
 /**
- * 根据api执行对应接口
+ * get请求uri
- * @param api Api实例
+ * 该方法已处理请求结果中code != 200的message提示,如需其他错误处理(取消加载状态,重置对象状态等等),可catch继续处理
- * @param params 请求参数
+ *
+ * @param {Object} url   uri
+ * @param {Object} params 参数
  */
-function send(api: Api, params: any, options: any): Promise<any> {
+function get(url: string, params: any = null, headers: any = null, options: any = null): Promise<any> {
-    return request(api.method, api.url, params, null, options);
+    return request('get', url, params, headers, options);
 }
 
-/**
+function post(url: string, params: any = null, headers: any = null, options: any = null): Promise<any> {
- * 根据api执行对应接口
+    return request('post', url, params, headers, options);
- * @param api Api实例
+}
- * @param params 请求参数
+
- */
+function put(url: string, params: any = null, headers: any = null, options: any = null): Promise<any> {
-function sendWithHeaders(api: Api, params: any, headers: any): Promise<any> {
+    return request('put', url, params, headers, options);
-    return request(api.method, api.url, params, headers, null);
+}
+
+function del(url: string, params: any = null, headers: any = null, options: any = null): Promise<any> {
+    return request('delete', url, params, headers, options);
 }
 
 function getApiUrl(url: string) {
@@ -157,7 +181,9 @@ function getApiUrl(url: string) {
 
 export default {
     request,
-    send,
+    get,
-    sendWithHeaders,
+    post,
-    getApiUrl
+    put,
-}
+    del,
+    getApiUrl,
+};

mayfly_go_web/src/common/rsa.ts

@@ -1,17 +1,17 @@
 import openApi from './openApi';
-import JSEncrypt from 'jsencrypt'
+import JSEncrypt from 'jsencrypt';
 import { notBlank } from './assert';
 
-var encryptor: any = null
+var encryptor: any = null;
 
 export async function getRsaPublicKey() {
-    let publicKey = sessionStorage.getItem('RsaPublicKey')
+    let publicKey = sessionStorage.getItem('RsaPublicKey');
     if (publicKey) {
-        return publicKey
+        return publicKey;
     }
-    publicKey = await openApi.getPublicKey() as string
+    publicKey = (await openApi.getPublicKey()) as string;
-    sessionStorage.setItem('RsaPublicKey', publicKey)
+    sessionStorage.setItem('RsaPublicKey', publicKey);
-    return publicKey
+    return publicKey;
 }
 
 /**
@@ -23,14 +23,14 @@ export async function getRsaPublicKey() {
 export async function RsaEncrypt(value: any) {
     // 不存在则返回空值
     if (!value) {
-        return ""
+        return '';
     }
-    if (encryptor != null) {
+    if (encryptor != null && sessionStorage.getItem('RsaPublicKey') != null) {
-        return encryptor.encrypt(value)
+        return encryptor.encrypt(value);
     }
-    encryptor = new JSEncrypt()
+    encryptor = new JSEncrypt();
-    const publicKey = await getRsaPublicKey() as string;
+    const publicKey = (await getRsaPublicKey()) as string;
-    notBlank(publicKey, "获取公钥失败")
+    notBlank(publicKey, '获取公钥失败');
-    encryptor.setPublicKey(publicKey)//设置公钥
+    encryptor.setPublicKey(publicKey); //设置公钥
-    return encryptor.encrypt(value)
+    return encryptor.encrypt(value);
 }

mayfly_go_web/src/common/sockets.ts

@@ -1,8 +1,7 @@
-
+import Config from './config';
-import Config from './config'
+import { ElNotification } from 'element-plus';
-import { ElNotification } from 'element-plus'
 import SocketBuilder from './SocketBuilder';
-import { getSession } from '@/common/utils/storage.ts';
+import { getSession } from '@/common/utils/storage';
 
 export default {
     /**
@@ -38,8 +37,9 @@ export default {
                     title: message.title,
                     message: message.msg,
                     type: mtype as any,
-                })
+                });
             })
-            .open((event: any) => console.log(event)).build();
+            .open((event: any) => console.log(event))
-    }
+            .build();
-}
+    },
+};

mayfly_go_web/src/common/sysconfig.ts

@@ -1,8 +1,9 @@
 import openApi from './openApi';
 
 // 登录是否使用验证码配置key
-const UseLoginCaptchaConfigKey = "UseLoginCaptcha"
+const AccountLoginSecurity = 'AccountLoginSecurity';
-const UseWartermarkConfigKey = "UseWartermark"
+const UseLoginCaptchaConfigKey = 'UseLoginCaptcha';
+const UseWartermarkConfigKey = 'UseWartermark';
 
 /**
  * 获取系统配置值
@@ -10,8 +11,8 @@ const UseWartermarkConfigKey = "UseWartermark"
  * @param key 配置key
  * @returns 配置值
  */
-export async function getConfigValue(key: string) : Promise<string> {
+export async function getConfigValue(key: string): Promise<string> {
-    return await openApi.getConfigValue({key}) as string
+    return (await openApi.getConfigValue({ key })) as string;
 }
 
 /**
@@ -21,12 +22,25 @@ export async function getConfigValue(key: string) : Promise<string> {
  * @param defaultValue 默认值
  * @returns 是否为ture，1: true；其他: false
  */
-export async function getBoolConfigValue(key :string, defaultValue :boolean) : Promise<boolean> {
+export async function getBoolConfigValue(key: string, defaultValue: boolean): Promise<boolean> {
-    const value = await getConfigValue(key)
+    const value = await getConfigValue(key);
+    return convertBool(value, defaultValue);
+}
+
+/**
+ * 获取账号登录安全配置
+ *
+ * @returns
+ */
+export async function getAccountLoginSecurity(): Promise<any> {
+    const value = await getConfigValue(AccountLoginSecurity);
     if (!value) {
-        return defaultValue;
+        return null;
     }
-    return value == "1";
+    const jsonValue = JSON.parse(value);
+    jsonValue.useCaptcha = convertBool(jsonValue.useCaptcha, true);
+    jsonValue.useOtp = convertBool(jsonValue.useOtp, true);
+    return jsonValue;
 }
 
 /**
@@ -34,8 +48,8 @@ export async function getBoolConfigValue(key :string, defaultValue :boolean) : P
  *
  * @returns
  */
-export async function useLoginCaptcha() : Promise<boolean> {
+export async function useLoginCaptcha(): Promise<boolean> {
-    return await getBoolConfigValue(UseLoginCaptchaConfigKey, true)
+    return await getBoolConfigValue(UseLoginCaptchaConfigKey, true);
 }
 
 /**
@@ -43,6 +57,24 @@ export async function useLoginCaptcha() : Promise<boolean> {
  *
  * @returns
  */
- export async function useWartermark() : Promise<boolean> {
+export async function useWartermark(): Promise<boolean> {
-    return await getBoolConfigValue(UseWartermarkConfigKey, true)
+    return await getBoolConfigValue(UseWartermarkConfigKey, true);
 }
+
+function convertBool(value: string, defaultValue: boolean) {
+    if (!value) {
+        return defaultValue;
+    }
+    return value == '1' || value == 'true';
+}
+
+/**
+ * 获取LDAP登录配置
+ *
+ * @returns
+ */
+export async function getLdapEnabled(): Promise<any> {
+    const value = await openApi.getLdapEnabled();
+    return convertBool(value, false);
+}
+

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/date.ts

@@ -1,27 +1,27 @@
 export function dateFormat2(fmt: string, date: Date) {
     let ret;
     const opt = {
-        "y+": date.getFullYear().toString(),        // 年
+        'y+': date.getFullYear().toString(), // 年
-        "M+": (date.getMonth() + 1).toString(),     // 月
+        'M+': (date.getMonth() + 1).toString(), // 月
-        "d+": date.getDate().toString(),            // 日
+        'd+': date.getDate().toString(), // 日
-        "H+": date.getHours().toString(),           // 时
+        'H+': date.getHours().toString(), // 时
-        "m+": date.getMinutes().toString(),         // 分
+        'm+': date.getMinutes().toString(), // 分
-        "s+": date.getSeconds().toString()          // 秒
+        's+': date.getSeconds().toString(), // 秒
         // 有其他格式化字符需求可以继续添加，必须转化成字符串
     };
     for (const k in opt) {
-        ret = new RegExp("(" + k + ")").exec(fmt);
+        ret = new RegExp('(' + k + ')').exec(fmt);
         if (ret) {
-            fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+            fmt = fmt.replace(ret[1], ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0'));
         }
     }
     return fmt;
 }
 
 export function dateStrFormat(fmt: string, dateStr: string) {
-    return dateFormat2(fmt, new Date(dateStr))
+    return dateFormat2(fmt, new Date(dateStr));
 }
 
 export function dateFormat(dateStr: string) {
-    return dateFormat2('yyyy-MM-dd HH:mm:ss',new Date(dateStr))
+    return dateFormat2('yyyy-MM-dd HH:mm:ss', new Date(dateStr));
 }

mayfly_go_web/src/common/utils/export.ts

@@ -0,0 +1,43 @@
+export function exportCsv(filename: string, columns: string[], datas: []) {
+    // 二维数组
+    const cvsData = [columns];
+    for (let data of datas) {
+        // 数据值组成的一维数组
+        let dataValueArr: any = [];
+        for (let column of columns) {
+            let val: any = data[column];
+            if (val == null || val == undefined) {
+                dataValueArr.push('');
+                continue;
+            }
+
+            if (typeof val == 'string' && val) {
+                // csv格式如果有逗号，整体用双引号括起来；如果里面还有双引号就替换成两个双引号，这样导出来的格式就不会有问题了
+                if (val.indexOf(',') != -1) {
+                    // 如果还有双引号，先将双引号转义，避免两边加了双引号后转义错误
+                    if (val.indexOf('"') != -1) {
+                        val = val.replace(/\"/g, '""');
+                    }
+                    // 再将逗号转义
+                    val = `"${val}"`;
+                }
+                dataValueArr.push(val + '\t');
+            } else {
+                dataValueArr.push(val + '\t');
+            }
+        }
+        cvsData.push(dataValueArr);
+    }
+    const csvString = cvsData.map((e) => e.join(',')).join('\n');
+    // 导出
+    let link = document.createElement('a');
+    let exportContent = '\uFEFF';
+    let blob = new Blob([exportContent + csvString], {
+        type: 'text/plain;charset=utf-8',
+    });
+    link.id = 'download-csv';
+    link.setAttribute('href', URL.createObjectURL(blob));
+    link.setAttribute('download', `${filename}.csv`);
+    document.body.appendChild(link);
+    link.click();
+}

mayfly_go_web/src/common/utils/format.ts

@@ -73,3 +73,122 @@ export function formatJsonString(txt: string, compress: boolean) {
     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/loading.ts

@@ -1,5 +1,5 @@
 import { nextTick } from 'vue';
-import loadingCss from '@/theme/loading.scss';
+import loadingCss from '@/theme/loading.scss?inline';
 
 // 定义方法
 export const NextLoading = {

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,12 +1,9 @@
 // 字体图标 url
-const cssCdnUrlList: Array<string> = [
+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) => {
@@ -18,7 +15,7 @@ export function setCssCdn() {
     });
 }
 
-// 批量设置第三方js
+// 动态批量设置第三方js
 export function setJsCdn() {
     if (jsCdnUrlList.length <= 0) return false;
     jsCdnUrlList.map((v) => {
@@ -28,11 +25,17 @@ export function setJsCdn() {
     });
 }
 
-// 设置执行函数
+/**
+ * 批量设置字体图标、动态js
+ * @method cssCdn 动态批量设置字体图标
+ * @method jsCdn 动态批量设置第三方js
+ */
 const setIntroduction = {
+    // 设置css
     cssCdn: () => {
         setCssCdn();
     },
+    // 设置js
     jsCdn: () => {
         setJsCdn();
     },

mayfly_go_web/src/common/utils/storage.ts

@@ -36,21 +36,19 @@ export function clearSession() {
     window.sessionStorage.clear();
 }
 
-
-
 export function getUserInfo4Session() {
-    return getSession("userInfo")
+    return getSession('userInfo');
 }
 
 export function setUserInfo2Session(userinfo: any) {
-    setSession("userInfo", userinfo)
+    setSession('userInfo', userinfo);
 }
 
 // 获取是否开启水印
 export function getUseWatermark4Session() {
-    return getSession("useWatermark")
+    return getSession('useWatermark');
 }
 
 export function setUseWatermark2Session(useWatermark: boolean) {
-    setSession("useWatermark", useWatermark)
+    setSession('useWatermark', useWatermark);
 }

mayfly_go_web/src/common/utils/string.ts

@@ -12,7 +12,7 @@ export function templateResolve(template: string, param: any) {
         if (value != null || value != undefined) {
             return value;
         }
-        return "";
+        return '';
     });
 }
 
@@ -21,11 +21,34 @@ export function letterAvatar(name: string, size = 60, color = '') {
     name = name || '';
     size = size || 60;
     var colours = [
-        "#1abc9c", "#2ecc71", "#3498db", "#9b59b6", "#34495e", "#16a085", "#27ae60", "#2980b9", "#8e44ad", "#2c3e50",
+            '#1abc9c',
-        "#f1c40f", "#e67e22", "#e74c3c", "#00bcd4", "#95a5a6", "#f39c12", "#d35400", "#c0392b", "#bdc3c7", "#7f8c8d"
+            '#2ecc71',
-    ],
+            '#3498db',
+            '#9b59b6',
+            '#34495e',
+            '#16a085',
+            '#27ae60',
+            '#2980b9',
+            '#8e44ad',
+            '#2c3e50',
+            '#f1c40f',
+            '#e67e22',
+            '#e74c3c',
+            '#00bcd4',
+            '#95a5a6',
+            '#f39c12',
+            '#d35400',
+            '#c0392b',
+            '#bdc3c7',
+            '#7f8c8d',
+        ],
         nameSplit = String(name).split(' '),
-        initials, charIndex, colourIndex, canvas, context, dataURI;
+        initials,
+        charIndex,
+        colourIndex,
+        canvas,
+        context,
+        dataURI;
 
     if (nameSplit.length == 1) {
         initials = nameSplit[0] ? nameSplit[0].charAt(0) : '?';
@@ -33,23 +56,76 @@ export function letterAvatar(name: string, size = 60, color = '') {
         initials = nameSplit[0].charAt(0) + nameSplit[1].charAt(0);
     }
     if (window.devicePixelRatio) {
-        size = (size * window.devicePixelRatio);
+        size = size * window.devicePixelRatio;
     }
-    initials = initials.toLocaleUpperCase()
+    initials = initials.toLocaleUpperCase();
     charIndex = (initials == '?' ? 72 : initials.charCodeAt(0)) - 64;
     colourIndex = charIndex % 20;
     canvas = document.createElement('canvas');
     canvas.width = size;
     canvas.height = size;
-    context = canvas.getContext("2d") as any;
+    context = canvas.getContext('2d') as any;
 
     context.fillStyle = color ? color : colours[colourIndex - 1];
     context.fillRect(0, 0, canvas.width, canvas.height);
     context.font = Math.round(canvas.width / 2) + "px 'Microsoft Yahei'";
-    context.textAlign = "center";
+    context.textAlign = 'center';
-    context.fillStyle = "#FFF";
+    context.fillStyle = '#FFF';
     context.fillText(initials, size / 2, size / 1.5);
     dataURI = canvas.toDataURL();
     canvas = null;
     return dataURI;
-};
+}
+
+/**
+ * 计算文本所占用的宽度（px） -> 该种方式较为准确
+ * 使用span标签包裹内容，然后计算span的宽度 width： px
+ * @param str
+ */
+export function getTextWidth(str: string) {
+    let width = 0;
+    let html = document.createElement('span');
+    html.innerText = str;
+    html.className = 'getTextWidth';
+    document?.querySelector('body')?.appendChild(html);
+    width = (document?.querySelector('.getTextWidth') as any).offsetWidth;
+    document?.querySelector('.getTextWidth')?.remove();
+    return width;
+}
+
+/**
+ * 获取内容所需要占用的宽度
+ */
+export function getContentWidth(content: any): number {
+    if (!content) {
+        return 50;
+    }
+    // 以下分配的单位长度可根据实际需求进行调整
+    let flexWidth = 0;
+    for (const char of content) {
+        if (flexWidth > 500) {
+            break;
+        }
+        if ((char >= '0' && char <= '9') || (char >= 'a' && char <= 'z')) {
+            // 小写字母、数字字符
+            flexWidth += 9.3;
+            continue;
+        }
+        if (char >= 'A' && char <= 'Z') {
+            flexWidth += 9;
+            continue;
+        }
+        if (char >= '\u4e00' && char <= '\u9fa5') {
+            // 如果是中文字符，为字符分配16个单位宽度
+            flexWidth += 20;
+        } else {
+            // 其他种类字符
+            flexWidth += 8;
+        }
+    }
+    // if (flexWidth > 450) {
+    //     // 设置最大宽度
+    //     flexWidth = 450;
+    // }
+    return flexWidth;
+}

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,19 +44,29 @@ 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) => {
-		nextTick(() => {
+        nextTick(() => {
-			const icons = svg as any;
+            const icons = svg as any;
-			const sheetsIconList = [];
+            const sheetsIconList = [];
-			for (const i in icons) {
+            for (const i in icons) {
-				sheetsIconList.push(`${icons[i].name}`);
+                sheetsIconList.push(`${icons[i].name}`);
-			}
+            }
-			if (sheetsIconList.length > 0) resolve(sheetsIconList);
+            if (sheetsIconList.length > 0) resolve(sheetsIconList);
-			else reject('未获取到值，请刷新重试');
+            else reject('未获取到值，请刷新重试');
-		});
+        });
-	});
+    });
 };
 
 // 初始化获取 css 样式，这里使用 fontawesome 的图标
@@ -76,9 +102,9 @@ const awesomeIconfont = () => {
 
 // 定义导出方法集合
 const initIconfont = {
-    // ali: () => {
+    ali: () => {
-    // 	return getAlicdnIconfont();
+        return getLocalAliIconfont();
-    // },
+    },
     ele: () => {
         return elementPlusIconfont();
     },

mayfly_go_web/src/common/utils/toolsValidate.ts

@@ -163,8 +163,7 @@ export function verifyPasswordStrength(val: string) {
     // 中：字母+数字，字母+特殊字符，数字+特殊字符
     if (/^(?![a-zA-z]+$)(?!\d+$)(?![!@#$%^&\.*]+$)[a-zA-Z\d!@#$%^&\.*]{6,16}$/.test(val)) v = '中';
     // 强：字母+数字+特殊字符
-    if (/^(?![a-zA-z]+$)(?!\d+$)(?![!@#$%^&\.*]+$)(?![a-zA-z\d]+$)(?![a-zA-z!@#$%^&\.*]+$)(?![\d!@#$%^&\.*]+$)[a-zA-Z\d!@#$%^&\.*]{6,16}$/.test(val))
+    if (/^(?![a-zA-z]+$)(?!\d+$)(?![!@#$%^&\.*]+$)(?![a-zA-z\d]+$)(?![a-zA-z!@#$%^&\.*]+$)(?![\d!@#$%^&\.*]+$)[a-zA-Z\d!@#$%^&\.*]{6,16}$/.test(val)) v = '强';
-        v = '强';
     // 返回结果
     return v;
 }
@@ -172,11 +171,7 @@ export function verifyPasswordStrength(val: string) {
 // IP地址
 export function verifyIPAddress(val: string) {
     // false: IP地址不正确
-    if (
+    if (!/^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/.test(val))
-        !/^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/.test(
-            val
-        )
-    )
         return false;
     // true: IP地址正确
     else return true;

mayfly_go_web/src/common/utils/wartermark.ts

@@ -1,5 +1,5 @@
-import { getUseWatermark4Session, getUserInfo4Session } from '@/common/utils/storage.ts';
+import { getUseWatermark4Session, getUserInfo4Session } from '@/common/utils/storage';
-import { dateFormat2 } from '@/common/utils/date.ts'
+import { dateFormat2 } from '@/common/utils/date';
 
 // 页面添加水印效果
 const setWatermark = (str: any) => {
@@ -44,17 +44,17 @@ function del() {
 const watermark = {
     use: () => {
         setTimeout(() => {
-            const userinfo = getUserInfo4Session()
+            const userinfo = getUserInfo4Session();
             if (userinfo && getUseWatermark4Session()) {
-                set(`${userinfo.username} ${dateFormat2('yyyy-MM-dd HH:mm:ss', new Date())}`)
+                set(`${userinfo.username} ${dateFormat2('yyyy-MM-dd HH:mm:ss', new Date())}`);
             } else {
                 del();
             }
-        }, 1500)
+        }, 1500);
     },
     // 设置水印
     set: (str: any) => {
-        set(str)
+        set(str);
     },
     // 删除水印
     del: () => {

mayfly_go_web/src/components/auth/auth.ts

@@ -0,0 +1,25 @@
+import { useUserInfo } from '@/store/userInfo';
+
+/**
+ * 判断当前用户是否拥有指定权限
+ * @param code 权限code
+ * @returns
+ */
+export function hasPerm(code: string) {
+    return useUserInfo().userInfo.permissions.some((v: any) => v === code);
+}
+
+/**
+ * 判断用户是否拥有权限对象里对应的code
+ * @param perms { save: "xxx:save"}
+ * @returns {"xxx:save": true}  key->permission code
+ */
+export function hasPerms(permCodes: any[]) {
+    const res = {};
+    for (let permCode of permCodes) {
+        if (hasPerm(permCode)) {
+            res[permCode] = true;
+        }
+    }
+    return res;
+}

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,142 @@
+<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/enumtag/EnumTag.vue

@@ -0,0 +1,60 @@
+<template>
+    <el-tag v-bind="$attrs" :type="type" :color="color" effect="plain">{{ enumLabel }}</el-tag>
+</template>
+
+<script lang="ts" setup>
+import { toRefs, watch, reactive, onMounted } from 'vue';
+import EnumValue from '@/common/Enum';
+
+const props = defineProps({
+    enums: {
+        type: Object, // 需要为EnumValue类型
+        required: true,
+    },
+    value: {
+        type: [Object, String, Number],
+        required: true,
+    },
+});
+
+const defaultType = 'primary';
+
+const state = reactive({
+    type: defaultType,
+    color: '',
+    enumLabel: '',
+});
+
+const { type, color, enumLabel } = toRefs(state);
+
+// 监听该值是否改变，改变则需要将其枚举值与标签进行调整
+watch(
+    () => props.value,
+    (newValue: any) => {
+        convert(newValue);
+    }
+);
+
+onMounted(() => {
+    convert(props.value);
+});
+
+const convert = (value: any) => {
+    const enumValue = EnumValue.getEnumByValue(Object.values(props.enums as any) as any, value) as any;
+    if (!enumValue) {
+        state.enumLabel = '-';
+        state.type = 'danger';
+        state.color = '';
+        return;
+    }
+
+    state.enumLabel = enumValue?.label || '';
+    if (enumValue.tag) {
+        state.color = enumValue.tag.color;
+        state.type = enumValue.tag.type;
+    } else {
+        state.type = defaultType;
+    }
+};
+</script>
+<style scoped lang="scss"></style>

mayfly_go_web/src/components/iconSelector/index.vue

@@ -1,261 +1,239 @@
 <template>
-    <div class="icon-selector">
+    <div class="icon-selector w100 h100">
-        <el-popover placement="bottom" :width="450" v-model:visible="fontIconVisible" popper-class="icon-selector-popper">
+        <el-input
-            <template #reference>
+            v-model="state.fontIconSearch"
-                <el-input
+            :placeholder="state.fontIconPlaceholder"
-                    v-model="fontIconSearch"
+            :clearable="clearable"
-                    :placeholder="fontIconPlaceholder"
+            :disabled="disabled"
-                    :clearable="clearable"
+            :size="size"
-                    :disabled="disabled"
+            ref="inputWidthRef"
-                    :size="size"
+            @clear="onClearFontIcon"
-                    ref="inputWidthRef"
+            @focus="onIconFocus"
-                    @clear="onClearFontIcon"
+            @blur="onIconBlur"
-                    @focus="onIconFocus"
+        >
-                    @blur="onIconBlur"
+            <template #prepend>
-                >
+                <SvgIcon :name="state.fontIconPrefix === '' ? prepend : state.fontIconPrefix" class="font14" />
-                    <template #prepend>
-                        <SvgIcon :name="prepend" class="font14" />
-                    </template>
-                </el-input>
             </template>
-            <transition name="el-zoom-in-top">
+        </el-input>
-                <div class="icon-selector-warp" v-show="fontIconVisible">
+        <el-popover
-                    <div class="icon-selector-warp-title flex">
+            placement="bottom"
-                        <div class="flex-auto">{{ title }}</div>
+            :width="state.fontIconWidth"
-                        <div class="icon-selector-warp-title-tab" v-if="type === 'all'">
+            transition="el-zoom-in-top"
-                            <span :class="{ 'span-active': fontIconType === 'ali' }" @click="onIconChange('ali')" class="ml10" title="iconfont 图标"
+            popper-class="icon-selector-popper"
-                                >ali</span
+            trigger="click"
-                            >
+            :virtual-ref="inputWidthRef"
-                            <span
+            virtual-triggering
-                                :class="{ 'span-active': fontIconType === 'ele' }"
+        >
-                                @click="onIconChange('ele')"
+            <template #default>
-                                class="ml10"
+                <div class="icon-selector-warp">
-                                title="elementPlus 图标"
+                    <div class="icon-selector-warp-title">{{ title }}</div>
-                                >ele</span
+                    <el-tabs v-model="state.fontIconTabActive" @tab-click="onIconClick">
-                            >
+                        <el-tab-pane lazy label="ele" name="ele">
-                            <span
+                            <IconList :list="fontIconSheetsFilterList" :empty="emptyDescription" :prefix="state.fontIconPrefix" @get-icon="onColClick" />
-                                :class="{ 'span-active': fontIconType === 'awe' }"
+                        </el-tab-pane>
-                                @click="onIconChange('awe')"
+                        <el-tab-pane lazy label="ali" name="ali">
-                                class="ml10"
+                            <IconList :list="fontIconSheetsFilterList" :empty="emptyDescription" :prefix="state.fontIconPrefix" @get-icon="onColClick" />
-                                title="fontawesome 图标"
+                        </el-tab-pane>
-                                >awe</span
+                        <!-- <el-tab-pane lazy label="awe" name="awe">
-                            >
+							<IconList :list="fontIconSheetsFilterList" :empty="emptyDescription" :prefix="state.fontIconPrefix" @get-icon="onColClick" />
-                        </div>
+						</el-tab-pane> -->
-                    </div>
+                    </el-tabs>
-                    <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>
+            </template>
         </el-popover>
     </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts" name="iconSelector">
-import { ref, toRefs, reactive, onMounted, nextTick, computed, watch } from 'vue';
+import { defineAsyncComponent, ref, reactive, onMounted, nextTick, computed, watch } from 'vue';
-import initIconfont from '@/common/utils/getStyleSheets';
+import type { TabsPaneContext } from 'element-plus';
-export default {
+import initIconfont from '@/common/utils/svgIcons';
-    name: 'iconSelector',
+import '@/theme/iconSelector.scss';
-    emits: ['update:modelValue', 'get', 'clear'],
+
-    props: {
+// 定义父组件传过来的值
-        // 输入框前置内容
+const props = defineProps({
-        prepend: {
+    // 输入框前置内容
-            type: String,
+    prepend: {
-            default: () => 'Pointer',
+        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();
+    placeholder: {
-        const selectorScrollbarRef = ref();
+        type: String,
-        const state: any = reactive({
+        default: () => '请输入内容搜索图标或者选择图标',
-            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),
-        };
     },
+    // 输入框占位文本
+    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,18 +1,41 @@
 <template>
-    <div class="monaco-editor" style="border: 1px solid #ccc;">
+    <div class="monaco-editor" style="border: 1px solid var(--el-border-color-light, #ebeef5)">
-        <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>
 
 <script lang="ts" setup>
 import { ref, watch, toRefs, reactive, onMounted, onBeforeUnmount } from 'vue';
-import EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker.js?worker';
+// import * as monaco from 'monaco-editor';
-import * as monaco from 'monaco-editor';
+import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
+// 相关语言
+import 'monaco-editor/esm/vs/basic-languages/shell/shell.contribution.js';
+import 'monaco-editor/esm/vs/basic-languages/yaml/yaml.contribution.js';
+import 'monaco-editor/esm/vs/basic-languages/dockerfile/dockerfile.contribution.js';
+import 'monaco-editor/esm/vs/basic-languages/javascript/javascript.contribution.js';
+import 'monaco-editor/esm/vs/basic-languages/html/html.contribution.js';
+import 'monaco-editor/esm/vs/basic-languages/css/css.contribution.js';
+import 'monaco-editor/esm/vs/basic-languages/python/python.contribution.js';
+import 'monaco-editor/esm/vs/basic-languages/markdown/markdown.contribution.js';
+import 'monaco-editor/esm/vs/basic-languages/java/java.contribution.js';
+import 'monaco-editor/esm/vs/basic-languages/sql/sql.contribution.js';
+import 'monaco-editor/esm/vs/language/json/monaco.contribution';
+// 右键菜单
+import 'monaco-editor/esm/vs/editor/contrib/contextmenu/browser/contextmenu.js';
+import 'monaco-editor/esm/vs/editor/contrib/caretOperations/browser/caretOperations.js';
+import 'monaco-editor/esm/vs/editor/contrib/clipboard//browser/clipboard.js';
+import 'monaco-editor/esm/vs/editor/contrib/find/browser/findController.js';
+import 'monaco-editor/esm/vs/editor/contrib/format//browser/formatActions.js';
+// 提示
+import 'monaco-editor/esm/vs/editor/contrib/suggest/browser/suggestController.js';
+import 'monaco-editor/esm/vs/editor/contrib/suggest/browser/suggestInlineCompletions.js';
+
 import { editor, languages } from 'monaco-editor';
-import JsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker'
+import EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker.js?worker';
+import JsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker';
 // 主题仓库 https://github.com/brijeshb42/monaco-themes
 // 主题例子 https://editor.bitwiser.in/
 // import Monokai from 'monaco-themes/themes/Monokai.json'
@@ -21,10 +44,15 @@ import JsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker'
 // import bop from 'monaco-themes/themes/Birds of Paradise.json'
 // import krTheme from 'monaco-themes/themes/krTheme.json'
 // import Dracula from 'monaco-themes/themes/Dracula.json'
-import SolarizedLight from 'monaco-themes/themes/Solarized-light.json'
+import SolarizedLight from 'monaco-themes/themes/Solarized-light.json';
 import { language as shellLan } from 'monaco-editor/esm/vs/basic-languages/shell/shell.js';
 import { ElOption, ElSelect } from 'element-plus';
 
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '@/store/themeConfig';
+
+const { themeConfig } = storeToRefs(useThemeConfig());
+
 const props = defineProps({
     modelValue: {
         type: String,
@@ -49,12 +77,12 @@ const props = defineProps({
         type: Object,
         default: null,
     },
-})
+});
 
 //定义事件
-const emit = defineEmits(['update:modelValue'])
+const emit = defineEmits(['update:modelValue']);
 
-const languages = [
+const languageArr = [
     {
         value: 'shell',
         label: 'Shell',
@@ -109,11 +137,11 @@ const options = {
     language: 'shell',
     theme: 'SolarizedLight',
     automaticLayout: true, //自适应宽高布局
-    foldingStrategy: 'indentation',//代码可分小段折叠
+    foldingStrategy: 'indentation', //代码可分小段折叠
     roundedSelection: false, // 禁用选择文本背景的圆角
     matchBrackets: 'near',
     linkedEditing: true,
-    cursorBlinking: 'smooth',// 光标闪烁样式
+    cursorBlinking: 'smooth', // 光标闪烁样式
     mouseWheelZoom: true, // 在按住Ctrl键的同时使用鼠标滚轮时，在编辑器中缩放字体
     overviewRulerBorder: false, // 不要滚动条的边框
     tabSize: 4, // tab 缩进长度
@@ -125,15 +153,13 @@ const options = {
     minimap: {
         enabled: false, // 不要小地图
     },
-}
+};
 
 const state = reactive({
     languageMode: 'shell',
-})
+});
 
-const {
+const { languageMode } = toRefs(state);
-    languageMode,
-} = toRefs(state)
 
 onMounted(() => {
     state.languageMode = props.language;
@@ -149,19 +175,33 @@ onBeforeUnmount(() => {
     if (completionItemProvider) {
         completionItemProvider.dispose();
     }
-})
+});
 
-watch(() => props.modelValue, (newValue: any) => {
+watch(
-    if (!monacoEditorIns.hasTextFocus()) {
+    () => props.modelValue,
-        state.languageMode = props.language;
+    (newValue: any) => {
-        monacoEditorIns?.setValue(newValue);
+        if (!monacoEditorIns.hasTextFocus()) {
+            state.languageMode = props.language;
+            monacoEditorIns?.setValue(newValue);
+        }
     }
-})
+);
 
-watch(() => props.language, (newValue: any) => {
+watch(
-    changeLanguage(newValue);
+    () => props.language,
-})
+    (newValue: any) => {
+        changeLanguage(newValue);
+    }
+);
 
+// 监听 themeConfig editorTheme配置文件的变化
+watch(
+    () => themeConfig.value.editorTheme,
+    (val) => {
+        console.log('monaco editor theme change: ', val);
+        monaco?.editor?.setTheme(val);
+    }
+);
 
 const monacoTextarea: any = ref(null);
 
@@ -171,53 +211,49 @@ let completionItemProvider: any = null;
 self.MonacoEnvironment = {
     getWorker(_: any, label: string) {
         if (label === 'json') {
-            return new JsonWorker()
+            return new JsonWorker();
         }
         return new EditorWorker();
-    }
+    },
 };
 
 const initMonacoEditorIns = () => {
-    console.log('初始化monaco编辑器')
+    console.log('初始化monaco编辑器');
     // options参数参考 https://microsoft.github.io/monaco-editor/api/interfaces/monaco.editor.IStandaloneEditorConstructionOptions.html#language
     // 初始化一些主题
     monaco.editor.defineTheme('SolarizedLight', SolarizedLight);
     options.language = state.languageMode;
-    // 从localStorage中获取，通过store可能存在父子组件都使用store报错
+    options.theme = themeConfig.value.editorTheme;
-    options.theme = JSON.parse(localStorage.getItem('themeConfig') as string).editorTheme || 'vs';
     monacoEditorIns = monaco.editor.create(monacoTextarea.value, Object.assign(options, props.options as any));
 
     // 监听内容改变,双向绑定
     monacoEditorIns.onDidChangeModelContent(() => {
         emit('update:modelValue', monacoEditorIns.getModel()?.getValue());
-    })
+    });
-
-    // 动态设置主题
-    // monaco.editor.setTheme('hc-black');
 };
 
 const changeLanguage = (value: any) => {
     console.log('change lan');
     // 获取当前的文档模型
-    let oldModel = monacoEditorIns.getModel()
+    let oldModel = monacoEditorIns.getModel();
     if (!oldModel) {
         return;
     }
     // 创建一个新的文档模型
-    let newModel = monaco.editor.createModel(oldModel.getValue(), value)
+    let newModel = monaco.editor.createModel(oldModel.getValue(), value);
     // 设置成新的
-    monacoEditorIns.setModel(newModel)
+    monacoEditorIns.setModel(newModel);
     // 销毁旧的模型
     if (oldModel) {
-        oldModel.dispose()
+        oldModel.dispose();
     }
 
     registerCompletionItemProvider();
-}
+};
 
 const setEditorValue = (value: any) => {
-    monacoEditorIns.getModel()?.setValue(value)
+    monacoEditorIns.getModel()?.setValue(value);
-}
+};
 
 /**
  * 注册联想补全提示
@@ -227,44 +263,43 @@ const registerCompletionItemProvider = () => {
         completionItemProvider.dispose();
     }
     if (state.languageMode == 'shell') {
-        registeShell()
+        registeShell();
     }
-}
+};
 
 const registeShell = () => {
     completionItemProvider = monaco.languages.registerCompletionItemProvider('shell', {
         provideCompletionItems: async () => {
-            let suggestions: languages.CompletionItem[] = []
+            let suggestions: languages.CompletionItem[] = [];
             shellLan.keywords.forEach((item: any) => {
                 suggestions.push({
                     label: item,
                     kind: monaco.languages.CompletionItemKind.Keyword,
                     insertText: item,
                 } as any);
-            })
+            });
             shellLan.builtins.forEach((item: any) => {
                 suggestions.push({
                     label: item,
                     kind: monaco.languages.CompletionItemKind.Property,
                     insertText: item,
                 } as any);
-            })
+            });
             return {
-                suggestions: suggestions
+                suggestions: suggestions,
             };
-        }
+        },
-    })
+    });
 };
 
 const format = () => {
     /*
     触发自动格式化;
    */
-    monacoEditorIns.trigger('', 'editor.action.formatDocument', '')
+    monacoEditorIns.trigger('', 'editor.action.formatDocument', '');
-}
+};
-
-defineExpose({ format })
 
+defineExpose({ format });
 </script>
 
 <style lang="scss">

mayfly_go_web/src/components/pagetable/PageTable.vue

@@ -0,0 +1,437 @@
+<template>
+    <div class="page-table">
+        <!-- 
+            实现：通过我们配置好的 查询条件
+                首先去创建form表单，根据我们配置的查询条件去做一个循环判断，展示出不用类型所对应不同的输入框
+                比如：text对应普通的输入框，select对应下拉选择，dateTime对应日期时间选择器
+                在使用时，父组件会传来一个queryForm空的对象，
+                循环出来的输入框会绑定表格配置中的prop字段绑定在queryForm对象中
+         -->
+        <el-card>
+            <div class="query" ref="queryRef">
+                <div>
+                    <div v-if="props.query.length > 0">
+                        <el-form :model="props.queryForm" label-width="auto" :size="props.size">
+                            <el-row
+                                v-for="i in Math.ceil((props.query.length + 1) / (defaultQueryCount + 1))"
+                                :key="i"
+                                v-show="i == 1 || isOpenMoreQuery"
+                                :class="i > 1 && isOpenMoreQuery ? 'is-open' : ''"
+                            >
+                                <el-form-item
+                                    :label="item.label"
+                                    style="margin-right: 12px; margin-bottom: 0px"
+                                    v-for="item in getRowQueryItem(i)"
+                                    :key="item.prop"
+                                >
+                                    <!-- 这里只获取指定个数的筛选条件 -->
+                                    <el-input
+                                        v-model="queryForm[item.prop]"
+                                        :placeholder="'输入' + item.label + '关键字'"
+                                        clearable
+                                        v-if="item.type == 'text'"
+                                    ></el-input>
+
+                                    <el-select-v2
+                                        v-model="queryForm[item.prop]"
+                                        :options="item.options"
+                                        clearable
+                                        :placeholder="'选择' + item.label + '关键字'"
+                                        v-else-if="item.type == 'select'"
+                                    />
+
+                                    <el-date-picker
+                                        v-model="queryForm[item.prop]"
+                                        clearable
+                                        type="datetimerange"
+                                        format="YYYY-MM-DD hh:mm:ss"
+                                        value-format="x"
+                                        range-separator="至"
+                                        start-placeholder="开始时间"
+                                        end-placeholder="结束时间"
+                                        v-else-if="item.type == 'date'"
+                                    />
+
+                                    <template v-else-if="item.slot == 'queryBtns'">
+                                        <template v-if="props.query?.length > defaultQueryCount">
+                                            <el-button
+                                                @click="isOpenMoreQuery = !isOpenMoreQuery"
+                                                v-if="!isOpenMoreQuery"
+                                                icon="ArrowDownBold"
+                                                circle
+                                            ></el-button>
+                                            <el-button @click="isOpenMoreQuery = !isOpenMoreQuery" v-else icon="ArrowUpBold" circle></el-button>
+                                        </template>
+
+                                        <el-button @click="queryData()" type="primary" icon="search" plain>查询</el-button>
+                                        <el-button @click="reset()" icon="RefreshRight">重置</el-button>
+                                    </template>
+
+                                    <slot :name="item.slot"></slot>
+                                </el-form-item>
+                            </el-row>
+                        </el-form>
+                    </div>
+                </div>
+
+                <div class="slot">
+                    <!-- 查询栏右侧slot插槽（用来添加表格其他操作，比如，新增数据，删除数据等其他操作） -->
+                    <slot name="queryRight"></slot>
+
+                    <!-- 
+                    动态表头显示，根据表格每条配置项中的show字段来决定改列是否显示或者隐藏 
+                    columns 就是我们表格配置的数组对象
+                    -->
+                    <el-popover
+                        placement="bottom"
+                        title="表格配置"
+                        popper-style="max-height: 550px; overflow: auto; max-width: 450px"
+                        width="auto"
+                        trigger="click"
+                    >
+                        <div v-for="(item, index) in props.columns" :key="index">
+                            <el-checkbox v-model="item.show" :label="item.label" :true-label="true" :false-label="false" />
+                        </div>
+                        <template #reference>
+                            <!-- 一个Element Plus中的图标 -->
+                            <el-button icon="Operation" :size="props.size"></el-button>
+                        </template>
+                    </el-popover>
+                </div>
+            </div>
+
+            <el-table
+                v-bind="$attrs"
+                :max-height="tableMaxHeight"
+                @selection-change="handleSelectionChange"
+                :data="props.data"
+                highlight-current-row
+                v-loading="loadingData"
+                :size="props.size"
+            >
+                <el-table-column v-if="props.showSelection" type="selection" width="40" />
+
+                <template v-for="(item, index) in columns">
+                    <el-table-column
+                        :key="index"
+                        v-if="item.show"
+                        :prop="item.prop"
+                        :label="item.label"
+                        :fixed="item.fixed"
+                        :align="item.align"
+                        :show-overflow-tooltip="item.showOverflowTooltip"
+                        :min-width="item.minWidth"
+                        :sortable="item.sortable || false"
+                        :type="item.type"
+                        :width="item.width"
+                    >
+                        <!-- 插槽：预留功能 -->
+                        <template #default="scope" v-if="item.slot">
+                            <slot :name="item.prop" :data="scope.row"></slot>
+                        </template>
+
+                        <!-- 枚举类型使用tab展示 -->
+                        <template #default="scope" v-else-if="item.type == 'tag'">
+                            <enum-tag :size="props.size" :enums="item.typeParam" :value="scope.row[item.prop]"></enum-tag>
+                        </template>
+
+                        <template #default="scope" v-else>
+                            <!-- 配置了美化文本按钮以及文本内容大于指定长度，则显示美化按钮 -->
+                            <el-popover
+                                v-if="item.isBeautify && scope.row[item.prop]?.length > 35"
+                                effect="light"
+                                trigger="click"
+                                placement="top"
+                                width="600px"
+                            >
+                                <template #default>
+                                    <el-input :autosize="{ minRows: 3, maxRows: 15 }" disabled v-model="formatVal" type="textarea" />
+                                </template>
+                                <template #reference>
+                                    <el-link
+                                        @click="formatText(scope.row[item.prop])"
+                                        :underline="false"
+                                        type="success"
+                                        icon="MagicStick"
+                                        class="mr5"
+                                    ></el-link>
+                                </template>
+                            </el-popover>
+
+                            <span>{{ item.getValueByData(scope.row) }}</span>
+                        </template>
+                    </el-table-column>
+                </template>
+            </el-table>
+
+            <el-row style="margin-top: 20px" type="flex" justify="end">
+                <el-pagination
+                    :small="props.size == 'small'"
+                    @current-change="handlePageChange"
+                    @size-change="handleSizeChange"
+                    style="text-align: right"
+                    layout="prev, pager, next, total, sizes, jumper"
+                    :total="props.total"
+                    v-model:current-page="state.pageNum"
+                    v-model:page-size="state.pageSize"
+                    :page-sizes="pageSizes"
+                />
+            </el-row>
+        </el-card>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { toRefs, watch, reactive, onMounted } from 'vue';
+import { TableColumn, TableQuery } from './index';
+import EnumTag from '@/components/enumtag/EnumTag.vue';
+
+const emit = defineEmits(['update:queryForm', 'update:pageNum', 'update:pageSize', 'update:selectionData', 'pageChange'])
+
+const props = defineProps({
+    size: {
+        type: String,
+        default: '',
+    },
+    inputWidth: {
+        type: [Number, String],
+        default: 0,
+    },
+    // 是否显示选择列
+    showSelection: {
+        type: Boolean,
+        default: false,
+    },
+    // 当前选择的数据
+    selectionData: {
+        type: Array<any>
+    },
+    // 列信息
+    columns: {
+        type: Array<TableColumn>,
+        default: function () {
+            return [];
+        },
+        required: true,
+    },
+    // 表格数据
+    data: {
+        type: Array,
+        required: true,
+    },
+    total: {
+        type: [Number],
+        default: 0,
+    },
+    pageNum: {
+        type: Number,
+        default: 1,
+    },
+    pageSize: {
+        type: [Number],
+        default: 10,
+    },
+    // 查询条件配置
+    query: {
+        type: Array<TableQuery>,
+        default: function () {
+            return [];
+        }
+    },
+    // 绑定的查询表单
+    queryForm: {
+        type: Object,
+        default: function () {
+            return {};
+        }
+    },
+})
+
+const state = reactive({
+    pageSizes: [] as any, // 可选每页显示的数据量
+    pageSize: 10,
+    pageNum: 1,
+    isOpenMoreQuery: false,
+    defaultQueryCount: 2, // 默认显示的查询参数个数，展开后每行显示查询条件个数为该值加1。第一行用最后一列来占用按钮
+    queryForm: {} as any,
+    loadingData: false,
+    // 输入框宽度
+    inputWidth: "200px" as any,
+    formatVal: '', // 格式化后的值
+    tableMaxHeight: window.innerHeight - 240 + 'px',
+})
+
+const {
+    pageSizes,
+    isOpenMoreQuery,
+    defaultQueryCount,
+    queryForm,
+    loadingData,
+    inputWidth,
+    formatVal,
+    tableMaxHeight,
+} = toRefs(state)
+
+watch(() => props.queryForm, (newValue: any) => {
+    state.queryForm = newValue;
+})
+
+watch(() => props.pageNum, (newValue: any) => {
+    state.pageNum = newValue;
+})
+
+watch(() => props.pageSize, (newValue: any) => {
+    state.pageSize = newValue;
+})
+
+watch(() => props.data, (newValue: any) => {
+    if (newValue && newValue.length > 0) {
+        props.columns.forEach(item => {
+            if (item.autoWidth && item.show) {
+                item.autoCalculateMinWidth(props.data);
+            }
+        })
+    }
+})
+
+onMounted(() => {
+    const pageSize = props.pageSize;
+
+    state.pageNum = props.pageNum;
+    state.pageSize = pageSize;
+    state.queryForm = props.queryForm;
+    state.pageSizes = [pageSize, pageSize * 2, pageSize * 3, pageSize * 4, pageSize * 5];
+
+    // 如果没传输入框宽度，则根据组件size设置默认宽度
+    if (!props.inputWidth) {
+        state.inputWidth = props.size == 'small' ? '150px' : '200px';
+    } else {
+        state.inputWidth = props.inputWidth;
+    }
+
+    window.addEventListener('resize', () => {
+        calcuTableHeight();
+    });
+})
+
+const calcuTableHeight = () => {
+    state.tableMaxHeight = window.innerHeight - 240 + 'px';
+}
+
+const formatText = (data: any)=> {
+    state.formatVal = '';
+    try {
+        state.formatVal = JSON.stringify(JSON.parse(data), null, 4);
+    }  catch (e) {
+        state.formatVal = data;
+    }
+}
+
+const getRowQueryItem = (row: number) => {
+    // 第一行需要加个查询等按钮列
+    if (row === 1) {
+        const res = props.query.slice(row - 1, defaultQueryCount.value);
+        // 查询等按钮列
+        res.push(TableQuery.slot("", "", "queryBtns"));
+        return res
+    }
+    const columnCount = defaultQueryCount.value + 1;
+    return props.query.slice((row - 1) * columnCount - 1, row * columnCount - 1);
+}
+
+const handleSelectionChange = (val: any) => {
+    emit('update:selectionData', val);
+}
+
+const handlePageChange = () => {
+    emit('update:pageNum', state.pageNum);
+    execQuery();
+}
+
+const handleSizeChange = () => {
+    changePageNum(1);
+    emit('update:pageSize', state.pageSize);
+    execQuery();
+}
+
+const queryData = () => {
+    changePageNum(1);
+    execQuery();
+}
+
+const reset = () => {
+    // 将查询参数绑定的值置空，并重新粗发查询接口
+    for (let qi of props.query) {
+        state.queryForm[qi.prop] = null;
+    }
+
+    changePageNum(1);
+    emit('update:queryForm', state.queryForm);
+    execQuery();
+}
+
+const changePageNum = (pageNum: number) => {
+    state.pageNum = pageNum;
+    emit('update:pageNum', state.pageNum);
+}
+
+const execQuery = () => {
+    emit('pageChange');
+}
+
+/**
+ * 是否正在加载数据
+ */
+const loading = (loading: boolean) => {
+    state.loadingData = loading;
+}
+
+defineExpose({ loading })
+</script>
+<style scoped lang="scss">
+.page-table {
+    .query {
+        margin-bottom: 10px;
+        overflow: hidden;
+
+        .is-open {
+            // padding: 10px 0;
+            max-height: 200px;
+            margin-top: 10px;
+        }
+
+        display: flex;
+        align-items: flex-start;
+        justify-content: space-between;
+
+        .slot {
+            display: flex;
+            justify-content: flex-end;
+        }
+    }
+
+    .page {
+        margin-top: 10px;
+    }
+}
+
+::v-deep(.el-form-item__label) {
+    font-weight: bold;
+}
+
+.el-select-v2 {
+    width: v-bind(inputWidth);
+}
+
+.el-input {
+    width: v-bind(inputWidth);
+}
+
+.el-select {
+    width: v-bind(inputWidth);
+}
+
+.el-date-editor {
+    width: 380px !important;
+}
+</style>

mayfly_go_web/src/components/pagetable/index.ts

@@ -0,0 +1,309 @@
+import EnumValue from '@/common/Enum';
+import { dateFormat } from '@/common/utils/date';
+import { getTextWidth } from '@/common/utils/string';
+
+export class TableColumn {
+    /**
+     * 属性字段
+     */
+    prop: string;
+
+    /**
+     * 显示表头
+     */
+    label: string;
+
+    /**
+     * 是否自动计算宽度
+     */
+    autoWidth: boolean = true;
+
+    /**
+     * 自动计算宽度时，累加该值（可能列值会进行转换 如添加图标等，宽度需要比计算出来的更宽些）
+     */
+    addWidth: number = 0;
+
+    /**
+     * 最小宽度
+     */
+    minWidth: number | string;
+
+    /**
+     * 是否插槽，是的话插槽名则为prop属性名
+     */
+    slot: boolean = false;
+
+    showOverflowTooltip: boolean = true;
+
+    sortable: boolean = false;
+
+    /**
+     * 官方：对应列的类型。 如果设置了selection则显示多选框；
+     * 如果设置了 index 则显示该行的索引（从 1 开始计算）；
+     *
+     * 新增 tag类型，用于枚举值转换后用tag进行展示
+     *
+     */
+    type: string;
+
+    /**
+     * 类型展示需要的额外参数，如枚举转换的EnumValue值等
+     */
+    typeParam: any;
+
+    width: number | string;
+
+    fixed: any;
+
+    align: string = 'left';
+
+    /**
+     * 指定格式化函数对原始值进行格式化，如时间格式化等
+     * param1: data, param2: prop
+     */
+    formatFunc: Function;
+
+    /**
+     * 是否显示该列
+     */
+    show: boolean = true;
+
+    /**
+     * 是否展示美化按钮（主要用于美化json文本等）
+     */
+    isBeautify: boolean = false;
+
+    constructor(prop: string, label: string) {
+        this.prop = prop;
+        this.label = label;
+    }
+
+    /**
+     * 获取该列在指定行数据中的值
+     * @param rowData 该行对应的数据
+     * @returns 该列对应的值
+     */
+    getValueByData(rowData: any) {
+        if (this.formatFunc) {
+            return this.formatFunc(rowData, this.prop);
+        }
+        return rowData[this.prop];
+    }
+
+    static new(prop: string, label: string): TableColumn {
+        return new TableColumn(prop, label);
+    }
+
+    noShowOverflowTooltip(): TableColumn {
+        this.showOverflowTooltip = false;
+        return this;
+    }
+
+    setMinWidth(minWidth: number | string): TableColumn {
+        this.minWidth = minWidth;
+        this.autoWidth = false;
+        return this;
+    }
+
+    setAddWidth(addWidth: number): TableColumn {
+        this.addWidth = addWidth;
+        return this;
+    }
+
+    /**
+     * 居中对齐
+     * @returns this
+     */
+    alignCenter(): TableColumn {
+        this.align = 'center';
+        return this;
+    }
+
+    /**
+     * 使用标签类型展示该列（用于枚举值友好展示）
+     * @param param 枚举对象
+     * @returns this
+     */
+    typeTag(param: any): TableColumn {
+        this.type = 'tag';
+        this.typeParam = param;
+        return this;
+    }
+
+    typeText(): TableColumn {
+        this.type = 'text';
+        return this;
+    }
+
+    typeJson(): TableColumn {
+        this.type = 'jsonText';
+        return this;
+    }
+
+    /**
+     * 标识该列为插槽
+     * @returns this
+     */
+    isSlot(): TableColumn {
+        this.slot = true;
+        return this;
+    }
+
+    /**
+     * 设置该列的格式化回调函数
+     * @param func 格式化回调函数(参数为 -> data: 该行对应的数据，prop: 该列对应的prop属性值)
+     * @returns
+     */
+    setFormatFunc(func: Function): TableColumn {
+        this.formatFunc = func;
+        return this;
+    }
+
+    /**
+     * 为时间字段，则使用默认时间格式函数
+     * @returns this
+     */
+    isTime(): TableColumn {
+        this.setFormatFunc((data: any, prop: string) => {
+            return dateFormat(data[prop]);
+        });
+        return this;
+    }
+
+    /**
+     * 标识该列枚举类，需进行枚举值转换
+     * @returns this
+     */
+    isEnum(enums: any): TableColumn {
+        this.setFormatFunc((data: any, prop: string) => {
+            return EnumValue.getLabelByValue(enums, data[prop]);
+        });
+        return this;
+    }
+
+    fixedRight(): TableColumn {
+        this.fixed = 'right';
+        return this;
+    }
+
+    fixedLeft(): TableColumn {
+        this.fixed = 'left';
+        return this;
+    }
+
+    canBeautify(): TableColumn {
+        this.isBeautify = true;
+        return this;
+    }
+
+    /**
+     * 自动计算最小宽度
+     * @param str 字符串
+     * @param tableData 表数据
+     * @param label 表头label也参与宽度计算
+     * @returns 列宽度
+     */
+    autoCalculateMinWidth = (tableData: any) => {
+        const prop = this.prop;
+        const label = this.label;
+
+        if (!tableData || !tableData.length || tableData.length === 0 || tableData === undefined) {
+            return 0;
+        }
+
+        let maxWidthText = '';
+        let maxWidthValue;
+        // 为了兼容formatFunc格式化回调函数
+        let maxData;
+        // 获取该列中最长的数据(内容)
+        for (let i = 0; i < tableData.length; i++) {
+            let nowData = tableData[i];
+            let nowValue = nowData[prop];
+            if (!nowValue) {
+                continue;
+            }
+            // 转为字符串比较长度
+            let nowText = nowValue + '';
+            if (nowText.length > maxWidthText.length) {
+                maxWidthText = nowText;
+                maxWidthValue = nowValue;
+                maxData = nowData;
+            }
+        }
+        if (this.formatFunc && maxWidthValue) {
+            maxWidthText = this.formatFunc(maxData, prop) + '';
+        }
+        // 需要加上表格的内间距等，视情况加
+        const contentWidth: number = getTextWidth(maxWidthText) + 30;
+        // 获取label的宽度，取较大的宽度
+        const columnWidth: number = getTextWidth(label) + 60;
+        const flexWidth: number = contentWidth > columnWidth ? contentWidth : columnWidth;
+        // 设置上限与累加需要额外增加的宽度
+        this.minWidth = (flexWidth > 400 ? 400 : flexWidth) + this.addWidth;
+    };
+}
+
+export class TableQuery {
+    /**
+     * 属性字段
+     */
+    prop: string;
+
+    /**
+     * 显示表头
+     */
+    label: string;
+
+    /**
+     * 查询类型，text、select、date
+     */
+    type: string;
+
+    /**
+     * select可选值
+     */
+    options: any;
+
+    /**
+     * 插槽名
+     */
+    slot: string;
+
+    constructor(prop: string, label: string) {
+        this.prop = prop;
+        this.label = label;
+    }
+
+    static new(prop: string, label: string): TableQuery {
+        return new TableQuery(prop, label);
+    }
+
+    static text(prop: string, label: string): TableQuery {
+        const tq = new TableQuery(prop, label);
+        tq.type = 'text';
+        return tq;
+    }
+
+    static select(prop: string, label: string): TableQuery {
+        const tq = new TableQuery(prop, label);
+        tq.type = 'select';
+        return tq;
+    }
+
+    static date(prop: string, label: string): TableQuery {
+        const tq = new TableQuery(prop, label);
+        tq.type = 'date';
+        return tq;
+    }
+
+    static slot(prop: string, label: string, slotName: string): TableQuery {
+        const tq = new TableQuery(prop, label);
+        tq.slot = slotName;
+        return tq;
+    }
+
+    setOptions(options: any): TableQuery {
+        this.options = options;
+        return this;
+    }
+}

mayfly_go_web/src/components/svgIcon/index.vue

@@ -1,24 +1,105 @@
-<script lang="ts">
+<template>
-// 渲染函数：https://v3.cn.vuejs.org/guide/render-function.html
+    <i v-if="isShowIconSvg" class="el-icon icon-middle" :style="setIconSvgStyle">
-import { h, resolveComponent, defineComponent } from 'vue';
+        <component :is="getIconName" :style="setIconSvgStyle" />
-export default defineComponent({
+    </i>
-	name: 'svgIcon',
+
-	props: {
+    <svg v-else-if="isIconfont()" class="el-icon iconfont-icon icon-middle" aria-hidden="true" :style="setIconSvgStyle">
-		// svg 图标组件名字
+        <use :xlink:href="'#' + getIconfontName()"></use>
-		name: {
+    </svg>
-			type: String,
+
-		},
+    <div v-else-if="isShowIconImg" :style="setIconImgOutStyle">
-		// svg 大小
+        <img :src="getIconName" :style="setIconSvgInsStyle" />
-		size: {
+    </div>
-			type: Number,
+
-		},
+    <i v-else :class="getIconName" :style="setIconSvgStyle" />
-		// svg 颜色
+</template>
-		color: {
+
-			type: String,
+<script setup lang="ts" name="svgIcon">
-		},
+import { computed } from 'vue';
-	},
+
-	setup(props: any) {
+// 定义父组件传过来的值
-        return () => h('i', { class: 'el-icon', style: `--font-size: ${props.size};--color: ${props.color}` }, [h(resolveComponent(`${props.name}`))]);
+const props = defineProps({
-	},
+    // svg 图标组件名字
+    name: {
+        type: String,
+    },
+    // svg 大小
+    size: {
+        type: Number,
+        default: () => 14,
+    },
+    // svg 颜色
+    color: {
+        type: String,
+    },
+    isEle: {
+        type: Boolean,
+        default: true,
+    },
+});
+
+// 在线链接、本地引入地址前缀
+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/components/terminal/TerminalBody.vue

@@ -0,0 +1,286 @@
+<template>
+    <div id="terminal-body" :style="{ height, background: themeConfig.terminalBackground }">
+        <div ref="terminalRef" class="terminal" />
+
+        <TerminalSearch ref="terminalSearchRef" :search-addon="state.addon.search" @close="focus" />
+    </div>
+</template>
+
+<script lang="ts" setup>
+import 'xterm/css/xterm.css';
+import { Terminal } from 'xterm';
+import { FitAddon } from 'xterm-addon-fit';
+import { SearchAddon } from 'xterm-addon-search';
+import { WebLinksAddon } from 'xterm-addon-web-links';
+
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '@/store/themeConfig';
+import { ref, nextTick, reactive, onMounted, onBeforeUnmount, watch } from 'vue';
+import TerminalSearch from './TerminalSearch.vue';
+import { debounce } from 'lodash';
+import { TerminalStatus } from './common';
+
+const props = defineProps({
+    /**
+     * 初始化执行命令
+     */
+    cmd: { type: String },
+    /**
+     * 连接url
+     */
+    socketUrl: {
+        type: String,
+    },
+    /**
+     * 高度
+     */
+    height: {
+        type: [String, Number],
+        default: '100%',
+    },
+});
+
+const emit = defineEmits(['statusChange']);
+
+const terminalRef: any = ref(null);
+const terminalSearchRef: any = ref(null);
+
+const { themeConfig } = storeToRefs(useThemeConfig());
+
+// 终端实例
+let term: Terminal;
+let socket: WebSocket;
+let pingInterval: any;
+
+const state = reactive({
+    // 插件
+    addon: {
+        fit: null as any,
+        search: null as any,
+        weblinks: null as any,
+    },
+    status: TerminalStatus.NoConnected,
+});
+
+onMounted(() => {
+    nextTick(() => {
+        init();
+    });
+});
+
+watch(
+    () => state.status,
+    () => {
+        emit('statusChange', state.status);
+    }
+);
+
+onBeforeUnmount(() => {
+    close();
+});
+
+function init() {
+    if (term) {
+        console.log('重新连接...');
+        close();
+    }
+    term = new Terminal({
+        fontSize: themeConfig.value.terminalFontSize || 15,
+        fontWeight: themeConfig.value.terminalFontWeight || 'normal',
+        fontFamily: 'JetBrainsMono, monaco, Consolas, Lucida Console, monospace',
+        cursorBlink: true,
+        disableStdin: false,
+        allowProposedApi: true,
+        theme: {
+            foreground: themeConfig.value.terminalForeground || '#7e9192', //字体
+            background: themeConfig.value.terminalBackground || '#002833', //背景色
+            cursor: themeConfig.value.terminalCursor || '#268F81', //设置光标
+            // cursorAccent: "red",  // 光标停止颜色
+        } as any,
+    });
+    term.open(terminalRef.value);
+
+    // 注册自适应组件
+    const fitAddon = new FitAddon();
+    state.addon.fit = fitAddon;
+    term.loadAddon(fitAddon);
+    fitTerminal();
+
+    // 注册搜索组件
+    const searchAddon = new SearchAddon();
+    state.addon.search = searchAddon;
+    term.loadAddon(searchAddon);
+
+    // 注册 url link组件
+    const weblinks = new WebLinksAddon();
+    state.addon.weblinks = weblinks;
+    term.loadAddon(weblinks);
+
+    // 初始化websocket
+    initSocket();
+}
+
+/**
+ * 连接成功
+ */
+const onConnected = () => {
+    // 注册心跳
+    pingInterval = setInterval(sendPing, 15000);
+
+    // 注册 terminal 事件
+    term.onResize((event) => sendResize(event.cols, event.rows));
+    term.onData((event) => sendCmd(event));
+
+    // 注册自定义快捷键
+    term.attachCustomKeyEventHandler((event: KeyboardEvent) => {
+        // 注册搜索键 ctrl + f
+        if (event.key === 'f' && (event.ctrlKey || event.metaKey) && event.type === 'keydown') {
+            event.preventDefault();
+            terminalSearchRef.value.open();
+        }
+
+        return true;
+    });
+
+    state.status = TerminalStatus.Connected;
+
+    // resize
+    sendResize(term.cols, term.rows);
+    // 注册窗口大小监听器
+    window.addEventListener('resize', debounce(fitTerminal, 400));
+
+    focus();
+
+    // 如果有初始要执行的命令，则发送执行命令
+    if (props.cmd) {
+        sendCmd(props.cmd + ' \r');
+    }
+};
+
+// 自适应终端
+const fitTerminal = () => {
+    const dimensions = state.addon.fit && state.addon.fit.proposeDimensions();
+    if (!dimensions) {
+        return;
+    }
+    if (dimensions?.cols && dimensions?.rows) {
+        term.resize(dimensions.cols, dimensions.rows);
+    }
+};
+
+const focus = () => {
+    setTimeout(() => term.focus(), 400);
+};
+
+const clear = () => {
+    term.clear();
+    term.clearSelection();
+    term.focus();
+};
+
+function initSocket() {
+    if (props.socketUrl) {
+        socket = new WebSocket(props.socketUrl);
+    }
+
+    // 监听socket连接
+    socket.onopen = () => {
+        onConnected();
+    };
+
+    // 监听socket错误信息
+    socket.onerror = (e: Event) => {
+        term.writeln('\r\n\x1b[31m提示: 连接错误...');
+        state.status = TerminalStatus.Error;
+        console.log('连接错误', e);
+    };
+
+    socket.onclose = (e: CloseEvent) => {
+        console.log('terminal socket close...', e.reason);
+        // 关闭窗口大小监听器
+        window.removeEventListener('resize', debounce(fitTerminal, 100));
+        // 清除 ping
+        pingInterval && clearInterval(pingInterval);
+        state.status = TerminalStatus.Disconnected;
+    };
+
+    // 监听socket消息
+    socket.onmessage = getMessage;
+}
+
+function getMessage(msg: any) {
+    // msg.data是真正后端返回的数据
+    term.write(msg.data);
+}
+
+enum MsgType {
+    Resize = 1,
+    Data = 2,
+    Ping = 3,
+}
+
+const send = (msg: any) => {
+    state.status == TerminalStatus.Connected && socket.send(JSON.stringify(msg));
+};
+
+const sendResize = (cols: number, rows: number) => {
+    send({
+        type: MsgType.Resize,
+        Cols: cols,
+        Rows: rows,
+    });
+};
+
+const sendPing = () => {
+    send({
+        type: MsgType.Ping,
+        msg: 'ping',
+    });
+};
+
+function sendCmd(key: any) {
+    send({
+        type: MsgType.Data,
+        msg: key,
+    });
+}
+
+function closeSocket() {
+    // 关闭 websocket
+    socket && socket.readyState === 1 && socket.close();
+    // 清除 ping
+    pingInterval && clearInterval(pingInterval);
+}
+
+function close() {
+    console.log('in terminal body close');
+    closeSocket();
+    if (term) {
+        state.addon.search.dispose();
+        state.addon.fit.dispose();
+        state.addon.weblinks.dispose();
+        term.dispose();
+    }
+}
+
+const getStatus = (): TerminalStatus => {
+    return state.status;
+};
+
+defineExpose({ init, fitTerminal, focus, clear, close, getStatus });
+</script>
+<style lang="scss">
+#terminal-body {
+    background: #212529;
+    width: 100%;
+
+    .terminal {
+        width: 100%;
+        height: 100%;
+
+        .xterm .xterm-viewport {
+            overflow-y: hidden;
+        }
+    }
+}
+</style>

mayfly_go_web/src/components/terminal/TerminalDialog.vue

@@ -0,0 +1,309 @@
+<template>
+    <div>
+        <div class="terminal-dialog-container" v-for="openTerminal of terminals" :key="openTerminal.terminalId">
+            <el-dialog
+                title="终端"
+                v-model="openTerminal.visible"
+                top="32px"
+                class="terminal-dialog"
+                width="75%"
+                :close-on-click-modal="false"
+                :modal="true"
+                :show-close="false"
+                :fullscreen="openTerminal.fullscreen"
+            >
+                <template #header>
+                    <div class="terminal-title-wrapper">
+                        <!-- 左侧 -->
+                        <div class="title-left-fixed">
+                            <!-- title信息 -->
+                            <div>
+                                <slot name="headerTitle" :terminalInfo="openTerminal">
+                                    {{ openTerminal.headerTitle }}
+                                </slot>
+                            </div>
+                        </div>
+
+                        <!-- 右侧 -->
+                        <div class="title-right-fixed">
+                            <el-popconfirm @confirm="reConnect(openTerminal.terminalId)" title="确认重新连接?">
+                                <template #reference>
+                                    <div class="mr15 pointer">
+                                        <el-tag v-if="openTerminal.status == TerminalStatus.Connected" type="success" effect="light" round> 已连接 </el-tag>
+                                        <el-tag v-else type="danger" effect="light" round> 未连接 </el-tag>
+                                    </div>
+                                </template>
+                            </el-popconfirm>
+
+                            <el-popover placement="bottom" :width="200" trigger="hover">
+                                <template #reference>
+                                    <SvgIcon name="QuestionFilled" :size="20" class="pointer-icon mr10" />
+                                </template>
+                                <div>ctrl | command + f (搜索)</div>
+                                <div class="mt5">点击连接状态可重连</div>
+                            </el-popover>
+
+                            <SvgIcon
+                                name="ArrowDown"
+                                v-if="props.visibleMinimize"
+                                @click="minimize(openTerminal.terminalId)"
+                                :size="20"
+                                class="pointer-icon mr10"
+                                title="最小化"
+                            />
+
+                            <!-- <SvgIcon name="FullScreen" @click="handlerFullScreen(openTerminal)" :size="20" class="pointer-icon mr10" title="全屏|退出全屏" /> -->
+
+                            <SvgIcon name="Close" class="pointer-icon" @click="close(openTerminal.terminalId)" title="关闭" :size="20" />
+                        </div>
+                    </div>
+                </template>
+                <div class="terminal-wrapper" style="height: calc(100vh - 215px)">
+                    <TerminalBody
+                        @status-change="terminalStatusChange(openTerminal.terminalId, $event)"
+                        :ref="(el) => setTerminalRef(el, openTerminal.terminalId)"
+                        :cmd="openTerminal.cmd"
+                        :socket-url="openTerminal.socketUrl"
+                    />
+                </div>
+            </el-dialog>
+        </div>
+
+        <!-- 终端最小化 -->
+        <div class="terminal-minimize-container">
+            <el-card
+                v-for="minimizeTerminal of minimizeTerminals"
+                :key="minimizeTerminal.terminalId"
+                :class="`terminal-minimize-item pointer ${minimizeTerminal.styleClass}`"
+                size="small"
+                @click="maximize(minimizeTerminal.terminalId)"
+            >
+                <el-tooltip effect="customized" :content="minimizeTerminal.desc" placement="top">
+                    <span>
+                        {{ minimizeTerminal.title }}
+                    </span>
+                </el-tooltip>
+
+                <!-- 关闭按钮 -->
+                <SvgIcon name="CloseBold" @click.stop="closeMinimizeTerminal(minimizeTerminal.terminalId)" class="ml10 pointer-icon fr" :size="20" />
+            </el-card>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { toRefs, reactive } from 'vue';
+import TerminalBody from '@/components/terminal/TerminalBody.vue';
+import SvgIcon from '@/components/svgIcon/index.vue';
+import { TerminalStatus } from './common';
+
+const props = defineProps({
+    visibleMinimize: {
+        type: Boolean,
+        default: false,
+    },
+});
+
+const emit = defineEmits(['close', 'minimize']);
+
+const openTerminalRefs: any = {};
+
+/**
+terminal对象信息:
+
+visible: false,
+machineId: null as any,
+terminalId: null as any,
+machine: {} as any,
+fullscreen: false,
+ */
+
+const state = reactive({
+    terminals: {} as any, // key -> terminalId  value -> terminal
+    minimizeTerminals: {} as any, // key -> terminalId  value -> 简易terminal
+});
+
+const { terminals, minimizeTerminals } = toRefs(state);
+
+const setTerminalRef = (el: any, terminalId: any) => {
+    if (terminalId) {
+        openTerminalRefs[terminalId] = el;
+    }
+};
+
+function open(terminalInfo: any, cmd: string = '') {
+    let terminalId = terminalInfo.terminalId;
+    if (!terminalId) {
+        terminalId = Date.now();
+    }
+    state.terminals[terminalId] = {
+        ...terminalInfo,
+        terminalId,
+        visible: true,
+        cmd,
+        status: TerminalStatus.NoConnected,
+    };
+}
+
+const terminalStatusChange = (terminalId: string, status: TerminalStatus) => {
+    const terminal = state.terminals[terminalId];
+    if (terminal) {
+        terminal.status = status;
+    }
+
+    const minTerminal = state.minimizeTerminals[terminalId];
+    if (!minTerminal) {
+        return;
+    }
+    minTerminal.styleClass = getTerminalStatysStyleClass(terminalId, status);
+};
+
+const getTerminalStatysStyleClass = (terminalId: any, status: any = null) => {
+    if (status == null) {
+        status = openTerminalRefs[terminalId].getStatus();
+    }
+    if (status == TerminalStatus.Connected) {
+        return 'terminal-status-success';
+    }
+
+    if (status == TerminalStatus.NoConnected) {
+        return 'terminal-status-no-connect';
+    }
+
+    return 'terminal-status-error';
+};
+
+const reConnect = (terminalId: any) => {
+    openTerminalRefs[terminalId].init();
+};
+
+function close(terminalId: any) {
+    console.log('in terminal dialog close');
+    delete state.terminals[terminalId];
+
+    // 关闭终端，并删除终端ref
+    const terminalRef = openTerminalRefs[terminalId];
+    terminalRef && terminalRef.close();
+    delete openTerminalRefs[terminalId];
+
+    emit('close', terminalId);
+}
+
+function minimize(terminalId: number) {
+    console.log('in terminal dialog minimize: ', terminalId);
+
+    const terminal = state.terminals[terminalId];
+    if (!terminal) {
+        console.warn('不存在该终端信息: ', terminalId);
+        return;
+    }
+    terminal.visible = false;
+
+    const minTerminalInfo = {
+        terminalId: terminal.terminalId,
+        title: terminal.minTitle, // 截取terminalId最后两位区分多个terminal
+        desc: terminal.minDesc,
+        styleClass: getTerminalStatysStyleClass(terminalId),
+    };
+    state.minimizeTerminals[terminalId] = minTerminalInfo;
+
+    emit('minimize', minTerminalInfo);
+}
+
+function maximize(terminalId: any) {
+    console.log('in terminal dialog maximize: ', terminalId);
+    const minTerminal = state.minimizeTerminals[terminalId];
+    if (!minTerminal) {
+        console.log('no min terminal...');
+        return;
+    }
+    delete state.minimizeTerminals[terminalId];
+
+    // 显示终端信息
+    state.terminals[terminalId].visible = true;
+
+    const terminalRef = openTerminalRefs[terminalId];
+    // fit
+    setTimeout(() => {
+        terminalRef.fitTerminal();
+        terminalRef.focus();
+    }, 250);
+}
+
+const closeMinimizeTerminal = (terminalId: any) => {
+    delete state.minimizeTerminals[terminalId];
+    close(terminalId);
+};
+
+defineExpose({
+    open,
+    close,
+    minimize,
+    maximize,
+});
+</script>
+
+<style lang="scss">
+.terminal-dialog-container {
+    .el-dialog__header {
+        padding: 10px;
+    }
+
+    // .terminal-dialog {
+    //     height: calc(100vh - 200px) !important;
+    // }
+
+    .el-overlay .el-overlay-dialog .el-dialog .el-dialog__body {
+        padding: 0px !important;
+    }
+
+    .terminal-title-wrapper {
+        display: flex;
+        justify-content: space-between;
+        font-size: 16px;
+
+        .title-right-fixed {
+            display: flex;
+            align-items: center;
+            font-size: 20px;
+            text-align: end;
+        }
+    }
+}
+
+.terminal-minimize-container {
+    position: absolute;
+    right: 16px;
+    bottom: 16px;
+    z-index: 10;
+    display: flex;
+    flex-wrap: wrap-reverse;
+    justify-content: flex-end;
+
+    .terminal-minimize-item {
+        min-width: 120px;
+        // box-shadow: 0 3px 4px #dee2e6;
+        border-radius: 4px;
+        margin: 1px 1px;
+    }
+
+    .terminal-status-error {
+        box-shadow: 0 3px 4px var(--el-color-danger);
+        border-color: var(--el-color-danger);
+    }
+
+    .terminal-status-no-connect {
+        box-shadow: 0 3px 4px var(--el-color-warning);
+        border-color: var(--el-color-warning);
+    }
+
+    .terminal-status-success {
+        box-shadow: 0 3px 4px var(--el-color-success);
+        border-color: var(--el-color-success);
+    }
+
+    .el-card__body {
+        padding: 15px !important;
+    }
+}
+</style>

mayfly_go_web/src/components/terminal/TerminalSearch.vue

@@ -0,0 +1,149 @@
+<template>
+    <div id="search-card" v-show="search.visible" @keydown.esc="closeSearch">
+        <el-card title="搜索" size="small">
+            <!-- 搜索框 -->
+            <el-input
+                class="search-input"
+                ref="searchInputRef"
+                placeholder="请输入查找内容,回车搜索"
+                v-model="search.value"
+                @keyup.enter.native="searchKeywords(true)"
+                clearable
+            >
+            </el-input>
+            <!-- 选项 -->
+            <div class="search-options">
+                <el-row>
+                    <el-col :span="12">
+                        <el-checkbox class="usn" v-model="search.regex"> 正则匹配 </el-checkbox>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-checkbox class="usn" v-model="search.words"> 单词全匹配 </el-checkbox>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-checkbox class="usn" v-model="search.matchCase"> 区分大小写 </el-checkbox>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-checkbox class="usn" v-model="search.incremental"> 增量查找 </el-checkbox>
+                    </el-col>
+                </el-row>
+            </div>
+            <!-- 按钮 -->
+            <div class="search-buttons">
+                <el-button class="terminal-search-button search-button-prev" type="primary" size="small" @click="searchKeywords(false)"> 上一个 </el-button>
+                <el-button class="terminal-search-button search-button-next" type="primary" size="small" @click="searchKeywords(true)"> 下一个 </el-button>
+                <el-button class="terminal-search-button search-button-next" type="primary" size="small" @click="closeSearch"> 关闭 </el-button>
+            </div>
+        </el-card>
+    </div>
+</template>
+<script lang="ts" setup>
+import { ref, toRefs, nextTick, reactive } from 'vue';
+import { ElMessage } from 'element-plus';
+import { SearchAddon, ISearchOptions } from 'xterm-addon-search';
+
+const props = defineProps({
+    searchAddon: {
+        type: [SearchAddon],
+        require: true,
+    },
+});
+
+const state = reactive({
+    search: {
+        visible: false,
+        value: '',
+        regex: false,
+        words: false,
+        matchCase: false,
+        incremental: false,
+    },
+});
+
+const { search } = toRefs(state);
+
+const emit = defineEmits(['close']);
+
+const searchInputRef: any = ref(null);
+
+function open() {
+    const visible = state.search.visible;
+    state.search.visible = !visible;
+    console.log(state.search.visible);
+    if (!visible) {
+        nextTick(() => {
+            searchInputRef.value.focus();
+        });
+    }
+}
+
+function closeSearch() {
+    state.search.visible = false;
+    state.search.value = '';
+    props.searchAddon?.clearDecorations();
+    emit('close');
+}
+
+function searchKeywords(direction: any) {
+    if (!state.search.value) {
+        return;
+    }
+    const option = {
+        regex: state.search.regex,
+        wholeWord: state.search.words,
+        caseSensitive: state.search.matchCase,
+        incremental: state.search.incremental,
+    };
+    let res;
+    if (direction) {
+        res = props.searchAddon?.findNext(state.search.value, getSearchOptions(option));
+    } else {
+        res = props.searchAddon?.findPrevious(state.search.value, getSearchOptions(option));
+    }
+    if (!res) {
+        ElMessage.info('未查询到匹配项');
+    }
+}
+
+const getSearchOptions = (searchOptions?: ISearchOptions): ISearchOptions => {
+    return {
+        ...searchOptions,
+        decorations: {
+            matchOverviewRuler: '#888888',
+            activeMatchColorOverviewRuler: '#ffff00',
+            matchBackground: '#888888',
+            activeMatchBackground: '#ffff00',
+        },
+    };
+};
+
+defineExpose({ open });
+</script>
+
+<style lang="scss" scoped>
+#search-card {
+    position: absolute;
+    top: 60px;
+    right: 20px;
+    z-index: 1200;
+    width: 270px;
+
+    .search-input {
+        width: 240px;
+    }
+
+    .search-options {
+        margin: 12px 0;
+    }
+
+    .search-buttons {
+        margin-top: 5px;
+        display: flex;
+        justify-content: flex-end;
+    }
+
+    .terminal-search-button {
+        margin-left: 10px;
+    }
+}
+</style>

mayfly_go_web/src/components/terminal/common.ts

@@ -0,0 +1,6 @@
+export enum TerminalStatus {
+    Error = -1,
+    NoConnected = 0,
+    Connected = 1,
+    Disconnected = 2,
+}

mayfly_go_web/src/directive/auth.ts

@@ -1,20 +1,29 @@
 import type { App } from 'vue';
-import { auth, auths, authAll } from './authFunction'
+import { useUserInfo } from '@/store/userInfo';
+import { judementSameArr } from '@/common/utils/arrayOperation';
+import { hasPerm } from '@/components/auth/auth';
 
 // 用户权限指令
 export function authDirective(app: App) {
     // 单个权限验证（v-auth="xxx"）
     app.directive('auth', {
         mounted(el, binding) {
-            if (!auth(binding.value)) {
+            if (!hasPerm(binding.value)) {
                 parseNoAuth(el, binding);
-            };
+            }
         },
     });
     // 多个权限验证，满足一个则显示（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,9 +31,9 @@ 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);
-            };
+            }
         },
     });
 }
@@ -46,8 +55,8 @@ const parseNoAuth = (el: any, binding: any) => {
         // 移除该元素
         el.parentNode.removeChild(el);
     }
-}
+};
 
 const disableClickFn = (event: any) => {
     event && event.stopImmediatePropagation();
-}
+};

mayfly_go_web/src/directive/index.ts

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

mayfly_go_web/src/directive/waves.ts

@@ -44,7 +44,7 @@ export function wavesDirective(app: App) {
             el.addEventListener('mousedown', onCurrentClick, false);
         },
         unmounted(el) {
-            el.addEventListener('mousedown', () => { });
+            el.addEventListener('mousedown', () => {});
         },
     });
 }

mayfly_go_web/src/main.ts

@@ -1,64 +1,37 @@
 import { createApp } from 'vue';
-import App from './App.vue';
+import App from '@/App.vue';
+
 import router from './router';
-import { store, key } from './store';
+import pinia from '@/store/index';
-import { directive } from '@/common/utils/directive.ts';
+import { directive } from '@/directive/index';
-import { globalComponentSize } from '@/common/utils/componentSize.ts';
+import { globalComponentSize } from '@/common/utils/componentSize';
-import { dateStrFormat } from '@/common/utils/date.ts'
+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 'element-plus/theme-chalk/dark/css-vars.css';
-import '@/theme/index.scss';
+import zhCn from 'element-plus/es/locale/lang/zh-cn';
-import mitt from 'mitt';
 import { ElMessage } from 'element-plus';
 
-import * as svg from '@element-plus/icons-vue';
+import '@/theme/index.scss';
-import SvgIcon from '@/components/svgIcon/index.vue';
+import '@/assets/font/font.css';
-import '@/assets/font/font.css'
+import '@/assets/iconfont/iconfont.js';
 
 const app = createApp(App);
 
-/**
+registElSvgIcon(app);
- * 导出全局注册 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);
 directive(app);
 
-app.use(router)
+app.use(pinia).use(router).use(ElementPlus, { size: globalComponentSize, locale: zhCn }).mount('#app');
-    .use(store, key)
-    .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) {
     // 如果是断言错误，则进行提示即可
     if (err.name == 'AssertError') {
-        ElMessage.error(err.message)
+        ElMessage.error(err.message);
     } else {
-        console.error(err, 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';
-import { getSession, clearSession } from '@/common/utils/storage.ts';
+import { templateResolve } from '@/common/utils/string';
-import { templateResolve } from '@/common/utils/string.ts'
+import { NextLoading } from '@/common/utils/loading';
-import { NextLoading } from '@/common/utils/loading.ts';
+import { dynamicRoutes, staticRoutes, pathMatch } from './route';
-import { dynamicRoutes, staticRoutes, pathMatch } from './route.ts'
-import { imports } from './imports';
 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}', '!../views/layout/**/*.{vue,tsx}']);
+const dynamicViewsModules: Record<string, Function> = Object.assign({}, { ...viewsModules });
 
 // 添加静态路由
 const router = createRouter({
@@ -22,90 +33,116 @@ export function initAllFun() {
     const token = getSession('token'); // 获取浏览器缓存 token 值
     if (!token) {
         // 无 token 停止执行下一步
-        return false
+        return false;
     }
-    store.dispatch('userInfos/setUserInfos'); // 触发初始化用户信息
+    useUserInfo().setUserInfo({});
     router.addRoute(pathMatch); // 添加404界面
     resetRoute(); // 删除/重置路由
     // 添加动态路由
     setFilterRouteEnd().forEach((route: any) => {
-        router.addRoute((route as unknown) as RouteRecordRaw);
+        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
+        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);
     resetRoute(); // 删除/重置路由
     // 添加动态路由
     formatTwoStageRoutes(formatFlatteningRoutes(dynamicRoutes)).forEach((route: any) => {
-        router.addRoute((route as unknown) as RouteRecordRaw);
+        router.addRoute(route as unknown as RouteRecordRaw);
     });
-    store.dispatch('routesList/setRoutesList', dynamicRoutes[0].children);
+    useRoutesList().setRoutesList(dynamicRoutes[0].children);
 }
 
 // 后端控制路由，isRequestRoutes 为 true，则开启后端控制路由
-export function getBackEndControlRoutes() {
+export async function getBackEndControlRoutes() {
-    return openApi.getMenuRoute({});
+    try {
+        const menuAndPermission = await openApi.getPermissions();
+        // 赋值权限码，用于控制按钮等
+        useUserInfo().userInfo.permissions = menuAndPermission.permissions;
+        return menuAndPermission.menus;
+    } catch (e: any) {
+        console.error(e);
+        return [];
+    }
 }
 
 // 后端控制路由，后端返回路由 转换为vue route
-export function backEndRouterConverter(routes: any, parentPath: string = "/") {
+export function backEndRouterConverter(routes: any, parentPath: string = '/') {
     if (!routes) return;
     return routes.map((item: any) => {
         if (!item.meta) {
-            return item
+            return item;
         }
         // 将json字符串的meta转为对象
-        item.meta = JSON.parse(item.meta)
+        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']
+            delete item.meta['component'];
         }
         // route.path == resource.code
-        let path = item.code
+        let path = item.code;
         // 如果不是以 / 开头，则路径需要拼接父路径
-        if (!path.startsWith("/")) {
+        if (!path.startsWith('/')) {
-            path = parentPath + "/" + path;
+            path = parentPath + '/' + path;
         }
-        item.path = path
+        item.path = path;
-        delete item['code']
+        delete item['code'];
 
         // route.meta.title == resource.name
-        item.meta.title = item.name
+        item.meta.title = item.name;
-        delete item['name']
+        delete item['name'];
 
         // route.name == resource.meta.routeName
-        item.name = item.meta.routeName
+        item.name = item.meta.routeName;
-        delete item.meta['routeName']
+        delete item.meta['routeName'];
 
         // route.redirect == resource.meta.redirect
         if (item.meta.redirect) {
-            item.redirect = item.meta.redirect
+            item.redirect = item.meta.redirect;
-            delete item.meta['redirect']
+            delete item.meta['redirect'];
         }
         item.children && backEndRouterConverter(item.children, item.path);
         return item;
     });
 }
 
+/**
+ * 后端路由 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,16 +171,16 @@ export function formatTwoStageRoutes(arr: any) {
             }
         }
     });
-    store.dispatch('keepAliveNames/setCacheKeepAlive', cacheList);
+    useKeepALiveNames().setCacheKeepAlive(cacheList);
     return newArr;
 }
 
 // 判断路由code 是否包含当前登录用户menus字段中，menus为字符串code数组
 export function hasAnth(menus: any, route: any) {
     if (route.meta && route.meta.code) {
-        return menus.includes(route.meta.code)
+        return menus.includes(route.meta.code);
     }
-    return true
+    return true;
 }
 
 // 递归过滤有权限的路由
@@ -153,7 +190,7 @@ export function setFilterMenuFun(routes: any, menus: any) {
         const item = { ...route };
         if (hasAnth(menus, item)) {
             if (item.children) {
-                item.children = setFilterMenuFun(item.children, menus)
+                item.children = setFilterMenuFun(item.children, menus);
             }
             menu.push(item);
         }
@@ -167,13 +204,13 @@ 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 })
+                    filterRoute.push({ ...route });
                 }
-            })
+            });
         } else {
-            filterRoute.push({ ...route })
+            filterRoute.push({ ...route });
         }
     });
     return filterRoute;
@@ -188,37 +225,39 @@ 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);
     });
 }
 
-// 初始化方法执行
+export async function initRouter() {
-const { isRequestRoutes } = store.state.themeConfig.themeConfig;
+    // 初始化方法执行
-if (!isRequestRoutes) {
+    const { isRequestRoutes } = useThemeConfig(pinia).themeConfig;
-    // 未开启后端控制路由
+    if (!isRequestRoutes) {
-    initAllFun();
+        // 未开启后端控制路由
-} else if (isRequestRoutes) {
+        initAllFun();
-    // 后端控制路由，isRequestRoutes 为 true，则开启后端控制路由
+    } else if (isRequestRoutes) {
-    initBackEndControlRoutesFun();
+        // 后端控制路由，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');
-    if (to.path === '/login' && !token) {
+    if ((to.path === '/login' || to.path == '/oauth2/callback') && !token) {
         next();
         NProgress.done();
         return;
@@ -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 Layout from '@/views/layout/index.vue';
-// import RouterParent from '@/views/layout/routerView/parent.vue';
 
 // 定义动态路由
 export const dynamicRoutes = [
@@ -12,108 +11,109 @@ export const dynamicRoutes = [
         meta: {
             isKeepAlive: true,
         },
-    //     children: [
+        children: [],
-    //         {
+        //     children: [
-    //             path: '/home',
+        //         {
-    //             name: 'home',
+        //             path: '/home',
-    //             component: () => import('@/views/home/index.vue'),
+        //             name: 'home',
-    //             meta: {
+        //             component: () => import('@/views/home/index.vue'),
-    //                 title: '首页',
+        //             meta: {
-    //                 // iframe链接
+        //                 title: '首页',
-    //                 link: '',
+        //                 // iframe链接
-    //                 // 是否在菜单栏显示，默认显示
+        //                 link: '',
-    //                 isHide: false,
+        //                 // 是否在菜单栏显示，默认显示
-    //                 isKeepAlive: true,
+        //                 isHide: false,
-    //                 // tag标签是否不可删除
+        //                 isKeepAlive: true,
-    //                 isAffix: true,
+        //                 // tag标签是否不可删除
-    //                 // 是否为iframe
+        //                 isAffix: true,
-    //                 isIframe: false,
+        //                 // 是否为iframe
-    //                 icon: 'el-icon-s-home',
+        //                 isIframe: false,
-    //             },
+        //                 icon: 'el-icon-s-home',
-    //         },
+        //             },
-    //         {
+        //         },
-    //             path: '/sys',
+        //         {
-    //             name: 'Resource',
+        //             path: '/sys',
-    //             redirect: '/sys/resources',
+        //             name: 'Resource',
-    //             meta: {
+        //             redirect: '/sys/resources',
-    //                 title: '系统管理',
+        //             meta: {
-    //                 // 资源code，用于校验用户是否拥有该资源权限
+        //                 title: '系统管理',
-    //                 code: 'sys',
+        //                 // 资源code，用于校验用户是否拥有该资源权限
-    //                 // isKeepAlive: true,
+        //                 code: 'sys',
-    //                 icon: 'el-icon-monitor',
+        //                 // isKeepAlive: true,
-    //             },
+        //                 icon: 'el-icon-monitor',
-    //             children: [
+        //             },
-    //                 {
+        //             children: [
-    //                     path: 'sys/resources',
+        //                 {
-    //                     name: 'ResourceList',
+        //                     path: 'sys/resources',
-    //                     component: () => import('@/views/system/resource'),
+        //                     name: 'ResourceList',
-    //                     meta: {
+        //                     component: () => import('@/views/system/resource'),
-    //                         title: '资源管理',
+        //                     meta: {
-    //                         code: 'resource:list',
+        //                         title: '资源管理',
-    //                         isKeepAlive: true,
+        //                         code: 'resource:list',
-    //                         icon: 'el-icon-menu',
+        //                         isKeepAlive: true,
-    //                     },
+        //                         icon: 'el-icon-menu',
-    //                 },
+        //                     },
-    //                 {
+        //                 },
-    //                     path: 'sys/roles',
+        //                 {
-    //                     name: 'RoleList',
+        //                     path: 'sys/roles',
-    //                     component: () => import('@/views/system/role'),
+        //                     name: 'RoleList',
-    //                     meta: {
+        //                     component: () => import('@/views/system/role'),
-    //                         title: '角色管理',
+        //                     meta: {
-    //                         code: 'role:list',
+        //                         title: '角色管理',
-    //                         isKeepAlive: true,
+        //                         code: 'role:list',
-    //                         icon: 'el-icon-menu',
+        //                         isKeepAlive: true,
-    //                     },
+        //                         icon: 'el-icon-menu',
-    //                 },
+        //                     },
-    //                 {
+        //                 },
-    //                     path: 'sys/accounts',
+        //                 {
-    //                     name: 'ResourceList',
+        //                     path: 'sys/accounts',
-    //                     component: () => import('@/views/system/account'),
+        //                     name: 'ResourceList',
-    //                     meta: {
+        //                     component: () => import('@/views/system/account'),
-    //                         title: '账号管理',
+        //                     meta: {
-    //                         code: 'account:list',
+        //                         title: '账号管理',
-    //                         isKeepAlive: true,
+        //                         code: 'account:list',
-    //                         icon: 'el-icon-menu',
+        //                         isKeepAlive: true,
-    //                     },
+        //                         icon: 'el-icon-menu',
-    //                 },
+        //                     },
-    //             ],
+        //                 },
-    //         },
+        //             ],
-    //         {
+        //         },
-    //             path: '/machine',
+        //         {
-    //             name: 'Machine',
+        //             path: '/machine',
-    //             redirect: '/machine/list',
+        //             name: 'Machine',
-    //             meta: {
+        //             redirect: '/machine/list',
-    //                 title: '机器管理',
+        //             meta: {
-    //                 // 资源code，用于校验用户是否拥有该资源权限
+        //                 title: '机器管理',
-    //                 code: 'machine',
+        //                 // 资源code，用于校验用户是否拥有该资源权限
-    //                 // isKeepAlive: true,
+        //                 code: 'machine',
-    //                 icon: 'el-icon-monitor',
+        //                 // isKeepAlive: true,
-    //             },
+        //                 icon: 'el-icon-monitor',
-    //             children: [
+        //             },
-    //                 {
+        //             children: [
-    //                     path: '/list',
+        //                 {
-    //                     name: 'MachineList',
+        //                     path: '/list',
-    //                     component: () => import('@/views/ops/machine'),
+        //                     name: 'MachineList',
-    //                     meta: {
+        //                     component: () => import('@/views/ops/machine'),
-    //                         title: '机器列表',
+        //                     meta: {
-    //                         code: 'machine:list',
+        //                         title: '机器列表',
-    //                         isKeepAlive: true,
+        //                         code: 'machine:list',
-    //                         icon: 'el-icon-menu',
+        //                         isKeepAlive: true,
-    //                     },
+        //                         icon: 'el-icon-menu',
-    //                 },
+        //                     },
-    //             ],
+        //                 },
-    //         },
+        //             ],
-    //         {
+        //         },
-    //             path: '/personal',
+        //         {
-    //             name: 'personal',
+        //             path: '/personal',
-    //             component: () => import('@/views/personal/index.vue'),
+        //             name: 'personal',
-    //             meta: {
+        //             component: () => import('@/views/personal/index.vue'),
-    //                 title: '个人中心',
+        //             meta: {
-    //                 isKeepAlive: true,
+        //                 title: '个人中心',
-    //                 icon: 'el-icon-user',
+        //                 isKeepAlive: true,
-    //             },
+        //                 icon: 'el-icon-user',
-    //         },
+        //             },
-    //     ],
+        //         },
+        //     ],
     },
 ];
 
@@ -124,7 +124,7 @@ export const staticRoutes: Array<RouteRecordRaw> = [
         name: 'login',
         component: () => import('@/views/login/index.vue'),
         meta: {
-            title: '登陆',
+            title: '登录',
         },
     },
     {
@@ -143,6 +143,14 @@ export const staticRoutes: Array<RouteRecordRaw> = [
             title: '没有权限',
         },
     },
+    {
+        path: '/oauth2/callback',
+        name: 'oauth2Callback',
+        component: () => import('@/views/oauth/Oauth2Callback.vue'),
+        meta: {
+            title: 'oauth2回调',
+        },
+    },
     {
         path: '/machine/terminal',
         name: 'machineTerminal',

mayfly_go_web/src/store/index.ts

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

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';
+import { defineStore } from 'pinia';
-// 此处加上 `.ts` 后缀报错，具体原因不详
-import { ThemeConfigState, RootStateTypes } from '@/store/interface/index';
 
-const themeConfigModule: Module<ThemeConfigState, RootStateTypes> = {
+export const useThemeConfig = defineStore('themeConfig', {
-    namespaced: true,
+    state: (): ThemeConfigState => ({
-    state: {
         themeConfig: {
             // 是否开启布局配置抽屉
             isDrawer: false,
@@ -27,13 +24,13 @@ const themeConfigModule: Module<ThemeConfigState, RootStateTypes> = {
             // 默认顶栏导航背景颜色，请注意：需要同时修改 `/@/theme/common/var.scss` 对应的值
             topBar: '#ffffff',
             // 默认菜单导航背景颜色，请注意：需要同时修改 `/@/theme/common/var.scss` 对应的值
-            menuBar: '#545c64',
+            menuBar: '#FFFFFF',
             // 默认分栏菜单背景颜色，请注意：需要同时修改 `/@/theme/common/var.scss` 对应的值
             columnsMenuBar: '#545c64',
             // 默认顶栏导航字体颜色，请注意：需要同时修改 `/@/theme/common/var.scss` 对应的值
             topBarColor: '#606266',
             // 默认菜单导航字体颜色，请注意：需要同时修改 `/@/theme/common/var.scss` 对应的值
-            menuBarColor: '#eaeaea',
+            menuBarColor: '#606266',
             // 默认分栏菜单字体颜色，请注意：需要同时修改 `/@/theme/common/var.scss` 对应的值
             columnsMenuBarColor: '#e6e6e6',
             // 是否开启顶栏背景颜色渐变
@@ -73,16 +70,19 @@ 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 底部版权信息
             isFooter: false,
+            // 是否暗模式
+            isDark: false,
             // 是否开启灰色模式
             isGrayscale: false,
             // 是否开启色弱模式
@@ -94,8 +94,8 @@ const themeConfigModule: Module<ThemeConfigState, RootStateTypes> = {
 
             /* 其它设置
             ------------------------------- */
-            // 默认 Tagsview 风格，可选 1、 tags-style-one 2、 tags-style-two 3、 tags-style-three 4、 tags-style-four
+            // 默认 Tagsview 风格，可选 1、 tags-style-one 2、 tags-style-two 3、 tags-style-three
-            tagsStyle: 'tags-style-one',
+            tagsStyle: 'tags-style-three',
             // 默认主页面切换动画，可选 1、 slide-right 2、 slide-left 3、 opacitys
             animation: 'slide-right',
             // 默认分栏高亮风格，可选 1、 圆角 columns-round 2、 卡片 columns-card
@@ -107,18 +107,17 @@ const themeConfigModule: Module<ThemeConfigState, RootStateTypes> = {
             layout: 'classic',
 
             // ssh终端字体颜色
-            terminalForeground: '#7e9192',
+            terminalForeground: '#C5C8C6',
             // ssh终端背景色
-            terminalBackground: '#002833',
+            terminalBackground: '#121212',
             // ssh终端cursor色
-            terminalCursor: '#268F81',
+            terminalCursor: '#F0CC09',
-            terminalFontSize: 15,
+            terminalFontSize: 14,
-            terminalFontWeight: 'normal',
+            terminalFontWeight: 'bold',
 
             // 编辑器主题
             editorTheme: 'vs',
 
-
             /* 后端控制路由
             ------------------------------- */
             // 是否开启后端控制路由
@@ -135,19 +134,11 @@ const themeConfigModule: Module<ThemeConfigState, RootStateTypes> = {
             // 默认全局组件大小，可选值"<|large|default|small>"，默认 ''
             globalComponentSize: '',
         },
-    },
+    }),
-    mutations: {
-        // 设置布局配置
-        getThemeConfig(state: any, data: object) {
-            state.themeConfig = data;
-        },
-    },
     actions: {
         // 设置布局配置
-        setThemeConfig({ commit }, data: object) {
+        setThemeConfig(data: ThemeConfigState) {
-            commit('getThemeConfig', data);
+            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,242 +1,296 @@
 /* 初始化样式
 ------------------------------- */
 * {
-	margin: 0;
+    margin: 0;
-	padding: 0;
+    padding: 0;
-	box-sizing: border-box;
+    box-sizing: border-box;
-	outline: none !important;
+    outline: none !important;
+}
+
+:root {
+	--color-white: #ffffff;
+	--bg-main-color: #f8f8f8;
+	--bg-color: #f5f5ff;
+    --bg-menuBarActiveColor: #0000000a;  // 菜单栏激活时的背景色
+	--border-color-light: #f1f2f3;
+	--el-color-primary-lighter: #ecf5ff;
+	--color-success-lighter: #f0f9eb;
+	--color-warning-lighter: #fdf6ec;
+	--color-danger-lighter: #fef0f0;
+	--color-dark-hover: #0000001a;
+	--color-menu-hover: rgba(0, 0, 0, 0.2);
+	--color-user-hover: rgba(0, 0, 0, 0.04);
+	--color-seting-main: #e9eef3;
+	--color-seting-aside: #d3dce6;
+	--color-seting-header: #b3c0d1;
 }
 
 html,
 body,
 #app {
-	margin: 0;
+    margin: 0;
-	padding: 0;
+    padding: 0;
-	width: 100%;
+    width: 100%;
-	height: 100%;
+    height: 100%;
-	font-family: 'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif;
+    font-family: 'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif;
-	font-weight: 450;
+    font-weight: 450;
-	-webkit-font-smoothing: antialiased;
+    -webkit-font-smoothing: antialiased;
-	-webkit-tap-highlight-color: transparent;
+    -webkit-tap-highlight-color: transparent;
-	background-color: #f8f8f8;
+    background-color: var(--bg-main-color);
-	font-size: 14px;
+    font-size: 14px;
-	overflow: hidden;
+    overflow: hidden;
-	position: relative;
+    position: relative;
 }
 
 /* 主布局样式
 ------------------------------- */
 .layout-container {
-	width: 100%;
+    width: 100%;
-	height: 100%;
+    height: 100%;
-	.layout-aside {
+
-		background: var(--bg-menuBar);
+    .layout-aside {
-		box-shadow: 2px 0 6px rgb(0 21 41 / 1%);
+        background: var(--bg-menuBar);
-		height: inherit;
+        box-shadow: 2px 0 6px rgb(0 21 41 / 1%);
-		position: relative;
+        height: inherit;
-		z-index: 1;
+        position: relative;
-		display: flex;
+        z-index: 1;
-		flex-direction: column;
+        display: flex;
-		overflow-x: hidden !important;
+        flex-direction: column;
-		.el-scrollbar__view {
+        overflow-x: hidden !important;
-			overflow: hidden;
+
-		}
+        .el-scrollbar__view {
-	}
+            overflow: hidden;
-	.layout-header {
+        }
-		padding: 0 !important;
+    }
-	}
+
-	.layout-main {
+    .layout-header {
-		padding: 0 !important;
+        padding: 0 !important;
-		overflow: hidden;
+    }
-		width: 100%;
+
-		background-color: #f8f8f8;
+    .layout-main {
-	}
+        padding: 0 !important;
-	.el-scrollbar {
+        overflow: hidden;
-		width: 100%;
+        width: 100%;
-	}
+        background-color: var(--bg-main-color);
-	.layout-view-bg-white {
+    }
-		background: white;
+
-		width: 100%;
+    .el-scrollbar {
-		height: 100%;
+        width: 100%;
-		border-radius: 4px;
+    }
-		border: 1px solid #ebeef5;
+
-	}
+    .layout-view-bg-white {
-	.layout-el-aside-br-color {
+        background: white;
-		border-right: 1px solid rgb(238, 238, 238);
+        width: 100%;
-	}
+        height: 100%;
-	.layout-aside-width-default {
+        border-radius: 4px;
-		width: 220px !important;
+        border: 1px solid var(--el-border-color-light, #ebeef5);
-		transition: width 0.3s ease;
+    }
-	}
+
-	.layout-aside-width64 {
+    .layout-el-aside-br-color {
-		width: 64px !important;
+        border-right: 1px solid var(--el-border-color-light, #ebeef5);
-		transition: width 0.3s ease;
+    }
-	}
+
-	.layout-aside-width1 {
+    .layout-aside-width-default {
-		width: 1px !important;
+        width: 220px !important;
-		transition: width 0.3s ease;
+        transition: width 0.3s ease;
-	}
+    }
-	.layout-scrollbar {
+
-		@extend .el-scrollbar;
+    .layout-aside-width64 {
-		padding: 10px;
+        width: 64px !important;
-	}
+        transition: width 0.3s ease;
-	.layout-mian-height-50 {
+    }
-		height: calc(100vh - 50px);
+
-	}
+    .layout-aside-width1 {
-	.layout-columns-warp {
+        width: 1px !important;
-		flex: 1;
+        transition: width 0.3s ease;
-		display: flex;
+    }
-		overflow: hidden;
+
-	}
+    .layout-scrollbar {
-	.layout-hide {
+        @extend .el-scrollbar;
-		display: none;
+        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 {
+    .el-drawer__header {
-		padding: 0 15px !important;
+        padding: 0 15px !important;
-		height: 50px;
+        height: 50px;
-		display: flex;
+        display: flex;
-		align-items: center;
+        align-items: center;
-		margin-bottom: 0 !important;
+        margin-bottom: 0 !important;
-		border-bottom: 1px solid rgb(230, 230, 230);
+        border-bottom: 1px solid var(--el-border-color-light, #ebeef5);
-	}
+    }
-	.el-divider {
+
-		background-color: rgb(230, 230, 230);
+    .el-divider {
-	}
+        background-color: rgb(230, 230, 230);
+    }
 }
 
 /* nprogress 进度条跟随主题颜色
 ------------------------------- */
 #nprogress {
-	.bar {
+    .bar {
-		background: var(--color-primary) !important;
+        background: var(--el-color-primary) !important;
-		z-index: 9999999 !important;
+        z-index: 9999999 !important;
-	}
+    }
 }
 
 /* flex 弹性布局
 ------------------------------- */
 .flex {
-	display: flex;
+    display: flex;
 }
+
 .flex-auto {
-	flex: 1;
+    flex: 1;
 }
+
 .flex-center {
-	@extend .flex;
+    @extend .flex;
-	flex-direction: column;
+    flex-direction: column;
-	width: 100%;
+    width: 100%;
-	overflow: hidden;
+    overflow: hidden;
 }
+
 .flex-margin {
-	margin: auto;
+    margin: auto;
 }
+
 .flex-warp {
-	display: flex;
+    display: flex;
-	flex-wrap: wrap;
+    flex-wrap: wrap;
-	align-content: flex-start;
+    align-content: flex-start;
-	margin: 0 -5px;
+    margin: 0 -5px;
-	.flex-warp-item {
+
-		padding: 5px;
+    .flex-warp-item {
-		.flex-warp-item-box {
+        padding: 5px;
-			width: 100%;
+
-			height: 100%;
+        .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(--el-color-primary);
 }
+
 .color-success {
-	color: var(--color-success);
+    color: var(--el-color-success);
 }
+
 .color-warning {
-	color: var(--color-warning);
+    color: var(--el-color-warning);
 }
+
 .color-danger {
-	color: var(--color-danger);
+    color: var(--el-color-danger);
 }
+
 .color-info {
-	color: var(--color-info);
+    color: var(--el-color-info);
 }
 
 /* 字体大小全局样式
 ------------------------------- */
 @for $i from 10 through 32 {
-	.font#{$i} {
+    .font#{$i} {
-		font-size: #{$i}px !important;
+        font-size: #{$i}px !important;
-	}
+    }
 }
 
 /* 外边距、内边距全局样式
 ------------------------------- */
 @for $i from 1 through 35 {
-	.mt#{$i} {
+    .mt#{$i} {
-		margin-top: #{$i}px !important;
+        margin-top: #{$i}px !important;
-	}
+    }
-	.mr#{$i} {
+
-		margin-right: #{$i}px !important;
+    .mr#{$i} {
-	}
+        margin-right: #{$i}px !important;
-	.mb#{$i} {
+    }
-		margin-bottom: #{$i}px !important;
+
-	}
+    .mb#{$i} {
-	.ml#{$i} {
+        margin-bottom: #{$i}px !important;
-		margin-left: #{$i}px !important;
+    }
-	}
+
-	.pt#{$i} {
+    .ml#{$i} {
-		padding-top: #{$i}px !important;
+        margin-left: #{$i}px !important;
-	}
+    }
-	.pr#{$i} {
+
-		padding-right: #{$i}px !important;
+    .pt#{$i} {
-	}
+        padding-top: #{$i}px !important;
-	.pb#{$i} {
+    }
-		padding-bottom: #{$i}px !important;
+
-	}
+    .pr#{$i} {
-	.pl#{$i} {
+        padding-right: #{$i}px !important;
-		padding-left: #{$i}px !important;
+    }
-	}
+
+    .pb#{$i} {
+        padding-bottom: #{$i}px !important;
+    }
+
+    .pl#{$i} {
+        padding-left: #{$i}px !important;
+    }
 }
 
 
 ::-webkit-scrollbar {
     width: 4px;
     height: 8px;
-    background-color: #F5F5F5;
+    background-color: var(--el-border-color-light, #ebeef5);
 }
 
 ::-webkit-scrollbar-track {
     -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
-    background-color: #F5F5F5;
+    background-color: var(--el-border-color-light, #ebeef5);
 }
 
 ::-webkit-scrollbar-thumb {
     -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
-    background-color: #F5F5F5;
+    background-color: var(--el-border-color-light, #ebeef5);
 }
 
 .el-menu .fa {
@@ -249,15 +303,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,21 +331,24 @@ body,
     -webkit-user-select: none;
     -ms-user-select: none;
     user-select: none;
-  }
+}
 
 .toolbar {
     width: 100%;
-    padding: 6px;
+    padding: 4px;
-    background-color: #ffffff;
     overflow: hidden;
-    line-height: 32px;
+    line-height: 24px;
-    border: 1px solid #e6ebf5;
+    border: 1px solid var(--el-border-color-light, #ebeef5);
 }
 
 .fl {
     float: left;
 }
 
+.fr {
+    float: right;
+}
+
 .search-form {
     .el-form-item {
         margin-bottom: 3px;
@@ -294,3 +358,19 @@ body,
 .el-table-z-index-inherit .el-table .el-table__cell {
     z-index: inherit !important;
 }
+
+.f12 {
+    font-size: 12px
+}
+
+.pointer {
+    cursor: pointer;
+}
+
+.pointer-icon {
+    cursor: pointer;
+    transition: color 0.3s;
+}
+.pointer-icon:hover {
+    color: var(--el-color-primary); /* 鼠标移动到图标时的颜色 */
+}

mayfly_go_web/src/theme/base.scss

@@ -1,2 +1 @@
 @import 'common/transition.scss';
-@import 'common/var.scss';

mayfly_go_web/src/theme/common/var.scss

@@ -1,129 +0,0 @@
-/**
-* scss 怎么动态创建变量
-* 本来想用 @function，@for 好像不可以动态创建
-* 2020.12.19 lyt 记录
-**/
-
-/* 定义初始颜色
-------------------------------- */
-$--color-primary: #409eff !default;
-$--color-whites: #ffffff !default;
-$--color-blacks: #000000 !default;
-$--color-primary-light-1: mix($--color-whites, $--color-primary, 10%) !default;
-$--color-primary-light-2: mix($--color-whites, $--color-primary, 20%) !default;
-$--color-primary-light-3: mix($--color-whites, $--color-primary, 30%) !default;
-$--color-primary-light-4: mix($--color-whites, $--color-primary, 40%) !default;
-$--color-primary-light-5: mix($--color-whites, $--color-primary, 50%) !default;
-$--color-primary-light-6: mix($--color-whites, $--color-primary, 60%) !default;
-$--color-primary-light-7: mix($--color-whites, $--color-primary, 70%) !default;
-$--color-primary-light-8: mix($--color-whites, $--color-primary, 80%) !default;
-$--color-primary-light-9: mix($--color-whites, $--color-primary, 90%) !default;
-$--color-success: #67c23a !default;
-$--color-success-light-1: mix($--color-whites, $--color-success, 10%) !default;
-$--color-success-light-2: mix($--color-whites, $--color-success, 20%) !default;
-$--color-success-light-3: mix($--color-whites, $--color-success, 30%) !default;
-$--color-success-light-4: mix($--color-whites, $--color-success, 40%) !default;
-$--color-success-light-5: mix($--color-whites, $--color-success, 50%) !default;
-$--color-success-light-6: mix($--color-whites, $--color-success, 60%) !default;
-$--color-success-light-7: mix($--color-whites, $--color-success, 70%) !default;
-$--color-success-light-8: mix($--color-whites, $--color-success, 80%) !default;
-$--color-success-light-9: mix($--color-whites, $--color-success, 90%) !default;
-$--color-info: #909399 !default;
-$--color-info-light-1: mix($--color-whites, $--color-info, 10%) !default;
-$--color-info-light-2: mix($--color-whites, $--color-info, 20%) !default;
-$--color-info-light-3: mix($--color-whites, $--color-info, 30%) !default;
-$--color-info-light-4: mix($--color-whites, $--color-info, 40%) !default;
-$--color-info-light-5: mix($--color-whites, $--color-info, 50%) !default;
-$--color-info-light-6: mix($--color-whites, $--color-info, 60%) !default;
-$--color-info-light-7: mix($--color-whites, $--color-info, 70%) !default;
-$--color-info-light-8: mix($--color-whites, $--color-info, 80%) !default;
-$--color-info-light-9: mix($--color-whites, $--color-info, 90%) !default;
-$--color-warning: #e6a23c !default;
-$--color-warning-light-1: mix($--color-whites, $--color-warning, 10%) !default;
-$--color-warning-light-2: mix($--color-whites, $--color-warning, 20%) !default;
-$--color-warning-light-3: mix($--color-whites, $--color-warning, 30%) !default;
-$--color-warning-light-4: mix($--color-whites, $--color-warning, 40%) !default;
-$--color-warning-light-5: mix($--color-whites, $--color-warning, 50%) !default;
-$--color-warning-light-6: mix($--color-whites, $--color-warning, 60%) !default;
-$--color-warning-light-7: mix($--color-whites, $--color-warning, 70%) !default;
-$--color-warning-light-8: mix($--color-whites, $--color-warning, 80%) !default;
-$--color-warning-light-9: mix($--color-whites, $--color-warning, 90%) !default;
-$--color-danger: #f56c6c !default;
-$--color-danger-light-1: mix($--color-whites, $--color-danger, 10%) !default;
-$--color-danger-light-2: mix($--color-whites, $--color-danger, 20%) !default;
-$--color-danger-light-3: mix($--color-whites, $--color-danger, 30%) !default;
-$--color-danger-light-4: mix($--color-whites, $--color-danger, 40%) !default;
-$--color-danger-light-5: mix($--color-whites, $--color-danger, 50%) !default;
-$--color-danger-light-6: mix($--color-whites, $--color-danger, 60%) !default;
-$--color-danger-light-7: mix($--color-whites, $--color-danger, 70%) !default;
-$--color-danger-light-8: mix($--color-whites, $--color-danger, 80%) !default;
-$--color-danger-light-9: mix($--color-whites, $--color-danger, 90%) !default;
-$--bg-topBar: #ffffff;
-$--bg-menuBar: #545c64;
-$--bg-columnsMenuBar: #545c64;
-$--bg-topBarColor: #606266;
-$--bg-menuBarColor: #eaeaea;
-$--bg-columnsMenuBarColor: #e6e6e6;
-
-/* 赋值给:root
-------------------------------- */
-:root {
-	--color-primary: #{$--color-primary};
-	--color-whites: #{$--color-whites};
-	--color-blacks: #{$--color-blacks};
-	--color-primary-light-1: #{$--color-primary-light-1};
-	--color-primary-light-2: #{$--color-primary-light-2};
-	--color-primary-light-3: #{$--color-primary-light-3};
-	--color-primary-light-4: #{$--color-primary-light-4};
-	--color-primary-light-5: #{$--color-primary-light-5};
-	--color-primary-light-6: #{$--color-primary-light-6};
-	--color-primary-light-7: #{$--color-primary-light-7};
-	--color-primary-light-8: #{$--color-primary-light-8};
-	--color-primary-light-9: #{$--color-primary-light-9};
-	--color-success: #{$--color-success};
-	--color-success-light-1: #{$--color-success-light-1};
-	--color-success-light-2: #{$--color-success-light-2};
-	--color-success-light-3: #{$--color-success-light-3};
-	--color-success-light-4: #{$--color-success-light-4};
-	--color-success-light-5: #{$--color-success-light-5};
-	--color-success-light-6: #{$--color-success-light-6};
-	--color-success-light-7: #{$--color-success-light-7};
-	--color-success-light-8: #{$--color-success-light-8};
-	--color-success-light-9: #{$--color-success-light-9};
-	--color-info: #{$--color-info};
-	--color-info-light-1: #{$--color-info-light-1};
-	--color-info-light-2: #{$--color-info-light-2};
-	--color-info-light-3: #{$--color-info-light-3};
-	--color-info-light-4: #{$--color-info-light-4};
-	--color-info-light-5: #{$--color-info-light-5};
-	--color-info-light-6: #{$--color-info-light-6};
-	--color-info-light-7: #{$--color-info-light-7};
-	--color-info-light-8: #{$--color-info-light-8};
-	--color-info-light-9: #{$--color-info-light-9};
-	--color-warning: #{$--color-warning};
-	--color-warning-light-1: #{$--color-warning-light-1};
-	--color-warning-light-2: #{$--color-warning-light-2};
-	--color-warning-light-3: #{$--color-warning-light-3};
-	--color-warning-light-4: #{$--color-warning-light-4};
-	--color-warning-light-5: #{$--color-warning-light-5};
-	--color-warning-light-6: #{$--color-warning-light-6};
-	--color-warning-light-7: #{$--color-warning-light-7};
-	--color-warning-light-8: #{$--color-warning-light-8};
-	--color-warning-light-9: #{$--color-warning-light-9};
-	--color-danger: #{$--color-danger};
-	--color-danger-light-1: #{$--color-danger-light-1};
-	--color-danger-light-2: #{$--color-danger-light-2};
-	--color-danger-light-3: #{$--color-danger-light-3};
-	--color-danger-light-4: #{$--color-danger-light-4};
-	--color-danger-light-5: #{$--color-danger-light-5};
-	--color-danger-light-6: #{$--color-danger-light-6};
-	--color-danger-light-7: #{$--color-danger-light-7};
-	--color-danger-light-8: #{$--color-danger-light-8};
-	--color-danger-light-9: #{$--color-danger-light-9};
-	--bg-topBar: #{$--bg-topBar};
-	--bg-menuBar: #{$--bg-menuBar};
-	--bg-columnsMenuBar: #{$--bg-columnsMenuBar};
-	--bg-topBarColor: #{$--bg-topBarColor};
-	--bg-menuBarColor: #{$--bg-menuBarColor};
-	--bg-columnsMenuBarColor: #{$--bg-columnsMenuBarColor};
-}

mayfly_go_web/src/theme/dark.scss

@@ -0,0 +1,27 @@
+html.dark {
+    // 变量(自定义时，只需修改这里的值)
+	--next-bg-main: #1f1f1f;
+	--next-color-white: #ffffff;
+	--next-color-disabled: #191919;
+	--next-color-bar: #dadada;
+	--next-color-primary: #303030;
+	--next-border-color: #424242;
+	--next-border-black: #333333;
+	--next-border-columns: #2a2a2a;
+	--next-color-seting: #505050;
+	--next-text-color-regular: #9b9da1;
+	--next-text-color-placeholder: #7a7a7a;
+	--next-color-hover: #3c3c3c;
+	--next-color-hover-rgba: rgba(0, 0, 0, 0.3);
+
+    /* 自定义深色背景颜色 */
+    // root
+	--bg-main-color: var(--next-bg-main) !important;
+	--bg-topBar: var(--next-color-disabled) !important;
+	--bg-topBarColor: var(--next-color-bar) !important;
+	--bg-menuBar: var(--next-color-disabled) !important;
+	--bg-menuBarColor: var(--next-color-bar) !important;
+	--bg-menuBarActiveColor: var(--next-color-hover-rgba) !important;
+	--bg-columnsMenuBar: var(--next-color-disabled) !important;
+	--bg-columnsMenuBarColor: var(--next-color-bar) !important;
+  }

mayfly_go_web/src/theme/iconSelector.scss

@@ -3,83 +3,27 @@
 .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;
-		}
+			border-bottom: 1px solid var(--el-border-color-light);
-		.icon-selector-warp-row {
+			margin: 0 !important;
-			max-height: 260px;
+			.el-tabs__nav-wrap {
-			overflow-y: auto;
+				&::after {
-			padding: 15px 15px 5px;
+					height: 0 !important;
-			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;
-					}
 				}
-				&:hover {
+				.el-tabs__item {
-					border: 1px solid var(--color-primary);
+					padding: 0 5px !important;
-					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;
-					}
 				}
 			}
 		}

mayfly_go_web/src/theme/index.scss

@@ -4,4 +4,5 @@
 @import './element.scss';
 @import './media/media.scss';
 @import './waves.scss';
+@import './dark.scss';
 @import './iconSelector.scss';

mayfly_go_web/src/theme/loading.scss

@@ -15,7 +15,7 @@
 .loading-next .loading-next-box-warp .loading-next-box-item {
 	width: 33.333333%;
 	height: 33.333333%;
-	background: var(--color-primary);
+	background: var(--el-color-primary);
 	float: left;
 	animation: loading-next-animation 1.2s infinite ease;
 	border-radius: 1px;

mayfly_go_web/src/theme/media/scrollbar.scss

@@ -9,7 +9,7 @@
 		height: 3px !important;
 	}
 	::-webkit-scrollbar-track-piece {
-		background-color: #f8f8f8;
+		background-color: var(--bg-main-color);
 	}
 	// 滚动条的设置
 	::-webkit-scrollbar-thumb {
@@ -40,7 +40,7 @@
 		height: 7px;
 	}
 	::-webkit-scrollbar-track-piece {
-		background-color: #f8f8f8;
+		background-color: var(--bg-main-color);
 	}
 	// 滚动条的设置
 	::-webkit-scrollbar-thumb {

mayfly_go_web/src/theme/mixins/element-mixins.scss

@@ -1,34 +0,0 @@
-/* Button 按钮
-------------------------------- */
-@mixin Button($main, $c1, $c2) {
-	color: set-color($main);
-	background: set-color($c1);
-	border-color: set-color($c2);
-}
-
-/* Radio 单选框、Checkbox 多选框
-------------------------------- */
-@mixin RadioCheckbox($name) {
-	background-color: set-color($name);
-	border-color: set-color($name);
-}
-
-/* Tag 标签
-------------------------------- */
-@mixin Tag($main, $c1, $c2) {
-	color: set-color($main);
-	background-color: set-color($c1);
-	border-color: set-color($c2);
-}
-@mixin TagDark($main, $c1) {
-	color: set-color($main);
-	background-color: set-color($c1);
-}
-
-/* Alert 警告
-------------------------------- */
-@mixin Alert($main, $c1, $c2) {
-	color: set-color($main);
-	background: set-color($c1);
-	border: 1px solid set-color($c2);
-}

mayfly_go_web/src/theme/mixins/function.scss

@@ -1,5 +0,0 @@
-/* 颜色调用函数
-------------------------------- */
-@function set-color($key) {
-	@return var(--color-#{$key});
-}

mayfly_go_web/src/theme/mixins/index.scss

@@ -1,3 +1,15 @@
+/* 第三方图标字体间距/大小设置
+------------------------------- */
+@mixin generalIcon {
+	font-size: 14px !important;
+	display: inline-block;
+	vertical-align: middle;
+	margin-right: 5px;
+	width: 24px;
+	text-align: center;
+	justify-content: center;
+}
+
 /* 文本不换行
 ------------------------------- */
 @mixin text-no-wrap() {

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;
+}
 
-// 布局配置
+declare interface ThemeConfigState {
-export interface ThemeConfigState {
     themeConfig: {
         isDrawer: boolean;
         primary: string;
@@ -30,11 +31,13 @@ export interface ThemeConfigState {
         isShowLogoChange: boolean;
         isBreadcrumb: boolean;
         isTagsview: boolean;
+        isShareTagsView: boolean;
         isBreadcrumbIcon: boolean;
         isTagsviewIcon: boolean;
         isCacheTagsView: boolean;
         isSortableTagsView: boolean;
         isFooter: boolean;
+        isDark: boolean;
         isGrayscale: boolean;
         isInvert: boolean;
         isWartermark: boolean;
@@ -52,48 +55,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 {
+declare interface RoutesListState {
-    routesList: Array<object>;
+    routesList: T[];
 }
 
 // 路由缓存列表
-export interface KeepAliveNamesState {
+declare interface KeepAliveNamesState {
-    keepAliveNames: Array<string>;
+    keepAliveNames: string[];
-}
+    cachedViews: 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;
 }

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,3 +1,4 @@
+// 声明一个模块，防止引入文件时报错
 declare module '*.json';
 declare module '*.png';
 declare module '*.jpg';

mayfly_go_web/src/views/home/Home.vue

@@ -4,11 +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>
                         </div>
                     </div>
@@ -29,15 +28,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';
 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: [
         {
@@ -63,9 +64,7 @@ const state = reactive({
     ],
 });
 
-const {
+const { topCardItemList } = toRefs(state);
-    topCardItemList,
-} = toRefs(state)
 
 // 当前时间提示语
 const currentTime = computed(() => {
@@ -114,11 +113,6 @@ onMounted(() => {
     // initHomeLaboratory();
     // initHomeOvertime();
 });
-
-// 获取用户信息 vuex
-const getUserInfos = computed(() => {
-    return store.state.userInfos.userInfos;
-});
 </script>
 
 <style scoped lang="scss">
@@ -182,8 +176,8 @@ const getUserInfos = computed(() => {
     }
 
     .home-card-first {
-        background: white;
+        background: var(--bg-main-color);
-        border: 1px solid #ebeef5;
+        border: 1px solid var(--el-border-color-light, #ebeef5);
         display: flex;
         align-items: center;
 
@@ -191,7 +185,7 @@ const getUserInfos = computed(() => {
             width: 60px;
             height: 60px;
             border-radius: 100%;
-            border: 2px solid var(--color-primary-light-5);
+            border: 2px solid var(--el-color-primary-light-5);
         }
 
         .home-card-first-right {
@@ -250,7 +244,8 @@ const getUserInfos = computed(() => {
             .home-dynamic-item-left {
                 text-align: right;
 
-                .home-dynamic-item-left-time1 {}
+                .home-dynamic-item-left-time1 {
+                }
 
                 .home-dynamic-item-left-time2 {
                     font-size: 13px;
@@ -265,7 +260,7 @@ const getUserInfos = computed(() => {
                 position: relative;
 
                 i {
-                    color: var(--color-primary);
+                    color: var(--el-color-primary);
                     font-size: 12px;
                     position: absolute;
                     top: 1px;
@@ -287,7 +282,7 @@ const getUserInfos = computed(() => {
                         border-radius: 100%;
                         padding: 3px 2px 2px;
                         text-align: center;
-                        color: var(--color-primary);
+                        color: var(--el-color-primary);
                     }
                 }
 

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">
+<script lang="ts" setup name="layoutAside">
-import { toRefs, reactive, computed, watch, getCurrentInstance, onBeforeMount, onUnmounted } from 'vue';
+import { reactive, computed, watch, getCurrentInstance, onBeforeMount, onUnmounted } from 'vue';
-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 Logo from '@/views/layout/logo/index.vue';
 import Vertical from '@/views/layout/navMenu/vertical.vue';
-export default {
+import mittBus from '@/common/utils/mitt';
-    name: 'layoutAside',
+
-    components: { Logo, Vertical },
+const { proxy } = getCurrentInstance() as any;
-    setup() {
+
-        const { proxy } = getCurrentInstance() as any;
+const { themeConfig } = storeToRefs(useThemeConfig());
-        const store = useStore();
+const { routesList } = storeToRefs(useRoutesList());
-        const state: any = reactive({
+
-            menuList: [],
+const state: any = reactive({
-            clientWidth: '',
+    menuList: [],
-        });
+    clientWidth: '',
-        // 获取布局配置信息
+});
-        const getThemeConfig = computed(() => {
+
-            return store.state.themeConfig.themeConfig;
+// 设置菜单展开/收起时的宽度
-        });
+const setCollapseWidth = computed(() => {
-        // 设置菜单展开/收起时的宽度
+    let { layout, isCollapse, menuBar } = themeConfig.value;
-        const setCollapseWidth = computed(() => {
+    let asideBrColor =
-            let { layout, isCollapse, menuBar } = store.state.themeConfig.themeConfig;
+        menuBar === '#FFFFFF' || menuBar === '#FFF' || menuBar === '#fff' || menuBar === '#ffffff' ? 'layout-el-aside-br-color' : '';
-            let asideBrColor =
+    if (layout === 'columns') {
-                menuBar === '#FFFFFF' || menuBar === '#FFF' || menuBar === '#fff' || menuBar === '#ffffff' ? 'layout-el-aside-br-color' : '';
+        // 分栏布局，菜单收起时宽度给 1px
-            if (layout === 'columns') {
+        if (isCollapse) {
-                // 分栏布局，菜单收起时宽度给 1px
+            return ['layout-aside-width1', asideBrColor];
-                if (isCollapse) {
+        } else {
-                    return ['layout-aside-width1', asideBrColor];
+            return ['layout-aside-width-default', asideBrColor];
-                } else {
+        }
-                    return ['layout-aside-width-default', asideBrColor];
+    } else {
-                }
+        // 其它布局给 64px
-            } else {
+        if (isCollapse) {
-                // 其它布局给 64px
+            return ['layout-aside-width64', asideBrColor];
-                if (isCollapse) {
+        } else {
-                    return ['layout-aside-width64', asideBrColor];
+            return ['layout-aside-width-default', asideBrColor];
-                } else {
+        }
-                    return ['layout-aside-width-default', asideBrColor];
+    }
-                }
+});
-            }
+
-        });
+// 设置显示/隐藏 logo
-        // 设置显示/隐藏 logo
+const setShowLogo = computed(() => {
-        const setShowLogo = computed(() => {
+    let { layout, isShowLogo } = themeConfig.value;
-            let { layout, isShowLogo } = store.state.themeConfig.themeConfig;
+    return (isShowLogo && layout === 'defaults') || (isShowLogo && layout === 'columns');
-            return (isShowLogo && layout === 'defaults') || (isShowLogo && layout === 'columns');
+});
-        });
+
-        // 设置/过滤路由（非静态路由/是否显示在菜单中）
+// 设置/过滤路由（非静态路由/是否显示在菜单中）
-        const setFilterRoutes = () => {
+const setFilterRoutes = () => {
-            if (store.state.themeConfig.themeConfig.layout === 'columns') return false;
+    if (themeConfig.value.layout === 'columns') return false;
-            state.menuList = filterRoutesFun(store.state.routesList.routesList);
+    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(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),
-        };
-    },
 };
+
+// 路由过滤递归函数
+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

@@ -3,7 +3,7 @@
         <el-scrollbar>
             <ul>
                 <li
-                    v-for="(v, k) in columnsAsideList"
+                    v-for="(v, k) in state.columnsAsideList"
                     :key="k"
                     @click="onColumnsAsideMenuClick(v, k)"
                     :ref="
@@ -11,10 +11,10 @@
                             if (el) columnsAsideOffsetTopRefs[k] = el;
                         }
                     "
-                    :class="{ 'layout-columns-active': liIndex === k }"
+                    :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.isIframe)">
+                    <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 +35,103 @@
     </div>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup name="layoutColumnsAside">
-import { reactive, toRefs, ref, computed, onMounted, nextTick, getCurrentInstance, watch } from 'vue';
+import { reactive, ref, computed, onMounted, nextTick, getCurrentInstance, watch } from 'vue';
 import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
-import { useStore } from '@/store/index.ts';
+import pinia from '@/store/index';
-export default {
+import { useThemeConfig } from '@/store/themeConfig';
-    name: 'layoutColumnsAside',
+import { useRoutesList } from '@/store/routesList';
-    setup() {
+import mittBus from '@/common/utils/mitt';
-        const columnsAsideOffsetTopRefs: any = ref([]);
+
-        const columnsAsideActiveRef = ref();
+const columnsAsideOffsetTopRefs: any = ref([]);
-        const { proxy } = getCurrentInstance() as any;
+const columnsAsideActiveRef = ref();
-        const store = useStore();
+const route = useRoute();
-        const route = useRoute();
+const router = useRouter();
-        const router = useRouter();
+const state: any = reactive({
-        const state: any = reactive({
+    columnsAsideList: [],
-            columnsAsideList: [],
+    liIndex: 0,
-            liIndex: 0,
+    difference: 0,
-            difference: 0,
+    routeSplit: [],
-            routeSplit: [],
+});
-        });
+// 设置高亮样式
-        // 设置高亮样式
+const setColumnsAsideStyle = computed(() => {
-        const setColumnsAsideStyle = computed(() => {
+    return useThemeConfig().themeConfig.columnsAsideStyle;
-            return store.state.themeConfig.themeConfig.columnsAsideStyle;
+});
-        });
+// 设置菜单高亮位置移动
-        // 设置菜单高亮位置移动
+const setColumnsAsideMove = (k: number) => {
-        const setColumnsAsideMove = (k: number) => {
+    state.liIndex = k;
-            state.liIndex = k;
+    columnsAsideActiveRef.value.style.top = `${columnsAsideOffsetTopRefs.value[k].offsetTop + state.difference}px`;
-            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),
-        };
-    },
 };
+// 菜单高亮点击事件
+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 +139,10 @@ export default {
     width: 64px;
     height: 100%;
     background: var(--bg-columnsMenuBar);
+
     ul {
         position: relative;
+
         li {
             color: var(--bg-columnsMenuBarColor);
             width: 100%;
@@ -161,23 +152,28 @@ 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);
+            background: var(--el-color-primary);
             color: #ffffff;
             position: absolute;
             left: 50%;
@@ -189,6 +185,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
+        <el-scrollbar class="layout-scrollbar" ref="layoutScrollbarRef"
-            class="layout-scrollbar"
+            v-show="!state.currentRouteMeta.link && state.currentRouteMeta.linkType != 1"
-            ref="layoutScrollbarRef"
+            :style="{ minHeight: `calc(100vh - ${state.headerHeight}` }">
-            v-show="!currentRouteMeta.link && !currentRouteMeta.isIframe"
-            :style="{ minHeight: `calc(100vh - ${headerHeight}` }"
-        >
             <LayoutParentView />
-            <Footer v-if="getThemeConfig.isFooter" />
+            <Footer v-if="themeConfig.isFooter" />
         </el-scrollbar>
-        <Link
+        <Link :style="{ height: `calc(100vh - ${state.headerHeight}` }" :meta="state.currentRouteMeta"
-            :style="{ height: `calc(100vh - ${headerHeight}` }"
+            v-if="state.currentRouteMeta.link && state.currentRouteMeta.linkType == 2" />
-            :meta="currentRouteMeta"
+        <Iframes :style="{ height: `calc(100vh - ${state.headerHeight}` }" :meta="state.currentRouteMeta"
-            v-if="currentRouteMeta.link && !currentRouteMeta.isIframe"
+            v-if="state.currentRouteMeta.link && state.currentRouteMeta.linkType == 1 && state.isShowLink"
-        />
+            @getCurrentRouteMeta="onGetCurrentRouteMeta" />
-        <Iframes
-            :style="{ height: `calc(100vh - ${headerHeight}` }"
-            :meta="currentRouteMeta"
-            v-if="currentRouteMeta.link && currentRouteMeta.isIframe && isShowLink"
-            @getCurrentRouteMeta="onGetCurrentRouteMeta"
-        />
     </el-main>
 </template>
 
-<script lang="ts">
+<script setup lang="ts" name="layoutMain">
-import { computed, defineComponent, toRefs, reactive, getCurrentInstance, watch, onBeforeMount } from 'vue';
+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',
+const { proxy } = getCurrentInstance() as any;
-    components: { LayoutParentView, Footer, Link, Iframes },
+const { themeConfig } = storeToRefs(useThemeConfig());
-    setup() {
+const route = useRoute();
-        const { proxy } = getCurrentInstance() as any;
+const state = reactive({
-        const store = useStore();
+    headerHeight: '',
-        const route = useRoute();
+    currentRouteMeta: {} as any,
-        const state = reactive({
+    isShowLink: false,
-            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 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>Made by mayfly with ❤️</div>
-            <div class="mt5">mayfly</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'" />
+    <Defaults v-if="themeConfig.layout === 'defaults'" />
-    <Classic v-else-if="getThemeConfig.layout === 'classic'" />
+    <Classic v-else-if="themeConfig.layout === 'classic'" />
-    <Transverse v-else-if="getThemeConfig.layout === 'transverse'" />
+    <Transverse v-else-if="themeConfig.layout === 'transverse'" />
-    <Columns v-else-if="getThemeConfig.layout === 'columns'" />
+    <Columns v-else-if="themeConfig.layout === 'columns'" />
 </template>
 
-<script lang="ts">
+<script setup lang="ts" name="layout">
-import { computed, onBeforeMount, onUnmounted, getCurrentInstance } from 'vue';
+import { onBeforeMount, onUnmounted } from 'vue';
-import { useStore } from '@/store/index.ts';
+import { getLocal, setLocal } from '@/common/utils/storage';
-import { getLocal, setLocal } from '@/common/utils/storage.ts';
+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 {
+import mittBus from '@/common/utils/mitt';
-    name: 'layout',
+
-    components: { Defaults, Classic, Transverse, Columns },
+const { themeConfig } = storeToRefs(useThemeConfig());
-    setup() {
+
-        const { proxy } = getCurrentInstance() as any;
+// 窗口大小改变时(适配移动端)
-        const store = useStore();
+const onLayoutResize = () => {
-        // 获取布局配置信息
+    if (!getLocal('oldLayout')) setLocal('oldLayout', themeConfig.value.layout);
-        const getThemeConfig = computed(() => {
+    const clientWidth = document.body.clientWidth;
-            return store.state.themeConfig.themeConfig;
+    if (clientWidth < 1000) {
+        themeConfig.value.isCollapse = false;
+        mittBus.emit('layoutMobileResize', {
+            layout: 'defaults',
+            clientWidth,
         });
-        // 窗口大小改变时(适配移动端)
+    } else {
-        const onLayoutResize = () => {
+        mittBus.emit('layoutMobileResize', {
-            if (!getLocal('oldLayout')) setLocal('oldLayout', getThemeConfig.value.layout);
+            layout: getLocal('oldLayout') ? getLocal('oldLayout') : 'defaults',
-            const clientWidth = document.body.clientWidth;
+            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);
         });
-        // 页面卸载时
+    }
-        onUnmounted(() => {
-            window.removeEventListener('resize', onLayoutResize);
-        });
-        return {
-            getThemeConfig,
-        };
-    },
 };
+// 页面加载前
+onBeforeMount(() => {
+    onLayoutResize();
+    window.addEventListener('resize', onLayoutResize);
+});
+// 页面卸载时
+onUnmounted(() => {
+    window.removeEventListener('resize', onLayoutResize);
+});
 </script>