ソースを参照

管理后台初始提交

zuy 2 年 前
コミット
175127a7f2
100 ファイル変更10542 行追加0 行削除
  1. 11 0
      admin-web/.env
  2. 6 0
      admin-web/.env.development
  3. 6 0
      admin-web/.env.production
  4. 18 0
      admin-web/.eslintignore
  5. 77 0
      admin-web/.eslintrc.js
  6. 23 0
      admin-web/.gitignore
  7. 39 0
      admin-web/.prettierrc.js
  8. 463 0
      admin-web/CHANGELOG.md
  9. 21 0
      admin-web/LICENSE
  10. 144 0
      admin-web/README.md
  11. 17 0
      admin-web/index.html
  12. 80 0
      admin-web/package.json
  13. BIN
      admin-web/public/favicon.ico
  14. 139 0
      admin-web/src/App.vue
  15. 6 0
      admin-web/src/assets/login-bg.svg
  16. 0 0
      admin-web/src/assets/login-icon-two.svg
  17. 0 0
      admin-web/src/assets/login-main.svg
  18. 2 0
      admin-web/src/assets/logo-mini.svg
  19. BIN
      admin-web/src/assets/logo.ico
  20. 1 0
      admin-web/src/assets/mime/audio.svg
  21. 1 0
      admin-web/src/assets/mime/bat.svg
  22. 1 0
      admin-web/src/assets/mime/docx.svg
  23. 1 0
      admin-web/src/assets/mime/folder.svg
  24. 1 0
      admin-web/src/assets/mime/jpg.svg
  25. 1 0
      admin-web/src/assets/mime/other.svg
  26. 0 0
      admin-web/src/assets/mime/pdf.svg
  27. 1 0
      admin-web/src/assets/mime/pptx.svg
  28. 1 0
      admin-web/src/assets/mime/rar.svg
  29. 1 0
      admin-web/src/assets/mime/txt.svg
  30. 1 0
      admin-web/src/assets/mime/video.svg
  31. 0 0
      admin-web/src/assets/mime/web.svg
  32. 1 0
      admin-web/src/assets/mime/xlsx.svg
  33. 271 0
      admin-web/src/components/attach/Attach.vue
  34. 26 0
      admin-web/src/components/auth/auth.vue
  35. 27 0
      admin-web/src/components/auth/authAll.vue
  36. 32 0
      admin-web/src/components/auth/auths.vue
  37. 112 0
      admin-web/src/components/avatar/index.vue
  38. 103 0
      admin-web/src/components/editor/index.vue
  39. 81 0
      admin-web/src/components/form/ExtBoolean.vue
  40. 74 0
      admin-web/src/components/form/ExtButton.vue
  41. 175 0
      admin-web/src/components/form/ExtCaptcha.vue
  42. 32 0
      admin-web/src/components/form/ExtClipboard.vue
  43. 64 0
      admin-web/src/components/form/ExtColor.vue
  44. 966 0
      admin-web/src/components/form/ExtCron.vue
  45. 158 0
      admin-web/src/components/form/ExtDLabel.vue
  46. 53 0
      admin-web/src/components/form/ExtDRadio.vue
  47. 118 0
      admin-web/src/components/form/ExtDSelect.vue
  48. 256 0
      admin-web/src/components/form/ExtDatePicker.vue
  49. 185 0
      admin-web/src/components/form/ExtForm.vue
  50. 87 0
      admin-web/src/components/form/ExtIcon.vue
  51. 119 0
      admin-web/src/components/form/ExtImport.vue
  52. 76 0
      admin-web/src/components/form/ExtPage.vue
  53. 57 0
      admin-web/src/components/form/ExtProgress.vue
  54. 19 0
      admin-web/src/components/form/ExtRender.vue
  55. 205 0
      admin-web/src/components/form/ExtSContainer.vue
  56. 222 0
      admin-web/src/components/form/ExtSearch.vue
  57. 128 0
      admin-web/src/components/form/ExtSelect.vue
  58. 189 0
      admin-web/src/components/form/ExtTable.vue
  59. 107 0
      admin-web/src/components/form/ExtTag.vue
  60. 20 0
      admin-web/src/components/form/ExtTip.vue
  61. 307 0
      admin-web/src/components/form/ExtTreeSelect.vue
  62. 564 0
      admin-web/src/components/form/ExtUpload.vue
  63. 241 0
      admin-web/src/components/iconSelector/index.vue
  64. 84 0
      admin-web/src/components/iconSelector/list.vue
  65. 191 0
      admin-web/src/components/noticeBar/index.vue
  66. 158 0
      admin-web/src/components/preview/Preview.vue
  67. 21 0
      admin-web/src/components/rich/index.vue
  68. 323 0
      admin-web/src/components/section/ExtQuerySection.vue
  69. 63 0
      admin-web/src/components/svgIcon/index.vue
  70. 45 0
      admin-web/src/directive/authDirective.ts
  71. 55 0
      admin-web/src/directive/customDirective.ts
  72. 16 0
      admin-web/src/directive/index.ts
  73. 68 0
      admin-web/src/i18n/index.ts
  74. 193 0
      admin-web/src/i18n/lang/en.ts
  75. 193 0
      admin-web/src/i18n/lang/zh-cn.ts
  76. 192 0
      admin-web/src/i18n/lang/zh-tw.ts
  77. 13 0
      admin-web/src/i18n/pages/formI18n/en.ts
  78. 13 0
      admin-web/src/i18n/pages/formI18n/zh-cn.ts
  79. 13 0
      admin-web/src/i18n/pages/formI18n/zh-tw.ts
  80. 29 0
      admin-web/src/i18n/pages/login/en.ts
  81. 28 0
      admin-web/src/i18n/pages/login/zh-cn.ts
  82. 28 0
      admin-web/src/i18n/pages/login/zh-tw.ts
  83. 160 0
      admin-web/src/layout/component/aside.vue
  84. 281 0
      admin-web/src/layout/component/columnsAside.vue
  85. 18 0
      admin-web/src/layout/component/header.vue
  86. 65 0
      admin-web/src/layout/component/main.vue
  87. 25 0
      admin-web/src/layout/footer/index.vue
  88. 56 0
      admin-web/src/layout/index.vue
  89. 352 0
      admin-web/src/layout/lockScreen/index.vue
  90. 78 0
      admin-web/src/layout/logo/index.vue
  91. 71 0
      admin-web/src/layout/main/classic.vue
  92. 71 0
      admin-web/src/layout/main/columns.vue
  93. 71 0
      admin-web/src/layout/main/defaults.vue
  94. 58 0
      admin-web/src/layout/main/transverse.vue
  95. 150 0
      admin-web/src/layout/navBars/breadcrumb/breadcrumb.vue
  96. 53 0
      admin-web/src/layout/navBars/breadcrumb/closeFull.vue
  97. 112 0
      admin-web/src/layout/navBars/breadcrumb/index.vue
  98. 107 0
      admin-web/src/layout/navBars/breadcrumb/notification.vue
  99. 125 0
      admin-web/src/layout/navBars/breadcrumb/search.vue
  100. 826 0
      admin-web/src/layout/navBars/breadcrumb/setings.vue

+ 11 - 0
admin-web/.env

@@ -0,0 +1,11 @@
+# port 端口号
+VITE_PORT = 8888
+
+# open 运行 npm run dev 时自动打开浏览器
+VITE_OPEN = false
+
+# public path 配置线上环境路径(打包)、本地通过 http-server 访问时,请置空即可
+VITE_PUBLIC_PATH = /admin/
+
+#公钥
+VITE_PUBLIC_KEY = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDNc4Zrvk3E0mUkO8NOeNYOOaPI4uLoBAuDt9Rp0urX7y0wq7vvQzytvwzXXeM9Xp89j7g4ZLR7qBLBCj3QNPH0SUjE1yy9KVBKdjkPre7WT+plS74s2rJz/hygKiJ3Vxa+Z15v6JEHy/3/+i9gW3p/bCLaMQtvGemNvDXwCTwINQIDAQAB

+ 6 - 0
admin-web/.env.development

@@ -0,0 +1,6 @@
+# 本地环境
+ENV = development
+
+# 本地环境接口地址
+VITE_API_URL = http://localhost:8080/
+VITE_FILE_URL = http://localhost:8080/file/download/

+ 6 - 0
admin-web/.env.production

@@ -0,0 +1,6 @@
+# 线上环境
+ENV = production
+
+# 线上环境接口地址
+VITE_API_URL =
+VITE_FILE_URL =

+ 18 - 0
admin-web/.eslintignore

@@ -0,0 +1,18 @@
+
+*.sh
+node_modules
+lib
+*.md
+*.scss
+*.woff
+*.ttf
+.vscode
+.idea
+dist
+mock
+public
+bin
+build
+config
+index.html
+src/assets

+ 77 - 0
admin-web/.eslintrc.js

@@ -0,0 +1,77 @@
+module.exports = {
+	root: true,
+	env: {
+		browser: true,
+		es2021: true,
+		node: true,
+	},
+	parser: 'vue-eslint-parser',
+	parserOptions: {
+		ecmaVersion: 12,
+		parser: '@typescript-eslint/parser',
+		sourceType: 'module',
+	},
+	extends: ['plugin:vue/vue3-essential', 'plugin:vue/essential', 'eslint:recommended'],
+	plugins: ['vue', '@typescript-eslint'],
+	overrides: [
+		{
+			files: ['*.ts', '*.tsx', '*.vue'],
+			rules: {
+				'no-undef': 'off',
+				'no-console': 'off',
+			},
+		},
+	],
+	rules: {
+		// http://eslint.cn/docs/rules/
+		// https://eslint.vuejs.org/rules/
+		// https://typescript-eslint.io/rules/no-unused-vars/
+		'@typescript-eslint/ban-ts-ignore': 'off',
+		'@typescript-eslint/explicit-function-return-type': 'off',
+		'@typescript-eslint/no-explicit-any': 'off',
+		'@typescript-eslint/no-var-requires': 'off',
+		'@typescript-eslint/no-empty-function': 'off',
+		'@typescript-eslint/no-use-before-define': 'off',
+		'@typescript-eslint/ban-ts-comment': 'off',
+		'@typescript-eslint/ban-types': 'off',
+		'@typescript-eslint/no-non-null-assertion': 'off',
+		'@typescript-eslint/explicit-module-boundary-types': 'off',
+		'@typescript-eslint/no-redeclare': 'error',
+		'@typescript-eslint/no-non-null-asserted-optional-chain': 'off',
+		'@typescript-eslint/no-unused-vars': [2],
+		'vue/custom-event-name-casing': 'off',
+		'vue/attributes-order': 'off',
+		'vue/one-component-per-file': 'off',
+		'vue/html-closing-bracket-newline': 'off',
+		'vue/max-attributes-per-line': 'off',
+		'vue/multiline-html-element-content-newline': 'off',
+		'vue/singleline-html-element-content-newline': 'off',
+		'vue/attribute-hyphenation': 'off',
+		'vue/html-self-closing': 'off',
+		'vue/no-multiple-template-root': 'off',
+		'vue/require-default-prop': 'off',
+		'vue/no-v-model-argument': 'off',
+		'vue/no-arrow-functions-in-watch': 'off',
+		'vue/no-template-key': 'off',
+		'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',
+		'generator-star-spacing': 'off',
+		'no-unreachable': 'off',
+		'no-multiple-template-root': 'off',
+		'no-unused-vars': 'error',
+		'no-v-model-argument': 'off',
+		'no-case-declarations': 'off',
+		'no-console': 'error',
+		'no-redeclare': 'off',
+	},
+};

+ 23 - 0
admin-web/.gitignore

@@ -0,0 +1,23 @@
+.DS_Store
+node_modules
+/dist
+
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

+ 39 - 0
admin-web/.prettierrc.js

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

+ 463 - 0
admin-web/CHANGELOG.md

@@ -0,0 +1,463 @@
+# <a href="https://gitee.com/lyt-top/vue-next-admin" target="_blank">vue-next-admin 更新日志</a>
+
+🎉🎉🔥 `vue-next-admin` 基于 vue3.x 、Typescript、vite、Element plus 等,适配手机、平板、pc 的后台开源免费模板库(vue2.x 请切换 vue-prev-admin 分支)
+
+## 2.4.31
+
+`2023.03.10`
+
+- 🌟 更新 依赖更新最新版本
+- 🐞 修复 顶栏背景渐变设置不生效
+- 🐞 修复 顶栏背景渐变、菜单背景渐变时,深色主题不生效
+- 🐞 修复 顶栏搜索框移动端显示问题
+- 🎯 优化 `main.ts`,相关 issues [#I6KNFH](https://gitee.com/lyt-top/vue-next-admin/issues/I6KNFH)、[#I6JRH6](https://gitee.com/lyt-top/vue-next-admin/issues/I6JRH6)
+- 🎯 优化 菜单横向模式显示(horizontal)
+- 🎯 优化 分栏布局,[希望分栏布局做一下优化,在没有二级菜单的时候,直接全屏展示一级菜单链接](https://gitee.com/lyt-top/vue-next-admin/issues/I6HW7H),感谢[@jiuping](https://gitee.com/jiuping),`tagsview` 点击时处理 `收起/展开` 菜单
+
+## 2.4.3
+
+`2023.02.22`
+
+🚩🚩🚩 感谢 [驰骋工作流引擎-表单引擎-低代码开发平台](http://www.ccflow.org/) 赞助商的赞助。驰骋公司为社会提供流程引擎+表单引擎+低代码开发平台一体的开源软件解决方案,欢迎广大开发者前去体验!
+
+- 🌟 更新 依赖更新最新版本
+- 🎉 新增 赞助商组件(`/src/layout/sponsors`),[项目目录结构查看](https://lyt-top.gitee.io/vue-next-admin-doc-preview/config/)
+- 🐞 修复 [过滤筛选组件展开点击不了](https://gitee.com/lyt-top/vue-next-admin/issues/I688WG)
+- 🐞 修复 [设置锁屏时间时直接白屏了不能恢复,除非删除主题配置才会重新加载](https://gitee.com/lyt-top/vue-next-admin/issues/I6AF8P),感谢[@baizunxian](https://gitee.com/xb_xiaobai)
+- 🐞 修复 `分栏布局` 地址栏输入不存在的路由报错问题
+- 🎨 合并 [!44 tagsViewName 正则匹配错误,匹配到含 en 单词](https://gitee.com/lyt-top/vue-next-admin/pulls/44/files),感谢[@tony 星](https://gitee.com/tony_tong_xin)
+- 🎨 合并 [!45 fix 地址栏出现 false 问题](https://gitee.com/lyt-top/vue-next-admin/pulls/45),感谢[@随心](https://gitee.com/jiangqiang1996)
+- 🎯 优化 `/src/utils/storage` 下 `key` 编写成 `${__NEXT_NAME__}:${key}`,防止部署多套系统到同一域名不同目录时,变量共用的问题(`__NEXT_NAME__`为 `package.json` 中的 `name`)
+- 🎯 优化 watermark 单词拼写错误
+
+## 2.4.21
+
+`2022.12.12`
+
+- 🌟 更新 依赖更新最新版本
+- 🎉 新增 菜单背景高亮颜色可自定义,通过 `布局配置 -> 菜单设置 -> 菜单高亮背景色` 进行设置
+- 🐞 修复 `分栏布局` 二级导航菜单内容多时,无法滚动问题,感谢群友@静雨轩主人
+- 🐞 修复 [!42 修复 工作流无法添加新节点问题](https://gitee.com/lyt-top/vue-next-admin/pulls/42),感谢[@beta](https://gitee.com/beta_dz)
+- 🎯 优化 `/make/tableDemo` 表头很多时,无法滚动问题,感谢群友@糊涂涂涂
+
+## 2.4.2
+
+`2022.12.09`
+
+- 🌟 更新 依赖更新最新版本
+- 🎉 新增 国际化自动导入文件功能,只需在 `/src/i18n/pages` 下新建文件夹定义即可
+- 🎉 新增 `/make/tableDemo` 中 [搜索框展开,收缩功能,高级筛选组件 有计划做吗](https://gitee.com/lyt-top/vue-next-admin/issues/I6511L)
+- 🐞 修复 [!40 开启 TagsView 缓存后,刷新后所有的路由都变成组件缓存了](https://gitee.com/lyt-top/vue-next-admin/pulls/40),感谢[@mrjimin](https://gitee.com/mrjimin)
+- 🐞 修复 [!41 修复 get 请求传递嵌套对象或数组时无法正常编码问题](https://gitee.com/lyt-top/vue-next-admin/pulls/41),感谢[@随心](https://gitee.com/jiangqiang1996)
+- 🐞 修复 组件 wangEditor 回显值的问题
+- 🐞 修复 `/fun/echartsMap`(地理坐标/地图)、`visualizingDemo2`(数据可视化演示 2) 演示报错问题
+- 🎯 优化 版本升级提示
+- 🎯 优化 无权限登录时增加提示信息,[BUG:因前端加载路由(initFrontEndControlRoutes)中当前用户角色为一个陌生角色, 导致 router.beforeEach 会死循环 浏览器崩溃](https://gitee.com/lyt-top/vue-next-admin/issues/I64HVO),感谢[@canroc](https://gitee.com/canroc)、[@随心](https://gitee.com/jiangqiang1996)
+- 🌈 重构 `/views/system` 新增修改组件合并。[可以把新增修改组件合并成一个吧](https://gitee.com/lyt-top/vue-next-admin/issues/I64WES)
+- 🌈 重构 图标选择器,[图标选择器没办法筛选,只能筛选 ali 的](https://gitee.com/lyt-top/vue-next-admin/issues/I64HZD),感谢[@随心](https://gitee.com/jiangqiang1996)
+
+## 2.4.1
+
+`2022.11.30`
+
+- 🎉 新增 版本升级提示
+- 🐞 修复 [先打开 F12 再登录进去,然后改变浏览器大小 js 报错](https://gitee.com/lyt-top/vue-next-admin/issues/I63ZZT),感谢[@Quber](https://gitee.com/quber)
+
+## 2.4.0
+
+`2022.11.29`
+
+⚡⚡⚡ 此版为破坏性更新,应群友建议 `script lang="ts"` 改 `script lang="ts" setup 语法糖`。
+
+- 🌟 更新 依赖更新最新版本
+- 🎉 新增 表格封装演示,路径:`组件封装 -> 表格封装演示`
+- 🎉 新增 master 分支 script lang="ts" 改成 script lang="ts" setup 语法糖,将同步基础分支
+- 🐞 修复 [v2.3.0 版本报错问题处理](https://gitee.com/lyt-top/vue-next-admin/issues/I623RP)
+- 🐞 修复 [el-backtop 滚动高度不触发(固定了 header)](https://gitee.com/lyt-top/vue-next-admin/issues/I63N0D),感谢[@dejavuuuuu](https://gitee.com/zc19951010)
+- 🎯 优化 完善 ts 类型,删除根目录 `plugins.d.ts、shim.d.ts、source.d.ts`,移入到 `/src/types/global.d.ts`
+- 🎯 优化 代码 `watch` 移动到 `生命周期钩子` 最后,文字注释等
+
+## 2.3.0
+
+`2022.11.16`
+
+- 🌟 更新 依赖更新最新版本
+- 🎉 新增 新版登录页
+- 🎉 新增 tagsview 鼠标中键 `关闭当前 tagsview`
+- 🎉 新增 `分栏菜单鼠标悬停预加载`。[分栏模式如何去掉鼠标悬浮父级菜单,分栏菜单自动加载的功能啊](https://gitee.com/lyt-top/vue-next-admin/issues/I5RUY7)。操作路径:`布局配置 -> 分栏设置`
+- 🐞 修复 [vue-i18n](https://vue-i18n.intlify.dev/api/general.html#createi18n) 报错,[!39 修复 i18n 兼容性问题](https://toscode.gitee.com/lyt-top/vue-next-admin/pulls/39/files),感谢[@随心](https://toscode.gitee.com/jiangqiang1996)
+- 🐞 修复 顶栏搜索功能点击蒙蔽弹窗不关闭
+- 🐞 修复 [!38 fix: bug refreshRouterViewKey 值为 null 导致路由缓存第一次无效](https://toscode.gitee.com/lyt-top/vue-next-admin/pulls/38/files),感谢[@P)](https://toscode.gitee.com/foxp8y)
+- 🐞 修复 `路由参数 -> 普通路由/动态路由` 国际化演示时,`tagsView` 和 `浏览器标题` 显示异常。[演示中:路由参数界面 -> 动态路由,国际化显示时面包屑、浏览器标题有 bug](https://gitee.com/lyt-top/vue-next-admin/issues/I5JRJG)
+- 🐞 修复 `路由参数 -> 普通路由/动态路由` 动态设置 `tagsViewName` 时,`tagsView 右键菜单刷新` 功能失效(也就是路由后面有参数时,query、params)。[普通或动态路由新建页面后点击 tagview 刷新无效](https://gitee.com/lyt-top/vue-next-admin/issues/I5K3YO),感谢[@dejavuuuuu](https://gitee.com/zc19951010)
+- 🐞 修复 [表单(el-form)中,字体图标偏移问题](https://gitee.com/lyt-top/vue-next-admin/issues/I5K1PM)
+- 🐞 修复 路由 `router.addRoute` 时,一直提示 `No match found for location with path 'xxx'`
+- 🎯 优化 全局 `getCurrentInstance` 替换成 [`provide/inject`](https://cn.vuejs.org/api/application.html#app-provide) 或通过 `ref` 处理
+- 🎯 优化 引入组件方式 `(import xxx from xxx)` 改成 `defineAsyncComponent(() => import(xxx))`
+- 🎯 优化 页面高度 100% 问题,重写布局配置 `界面设置 -> 固定 Header` 多余的 `el-scrollbar` 逻辑、重写各界面需 `计算属性 computed` 设置动态高度问题(改为 css `flex` 设置自适应高度,具体查看文档:[设置可视区高度 100%](https://lyt-top.gitee.io/vue-next-admin-doc-preview/config/otherIssues/#%E8%AE%BE%E7%BD%AE%E5%8F%AF%E8%A7%86%E5%8C%BA%E9%AB%98%E5%BA%A6-100)。[!31 修复页面样式无法通过百分比设置的问题](https://toscode.gitee.com/lyt-top/vue-next-admin/pulls/31),感谢[@LostDeer](https://toscode.gitee.com/lyt-top/vue-next-admin/pulls/31/files)。`(改动较大,删除多余代码)`
+- 🎯 优化 [wangeditor](https://www.wangeditor.com/) 组件,`@wangeditor/editor-for-vue`。可自行修改,组件位置:`/src/components/editor`。相关 Issues:[wangeditor 编辑器多个菜单不能回弹](https://gitee.com/lyt-top/vue-next-admin/issues/I5M5H7)
+- 🌈 重构 外链、内嵌 iframe 逻辑 + 美化,iframe 支持缓存
+
+## 2.2.0
+
+`2022.07.10`
+
+⚡⚡⚡ [/sec/stores/userInfo.ts](https://gitee.com/lyt-top/vue-next-admin/blob/master/src/stores/userInfo.ts) 下添加了 `getApiUserInfo` 接口模拟数据 `setTimeout` 为 3 秒
+
+- 🌟 更新 依赖更新最新版本
+- 🐞 修复 [主界面重新授权按钮点击卡死不跳转登录界面#I5C3JS](https://gitee.com/lyt-top/vue-next-admin/issues/I5C3JS),感谢[@Hero-Typ](https://gitee.com/tian_yu_peng)
+- 🐞 修复 编译警告[#I5CVSB](https://gitee.com/lyt-top/vue-next-admin/issues/I5CVSB),全局替换成 `:deep(attr)`,感谢[@Linvas](https://gitee.com/linvas)。参考文档:[vue3 sfc-style](https://v3.cn.vuejs.org/api/sfc-style.html#style-scoped)。`node_modules\print-js\dist\print.js` 需 `print-js` 作者适配或去除 `package.json` 中的 `"print-js": "^1.6.0"`
+- 🐞 修复 [vue-next-admin-template-js 版本前端控制路由:userInfo.js 请求用户信息接口报错,加载不到路由 可以写个定时器模拟一下接口 一样的报错#I5F1HP](https://gitee.com/lyt-top/vue-next-admin/issues/I5F1HP),感谢[@白开水](https://gitee.com/libin951223)
+
+## 2.1.1
+
+`2022.05.27`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 深色模式下,`<el-button text></el-button>` 时,`:active` 样式
+- 🎯 优化 [页面缓存在刷新之后失效 #I58U75](https://gitee.com/lyt-top/vue-next-admin/issues/I58U75)),感谢[@ls0428](https://gitee.com/ls0428)
+- 🎯 优化 [SvgIcon 对下载的 Svg 图像设置颜色无效 #I59ND0](https://gitee.com/lyt-top/vue-next-admin/issues/I59ND0)),感谢[@elus_z](https://gitee.com/elus_z)
+- 🎯 优化 `/src/utils/toolsValidate.ts` 工具类
+- 🐞 修复 [布局切换,TagsView 显示的 tab 会多一个出来 #I58WGM](https://gitee.com/lyt-top/vue-next-admin/issues/I58WGM),感谢[@lg_boy](https://gitee.com/lg_boy)
+- 🐞 修复 [如果设置顶部面包屑导航开启图标 isBreadcrumbIcon=true 后,样式有点问题 如果不开启就是正常的 #I58VB8](https://gitee.com/lyt-top/vue-next-admin/issues/I58VB8)
+- 🐞 修复 地址栏路由地址输入错误时,返回首页后,再次输入路由地址错误时,不跳转 404 问题
+- 🐞 修复 [2.1.0 版本的图标选择组件多次点击后功能失效 #I590TH](https://gitee.com/lyt-top/vue-next-admin/issues/I590TH),感谢[@quber](https://gitee.com/quber)
+
+## 2.1.0
+
+`2022.04.18`
+
+⚡⚡⚡ 此版本为破环性更新,优化内容如下:(谨慎更新!谨慎更新!!谨慎更新!!!)。因为 `vuex` 替换成 `pinia`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 部分界面图片不显示问题(更换 gitee 在线图片地址源)
+- 🎯 优化 各界面方法引入与逻辑之间添加一行空行,方便区分内容
+- 🎯 优化 图标选择器 [#I4YAHB](https://gitee.com/lyt-top/vue-next-admin/issues/I4YAHB),感谢[@真有你的](https://gitee.com/sunliusen)
+- 🎯 优化 图标选择器 icon type 类型为 all 时,类型 ali、ele、awe 回显问题
+- 🎯 优化 去掉开发环境 i18n 控制台警告,页面代码:[i18n/index.ts](https://gitee.com/lyt-top/vue-next-admin/blob/master/src/i18n/index.ts)
+- 🎯 优化 `NextLoading.start()` 方法,防止第一次进入界面时出现短暂空白
+- 🎯 优化 地址栏有参数退出登录,再次登录不跳之前界面问题 `src/layout/navBars/breadcrumb/user.vue`
+- 🎯 优化 `SvgIcon` 组件,防止 `开启 Tagsview 图标` 时,`tagsView 右键菜单关闭` 报错问题,工作流不可连线、全屏时关闭按钮消失问题
+- 🎯 优化 [如果 url 中有中文等特殊字符,第一次切换该 tab 时 keep-alive 失效#I55JS7](https://gitee.com/lyt-top/vue-next-admin/issues/I55JS7),感谢[yuyong1566](https://gitee.com/yuyong1566)
+- 🎯 优化 [wangEditor](https://www.wangeditor.com/) 更新到 v5,[vue3 版本线上示例中 wangeditor 富文本编辑器 demo 实例,无法换行#I5565B](https://gitee.com/lyt-top/vue-next-admin/issues/I5565B),感谢@[jenchih](https://gitee.com/jenchih)
+- 🎯 优化 [在关闭 tagview 时,高度刷新时会会变化,出现滚动条](https://gitee.com/lyt-top/vue-next-admin/issues/I55FHM),感谢[张松](https://gitee.com/zs310071113)
+- 🎯 优化 [路由参数](https://lyt-top.gitee.io/vue-next-admin-preview/#/params/common)演示
+- 🎉 新增 [vuex](https://vuex.vuejs.org/) 替换成 [pinia](https://pinia.vuejs.org/getting-started.html)
+- 🎉 新增 tagsView 支持自定义 tagsView 名称(文章详情时有用),前往体验:[路由参数/普通路由](https://lyt-top.gitee.io/vue-next-admin-preview/#/params/common)。新增 tagsView 支持自定义名称国际化,感谢[@q7but](https://gitee.com/q7but)、[!22 add 添加自定义 tagVIewName 拓展,支持国际化](https://gitee.com/lyt-top/vue-next-admin/pulls/22/files)、感谢[@tony_tong_xin](https://gitee.com/tony_tong_xin)
+- 🐞 修复 适配 `"element-plus": "^2.1.9",2.2.0` 版本
+- 🐞 修复 [导航栏横向布局后,一级菜单显示问题#I4Z3M3](https://gitee.com/lyt-top/vue-next-admin/issues/I4Z3M3)
+- 🐞 修复 横向布局三级及以上导航菜单高亮、导航高度不统一问题
+- 🐞 修复 分栏模式下,选中的菜单是 primary 样式,鼠标移入字也变成 primary 色了,感谢群友@孤夜-流殇
+- 🐞 修复 [vuex 里面改了颜色 但是不生效 #I4WFMA](https://gitee.com/lyt-top/vue-next-admin/issues/I4WFMA)
+- 🐞 修复 全局主题 primary 清空颜色后报错,[#I4X0LG](https://gitee.com/lyt-top/vue-next-admin/issues/I4X0LG),感谢[面向 BUG 编程](https://gitee.com/fhtfy)
+- 🐞 修复 [.eslintrc.js 文件 rules 标签名错误 #I53IPK](https://gitee.com/lyt-top/vue-next-admin/issues/I53IPK),感谢[yuyong1566](https://gitee.com/yuyong1566)
+- 🐞 修复 `开启 Tagsview 图标` 时,`tagsView 右键菜单关闭` 报错问题
+- 🐞 修复 `router.push` 路径找不到时报错问题,`404、401 界面` 已移入到 `main` 主布局里(之前全屏)
+- 🐞 修复 [全局修改组件大小失效了](https://gitee.com/lyt-top/vue-next-admin/issues/I551RP),感谢[lg_boy](https://gitee.com/lg_boy)
+- 🐞 修复 [修改一下配置时,需要每次都清理 `window.localStorage` 浏览器永久缓存,配置才会生效,问题解决#I567R1](https://gitee.com/lyt-top/vue-next-admin/issues/I567R1),感谢[@lanbao123](https://gitee.com/lanbao123)
+- 🐞 修复 [标记为需要缓存的 tab 页后,再次从左侧菜单打开,还是显示被缓存的页面内容#I4UY3G](https://gitee.com/lyt-top/vue-next-admin/issues/I4UY3G),感谢@axcc1234、特别感谢群友@华仔
+- 🌈 重构 路由(`/src/router/index.ts`)解决 No match found for location with path "xxx"(前端控制,后端控制未解决) 问题
+
+## 2.0.2
+
+`2022.03.04`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 Alert 提示添加边框
+- 🎯 优化 功能 / 数字滚动 演示界面
+- 🐞 修复 全局主题按钮颜色 :active 问题
+- 🐞 修复 Dropdown 下拉菜单样式问题
+- 🐞 修复 SvgIcon 图标组件动态切换时报警告问题,[SvgIcon 改变 name 时可能导致图像不显示](https://gitee.com/lyt-top/vue-next-admin/issues/I4VGE0),感谢@axcc1234
+
+## 2.0.1
+
+`2022.02.25`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 svgIcon 图标组件
+- 🎯 优化 vite.config.ts 打包,感谢群友@YourObjec
+- 🐞 修复 tagViews 开启图标不显示问题(风格 5),感谢群友@坏人
+- 🐞 修复 [Element Plus 1.2.0-beta.6 以后的版本 el-table 在移动端无法左右滑动](https://gitee.com/lyt-top/vue-next-admin/issues/I4UPTP),感谢@YGDada
+
+## 2.0.0
+
+`2022.02.21`
+
+⚡⚡⚡ 此版本为破环性更新,优化内容如下:(谨慎更新!谨慎更新!!谨慎更新!!!)。演示界面建议直接覆盖文件。如需使用之前版本,请前往[gitee 发行版](https://gitee.com/lyt-top/vue-next-admin/releases) 进行对应版本下载。基础版会基于 `master` 分支进行修改
+
+- 🌟 更新 依赖更新最新版本
+- 🌟 更新 登录页、首页
+- 💔 移除 vue-web-screen-shot
+- 💔 移除 城市多级联动,完整 json 数据请去 [vue-next-admin-images/menu](https://gitee.com/lyt-top/vue-next-admin-images/tree/master/menu) 仓库查看
+- 💔 移除 功能/echartsTree 树图
+- 💔 移除 其它设置/Tagsview 风格 2、Tagsview 风格 3
+- 💔 移除 功能/验证器
+- 🚧 调整 src/api 编写方式
+- 🚧 调整 自定义封装公用组件演示,更好的维护
+- 🎉 新增 Volar 支持,vs code 配置参考 [Vue Language Features (Volar)](https://lyt-top.gitee.io/vue-next-admin-doc-preview/home/vscode/)
+- 🎉 新增 `SvgIcon` 支持本地 svg 图标使用
+- 🎉 新增 表单表格验证演示
+- 🎯 优化 全局主题(移除 success、info、warning、danger)
+- 🎯 优化 工作流(开源)
+- 🎯 优化 element plus svg 图标,`elementXXX` 改成 `ele-XXX`
+- 🌈 重构 深色模式
+- 🌹 合并 [处理 parent 的 h100 由于外层有 min-height 导致失效的问题](https://gitee.com/lyt-top/vue-next-admin/pulls/20),感谢@MaxNull、@21030442-mao
+- 🐞 修复 element plus 升级 `^1.3.0-beta.5` 后 组件 size 大小问题(大改:涉及布局、演示界面)
+- 🐞 修复 vs code 使用 Vue Language Features (Volar) 插件 代码报红问题(可以把公用的 ts 类型定义封装起来公用)
+
+## 1.2.2
+
+`2021.12.21`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 iframes 滚动条问题
+- 🎯 优化 部署后每次都要强制刷新清浏览器缓存问题
+- 🎉 新增 工具类百分比验证演示
+- 🐞 修复 [tag-view 标签右键会超出浏览器 #I4KN78](https://gitee.com/lyt-top/vue-next-admin/issues/I4KN78)
+
+## 1.2.1
+
+`2021.12.12`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 cropper 裁剪时卡顿问题 [#I4M2VQ](https://gitee.com/lyt-top/vue-next-admin/issues/I4M2VQ)
+- 🎯 优化 Wangeditor 富文本编辑器的问题 [#I4LPC1](https://gitee.com/lyt-top/vue-next-admin/issues/I4LPC1)、[#I4LM7I](https://gitee.com/lyt-top/vue-next-admin/issues/I4LM7I)
+- 🐞 修复 浏览器标题问题
+- 🐞 修复 element plus svg 图标引入
+- 🐞 修复 工作流不可以拖线连接问题
+
+## 1.2.0
+
+`2021.11.28`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 深色模式
+- 🎯 优化 `/@/utils` 文件夹,合并删除单一内容
+- 🎯 优化 系统设置:菜单管理(新增、修改)、角色管理(新增菜单权限)、用户管理、部门管理、字典管理
+- 🎯 优化 登录界面逻辑、权限管理逻辑
+- 🎯 优化 同步 [vue-next-admin-images](https://gitee.com/lyt-top/vue-next-admin-images/tree/master/menu) 后端控制菜单模拟数据
+- 🎉 新增 适配 Font Icon 向 SVG Icon 迁移(改动大,"element-plus": "^1.2.0-beta.4" 谨慎更新)
+- 🐞 修复 热更新问题,感谢@甜蜜蜜
+- 🐞 修复 页面/element 字体图标演示
+- 🐞 修复 功能/图标选择器演示,新增高级功能 [issues #I4GJXQ](https://gitee.com/lyt-top/vue-next-admin/issues/I4GJXQ)
+
+## 1.1.2
+
+`2021.10.17`
+
+- 🌟 更新 依赖更新最新版本
+- 🐞 修复 开启全屏时,刷新界面被还原成未全屏的状态
+- 🎯 优化 tagsView 右键菜单关闭逻辑
+- 🎯 优化 wangeditor 富文本编辑器(增加双向绑定)
+- 🎉 新增 工作流(暂不开源)
+- 🎉 新增 基础版 ts(不带国际化),切换 `vue-next-admin-template` 分支
+
+## 1.1.1
+
+`2021.09.25`
+
+- 🌟 更新 依赖更新最新版本(`"element-plus": "^1.1.0-beta.13"` 版本运行错误,`^1.1.0-beta.16`修复横向菜单卡死问题)
+- 🐞 修复 Dialog 弹窗位置错误、Drawer 抽屉内边距、el-menu 菜单收起时背景色问题
+- 🎯 优化 锁屏界面自动锁屏(s/秒)必须设置至少 1 秒
+- 🎉 新增 分栏布局,鼠标移入当前项时,显示当前项菜单内容
+- 🎉 新增 工作流(未完成)
+
+## 1.1.0
+
+`2021.09.10`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 小屏模式下登录页二维码遮挡标题问题
+- 🎉 新增 图片验证器
+- 🎉 新增 动态复杂表单
+- 🎉 新增 工作流(未完成)
+- 🎉 新增 深色主题(伪深色,样式变动大,谨慎更新)
+
+## 1.0.18
+
+`2021.08.29`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 权限组件去掉顶级 div(`/src/components/auth`)
+- 🎉 新增 布局配置添加恢复默认按钮
+- 🐞 修复 升级 <a href="https://element-plus.gitee.io/#/zh-CN/component/changelog" target="_blank">element plus 1.1.0-beta.7</a>后项目无法启动、el-menu 菜单
+- 🐞 修复 表格固定列时的层级、设置了相对定位时,遮挡左侧导航菜单问题
+
+## 1.0.17
+
+`2021.08.22`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 去除设置布局切换,重置主题样式(initSetLayoutChange),切换布局需手动设置样式,设置的样式自动同步各布局
+- 🎯 优化 Dropdown 下拉菜单用户账号靠边时换行问题
+- 🎯 优化 左侧导航菜单,共用菜单树,防止 `布局配置` 设置 `菜单 / 顶栏` 时,样式丢失等问题
+- 🐞 修复 固定 header 后没有回到顶部的 bug,拉取项目后运行不起来的 bug。<a href="https://gitee.com/lyt-top/vue-next-admin/pulls/14" target="_blank">!14</a>,感谢<a href="https://gitee.com/wjs0509" target="_blank">@wjs0509</a>
+- 🐞 修复 tagView 右键全屏后,浏览器窗口大小发生任何变化都会导致左边菜单显示出来,并且可点击打开对应页面。<a href="https://gitee.com/lyt-top/vue-next-admin/issues/I46E6T" target="_blank">I46E6T</a>
+- 🐞 修复 默认设置 `菜单 / 顶栏` 样式不生效问题(/@/src/store/modules/themeConfig.ts)
+
+## 1.0.16
+
+`2021.08.14`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 菜单高亮(详情且详情设置了 meta.isHide 时,顶级菜单高亮),感谢群友@YourObject
+- 🎯 优化 详情路径写法:如父级(/pages/filtering),那么详情为(/pages/filtering/details?id=1)。这样写可实现(详情时,父级菜单高亮),否则写成(/pages/filteringDetails?id=1)顶级菜单将不会高亮。可参考:`页面/过滤筛选组件`,点击当前图片进行测试
+- 🎯 优化 tagsView 右键菜单全屏时,打开的界面高度问题
+- 🎯 优化 图表批量 resize 问题
+- 🐞 修复 菜单收起时(设置全局主题:primary 且有二级菜单时),文字高亮颜色不对
+- 🐞 修复 国际化 <a href="https://gitee.com/lyt-top/vue-next-admin/issues/I43NPE" target="_blank">#I43NPE</a>。可参考:`页面/过滤筛选组件`,点击顶部语言切换,进行底部分页国际化查看
+
+## 1.0.15
+
+`2021.08.06`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 tagsView 右键菜单点击时的字段名(id 已修改成 contextMenuClickId)与路由中返回的 id 名冲突问题,感谢群友@伯牙已遇钟子期
+- 🎉 新增 多个 form 表单验证界面演示
+
+## 1.0.14
+
+`2021.07.29`
+
+- 🌟 更新 依赖更新最新版本(vue、vuex、vue-router),出现问题,请手动降级。版本查看:<a href="https://www.npmjs.com/" target="_blank">vnpm</a>
+- 🎯 优化 数据可视化图表演示加载卡顿问题、优化有图表的演示界面
+- 🎯 优化 路由参数演示界面
+- 🎯 优化 tagsView 操作演示界面,由于存在相同路由多标签,必须要传全部参数值(query 或者 params)
+- 🎉 新增 开启 TagsView 共用,开启时:(多个路由菜单共用一个详情组件(参数为后点击的覆盖前面点击的),tagsView 中只会出现一个(不支持同时出现多个 tagsView 标签))。关闭时:(多个路由菜单共用一个详情组件,参数不同,会同时出现多个 tagsView 标签)
+- 🐞 修复 tagsView 共用(单标签)时,右键菜单功能点击,参数不对的问题(第 2n+个参数未覆盖第一个参数值)
+- 🐞 修复 多 tagsView 标签(参数不同)、单个 tagsView 标签公用(参数不同)所带来的刷新功能、横向自动滚动等问题
+- 🐞 修复 处理全屏若干问题,<a href="https://gitee.com/lyt-top/vue-next-admin/pulls/12" target="_blank">pr!12</a>,感谢群友@另一个前端
+
+## 1.0.13
+
+`2021.07.25`
+
+- 🌟 更新 依赖更新最新版本
+- 🎉 新增 数据可视化演示界面(/visualizingDemo1、/visualizingDemo2)
+- 🎉 新增 登录页扫码登录
+
+## 1.0.12
+
+`2021.07.16`
+
+- 🌟 更新 依赖更新最新版本
+- 🎉 新增 数据可视化演示空界面(待完善)
+- 🎯 优化 tagsView 动态路由(xxx/:id/:name)时的右键菜单刷新、关闭其它时参数丢失问题(2021.07.15 优化)
+- 🐞 修复 路由带参数时,复制路径到登录页,跳转后参数消失的问题
+- 🐞 修复 设置多个外链,点击后,页面内容停留在上一个内容(内容未改变)、国际化处理、打开新窗口 sessionStorage 共享等
+
+## 1.0.11
+
+`2021.07.14`
+
+- 🌟 更新 依赖更新最新版本
+- 🎉 新增 路由参数、图片懒加载界面演示
+- ⚠️ 警告 Form 表单 `binding value must be a string or number`,解决:加上 `label-position="top"` 不报警告(等待官方修复)
+- 🎯 优化 锁屏界面动画效果、首页图表显示
+- 🎯 优化 tagsView 右键菜单 `关闭` 功能逻辑
+- 🐞 修复 开启 TagsView 拖拽报错及小于 `1000px` 时自动设置禁止拖拽(<a href="https://gitee.com/lyt-top/vue-next-admin/issues/I3ZRRI" target="_blank">#I3ZRRI</a>)
+- 🐞 修复 `iframe 内嵌、外链` 高度问题,使用 computed 进行计算
+- 🐞 修复 默认布局开启 `侧边栏 Logo` 与关闭 `菜单水平折叠`,切换到横向布局时,菜单看不见的问题
+- 🐞 修复 切换不同布局时,再去开启 `经典布局分割菜单` 功能不生效问题
+- 🐞 修复 浏览器窗口标题中/英文切换不实时生效的问题
+- 🐞 修复 切换布局时,某些功能不可以使用。部分界面不需要取消事件监听(proxy.mittBus.off('xxx'))
+- 🐞 修复 动态路由带参数,router-link 跳转问题(<a href="hhttps://gitee.com/lyt-top/vue-next-admin/issues/I3YX6G" target="_blank">#I3YX6G</a>)
+- 🐞 修复 横向菜单有二级菜单时,点击子级菜单不高亮问题
+- 🐞 修复 功能 tagsView 操作演示不生效
+
+## 1.0.10
+
+`2021.07.07`
+
+- 🌟 更新 依赖更新最新版本(字体图标无问题)
+- 🎯 优化 内嵌 iframe、外链,解决 tagsView 刷新问题
+
+## 1.0.9
+
+`2021.07.02`
+
+- 🌟 更新 依赖更新最新版本
+- 🎯 优化 图标选择器设置宽度、v-model 等问题
+- 🎯 优化 滚动通知栏在手机上的体验
+- 🎯 优化 系统管理/新增菜单(编辑菜单),使用 `图标选择器` 进行模拟
+- 🎯 优化 字体图标(自动载入) 逻辑
+- 🐞 修复 screenfull 全屏时,按键盘 esc 键图标不改变问题,感谢群友@伯牙已遇钟子期
+
+## 1.0.8
+
+`2021.06.29`
+
+- 🌟 更新 依赖更新最新版本
+- 🎉 新增 表单中英文切换演示
+- 🎯 优化 登录页查看密码 icon 图标
+- 🎯 优化 图标选择器
+- 🎯 优化 拖动指令
+- 🐞 修复 form 表单在页面小于 576px 时的排版问题
+
+## 1.0.7
+
+`2021.06.24`
+
+- 🌟 更新 依赖更新最新版本
+- 🎉 新增 拖动指令及其演示界面
+- 🎯 优化 锁屏界面,解锁提示
+- 🎯 优化 登录页在手机上显示的效果
+
+## 1.0.6
+
+`2021.06.23`
+
+- 🎯 优化 去掉内嵌 iframe 内边距(padding)
+- 🎯 优化 城市多级联动组件
+- 🎯 优化 Tree 树形控件改成表格组件
+- 🐞 修复 Cascader 级联选择器高度问题
+
+## 1.0.5
+
+`2021.06.22`
+
+- 🌟 更新 vite 降级为@vite2.3.7,降级方法 `cnpm install vite@2.3.7`,防止 element plus 字体图标消失
+- 🐞 修复 开启后端控制路由(isRequestRoutes = true)时,内嵌 iframe、外链不可使用的问题
+
+## 1.0.4
+
+`2021.06.19`
+
+- 🌟 更新 依赖更新最新版本("vite": "^2.3.7")热更新无问题
+- 🎉 新增 深克隆工具,方便开发,感谢<a href="https://gitee.com/kangert" target="_blank">@kangert</a>(<a href="https://gitee.com/lyt-top/vue-next-admin/pulls/6" target="_blank">#6</a>)
+- 🎯 优化 vuex 模块自动导入。感谢<a href="https://gitee.com/kangert" target="_blank">@kangert</a>(<a href="https://gitee.com/lyt-top/vue-next-admin/pulls/4" target="_blank">#4</a>),感谢群友@web 小学生-第五君
+- 🎯 优化 类型定义提高编码体验,修复不能将类型“string | undefined”分配给类型“string”的问题。感谢<a href="https://gitee.com/kangert" target="_blank">@kangert</a>(<a href="https://gitee.com/lyt-top/vue-next-admin/pulls/5" target="_blank">#5</a>)
+- 🎯 优化 `layout` 文件夹移动到与 `views` 文件夹同级(改动较大,`/@/views/layout` 变成 `/@/layout`)
+- 🎯 优化 页面有 `console.log` 时 `eslint` 不生效问题
+- 🎯 优化 页面、ts 中 `any` 类型问题(改动较大)
+- 🎯 优化 登录页在手机上显示的效果
+- 🎯 优化 多行注释信息,鼠标放到方法名即可查看,更加直观的知道方法参数等。引入方法时需去掉以 `.ts` 结尾的后缀(改动较大)
+- 🎯 优化 移除 `utils/storage.ts` 下的旧写法(改动较大)
+- 🎯 优化 拆分 `router` 下内容,路由、前端、后端控制分开写,方便理解
+- 🐞 修复 鼠标移入顶部用户信息栏 `开/关全屏` 文字反向问题
+- 🐞 修复 热更新时,NextLoading(界面 loading) 不消失问题 `window.nextLoading === undefined`
+- 🐞 修复 vuex 中不可以使用 `/@/api/xxx` 下的接口调用问题
+
+## 1.0.3
+
+`2021.06.02`
+
+- ❄️ 删除 G6 思维导图界面
+- 🌟 更新 手动更新 vue、vue-router、vuex 到最近最多人使用的版本,出现不可预测的问题请降低版本。版本查看:<a href="https://www.npmjs.com/package/vue" target="_blank">vue 版本查看</a>
+- 🐞 修复 开启后端控制路由 `isRequestRoutes` 在非首页刷新页面后,回到首页的问题,感谢群友@伯牙已遇钟子期
+
+## 1.0.2
+
+`2021.06.01`
+
+- 🌟 更新 依赖更新最新版本
+- 🐞 修复 菜单搜索中文不可以搜索的问题,感谢群友@逍遥天意
+
+## 1.0.1
+
+`2021.05.31`
+
+- 🎉 新增 更新日志文件 `CHANGELOG.md`,以后每次更新都会在这里显示对应内容
+- 🌟 更新 依赖更新最新版本
+- 🐞 修复 分栏、经典布局路由设置 `meta.isHide` 为 `true` 时报错问题,感谢群友@29、@芭芭拉
+- 🐞 修复 经典布局点击 `tagsView` 左侧菜单数据不变问题

+ 21 - 0
admin-web/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 lyt-Top
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

+ 144 - 0
admin-web/README.md

@@ -0,0 +1,144 @@
+<div align="center">
+	<img src="https://img-blog.csdnimg.cn/9efd5420327a46b7bd6d93524a97229d.png?x-oss-process=image/watermark,type_d3F5LXplbmhlaQ,shadow_50,text_Q1NETiBAbHl0LXRvcA==,size_14,color_FFFFFF,t_70,g_se,x_16">
+	<p align="center">
+		<a href="https://v3.vuejs.org/" target="_blank">
+			<img src="https://img.shields.io/badge/vue.js-vue3.x-green" alt="vue">
+		</a>
+		<a href="https://element-plus.gitee.io/#/zh-CN/component/changelog" target="_blank">
+			<img src="https://img.shields.io/badge/element--plus-%3E1.0.0-blue" alt="element plus">
+		</a>
+		<a href="https://www.tslang.cn/" target="_blank">
+	    <img src="https://img.shields.io/badge/typescript-%3E4.0.0-blue" alt="typescript">
+	  </a>
+		<a href="https://vitejs.dev/" target="_blank">
+		  <img src="https://img.shields.io/badge/vite-%3E2.0.0-yellow" alt="vite">
+		</a>
+		<a href="https://gitee.com/lyt-top/vue-next-admin/blob/master/LICENSE" target="_blank">
+		  <img src="https://img.shields.io/badge/license-MIT-success" alt="license">
+		</a>
+	</p>
+	<p>&nbsp;</p>
+</div>
+
+#### 💝 长期赞助商
+
+<a href="http://www.ccflow.org/" target="_blank">
+	<img src="./src/assets/ccflowRightNextAdmin.png" width="50%" height="70px">
+</a>
+
+#### 🌈 介绍
+
+基于 vue3.x + CompositionAPI setup 语法糖 + typescript + vite + element plus + vue-router-next + pinia 技术,适配手机、平板、pc 的后台开源免费模板,希望减少工作量,帮助大家实现快速开发。
+
+#### ⛱️ 线上预览
+
+- vue3.x 版本预览(vue-next-admin)<a href="https://lyt-top.gitee.io/vue-next-admin-preview/#/login" target="_blank">https://lyt-top.gitee.io/vue-next-admin-preview/#/login</a>
+- vue2.x 版本预览(vue-prev-admin)<a href="https://lyt-top.gitee.io/vue-prev-admin-preview/#/login" target="_blank">https://lyt-top.gitee.io/vue-prev-admin-preview/#/login</a>
+- vue3.x + uni-app 商城 H5(vue-next-admin-shop)<a href="https://lyt-top.gitee.io/vue-next-admin-shop-preview" target="_blank">https://lyt-top.gitee.io/vue-next-admin-shop-preview</a>
+
+#### 💒 代码仓库
+
+- vue3.x 版本 <a href="https://gitee.com/lyt-top/vue-next-admin" target="_blank">https://gitee.com/lyt-top/vue-next-admin</a>
+- vue2.x 版本 <a href="https://gitee.com/lyt-top/vue-next-admin/tree/vue-prev-admin" target="_blank">https://gitee.com/lyt-top/vue-next-admin/tree/vue-prev-admin</a>
+
+#### 🚧 安装 cnpm、yarn
+
+- 复制代码(桌面 cmd 运行) `npm install -g cnpm --registry=https://registry.npm.taobao.org`
+- 复制代码(桌面 cmd 运行) `npm install -g yarn`
+
+#### 🏭 环境支持
+
+| Edge      | Firefox      | Chrome      | Safari      |
+| --------- | ------------ | ----------- | ----------- |
+| Edge ≥ 88 | Firefox ≥ 78 | Chrome ≥ 87 | Safari ≥ 13 |
+
+> 由于 Vue3 不再支持 IE11,故而 ElementPlus 也不支持 IE11 及之前版本。
+
+#### ⚡ 使用说明
+
+建议使用 cnpm,因为 yarn 有时会报错。<a href="http://nodejs.cn/" target="_blank">node 版本 > 14.18+/16+</a>
+
+> Vite 不再支持 Node 12 / 13 / 15,因为上述版本已经进入了 EOL 阶段。现在你必须使用 Node 14.18+ / 16+ 版本。
+
+```bash
+# 克隆项目
+git clone https://gitee.com/lyt-top/vue-next-admin.git
+
+# 进入项目
+cd vue-next-admin
+
+# 安装依赖
+cnpm install
+
+# 运行项目
+cnpm run dev
+
+# 打包发布
+cnpm run build
+```
+
+#### 📚 开发文档
+
+- 查看开发文档:<a href="https://lyt-top.gitee.io/vue-next-admin-doc-preview" target="_blank">vue-next-admin-doc</a>
+
+#### 💯 学习交流加 QQ 群
+
+> 1 - 4 交流群已满,请加 vue-next-admin 交流群 5
+
+群号:556254895
+
+其它交流群请查看文档首页 [vueNextAdmin 解疑问](https://lyt-top.gitee.io/vue-next-admin-doc-preview/)
+
+#### 💒 集成后端
+
+- <a target="_blank" href="https://github.com/PandaGoAdmin/PandaX">@熊猫 PandaGoAdmin</a>
+- <a target="_blank" href="https://toscode.gitee.com/GionConnection/gopro_free">@甜蜜蜜 GoPro 平台</a>
+- <a target="_blank" href="https://gitee.com/GionConnection/niupi-free">@甜蜜蜜 NiuPi 平台</a>
+- <a target="_blank" href="https://gitee.com/tiger1103/gfast/tree/os-v3/">@游子 GFast-V3</a>
+- <a target="_blank" href="https://gitee.com/diygw/diygw-ui-php/">@diygw.com gw-ui-php</a>
+- <a target="_blank" href="https://gitee.com/zsvg/vboot-net">@zsvg vboot-net</a>
+- <a target="_blank" href="https://gitee.com/zsvg/vboot-java">@zsvg vboot-java</a>
+- <a target="_blank" href="https://gitee.com/wonderful-code/buildadmin">@青红造了个白 buildadmin</a>
+- <a target="_blank" href="https://github.com/xiaodingding/iotfast">@Goodwell iotfast(一个开源的物联网平台)</a>
+
+#### ❤️ 鸣谢列表
+
+- <a href="https://github.com/vuejs/vue" target="_blank">vue</a>
+- <a href="https://github.com/vuejs/vue-next" target="_blank">vue-next</a>
+- <a href="https://github.com/ElemeFE/element" target="_blank">element-ui</a>
+- <a href="https://github.com/element-plus/element-plus" target="_blank">element-plus</a>
+- <a href="https://github.com/vuejs/vue-router-next" target="_blank">vue-router-next</a>
+- <a href="https://github.com/vuejs/pinia" target="_blank">pinia</a>
+- <a href="https://github.com/apache/echarts" target="_blank">echarts</a>
+- <a href="https://github.com/axios/axios" target="_blank">axios</a>
+- <a href="https://github.com/zenorocha/clipboard.js" target="_blank">clipboard</a>
+- <a href="https://github.com/inorganik/countUp.js" target="_blank">countUp</a>
+- <a href="https://github.com/developit/mitt" target="_blank">mitt</a>
+- <a href="https://github.com/rstacruz/nprogress" target="_blank">nprogress</a>
+- <a href="https://github.com/sindresorhus/screenfull.js" target="_blank">screenfull</a>
+- <a href="https://github.com/SortableJS/Sortable" target="_blank">sortablejs</a>
+- <a href="https://github.com/sass/sass" target="_blank">sass</a>
+- <a href="https://github.com/microsoft/TypeScript" target="_blank">typescript</a>
+- <a href="https://github.com/vitejs/vite" target="_blank">vite</a>
+- <a href="https://github.com/wangeditor-team/wangEditor" target="_blank">wangeditor</a>
+- <a href="https://github.com/fengyuanchen/cropperjs" target="_blank">cropperjs</a>
+- <a href="https://github.com/davidshimjs/qrcodejs" target="_blank">qrcodejs</a>
+- <a href="https://github.com/crabbly/Print.js" target="_blank">print-js</a>
+- <a href="https://github.com/jbaysolutions/vue-grid-layout" target="_blank">vue-grid-layout</a>
+- <a href="https://github.com/antoniandre/splitpanes" target="_blank">splitpanes</a>
+- <a href="https://github.com/jsplumb/jsplumb" target="_blank">jsplumb</a>
+- <a href="https://github.com/hxj9102/table2excel" target="_blank">js-table2excel</a>
+
+#### 💕 特别感谢
+
+特别感谢老哥们的建议、指导与帮忙。谢谢!
+
+- <a href="https://gitee.com/click33/sa-plus" target="_blank">@省长</a>
+- <a href="https://gitee.com/jskz/Jskz-SpringCloud" target="_blank">@唐参</a>
+- <a href="https://gitee.com/chuange" target="_blank">@川歌</a>
+- @华仔
+
+#### 💌 支持作者
+
+如果觉得框架不错,或者已经在使用了,希望你可以去 <a target="_blank" href="https://github.com/lyt-Top/vue-next-admin">Github</a> 或者
+<a target="_blank" href="https://gitee.com/lyt-top/vue-next-admin">Gitee</a> 帮我点个 ⭐ Star,这将是对我极大的鼓励与支持。

+ 17 - 0
admin-web/index.html

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <meta charset="utf-8"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <meta name="keywords" content="vue-next-admin"/>
+    <meta name="description" content="充电小程序管理后台"/>
+    <link rel="icon" href="/favicon.ico"/>
+    <title>充电小程序管理后台</title>
+
+</head>
+<body>
+<div id="app"></div>
+<script type="module" src="/src/main.ts"></script>
+</body>
+</html>

+ 80 - 0
admin-web/package.json

@@ -0,0 +1,80 @@
+{
+	"name": "web",
+	"version": "1.0.2.4.31",
+	"description": "admin",
+	"license": "MIT",
+	"scripts": {
+		"dev": "vite --force",
+		"build": "vite build",
+		"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src"
+	},
+	"dependencies": {
+		"@element-plus/icons-vue": "^2.1.0",
+		"@wangeditor/editor": "^5.1.23",
+		"@wangeditor/editor-for-vue": "^5.1.12",
+		"axios": "^1.3.4",
+		"countup.js": "^2.5.0",
+		"echarts": "^5.4.1",
+		"echarts-gl": "^2.0.9",
+		"element-plus": "^2.3.9",
+		"js-cookie": "^3.0.1",
+		"js-table2excel": "^1.0.3",
+		"jsencrypt": "^3.3.2",
+		"lodash": "^4.17.21",
+		"mitt": "^3.0.0",
+		"nprogress": "^0.2.0",
+		"pinia": "^2.0.33",
+		"print-js": "^1.6.0",
+		"qrcodejs2-fixes": "^0.0.2",
+		"qs": "^6.11.1",
+		"screenfull": "^6.0.2",
+		"sortablejs": "^1.15.0",
+		"splitpanes": "^3.1.5",
+		"vue": "^3.2.47",
+		"vue-clipboard3": "^2.0.0",
+		"vue-grid-layout": "^3.0.0-beta1",
+		"vue-i18n": "^9.2.2",
+		"vue-router": "^4.1.6",
+		"vue3-image-preview": "^0.2.5",
+		"vuedraggable": "^4.1.0",
+		"yarn": "^1.22.19"
+	},
+	"devDependencies": {
+		"@types/node": "^18.15.0",
+		"@types/nprogress": "^0.2.0",
+		"@types/sortablejs": "^1.15.0",
+		"@typescript-eslint/eslint-plugin": "^5.54.1",
+		"@typescript-eslint/parser": "^5.54.1",
+		"@vitejs/plugin-vue": "^4.0.0",
+		"@vue/compiler-sfc": "^3.2.47",
+		"eslint": "8.22.0",
+		"eslint-plugin-vue": "^9.9.0",
+		"prettier": "^2.8.4",
+		"sass": "^1.58.3",
+		"typescript": "^4.9.5",
+		"vite": "^4.1.4",
+		"vue-eslint-parser": "^9.1.0"
+	},
+	"browserslist": [
+		"> 1%",
+		"last 2 versions",
+		"not dead"
+	],
+	"bugs": {},
+	"engines": {
+		"node": ">=16.0.0",
+		"npm": ">= 7.0.0"
+	},
+	"keywords": [
+		"vue",
+		"vue3",
+		"vuejs/vue-next",
+		"element-ui",
+		"element-plus",
+		"vue-next-admin",
+		"next-admin"
+	],
+	"repository": {
+		"type": "git"
+	}
+}

BIN
admin-web/public/favicon.ico


+ 139 - 0
admin-web/src/App.vue

@@ -0,0 +1,139 @@
+<template>
+	<el-config-provider :size="getGlobalComponentSize" :locale="getGlobalI18n">
+		<router-view v-show="setLockScreen" />
+		<LockScreen v-if="themeConfig.isLockScreen" />
+		<Setings ref="setingsRef" v-show="setLockScreen" />
+		<CloseFull v-if="!themeConfig.isLockScreen" />
+<!--		<Upgrade v-if="getVersion" />-->
+<!--		<Sponsors />-->
+	</el-config-provider>
+</template>
+
+<script setup lang="ts" name="app">
+import { defineAsyncComponent, computed, ref, onBeforeMount, onMounted, onUnmounted, nextTick, watch } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { storeToRefs } from 'pinia';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import other from '/@/utils/other';
+import { Local, Session } from '/@/utils/storage';
+import mittBus from '/@/utils/mitt';
+import setIntroduction from '/@/utils/setIconfont';
+import {$get} from "/@/utils/request";
+
+// 引入组件
+const LockScreen = defineAsyncComponent(() => import('/@/layout/lockScreen/index.vue'));
+const Setings = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/setings.vue'));
+const CloseFull = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/closeFull.vue'));
+// const Upgrade = defineAsyncComponent(() => import('/@/layout/upgrade/index.vue'));
+// const Sponsors = defineAsyncComponent(() => import('/@/layout/sponsors/index.vue'));
+
+// 定义变量内容
+const { messages, locale } = useI18n();
+const setingsRef = ref();
+const route = useRoute();
+const stores = useTagsViewRoutes();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+
+// 设置锁屏时组件显示隐藏
+const setLockScreen = computed(() => {
+	// 防止锁屏后,刷新出现不相关界面
+	// https://gitee.com/lyt-top/vue-next-admin/issues/I6AF8P
+	return themeConfig.value.isLockScreen ? themeConfig.value.lockScreenTime > 1 : themeConfig.value.lockScreenTime >= 0;
+});
+// 获取版本号
+/*const getVersion = computed(() => {
+	let isVersion = false;
+	if (route.path !== '/login') {
+		// @ts-ignore
+		if ((Local.get('version') && Local.get('version') !== __NEXT_VERSION__) || !Local.get('version')) isVersion = true;
+	}
+	return isVersion;
+});*/
+// 获取全局组件大小
+const getGlobalComponentSize = computed(() => {
+	return other.globalComponentSize();
+});
+// 获取全局 i18n
+const getGlobalI18n = computed(() => {
+	return messages.value[locale.value];
+});
+// 设置初始化,防止刷新时恢复默认
+onBeforeMount(() => {
+	// 设置批量第三方 icon 图标
+	setIntroduction.cssCdn();
+	// 设置批量第三方 js
+	setIntroduction.jsCdn();
+});
+// 页面加载时
+onMounted(() => {
+  console.error("App onMounted")
+	nextTick(() => {
+		// 监听布局配'置弹窗点击打开
+		mittBus.on('openSetingsDrawer', () => {
+			setingsRef.value.openDrawer();
+		});
+		// 获取缓存中的布局配置
+		if (Local.get('themeConfig')) {
+			storesThemeConfig.setThemeConfig({ themeConfig: Local.get('themeConfig') });
+			document.documentElement.style.cssText = Local.get('themeConfigStyle');
+		}
+		// 获取缓存中的全屏配置
+		if (Session.get('isTagsViewCurrenFull')) {
+			stores.setCurrenFullscreen(Session.get('isTagsViewCurrenFull'));
+		}
+
+    window.addEventListener('beforeunload', ()=>{
+      console.log("beforeunload")
+    });
+    window.addEventListener('unload', ()=>{
+      console.log("unload")
+    });
+    if (Session.get('token')) {
+      refreshEnv();
+    }
+	});
+});
+
+const refreshEnv = ()=>{
+  $get("/dict/dictList", {}).then((res: any) => {
+    Session.set("dicts", res);
+  })
+
+  $get("/user/profile").then((obj: any) => {
+    if (obj) {
+      let {user, permissionList} = obj;
+      let userInfo = {...user, permList: permissionList}
+      Session.set('userInfo',userInfo)
+    }
+
+  }).catch(err => {
+    Session.clear();
+  });
+}
+
+// 页面销毁时,关闭监听布局配置/i18n监听
+onUnmounted(() => {
+	mittBus.off('openSetingsDrawer', () => {});
+
+  window.removeEventListener('beforeunload', ()=>{
+    console.log("removeEventListener beforeunload")
+  });
+  window.removeEventListener('unload', ()=>{
+    console.log("removeEventListener unload")
+  });
+});
+// 监听路由的变化,设置网站标题
+watch(
+	() => route.path,
+	() => {
+    console.log("App.vue watch route path",route.path)
+		other.useTitle();
+	},
+	{
+		deep: true,
+	}
+);
+</script>

ファイルの差分が大きいため隠しています
+ 6 - 0
admin-web/src/assets/login-bg.svg


ファイルの差分が大きいため隠しています
+ 0 - 0
admin-web/src/assets/login-icon-two.svg


ファイルの差分が大きいため隠しています
+ 0 - 0
admin-web/src/assets/login-main.svg


ファイルの差分が大きいため隠しています
+ 2 - 0
admin-web/src/assets/logo-mini.svg


BIN
admin-web/src/assets/logo.ico


+ 1 - 0
admin-web/src/assets/mime/audio.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1685844259796" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1664" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M967.111111 281.6V910.222222c0 62.862222-50.915556 113.777778-113.777778 113.777778H170.666667c-62.862222 0-113.777778-50.915556-113.777778-113.777778V113.777778c0-62.862222 50.915556-113.777778 113.777778-113.777778h514.844444L967.111111 281.6z" fill="#A15FDE" p-id="1665"></path><path d="M685.511111 196.266667V0L967.111111 281.6H770.844444a85.333333 85.333333 0 0 1-85.333333-85.333333" fill="#C386F0" p-id="1666"></path><path d="M669.980444 426.268444v236.999112c0 26.254222-31.857778 47.587556-71.082666 47.587555-39.253333 0-70.741333-21.333333-70.741334-47.587555 0-26.282667 31.516444-47.587556 70.741334-47.587556 14.848 0 28.728889 3.100444 40.163555 8.334222v-165.916444l-205.767111 48.497778v211.057777c0 26.254222-32.142222 47.559111-71.992889 47.559111-39.850667 0-72.305778-21.333333-72.305777-47.559111 0-26.282667 32.426667-47.587556 72.305777-47.587555a96.711111 96.711111 0 0 1 41.102223 8.647111V474.168889c0-14.222222 9.870222-26.88 23.779555-29.980445l205.795556-47.900444a30.862222 30.862222 0 0 1 38.001777 29.980444" fill="#FFFFFF" p-id="1667"></path></svg>

+ 1 - 0
admin-web/src/assets/mime/bat.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1685844285452" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2390" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M967.111111 281.6V910.222222c0 62.577778-51.2 113.777778-113.777778 113.777778H170.666667c-62.577778 0-113.777778-51.2-113.777778-113.777778V113.777778c0-62.577778 51.2-113.777778 113.777778-113.777778h514.844444L967.111111 281.6z" fill="#BABABA" p-id="2391"></path><path d="M632.234667 468.48a21.333333 21.333333 0 0 1 27.989333-1.905778l2.190222 1.905778 100.551111 100.551111a21.333333 21.333333 0 0 1 1.905778 27.989333l-1.905778 2.190223-100.551111 100.551111a21.333333 21.333333 0 0 1-32.085333-27.960889l1.905778-2.190222 85.475555-85.504-85.475555-85.475556a21.333333 21.333333 0 0 1-1.905778-27.989333l1.905778-2.161778zM377.969778 699.761778a21.333333 21.333333 0 0 1-27.989334 1.934222l-2.190222-1.934222-100.579555-100.551111a21.333333 21.333333 0 0 1-1.905778-27.989334l1.905778-2.190222 100.579555-100.551111a21.333333 21.333333 0 0 1 32.085334 27.989333l-1.905778 2.161778-85.475556 85.504 85.475556 85.475556a21.333333 21.333333 0 0 1 1.905778 27.989333l-1.905778 2.161778zM527.047111 475.392a21.333333 21.333333 0 0 1 40.334222 13.568l-0.910222 2.759111-83.342222 201.130667a21.333333 21.333333 0 0 1-40.334222-13.568l0.938666-2.759111 83.313778-201.130667z" fill="#FFFFFF" p-id="2392"></path><path d="M685.511111 224.711111V0L967.111111 281.6H742.4c-31.288889 0-56.888889-25.6-56.888889-56.888889" fill="#979797" p-id="2393"></path></svg>

+ 1 - 0
admin-web/src/assets/mime/docx.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1685844217583" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="928" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M967.111111 281.6V910.222222c0 62.577778-51.2 113.777778-113.777778 113.777778H170.666667c-62.577778 0-113.777778-51.2-113.777778-113.777778V113.777778c0-62.577778 51.2-113.777778 113.777778-113.777778h514.844444L967.111111 281.6z" fill="#4F6BF6" p-id="929"></path><path d="M581.262222 755.626667h59.363556L739.555556 439.04h-59.335112z" fill="#FFFFFF" p-id="930"></path><path d="M685.511111 224.711111V0L967.111111 281.6H742.4c-31.288889 0-56.888889-25.6-56.888889-56.888889" fill="#243EBB" p-id="931"></path><path d="M640.625778 755.626667h-59.363556l-98.929778-277.020445h59.335112zM442.737778 755.626667h-59.363556L284.444444 439.04h59.335112z" fill="#FFFFFF" p-id="932"></path><path d="M383.374222 755.626667h59.363556l98.929778-277.020445h-59.335112z" fill="#FFFFFF" p-id="933"></path></svg>

+ 1 - 0
admin-web/src/assets/mime/folder.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1685844300123" class="icon" viewBox="0 0 1228 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2537" xmlns:xlink="http://www.w3.org/1999/xlink" width="239.84375" height="200"><path d="M1196.987733 212.5824v540.0576c0 39.594667-34.474667 71.3728-76.765866 71.3728H323.242667c-51.780267 0-88.746667-46.762667-73.250134-92.808533l126.737067-375.808H70.417067C31.675733 355.362133 0 326.4512 0 291.089067V98.372267C0 63.044267 31.675733 34.0992 70.417067 34.0992h378.811733c26.7264 0 51.029333 13.9264 63.010133 35.703467l39.048534 71.406933H1120.256c42.257067 0 76.8 32.119467 76.8 71.3728" fill="#5398DF" p-id="2538"></path><path d="M1128.721067 997.853867H68.266667a68.266667 68.266667 0 0 1-68.266667-68.266667V280.3712a68.266667 68.266667 0 0 1 68.266667-68.266667h1060.4544a68.266667 68.266667 0 0 1 68.266666 68.266667V929.5872a68.266667 68.266667 0 0 1-68.266666 68.266667" fill="#85BCFF" p-id="2539"></path></svg>

+ 1 - 0
admin-web/src/assets/mime/jpg.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1685844272369" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2099" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M952.888889 281.6V910.222222c0 62.862222-50.915556 113.777778-113.777778 113.777778H156.444444c-62.862222 0-113.777778-50.915556-113.777777-113.777778V113.777778c0-62.862222 50.915556-113.777778 113.777777-113.777778h514.844445L952.888889 281.6z" fill="#85BCFF" p-id="2100"></path><path d="M676.664889 167.822222V0l281.6 281.6h-167.822222c-62.862222 0-113.777778-50.915556-113.777778-113.777778" fill="#529EE0" p-id="2101"></path><path d="M685.824 363.804444a53.76 53.76 0 0 1 53.731556 53.731556v307.029333a53.76 53.76 0 0 1-53.731556 53.731556H309.76a53.731556 53.731556 0 0 1-53.731556-53.76V417.564444c0-29.667556 24.035556-53.731556 53.731556-53.731555H685.795556z m-72.903111 149.674667l-138.183111 146.545778-80.583111-62.805333-92.131556 94.208v31.402666c0 11.548444 10.325333 20.906667 23.04 20.906667h345.400889c12.714667 0 23.04-9.386667 23.04-20.906667v-125.610666l-80.583111-83.740445z m-227.896889-85.532444a32.085333 32.085333 0 1 0 0 64.142222 32.085333 32.085333 0 0 0 0-64.142222z" fill="#FFFFFF" p-id="2102"></path></svg>

+ 1 - 0
admin-web/src/assets/mime/other.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1685846951833" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2830" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M967.111111 281.6V910.222222c0 62.862222-50.915556 113.777778-113.777778 113.777778H170.666667c-62.862222 0-113.777778-50.915556-113.777778-113.777778V113.777778c0-62.862222 50.915556-113.777778 113.777778-113.777778h514.844444L967.111111 281.6z" fill="#BABABA" p-id="2831"></path><path d="M685.511111 167.822222V0L967.111111 281.6H799.288889c-62.862222 0-113.777778-50.915556-113.777778-113.777778" fill="#979797" p-id="2832"></path><path d="M733.667556 632.689778a111.104 111.104 0 0 1-110.819556 110.819555h-221.667556a111.132444 111.132444 0 0 1-110.848-110.819555 111.047111 111.047111 0 0 1 99.754667-110.279111A122.197333 122.197333 0 0 1 512 407.694222a122.197333 122.197333 0 0 1 121.912889 114.716445 111.160889 111.160889 0 0 1 99.754667 110.279111" fill="#FFFFFF" p-id="2833"></path></svg>

ファイルの差分が大きいため隠しています
+ 0 - 0
admin-web/src/assets/mime/pdf.svg


+ 1 - 0
admin-web/src/assets/mime/pptx.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1685844248098" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1222" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M967.111111 281.6V910.222222c0 62.577778-51.2 113.777778-113.777778 113.777778H170.666667c-62.577778 0-113.777778-51.2-113.777778-113.777778V113.777778c0-62.577778 51.2-113.777778 113.777778-113.777778h514.844444L967.111111 281.6z" fill="#F16C41" p-id="1223"></path><path d="M685.511111 224.711111V0L967.111111 281.6H742.4c-31.288889 0-56.888889-25.6-56.888889-56.888889" fill="#CD4B29" p-id="1224"></path><path d="M525.880889 648.135111a88.32 88.32 0 0 1-68.750222-32.995555 87.04 87.04 0 0 1-19.626667-55.381334c0-21.048889 7.253333-40.248889 19.626667-55.381333a88.234667 88.234667 0 0 1 68.750222-32.995556 88.490667 88.490667 0 0 1 88.376889 88.376889 88.519111 88.519111 0 0 1-88.376889 88.376889m0-235.690667c-24.945778 0-48.327111 6.087111-68.750222 17.294223a143.075556 143.075556 0 0 0-58.88 56.945777v146.119112a143.132444 143.132444 0 0 0 58.88 56.974222c20.423111 11.178667 43.804444 17.265778 68.750222 17.265778a147.342222 147.342222 0 0 0 147.285333-147.285334 147.342222 147.342222 0 0 0-147.285333-147.342222" fill="#FFFFFF" p-id="1225"></path><path d="M398.222222 824.888889h58.908445V412.444444H398.222222z" fill="#FFFFFF" p-id="1226"></path></svg>

+ 1 - 0
admin-web/src/assets/mime/rar.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1685844263933" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1809" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M967.111111 281.6V910.222222c0 62.862222-50.915556 113.777778-113.777778 113.777778H170.666667c-62.862222 0-113.777778-50.915556-113.777778-113.777778V113.777778c0-62.862222 50.915556-113.777778 113.777778-113.777778h514.844444L967.111111 281.6z" fill="#FFC63A" p-id="1810"></path><path d="M685.511111 167.822222V0L967.111111 281.6H799.288889c-62.862222 0-113.777778-50.915556-113.777778-113.777778" fill="#DD9F08" p-id="1811"></path><path d="M436.565333 68.437333h68.437334V0h-68.437334zM505.002667 136.874667h68.437333V68.437333h-68.437333zM436.565333 205.312h68.437334V136.874667h-68.437334zM505.002667 273.749333h68.437333V205.312h-68.437333z" fill="#FFFFFF" p-id="1812"></path><path d="M436.565333 342.158222h68.437334V273.720889h-68.437334zM505.002667 410.624h68.437333V342.186667h-68.437333z" fill="#FFFFFF" p-id="1813"></path><path d="M436.565333 479.032889h68.437334v-68.437333h-68.437334zM505.002667 547.470222h68.437333v-68.437333h-68.437333zM470.784 762.225778h68.437333v-68.437334h-68.437333v68.437334z m-34.218667-136.874667v136.874667c0 18.915556 15.331556 34.218667 34.218667 34.218666h68.437333c18.915556 0 34.218667-15.303111 34.218667-34.218666v-136.874667h-136.874667z" fill="#FFFFFF" p-id="1814"></path></svg>

+ 1 - 0
admin-web/src/assets/mime/txt.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1685844256034" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1517" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M967.111111 281.6V910.222222c0 62.862222-50.915556 113.777778-113.777778 113.777778H170.666667c-62.862222 0-113.777778-50.915556-113.777778-113.777778V113.777778c0-62.862222 50.915556-113.777778 113.777778-113.777778h514.844444L967.111111 281.6z" fill="#6D9FE5" p-id="1518"></path><path d="M685.511111 167.822222V0L967.111111 281.6H799.288889c-62.862222 0-113.777778-50.915556-113.777778-113.777778" fill="#4B80CB" p-id="1519"></path><path d="M344.177778 485.575111h312.888889V426.666667h-312.888889zM471.153778 770.019556h58.908444v-284.444445h-58.908444z" fill="#FFFFFF" p-id="1520"></path></svg>

+ 1 - 0
admin-web/src/assets/mime/video.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1685844275589" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2244" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M967.111111 281.6V910.222222c0 62.862222-50.915556 113.777778-113.777778 113.777778H170.666667c-62.862222 0-113.777778-50.915556-113.777778-113.777778V113.777778c0-62.862222 50.915556-113.777778 113.777778-113.777778h514.844444L967.111111 281.6z" fill="#C386F0" p-id="2245"></path><path d="M284.444444 398.222222m42.666667 0l298.666667 0q42.666667 0 42.666666 42.666667l0 234.666667q0 42.666667-42.666666 42.666666l-298.666667 0q-42.666667 0-42.666667-42.666666l0-234.666667q0-42.666667 42.666667-42.666667Z" fill="#FFFFFF" p-id="2246"></path><path d="M738.417778 457.841778a31.971556 31.971556 0 0 1 48.014222 27.676444v154.538667c0 24.632889-26.652444 40.021333-47.985778 27.704889L684.430222 636.586667V488.96z" fill="#FFFFFF" p-id="2247"></path><path d="M685.511111 167.822222V0L967.111111 281.6H799.288889c-62.862222 0-113.777778-50.915556-113.777778-113.777778" fill="#A15FDE" p-id="2248"></path></svg>

ファイルの差分が大きいため隠しています
+ 0 - 0
admin-web/src/assets/mime/web.svg


+ 1 - 0
admin-web/src/assets/mime/xlsx.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1685844242773" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1075" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M967.111111 281.6V910.222222c0 62.577778-51.2 113.777778-113.777778 113.777778H170.666667c-62.577778 0-113.777778-51.2-113.777778-113.777778V113.777778c0-62.577778 51.2-113.777778 113.777778-113.777778h514.844444L967.111111 281.6z" fill="#62C558" p-id="1076"></path><path d="M685.511111 224.711111V0L967.111111 281.6H742.4c-31.288889 0-56.888889-25.6-56.888889-56.888889" fill="#2A8121" p-id="1077"></path><path d="M682.666667 724.024889L638.691556 768 341.333333 470.670222 385.308444 426.666667zM454.087111 611.128889l44.088889 44.088889L385.422222 768 341.333333 723.911111zM682.666667 470.755556l-113.066667 113.066666-44.088889-44.088889L638.577778 426.666667z" fill="#FFFFFF" p-id="1078"></path></svg>

+ 271 - 0
admin-web/src/components/attach/Attach.vue

@@ -0,0 +1,271 @@
+<style lang="scss" scoped>
+.attach-container-left {
+  display: flex;
+  flex-direction: column;
+  justify-items: flex-end;
+
+  img {
+    height: 45px;
+  }
+}
+
+.attach-container-left-line {
+  display: inline-flex;
+  flex-wrap: nowrap;
+
+  img {
+    height: 20px;
+  }
+}
+</style>
+<template>
+  <div class="attach-container">
+    <el-tooltip placement="top" effect="light">
+      <div :class="inline?'attach-container-left-line':'attach-container-left'">
+        <template v-if="state.isImage">
+          <img :src="u.fmt.fmtImg(state.uid)"/>
+        </template>
+        <template v-else><img :src="state.icon"/></template>
+
+        <el-button text size="small" :title="state.name" @click="handlePreview">{{ state.name }}</el-button>
+      </div>
+      <div class="attache-container-right">
+        <slot name="extraRight"></slot>
+      </div>
+      <template #content>
+        <el-button-group>
+          <el-button size="small" type="primary" text v-if="!state.isImage"  @click="handlePreview">预览</el-button>
+          <el-button size="small" type="success" text v-if="downable&&!readonly" @click="handleDownload"> 下载</el-button>
+          <el-button size="small" type="warning" text v-if="edit&&!readonly" @click="handleEdit"> 编辑</el-button>
+          <el-button size="small" type="danger" text v-if="!readonly" @click="handleDelete"> 删除</el-button>
+        </el-button-group>
+
+
+      </template>
+    </el-tooltip>
+    <Preview ref="previewRef" :url="state.previewUrl" :name="state.name"/>
+    <ExcelEditor ref="excelEditorRef" :url="state.previewUrl" :name="state.name" :uid="state.uid"/>
+  </div>
+</template>
+
+<!--统一文件展示组件、预览、编辑、删除管理-->
+<script setup lang="ts" name="Attach">
+import {reactive, onMounted, ref, onBeforeUnmount, defineAsyncComponent, computed} from 'vue';
+import u from "/@/utils/u";
+import {$get} from "/@/utils/request";
+import {Msg} from "/@/utils/message";
+
+
+const Preview = defineAsyncComponent(() => import("/@/components/preview/Preview.vue"));
+const ExcelEditor = defineAsyncComponent(() => import("/@/components/excel/ExcelEditor.vue"));
+// const Luckysheet = defineAsyncComponent(() => import("/@/components/excel/Luckysheet.vue"));
+
+// 定义父组件传过来的值
+const props = defineProps({
+  attach: {
+    type: Object,
+    default: () => {
+      return {
+        id: 0,
+        uid: '',
+        name: '',
+        size: 0,
+      }
+    }
+  },
+  readonly: {
+    type: Boolean,
+    default: false
+  },
+  editable: {
+    type: Boolean,
+    default: false
+  },
+  downable: {
+    type: Boolean,
+    default: false
+  },
+  deletable: {
+    type: Boolean,
+    default: false
+  },
+  inline: {
+    type: Boolean,
+    default: false
+  }
+})
+
+const edit = computed(() => {
+  if (props.editable && props.attach) {
+    props.attach.uid.toLowerCase().endsWith(".xlsx");
+  }
+  return false;
+});
+
+// const luckysheetRef = ref();
+const excelEditorRef = ref();
+const previewRef = ref();
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['on-preview', 'on-edit', 'on-download', 'on-delete']);
+
+import {preview} from 'vue3-image-preview'
+
+
+// 定义变量内容
+const state = reactive({
+  uid: '',
+  icon: '',
+  name: '',
+  content: '',
+  previewUrl: '',
+  isImage: false,
+  attachConf: [
+    {
+      suffix: ['jpg', 'jpeg', 'png', 'gif', 'svg'],
+      icon: '@/assets/mime/jpg.svg'
+    },
+    {
+      suffix: ["mp4", "ogg", "avi", "webm"],
+      icon: '@/assets/mime/video.svg'
+    },
+    {
+      suffix: ["mp3", "amr", "avi", "wav"],
+      icon: '@/assets/mime/audio.svg'
+    },
+    {
+      suffix: ["doc", "docx"],
+      icon: '@/assets/mime/docx.svg'
+    },
+    {
+      suffix: ["xls", "xlsx"],
+      icon: '@/assets/mime/xlsx.svg'
+    },
+    {
+      suffix: ["ppt", "pptx"],
+      icon: '@/assets/mime/pptx.svg'
+    },
+    {
+      suffix: ["pdf"],
+      icon: '@/assets/mime/pdf.svg'
+    },
+    {
+      suffix: ["txt", "log", "css"],
+      icon: '@/assets/mime/txt.svg'
+    },
+    {
+      suffix: ["zip", "rar", "7z", "gz", "xz", "tar"],
+      icon: '@/assets/mime/rar.svg'
+    },
+    {
+      suffix: ["html", "htm"],
+      icon: '@/assets/mime/web.svg'
+    },
+    {
+      suffix: ["java", "js", "php", "py", "sh", "bat"],
+      icon: '@/assets/mime/bat.svg'
+    },
+  ]
+});
+
+// 页面销毁时
+onBeforeUnmount(() => {
+});
+
+onMounted(() => {
+  init();
+})
+
+const init = () => {
+  console.log(props.attach)
+  let {name, size, id, uid} = props.attach;
+  if (name) {
+    state.name = name;
+  } else {
+    if (uid) {
+      state.name = uid;
+    }
+  }
+
+  if (!uid) {
+    throw new Error('文件不存在~');
+  }
+  state.uid = uid;
+//文件类型判断
+  let suffix = uid.substring(uid.lastIndexOf(".") + 1).toLowerCase();
+
+  let conf = state.attachConf.find(k => k.suffix.includes(suffix));
+  console.log(suffix, conf)
+  if (conf) {
+    state.icon = conf.icon;
+  } else {
+    state.icon = "@/assets/mime/other.svg"
+  }
+
+  if (state.attachConf[0].suffix.includes(suffix)) {
+    state.isImage = true;
+  }
+
+}
+
+const handlePreview = () => {
+  if (state.isImage) {
+    preview({images: u.fmt.fmtImg(state.uid)})
+  } else {
+    handleReady();
+    previewRef.value.handlePreview();
+  }
+
+  emit('on-preview', state.uid)
+}
+
+const handleReady = async () => {
+  //1.获取预览的key
+  try {
+    let key = await $get(`/preview/getKey/${state.uid}`);
+    //2.打开预览页面
+    state.previewUrl = `${u.url.preview}${key}`
+    console.log(state.previewUrl)
+  } catch (e) {
+    Msg.message(`文件地址错误,请稍后再试`, 'error')
+  }
+
+  // .then((res: any) => {
+  //    let key = res;
+  //    //2.打开预览页面
+  //    state.previewUrl = `${u.url.preview}${key}`
+  //    console.log(state.previewUrl)
+  //
+  //  }).catch((e) => {
+  //    console.error(e)
+  //    Msg.message(`文件地址错误,请稍后再试`,'error')
+  //  })
+}
+
+const handleDownload = () => {
+  let url = u.fmt.fmtUrl(state.uid)
+  window.open(url, '_blank')
+  emit('on-download', state.uid)
+}
+
+const handleEdit = async () => {
+  await handleReady();
+  let suffix = state.name.substring(state.name.lastIndexOf(".")).toLowerCase();
+  if (suffix.endsWith(".xlsx")) {
+    excelEditorRef.value.handleEdit();
+    // luckysheetRef.value.initLuckysheet()
+  } else {
+    Msg.message(`暂不支持该格式文件的在线编辑功能`)
+  }
+  emit('on-edit', state.uid)
+}
+
+const handleDelete = () => {
+  emit('on-delete', state.uid)
+}
+
+defineExpose({
+  handlePreview
+});
+
+
+</script>

+ 26 - 0
admin-web/src/components/auth/auth.vue

@@ -0,0 +1,26 @@
+<template>
+	<slot v-if="getUserAuthBtnList" />
+</template>
+
+<script setup lang="ts" name="auth">
+import { computed } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useUserInfo } from '/@/stores/userInfo';
+
+// 定义父组件传过来的值
+const props = defineProps({
+	value: {
+		type: String,
+		default: () => '',
+	},
+});
+
+// 定义变量内容
+const stores = useUserInfo();
+const { userInfos } = storeToRefs(stores);
+
+// 获取 pinia 中的用户权限
+const getUserAuthBtnList = computed(() => {
+	return userInfos.value.authBtnList.some((v: string) => v === props.value);
+});
+</script>

+ 27 - 0
admin-web/src/components/auth/authAll.vue

@@ -0,0 +1,27 @@
+<template>
+	<slot v-if="getUserAuthBtnList" />
+</template>
+
+<script setup lang="ts" name="authAll">
+import { computed } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useUserInfo } from '/@/stores/userInfo';
+import { judementSameArr } from '/@/utils/arrayOperation';
+
+// 定义父组件传过来的值
+const props = defineProps({
+	value: {
+		type: Array,
+		default: () => [],
+	},
+});
+
+// 定义变量内容
+const stores = useUserInfo();
+const { userInfos } = storeToRefs(stores);
+
+// 获取 pinia 中的用户权限
+const getUserAuthBtnList = computed(() => {
+	return judementSameArr(props.value, userInfos.value.authBtnList);
+});
+</script>

+ 32 - 0
admin-web/src/components/auth/auths.vue

@@ -0,0 +1,32 @@
+<template>
+	<slot v-if="getUserAuthBtnList" />
+</template>
+
+<script setup lang="ts" name="auths">
+import { computed } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useUserInfo } from '/@/stores/userInfo';
+
+// 定义父组件传过来的值
+const props = defineProps({
+	value: {
+		type: Array,
+		default: () => [],
+	},
+});
+
+// 定义变量内容
+const stores = useUserInfo();
+const { userInfos } = storeToRefs(stores);
+
+// 获取 pinia 中的用户权限
+const getUserAuthBtnList = computed(() => {
+	let flag = false;
+	userInfos.value.authBtnList.map((val: string) => {
+		props.value.map((v) => {
+			if (val === v) flag = true;
+		});
+	});
+	return flag;
+});
+</script>

+ 112 - 0
admin-web/src/components/avatar/index.vue

@@ -0,0 +1,112 @@
+<template>
+  <el-avatar v-for="(avatar,idx) in state.avatarList" :key="idx"
+             class="cursor-pointer avatar-item"
+             :title="avatar.name"
+             :size="size" :src="u.fmt.fmtImg(avatar.avatar)">
+    <el-avatar :style="getStyle(avatar)">{{ getFirst(avatar.name) }}</el-avatar>
+  </el-avatar>
+</template>
+
+<script setup name="Avatar" lang="ts">
+import {reactive, watch} from 'vue';
+import u from "/@/utils/u";
+
+const props = defineProps({
+  size: {
+    type: Number,
+    default: 39
+  },
+  option: {
+    type: [Object, Array],
+    require: true,
+  }
+})
+
+type Avatar = {
+  id: number;
+  avatar: string;
+  name: string;
+}
+
+
+const state = reactive({
+  avatarList: [] as Array<Avatar>
+})
+
+watch(() => props.option, (val, oldVal) => {
+  console.log("watch>>>>>>>", props.option)
+  if (val == oldVal) {
+    return;
+  }
+  if (props.option) {
+    if (props.option instanceof Array) {
+      state.avatarList = props.option.map((k: any) => {
+        let {id, avatar, name,} = k;
+        return {id, name, avatar}
+      })
+    } else {
+      let {id, avatar, name} = props.option;
+      state.avatarList = {id, name, avatar}
+    }
+  } else {
+    state.avatarList = [];
+  }
+}, {deep: true, immediate: true})
+
+
+const getFirst = (name: string) => {
+  if (name) {
+    return name.substring(0, 1);
+  }
+  return '';
+};
+
+
+const getStyle = (avatar: Avatar) => {
+  console.log(avatar)
+  return {
+    backgroundColor: colorById(avatar.id || 0),
+    color: '#fff'
+  }
+};
+
+const colorById = (i: number) => {
+  if (i < 10) i = i * 302.3;
+  if (i < 100) i = i * 31.2;
+  for (; i > 255; i *= 0.98) ;
+  let temp = i.toString().substring(i.toString().length - 3);
+  i += parseInt(temp);
+  for (; i > 255; i -= 255) ;
+  i = parseInt(i);
+  if (i < 10) i += 10;
+
+  let R: number = i * (i / 100);
+  for (; R > 255; R -= 255) ;
+  if (R < 50) R += 60;
+  R = parseInt(R).toString(16);
+
+  var G = i * (i % 100);
+  for (; G > 255; G -= 255) ;
+  if (G < 50) G += 60;
+  G = parseInt(G).toString(16);
+
+  var B = i * (i % 10);
+  for (; B > 255; B -= 255) ;
+  if (B < 50) B += 60;
+  B = parseInt(B).toString(16);
+
+  // console.log(i + ":" + R + ":" + G + ":" + B);
+  return "#" + R + G + B;
+}
+
+// const firstLetter = computed(() => {
+//   return props?.option?.name?.substring(0, 1) || '';
+// });
+</script>
+
+<style scoped lang="scss">
+.avatar-item {
+  border: 2px solid #fff;
+}
+
+</style>

+ 103 - 0
admin-web/src/components/editor/index.vue

@@ -0,0 +1,103 @@
+<template>
+	<div class="editor-container">
+		<Toolbar :editor="editorRef" :mode="mode" />
+		<Editor
+			:mode="mode"
+			:defaultConfig="state.editorConfig"
+			:style="{ height }"
+			v-model="state.editorVal"
+			@onCreated="handleCreated"
+			@onChange="handleChange"
+		/>
+	</div>
+</template>
+
+<script setup lang="ts" name="wangEditor">
+// https://www.wangeditor.com/v5/for-frame.html#vue3
+import '@wangeditor/editor/dist/css/style.css';
+import { reactive, shallowRef, watch, onBeforeUnmount } from 'vue';
+import { IDomEditor } from '@wangeditor/editor';
+import { Toolbar, Editor } from '@wangeditor/editor-for-vue';
+
+// 定义父组件传过来的值
+const props = defineProps({
+	// 是否禁用
+	disable: {
+		type: Boolean,
+		default: () => false,
+	},
+	// 内容框默认 placeholder
+	placeholder: {
+		type: String,
+		default: () => '请输入内容...',
+	},
+	// https://www.wangeditor.com/v5/getting-started.html#mode-%E6%A8%A1%E5%BC%8F
+	// 模式,可选 <default|simple>,默认 default
+	mode: {
+		type: String,
+		default: () => 'default',
+	},
+	// 高度
+	height: {
+		type: String,
+		default: () => '180px',
+	},
+	// 双向绑定,用于获取 editor.getHtml()
+	getHtml: String,
+	// 双向绑定,用于获取 editor.getText()
+	getText: String,
+});
+
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['update:getHtml', 'update:getText']);
+
+// 定义变量内容
+const editorRef = shallowRef();
+const state = reactive({
+	editorConfig: {
+		placeholder: props.placeholder,
+	},
+	editorVal: props.getHtml,
+});
+
+// 编辑器回调函数
+const handleCreated = (editor: IDomEditor) => {
+	editorRef.value = editor;
+};
+// 编辑器内容改变时
+const handleChange = (editor: IDomEditor) => {
+  console.log(editor.getHtml())
+  console.log(editor.getText())
+	emit('update:getHtml', editor.getHtml());
+	emit('update:getText', editor.getText());
+};
+// 页面销毁时
+onBeforeUnmount(() => {
+	const editor = editorRef.value;
+	if (editor == null) return;
+	editor.destroy();
+});
+// 监听是否禁用改变
+// https://gitee.com/lyt-top/vue-next-admin/issues/I4LM7I
+watch(
+	() => props.disable,
+	(bool) => {
+		const editor = editorRef.value;
+		if (editor == null) return;
+		bool ? editor.disable() : editor.enable();
+	},
+	{
+		deep: true,
+	}
+);
+// 监听双向绑定值改变,用于回显
+watch(
+	() => props.getHtml,
+	(val) => {
+		state.editorVal = val;
+	},
+	{
+		deep: true,
+	}
+);
+</script>

+ 81 - 0
admin-web/src/components/form/ExtBoolean.vue

@@ -0,0 +1,81 @@
+<style scoped lang="scss">
+.text {
+  display: inline-block;
+  padding: 3px 6px;
+  font-size: 11px;
+  font-weight: 600;
+  line-height: 1;
+  height: 20px;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: baseline;
+  border-radius: 10px;
+  margin-top: 3px;
+  width: auto;
+  color: #FF5722;
+  border: 1px solid #FF5722;
+}
+
+.true-text {
+  color: #5FB878;
+  border: 1px solid #5FB878;
+}
+</style>
+<template>
+  <div>
+    <span v-if="disabled" class="text" :class="{'true-text':props.modelValue==true}">{{ props.modelValue ? '是' : '否' }}</span>
+    <el-select v-else
+               transfer
+               :multiple="false"
+               clearable
+               @change="handleChange"
+               style="width: 100%"
+               :placeholder="placeholder"
+               v-model="state.model">
+      <el-option label="是" :value="true"><el-text type="success">是</el-text></el-option>
+      <el-option label="否" :value="false"><el-text type="danger">否</el-text></el-option>
+    </el-select>
+  </div>
+</template>
+<script setup lang="ts" name="ExtBoolean">
+import {reactive, onMounted, watch} from 'vue';
+//数据字典的布尔值类型的下拉选择组件
+
+const props = defineProps({
+  modelValue: {
+    type: Boolean
+  },
+  disabled: {
+    type: Boolean,
+    default: false
+  },
+  placeholder: {
+    type: String,
+    default: '请选择'
+  },
+  tips: {
+    type: String
+  }
+})
+
+const state = reactive({
+  model: false,
+})
+
+onMounted(() => {
+  state.model = props.modelValue;
+})
+
+watch(() => props.modelValue, (val, oldVal) => {
+  console.log('ExtBoolean watch modelValue', val, oldVal)
+  state.model = props.modelValue;
+})
+
+const emit = defineEmits(['on-change', 'update:modelValue']);
+
+const handleChange = () => {
+  console.log(state.model)
+  emit('update:modelValue', state.model)
+  emit('on-change', state.model)
+}
+</script>

+ 74 - 0
admin-web/src/components/form/ExtButton.vue

@@ -0,0 +1,74 @@
+<style lang="scss" scoped>
+</style>
+<template>
+  <div style="display: inline-block">
+    <el-tooltip v-if="tips" :content="tips" placement="left-start">
+      <el-button
+          :loading="loading"
+          :size="size"
+          :plain="plain"
+          v-auth="auth" :disabled="disabled" :type="type" :text="isText"  @click="handleClick">
+        <SvgIcon v-if="icon" :name="icon"/>
+        {{ name }}
+      </el-button>
+    </el-tooltip>
+    <el-button v-else
+               :loading="loading"
+               :size="size"
+               :plain="plain"
+               v-auth="auth" :disabled="disabled" :type="type" :text="isText"  @click="handleClick">
+      <SvgIcon v-if="icon" :name="icon"/>{{ name }}
+    </el-button>
+  </div>
+</template>
+<script setup lang="ts" name="ExtButton">
+
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['on-click']);
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,no-unused-vars
+const props = defineProps({
+  icon:{
+    type:String
+  },
+  name: {
+    type: String,
+    require:true,
+  },
+  auth: {
+    type: String
+  },
+  plain: {
+    type: Boolean,
+    default:true
+  },
+  size: {
+    type: String,
+    default: "default"
+  },
+  tips: {
+    type: String,
+  },
+  disabled: {
+    type: Boolean,
+    default: false
+  },
+  isText: {
+    type: Boolean,
+    default: false
+  },
+  type: {
+    type: String,
+    default: 'primary'
+  },
+  loading:{
+    type:Boolean,
+    default:false
+  }
+})
+
+const handleClick = () => {
+  emit('on-click')
+}
+
+</script>

+ 175 - 0
admin-web/src/components/form/ExtCaptcha.vue

@@ -0,0 +1,175 @@
+<template>
+  <canvas id="captcha" ref="sliderRef"></canvas>
+</template>
+
+<script lang="ts" setup name="ExtCaptcha">
+//验证码组件
+import {onMounted, reactive} from 'vue';
+import {$body} from "/@/utils/request";
+import {Msg} from "/@/utils/message";
+
+const sliderRef = reactive(null);
+
+const state = reactive({
+  currentCaptchaConfig: {},
+  isPrintLog: true
+})
+
+
+onMounted(()=>{
+  initConfig(590,360,590,50,null)
+})
+
+const clearPreventDefault = (event: any) => {
+  if (event.preventDefault) {
+    event.preventDefault();
+  }
+}
+
+const clearAllPreventDefault = () => {
+  if (sliderRef?.value) {
+    sliderRef.value.addEventListener("touchmove", clearPreventDefault, false)
+  }
+}
+
+const printLog = (...params: Array<any>) => {
+  if (state.isPrintLog) {
+    console.log(JSON.stringify(params));
+  }
+}
+
+const initConfig = (bgImageWidth: number, bgImageHeight: number, sliderImageWidth: number, sliderImageHeight: number, end: any) => {
+  state.currentCaptchaConfig = {
+    startTime: new Date(),
+    trackArr: [],
+    movePercent: 0,
+    bgImageWidth,
+    bgImageHeight,
+    sliderImageWidth,
+    sliderImageHeight,
+    end
+  }
+  printLog("init", state.currentCaptchaConfig);
+}
+
+
+const down = (event: any) => {
+  let targetTouches = event.originalEvent ? event.originalEvent.targetTouches : event.targetTouches;
+  let startX = event.pageX;
+  let startY = event.pageY;
+  if (startX === undefined) {
+    startX = Math.round(targetTouches[0].pageX);
+    startY = Math.round(targetTouches[0].pageY);
+  }
+  state.currentCaptchaConfig.startX = startX;
+  state.currentCaptchaConfig.startY = startY;
+
+  const pageX = state.currentCaptchaConfig.startX;
+  const pageY = state.currentCaptchaConfig.startY;
+  const startTime = state.currentCaptchaConfig.startTime;
+  const trackArr = state.currentCaptchaConfig.trackArr;
+  trackArr.push({
+    x: pageX - startX,
+    y: pageY - startY,
+    type: "down",
+    t: (new Date().getTime() - startTime.getTime())
+  });
+  printLog("start", startX, startY)
+  // pc
+  window.addEventListener("mousemove", move);
+  window.addEventListener("mouseup", up);
+  // 手机端
+  window.addEventListener("touchmove", move, false);
+  window.addEventListener("touchend", up, false);
+  doDown(state.currentCaptchaConfig);
+}
+
+
+const move = (event: any) => {
+  if (event instanceof TouchEvent) {
+    event = event.touches[0];
+  }
+  let pageX = Math.round(event.pageX);
+  let pageY = Math.round(event.pageY);
+  const startX = state.currentCaptchaConfig.startX;
+  const startY = state.currentCaptchaConfig.startY;
+  const startTime = state.currentCaptchaConfig.startTime;
+  const end = state.currentCaptchaConfig.end;
+  const bgImageWidth = state.currentCaptchaConfig.bgImageWidth;
+  const trackArr = state.currentCaptchaConfig.trackArr;
+  let moveX = pageX - startX;
+  const track = {
+    x: pageX - startX,
+    y: pageY - startY,
+    type: "move",
+    t: (new Date().getTime() - startTime.getTime())
+  };
+  trackArr.push(track);
+  if (moveX < 0) {
+    moveX = 0;
+  } else if (moveX > end) {
+    moveX = end;
+  }
+  state.currentCaptchaConfig.moveX = moveX;
+  state.currentCaptchaConfig.movePercent = moveX / bgImageWidth;
+  doMove(state.currentCaptchaConfig);
+  printLog("move", track)
+}
+
+
+const up = (event: any) => {
+  window.removeEventListener("mousemove", move);
+  window.removeEventListener("mouseup", up);
+  window.removeEventListener("touchmove", move);
+  window.removeEventListener("touchend", up);
+  if (event instanceof TouchEvent) {
+    event = event.changedTouches[0];
+  }
+  state.currentCaptchaConfig.stopTime = new Date();
+  let pageX = Math.round(event.pageX);
+  let pageY = Math.round(event.pageY);
+  const startX = state.currentCaptchaConfig.startX;
+  const startY = state.currentCaptchaConfig.startY;
+  const startTime = state.currentCaptchaConfig.startTime;
+  const trackArr = state.currentCaptchaConfig.trackArr;
+
+  const track = {
+    x: pageX - startX,
+    y: pageY - startY,
+    type: "up",
+    t: (new Date().getTime() - startTime.getTime())
+  }
+
+  trackArr.push(track);
+  printLog("up", track)
+  valid(state.currentCaptchaConfig);
+}
+
+const doDown = (config:any) => {
+  // $("#slider-move-btn").css("background-position", "-5px 31.0092%")
+}
+
+const doMove = (currentCaptchaConfig: any) => {
+  // const moveX = currentCaptchaConfig.moveX;
+  // $("#rotate-move-btn").css("transform", "translate(" + moveX + "px, 0px)")
+  // $(".rotate-img-div").css("transform", "rotate(" + (moveX / (currentCaptchaConfig.end / 360)) + "deg)")
+}
+
+const valid = (captchaConfig: any) => {
+  let data = {
+    bgImageWidth: captchaConfig.bgImageWidth,
+    bgImageHeight: captchaConfig.bgImageHeight,
+    sliderImageWidth: captchaConfig.sliderImageWidth,
+    sliderImageHeight: captchaConfig.sliderImageHeight,
+    startSlidingTime: captchaConfig.startTime,
+    endSlidingTime: captchaConfig.stopTime, // 官方demo 这里有个语法错误trackList: captchaConfig.trackArr};let sendData = {'id' : currentCaptchaId,'captchaTrack': data}$.ajax({type:"POST",url:"http://localhost:8080/check",contentType: "application/json", dataType:"json",data:JSON.stringify(sendData),success:function (res) {if (res) {alert("验证成功!!!");}refreshCaptcha();}})
+  }
+  $body('/captcha/valid', data).then(() => {
+    Msg.message('校验成功', 'success')
+  })
+}
+</script>
+
+<style scoped>
+
+</style>

+ 32 - 0
admin-web/src/components/form/ExtClipboard.vue

@@ -0,0 +1,32 @@
+<style lang="scss" scoped>
+</style>
+<template>
+  <div>
+    <SvgIcon name="ele-CopyDocument" style="color:var(--el-color-success)"  class="cursor-pointer" title="复制" @click="handleCopy"></SvgIcon>
+  </div>
+</template>
+<script setup lang="ts" name="ExtClipboard">
+import {Msg} from "/@/utils/message";
+
+const emit = defineEmits(['on-change']);
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,no-unused-vars
+const props = defineProps({
+  message: {
+    type: String,
+    require: true,
+  },
+})
+
+const handleCopy = () => {
+  if (props.message) {
+    navigator.clipboard.writeText(props.message).then(() => {
+      Msg.message("复制成功");
+      emit('on-change',props.message)
+    })
+  }else{
+    Msg.message("无可复制内容",'warning')
+  }
+}
+
+</script>

+ 64 - 0
admin-web/src/components/form/ExtColor.vue

@@ -0,0 +1,64 @@
+<style scoped lang="scss">
+.color-box {
+  display: inline-flex;
+  align-items: center;
+  align-content: center;
+}
+
+.refresh-btn {
+  margin-left: 8px;
+  color:#409EFF ;
+}
+
+.refresh-animate{
+  transform: rotate(180deg);
+  transition: all 0.5s;
+}
+</style>
+<template>
+  <div class="color-box">
+    <el-color-picker  v-model="state.modelValue" :predefine="state.colors" @change="handleColorChange"/>
+    <SvgIcon class="refresh-btn" name="ele-Refresh" @click="handleRandomColor" :class="{'refresh-animate':state.anim}"/>
+  </div>
+</template>
+<script setup lang="ts" name="ExtDLabel">
+import {onMounted, reactive} from 'vue';
+
+const emit = defineEmits(['update:modelValue','on-change']);
+
+const props = defineProps({
+  modelValue: {
+    type: String
+  },
+})
+
+const state = reactive({
+  modelValue: '#67C23A' as string,
+  colors: ['#409EFF', '#67C23A', '#E6A23C', '#F56C6C', '#909399', '#CDD0D6', '#8230A6','#EA2517','#DA72C7','#342F3B'],
+  anim:false
+})
+
+// const modelVal = computed(() => props.value)
+
+const handleRandomColor = () => {
+  let rand = Math.floor(Math.random() * state.colors.length);
+  state.modelValue = state.colors[rand];
+  emit('update:modelValue', state.modelValue)
+  emit('on-change')
+  state.anim = true;
+  setTimeout(()=>{
+    state.anim = false;
+  },600)
+}
+
+const handleColorChange = () => {
+  emit('update:modelValue', state.modelValue)
+  emit('on-change')
+}
+
+onMounted(() => {
+  state.modelValue = props.modelValue || '#000000';
+  emit('update:modelValue', state.modelValue)
+  emit('on-change')
+});
+</script>

+ 966 - 0
admin-web/src/components/form/ExtCron.vue

@@ -0,0 +1,966 @@
+<template>
+  <div>
+    <el-input v-model="state.modelData" placeholder="请输入cron表达式">
+      <template #append>
+        <ext-button icon="ele-Setting" @click="state.tooltipVisible = !state.tooltipVisible"/>
+      </template>
+    </el-input>
+
+    <el-dialog
+        title="cron表达式工具"
+        v-model="state.tooltipVisible"
+        width="720px"
+        draggable
+        destroy-on-close
+        append-to-body
+        :modal="false"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        align-center>
+      <div class="cron-container" style="width: 100%;min-height:500px; ">
+        <el-tabs type="border-card" v-model="state.activeTab">
+
+          <el-tab-pane name="generator" label="生成器" v-if="!disabled">
+
+            <el-tabs model-value="second">
+              <el-tab-pane :label="state.text.Seconds.name" name="second">
+                <div>
+                  <label for="seconds1">
+                    <input type="radio" id="seconds1" value="1" v-model="state.second.cronEvery"/>
+                    {{ state.text.Seconds.every }}
+                  </label>
+                </div>
+                <!-- 每隔多久 -->
+                <div class="mt-20">
+                  <label for="seconds2">
+                    <input type="radio" id="seconds2" value="2" v-model="state.second.cronEvery"/>
+                    {{ state.text.Seconds.interval[0] }}
+                    <el-input-number type="number" :min="1" :max="60" v-model="state.second.incrementIncrement"/>
+                    {{ state.text.Seconds.interval[1] || "" }}
+                    <el-input-number type="number" :min="0" :max="59" v-model="state.second.incrementStart"/>
+                    {{ state.text.Seconds.interval[2] || "" }}
+                  </label>
+                </div>
+                <!-- 具体秒数 -->
+                <div class="mt-20">
+                  <label for="seconds3">
+                    <input type="radio" id="seconds3" value="3" v-model="state.second.cronEvery"/>
+                    {{ state.text.Seconds.specific }}
+                    <el-select multiple filterable v-model="state.second.specificSpecific">
+                      <el-option :value="index" v-for="(item, index) in 60" :key="index">{{ index }}</el-option>
+                    </el-select>
+                  </label>
+                </div>
+                <!-- 具体秒数 -->
+                <div class="mt-20">
+                  <label for="seconds4">
+                    <input type="radio" id="seconds4" value="4" v-model="state.second.cronEvery"/>
+                    {{ state.text.Seconds.cycle[0] }}
+                    <el-input-number type="number" v-model="state.second.rangeStart" :min="1" :max="60"/>
+                    {{ state.text.Seconds.cycle[1] || "" }}
+                    <el-input-number type="number" v-model="state.second.rangeEnd" :min="0" :max="59"/>
+                    {{ state.text.Seconds.cycle[2] || "" }}
+                  </label>
+                </div>
+              </el-tab-pane>
+
+              <el-tab-pane :label="state.text.Minutes.name">
+                <div>
+                  <label for="minute1">
+                    <input type="radio" id="minute1" value="1" v-model="state.minute.cronEvery"/>
+                    {{ state.text.Minutes.every }}
+                  </label>
+                </div>
+                <!-- 每隔多久 -->
+                <div class="mt-20">
+                  <label for="minute2">
+                    <input type="radio" id="minute2" value="2" v-model="state.minute.cronEvery"/>
+                    {{ state.text.Minutes.interval[0] }}
+                    <el-input-number type="number" :min="1" :max="60" v-model="state.minute.incrementIncrement"/>
+                    {{ state.text.Minutes.interval[1] || "" }}
+                    <el-input-number type="number" :min="0" :max="59" v-model="state.minute.incrementStart"/>
+                    {{ state.text.Minutes.interval[2] || "" }}
+                  </label>
+                </div>
+                <!-- 具体秒数 -->
+                <div class="mt-20">
+                  <label for="minute3">
+                    <input type="radio" id="minute3" value="3" v-model="state.minute.cronEvery"/>
+                    {{ state.text.Minutes.specific }}
+                    <el-select multiple filterable v-model="state.minute.specificSpecific">
+                      <el-option :value="index" v-for="(item, index) in 60" :key="index">{{ index }}</el-option>
+                    </el-select>
+                  </label>
+                </div>
+                <!-- 具体秒数 -->
+                <div class="mt-20">
+                  <label for="minute4">
+                    <input type="radio" id="minute4" value="4" v-model="state.minute.cronEvery"/>
+                    {{ state.text.Minutes.cycle[0] }}
+                    <el-input-number type="number" v-model="state.minute.rangeStart" :min="1" :max="60"/>
+                    {{ state.text.Minutes.cycle[1] || "" }}
+                    <el-input-number type="number" v-model="state.minute.rangeEnd" :min="0" :max="59"/>
+                    {{ state.text.Minutes.cycle[2] || "" }}
+                  </label>
+                </div>
+              </el-tab-pane>
+
+
+              <el-tab-pane :label="state.text.Hours.name">
+
+                <div>
+                  <label for="hour1">
+                    <input type="radio" id="hour1" value="1" v-model="state.hour.cronEvery"/>
+                    {{ state.text.Hours.every }}
+                  </label>
+                </div>
+                <!-- 每隔多久 -->
+                <div class="mt-20">
+                  <label for="hour2">
+                    <input type="radio" id="hour2" value="2" v-model="state.hour.cronEvery"/>
+                    {{ state.text.Hours.interval[0] }}
+                    <el-input-number type="number" :min="1" :max="60" v-model="state.hour.incrementIncrement"/>
+                    {{ state.text.Hours.interval[1] || "" }}
+                    <el-input-number type="number" :min="0" :max="59" v-model="state.hour.incrementStart"/>
+                    {{ state.text.Hours.interval[2] || "" }}
+                  </label>
+                </div>
+                <!-- 具体秒数 -->
+                <div class="mt-20">
+                  <label for="hour3">
+                    <input type="radio" id="hour3" value="3" v-model="state.hour.cronEvery"/>
+                    {{ state.text.Hours.specific }}
+                    <el-select multiple filterable v-model="state.hour.specificSpecific">
+                      <el-option :value="index" v-for="(item, index) in 24" :key="index">{{ index }}</el-option>
+                    </el-select>
+                  </label>
+                </div>
+                <!-- 具体秒数 -->
+                <div class="mt-20">
+                  <label for="hour4">
+                    <input type="radio" id="hour4" value="4" v-model="state.hour.cronEvery"/>
+                    {{ state.text.Hours.cycle[0] }}
+                    <el-input-number type="number" v-model="state.hour.rangeStart" :min="1" :max="60"/>
+                    {{ state.text.Hours.cycle[1] || "" }}
+                    <el-input-number type="number" v-model="state.hour.rangeEnd" :min="0" :max="59"/>
+                    {{ state.text.Hours.cycle[2] || "" }}
+                  </label>
+                </div>
+              </el-tab-pane>
+
+              <el-tab-pane :label="state.text.Day.name">
+                <!-- 1 -->
+                <div>
+                  <label for="day1">
+                    <input type="radio" id="day1" value="1" v-model="state.day.cronEvery"/>
+                    {{ state.text.Day.every }}
+                  </label>
+                </div>
+                <!-- 2 -->
+                <div class="mt-20">
+                  <label for="day2">
+                    <input type="radio" id="day2" value="2" v-model="state.day.cronEvery"/>
+                    {{ state.text.Day.intervalWeek[0] }}
+                    <el-input-number type="number" :min="1" :max="7" v-model="state.week.incrementIncrement"/>
+                    {{ state.text.Day.intervalWeek[1] }}
+                    <el-input-number type="number" :min="0" :max="59" v-model="state.week.incrementStart"/>
+                    {{ state.text.Day.intervalWeek[2] }}
+                  </label>
+                </div>
+                <!-- 3 -->
+                <div class="mt-20">
+                  <label for="day3">
+                    <input type="radio" id="day3" value="3" v-model="state.day.cronEvery"/>
+                    {{ state.text.Day.intervalDay[0] }}
+                    <el-input-number type="number" v-model="state.day.rangeStart" :min="1" :max="30"/>
+                    {{ state.text.Day.intervalDay[1] }}
+                    <el-input-number type="number" v-model="state.day.rangeEnd" :min="1" :max="30"/>
+                    {{ state.text.Day.intervalDay[2] }}
+                  </label>
+                </div>
+                <!-- 4 -->
+                <div class="mt-20">
+                  <label for="day4">
+                    <input type="radio" id="day4" value="4" v-model="state.day.cronEvery"/>
+                    {{ state.text.Day.specificWeek }}
+                    <el-select multiple filterable v-model="state.week.specificSpecific">
+                      <el-option v-for="(val, index) in 7" :key="index" :value="['SUN', 'MON', 'TUE', 'WED', 'THU', 'FRI', 'SAT'][val - 1]">
+                        {{ state.text.Week[val - 1] }}
+                      </el-option>
+                    </el-select>
+                  </label>
+                </div>
+                <!-- 5 -->
+                <div class="mt-20">
+                  <label for="day5">
+                    <input type="radio" id="day5" value="5" v-model="state.day.cronEvery"/>
+                    {{ state.text.Day.specificDay }}
+                    <el-select multiple filterable v-model="state.day.specificSpecific">
+                      <el-option v-for="(val, index) in 31" :key="index" :value="val">
+                        {{ val }}
+                      </el-option>
+                    </el-select>
+                  </label>
+                </div>
+                <!-- 6 -->
+                <div class="mt-20">
+                  <label for="day6">
+                    <input type="radio" id="day6" value="6" v-model="state.day.cronEvery"/>
+                    {{ state.text.Day.lastDay }}
+                  </label>
+                </div>
+                <!-- 7 -->
+                <div class="mt-20">
+                  <label for="day7">
+                    <input type="radio" id="day7" value="7" v-model="state.day.cronEvery"/>
+                    {{ state.text.Day.lastWeekday }}
+                  </label>
+                </div>
+                <!-- 8 -->
+                <div class="mt-20">
+                  <label for="day8">
+                    <input type="radio" id="day8" value="8" v-model="state.day.cronEvery"/>
+                    {{ state.text.Day.lastWeek[0] }}
+                    <el-select v-model="state.day.cronLastSpecificDomDay">
+                      <el-option v-for="(val, index) in 7" :key="index" :value="val">
+                        {{ state.text.Week[val - 1] }}
+                      </el-option>
+                    </el-select>
+                    {{ state.text.Day.lastWeek[1] || "" }}
+                  </label>
+                </div>
+                <!-- 9 -->
+                <div class="mt-20">
+                  <label for="day9">
+                    <input type="radio" id="day9" value="9" v-model="state.day.cronEvery"/>
+                    <el-input-number type="number" v-model="state.day.cronDaysBeforeEomMinus" :min="1" :max="31"/>
+                    {{ state.text.Day.beforeEndMonth[0] }}
+                  </label>
+                </div>
+                <!-- 10 -->
+                <div class="mt-20">
+                  <label for="day10">
+                    <input type="radio" id="day10" value="10" v-model="state.day.cronEvery"/>
+                    {{ state.text.Day.nearestWeekday[0] }}
+                    <el-input-number type="number" v-model="state.day.cronDaysNearestWeekday" :min="1" :max="31"/>
+                    {{ state.text.Day.nearestWeekday[1] }}
+                  </label>
+                </div>
+                <!-- 11 -->
+                <div class="mt-20">
+                  <label for="day11">
+                    <input type="radio" id="day11" value="11" v-model="state.day.cronEvery"/>
+                    {{ state.text.Day.someWeekday[0] }}
+                    <el-input-number type="number" v-model="state.week.cronNthDayNth" :min="1" :max="5"/>
+                    &nbsp;
+                    <el-select v-model="state.week.cronNthDayDay">
+                      <el-option v-for="(val, index) in 7" :key="index" :value="val">
+                        {{ state.text.Week[val - 1] }}
+                      </el-option>
+                    </el-select>
+                    {{ state.text.Day.someWeekday[1] }}
+                  </label>
+                </div>
+              </el-tab-pane>
+
+              <el-tab-pane :label="state.text.Month.name">
+                <div>
+                  <label for="month1">
+                    <input type="radio" id="month1" value="1" v-model="state.month.cronEvery"/>
+                    {{ state.text.Month.every }}
+                  </label>
+                </div>
+                <!-- 2 -->
+                <div class="mt-20">
+                  <label for="month2">
+                    <input type="radio" id="month2" value="2" v-model="state.month.cronEvery"/>
+                    {{ state.text.Month.interval[0] }}
+                    <el-input-number type="number" v-model="state.month.incrementIncrement" :min="0" :max="12"/>
+                    {{ state.text.Month.interval[1] }}
+                    <el-input-number type="number" v-model="state.month.incrementStart" :min="0" :max="12"/>
+                  </label>
+                </div>
+                <!-- 3 -->
+                <div class="mt-20">
+                  <label for="month3">
+                    <input type="radio" id="month3" value="3" v-model="state.month.cronEvery"/>
+                    {{ state.text.Month.specific }}
+                    <el-select multiple filterable v-model="state.month.specificSpecific">
+                      <el-option v-for="(val, index) in 12" :key="index" :value="val">
+                        {{ val }}
+                      </el-option>
+                    </el-select>
+                  </label>
+                </div>
+                <!-- 4 -->
+                <div class="mt-20">
+                  <label for="month4">
+                    <input type="radio" id="month4" value="4" v-model="state.month.cronEvery"/>
+                    {{ state.text.Month.cycle[0] }}
+                    <el-input-number type="number" v-model="state.month.rangeStart" :min="1" :max="12"/>
+                    {{ state.text.Month.cycle[1] }}
+                    <el-input-number type="number" v-model="state.month.rangeEnd" :min="1" :max="12"/>
+                  </label>
+                </div>
+              </el-tab-pane>
+
+              <el-tab-pane :label="state.text.Year.name">
+                <!-- 1 -->
+                <div>
+                  <label for="year1">
+                    <input type="radio" id="year1" value="1" v-model="state.year.cronEvery"/>
+                    {{ state.text.Year.every }}
+                  </label>
+                </div>
+                <!-- 2 -->
+                <div class="mt-20">
+                  <label for="year2">
+                    <input type="radio" id="year2" value="2" v-model="state.year.cronEvery"/>
+                    {{ state.text.Year.interval[0] }}
+                    <el-input-number type="number" v-model="state.year.incrementIncrement" :min="1" :max="99"/>
+                    {{ state.text.Year.interval[1] }}
+                    <el-input-number type="number" v-model="state.year.incrementStart" :min="currYear" :max="currYear + 10"/>
+                  </label>
+                </div>
+                <!-- 3 -->
+                <div class="mt-20">
+                  <label for="year3">
+                    <input type="radio" id="year3" value="3" v-model="state.year.cronEvery"/>
+                    {{ state.text.Year.specific }}
+                    <el-select multiple filterable v-model="state.year.specificSpecific">
+                      <el-option v-for="(val, index) in 100" :key="index" :value="currYear + val">
+                        {{ currYear + val }}
+                      </el-option>
+                    </el-select>
+                  </label>
+                </div>
+                <!-- 4 -->
+                <div class="mt-20">
+                  <label for="year3">
+                    <input type="radio" id="year3" value="4" v-model="state.year.cronEvery"/>
+                    {{ state.text.Year.cycle[0] }}
+                    <el-input-number type="number" v-model="state.year.rangeStart" :min="currYear" :max="currYear + 10"/>
+                    {{ state.text.Year.cycle[1] }}
+                    <el-input-number type="number" v-model="state.year.rangeEnd" :min="currYear" :max="currYear + 10"/>
+                  </label>
+                </div>
+              </el-tab-pane>
+            </el-tabs>
+
+            <div class="v3c-footer mt20">
+              <div style="flex: 1">
+                完整表达式 &nbsp;: &nbsp;&nbsp;<span class="cron">{{ state.cron }}</span>
+                &nbsp; &nbsp; &nbsp;
+<!--                <el-button type="primary" @click.stop="handleChange">{{ state.text.Save }}</el-button>-->
+                <el-button type="success" @click.stop="handleCheck">{{ state.text.Check }}</el-button>
+              </div>
+            </div>
+          </el-tab-pane>
+
+          <el-tab-pane name="examples" label="常用示例">
+            <el-card shadow="hover" class="mt20">
+              <div class="flex justify-between flex-wrap hp code">
+                <ext-clipboard message="*/10 * * * * ?" class="hc"/>
+                <div class="mh10">*/10 * * * * ?</div>
+                <div>每隔10秒执行一次</div>
+              </div>
+
+
+              <div class="flex justify-between  flex-wrap hp code">
+                <ext-clipboard message="0 */5 * * * ?" class="hc"/>
+                <div class="mh10"> 0 */5 * * * ?</div>
+                <div>每隔5分钟执行一次</div>
+              </div>
+
+
+              <div class="flex justify-between  flex-wrap hp code">
+                <ext-clipboard message="0 2,22,32 * * * ?" class="hc"/>
+                <div class="mh10">0 2,22,32 * * * ?</div>
+                <div>在2分、22分、32分执行一次</div>
+              </div>
+
+              <div class="flex justify-between  flex-wrap hp code">
+                <ext-clipboard message="0 0 4-8 * * ?" class="hc"/>
+                <div class="mh10">0 0 4-8 * * ?</div>
+                <div>每天4-8点整点执行一次</div>
+              </div>
+
+              <div class="flex justify-between  flex-wrap hp code">
+                <ext-clipboard message="0 0 2 * * ?" class="hc"/>
+                <div class="mh10">0 0 2 * * ?</div>
+                <div>每天凌晨2点执行一次</div>
+              </div>
+
+
+              <div class="flex justify-between  flex-wrap hp code">
+                <ext-clipboard message="0 0 2 1 * ?" class="hc"/>
+                <div class="mh10">0 0 2 1 * ?</div>
+                <div>每月1号凌晨2点执行一次</div>
+              </div>
+
+
+            </el-card>
+            <p class="code">
+              格式:{Seconds} {Minutes} {Hours} {DayofMonth} {Month} {DayofWeek} {Year}[可选]
+            </p>
+            <p class="code">
+             取值说明:<br>
+              * : 表示匹配该域的任意值。比如Minutes域使用*,就表示每分钟都会触发。<br>
+              - : 表示范围。比如Minutes域使用 10-20,就表示从10分钟到20分钟每分钟都会触发一次。<br>
+              , : 表示列出枚举值。比如Minutes域使用1,3,就表示1分钟和3分钟都会触发一次。<br>
+              / : 表示间隔时间触发(开始时间/时间间隔)。例如在Minutes域使用 5/10,就表示从第5分钟开始,每隔10分钟触发一次。<br>
+              ? : 表示不指定值。简单理解就是忽略该字段的值,直接根据另一个字段的值触发执行。<br>
+              # : 表示该月第n个星期x(x#n),仅用星期域。如:星期:6#3,表示该月的第三个星期五。<br>
+              L : 表示最后,是单词"last"的缩写(最后一天或最后一个星期几);仅出现在日和星期的域中。用在日则表示该月的最后一天,用在星期则表示该月的最后一个星期。如:星期域上的值为5L,则表示该月最后一个星期的星期四。在使用'L'时,不要指定列表','或范围'-',否则易导致出现意料之外的结果。<br>
+              W: 仅用在日的域中,表示距离当月给定日期最近的工作日(周一到周五),是单词"weekday"的缩写。<br>
+            </p>
+
+
+
+          </el-tab-pane>
+          <el-tab-pane name="validator" label="校验器">
+            <h5>最近10次的cron表达式执行时间:</h5>
+            <el-input v-model="state.validatorCron">
+              <template #append>
+                <el-button @click="handleGenLatestCronTime(10)">生成执行计划</el-button>
+              </template>
+            </el-input>
+
+            <el-row v-loading="state.validatorLoading">
+              <el-col :sm="24" :md="24">{{state.cronDesc}}</el-col>
+              <el-col :sm="24" :md="24" v-for="(item,idx) in state.latestCronTimeList" :key="idx">{{ item }}</el-col>
+            </el-row>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+      <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="state.tooltipVisible = false">关闭</el-button>
+        <el-button type="primary" @click="handleChange">确定</el-button>
+      </span>
+      </template>
+    </el-dialog>
+  </div>
+
+
+</template>
+
+<script>
+import {reactive, computed, toRefs, defineComponent, ref, watch} from "vue";
+import ExtButton from "/@/components/form/ExtButton.vue";
+import {Msg} from "../../utils/message";
+import ExtClipboard from "/@/components/form/ExtClipboard.vue";
+import {$post} from "/@/utils/request.ts";
+
+import cronstrue from 'cronstrue/i18n';
+
+export default defineComponent({
+  name: "ExtCron",
+  components: {ExtClipboard, ExtButton},
+  props: {
+    i18n: {},
+    maxHeight: String,
+    change: Function,
+    value: String,
+    modelValue: String,
+    disabled:Boolean
+  },
+  setup(props, {emit}) {
+    const {i18n} = toRefs(props);
+    const state = reactive({
+      activeTab:'generator',
+      validatorLoading:false,
+      cronDesc:'',
+      validatorCron:'',
+      editorActiveTab: '秒',
+      latestCronTimeList: [],
+      modelData: '',
+      language: i18n.value,
+      tooltipVisible: false,
+      second: {
+        cronEvery: "1",
+        incrementStart: 3,
+        incrementIncrement: 5,
+        rangeStart: 0,
+        rangeEnd: 0,
+        specificSpecific: [],
+      },
+      minute: {
+        cronEvery: "1",
+        incrementStart: 3,
+        incrementIncrement: 5,
+        rangeStart: 0,
+        rangeEnd: 0,
+        specificSpecific: [],
+      },
+      hour: {
+        cronEvery: "1",
+        incrementStart: 3,
+        incrementIncrement: 5,
+        rangeStart: 0,
+        rangeEnd: 0,
+        specificSpecific: [],
+      },
+      day: {
+        cronEvery: "1",
+        incrementStart: 1,
+        incrementIncrement: 1,
+        rangeStart: 0,
+        rangeEnd: 0,
+        specificSpecific: [],
+        cronLastSpecificDomDay: 1,
+        cronDaysBeforeEomMinus: 0,
+        cronDaysNearestWeekday: 1,
+      },
+      week: {
+        cronEvery: "1",
+        incrementStart: 1,
+        incrementIncrement: 1,
+        specificSpecific: [],
+        cronNthDayDay: 1,
+        cronNthDayNth: 1,
+      },
+      month: {
+        cronEvery: "1",
+        incrementStart: 3,
+        incrementIncrement: 5,
+        rangeStart: 1,
+        rangeEnd: 1,
+        specificSpecific: [],
+      },
+      year: {
+        cronEvery: "1",
+        incrementStart: 2022,
+        incrementIncrement: 1,
+        rangeStart: 1,
+        rangeEnd: 1,
+        specificSpecific: [],
+      },
+      output: {
+        second: "",
+        minute: "",
+        hour: "",
+        day: "",
+        month: "",
+        Week: "",
+        year: "",
+      },
+      // text: computed(() => Language[state.language || "cn"]),
+      text: {
+        Seconds: {
+          name: '秒',
+          every: '每一秒钟',
+          interval: ['每隔', '秒执行 ,从', '秒开始'],
+          specific: '具体秒数(可多选)',
+          cycle: ['周期从', '到', '秒']
+        },
+        Minutes: {
+          name: '分',
+          every: '每一分钟',
+          interval: ['每隔', '分执行 ,从', '分开始'],
+          specific: '具体分钟数(可多选)',
+          cycle: ['周期从', '到', '分']
+        },
+        Hours: {
+          name: '时',
+          every: '每一小时',
+          interval: ['每隔', '小时执行 ,从', '小时开始'],
+          specific: '具体小时数(可多选)',
+          cycle: ['周期从', '到', '小时']
+        },
+        Day: {
+          name: '天',
+          every: '每一天',
+          intervalWeek: ['每隔', '周执行 ,从', '开始'],
+          intervalDay: ['每隔', '天执行 ,从', '天开始'],
+          specificWeek: '具体星期几(可多选)',
+          specificDay: '具体天数(可多选)',
+          lastDay: '在这个月的最后一天',
+          lastWeekday: '在这个月的最后一个工作日',
+          lastWeek: ['在这个月的最后一个'],
+          beforeEndMonth: ['在本月底前', '天'],
+          nearestWeekday: ['最近的工作日(周一至周五)至本月', '日'],
+          someWeekday: ['在这个月的第', '个'],
+        },
+        Week: ['天', '一', '二', '三', '四', '五', '六'].map(val => '星期' + val),
+        Month: {
+          name: '月',
+          every: '每一月',
+          interval: ['每隔', '月执行 从', '月开始'],
+          specific: '具体月数(可多选)',
+          cycle: ['从', '到', '月之间的每个月']
+        },
+        Year: {
+          name: '年',
+          every: '每一年',
+          interval: ['每隔', '年执行 从', '年开始'],
+          specific: '具体年份(可多选)',
+          cycle: ['从', '到', '年之间的每一年']
+        },
+        Save: '保存',
+        Check: '校验',
+      },
+      secondsText: computed(() => {
+        let seconds = "";
+        let cronEvery = state.second.cronEvery;
+        switch (cronEvery.toString()) {
+          case "1":
+            seconds = "*";
+            break;
+          case "2":
+            seconds = state.second.incrementStart + "/" + state.second.incrementIncrement;
+            break;
+          case "3":
+            state.second.specificSpecific.map((val) => {
+              seconds += val + ",";
+            });
+            seconds = seconds.slice(0, -1);
+            break;
+          case "4":
+            seconds = state.second.rangeStart + "-" + state.second.rangeEnd;
+            break;
+        }
+        return seconds;
+      }),
+      minutesText: computed(() => {
+        let minutes = "";
+        let cronEvery = state.minute.cronEvery;
+        switch (cronEvery.toString()) {
+          case "1":
+            minutes = "*";
+            break;
+          case "2":
+            minutes = state.minute.incrementStart + "/" + state.minute.incrementIncrement;
+            break;
+          case "3":
+            state.minute.specificSpecific.map((val) => {
+              minutes += val + ",";
+            });
+            minutes = minutes.slice(0, -1);
+            break;
+          case "4":
+            minutes = state.minute.rangeStart + "-" + state.minute.rangeEnd;
+            break;
+        }
+        return minutes;
+      }),
+      hoursText: computed(() => {
+        let hours = "";
+        let cronEvery = state.hour.cronEvery;
+        switch (cronEvery.toString()) {
+          case "1":
+            hours = "*";
+            break;
+          case "2":
+            hours = state.hour.incrementStart + "/" + state.hour.incrementIncrement;
+            break;
+          case "3":
+            state.hour.specificSpecific.map((val) => {
+              hours += val + ",";
+            });
+            hours = hours.slice(0, -1);
+            break;
+          case "4":
+            hours = state.hour.rangeStart + "-" + state.hour.rangeEnd;
+            break;
+        }
+        return hours;
+      }),
+      daysText: computed(() => {
+        let days = "";
+        let cronEvery = state.day.cronEvery;
+        console.log(cronEvery)
+        switch (cronEvery.toString()) {
+          case "1":
+            break;
+          case "2":
+          case "4":
+          case "11":
+            days = "?";
+            break;
+          case "3":
+            days = state.day.rangeStart + "/" + state.day.rangeEnd;
+            break;
+          case "5":
+            state.day.specificSpecific.map((val) => {
+              days += val + ",";
+            });
+            days = days.slice(0, -1);
+            break;
+          case "6":
+            days = "L";
+            break;
+          case "7":
+            days = "LW";
+            break;
+          case "8":
+            days = state.day.cronLastSpecificDomDay + "L";
+            break;
+          case "9":
+            days = "L-" + state.day.cronDaysBeforeEomMinus;
+            break;
+          case "10":
+            days = state.day.cronDaysNearestWeekday + "W";
+            break;
+        }
+        return days;
+      }),
+      weeksText: computed(() => {
+        let weeks = "";
+        let cronEvery = state.day.cronEvery;
+        switch (cronEvery.toString()) {
+          case "1":
+          case "3":
+          case "5":
+            weeks = "?";
+            break;
+          case "2":
+            weeks = state.week.incrementStart + "/" + state.week.incrementIncrement;
+            break;
+          case "4":
+            state.week.specificSpecific.map((val) => {
+              weeks += val + ",";
+            });
+            weeks = weeks.slice(0, -1);
+            break;
+          case "6":
+          case "7":
+          case "8":
+          case "9":
+          case "10":
+            weeks = "?";
+            break;
+          case "11":
+            weeks = state.week.cronNthDayDay + "#" + state.week.cronNthDayNth;
+            break;
+        }
+        return weeks;
+      }),
+      monthsText: computed(() => {
+        let months = "";
+        let cronEvery = state.month.cronEvery;
+        switch (cronEvery.toString()) {
+          case "1":
+            months = "*";
+            break;
+          case "2":
+            months = state.month.incrementStart + "/" + state.month.incrementIncrement;
+            break;
+          case "3":
+            state.month.specificSpecific.map((val) => {
+              months += val + ",";
+            });
+            months = months.slice(0, -1);
+            break;
+          case "4":
+            months = state.month.rangeStart + "-" + state.month.rangeEnd;
+            break;
+        }
+        return months;
+      }),
+      yearsText: computed(() => {
+        let years = "";
+        let cronEvery = state.year.cronEvery;
+        switch (cronEvery.toString()) {
+          case "1":
+            years = "*";
+            break;
+          case "2":
+            years = state.year.incrementStart + "/" + state.year.incrementIncrement;
+            break;
+          case "3":
+            state.year.specificSpecific.map((val) => {
+              years += val + ",";
+            });
+            years = years.slice(0, -1);
+            break;
+          case "4":
+            years = state.year.rangeStart + "-" + state.year.rangeEnd;
+            break;
+        }
+        return years;
+      }),
+      cron: computed(() => {
+        let cron =  `${state.secondsText || "*"} ${state.minutesText || "*"} ${state.hoursText || "*"} ${state.daysText || "*"} ${state.monthsText || "*"} ${state.weeksText || "?"} ${
+            state.yearsText || "*"
+        }`;
+
+        return cron;
+      }),
+    });
+
+    const handleGenLatestCronTime = () => {
+      if (!state.validatorCron) {
+        Msg.message('cron表达式为空', 'error');
+        return;
+      }
+      let cronText = state.validatorCron.trim()
+      let cs = cronstrue.toString(cronText, {locale: 'zh_CN'})
+      console.log(cs)
+
+      state.cronDesc = cs;
+      $post('checkCron',{cron:cronText}).then(res=>{
+        state.latestCronTimeList = res;
+        state.validatorLoading = false;
+      }).catch((e)=>{
+        console.error(e)
+        state.validatorLoading = false;
+      })
+    }
+
+    const handleCheck= () => {
+    state.activeTab='validator';
+    state.validatorCron = state.cron;
+    handleGenLatestCronTime()
+    };
+
+    const handleChange = () => {
+      if(props.disabled){
+        state.tooltipVisible = false;
+        return false;
+      }
+      if (typeof state.cron !== "string") return false;
+      emit("update:modelValue", state.cron);
+      emit("on-change", state.cron);
+      state.modelData = state.cron;
+      state.tooltipVisible = false;
+    };
+    const rest = (data) => {
+      for (let i in data) {
+        if (data[i] instanceof Object) {
+          this.rest(data[i]);
+        } else {
+          switch (typeof data[i]) {
+            case "object":
+              data[i] = [];
+              break;
+            case "string":
+              data[i] = "";
+              break;
+          }
+        }
+      }
+    };
+
+    const tabActive = ref(1);
+    const currYear = new Date().getFullYear() - 1;
+    const onHandleTab = (index) => {
+      tabActive.value = index;
+    };
+
+    watch(
+        () => state.cron,
+        (value) => {
+          if (typeof state.cron !== "string") return;
+          emit("update:modelValue", value);
+          emit("on-change", value);
+        }
+    );
+
+
+    watch(
+        () => props.modelValue,
+        (value) => {
+          state.modelData = value;
+        }
+    );
+
+
+    return {
+      state,
+      handleChange,
+      handleCheck,
+      handleGenLatestCronTime,
+      rest,
+      tabActive,
+      onHandleTab,
+      currYear,
+    };
+  },
+});
+</script>
+
+<style lang="css" scoped>
+.v3c {
+  width: auto;
+  border: 1px solid #f5f7fa;
+}
+
+.v3c-tab {
+  padding: 0;
+  list-style: none;
+  margin: 0;
+  background-color: #f5f7fa;
+  display: flex;
+}
+
+.v3c-tab-item {
+  flex: 1;
+  text-align: center;
+  cursor: pointer;
+  padding: 10px;
+}
+
+.v3c-tab-item.v3c-active {
+  background-color: #5b8ff9;
+  color: #ffffff;
+}
+
+.v3c-lang-btn {
+  background-color: #61ddaa;
+  color: #ffffff;
+  /* border-radius: 10px; */
+}
+
+.v3c-content {
+  padding: 20px;
+  max-height: v-bind(maxHeight);
+  overflow: hidden;
+  overflow-y: auto;
+}
+
+.p-20 {
+  padding: 20px;
+}
+
+.v3c-footer {
+  background-color: #f5f7fa;
+  padding-top: 10px;
+  padding-bottom: 10px;
+  display: flex;
+  text-align: center;
+}
+
+.mt-20 {
+  margin-top: 20px;
+}
+
+.v3c input[type="text"] {
+  width: 80px;
+}
+
+.v3c input[type="number"] {
+  width: 80px;
+  height: 28px;
+  border: 1px solid #d9d9d9;
+}
+
+.v3c select {
+  width: 80px;
+  height: 32px;
+  border: 1px solid #d9d9d9;
+}
+
+.v3c select[multiple] {
+  width: 80px;
+  height: 100px;
+  border: 1px solid #d9d9d9;
+}
+
+.cron {
+  color: #61ddaa;
+  padding: 5px;
+  padding-left: 10px;
+  padding-right: 10px;
+}
+</style>

+ 158 - 0
admin-web/src/components/form/ExtDLabel.vue

@@ -0,0 +1,158 @@
+<style scoped lang="scss">
+.status-label {
+  display: inline-block;
+  padding: 3px 6px;
+  font-size: 11px;
+  font-weight: 600;
+  line-height: 1;
+  height: 20px;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: baseline;
+  border-radius: 10px;
+  margin-top: 3px;
+  width: auto;
+  color: #fff;
+}
+
+.status-label-color {
+  &-1 {
+    border: 1px solid #FFB800;
+    color: #FFB800;
+  }
+
+  &-2 {
+    border: 1px solid #009688;
+    color: #009688;
+  }
+
+  &-3 {
+    border: 1px solid #1E9FFF;
+    color: #1E9FFF;
+  }
+
+  &-4 {
+    border: 1px solid #00C7D2;
+    color: #00C7D2;
+  }
+
+  &-5 {
+    border: 1px solid #599CDE;
+    color: #599CDE;
+  }
+
+  &-6 {
+    border: 1px solid #FF5722;
+    color: #FF5722;
+  }
+
+  &-7 {
+    border: 1px solid #eb2f96;
+    color: #eb2f96;
+  }
+
+  &-8 {
+    border: 1px solid #4a5055;
+    color: #4a5055;
+  }
+}
+
+.status-label-mode {
+  &-1 {
+    color: #5FB878;
+  }
+
+  &-2 {
+    color: #009688;
+  }
+
+  &-3 {
+    color: #1E9FFF;
+  }
+
+  &-4 {
+    color: #00C7D2;
+  }
+
+  &-5 {
+    color: #599CDE;
+  }
+
+  &-6 {
+    color: #FF5722;
+  }
+
+  &-7 {
+    color: #eb2f96;
+  }
+
+  &-8 {
+    color: #4a5055;
+  }
+}
+</style>
+<template>
+  <span class="status-label" :style="state.style">{{ state.text }}</span>
+</template>
+<script setup lang="ts" name="ExtDLabel">
+import {onMounted, reactive} from 'vue';
+import {Session} from "/@/utils/storage";
+import u from "/@/utils/u";
+
+// const emit = defineEmits(['update:value']);
+
+const props = defineProps({
+  modelValue: {
+    type: [Number, String]
+  },
+  type: {
+    type: String,
+    require: true
+  },
+  dataRange: {
+    type: Array<IFieldRange>
+  }
+})
+
+const state = reactive({
+  text: '' as string,
+  style: {color: '#000000'},
+  color:'#fff'
+})
+const setupColorStyle = (hex: string = "#000000") => {
+  let hexToRgb = u.hexToRgb(hex);
+  let {r, g, b} = hexToRgb;
+  return {
+    'text-shadow': `2px 2px 3px rgba(${r},${g},${b},0.2)`,
+    // 'background-color': `rgba(${r},${g},${b},0.2)`,
+    'color': `rgb(${r},${g},${b})`
+  }
+}
+
+onMounted(() => {
+  if (!u.isEmptyOrNull(props.dataRange)) {
+    let data = props.dataRange?.find(k => k.value == props.modelValue);
+    if (data) {
+      let {label, color} = data;
+      state.text = label;
+      state.style = setupColorStyle(color);
+    }
+  } else {
+    const sessionDicts = Session.get("dicts");
+    if (u.isEmptyOrNull(sessionDicts)) {
+      return '--'
+    }
+    let dicts = sessionDicts[`${props.type}`]
+    if(u.isEmptyOrNull(dicts)){
+      return;
+    }
+    let dict = (<Dicts>dicts).find(k => k.value == props.modelValue);
+
+    if (dict) {
+      state.text = dict.label;
+      state.style = setupColorStyle(dict.color);
+    }
+  }
+
+});
+</script>

+ 53 - 0
admin-web/src/components/form/ExtDRadio.vue

@@ -0,0 +1,53 @@
+<template>
+  <el-radio-group v-model="modelVal" @change="handleChange">
+    <el-radio v-for="item in state.dicts" :key="item.value" :disabled="readonly" :label="item.value">{{ item.label }}</el-radio>
+  </el-radio-group>
+</template>
+<script setup lang="ts" name="ExtDRadio">
+import {reactive, onMounted, computed} from 'vue';
+import u from "/@/utils/u";
+import {Session} from "/@/utils/storage";
+
+const props = defineProps({
+  modelValue: {
+    type: Number
+  },
+  type: {
+    type: String,
+    require:true
+  },
+  readonly: {
+    type: Boolean,
+    default: false
+  },
+
+});
+
+const state = reactive({
+  dicts: [] as Array<Dict>
+})
+
+const emit = defineEmits(['update:modelValue']);
+
+const modelVal = computed(() => props.modelValue);
+
+const handleChange = (val: number | Array<number>) => {
+  console.log("handleChange", val)
+  emit("update:modelValue", val)
+}
+
+onMounted(() => {
+  console.log(state.dicts)
+  const dicts = Session.get("dicts");
+  if (u.isEmptyOrNull(dicts)) {
+    return '--'
+  }
+  console.log(dicts)
+  let k = props.type;
+  console.log(k)
+  state.dicts = dicts[`${k}`]
+  console.log(dicts)
+  console.log(state.dicts)
+});
+
+</script>

+ 118 - 0
admin-web/src/components/form/ExtDSelect.vue

@@ -0,0 +1,118 @@
+<template>
+  <el-select
+      :size="size"
+      transfer
+      :disabled="disabled"
+      :multiple="multiple"
+      filterable
+      clearable
+      style="width: 100%"
+      @change="handleChange"
+      :placeholder="placeholder"
+      v-model="state.dataVal">
+    <template #empty>
+      <el-empty :image-size="40" description=""></el-empty>
+    </template>
+    <el-option
+        v-for="(item,idx) in state.dicts"
+        :key="idx"
+        :label="item.label"
+        :value="item.value">
+      <span class="option-item" style="float: left"><i :style="setupColorStyle(item.color)">{{  item.label }}</i></span>
+      <!--        :style="setupColorStyle(item.color)"-->
+    </el-option>
+  </el-select>
+</template>
+<script setup lang="ts" name="ExtDSelect">
+import { onMounted, reactive,watch} from 'vue';
+import {Session} from "/@/utils/storage";
+import u from "/@/utils/u";
+
+const props = defineProps({
+  modelValue: {
+    type: [Number, String]
+  },
+  //可选的值(字典二次过滤)
+  values: {
+    type: Array,
+    default: () => {
+      return []
+    }
+  },
+  type: {
+    type: String,
+    required: true
+  },
+  dataRange: {
+    type: Array<IFieldRange>
+  },
+  disabled: {
+    type: Boolean,
+    default: false
+  },
+  multiple: {
+    type: Boolean,
+    default: false
+  },
+  placeholder: {
+    type: String,
+    default: '请选择'
+  },
+  size:{
+    type:String,
+    default:'default'
+  }
+})
+
+const state = reactive({
+  dicts: [] as Array<any>,
+  dataVal:null as any
+})
+
+const emit = defineEmits(['update:modelValue','on-change']);
+
+watch(()=>props.modelValue,(val,oldVal)=>{
+  console.log('ExtDSelect',val,oldVal)
+  state.dataVal = props.modelValue;
+})
+
+const handleChange = (val: number | Array<number>) => {
+  console.log("handleChange", val)
+  emit("update:modelValue", val)
+  emit("on-change", val)
+
+}
+
+const setupColorStyle = (hex: string = "#000000") => {
+  let hexToRgb = u.hexToRgb(hex);
+  let {r, g, b} = hexToRgb;
+  let v = {
+    'text-shadow': `2px 2px 3px rgba(${r},${g},${b},0.2)`,
+    // 'background-color': `rgba(${r},${g},${b},0.2)`,
+    'color': `rgb(${r},${g},${b})`
+  }
+  return v;
+}
+
+
+onMounted(() => {
+  state.dataVal = props.modelValue;
+  if (!u.isEmptyOrNull(props.dataRange)) {
+    state.dicts = props.dataRange;
+  } else {
+    const dicts = Session.get("dicts");
+    if (u.isEmptyOrNull(dicts)) {
+      return '--'
+    }
+    state.dicts = dicts[props.type]
+    console.table(state.dicts)
+  }
+
+});
+</script>
+
+<style scoped lang="scss">
+.option-item {
+  display: inline-block;
+}
+</style>

+ 256 - 0
admin-web/src/components/form/ExtDatePicker.vue

@@ -0,0 +1,256 @@
+<style scoped lang="scss">
+</style>
+<template>
+  <el-date-picker
+      ref="extDatePickerRef"
+      @change="handleChange"
+      @blur="handleBlur"
+      @focus="handleFocus"
+      :type="type"
+      clearable
+      :placeholder="placeholder"
+      :format="format"
+      :readonly="readonly"
+      v-model="state.dateValue"></el-date-picker>
+</template>
+<script setup lang="ts" name="ExtDatePicker">
+import {reactive, watch, ref,onMounted,nextTick} from 'vue';
+import u from "/@/utils/u";
+
+const extDatePickerRef = ref(null);
+//https://element-plus.gitee.io/zh-CN/component/date-picker.html#attributes
+const props = defineProps({
+  modelValue: {
+    type: [String,Number]
+  },
+  /**
+   * year/month/date/dates/datetime/ week/datetimerange/daterange/ monthrange
+   */
+  type: {
+    type: String,
+  },
+  /**
+   * 时间显示的格式
+   */
+  format: {
+    type: String,
+    default: 'YYYY-MM-DD'
+  },
+  valueFormat: {
+    type: String
+  },
+  readonly: {
+    type: Boolean,
+    default: false
+  },
+  isEnd: {
+    type: Boolean,
+    default: false
+  },
+  fields: {
+    type: String,
+  },
+  placeholder: {
+    type: String,
+    default: '请选择'
+  },
+  placement: {
+    type: String,
+  },
+  disabledValid: {
+    type: Function
+  },
+  shortcuts: {
+    type: Array<shortcut>
+  }
+})
+
+type shortcut = {
+  text: string,
+  value: Date | Function
+}
+
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['update:modelValue', 'on-change', 'on-range-change']);
+
+const state = reactive({
+  isRangeMode: props.type?.endsWith("range"),
+  dateValue: null,
+})
+
+onMounted(()=>{
+  console.log(props.modelValue)
+  nextTick(()=>{
+    console.log(props.modelValue)
+  })
+  setupDate(props.modelValue)
+})
+
+watch(() => props.modelValue, (val:any, oldVal) => {
+  console.log('props.modelValue', val, oldVal)
+ setupDate(val);
+/*
+  if (!state.isRangeMode) {
+    if (props.type === 'year') {
+      state.dateValue
+    }
+    state.dateValue = val == null ? null : new Date(val)
+  } else {
+    if (props.modelValue) {
+      if (!props.modelValue[`${props.fields}Start`] && !props.modelValue[`${props.fields}End`]) {
+        state.dateValue = null;
+      }
+    }
+  }*/
+})
+
+watch(() => state.dateValue, (val, oldVal) => {
+  console.log('props.modelValue', val, oldVal)
+  /*  if (!state.isRangeMode) {
+      let changedValue = null;
+      if (val) {
+        changedValue = val.getTime();
+      }
+      if (props.type === 'date' && props.isEnd && changedValue) {
+        emit('update:modelValue', changedValue + 24 * 3600 * 1000 - 1);
+      } else {
+        emit('update:modelValue', changedValue);
+      }*/
+  // }
+})
+
+const handleChange = (e: Date | Array<Date>) => {
+  console.log('handleChange', e)
+  reactiveEmit(e);
+  /*if (state.isRangeMode) {
+    props.modelValue[`${props.fields}Start`] = e[0] ? new Date(e[0]) : null;
+    props.modelValue[`${props.fields}End`] = e[1] ? new Date(e[1]) : null;
+    if (e[0] == "") {
+      emit("on-range-change", props.modelValue);
+    }*/
+  // }
+}
+
+const setupDate = (val:any)=>{
+  if (!val) {
+    state.dateValue = null;
+    return;
+  }
+  let today = new Date();
+  let year = today.getFullYear();
+  let fmtDate :Date|Array<Date>;
+  switch (props.type) {
+    case 'year':
+      fmtDate = new Date(val, 0, 1);
+      break;
+    case 'month':
+      let monthValue = Number.parseInt(val)-1;
+      fmtDate = new Date(year,monthValue,1);
+      break;
+    case 'date':
+      fmtDate = new Date(val)
+      break;
+    case 'dates':
+      if (Array.isArray(val)) {
+        fmtDate = val.map(k => new Date(k))
+      }
+      break;
+    case 'datetime':
+      fmtDate = new Date(val)
+      break;
+    case 'week':
+      break;
+    case 'datetimerange':
+      if (Array.isArray(val)) {
+        fmtDate = val.map(k => new Date(k))
+      }
+      break;
+    case 'daterange':
+      if (Array.isArray(val)) {
+        fmtDate = val.map(k => new Date(k))
+      }
+      break;
+    case 'monthrange':
+      if (Array.isArray(val)) {
+        fmtDate = val.map(k => new Date(k))
+      }
+      break;
+    default:
+      break;
+  }
+
+  state.dateValue = fmtDate;
+  console.log(state.dateValue)
+}
+
+/**
+ * 响应数据,根据不同的日期类型返回不同的值(默认为date类型,需要进行转义)
+ * @param date
+ */
+const reactiveEmit = (date: any) => {
+  console.log(date)
+  let reactiveDate = null;
+  if (date) {
+    reactiveDate = date;
+    switch (props.type) {
+      case 'year':
+        reactiveDate = new Date(date).getFullYear();
+        break;
+      case 'month':
+        reactiveDate = new Date(date).getMonth() + 1;
+        break;
+      case 'date':
+        if (props.isEnd) {
+          reactiveDate = u.date.end(new Date(date))
+        }
+        break;
+      case 'dates':
+        if (props.isEnd) {
+          if (Array.isArray(reactiveDate)) {
+            reactiveDate = reactiveDate.map(k => u.date.end(new Date(k)))
+          }
+        }
+        break;
+      case 'datetime':
+        if (props.isEnd) {
+          reactiveDate = u.date.end(new Date(date))
+        }
+        break;
+      case 'week':
+        break;
+      case 'datetimerange':
+        break;
+      case 'daterange':
+        break;
+      case 'monthrange':
+        break;
+      default:
+        break;
+    }
+    // reactiveDate = val.getTime();
+  }
+  emit('update:modelValue', reactiveDate);
+  emit('on-change', reactiveDate);
+  /*  if (!state.isRangeMode) {
+
+
+  /!*    if (props.type === 'date' && props.isEnd && reactiveDate) {
+        emit('update:modelValue', reactiveDate + 24 * 3600 * 1000 - 1);
+      } else {
+        emit('update:modelValue', reactiveDate);
+      }*!/
+
+
+    }*/
+}
+
+
+const handleBlur = (e: FocusEvent) => {
+  console.log(e)
+}
+
+const handleFocus = (e: FocusEvent) => {
+  console.log(e)
+}
+
+</script>

+ 185 - 0
admin-web/src/components/form/ExtForm.vue

@@ -0,0 +1,185 @@
+<template>
+  <div class="dynamic-form-container layout-pd">
+    <el-card shadow="hover">
+      <el-form
+          :model="form"
+          :rules="rules"
+          ref="formRulesOneRef"
+          size="default" label-width="0px" class="mt35">
+        <el-row :gutter="35">
+          <el-col
+              :xs="val.xs"
+              :sm="val.sm"
+              :md="val.md"
+              :lg="val.md"
+              :xl="val.xl"
+              class="mb20"
+              v-for="(val, key) in state.cols"
+              :key="key">
+            <template v-if="val.type !== ''">
+              <el-form-item
+                  :label="val.label"
+                  :prop="val.prop"
+                  :rules="[{ required: val.required, message: `${val.label}不能为空`, trigger: val.type === 'input' ? 'blur' : 'change' }]"
+                  v-if="val.type !== ''">
+                <el-input
+                    v-if="val.type === 'text'"
+                    v-model="form[val.prop]"
+                    :placeholder="val.placeholder"
+                    clearable
+                    style="width: 100%"
+                    :disabled="val.disabled">
+                </el-input>
+                <el-date-picker
+                    v-model="form[val.prop]"
+                    type="date"
+                    :placeholder="val.placeholder"
+                    v-else-if="val.type === 'date'"
+                    style="width: 100%"
+                    :disabled="val.disabled"
+                >
+                </el-date-picker>
+                <el-select
+                    v-model="form[val.prop]"
+                    :placeholder="val.placeholder"
+                    v-else-if="val.type === 'select'"
+                    style="width: 100%"
+                    :disabled="val.disabled"
+                >
+                  <el-option v-for="item in val.options" :key="item.value" :label="item.label"
+                             :value="item.value"></el-option>
+                </el-select>
+                <el-input
+                    type="textarea"
+                    v-model="form[val.prop]"
+                    :placeholder="val.placeholder"
+                    clearable
+                    v-if="val.type === 'textarea'"
+                    style="width: 100%"
+                    :disabled="val.disabled"
+                ></el-input>
+              </el-form-item>
+            </template>
+            <template v-else>
+              <el-row :gutter="35" v-for="(v, k) in form.list" :key="k">
+                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
+                  <el-form-item label="年度" :prop="`list[${k}].year`"
+                                :rules="[{ required: true, message: `年度不能为空`, trigger: 'blur' }]">
+                    <template #label>
+                      <el-button type="primary" circle size="small" @click="onAddRow" v-if="k === 0">
+                        <el-icon>
+                          <ele-Plus/>
+                        </el-icon>
+                      </el-button>
+                      <el-button type="danger" circle size="small" @click="onDelRow(k)" v-else>
+                        <el-icon>
+                          <ele-Delete/>
+                        </el-icon>
+                      </el-button>
+                      <span class="ml10">年度</span>
+                    </template>
+                    <el-input v-model="form.list[k].year" style="width: 100%" placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
+                  <el-form-item label="月度" :prop="`list[${k}].month`"
+                                :rules="[{ required: true, message: `月度不能为空`, trigger: 'blur' }]">
+                    <el-input v-model="form.list[k].month" style="width: 100%" placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
+                  <el-form-item label="日度" :prop="`list[${k}].day`"
+                                :rules="[{ required: true, message: `日度不能为空`, trigger: 'blur' }]">
+                    <el-input v-model="form.list[k].day" style="width: 100%" placeholder="请输入"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </template>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-row class="flex mt15">
+        <div class="flex-margin">
+          <el-button size="default" @click="onResetForm(formRulesOneRef)">
+            <el-icon>
+              <ele-RefreshRight/>
+            </el-icon>
+            重置
+          </el-button>
+          <el-button size="default" type="success" @click="onQueryChange">
+            <SvgIcon name="ele-Search"/>
+            查询
+          </el-button>
+          <slot name="extra"></slot>
+        </div>
+      </el-row>
+    </el-card>
+  </div>
+</template>
+
+<script setup lang="ts" name="ExtForm">
+import {reactive, ref, computed,onMounted} from 'vue';
+import {ElMessage} from 'element-plus';
+import type {FormInstance} from 'element-plus';
+import fieldUtil from "/@/utils/field";
+
+const emit = defineEmits(['change', 'update:value']);
+const props = defineProps({
+  columns: {
+    type: Array<IField>
+  },
+  value: {
+    type: Object,
+    require: true
+  },
+  importConfig: {
+    type: Object,
+  }
+})
+
+const form = computed(() => {
+  return {...props.value}
+})
+const rules = computed(() => {
+  return [];
+})
+
+// 定义变量内容
+const formRulesOneRef = ref<FormInstance>();
+const state = reactive({
+  cols: [],
+  form: {
+    name: '',
+    email: '',
+    autograph: '',
+    occupation: '',
+    list: [
+      {
+        year: '',
+        month: '',
+        day: '',
+      },
+    ],
+    remarks: '',
+  },
+});
+
+onMounted(()=>{
+  console.log(props.columns)
+  state.cols = fieldUtil.toFormQueryField(props.columns);
+  console.log(state.cols)
+})
+
+const onQueryChange = () => {
+  emit("update:value", form);
+  emit("change")
+}
+
+// 重置表单
+const onResetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) return;
+  formEl.resetFields();
+  emit("update:value", {})
+  emit("change")
+};
+</script>

+ 87 - 0
admin-web/src/components/form/ExtIcon.vue

@@ -0,0 +1,87 @@
+<template>
+  <!--  <SvgIcon style="font-size: 20px;cursor: pointer;" :name="state.currentIconName"  :title="state.currentIconName"  @click="state.dialogVisible = true"></SvgIcon>-->
+  <el-input @click="state.dialogVisible = true" v-model="state.currentIconName" style="width: 100%">
+    <template #prepend>
+      <SvgIcon style="font-size: 20px;cursor: pointer;" :name="state.currentIconName"></SvgIcon>
+    </template>
+  </el-input>
+  <el-dialog
+      append-to-body
+      v-model="state.dialogVisible"
+      title="请选择图标"
+      width="80%"
+      :before-close="handleClose"
+      @open="beforeOpen"
+  >
+    <div style="display: flex;flex-wrap: wrap">
+      <div v-for="(name,index) in state.icons" :index="index" :key="index" style="cursor: pointer;padding: 1rem"
+           :class="state.currentIconName === 'ele-'+name ? 'selected' : ''"
+           @click="handleIconSelect(name)">
+        <SvgIcon :name="'ele-'+name" :title="'ele-'+name"
+                 style="width: 2rem;height: 2rem;font-size: 20px;"></SvgIcon>
+        <!--        <component :is="name" style="width: 2rem;height: 2rem"></component>-->
+      </div>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="state.dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="handleOk">确定</el-button>
+      </span>
+    </template>
+  </el-dialog>
+
+</template>
+
+<script setup lang="ts">
+import * as ElIcons from '@element-plus/icons-vue'
+import {reactive, onMounted} from "vue";
+
+const emit = defineEmits(['update:modelValue', 'on-change']);
+
+const props = defineProps({
+  modelValue: {
+    type: String
+  }
+})
+
+onMounted(() => {
+  if (props.modelValue) {
+    state.currentIconName = props.modelValue;
+  }
+  for (let name in ElIcons) {
+    state.icons.push(name)
+  }
+  emit(`update:modelValue`, state.currentIconName);
+})
+
+const state = reactive({
+  iconList: [],
+  icons: [],
+  dialogVisible: false,
+  currentIconName: 'ele-Aim'
+})
+
+const handleIconSelect = (name: string) => {
+  state.currentIconName = 'ele-' + name;
+}
+const handleClose = () => {
+  state.dialogVisible = false;
+}
+const beforeOpen = () => {
+
+}
+const handleOk = () => {
+  emit(`update:modelValue`, state.currentIconName);
+  emit('on-change')
+  handleClose();
+}
+
+</script>
+
+<style scoped lang="scss">
+.selected {
+  background-color: var(--el-color-primary);
+  color: white;
+}
+</style>
+

+ 119 - 0
admin-web/src/components/form/ExtImport.vue

@@ -0,0 +1,119 @@
+<style scoped>
+
+:deep(.el-upload .el-upload--text) {
+  width: 100% !important;
+}
+</style>
+<template>
+    <span style="margin: 0 10px;">
+        <el-button plain @click="state.showUpload=true" type="info" size="default" :loading="state.showUpload">
+           <SvgIcon name="ele-BottomRight"/>
+            {{ state.labelTitle }}
+          </el-button>
+
+        <el-dialog
+            draggable
+            destroy-on-close
+            ref="importDialog"
+            v-model="state.showUpload"
+            width="475"
+            :close-on-click-modal="false"
+            align-center
+            title="导入文件">
+                <el-upload
+                    type="drag"
+                    :show-upload-list="false"
+                    :before-upload="beforeUpload"
+                    :on-success="handleUploadSuccess"
+                    :max-size="20480"
+                    :on-format-error="handleUploadFormatError"
+                    accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+                    :on-exceeded-size="handleUploadMaxSize"
+                    :action="state.uploadUrl">
+                  <el-card shadow="always" style="text-align: center;margin-left: 25px">
+                    <div class="flex flex-center flex-align-items-center w100">
+                       <SvgIcon size="36" name="ele-Upload" color="'var(--el-color-primary-light-5)'"/>
+                        <p style="color:#3399ff">
+                        点击或拖拽文件到此处上传,仅支持XLS、XLSX格式文件
+                        </p>
+                      </div>
+                  </el-card>
+
+                  <template #tip v-if="tips">
+                    <el-alert :title="tips" type="success"></el-alert>
+                  </template>
+                </el-upload>
+
+          <template #footer>
+            <el-row justify="space-around">
+              <el-col :span="12" style="text-align: left">
+                <el-link type="primary" v-if="templateUrl" style="padding-top: 10px;" :href="u.fmt.fmtServerUrl(templateUrl)">下载模板</el-link>
+              </el-col>
+              <el-col :span="12">
+                   <el-button type="primary" @click="confirm" size="default">确认</el-button>
+              </el-col>
+            </el-row>
+			</template>
+        </el-dialog>
+    </span>
+</template>
+<script lang="ts" setup name="ExtImport">
+
+import {ref, nextTick,onMounted} from 'vue';
+import u from "/@/utils/u";
+import {Msg} from "/@/utils/message";
+
+const emit = defineEmits(['update:value', 'finish']);
+
+const props = defineProps({
+  importUrl: {
+    type: String
+  },
+  label: {
+    type: String
+  },
+  tips: {
+    type: String
+  },
+  templateUrl: {
+    type: String
+  },
+})
+
+const state = ref({
+  uuid: null,
+  labelTitle: props.label || "导入",
+  showUpload: false,
+  uploadUrl:''
+})
+onMounted(()=>{
+  state.value.uploadUrl = u.fmt.fmtServerUrl(props.importUrl)
+})
+
+const beforeUpload = () => {
+  Msg.showLoading("导入中...");
+}
+const handleUploadMaxSize = () => {
+  Msg.message("文件超出20M大小限制", 'error')
+  Msg.hideLoading();
+}
+const handleUploadFormatError = () => {
+  Msg.message('请选择Excel文件导入上传', 'error');
+  Msg.hideLoading();
+}
+
+const handleUploadSuccess = (obj: any) => {
+  Msg.hideLoading();
+  if (!obj || obj.code === 200) {
+    Msg.message("导入成功", 'success');
+  }
+}
+
+const confirm = () => {
+  nextTick(() => {
+    state.value.showUpload = false;
+    emit("finish");
+  })
+}
+
+</script>

+ 76 - 0
admin-web/src/components/form/ExtPage.vue

@@ -0,0 +1,76 @@
+<template>
+  <el-row style="margin-top: 8px;">
+    <el-col :span="24">
+      <el-pagination
+          :current-page="state.page.pageIndex"
+          :page-size="state.page.pageSize"
+          :page-sizes="[10, 20, 50, 100]"
+          :small="true"
+          :background="true"
+          layout="total, sizes, prev, pager, next"
+          :total="state.page.total"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+      />
+    </el-col>
+  </el-row>
+
+</template>
+
+<script setup lang="ts" name="ExtPage">
+import {reactive, onMounted,  nextTick,watch} from 'vue';
+
+const emit = defineEmits(['change', 'update:value']);
+
+const props = defineProps({
+  value: {
+    type: Object,
+    default: () => {
+    }
+  },
+})
+
+const state = reactive({
+  page: {
+    pageIndex: 1,
+    pageSize: 20,
+    total: 0
+  } as IPage
+})
+
+// 监听双向绑定值改变,用于回显
+watch(
+    () => props.value,
+    (val, oldVal) => {
+      setupPage();
+    },
+    {deep: true,}
+);
+
+onMounted(() => {
+  nextTick(() => {
+    setupPage();
+  })
+})
+
+const setupPage = () => {
+  if (props.value) {
+    state.page.pageIndex = props.value.pageIndex;
+    state.page.pageSize = props.value.pageSize;
+    state.page.total = props.value.total;
+  }
+}
+
+const handleSizeChange = (val: number) => {
+  state.page.pageSize = val;
+  emit("update:value", state.page)
+  emit("change", state.page)
+  console.log(`${val} items per page`)
+}
+const handleCurrentChange = (val: number) => {
+  state.page.pageIndex = val;
+  emit("update:value", state.page)
+  emit("change", state.page)
+  console.log(`current page: ${val}`)
+}
+</script>

+ 57 - 0
admin-web/src/components/form/ExtProgress.vue

@@ -0,0 +1,57 @@
+<template>
+  <div id="ext_progress" @mousedown="onDragStart">
+    <el-progress
+        style="margin-top: 12px; cursor: pointer"
+        :percentage="state.progress"
+        :text-inside="true"
+        :stroke-width="16"
+        status="success"
+    ></el-progress>
+  </div>
+</template>
+<script setup lang="ts" name="ExtProgress">
+import {onMounted, reactive} from 'vue';
+
+const emit = defineEmits(['on-change', 'update:modelValue','on-choose','on-remove']);
+
+const props = defineProps({
+  modelValue: {
+    type: Number,
+    default: 0
+  },
+})
+
+onMounted(() => {
+  state.progress = props.modelValue || 0;
+})
+
+const state = reactive({
+  isDragEnd: false,
+  progress: 0
+})
+
+const onDragStart = (event: any) => {
+  state.isDragEnd = true;
+  let progressBox = document.querySelector("#ext_progress");
+  progressBox.addEventListener("mouseup", onDragEnd);
+  progressBox.addEventListener("mousemove", onDrag);
+}
+
+const onDragEnd = () => {
+  state.isDragEnd = false;
+}
+
+const onDrag = (event: any) => {
+  if (state.isDragEnd) {
+    const progressBox = document.querySelector("#ext_progress");
+    const rect = progressBox.getBoundingClientRect();
+    const width = rect.width;
+    const offsetX = event.clientX - rect.left;
+    let percentage = Math.round((offsetX / width) * 100);
+    percentage = Math.max(0, Math.min(percentage, 100));
+    state.progress = percentage;
+    emit("update:modelValue",percentage)
+  }
+}
+
+</script>

+ 19 - 0
admin-web/src/components/form/ExtRender.vue

@@ -0,0 +1,19 @@
+<script >
+import {h} from "vue";
+
+export default {
+  name: 'ExtRender',
+  props: {
+    data: Object,
+    func:Function
+  },
+  //h(节点名,属性,子组件[]或文本)
+  //通过render创建组件而不是通过template。没有:绑定参数的操作而是直接{}绑定参数
+  render() {
+    return (
+        this.func(h,this.data)
+        // this.func.apply(null,[h,this.data])
+    )
+  }
+}
+</script>>

+ 205 - 0
admin-web/src/components/form/ExtSContainer.vue

@@ -0,0 +1,205 @@
+<style scoped>
+</style>
+
+<template>
+  <el-drawer
+      ref="modal"
+      v-model="state.show"
+      show-close
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="选择"
+      style="padding: 10px;"
+      size="45%">
+
+    <el-row>
+      <el-col :span="24">
+        <ExtQueryForm ref="queryRef"
+                      v-model="state.queryForm"
+                      :columns="state.columns"
+                      @on-change="loadData(true)"/>
+      </el-col>
+
+    </el-row>
+
+
+    <el-row>
+      <el-col :span="24">
+        <el-scrollbar>
+          <ExtTable
+              :height="state.height"
+              :data-list="state.dataList"
+              :columns="state.columns"
+              :show-check-box="state.multiple"
+              :loading="state.loading"
+              :border="true"
+              :selectable="true"
+              @on-check-change="handleCheckChange"
+              @on-sort-change="handleSortChange"/>
+        </el-scrollbar>
+      </el-col>
+    </el-row>
+
+
+    <el-row>
+      <el-col :span="24">
+        <ExtPage v-model:value="state.pageQuery" @change="loadData(true)"/>
+      </el-col>
+    </el-row>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="state.show = false">取消</el-button>
+        <el-button type="primary" @click="confirm">确定</el-button>
+      </span>
+    </template>
+  </el-drawer>
+</template>
+
+
+<script setup lang="ts" name="ExtSContainer">
+import {reactive, onMounted, defineAsyncComponent,nextTick,ref} from 'vue';
+
+import {$body, $post} from "/@/utils/request";
+import u from "/@/utils/u";
+import ExtQueryForm from "/@/components/form/ExtQueryForm.vue";
+
+const ExtPage = defineAsyncComponent(() => import('/@/components/form/ExtPage.vue'))
+const ExtTable = defineAsyncComponent(() => import('/@/components/form/ExtTable.vue'))
+
+const  queryRef = ref();
+const state = reactive({
+  queryItem: {
+    id: undefined,
+  },
+  init: false,
+  columns: [
+    {label: 'ID', prop: 'id', width: 70,query: true,type:'number',conf:{op:'eq'}},
+    {label: '名称', prop: 'name', query: true, type: 'text', resizable: true},
+    {label: '创建时间', prop: 'createAt', query: true,sortable: 'custom',type:'datetime',hide:true},
+    {label: '更新时间', prop: 'updateAt',query: true, sortable: 'custom',type:'datetime',hide:true},
+  ],
+  datas: [],
+  checkIds: [],
+  chosenIdList: [],
+  config: {} as any,
+  show: false,
+  queryForm: {},
+  pageQuery: {
+    pageIndex: 1,
+    pageSize: 20,
+    total: 0
+  },
+  callback: () => {
+  },
+  dataList: [],
+  checkDataList: [],
+  multiple: false,
+  height:500,
+  loading:false
+})
+
+onMounted(() => {
+  // initQuery();
+
+  console.log("ExtSContainer>>>>>>>>>>onMounted")
+
+
+})
+
+
+
+const open = (callback: Function, multiple: boolean = false, config: any, chosenIdList: Array<number>) => {
+  state.config = config;
+  state.show = true;
+  state.multiple = multiple;
+  state.callback = callback;
+  state.chosenIdList = chosenIdList;
+  initQuery();
+  loadData(true)
+}
+
+const handleSortChange = (sort: any) => {
+  console.log("handleSortChange>>>>", sort)
+  //TODO 合并查询条件
+}
+
+const handleCheckChange = (list: any) => {
+  console.log("xxxx choosexxxx", list)
+  state.checkDataList = list;
+}
+
+const loadData = (refresh: boolean = false) => {
+  if (refresh) {
+    state.pageQuery.pageIndex = 1;
+  }
+  let {url, domain, cols, query} = state.config;
+  // if (url) {
+  //   request = u.fmt.fmtUrl(url);
+  // } else {
+  //   request = u.fmt.fmtUrl(`/${domain}/list`);
+  // }
+  let requestQuery = {...state.pageQuery,...query, ...state.queryForm}
+
+  console.log(requestQuery)
+  $body(url, requestQuery).then((res: any) => {
+    state.loading = false;
+    let {list, count} = res;
+    state.pageQuery.total = count;
+    state.dataList = list;
+  })
+}
+
+
+const confirm = () => {
+  if (state.callback && typeof state.callback === 'function') {
+    state.callback.apply(null, [state.checkDataList]);
+  }
+  /*  let list = [];
+    for (var i = 0; i < this.dataList.length; i++) {
+      if (this.containsInIds(this.dataList[i].id)) {
+        list.push(this.dataList[i]);
+      }
+    }
+    if (this.options.callback && list.length > 0) {
+      this.options.callback(list);
+    }*/
+  state.show = false;
+}
+
+
+/**
+ * 设置基础构造查询字段、展示字段等
+ */
+const initQuery = () => {
+  if (state.init) {
+    return;
+  }
+  let {columns, query} = state.config;
+  if (!u.isEmptyOrNull(columns)) {
+//
+  }
+  console.log(state.config)
+  if (query) {
+    state.queryForm = {...state.queryForm, ...query}
+    // Object.keys(query).forEach(k=>state.queryForm[k] = query[k]);
+  }
+  console.log(state.queryForm)
+  state.init = true;
+
+  nextTick(() => {
+    let bodyHeight = document.body.clientHeight;
+    let queryHeight = queryRef.value?.$el.clientHeight;
+    state.height = bodyHeight - queryHeight - 150
+    console.log(state.height)
+  })
+}
+
+
+
+// 暴露变量
+defineExpose({
+  open,
+});
+</script>

+ 222 - 0
admin-web/src/components/form/ExtSearch.vue

@@ -0,0 +1,222 @@
+<style scoped lang="scss">
+.ext-search-container {
+
+  cursor: pointer;
+  width: 100%;
+  line-height: 32px;
+  height: 32px;
+  display: inline-flex;
+  flex-grow: 1;
+  align-items: center;
+  justify-content: space-between;
+  padding: 1px 5px;
+  background-color: var(--el-input-bg-color, var(--el-fill-color-blank));
+  background-image: none;
+  border-radius: var(--el-input-border-radius, var(--el-border-radius-base));
+  transition: var(--el-transition-box-shadow);
+  transform: translate3d(0, 0, 0);
+  box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
+
+  &:hover {
+    border: 1px solid var(--el-border-color-hover);
+  }
+}
+
+.info-box {
+  margin-right: 5px;
+  display: inline-flex;
+  justify-content: space-between;
+  align-items: center;
+  flex: 1;
+  /*width: 160px;*/
+  height: 32px;
+  /*line-height: 1.5;*/
+  /*padding: 6px 7px;*/
+  font-size: 12px;
+  /*border: 1px solid #dddee1;*/
+  color: #495060;
+  /*background-color: #fff;*/
+  background-image: none;
+  cursor: text;
+}
+
+.icon-right {
+  position: absolute;
+  right: 5px;
+  top: 5px;
+  z-index: 999;
+  /*display: none;*/
+  cursor: pointer;
+}
+
+.icon-right {
+  display: none;
+}
+
+.icon-right:hover {
+  display: inline-block;
+}
+</style>
+<template>
+  <div :style="{width: props.width+'px'}" class="ext-search-container" @click="chooseObject">
+        <span :class="{readonly:'z-no-border'}" class="info-box z-ellipsis">
+          <template v-if="u.isEmptyOrNull(state.displays)">
+              <span style="color:#C2C5CA;">{{ placeholder }}</span>
+          </template>
+          <template v-else>
+              <el-tag
+                  v-for="(tag,idx) in state.displays"
+                  :key="tag.name||tag.title||tag"
+                  class="mx-1"
+                  @close="handleClose(idx)"
+                  @click="handleClick(tag)"
+                  :closable="!readonly">
+              {{ tag.name }}
+            </el-tag>
+          </template>
+
+          <!--            <span v-else class="z-pointer z-ellipsis" @click="showItem">{{ objectName }}</span>-->
+          <el-icon class="icon-right" v-if="!readonly" @click="clearObject"><Delete/></el-icon>
+        </span>
+    <el-button v-if="!readonly"  type="text" size="small" :icon="Search" circle/>
+  </div>
+  <ExtSContainer ref="extSContainerRef" v-if="!readonly"/>
+</template>
+
+<!--带弹窗搜索的关联组件-->
+
+<script setup lang="ts" name="ExtSearch">
+import {onMounted, defineAsyncComponent, ref, nextTick,watch} from 'vue';
+import {Delete, Search} from '@element-plus/icons-vue'
+import u from "/@/utils/u";
+
+const ExtSContainer = defineAsyncComponent(() => import('/@/components/form/ExtSContainer.vue'));
+
+const extSContainerRef = ref();
+
+const emit = defineEmits(['update:modelValue','on-change']);
+
+const props = defineProps({
+  modelValue: {
+    type: [Number, String, Array<Number>]
+  },
+  displayList: {
+    type: [String, Array<any>]
+  },
+  placeholder: {
+    type: String,
+    default: '请选择'
+  },
+  readonly: {
+    type: Boolean,
+    default: false
+  },
+  multiple: {
+    type: Boolean,
+    require: true,
+    default: false
+  },
+  config: {   //{domain:xxx,url:xxx,query:{},cols:[]}
+    type: Object
+  },
+})
+
+const state = ref({
+  objectId: null as any,
+  objectName: null as any,
+  displays: [] as Array<any>,
+  displayIds: [] as Array<any>,
+  dialogVisible:false
+})
+
+watch(()=>props.displayList,()=>{
+  if (props.multiple) {
+    if (props.displayList) {
+      if (!Array.isArray(props.displayList)) {
+        console.error("value list error")
+        return;
+      }
+      state.value.displays = props.displayList;
+      state.value.displayIds = props.modelValue;
+    }
+  } else {
+    state.value.displays = [props.displayList]
+    state.value.displayIds = [props.modelValue]
+  }
+
+  console.log(state.value.displays)
+  console.log(state.value.displayIds)
+})
+
+onMounted(() => {
+
+
+  // state.objectId = props.modelValue;
+  // state.objectName = props.oname;
+})
+
+const handleClick = () => {
+  /*extSContainerRef.value?.open((res:any)=>{
+
+  },props.multiple,props.config,state.value.displayIds);*/
+  // let entity = props.domain;
+  /*  entity = entity.substring(0, 1).toUpperCase() + entity.substring(1);
+    app.openModal(`${entity}InfoModal`, {
+      id: this.value
+    });*/
+}
+
+const handleClose = (idx: number) => {
+  state.value.displays.splice(idx, 1);
+  state.value.displayIds.splice(idx, 1);
+  emitData();
+}
+
+const emitData = () => {
+  nextTick(() => {
+    if (props.multiple) {
+      emit("update:modelValue", state.value.displayIds, state.value.displays)
+      emit("on-change")
+    } else {
+      emit("update:modelValue", state.value.displayIds[0], state.value.displays[0])
+      emit("on-change")
+    }
+  })
+}
+const chooseObject = () => {
+  console.log(props.config,props.multiple)
+  nextTick(()=>{
+    extSContainerRef.value?.open(
+        chooseCallback,
+        props.multiple,
+        props.config,
+        state.value.displayIds
+    );
+  })
+
+}
+
+const chooseCallback = (list: Array<any>) => {
+  if (u.isEmptyOrNull(list)) {
+    return;
+  }
+  if (props.multiple) {
+    state.value.displayIds = state.value.displayIds.concat(list.map(k => k.id))
+    state.value.displays = state.value.displays.concat(list)
+  } else {
+    state.value.displayIds = [list[0].id]
+    state.value.displays = [list[0].name]
+  }
+  emitData();
+}
+
+const clearObject = () => {
+  state.value.displayIds = [];
+  state.value.displays = [];
+  emitData();
+  // state.objectName = undefined;
+  // state.objectId = undefined;
+  // state.query['id'] = undefined;
+}
+
+</script>

+ 128 - 0
admin-web/src/components/form/ExtSelect.vue

@@ -0,0 +1,128 @@
+<template>
+  <el-select-v2
+      :options="state.list"
+      :disabled="disabled"
+      :multiple="multiple"
+      filterable
+      :clearable="clearable"
+      :placeholder="placeholder"
+      :max-collapse-tags="max"
+      @change="handleValueChange"
+      @clear="handleValueClear"
+      v-model="state.modelVal">
+    <template #empty>
+      <el-empty :image-size="40"/>
+    </template>
+    <template #prefix>
+      <SvgIcon :name="prefix"/>
+    </template>
+<!--    <el-option :key="item.id" v-for="item in state.list" :value="item.id" :label="item.name||item.title"> {{ item.name || item.title }}</el-option>-->
+  </el-select-v2>
+</template>
+<script lang="ts" setup name="ExtSelect">
+import {onMounted, ref, nextTick,watch} from 'vue';
+import u from "/@/utils/u";
+import {$body, $post} from "/@/utils/request";
+
+const emit = defineEmits(['update:modelValue', 'on-change']);
+
+const props = defineProps({
+  modelValue: {
+    type: Number
+  },
+  prefix: {
+    type: String
+  },
+  max: {
+    type: Number,
+    default: 3
+  },
+  url: {
+    type: String
+  },
+  query: {
+    type: Object
+  },
+  disabled: {
+    type: Boolean,
+    default: false
+  },
+  clearable: {
+    type: Boolean,
+    default: true
+  },
+  multiple: {
+    type: Boolean,
+    default: false
+  },
+  placeholder: {
+    type: String,
+    default: '请选择'
+  },
+  dataList: {
+    type: Array<any>
+  }
+})
+
+const state = ref({
+  list: [] as Array<any>,
+  modelVal: null
+})
+
+watch(()=>props.modelValue,(val)=>{
+  console.log("watch>>>",val)
+  state.value.modelVal = val;
+  })
+
+onMounted(() => {
+  loadData();
+})
+
+const loadData = () => {
+  if (!u.isEmptyOrNull(props.dataList)) {
+    state.value.list = props.dataList;
+  } else {
+    if (!props.url) {
+      return;
+    }
+    var query = {
+      pageIndex: 1,
+      pageSize: 200,
+    };
+    if (props.query) {
+      query = Object.assign({}, query, props.query);
+    }
+    $body(`${props.url}`, query).then((res: any) => {
+      let {list,count}  = res;
+      state.value.list =  list.map(k=>{
+        return {value:k.id,label:k.name}
+      })
+      console.log(state.value.list)
+      // state.value.list = res?.list
+    });
+  }
+
+}
+
+const handleValueChange = (val: any) => {
+  nextTick(() => {
+    console.log("handleValueChange--->", val)
+    emit("update:modelValue", val);
+    emit("on-change", val);
+  })
+}
+
+const handleValueClear = () => {
+  // props.query.id = undefined;
+  // this.query['id'] = undefined;
+  // let val: any = [];
+  // if (!props.multiple) {
+  //   val = undefined;
+  // }
+  // // emit("update:value", val);
+  // // emit("change", val);
+  // loadData();
+}
+
+
+</script>

+ 189 - 0
admin-web/src/components/form/ExtTable.vue

@@ -0,0 +1,189 @@
+<style scoped lang="scss">
+:deep(.el-table thead th.el-table__cell ) {
+  background: var(--el-fill-color-light);
+}
+
+/**
+未生效 todo
+ */
+:deep(el-table td.el-table__cell  div) {
+  .name-label {
+    cursor: pointer;
+    color: var(--el-color-primary-light-1);
+  }
+}
+
+</style>
+<template>
+  <div>
+    <el-table
+        :border="border"
+        :stripe="stripe"
+        :height="height"
+        highlight-current-row
+        current-row-key="id"
+        row-key="id"
+        :data="dataList"
+        v-loading="loading"
+        @row-dblclick="handleRowDblclick"
+        @selection-change="handleTableSelectionChange"
+        @sort-change="handleTableSortChange">
+      <template #empty>
+        <el-empty></el-empty>
+      </template>
+      <el-table-column type="selection" align="center" width="55" v-if="selectable" fixed="left"/>
+      <el-table-column
+          v-for="field in state.cols"
+          :key="field.prop"
+          :label="field.label"
+          :type="field.type"
+          :column-key="field.prop"
+          :width="field.width"
+          :min-width="field.minWidth"
+          :fixed="field.fixed"
+          :render-header="field.renderHeader"
+          :sortable="field.sortable"
+          :resizable="!field.fixed"
+          :show-overflow-tooltip="!field.fixed&&field.width>150"
+          reserve-selection
+      >
+        <template #default="{row}">
+
+<!--          {{field.prop}}-->
+<!--          {{row}}-->
+<!--          {{row[field.prop]}}-->
+          <template v-if="field.type==='expand'">
+            <p style="padding-left: 2em;" v-html="row[field.prop]"></p>
+          </template>
+
+
+          <template v-else>
+            <template v-if="field.render">
+              <ExtRender :func="field.render" :data="row"/>
+            </template>
+            <template v-else-if="field.type==='rich'">
+              <p v-html="row[field.prop]"></p>
+            </template>
+            <template v-else-if="field.type==='dict'">
+              <!--   字典-->
+              <ExtDLabel v-if="field.conf.dict" :type="field.conf.dict" v-model="row[field.prop]"/>
+              <ExtDLabel v-else-if="field.conf.range" :data-range="field.conf.range" v-model="row[field.prop]"/>
+            </template>
+            <template v-else-if="field.type==='rate'">
+              <el-rate v-model="row[field.prop]" allow-half/>
+            </template>
+            <template v-else-if="field.type==='progress'">
+              <el-progress type="circle" :percentage="row[field.prop]" :status="{'success':row[field.prop]>=100}"/>
+            </template>
+
+            <template v-else-if="field.type==='dept'||field.type==='user'">
+              <el-tag v-for="(v,id) in fieldUtil.value(field,row)" :key="id">{{ v }}</el-tag>
+            </template>
+
+            <template v-else-if="field.type==='bool'">
+              <ext-boolean v-model="row[field.prop]" disabled/>
+            </template>
+
+            <template v-else-if="field.type==='avatar'">
+              <el-avatar :size="50" :src="u.fmt.fmtImg(row[field.prop])"/>
+            </template>
+
+            <template v-else-if="field.type==='image'">
+              <ext-upload
+                  v-model="row[field.prop]"
+                  :multiple="field.conf?.multiple"
+                  style="width: 100%"
+                  mime="image"
+                  readonly >
+
+              </ext-upload>
+            </template>
+
+            <template v-else-if="field.type==='attach'">
+              <ext-upload
+                  v-model="row[field.prop]"
+                  :multiple="field.conf?.multiple"
+                  style="width: 100%"
+                  mime="attach"
+                  readonly  >
+              </ext-upload>
+            </template>
+
+            <div v-else>{{ fieldUtil.value(field, row) }}</div>
+          </template>
+
+        </template>
+      </el-table-column>
+
+      <!--      <template v-if="column.slot" v-for="(column,idx) in cls" slot-scope="{row,index}" :slot="column.slot">
+              <Input :disabled="readonly" class="z-no-border" v-model="row[column.key]"/>
+            </template>-->
+    </el-table>
+  </div>
+</template>
+<script setup lang="ts" name="ExtTable">
+import {reactive, onMounted,defineAsyncComponent} from 'vue';
+import fieldUtil from "/@/utils/field";
+import ExtDLabel from "/@/components/form/ExtDLabel.vue";
+import ExtRender from "/@/components/form/ExtRender.vue";
+import ExtBoolean from "/@/components/form/ExtBoolean.vue";
+import u from "/@/utils/u";
+
+const ExtUpload = defineAsyncComponent(() => import("/@/components/form/ExtUpload.vue"));
+
+const emit = defineEmits(['on-sort-change', 'on-check-change', 'on-row-dblclick']);
+const props = defineProps({
+  loading: {
+    type: Boolean,
+    default: true
+  },
+  columns: {
+    type: Array < IField >,
+    require: true,
+    default: () => []
+  },
+  dataList: {
+    type: Array
+  },
+  border: {
+    type: Boolean,
+    default: true
+  },
+  height: {
+    type: Number,
+    default: 500
+  },
+  stripe: {
+    type: Boolean,
+    default: false
+  },
+  selectable: {
+    type: Boolean,
+    default: false
+  }
+})
+
+const state: any = reactive({
+  cols: [] as Array<IField>
+})
+
+onMounted(() => {
+  state.cols = fieldUtil.toTableShowField(props.columns);
+  console.table(state.cols)
+})
+
+const handleTableSelectionChange = (selection: any) => {
+  console.log("handleTableSelectionChange>>", selection)
+  emit("on-check-change", selection)
+}
+
+const handleTableSortChange = (column, prop, order) => {
+  console.log("handleTableSortChange>>", column, prop, order)
+  emit("on-sort-change", column)
+}
+
+const handleRowDblclick = (row, column, event) => {
+  emit("on-row-dblclick", row)
+}
+
+</script>

+ 107 - 0
admin-web/src/components/form/ExtTag.vue

@@ -0,0 +1,107 @@
+<style scoped lang="scss">
+.tag-warpper {
+  width: 100%;
+  min-height: 35px;
+  border-radius: 2px;
+}
+
+
+.tag-list .el-tag {
+  height: 26px;
+  line-height: 26px;
+  float: left;
+}
+
+.tag-input {
+  float: left;
+  min-width: 150px;
+  border-width: 0;
+}
+
+.tag-warpper /deep/ .el-input {
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  -o-appearance: none;
+  appearance: none;
+  border-width: 0;
+  width: 100% !important;
+  outline: none !important;
+  box-shadow: none !important;
+}
+
+.tag-warpper .el-input:hover {
+  border-width: 0;
+  outline: none !important;
+  box-shadow: none !important;
+}
+
+.tag-warpper .el-input:focus {
+  border-width: 0;
+  outline: none !important;
+  box-shadow: none !important;
+}
+
+</style>
+<template>
+  <div>
+    <div :class="className">
+      <div class="tag-list">
+        <el-tag v-for="(item,idx) in state.tagList" :key="idx"
+                :name="item" :closable="!readonly" :color="'var(--el-text-color-primary)'"
+                @on-close="deleteItem(idx)">{{ item }}
+        </el-tag>
+        <div v-if="!readonly" class="tag-input nob">
+          <Input v-model="state.inputTag" :placeholder="placeholder"
+                 @keyup.enter.native="enterTag"/>
+        </div>
+      </div>
+    </div>
+  </div>
+
+</template>
+<script setup lang="ts" name="ExtTag">
+import {reactive} from 'vue';
+import {ElMessage} from 'element-plus';
+
+const emit = defineEmits(['update:value']);
+const props = defineProps({
+  value: {
+    type: Array,
+    default: () => {
+      return [];
+    }
+  },
+  readonly: {
+    type: Boolean,
+    default: false
+  },
+  placeholder: {
+    type: String,
+    default: '点此输入,Enter回车键键确认'
+  },
+  className: {
+    type: String,
+    default: "tag-warpper"
+  }
+})
+
+const state = reactive({
+  tagList: [] as Array<String>,
+  inputTag: ""
+})
+
+const enterTag = () => {
+  if (!state.inputTag.trim()) {
+    ElMessage.warning("输入内容不能为空");
+  } else {
+    state.tagList.push(state.inputTag);
+    state.inputTag = "";
+  }
+  emit("update:value", state.tagList)
+}
+
+const deleteItem = (idx: number) => {
+  state.tagList.splice(idx, 1);
+  emit("update:value", state.tagList)
+}
+</script>

+ 20 - 0
admin-web/src/components/form/ExtTip.vue

@@ -0,0 +1,20 @@
+<template>
+  <el-tooltip max-width="200" :placement="props.placement" :content="props.tip" :delay="200" effect="light">
+    <SvgIcon name="ele-QuestionFilled" color="#5cadff" class="cursor-help"></SvgIcon>
+  </el-tooltip>
+</template>
+
+<script setup lang="ts" name="ExtTip">
+
+const props = defineProps({
+  tip: {
+    type: String,
+    required: true
+  },
+  //toptop-starttop-endbottombottom-startbottom-endleftleft-startleft-endrightright-startright-end
+  placement: {
+    type: String,
+    default: 'top'
+  }
+})
+</script>

+ 307 - 0
admin-web/src/components/form/ExtTreeSelect.vue

@@ -0,0 +1,307 @@
+<template>
+  <div style="display: inline-block;width: 100%">
+    <div class="ext-tree-select-display" v-if="!state.init&&state.displays.length>0" @click="handleDisplayClick">
+      <template v-if="readonly&&!state.displays">{{ placeholder }}</template>
+      <el-tag :key="idx" v-for="(item,idx) in state.displays">{{ item.name || item }}</el-tag>
+    </div>
+    <el-tree-select
+        style="width: 100%"
+        v-show="state.init||(state.displays.length===0&&!readonly)"
+        ref="extTreeSelectRef"
+        v-model="state.modelValue"
+        :data="state.treeData"
+        :default-check-keys="state.defaultCheckKeys"
+        :filter-node-method="filterNodeMethod"
+        filterable clearable
+        highlight-current
+        :placeholder="placeholder"
+        :disabled="readonly"
+        show-checkbox
+        :loading="state.loading"
+        :check-on-click-node="state.checkOnClickNode"
+        :check-strictly="state.checkStrictly"
+        :multiple="multiple"
+        :node-key="nodeKey"
+        :props="{children:children,label:label}"
+        @check="handleTreeCheck"
+        @clear="handleSelectClear"
+        @visible-change="handleVisibleChange">
+      <template #empty>
+        <el-empty :image-size="50"/>
+      </template>
+    </el-tree-select>
+  </div>
+
+</template>
+
+<script lang="ts" setup name="ExtTreeSelect">
+import {reactive, onMounted, ref, watch} from 'vue';
+import {ElMessage} from 'element-plus';
+import {$body} from "/@/utils/request";
+import u from "/@/utils/u";
+
+const extTreeSelectRef = ref();
+const props = defineProps({
+  modelValue: {
+    type: [Number, Array<Number>]
+  },
+  multiple: {
+    type: Boolean,
+    default: false
+  },
+  mode: {
+    type: String,
+    default: 'dept'   //dept  user  custom
+  },
+  children: {
+    type: String,
+    default: 'children'
+  },
+  label: {
+    type: String,
+    default: 'name'
+  },
+  nodeKey: {
+    type: String,
+    default: 'id'
+  },
+  showCheckbox: {
+    type: Boolean,
+    default: true
+  },
+  placeholder: {
+    type: String,
+    default: '请选择'
+  },
+  readonly: {
+    type: Boolean,
+    default: false
+  },
+  displayList: {
+    type: [String, Array]
+  }
+});
+
+const state = reactive({
+  treeData: [] as Array<SelectTreeType>,
+  checkStrictly: true,  //任何节点都可被选择,否则只有子节点可被选择
+  showCheckBox: false, // 复选框
+  checkOnClickNode: false, //只有点击当前节点才可被选择
+  modelValue: null,
+  loading: false,
+  init: false,
+  displays: [] as Array<any>,
+  defaultCheckKeys: []
+})
+
+const emit = defineEmits(['update:modelValue', 'on-change']);
+
+watch(() => props.modelValue, (val) => {
+  if (state.init) {
+    // console.log(val)
+    // extTreeSelectRef.value.setCheckNodes(null)
+    reactiveModel()
+  }
+})
+
+// const modelVal = computed(() => props.value);
+// const defaultCheckKeys = computed(() => props.value);
+
+const reactiveModel = () => {
+  let val = props.modelValue;
+  let keys = [];
+  if (!props.multiple) {
+    keys = val ? [val] : []
+  } else {
+    keys = val || [];
+  }
+  console.log("reactiveModel>>>", keys)
+  extTreeSelectRef.value.setCheckedKeys(keys);
+  if (keys) {
+    let nodes = setupCheckNodes(state.treeData, keys)
+    extTreeSelectRef.value.setCheckedNodes(nodes);
+    console.log(nodes)
+  }
+
+}
+
+const setupCheckNodes = (tree: Array<any>, keys: Array<any>) => {
+  let result: Array<any> = [];
+  tree.forEach((item: any) => {
+    if (keys.includes(item.id)) {
+      result.push(item)
+    }
+    if (item.children) {
+      let ret = setupCheckNodes(item.children, keys)
+      if (ret) {
+        result = result.concat(ret);
+      }
+    }
+  })
+  return result;
+}
+
+const handleDisplayClick = () => {
+  state.init = true;
+  handleVisibleChange(true)
+  extTreeSelectRef.value.focus();
+}
+const handleVisibleChange = (visible: boolean) => {
+  // console.log("visible>>>", visible)
+  if (visible) {
+    loadData();
+  }
+}
+
+const handleSelectClear = () => {
+  extTreeSelectRef.value.setCheckedNodes([])
+  emitData();
+}
+
+const handleTreeCheck = () => {
+  // console.log(JSON.stringify(val))
+
+  if (!extTreeSelectRef.value) {
+    console.error("null select ref")
+  }
+  emitData();
+
+}
+
+const emitData = () => {
+  // console.error(state.modelValue)
+  let data = extTreeSelectRef.value.getCheckedNodes();
+  // console.error(data)
+  if (props.multiple) {
+    if (data && data.length > 0) {
+      emit("update:modelValue", data.map((k: any) => k[props.nodeKey]));
+      emit('on-change', data)
+    } else {
+      emit("update:modelValue", [])
+      emit('on-change', [])
+
+    }
+  } else {
+    if (data && data.length > 0) {
+      emit("update:modelValue", data[0][props.nodeKey])
+      emit('on-change', data[0])
+    } else {
+      emit("update:modelValue", null)
+      emit('on-change', null)
+    }
+  }
+}
+
+
+// const handleCurrentChange = (val,event)=>{
+//   console.log(val)
+//   console.log(event)
+// }
+
+const filterNodeMethod = (value: string, data: any) => {
+  // console.log(data, value)
+  return data[props.label].includes(value)
+}
+
+const recursiveArrayV2 = (treeData: Array<any>) => {
+  // let ret: Array<SelectTreeType> = [];
+  treeData.forEach(item => {
+    if (item.id < 0) {
+      item.disabled = true;
+    }
+    if (!u.isEmptyOrNull(item.children)) {
+      recursiveArrayV2(item.children)
+    }
+  })
+}
+
+const loadDeptUserData = () => {
+  $body(`/department/treeV2`).then((res: any) => {
+    if (!u.isEmptyOrNull(res)) {
+      recursiveArrayV2(res)
+      // console.log(res)
+      state.treeData = res;
+      state.loading = false;
+      reactiveModel()
+    } else {
+      ElMessage.info("暂无部门信息");
+    }
+  })
+}
+
+
+const loadDeptData = () => {
+  $body(`/department/tree`).then((res: any) => {
+    if (!u.isEmptyOrNull(res)) {
+      // let result: Array<SelectTreeType> = recursiveArray([res])
+      // console.log(res)
+      state.treeData = res;
+    } else {
+      ElMessage.info("暂无部门信息");
+    }
+    state.loading = false;
+    reactiveModel()
+  })
+}
+
+const loadData = () => {
+  state.init = true;
+  //不重复请求接口
+  if (state.treeData && state.treeData.length > 0) {
+    return;
+  }
+
+  state.loading = true;
+  if (props.mode === 'user') {
+    loadDeptUserData();
+    state.checkStrictly = false;
+    state.showCheckBox = true;
+    // state.checkOnClickNode = true;
+  } else if (props.mode === 'dept') {
+    loadDeptData();
+    state.showCheckBox = true;
+    // state.checkStrictly = props.multiple;
+  }
+}
+
+watch(() => props.displayList, (val) => {
+  console.log("displayList",val)
+  if (props.displayList) {
+    if (props.multiple) {
+      state.displays = [...props.displayList]
+    } else {
+      state.displays = [props.displayList]
+    }
+  }
+  console.log(JSON.stringify(state.displays))
+},{deep:true,immediate:true})
+
+onMounted(() => {
+
+});
+</script>
+
+<style scoped lang="scss">
+.ext-tree-select-display {
+  cursor: pointer;
+  width: 100%;
+  line-height: 32px;
+  height: 32px;
+  display: inline-flex;
+  flex-grow: 1;
+  align-items: center;
+  //justify-content: center;
+  padding: 1px 11px;
+  background-color: var(--el-input-bg-color, var(--el-fill-color-blank));
+  background-image: none;
+  border-radius: var(--el-input-border-radius, var(--el-border-radius-base));
+  //transition: var(--el-transition-box-shadow);
+  //transform: translate3d(0, 0, 0);
+  box-shadow: 0 0 0 1px var(--el-input-border-color, var(--el-border-color)) inset;
+
+  &:hover {
+    border: 1px solid var(--el-border-color-hover);
+  }
+}
+
+</style>

+ 564 - 0
admin-web/src/components/form/ExtUpload.vue

@@ -0,0 +1,564 @@
+<style scoped lang="scss">
+
+
+.upload-btn {
+  width: 60px;
+  height: 60px;
+  line-height: 60px;
+  text-align: center;
+  border: 1px dashed #dddddd;
+  border-radius: 2px;
+  cursor: pointer;
+  transition:all 0.5s;
+  margin-left: 5px;
+
+  &:hover{
+    border:1px dashed var(--el-color-primary)
+
+  }
+}
+
+.tips {
+  position: absolute;
+  font-size: 8px;
+  color: #FE526A;
+  display: inline-block;
+  bottom: -15px;
+}
+
+
+::v-deep(.el-form-item--default .el-form-item__content) {
+  display: none;
+}
+
+::v-deep(.el-upload-list) {
+  display: none !important;
+}
+</style>
+<template>
+  <div style="display:flex;align-items:center;min-width: 200px;padding: 10px 0;">
+    <canvas v-if="!readonly&&mime==='image'"  id="uploadCanvasId" style="display: none;"></canvas>
+      <div style="display: flex;flex-wrap: wrap;width: 100%" v-if="state.files.length>0">
+        <draggable
+            style="width: 100%"
+            :list="state.files"
+            itemKey="name"
+            ghost-class="ghost"
+            chosen-class="chosenClass"
+            animation="300"
+            @start="onMove"
+            @end="onEnd">
+          <template #item="{element,index}">
+            <div v-if="isAvatar"  class="hp">
+              <el-avatar :src="u.fmt.fmtImg(element.uid)" :size="60"/>
+              <SvgIcon name="ele-CircleCloseFilled" color="red" class="hc" @click="handleDeleteItem(0)"/>
+            </div>
+            <Attach v-else  :attach="element" @on-delete="handleDeleteItem(index)"/>
+          </template>
+        </draggable>
+      </div>
+
+    <el-upload
+        v-if="!readonly&&state.files.length<limit"
+        ref="upload"
+        :multiple="multiple"
+        :limit="limit"
+        :show-upload-list="false"
+        :before-upload="beforeUpload"
+        :on-success="handleUploadSuccess"
+        :max-size="maxSize||2048"
+        :accept="state.accept"
+        :data="state.uploadData"
+        :on-error="handleError"
+        :on-exceed="handleUploadMaxSize"
+        :on-progress="handleUploadProgress"
+        :action="uploadUrl"
+        style="display: inline-block;">
+      <div class="upload-btn">
+        <SvgIcon size="20" :name="mime==='image'?'ele-Picture':'ele-Paperclip'"/>
+      </div>
+      <el-progress status="success" style="width: 80px;"
+                   :percentage="Number(state.percent)"
+                   :stroke-color="['#108ee9', '#87d068']" :stroke-width="5"
+                   v-if="state.percent>0&&state.percent<100"/>
+    </el-upload>
+
+
+    <br>
+    <!--    <div v-if="readonly&&!value" class="upload-btn">-->
+    <!--      <SvgIcon size="20" :name="mime==='image'?'ele-Picture':'ele-Paperclip'"/>-->
+    <!--    </div>-->
+
+    <div class="tips" v-if="tips">{{ tips }}</div>
+  </div>
+</template>
+<script setup lang="ts" name="ExtUpload">
+import draggable from "vuedraggable";
+import {reactive, onMounted, computed, watch, onBeforeMount} from 'vue';
+import {UploadRawFile} from 'element-plus';
+import {$body} from "/@/utils/request";
+import u from "/@/utils/u";
+import {Session} from "/@/utils/storage";
+import {Msg} from "/@/utils/message";
+import Attach from "/@/components/attach/Attach.vue";
+
+
+const props = defineProps({
+  modelValue: {
+    type: [Object, Array, String]
+  },
+  maxSize: {
+    type: Number,
+    require: true,
+    default: 10240
+  },
+  mime: {
+    type: String,
+    require: true,
+    default: 'image'
+  },
+  tips: {
+    type: String
+  },
+  multiple: {
+    type: Boolean,
+    default: false
+  },
+  readonly: {
+    type: Boolean,
+    default: false
+  },
+  limit: {
+    type: Number,
+    default:1
+  },
+  compressed: {
+    type: Boolean,
+    default: false
+  },
+  isAvatar:{
+    type:Boolean,
+    default:false
+  }
+});
+
+
+const uploadUrl = computed(() => {
+  let token = Session.get('token');
+  return `${u.url.server}file/upload?X-Token=${token}`
+})
+
+const state = reactive({
+  previewUrl: '',
+  uploadData: {
+    data: undefined as any,
+    fileName: undefined as any
+  },
+  progressInterval: undefined,
+  accept: '' as string,
+  fileFormat: [] as Array<string>,
+  // uploadUrl: `${u.url.server}/file/upload?token=${app.token}`,
+  maxLength: props.limit || 1,
+  fileLength: 0,
+  files: [] as Array<any>,
+  spinShow: false,
+  images: [] as Array<any>,
+  init: false,
+  percent: '',
+  mode: 'cos',//当前上传模式,空-后台服务器/qiniu-七牛云/cos-腾讯云
+  qiniuConfig: {
+    useCdnDomain: false,
+    region: null
+  },
+  qiniuExtra: {},
+  qiniuUrl: 'http://pxal1j743.bkt.clouddn.com/',
+  cosUrl: "https://zyp-1258963180.cos.ap-guangzhou.myqcloud.com/",
+  cos: undefined,
+  cosConfig: {
+    tmpSecretId: undefined,
+    tmpSecretKey: undefined,
+    sessionToken: undefined,
+    expiredTime: undefined,
+  },
+  editable: false,
+  previewImage: null,
+  loading: null as any
+})
+
+const emit = defineEmits(['update:modelValue','on-change']);
+
+watch(
+    () => state.files,
+    (val) => {
+      console.log(!val,state.files)
+      if(!state.files||state.files.length===0){
+        if (props.limit && props.limit > 1) {
+          emit('update:modelValue', []);
+          emit('on-change')
+        }else{
+          emit('update:modelValue', null);
+          emit('on-change')
+        }
+      }else{
+        console.log("watch", state.files)
+        if (props.mime !== 'image') {
+          if (props.limit && props.limit > 1) {
+            emit('update:modelValue', val);
+          } else {
+            emit('update:modelValue', val[0]);
+          }
+        } else {
+          if (props.limit && props.limit > 1) {
+            emit('update:modelValue', state.files.map(k => k.uid));
+          } else {
+            emit('update:modelValue', state.files[0].uid);
+          }
+        }
+        emit('on-change')
+      }
+    },
+    {
+      deep: true
+    }
+);
+
+
+
+onBeforeMount(() => {
+  document.body.ondrop = function (event) {
+    //组织默认事件
+    event.preventDefault();
+    //阻止时间冒泡
+    event.stopPropagation();
+  }
+})
+
+onMounted(() => {
+  if (!props.limit) {
+    state.maxLength = 1;
+  } else {
+    state.maxLength = Number(props.limit);
+  }
+  prepareUpload();
+  initData();
+})
+
+/*const preview = (item: any) => {
+  let url = u.fmt.fmtPreview(item.url || item)
+  state.previewUrl = url;
+  console.log("preview:", item, url)
+  previewRef.value.handlePreview();
+  /!*  console.log("preview:", item)
+    let url = item.url || item;
+    let fullUrl = u.fmt.fmtUrl(url);
+    // url.indexOf("http") === 0 ? url : u.url.file + url;
+    if (!item) {
+      return;
+    }
+    let type = props.mime;
+    if (['image', 'video', 'audio'].includes(type)) {
+      ElMessage.warning(`预览功能开发中,敬请期待`)
+      // app.openModal('ExtPreview', {
+      //   url: fullUrl,
+      //   type: 'image'
+      // })
+      // this.previewImage = fullUrl;
+      // this.$refs.preview.open();
+    } else if (props.mime === 'wps' || props.mime === 'pdf') {
+      window.open("http://www.xdocin.com/xdoc?_func=to&_format=html&_cache=true&_xdoc=" + fullUrl, "_blank");
+    } else {
+      window.open(fullUrl, "_blank")
+    }*!/
+}*/
+
+const prepareUpload = () => {
+  const type = props.mime;
+  if (type == 'image') {
+    state.accept = "image/*";
+    state.fileFormat = ['jpg', 'jpeg', 'png', 'gif', 'svg'];
+  } else if (type == 'video') {
+    state.accept = "video/*";
+    state.fileFormat = ["mp4", "ogg", "avi", "webm"]
+  } else if (type == 'audio') {
+    state.accept = "audio/*";
+    state.fileFormat = ["mp3", "amr", "avi", "wav"]
+  } else if (type == 'pdf') {
+    state.accept = "application/pdf";
+    state.fileFormat = ["pdf"]
+  } else if (type == 'wps') {
+    state.fileFormat = ["doc", "docx", "xls", "xlsx", "ppt"]
+  } else {
+    state.accept = "**/*";
+  }
+  console.log(state.accept, props.mime)
+}
+
+/*const contains = (val: any, array: Array<any>) => {
+  let contain = false;
+  if (val) {
+    if (typeof val === "object") {
+      for (let i = 0; i < array.length; i++) {
+        if (val == array[i].url) {
+          contain = true;
+          break;
+        }
+      }
+    } else {
+      for (let i = 0; i < array.length; i++) {
+        if (val == array[i]) {
+          contain = true;
+          break;
+        }
+      }
+    }
+  }
+  return contain;
+}*/
+
+const initData = () => {
+  if (state.init) {
+    return
+  }
+  if (!props.modelValue) {
+    return;
+  }
+
+
+
+    if (props.mime === 'image') {
+      if (props.multiple) {
+        state.files = props.modelValue.map(k => {
+          return {uid: k, name: k}
+        })
+      } else {
+        state.files = [{uid: props.modelValue, name: props.modelValue}]
+      }
+    } else {
+      if (props.multiple) {
+        state.files = props.modelValue;
+      } else {
+        state.files = [props.modelValue]
+      }
+    }
+
+  state.init = true;
+  console.log("init",JSON.stringify(state.files),props.modelValue)
+}
+
+/**
+ * 图片压缩转base64上传
+ * @param image
+ */
+const compress = (image: any) => {
+  const maxWidth = 1920;
+  let canvas: any = document.getElementById("uploadCanvasId");
+  let ctx = canvas?.getContext("2d");
+  // var initImgSize = image.src.length;
+  let width = image.width;
+  let height = image.height;
+  if (width > maxWidth) {
+    let ration = maxWidth / width;
+    width = maxWidth;
+    height = height * ration
+  }
+  canvas.width = width;
+  canvas.height = height;
+  //图片过大需要进行瓦片绘制,暂不做处理
+  ctx.drawImage(image, 0, 0, canvas.width, canvas.height);
+  //进行压缩
+  return canvas.toDataURL("image/jpeg", 0.5);
+}
+
+
+const beforeUpload = (file: UploadRawFile) => {
+  let originalName = file.name;
+  let size = file.size;
+  if (size > props.maxSize * 1024) {
+    Msg.message(`文件超出大小${(props.maxSize / 1024).toFixed(2)}Mb限制`, 'error')
+    return false;
+  }
+  Msg.showLoading("上传中...")
+  //压缩上传
+  if (props.compressed && props.mime == 'image') {
+    //---压缩base64上传
+    let fileReader = new FileReader();
+    fileReader.onload = e => {
+      try {
+        let src = e.target?.result;
+        const image = new Image();
+        image.setAttribute('crossOrigin', 'anonymous');
+        Msg.showLoading("上传中...")
+        image.src = src;
+        image.onload = function () {
+          let width = image.width;
+          if (width && width > 1920) {
+            let base64Data = compress(image);
+            state.uploadData = {
+              data: base64Data,
+              fileName: file.name
+            }
+          } else {
+            state.uploadData = {
+              data: src,
+              fileName: originalName
+            }
+          }
+          let token = Session.get("token");
+          $body(`/file/uploadBase64?X-Token=${token}`, state.uploadData)
+              .then((res: any) => {
+                state.init = true;
+                state.files.unshift(res);
+                Msg.hideLoading();
+              }).catch(err => {
+            console.error(err)
+            Msg.hideLoading();
+          });
+        };
+      } catch (e) {
+        Msg.hideLoading();
+        console.error(e);
+      }
+    };
+    fileReader.readAsDataURL(file);
+    Msg.showLoading("上传中,请稍后...")
+    // state.loading = ElLoading.service({text: '上传中,请稍后'});
+    // app.showLoading("上传中,请稍后");
+    return false;
+  } else {
+    //---七牛云上传
+    if (state.mode === "qiniu") {
+      /* var qiniu = require('qiniu-js');
+       _this.$get("/file/qnToken").then(res => {
+           let fileName = app.randomDateSeq(16) + file.name.substring(file.name.lastIndexOf("."));
+           var observable = qiniu.upload(file, fileName, res, _this.qiniuExtra, _this.qiniuConfig)
+           observable.subscribe((next) => {
+               _this.percent = next.total.percent + "%";
+               if (next.total.percent >= 100) {
+                   _this.clearProgressInterval();
+               }
+           }, (error) => {
+               console.error("qnUpload ERR", error)
+           }, (compelete) => {
+               if (this.type === 'image') {
+                   this.images.push(_this.qiniuUrl + fileName);
+               } else {
+                   this.files.push({
+                       url: _this.qiniuUrl + fileName,
+                       name: originalName
+                   });
+               }
+               _this.clearProgressInterval();
+           });
+       }).catch(err => {
+           _this.clearProgressInterval();
+           console.error("qnToken ERR", err)
+       });
+       app.showLoading("上传中,请稍后");
+       //阻止upload的默认上传
+       return false;*/
+    } else if (state.mode == 'cos') {
+      /*      //----腾讯cos文件上传
+            state. loading = ElLoading.service({text: '上传中,请稍后'});
+            var COS = require('cos-js-sdk-v5');
+            let key = app.randomDateSeq(16) + file.name.substring(file.name.lastIndexOf("."));
+            if (!_this.cosConfig.expiredTime || _this.cosConfig.expiredTime < new Date().getTime()) {
+              _this.$get("/file/cosToken").then(res => {
+                _this.cosConfig = res;
+                _this.cos = new COS({
+                  SecretId: _this.cosConfig.tmpSecretId,
+                  SecretKey: _this.cosConfig.tmpSecretKey,
+                  XCosSecurityToken: _this.cosConfig.sessionToken,
+                  ExpiredTime: _this.cosConfig.expiredTime * 1000,
+                });
+                _this.cosUpload(key, file);
+              }).catch(e => {
+                console.error(e)
+                _this.clearProgressInterval();
+              });
+            } else {
+              _this.cosUpload(key, file);
+            }
+            //阻止upload的默认上传
+            return false;*/
+    } else {
+      // _this.spinShow = true;
+
+    }
+  }
+}
+
+const handleUploadMaxSize = () => {
+  Msg.message(`文件超出大小${(props.maxSize / 1024).toFixed(2)}Mb限制`, 'error')
+  // ElMessage.error(`文件超出大小${(props.maxSize / 1024).toFixed(2)}Mb限制`)
+  clearProgressInterval();
+}
+/*
+
+const handleUploadFormatError = () => {
+  ElMessage.error('请选择正确的文件格式上传');
+  clearProgressInterval();
+}
+*/
+
+const handleUploadSuccess = (res: any) => {
+  // Msg.hideLoading();
+  Msg.message('上传成功');
+  console.log(res)
+  state.init = true;
+  if (res && res.code === 200) {
+    state.files.unshift(res.data)
+    /*   if (props.mime === 'image') {
+         state.images.unshift(res.data.url);
+       } else {
+         state.files.unshift({
+           id: 0,
+           url: res.data.url,
+           name: res.data.name,
+           size: res.data.size
+         });
+       }*/
+  } else {
+    Msg.message('文件上传出错:' + res.msg, 'error')
+  }
+  clearProgressInterval();
+}
+
+const handleUploadProgress = (event: any) => {
+  console.log("progress>>>", event)
+  state.percent = Number(event.percent).toFixed(0);
+  if (event.percent >= 100) {
+    clearProgressInterval();
+  }
+}
+
+const handleError = (error: Error) => {
+  Msg.message("上传出错了,请稍后再试", 'error')
+  clearProgressInterval();
+  console.log(error)
+}
+
+const clearProgressInterval = () => {
+  state.init = true;
+  // this.spinShow = false;
+  // state.loading?.close();
+  // Msg.hideLoading();
+  if (state.progressInterval) {
+    clearInterval(state.progressInterval);
+  }
+}
+
+const handleDeleteItem = (idx: number) => {
+  state.files.splice(idx, 1);
+  console.log(props.readonly,state.files,props.limit)
+}
+
+
+const onEnd = (event: any) => {
+  console.log("location>>>>", event)
+}
+const onMove = (event: any) => {
+  let {relatedContext, draggedContext} = event;
+  console.log(relatedContext, draggedContext)
+}
+
+</script>

+ 241 - 0
admin-web/src/components/iconSelector/index.vue

@@ -0,0 +1,241 @@
+<template>
+	<div class="icon-selector w100 h100">
+		<el-input
+			v-model="state.fontIconSearch"
+			:placeholder="state.fontIconPlaceholder"
+			:clearable="clearable"
+			:disabled="disabled"
+			:size="size"
+			ref="inputWidthRef"
+			@clear="onClearFontIcon"
+			@focus="onIconFocus"
+			@blur="onIconBlur"
+		>
+			<template #prepend>
+				<SvgIcon
+					:name="state.fontIconPrefix === '' ? prepend : state.fontIconPrefix"
+					class="font14"
+					v-if="state.fontIconPrefix === '' ? prepend?.indexOf('ele-') > -1 : state.fontIconPrefix?.indexOf('ele-') > -1"
+				/>
+				<i v-else :class="state.fontIconPrefix === '' ? prepend : state.fontIconPrefix" class="font14"></i>
+			</template>
+		</el-input>
+		<el-popover
+			placement="bottom"
+			:width="state.fontIconWidth"
+			transition="el-zoom-in-top"
+			popper-class="icon-selector-popper"
+			trigger="click"
+			:virtual-ref="inputWidthRef"
+			virtual-triggering
+		>
+			<template #default>
+				<div class="icon-selector-warp">
+					<div class="icon-selector-warp-title">{{ title }}</div>
+					<el-tabs v-model="state.fontIconTabActive" @tab-click="onIconClick">
+						<el-tab-pane lazy label="ali" name="ali">
+							<IconList :list="fontIconSheetsFilterList" :empty="emptyDescription" :prefix="state.fontIconPrefix" @get-icon="onColClick" />
+						</el-tab-pane>
+						<el-tab-pane lazy label="ele" name="ele">
+							<IconList :list="fontIconSheetsFilterList" :empty="emptyDescription" :prefix="state.fontIconPrefix" @get-icon="onColClick" />
+						</el-tab-pane>
+						<el-tab-pane lazy label="awe" name="awe">
+							<IconList :list="fontIconSheetsFilterList" :empty="emptyDescription" :prefix="state.fontIconPrefix" @get-icon="onColClick" />
+						</el-tab-pane>
+					</el-tabs>
+				</div>
+			</template>
+		</el-popover>
+	</div>
+</template>
+
+<script setup lang="ts" name="iconSelector">
+import { defineAsyncComponent, ref, reactive, onMounted, nextTick, computed, watch } from 'vue';
+import type { TabsPaneContext } from 'element-plus';
+import initIconfont from '/@/utils/getStyleSheets';
+import '/@/theme/iconSelector.scss';
+
+// 定义父组件传过来的值
+const props = defineProps({
+	// 输入框前置内容
+	prepend: {
+		type: String,
+		default: () => 'ele-Pointer',
+	},
+	// 输入框占位文本
+	placeholder: {
+		type: String,
+		default: () => '请输入内容搜索图标或者选择图标',
+	},
+	// 输入框占位文本
+	size: {
+		type: String,
+		default: () => 'default',
+	},
+	// 弹窗标题
+	title: {
+		type: String,
+		default: () => '请选择图标',
+	},
+	// 禁用
+	disabled: {
+		type: Boolean,
+		default: () => false,
+	},
+	// 是否可清空
+	clearable: {
+		type: Boolean,
+		default: () => true,
+	},
+	// 自定义空状态描述文字
+	emptyDescription: {
+		type: String,
+		default: () => '无相关图标',
+	},
+	// 双向绑定值,默认为 modelValue,
+	// 参考:https://v3.cn.vuejs.org/guide/migration/v-model.html#%E8%BF%81%E7%A7%BB%E7%AD%96%E7%95%A5
+	// 参考:https://v3.cn.vuejs.org/guide/component-custom-events.html#%E5%A4%9A%E4%B8%AA-v-model-%E7%BB%91%E5%AE%9A
+	modelValue: String,
+});
+
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['update:modelValue', 'get', 'clear']);
+
+// 引入组件
+const IconList = defineAsyncComponent(() => import('/@/components/iconSelector/list.vue'));
+
+// 定义变量内容
+const inputWidthRef = ref();
+const state = reactive({
+	fontIconPrefix: '',
+	fontIconWidth: 0,
+	fontIconSearch: '',
+	fontIconPlaceholder: '',
+	fontIconTabActive: 'ali',
+	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 = 'ali';
+	if (props.modelValue!.indexOf('iconfont') > -1) name = 'ali';
+	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;
+		await initIconfont.ali().then((res: any) => {
+			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>

+ 84 - 0
admin-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>

+ 191 - 0
admin-web/src/components/noticeBar/index.vue

@@ -0,0 +1,191 @@
+<template>
+	<div class="notice-bar" :style="{ background, height: `${height}px` }" v-show="!state.isMode">
+		<div class="notice-bar-warp" :style="{ color, fontSize: `${size}px` }">
+			<i v-if="leftIcon" class="notice-bar-warp-left-icon" :class="leftIcon"></i>
+			<div class="notice-bar-warp-text-box" ref="noticeBarWarpRef">
+				<div class="notice-bar-warp-text" ref="noticeBarTextRef" v-if="!scrollable">{{ text }}</div>
+				<div class="notice-bar-warp-slot" v-else><slot /></div>
+			</div>
+			<SvgIcon :name="rightIcon" v-if="rightIcon" class="notice-bar-warp-right-icon" @click="onRightIconClick" />
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts" name="noticeBar">
+import { reactive, ref, onMounted, nextTick } from 'vue';
+
+// 定义父组件传过来的值
+const props = defineProps({
+	// 通知栏模式,可选值为 closeable link
+	mode: {
+		type: String,
+		default: () => '',
+	},
+	// 通知文本内容
+	text: {
+		type: String,
+		default: () => '',
+	},
+	// 通知文本颜色
+	color: {
+		type: String,
+		default: () => 'var(--el-color-warning)',
+	},
+	// 通知背景色
+	background: {
+		type: String,
+		default: () => 'var(--el-color-warning-light-9)',
+	},
+	// 字体大小,单位px
+	size: {
+		type: [Number, String],
+		default: () => 14,
+	},
+	// 通知栏高度,单位px
+	height: {
+		type: Number,
+		default: () => 40,
+	},
+	// 动画延迟时间 (s)
+	delay: {
+		type: Number,
+		default: () => 1,
+	},
+	// 滚动速率 (px/s)
+	speed: {
+		type: Number,
+		default: () => 100,
+	},
+	// 是否开启垂直滚动
+	scrollable: {
+		type: Boolean,
+		default: () => false,
+	},
+	// 自定义左侧图标
+	leftIcon: {
+		type: String,
+		default: () => '',
+	},
+	// 自定义右侧图标
+	rightIcon: {
+		type: String,
+		default: () => '',
+	},
+});
+
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['close', 'link']);
+
+// 定义变量内容
+const noticeBarWarpRef = ref();
+const noticeBarTextRef = ref();
+const state = reactive({
+	order: 1,
+	oneTime: 0,
+	twoTime: 0,
+	warpOWidth: 0,
+	textOWidth: 0,
+	isMode: false,
+});
+
+// 初始化 animation 各项参数
+const initAnimation = () => {
+	nextTick(() => {
+		state.warpOWidth = noticeBarWarpRef.value.offsetWidth;
+		state.textOWidth = noticeBarTextRef.value.offsetWidth;
+		document.styleSheets[0].insertRule(`@keyframes oneAnimation {0% {left: 0px;} 100% {left: -${state.textOWidth}px;}}`);
+		document.styleSheets[0].insertRule(`@keyframes twoAnimation {0% {left: ${state.warpOWidth}px;} 100% {left: -${state.textOWidth}px;}}`);
+		computeAnimationTime();
+		setTimeout(() => {
+			changeAnimation();
+		}, props.delay * 1000);
+	});
+};
+// 计算 animation 滚动时长
+const computeAnimationTime = () => {
+	state.oneTime = state.textOWidth / props.speed;
+	state.twoTime = (state.textOWidth + state.warpOWidth) / props.speed;
+};
+// 改变 animation 动画调用
+const changeAnimation = () => {
+	if (state.order === 1) {
+		noticeBarTextRef.value.style.cssText = `animation: oneAnimation ${state.oneTime}s linear; opactity: 1;}`;
+		state.order = 2;
+	} else {
+		noticeBarTextRef.value.style.cssText = `animation: twoAnimation ${state.twoTime}s linear infinite; opacity: 1;`;
+	}
+};
+// 监听 animation 动画的结束
+const listenerAnimationend = () => {
+	noticeBarTextRef.value.addEventListener(
+		'animationend',
+		() => {
+			changeAnimation();
+		},
+		false
+	);
+};
+// 右侧 icon 图标点击
+const onRightIconClick = () => {
+	if (!props.mode) return false;
+	if (props.mode === 'closeable') {
+		state.isMode = true;
+		emit('close');
+	} else if (props.mode === 'link') {
+		emit('link');
+	}
+};
+// 页面加载时
+onMounted(() => {
+	if (props.scrollable) return false;
+	initAnimation();
+	listenerAnimationend();
+});
+</script>
+
+<style scoped lang="scss">
+.notice-bar {
+	padding: 0 15px;
+	width: 100%;
+	border-radius: 4px;
+	.notice-bar-warp {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		height: inherit;
+		.notice-bar-warp-text-box {
+			flex: 1;
+			height: inherit;
+			display: flex;
+			align-items: center;
+			overflow: hidden;
+			position: relative;
+			.notice-bar-warp-text {
+				white-space: nowrap;
+				position: absolute;
+				left: 0;
+			}
+			.notice-bar-warp-slot {
+				width: 100%;
+				white-space: nowrap;
+				:deep(.el-carousel__item) {
+					display: flex;
+					align-items: center;
+				}
+			}
+		}
+		.notice-bar-warp-left-icon {
+			width: 24px;
+			font-size: inherit !important;
+		}
+		.notice-bar-warp-right-icon {
+			width: 24px;
+			text-align: right;
+			font-size: inherit !important;
+			&:hover {
+				cursor: pointer;
+			}
+		}
+	}
+}
+</style>

+ 158 - 0
admin-web/src/components/preview/Preview.vue

@@ -0,0 +1,158 @@
+<template>
+  <el-dialog
+      title="文档预览"
+      v-model="state.showPreview"
+      fullscreen
+      destroy-on-close
+      append-to-body
+      :show-close="false"
+      :close-on-press-escape="false"
+      :close-on-click-modal="false">
+    <template #header="{ close, titleId, titleClass }">
+      <div class="viewer-header">
+        <h4 :id='titleId' :class="titleClass">{{ name }}  <span v-if="state.docViewer||state.xlsViewer">[兼容模式]</span></h4>
+
+        <el-button plain  type="danger" @click="close">
+          <SvgIcon name="ele-CircleCloseFilled"/>关闭
+        </el-button>
+      </div>
+    </template>
+    <div class="doc-viewer" v-if="state.docViewer||state.xlsViewer">
+      <iframe  title="文档预览" id="docViewer-viewer" ref="frame11" :src="props.url" class="iframe-viewer" :height="state.iframeHeight"/>
+<!--      <p v-html="state.content"></p>-->
+    </div>
+<!--    <div class="xls-viewer" v-if="state.xlsViewer">
+      <p v-html="state.content"></p>
+    </div>-->
+    <iframe v-if="!state.docViewer&&!state.xlsViewer" title="文档预览" id="iframe-viewer" ref="frame" :src="src" class="iframe-viewer" :height="state.iframeHeight"/>
+  </el-dialog>
+
+</template>
+
+<script setup lang="ts" name="Preview">
+import {computed, nextTick, onMounted, onBeforeUnmount, ref, reactive} from "vue";
+
+const props = defineProps<{
+  url: string,
+  file?: File,
+  name: string,
+}>()
+
+
+const state = reactive({
+  showPreview: false,
+  iframeHeight: 950,
+  docViewer: false,
+  xlsViewer: false,
+  content:''
+})
+
+// iframe引用
+const frame = ref<HTMLIFrameElement>();
+// iframe路径指向构建产物,这里是/,因为放在了public下面
+// 如果使用cdn,请使用http://viewer.flyfish.group
+const source = '/file-viewer3/index.html'
+// 查看器的源,当前示例为本源,指定为location.origin即可
+const viewerOrigin = location.origin;
+// 构建完整url
+const src = computed(() => {
+  // 文件名称,建议传递,提高体验性
+  const name = props.name || '';
+  if (props.url) {
+    // 直接拼接url
+    return `${source}?url=${encodeURIComponent(props.url)}&name=${encodeURIComponent(name)}`
+  } else if (props.file) {
+    // 直接拼接来源origin
+    return `${source}?from=${encodeURIComponent(viewerOrigin)}&name=${encodeURIComponent(name)}`
+  } else {
+    return source;
+  }
+})
+
+// 发送文件数据
+const handlePreview = () => {
+  nextTick(() => {
+    state.showPreview = true;
+    if(state.xlsViewer||state.docViewer){
+      console.log("handlePreview xxx")
+     /* $get(props.url).then((res:any)=>{
+        state.content = res;
+      })*/
+    }else{
+      let clientHeight = document.body.clientHeight;
+      console.log(clientHeight, clientHeight - 130)
+
+      state.iframeHeight = clientHeight - 130
+
+
+      const viewer = frame.value;
+      if (!viewer || !props.file) return;
+
+      viewer.onload = () => viewer.contentWindow?.postMessage(props.file, viewerOrigin);
+    }
+
+  })
+}
+
+onMounted(() => {
+  let suffix = props.name.substring(props.name.lastIndexOf(".")).toLowerCase();
+  if (suffix.endsWith(".xls")) {
+    state.xlsViewer = true;
+  }
+
+  if (suffix.endsWith(".doc")) {
+    state.docViewer = true;
+  }
+
+})
+
+onBeforeUnmount(() => {
+  state.xlsViewer = false;
+  state.docViewer = false;
+})
+
+// 暴露变量
+defineExpose({
+  handlePreview
+});
+
+
+</script>
+
+
+<style scoped lang="scss">
+.viewer-header {
+  height: 48px;
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+
+.iframe-viewer {
+  //height: calc(100vh - 2px);
+  width: 100%;
+  border: 0;
+
+  html {
+    overflow-y: hidden;
+  }
+}
+
+.xls-viewer {
+  table {
+    margin: 0 auto;
+    border: 1px solid #000000;
+    border-collapse: collapse;
+  }
+
+  th,
+  td {
+    border: 1px solid #000000;
+    text-align: center;
+  }
+
+  overflow-x: scroll;
+}
+</style>
+

+ 21 - 0
admin-web/src/components/rich/index.vue

@@ -0,0 +1,21 @@
+<template>
+  <div id="app1">
+    <ckeditor :editor="state.editor" v-model="state.editorData" :config="state.editorConfig"></ckeditor>
+  </div>
+</template>
+
+<script setup name="CkEditor">
+import { reactive, shallowRef, watch, onBeforeUnmount } from 'vue';
+import CKEditor from '@ckeditor/ckeditor5-vue';
+const ckeditor = CKEditor.component;
+import ClassicEditor from '@ckeditor/ckeditor5-build-classic';
+
+const state = reactive({
+  editor: ClassicEditor,
+  editorData: '<p>Content of the editor.</p>',
+  editorConfig: {
+    // The configuration of the editor.
+  }
+})
+
+</script>

+ 323 - 0
admin-web/src/components/section/ExtQuerySection.vue

@@ -0,0 +1,323 @@
+<template>
+  <el-form :inline="inline"
+           v-model="query"
+           @submit.native.prevent>
+    <template v-for="item in customFields">
+      <template v-if="item.stable&&item.show">
+        <el-form-item :key="item.title">
+          <template v-if="item.type===0">
+            <ExtRender
+                class="z-w150"
+                :render-func="item.render"/>
+          </template>
+          <template v-if="item.type===1||item.type===2">
+            <Input
+                class="z-w150"
+                :placeholder="item.title"
+                v-model.trim="query[item.key]"
+                @on-change="handleQuery"
+                @keyup.enter.native="handleQuery"/>
+          </template>
+          <template v-else-if="item.type===3">
+            <ExtSelect
+                v-if="item.url"
+                :clearable="true"
+                class="z-w150"
+                :placeholder="item.title"
+                :url="item.url"
+                :query="item.query"
+                v-model="query[item.key]"
+                @on-change="handleQuery"/>
+            <ExtDSelect
+                v-else-if="item.dict"
+                class="z-w150"
+                :multiple="true"
+                :dicts="item.dicts"
+                :placeholder="item.title"
+                v-model.trim="query[item.key+'inList']"
+                @change="handleQuery"
+                :type="item.dict"/>
+            <ExtBoolean
+                v-else-if="item.boolean"
+                class="z-w150"
+                v-model="query[item.key]"
+                :placeholder="item.title"/>
+            <ExtInputNumber
+                v-else-if="item.ratio"
+                class="z-w150"
+                :ratio="item.ratio"
+                :placeholder="item.title"
+                v-model.trim="query[item.key]"
+                @on-change="handleQuery"
+                @keyup.enter.native="handleQuery"/>
+            <Input
+                v-else
+                type="number"
+                class="z-w150"
+                :placeholder="item.title"
+                v-model.trim="query[item.key]"
+                @on-change="handleQuery"
+                @keyup.enter.native="handleQuery"/>
+          </template>
+          <template v-else-if="item.type===4||item.type===5">
+            <ExtDSelect
+                class="z-w150"
+                :multiple="true"
+                :dicts="item.dicts"
+                :placeholder="item.title"
+                v-model.trim="query[item.key+'inList']"
+                @change="handleQuery"
+                :type="item.dict"/>
+          </template>
+          <template v-else-if="item.type===6||item.type===7||item.type===8">
+          </template>
+          <template v-else-if="item.type===9">
+            <ExtTreeSelect
+                v-model.trim="query[item.key+'inList']"
+                :placeholder="item.title"
+                :tree-url="item.url"
+                :clearable="true"/>
+          </template>
+          <template v-else-if="item.type===10">
+            <ExtTreeSelect
+                v-model.trim="query[item.key+'inList']"
+                class="z-w150"
+                :placeholder="item.title"
+                :tree-url="item.url"
+                tree-type="account"
+                :clearable="true"/>
+          </template>
+          <template v-else-if="item.type===11">
+            <ExtDatePicker
+                class="z-w150"
+                :placeholder="item.title"
+                v-model="query[item.key]"
+                type="date"
+                @on-change="handleQuery"/>
+          </template>
+          <template v-else-if="item.type===12">
+            <ExtDatePicker
+                class="z-w300"
+                :placeholder="item.title"
+                v-model="query"
+                type="datetimerange"
+                :fields="item.key"
+                @range-change="handleQuery"/>
+          </template>
+          <template v-else>无匹配</template>
+        </el-form-item>
+      </template>
+
+    </template>
+  </el-form>
+</template>
+
+<script setup lang="ts" name="ExtQuerySection">
+import {reactive, onMounted, computed} from 'vue';
+import {Local} from "/@/utils/storage";
+import u from "/@/utils/u"
+
+
+const props = defineProps({
+  columns: {
+    type: Array,
+    default: () => {
+      return []
+    }
+  },
+  inline: {
+    type: Boolean,
+    default: true
+  },
+  formQuery: {
+    type: Object,
+  },
+  hasOptions: {
+    type: Boolean,
+    default: false
+  },
+  name: {
+    type: String
+  }
+})
+
+const state = reactive({
+  customFields: [] as Array<QueryField>,
+  defaultCustom: ["id", "name", "title", "status", "type", "createBy", "updateBy", "createAt", "updateAt"]
+});
+
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['on-fields-change', 'on-query-change']);
+
+//computed
+const query = computed({
+  get: () => props.formQuery,
+  set: (val: any) => {
+    emit("on-query-change", val);
+  }
+});
+/*watch(
+    () => props.query,
+    () => {
+      // initModeValueEcho();
+      // initFontIconName();
+    }
+);*/
+const saveCustomQuery = () => {
+  Local.set(`${props.name}_custom_query`, state.customFields);
+}
+const loadCustomQuery = (): Array<any> => {
+  return Local.get(`${props.name}_custom_query`);
+}
+const setupCustomFields = (reset: Boolean = false) => {
+  let cacheCustomQuery = loadCustomQuery();
+  let icolumns = (<QueryFields>props.columns).filter((k: QueryField) => !!k.key && k.query);
+  // console.table(icolumns, "title", "key")
+  //<!--  public static final int FIELD_文本 = 1;-->
+  //<!--  public static final int FIELD_文本域 = 2;-->
+  //<!--  public static final int FIELD_数字 = 3;-->
+  //<!--  public static final int FIELD_单选 = 4;-->
+  //<!--  public static final int FIELD_复选 = 5;-->
+  //<!--  public static final int FIELD_富文本 = 6;-->
+  //<!--  public static final int FIELD_图片 = 7;-->
+  //<!--  public static final int FIELD_附件 = 8;-->
+  //<!--  public static final int FIELD_部门选择 = 9;-->
+  //<!--  public static final int FIELD_成员选择 = 10;-->
+  //<!--  public static final int FIELD_日期选择 = 11;-->
+  //<!--  public static final int FIELD_日期范围选择 = 12;-->
+  if (reset) {
+    let tmp: Array<QueryField> = [];
+    //1.先取默认固定字段
+    state.defaultCustom.forEach(custom => {
+      let index = icolumns.findIndex(k => k.key === custom);
+      if (index >= 0) {
+        let field = icolumns[index];
+        if (field.hasOwnProperty("key")) {
+          let {key, type, name, title, dict, url, query, boolean} = field;
+          let obj = {
+            key: key,
+            name: name,
+            title: title,
+            type: type,
+            dict: dict, //字典
+            url: url,
+            query: query,
+            boolean: boolean,
+            show: true,
+            stable: true
+          }
+          if (cacheCustomQuery) {
+            let _t = cacheCustomQuery.find(k => k.key === key);
+            if (_t) {
+              obj = Object.assign({}, obj, _t);
+            }
+          }
+          tmp.push(obj);
+        }
+      }
+    })
+    //2.再取系统字段
+    icolumns.forEach(column => {
+      if (!state.defaultCustom.includes(column.key)) {
+        let {key, type, name, title, dict, url, query, boolean} = column;
+        let obj = {
+          key: key,
+          name: name,
+          title: title,
+          type: type,
+          dict: dict, //字典
+          url: url,
+          query: query,
+          boolean: boolean,
+          show: true,
+          stable: false
+        }
+        if (cacheCustomQuery) {
+          let _t = cacheCustomQuery.find(k => k.key === key);
+          if (_t) {
+            obj = Object.assign({}, obj, _t);
+          }
+        }
+        tmp.push(obj);
+      }
+    })
+    //排序
+    if (!u.isEmptyOrNull(cacheCustomQuery)) {
+      let sortArray = cacheCustomQuery.map(k => k.key);
+      u.sortByArray(tmp, 'key', sortArray)
+    }
+    state.customFields = tmp;
+  } else {
+    let hasInit = !!cacheCustomQuery;
+    if (!hasInit) {
+      let tmp: Array<QueryField> = [];
+      icolumns.forEach(column => {
+        let {key, type, name, title, dict, url, query} = column;
+        tmp.push({
+          key: key,
+          name: name,
+          title: title,
+          type: type,
+          dict: dict,
+          url: url,
+          query: query,
+          show: true,
+          stable: state.defaultCustom.includes(column.key),
+        });
+      })
+      state.customFields = tmp;
+    } else {
+      state.customFields = icolumns;
+    }
+  }
+  emit("on-fields-change", state.customFields);
+  saveCustomQuery();
+  console.log("----->", JSON.stringify(state.customFields))
+
+}
+
+const handleQuery = () => {
+  emit("on-query-change", props.query);
+}
+const handleFieldShowChange = (show: boolean, idx: number) => {
+  state.customFields[idx].show = show;
+  emit("on-fields-change", state.customFields);
+  saveCustomQuery();
+}
+const handleMoveSort = () => {
+  saveCustomQuery();
+  return true;
+}
+
+const handleResetCustomFields = () => {
+  removeCustomQuery();
+  setupCustomFields(true);
+}
+
+const removeCustomQuery = () => {
+  Local.remove(`${props.name}_custom_query`)
+}
+
+onMounted(() => {
+  setupCustomFields(true)
+});
+</script>
+
+
+<style scoped lang="less">
+.popup-item-name {
+  cursor: all-scroll;
+  padding: 5px;
+}
+
+.actived {
+  color: #00C7D2;
+}
+
+.inline-form {
+  display: flex;
+  width: 450px;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+</style>

+ 63 - 0
admin-web/src/components/svgIcon/index.vue

@@ -0,0 +1,63 @@
+<template>
+	<i v-if="isShowIconSvg" class="el-icon" :style="setIconSvgStyle">
+		<component :is="getIconName" />
+	</i>
+	<div v-else-if="isShowIconImg" :style="setIconImgOutStyle">
+		<img :src="getIconName" :style="setIconSvgInsStyle" />
+	</div>
+	<i v-else :class="getIconName" :style="setIconSvgStyle" />
+</template>
+
+<script setup lang="ts" name="svgIcon">
+import { computed } from 'vue';
+
+// 定义父组件传过来的值
+const props = defineProps({
+	// svg 图标组件名字
+	name: {
+		type: String,
+	},
+	// svg 大小
+	size: {
+		type: [Number,String],
+		default: () => 14,
+	},
+	// svg 颜色
+	color: {
+		type: String,
+	},
+});
+
+// 在线链接、本地引入地址前缀
+// https://gitee.com/lyt-top/vue-next-admin/issues/I62OVL
+const linesString = ['https', 'http', '/src', '@/assets', 'data:image', import.meta.env.VITE_PUBLIC_PATH];
+
+// 获取 icon 图标名称
+const getIconName = computed(() => {
+	return props?.name;
+});
+// 用于判断 element plus 自带 svg 图标的显示、隐藏
+const isShowIconSvg = computed(() => {
+	return props?.name?.startsWith('ele-');
+});
+// 用于判断在线链接、本地引入等图标显示、隐藏
+const isShowIconImg = computed(() => {
+	return linesString.find((str) => props.name?.startsWith(str));
+});
+// 设置图标样式
+const setIconSvgStyle = computed(() => {
+	return `font-size: ${props.size}px;color: ${props.color};`;
+});
+// 设置图片样式
+const setIconImgOutStyle = computed(() => {
+	return `width: ${props.size}px;height: ${props.size}px;display: inline-block;overflow: hidden;`;
+});
+// 设置图片样式
+// https://gitee.com/lyt-top/vue-next-admin/issues/I59ND0
+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>

+ 45 - 0
admin-web/src/directive/authDirective.ts

@@ -0,0 +1,45 @@
+import type { App } from 'vue';
+import { useUserInfo } from '/@/stores/userInfo';
+import { judementSameArr } from '/@/utils/arrayOperation';
+
+/**
+ * 用户权限指令
+ * @directive 单个权限验证(v-auth="xxx")
+ * @directive 多个权限验证,满足一个则显示(v-auths="[xxx,xxx]")
+ * @directive 多个权限验证,全部满足则显示(v-auth-all="[xxx,xxx]")
+ */
+export function authDirective(app: App) {
+	// 单个权限验证(v-auth="xxx")
+	app.directive('auth', {
+		mounted(el, binding) {
+			console.log("v-auth",binding.value)
+			const stores = useUserInfo();
+			// if (!stores.userInfos.permList.some((v: string) => v === binding.value)) el.parentNode.removeChild(el);
+		},
+	});
+	// 多个权限验证,满足一个则显示(v-auths="[xxx,xxx]")
+	app.directive('auths', {
+		mounted(el, binding) {
+			let flag = false;
+			const stores = useUserInfo();
+			stores.userInfos.permList.map((val: string) => {
+				binding.value.map((v: string) => {
+					if (val === v) {
+						flag = true;
+						return;
+					}
+				});
+			});
+			console.log("v-auths")
+			// if (!flag) el.parentNode.removeChild(el);
+		},
+	});
+	// 多个权限验证,全部满足则显示(v-auth-all="[xxx,xxx]")
+	app.directive('auth-all', {
+		mounted(el, binding) {
+			const stores = useUserInfo();
+			const flag = judementSameArr(binding.value, stores.userInfos.permList);
+			// if (!flag) el.parentNode.removeChild(el);
+		},
+	});
+}

+ 55 - 0
admin-web/src/directive/customDirective.ts

@@ -0,0 +1,55 @@
+import type { App } from 'vue';
+
+/**
+ * 按钮波浪指令
+ * @directive 默认方式:v-waves,如 `<div v-waves></div>`
+ * @directive 参数方式:v-waves=" |light|red|orange|purple|green|teal",如 `<div v-waves="'light'"></div>`
+ */
+export function wavesDirective(app: App) {
+	app.directive('waves', {
+		mounted(el, binding) {
+			el.classList.add('waves-effect');
+			binding.value && el.classList.add(`waves-${binding.value}`);
+			function setConvertStyle(obj: { [key: string]: unknown }) {
+				let style: string = '';
+				for (let i in obj) {
+					if (obj.hasOwnProperty(i)) style += `${i}:${obj[i]};`;
+				}
+				return style;
+			}
+			function onCurrentClick(e: { [key: string]: unknown }) {
+				let elDiv = document.createElement('div');
+				elDiv.classList.add('waves-ripple');
+				el.appendChild(elDiv);
+				let styles = {
+					left: `${e.layerX}px`,
+					top: `${e.layerY}px`,
+					opacity: 1,
+					transform: `scale(${(el.clientWidth / 100) * 10})`,
+					'transition-duration': `750ms`,
+					'transition-timing-function': `cubic-bezier(0.250, 0.460, 0.450, 0.940)`,
+				};
+				elDiv.setAttribute('style', setConvertStyle(styles));
+				setTimeout(() => {
+					elDiv.setAttribute(
+						'style',
+						setConvertStyle({
+							opacity: 0,
+							transform: styles.transform,
+							left: styles.left,
+							top: styles.top,
+						})
+					);
+					setTimeout(() => {
+						elDiv && el.removeChild(elDiv);
+					}, 750);
+				}, 450);
+			}
+			el.addEventListener('mousedown', onCurrentClick, false);
+		},
+		unmounted(el) {
+			el.addEventListener('mousedown', () => {});
+		},
+	});
+}
+

+ 16 - 0
admin-web/src/directive/index.ts

@@ -0,0 +1,16 @@
+import type { App } from 'vue';
+import { authDirective } from '/@/directive/authDirective';
+import { wavesDirective } from '/@/directive/customDirective';
+
+/**
+ * 导出指令方法:v-xxx
+ * @methods authDirective 用户权限指令,用法:v-auth
+ * @methods wavesDirective 按钮波浪指令,用法:v-waves
+ * @methods dragDirective 自定义拖动指令,用法:v-drag
+ */
+export function directive(app: App) {
+	// 用户权限指令
+	authDirective(app);
+	// 按钮波浪指令
+	wavesDirective(app);
+}

+ 68 - 0
admin-web/src/i18n/index.ts

@@ -0,0 +1,68 @@
+import { createI18n } from 'vue-i18n';
+import pinia from '/@/stores';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+
+// 定义语言国际化内容
+
+/**
+ * 说明:
+ * 须在 pages 下新建文件夹(建议 `要国际化界面目录` 与 `i18n 目录` 相同,方便查找),
+ * 注意国际化定义的字段,不要与原有的定义字段相同。
+ * 1、/src/i18n/lang 下的 ts 为框架的国际化内容
+ * 2、/src/i18n/pages 下的 ts 为各界面的国际化内容
+ */
+
+// element plus 自带国际化
+import enLocale from 'element-plus/es/locale/lang/en';
+import zhcnLocale from 'element-plus/es/locale/lang/zh-cn';
+import zhtwLocale from 'element-plus/es/locale/lang/zh-tw';
+
+// 定义变量内容
+const messages = {};
+const element = { en: enLocale, 'zh-cn': zhcnLocale, 'zh-tw': zhtwLocale };
+const itemize = { en: [], 'zh-cn': [], 'zh-tw': [] };
+const modules: Record<string, any> = import.meta.glob('./**/*.ts', { eager: true });
+
+// 对自动引入的 modules 进行分类 en、zh-cn、zh-tw
+// https://vitejs.cn/vite3-cn/guide/features.html#glob-import
+for (const path in modules) {
+	const key = path.match(/(\S+)\/(\S+).ts/);
+	if (itemize[key![2]]) itemize[key![2]].push(modules[path].default);
+	else itemize[key![2]] = modules[path];
+}
+
+// 合并数组对象(非标准数组对象,数组中对象的每项 key、value 都不同)
+function mergeArrObj<T>(list: T, key: string) {
+	let obj = {};
+	list[key].forEach((i: EmptyObjectType) => {
+		obj = Object.assign({}, obj, i);
+	});
+	return obj;
+}
+
+// 处理最终格式
+for (const key in itemize) {
+	messages[key] = {
+		name: key,
+		el: element[key].el,
+		message: mergeArrObj(itemize, key),
+	};
+}
+
+// 读取 pinia 默认语言
+const stores = useThemeConfig(pinia);
+const { themeConfig } = storeToRefs(stores);
+
+// 导出语言国际化
+// https://vue-i18n.intlify.dev/guide/essentials/fallback.html#explicit-fallback-with-one-locale
+export const i18n = createI18n({
+	legacy: false,
+	silentTranslationWarn: true,
+	missingWarn: false,
+	silentFallbackWarn: true,
+	fallbackWarn: false,
+	locale: themeConfig.value.globalI18n,
+	fallbackLocale: zhcnLocale.name,
+	messages,
+});

+ 193 - 0
admin-web/src/i18n/lang/en.ts

@@ -0,0 +1,193 @@
+// 定义内容
+export default {
+	router: {
+		admin: 'admin',
+		home: 'home',
+		system: 'system',
+		systemMenu: 'systemMenu',
+		systemRole: 'systemRole',
+		systemUser: 'systemUser',
+		systemDept: 'systemDept',
+		systemDic: 'systemDic',
+		limits: 'limits',
+		limitsFrontEnd: 'FrontEnd',
+		limitsFrontEndPage: 'FrontEndPage',
+		limitsFrontEndBtn: 'FrontEndBtn',
+		limitsBackEnd: 'BackEnd',
+		limitsBackEndEndPage: 'BackEndEndPage',
+		menu: 'menu',
+		menu1: 'menu1',
+		menu11: 'menu11',
+		menu12: 'menu12',
+		menu121: 'menu121',
+		menu122: 'menu122',
+		menu13: 'menu13',
+		menu2: 'menu2',
+		funIndex: 'function',
+		funTagsView: 'funTagsView',
+		funCountup: 'countup',
+		funWangEditor: 'wangEditor',
+		funCropper: 'cropper',
+		funQrcode: 'qrcode',
+		funEchartsMap: 'EchartsMap',
+		funPrintJs: 'PrintJs',
+		funClipboard: 'Copy cut',
+		funGridLayout: 'Drag layout',
+		funSplitpanes: 'Pane splitter',
+		funDragVerify: 'Validator',
+		pagesIndex: 'pages',
+		pagesFiltering: 'Filtering',
+		pagesFilteringDetails: 'FilteringDetails',
+		pagesFilteringDetails1: 'FilteringDetails1',
+		pagesIocnfont: 'iconfont icon',
+		pagesElement: 'element icon',
+		pagesAwesome: 'awesome icon',
+		pagesFormAdapt: 'FormAdapt',
+		pagesTableRules: 'pagesTableRules',
+		pagesFormI18n: 'FormI18n',
+		pagesFormRules: 'Multi form validation',
+		pagesDynamicForm: 'Dynamic complex form',
+		pagesWorkflow: 'Workflow',
+		pagesListAdapt: 'ListAdapt',
+		pagesWaterfall: 'Waterfall',
+		pagesSteps: 'Steps',
+		pagesPreview: 'Large preview',
+		pagesWaves: 'Wave effect',
+		pagesTree: 'tree alter table',
+		pagesDrag: 'Drag command',
+		pagesLazyImg: 'Image lazy loading',
+		makeIndex: 'makeIndex',
+		makeSelector: 'Icon selector',
+		makeNoticeBar: 'notification bar',
+		makeSvgDemo: 'Svgicon demo',
+		makeTableDemo: 'table demo',
+		paramsIndex: 'Routing parameters',
+		paramsCommon: 'General routing',
+		paramsDynamic: 'Dynamic routing',
+		paramsCommonDetails: 'General routing details',
+		paramsDynamicDetails: 'Dynamic routing details',
+		chartIndex: 'chartIndex',
+		visualizingIndex: 'visualizingIndex',
+		visualizingLinkDemo1: 'visualizingLinkDemo1',
+		visualizingLinkDemo2: 'visualizingLinkDemo2',
+		personal: 'personal',
+		tools: 'tools',
+		layoutLinkView: 'LinkView',
+		layoutIframeViewOne: 'IframeViewOne',
+		layoutIframeViewTwo: 'IframeViewTwo',
+	},
+	staticRoutes: {
+		signIn: 'signIn',
+		notFound: 'notFound',
+		noPower: 'noPower',
+	},
+	user: {
+		title0: 'Component size',
+		title1: 'Language switching',
+		title2: 'Menu search',
+		title3: 'Layout configuration',
+		title4: 'news',
+		title5: 'Full screen on',
+		title6: 'Full screen off',
+		dropdownLarge: 'large',
+		dropdownDefault: 'default',
+		dropdownSmall: 'small',
+		dropdown1: 'home page',
+		dropdown2: 'Personal Center',
+		dropdown3: '404',
+		dropdown4: '401',
+		dropdown5: 'Log out',
+		dropdown6: 'Code warehouse',
+		searchPlaceholder: 'Menu search: support Chinese, routing path',
+		newTitle: 'notice',
+		newBtn: 'All read',
+		newGo: 'Go to the notification center',
+		newDesc: 'No notice',
+		logOutTitle: 'Tips',
+		logOutMessage: 'This operation will log out. Do you want to continue?',
+		logOutConfirm: 'determine',
+		logOutCancel: 'cancel',
+		logOutExit: 'Exiting',
+	},
+	tagsView: {
+		refresh: 'refresh',
+		close: 'close',
+		closeOther: 'closeOther',
+		closeAll: 'closeAll',
+		fullscreen: 'fullscreen',
+		closeFullscreen: 'closeFullscreen',
+	},
+	notFound: {
+		foundTitle: 'Wrong address input, please re-enter the address~',
+		foundMsg: 'You can check the web address first, and then re-enter or give us feedback.',
+		foundBtn: 'Back to home page',
+	},
+	noAccess: {
+		accessTitle: 'You are not authorized to operate~',
+		accessMsg: 'Contact information: add QQ group discussion 665452019',
+		accessBtn: 'Reauthorization',
+	},
+	layout: {
+		configTitle: 'Layout configuration',
+		oneTitle: 'Global Themes',
+		twoTopTitle: 'top bar set up',
+		twoMenuTitle: 'Menu set up',
+		twoColumnsTitle: 'Columns set up',
+		twoTopBar: 'Top bar background',
+		twoTopBarColor: 'Top bar default font color',
+		twoIsTopBarColorGradual: 'Top bar gradient',
+		twoMenuBar: 'Menu background',
+		twoMenuBarColor: 'Menu default font color',
+		twoMenuBarActiveColor: 'Menu Highlight Color',
+		twoIsMenuBarColorGradual: 'Menu gradient',
+		twoColumnsMenuBar: 'Column menu background',
+		twoColumnsMenuBarColor: 'Default font color bar menu',
+		twoIsColumnsMenuBarColorGradual: 'Column gradient',
+		twoIsColumnsMenuHoverPreload: 'Column Menu Hover Preload',
+		threeTitle: 'Interface settings',
+		threeIsCollapse: 'Menu horizontal collapse',
+		threeIsUniqueOpened: 'Menu accordion',
+		threeIsFixedHeader: 'Fixed header',
+		threeIsClassicSplitMenu: 'Classic layout split menu',
+		threeIsLockScreen: 'Open the lock screen',
+		threeLockScreenTime: 'screen locking(s/s)',
+		fourTitle: 'Interface display',
+		fourIsShowLogo: 'Sidebar logo',
+		fourIsBreadcrumb: 'Open breadcrumb',
+		fourIsBreadcrumbIcon: 'Open breadcrumb icon',
+		fourIsTagsview: 'Open tagsview',
+		fourIsTagsviewIcon: 'Open tagsview Icon',
+		fourIsCacheTagsView: 'Enable tagsview cache',
+		fourIsSortableTagsView: 'Enable tagsview drag',
+		fourIsShareTagsView: 'Enable tagsview sharing',
+		fourIsFooter: 'Open footer',
+		fourIsGrayscale: 'Grey model',
+		fourIsInvert: 'Color weak mode',
+		fourIsDark: 'Dark Mode',
+		fourIsWartermark: 'Turn on watermark',
+		fourWartermarkText: 'Watermark copy',
+		fiveTitle: 'Other settings',
+		fiveTagsStyle: 'Tagsview style',
+		fiveAnimation: 'page animation',
+		fiveColumnsAsideStyle: 'Column style',
+		fiveColumnsAsideLayout: 'Column layout',
+		sixTitle: 'Layout switch',
+		sixDefaults: 'One',
+		sixClassic: 'Two',
+		sixTransverse: 'Three',
+		sixColumns: 'Four',
+		tipText: 'Click the button below to copy the layout configuration to `/src/stores/themeConfig.ts` It has been modified in.',
+		copyText: 'replication configuration',
+		resetText: 'restore default',
+		copyTextSuccess: 'Copy succeeded!',
+		copyTextError: 'Copy failed!',
+	},
+	upgrade: {
+		title: 'New version',
+		msg: 'The new version is available, please update it now! Dont worry, the update is fast!',
+		desc: 'Prompt: Update will restore the default configuration',
+		btnOne: 'Cruel refusal',
+		btnTwo: 'Update now',
+		btnTwoLoading: 'Updating',
+	},
+};

+ 193 - 0
admin-web/src/i18n/lang/zh-cn.ts

@@ -0,0 +1,193 @@
+// 定义内容
+export default {
+	router: {
+		admin: '管理终端',
+		home: '首页',
+		system: '系统设置',
+		systemMenu: '菜单管理',
+		systemRole: '角色管理',
+		systemUser: '用户管理',
+		systemDept: '部门管理',
+		systemDic: '字典管理',
+		limits: '权限管理',
+		limitsFrontEnd: '前端控制',
+		limitsFrontEndPage: '页面权限',
+		limitsFrontEndBtn: '按钮权限',
+		limitsBackEnd: '后端控制',
+		limitsBackEndEndPage: '页面权限',
+		menu: '菜单嵌套',
+		menu1: '菜单1',
+		menu11: '菜单11',
+		menu12: '菜单12',
+		menu121: '菜单121',
+		menu122: '菜单122',
+		menu13: '菜单13',
+		menu2: '菜单2',
+		funIndex: '功能',
+		funTagsView: 'tagsView 操作',
+		funCountup: '数字滚动',
+		funWangEditor: 'Editor 编辑器',
+		funCropper: '图片裁剪',
+		funQrcode: '二维码生成',
+		funEchartsMap: '地理坐标/地图',
+		funPrintJs: '页面打印',
+		funClipboard: '复制剪切',
+		funGridLayout: '拖拽布局',
+		funSplitpanes: '窗格拆分器',
+		funDragVerify: '验证器',
+		pagesIndex: '页面',
+		pagesFiltering: '过滤筛选组件',
+		pagesFilteringDetails: '过滤筛选组件详情',
+		pagesFilteringDetails1: '过滤筛选组件详情111',
+		pagesIocnfont: 'ali 字体图标',
+		pagesElement: 'ele 字体图标',
+		pagesAwesome: 'awe 字体图标',
+		pagesFormAdapt: '表单自适应',
+		pagesTableRules: '表单表格验证',
+		pagesFormI18n: '表单国际化',
+		pagesFormRules: '多表单验证',
+		pagesDynamicForm: '动态复杂表单',
+		pagesWorkflow: '工作流',
+		pagesListAdapt: '列表自适应',
+		pagesWaterfall: '瀑布屏',
+		pagesSteps: '步骤条',
+		pagesPreview: '大图预览',
+		pagesWaves: '波浪效果',
+		pagesTree: '树形改表格',
+		pagesDrag: '拖动指令',
+		pagesLazyImg: '图片懒加载',
+		makeIndex: '组件封装',
+		makeSelector: '图标选择器',
+		makeNoticeBar: '滚动通知栏',
+		makeSvgDemo: 'svgIcon 演示',
+		makeTableDemo: '表格封装演示',
+		paramsIndex: '路由参数',
+		paramsCommon: '普通路由',
+		paramsDynamic: '动态路由',
+		paramsCommonDetails: '普通路由详情',
+		paramsDynamicDetails: '动态路由详情',
+		chartIndex: '大数据图表',
+		visualizingIndex: '数据可视化',
+		visualizingLinkDemo1: '数据可视化演示1',
+		visualizingLinkDemo2: '数据可视化演示2',
+		personal: '个人中心',
+		tools: '工具类集合',
+		layoutLinkView: '外链',
+		layoutIframeViewOne: '内嵌 iframe1',
+		layoutIframeViewTwo: '内嵌 iframe2',
+	},
+	staticRoutes: {
+		signIn: '登录',
+		notFound: '找不到此页面',
+		noPower: '没有权限',
+	},
+	user: {
+		title0: '组件大小',
+		title1: '语言切换',
+		title2: '菜单搜索',
+		title3: '布局配置',
+		title4: '消息',
+		title5: '开全屏',
+		title6: '关全屏',
+		dropdownLarge: '大型',
+		dropdownDefault: '默认',
+		dropdownSmall: '小型',
+		dropdown1: '首页',
+		dropdown2: '个人中心',
+		dropdown3: '404',
+		dropdown4: '401',
+		dropdown5: '退出登录',
+		dropdown6: '代码仓库',
+		searchPlaceholder: '菜单搜索:支持中文、路由路径',
+		newTitle: '通知',
+		newBtn: '全部已读',
+		newGo: '前往通知中心',
+		newDesc: '暂无通知',
+		logOutTitle: '提示',
+		logOutMessage: '此操作将退出登录, 是否继续?',
+		logOutConfirm: '确定',
+		logOutCancel: '取消',
+		logOutExit: '退出中',
+	},
+	tagsView: {
+		refresh: '刷新',
+		close: '关闭',
+		closeOther: '关闭其它',
+		closeAll: '全部关闭',
+		fullscreen: '当前页全屏',
+		closeFullscreen: '关闭全屏',
+	},
+	notFound: {
+		foundTitle: '地址输入错误,请重新输入地址~',
+		foundMsg: '您可以先检查网址,然后重新输入或给我们反馈问题。',
+		foundBtn: '返回首页',
+	},
+	noAccess: {
+		accessTitle: '您未被授权,没有操作权限~',
+		accessMsg: '联系方式:加QQ群探讨 665452019',
+		accessBtn: '重新授权',
+	},
+	layout: {
+		configTitle: '布局配置',
+		oneTitle: '全局主题',
+		twoTopTitle: '顶栏设置',
+		twoMenuTitle: '菜单设置',
+		twoColumnsTitle: '分栏设置',
+		twoTopBar: '顶栏背景',
+		twoTopBarColor: '顶栏默认字体颜色',
+		twoIsTopBarColorGradual: '顶栏背景渐变',
+		twoMenuBar: '菜单背景',
+		twoMenuBarColor: '菜单默认字体颜色',
+		twoMenuBarActiveColor: '菜单高亮背景色',
+		twoIsMenuBarColorGradual: '菜单背景渐变',
+		twoColumnsMenuBar: '分栏菜单背景',
+		twoColumnsMenuBarColor: '分栏菜单默认字体颜色',
+		twoIsColumnsMenuBarColorGradual: '分栏菜单背景渐变',
+		twoIsColumnsMenuHoverPreload: '分栏菜单鼠标悬停预加载',
+		threeTitle: '界面设置',
+		threeIsCollapse: '菜单水平折叠',
+		threeIsUniqueOpened: '菜单手风琴',
+		threeIsFixedHeader: '固定 Header',
+		threeIsClassicSplitMenu: '经典布局分割菜单',
+		threeIsLockScreen: '开启锁屏',
+		threeLockScreenTime: '自动锁屏(s/秒)',
+		fourTitle: '界面显示',
+		fourIsShowLogo: '侧边栏 Logo',
+		fourIsBreadcrumb: '开启 Breadcrumb',
+		fourIsBreadcrumbIcon: '开启 Breadcrumb 图标',
+		fourIsTagsview: '开启 Tagsview',
+		fourIsTagsviewIcon: '开启 Tagsview 图标',
+		fourIsCacheTagsView: '开启 TagsView 缓存',
+		fourIsSortableTagsView: '开启 TagsView 拖拽',
+		fourIsShareTagsView: '开启 TagsView 共用',
+		fourIsFooter: '开启 Footer',
+		fourIsGrayscale: '灰色模式',
+		fourIsInvert: '色弱模式',
+		fourIsDark: '深色模式',
+		fourIsWartermark: '开启水印',
+		fourWartermarkText: '水印文案',
+		fiveTitle: '其它设置',
+		fiveTagsStyle: 'Tagsview 风格',
+		fiveAnimation: '主页面切换动画',
+		fiveColumnsAsideStyle: '分栏高亮风格',
+		fiveColumnsAsideLayout: '分栏布局风格',
+		sixTitle: '布局切换',
+		sixDefaults: '默认',
+		sixClassic: '经典',
+		sixTransverse: '横向',
+		sixColumns: '分栏',
+		tipText: '点击下方按钮,复制布局配置去 `src/stores/themeConfig.ts` 中修改。',
+		copyText: '一键复制配置',
+		resetText: '一键恢复默认',
+		copyTextSuccess: '复制成功!',
+		copyTextError: '复制失败!',
+	},
+	upgrade: {
+		title: '新版本升级',
+		msg: '新版本来啦,马上更新尝鲜吧!不用担心,更新很快的哦!',
+		desc: '提示:更新会还原默认配置',
+		btnOne: '残忍拒绝',
+		btnTwo: '马上更新',
+		btnTwoLoading: '更新中',
+	},
+};

+ 192 - 0
admin-web/src/i18n/lang/zh-tw.ts

@@ -0,0 +1,192 @@
+// 定义内容
+export default {
+	router: {
+		home: '首頁',
+		system: '系統設置',
+		systemMenu: '選單管理',
+		systemRole: '角色管理',
+		systemUser: '用戶管理',
+		systemDept: '部門管理',
+		systemDic: '字典管理',
+		limits: '許可權管理',
+		limitsFrontEnd: '前端控制',
+		limitsFrontEndPage: '頁面許可權',
+		limitsFrontEndBtn: '按鈕許可權',
+		limitsBackEnd: '後端控制',
+		limitsBackEndEndPage: '頁面許可權',
+		menu: '選單嵌套',
+		menu1: '選單1',
+		menu11: '選單11',
+		menu12: '選單12',
+		menu121: '選單121',
+		menu122: '選單122',
+		menu13: '選單13',
+		menu2: '選單2',
+		funIndex: '功能',
+		funTagsView: 'tagsView 操作',
+		funCountup: '數位滾動',
+		funWangEditor: 'Editor 編輯器',
+		funCropper: '圖片裁剪',
+		funQrcode: '二維碼生成',
+		funEchartsMap: '地理座標/地圖',
+		funPrintJs: '頁面列印',
+		funClipboard: '複製剪切',
+		funGridLayout: '拖拽佈局',
+		funSplitpanes: '窗格折開器',
+		funDragVerify: '驗證器',
+		pagesIndex: '頁面',
+		pagesFiltering: '過濾篩選組件',
+		pagesFilteringDetails: '過濾篩選組件詳情',
+		pagesFilteringDetails1: '過濾篩選組件詳情111',
+		pagesIocnfont: 'ali 字體圖標',
+		pagesElement: 'ele 字體圖標',
+		pagesAwesome: 'awe 字體圖標',
+		pagesFormAdapt: '表單自我調整',
+		pagesTableRules: '表單表格驗證',
+		pagesFormI18n: '表單國際化',
+		pagesFormRules: '多表單驗證',
+		pagesDynamicForm: '動態複雜表單',
+		pagesWorkflow: '工作流',
+		pagesListAdapt: '清單自我調整',
+		pagesWaterfall: '瀑布屏',
+		pagesSteps: '步驟條',
+		pagesPreview: '大圖預覽',
+		pagesWaves: '波浪效果',
+		pagesTree: '樹形改表格',
+		pagesDrag: '拖動指令',
+		pagesLazyImg: '圖片懶加載',
+		makeIndex: '組件封裝',
+		makeSelector: '圖標選擇器',
+		makeNoticeBar: '滾動通知欄',
+		makeSvgDemo: 'svgIcon 演示',
+		makeTableDemo: '表格封裝演示',
+		paramsIndex: '路由參數',
+		paramsCommon: '普通路由',
+		paramsDynamic: '動態路由',
+		paramsCommonDetails: '普通路由詳情',
+		paramsDynamicDetails: '動態路由詳情',
+		chartIndex: '大資料圖表',
+		visualizingIndex: '數據視覺化',
+		visualizingLinkDemo1: '數據視覺化演示1',
+		visualizingLinkDemo2: '數據視覺化演示2',
+		personal: '個人中心',
+		tools: '工具類集合',
+		layoutLinkView: '外鏈',
+		layoutIframeViewOne: '内嵌 iframe1',
+		layoutIframeViewTwo: '内嵌 iframe2',
+	},
+	staticRoutes: {
+		signIn: '登入',
+		notFound: '找不到此頁面',
+		noPower: '沒有許可權',
+	},
+	user: {
+		title0: '組件大小',
+		title1: '語言切換',
+		title2: '選單蒐索',
+		title3: '佈局配寘',
+		title4: '消息',
+		title5: '開全屏',
+		title6: '關全屏',
+		dropdownLarge: '大型',
+		dropdownDefault: '默認',
+		dropdownSmall: '小型',
+		dropdown1: '首頁',
+		dropdown2: '個人中心',
+		dropdown3: '404',
+		dropdown4: '401',
+		dropdown5: '登出',
+		dropdown6: '程式碼倉庫',
+		searchPlaceholder: '選單蒐索:支援中文、路由路徑',
+		newTitle: '通知',
+		newBtn: '全部已讀',
+		newGo: '前往通知中心',
+		newDesc: '暫無通知',
+		logOutTitle: '提示',
+		logOutMessage: '此操作將登出,是否繼續?',
+		logOutConfirm: '確定',
+		logOutCancel: '取消',
+		logOutExit: '退出中',
+	},
+	tagsView: {
+		refresh: '重繪',
+		close: '關閉',
+		closeOther: '關閉其它',
+		closeAll: '全部關閉',
+		fullscreen: '當前頁全屏',
+		closeFullscreen: '關閉全屏',
+	},
+	notFound: {
+		foundTitle: '地址輸入錯誤,請重新輸入地址~',
+		foundMsg: '您可以先檢查網址,然後重新輸入或給我們迴響問題。',
+		foundBtn: '返回首頁',
+	},
+	noAccess: {
+		accessTitle: '您未被授權,沒有操作許可權~',
+		accessMsg: '聯繫方式:加QQ群探討665452019',
+		accessBtn: '重新授權',
+	},
+	layout: {
+		configTitle: '佈局配寘',
+		oneTitle: '全域主題',
+		twoTopTitle: '頂欄設定',
+		twoMenuTitle: '選單設定',
+		twoColumnsTitle: '分欄設定',
+		twoTopBar: '頂欄背景',
+		twoTopBarColor: '頂欄默認字體顏色',
+		twoIsTopBarColorGradual: '頂欄背景漸變',
+		twoMenuBar: '選單背景',
+		twoMenuBarColor: '選單默認字體顏色',
+		twoMenuBarActiveColor: '選單高亮背景色',
+		twoIsMenuBarColorGradual: '選單背景漸變',
+		twoColumnsMenuBar: '分欄選單背景',
+		twoColumnsMenuBarColor: '分欄選單默認字體顏色',
+		twoIsColumnsMenuBarColorGradual: '分欄選單背景漸變',
+		twoIsColumnsMenuHoverPreload: '分欄選單滑鼠懸停預加載',
+		threeTitle: '介面設定',
+		threeIsCollapse: '選單水准折疊',
+		threeIsUniqueOpened: '選單手風琴',
+		threeIsFixedHeader: '固定 Header',
+		threeIsClassicSplitMenu: '經典佈局分割選單',
+		threeIsLockScreen: '開啟鎖屏',
+		threeLockScreenTime: '自動鎖屏(s/秒)',
+		fourTitle: '介面顯示',
+		fourIsShowLogo: '側邊欄 Logo',
+		fourIsBreadcrumb: '開啟 Breadcrumb',
+		fourIsBreadcrumbIcon: '開啟 Breadcrumb 圖標',
+		fourIsTagsview: '開啟 Tagsview',
+		fourIsTagsviewIcon: '開啟 Tagsview 圖標',
+		fourIsCacheTagsView: '開啟 TagsView 緩存',
+		fourIsSortableTagsView: '開啟 TagsView 拖拽',
+		fourIsShareTagsView: '開啟 TagsView 共用',
+		fourIsFooter: '開啟 Footer',
+		fourIsGrayscale: '灰色模式',
+		fourIsInvert: '色弱模式',
+		fourIsDark: '深色模式',
+		fourIsWartermark: '開啟浮水印',
+		fourWartermarkText: '浮水印文案',
+		fiveTitle: '其它設定',
+		fiveTagsStyle: 'Tagsview 風格',
+		fiveAnimation: '主頁面切換動畫',
+		fiveColumnsAsideStyle: '分欄高亮風格',
+		fiveColumnsAsideLayout: '分欄佈局風格',
+		sixTitle: '佈局切換',
+		sixDefaults: '默認',
+		sixClassic: '經典',
+		sixTransverse: '橫向',
+		sixColumns: '分欄',
+		tipText: '點擊下方按鈕,複製佈局配寘去`src/stores/themeConfig.ts`中修改。',
+		copyText: '一鍵複製配寘',
+		resetText: '一鍵恢復默認',
+		copyTextSuccess: '複製成功!',
+		copyTextError: '複製失敗!',
+	},
+	upgrade: {
+		title: '新版本陞級',
+		msg: '新版本來啦,馬上更新嘗鮮吧! 不用擔心,更新很快的哦!',
+		desc: '提示:更新會還原默認配寘',
+		btnOne: '殘忍拒絕',
+		btnTwo: '馬上更新',
+		btnTwoLoading: '更新中',
+	},
+};

+ 13 - 0
admin-web/src/i18n/pages/formI18n/en.ts

@@ -0,0 +1,13 @@
+// 定义内容
+export default {
+	formI18nLabel: {
+		name: 'name',
+		email: 'email',
+		autograph: 'autograph',
+	},
+	formI18nPlaceholder: {
+		name: 'Please enter your name',
+		email: 'Please enter the users Department',
+		autograph: 'Please enter the login account name',
+	},
+};

+ 13 - 0
admin-web/src/i18n/pages/formI18n/zh-cn.ts

@@ -0,0 +1,13 @@
+// 定义内容
+export default {
+	formI18nLabel: {
+		name: '姓名',
+		email: '用户归属部门',
+		autograph: '登陆账户名',
+	},
+	formI18nPlaceholder: {
+		name: '请输入姓名',
+		email: '请输入用户归属部门',
+		autograph: '请输入登陆账户名',
+	},
+};

+ 13 - 0
admin-web/src/i18n/pages/formI18n/zh-tw.ts

@@ -0,0 +1,13 @@
+// 定义内容
+export default {
+	formI18nLabel: {
+		name: '姓名',
+		email: '用戶歸屬部門',
+		autograph: '登入帳戶名',
+	},
+	formI18nPlaceholder: {
+		name: '請輸入姓名',
+		email: '請輸入用戶歸屬部門',
+		autograph: '請輸入登入帳戶名',
+	},
+};

+ 29 - 0
admin-web/src/i18n/pages/login/en.ts

@@ -0,0 +1,29 @@
+// 定义内容
+export default {
+	label: {
+		one1: 'User name login',
+		two2: 'Mobile number',
+	},
+	link: {
+		one3: 'Third party login',
+		two4: 'Links',
+	},
+	account: {
+		accountPlaceholder1: 'The user name admin or not is common',
+		accountPlaceholder2: 'Password: 123456',
+		accountPlaceholder3: 'Please enter the verification code',
+		accountBtnText: 'Sign in',
+	},
+	mobile: {
+		placeholder1: 'Please input mobile phone number',
+		placeholder2: 'Please enter the verification code',
+		codeText: 'Get code',
+		btnText: 'Sign in',
+		msgText:
+			'Warm tip: it is recommended to use Google, Microsoft edge, version 79.0.1072.62 and above browsers, and 360 browser, please use speed mode',
+	},
+	scan: {
+		text: 'Open the mobile phone to scan and quickly log in / register',
+	},
+	signInText: 'welcome back!',
+};

+ 28 - 0
admin-web/src/i18n/pages/login/zh-cn.ts

@@ -0,0 +1,28 @@
+// 定义内容
+export default {
+	label: {
+		one1: '用户名登录',
+		two2: '手机号登录',
+	},
+	link: {
+		one3: '第三方登录',
+		two4: '友情链接',
+	},
+	account: {
+		accountPlaceholder1: '用户名 admin 或不输均为 common',
+		accountPlaceholder2: '密码:123456',
+		accountPlaceholder3: '请输入验证码',
+		accountBtnText: '登 录',
+	},
+	mobile: {
+		placeholder1: '请输入手机号',
+		placeholder2: '请输入验证码',
+		codeText: '获取验证码',
+		btnText: '登 录',
+		msgText: '* 温馨提示:建议使用谷歌、Microsoft Edge,版本 79.0.1072.62 及以上浏览器,360浏览器请使用极速模式',
+	},
+	scan: {
+		text: '打开手机扫一扫,快速登录/注册',
+	},
+	signInText: '欢迎回来!',
+};

+ 28 - 0
admin-web/src/i18n/pages/login/zh-tw.ts

@@ -0,0 +1,28 @@
+// 定义内容
+export default {
+	label: {
+		one1: '用戶名登入',
+		two2: '手機號登入',
+	},
+	link: {
+		one3: '協力廠商登入',
+		two4: '友情連結',
+	},
+	account: {
+		accountPlaceholder1: '用戶名admin或不輸均為common',
+		accountPlaceholder2: '密碼:123456',
+		accountPlaceholder3: '請輸入驗證碼',
+		accountBtnText: '登入',
+	},
+	mobile: {
+		placeholder1: '請輸入手機號',
+		placeholder2: '請輸入驗證碼',
+		codeText: '獲取驗證碼',
+		btnText: '登入',
+		msgText: '* 溫馨提示:建議使用穀歌、Microsoft Edge,版本79.0.1072.62及以上瀏覽器,360瀏覽器請使用極速模式',
+	},
+	scan: {
+		text: '打開手機掃一掃,快速登錄/注册',
+	},
+	signInText: '歡迎回來!',
+};

+ 160 - 0
admin-web/src/layout/component/aside.vue

@@ -0,0 +1,160 @@
+<template>
+	<div class="h100" >
+<!--	<div class="h100" v-show="!isTagsViewCurrenFull">-->
+		<el-aside class="layout-aside" :class="setCollapseStyle">
+			<Logo  />
+<!--			<Logo v-if="setShowLogo" />-->
+			<el-scrollbar class="flex-auto" ref="layoutAsideScrollbarRef" @mouseenter="onAsideEnterLeave(true)" @mouseleave="onAsideEnterLeave(false)">
+				<Vertical :menuList="state.menuList" />
+			</el-scrollbar>
+		</el-aside>
+	</div>
+</template>
+
+<script setup lang="ts" name="layoutAside">
+import { defineAsyncComponent, reactive, computed, watch, onBeforeMount, ref } from 'vue';
+import { storeToRefs } from 'pinia';
+import pinia from '/@/stores';
+import { useRoutesList } from '/@/stores/routesList';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+import mittBus from '/@/utils/mitt';
+
+// 引入组件
+const Logo = defineAsyncComponent(() => import('/@/layout/logo/index.vue'));
+const Vertical = defineAsyncComponent(() => import('/@/layout/navMenu/vertical.vue'));
+
+// 定义变量内容
+const layoutAsideScrollbarRef = ref();
+const stores = useRoutesList();
+const storesThemeConfig = useThemeConfig();
+const storesTagsViewRoutes = useTagsViewRoutes();
+const { routesList } = storeToRefs(stores);
+const { themeConfig } = storeToRefs(storesThemeConfig);
+const { isTagsViewCurrenFull } = storeToRefs(storesTagsViewRoutes);
+const state = reactive<AsideState>({
+	menuList: [],
+	clientWidth: 0,
+});
+
+// 设置菜单展开/收起时的宽度
+const setCollapseStyle = computed(() => {
+	const { layout, isCollapse, menuBar } = themeConfig.value;
+	const asideBrTheme = ['#FFFFFF', '#FFF', '#fff', '#ffffff'];
+	const asideBrColor = asideBrTheme.includes(menuBar) ? 'layout-el-aside-br-color' : '';
+	// 判断是否是手机端
+	if (state.clientWidth <= 1000) {
+		if (isCollapse) {
+			document.body.setAttribute('class', 'el-popup-parent--hidden');
+			const asideEle = document.querySelector('.layout-container') as HTMLElement;
+			const modeDivs = document.createElement('div');
+			modeDivs.setAttribute('class', 'layout-aside-mobile-mode');
+			asideEle.appendChild(modeDivs);
+			modeDivs.addEventListener('click', closeLayoutAsideMobileMode);
+			return [asideBrColor, 'layout-aside-mobile', 'layout-aside-mobile-open'];
+		} else {
+			// 关闭弹窗
+			closeLayoutAsideMobileMode();
+			return [asideBrColor, 'layout-aside-mobile', 'layout-aside-mobile-close'];
+		}
+	} else {
+		if (layout === 'columns') {
+			// 分栏布局,菜单收起时宽度给 1px
+			if (isCollapse) return [asideBrColor, 'layout-aside-pc-1'];
+			else return [asideBrColor, 'layout-aside-pc-220'];
+		} else {
+			// 其它布局给 64px
+			if (isCollapse) return [asideBrColor, 'layout-aside-pc-64'];
+			else return [asideBrColor, 'layout-aside-pc-220'];
+		}
+	}
+});
+// 设置显示/隐藏 logo
+const setShowLogo = computed(() => {
+	let { layout, isShowLogo } = themeConfig.value;
+	return (isShowLogo && layout === 'defaults') || (isShowLogo && layout === 'columns');
+});
+// 关闭移动端蒙版
+const closeLayoutAsideMobileMode = () => {
+	const el = document.querySelector('.layout-aside-mobile-mode');
+	el?.setAttribute('style', 'animation: error-img-two 0.3s');
+	setTimeout(() => {
+		el?.parentNode?.removeChild(el);
+	}, 300);
+	const clientWidth = document.body.clientWidth;
+	if (clientWidth < 1000) themeConfig.value.isCollapse = false;
+	document.body.setAttribute('class', '');
+};
+// 设置/过滤路由(非静态路由/是否显示在菜单中)
+const setFilterRoutes = () => {
+	if (themeConfig.value.layout === 'columns') return false;
+	state.menuList = filterRoutesFun(routesList.value);
+};
+// 路由过滤递归函数
+const filterRoutesFun = <T extends RouteItem>(arr: T[]): T[] => {
+	return arr
+		.filter((item: T) => !item.meta?.isHide)
+		.map((item: T) => {
+			item = Object.assign({}, item);
+			if (item.children) item.children = filterRoutesFun(item.children);
+			return item;
+		});
+};
+// 设置菜单导航是否固定(移动端)
+const initMenuFixed = (clientWidth: number) => {
+	state.clientWidth = clientWidth;
+};
+// 鼠标移入、移出
+const onAsideEnterLeave = (bool: Boolean) => {
+	let { layout } = themeConfig.value;
+	if (layout !== 'columns') return false;
+	if (!bool) mittBus.emit('restoreDefault');
+	// 开启 `分栏菜单鼠标悬停预加载` 才设置,防止 columnsAside.vue 监听 pinia.state
+	if (themeConfig.value.isColumnsMenuHoverPreload) stores.setColumnsMenuHover(bool);
+};
+// 页面加载前
+onBeforeMount(() => {
+	initMenuFixed(document.body.clientWidth);
+	setFilterRoutes();
+	// 此界面不需要取消监听(mittBus.off('setSendColumnsChildren))
+	// 因为切换布局时有的监听需要使用,取消了监听,某些操作将不生效
+	mittBus.on('setSendColumnsChildren', (res: MittMenu) => {
+		state.menuList = res.children;
+	});
+	// 开启经典布局分割菜单时,设置菜单数据
+	mittBus.on('setSendClassicChildren', (res: MittMenu) => {
+		let { layout, isClassicSplitMenu } = themeConfig.value;
+		if (layout === 'classic' && isClassicSplitMenu) {
+			state.menuList = [];
+			state.menuList = res.children;
+		}
+	});
+	// 开启经典布局分割菜单时,重新处理菜单数据
+	mittBus.on('getBreadcrumbIndexSetFilterRoutes', () => {
+		setFilterRoutes();
+	});
+	// 监听窗口大小改变时(适配移动端)
+	mittBus.on('layoutMobileResize', (res: LayoutMobileResize) => {
+		initMenuFixed(res.clientWidth);
+		closeLayoutAsideMobileMode();
+	});
+});
+// 监听 themeConfig 配置文件的变化,更新菜单 el-scrollbar 的高度
+watch(themeConfig.value, (val) => {
+	if (val.isShowLogoChange !== val.isShowLogo) {
+		if (layoutAsideScrollbarRef.value) layoutAsideScrollbarRef.value.update();
+	}
+});
+// 监听 pinia 值的变化,动态赋值给菜单中
+watch(
+	pinia.state,
+	(val) => {
+		let { layout, isClassicSplitMenu } = val.themeConfig.themeConfig;
+		if (layout === 'classic' && isClassicSplitMenu) return false;
+		setFilterRoutes();
+	},
+	{
+		deep: true,
+	}
+);
+</script>

+ 281 - 0
admin-web/src/layout/component/columnsAside.vue

@@ -0,0 +1,281 @@
+<template>
+	<div class="layout-columns-aside">
+		<el-scrollbar>
+			<ul @mouseleave="onColumnsAsideMenuMouseleave()">
+				<li
+					v-for="(v, k) in state.columnsAsideList"
+					:key="k"
+					@click="onColumnsAsideMenuClick(v)"
+					@mouseenter="onColumnsAsideMenuMouseenter(v, k)"
+					:ref="
+						(el) => {
+							if (el) columnsAsideOffsetTopRefs[k] = el;
+						}
+					"
+					:class="{ 'layout-columns-active': state.liIndex === k, 'layout-columns-hover': state.liHoverIndex === k }"
+					:title="$t(v.meta.title)"
+				>
+					<div :class="themeConfig.columnsAsideLayout" v-if="!v.meta.isLink || (v.meta.isLink && v.meta.isIframe)">
+						<SvgIcon :name="v.meta.icon" />
+						<div class="columns-vertical-title font12">
+							{{
+								$t(v.meta.title) && $t(v.meta.title).length >= 4
+									? $t(v.meta.title).substr(0, themeConfig.columnsAsideLayout === 'columns-vertical' ? 4 : 3)
+									: $t(v.meta.title)
+							}}
+						</div>
+					</div>
+					<div :class="themeConfig.columnsAsideLayout" v-else>
+						<a :href="v.meta.isLink" target="_blank">
+							<SvgIcon :name="v.meta.icon" />
+							<div class="columns-vertical-title font12">
+								{{
+									$t(v.meta.title) && $t(v.meta.title).length >= 4
+										? $t(v.meta.title).substr(0, themeConfig.columnsAsideLayout === 'columns-vertical' ? 4 : 3)
+										: $t(v.meta.title)
+								}}
+							</div>
+						</a>
+					</div>
+				</li>
+				<div ref="columnsAsideActiveRef" :class="themeConfig.columnsAsideStyle"></div>
+			</ul>
+		</el-scrollbar>
+	</div>
+</template>
+
+<script setup lang="ts" name="layoutColumnsAside">
+import { reactive, ref, onMounted, nextTick, watch, onUnmounted } from 'vue';
+import { useRoute, useRouter, onBeforeRouteUpdate, RouteRecordRaw } from 'vue-router';
+import { storeToRefs } from 'pinia';
+import pinia from '/@/stores';
+import { useRoutesList } from '/@/stores/routesList';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import mittBus from '/@/utils/mitt';
+
+// 定义变量内容
+const columnsAsideOffsetTopRefs = ref<RefType>([]);
+const columnsAsideActiveRef = ref();
+const stores = useRoutesList();
+const storesThemeConfig = useThemeConfig();
+const { routesList, isColumnsMenuHover, isColumnsNavHover } = storeToRefs(stores);
+const { themeConfig } = storeToRefs(storesThemeConfig);
+const route = useRoute();
+const router = useRouter();
+const state = reactive<ColumnsAsideState>({
+	columnsAsideList: [],
+	liIndex: 0,
+	liOldIndex: null,
+	liHoverIndex: null,
+	liOldPath: null,
+	difference: 0,
+	routeSplit: [],
+});
+
+// 设置菜单高亮位置移动
+const setColumnsAsideMove = (k: number) => {
+	if (k === undefined) return false;
+	state.liIndex = k;
+	columnsAsideActiveRef.value.style.top = `${columnsAsideOffsetTopRefs.value[k].offsetTop + state.difference}px`;
+};
+// 菜单高亮点击事件
+const onColumnsAsideMenuClick = async (v: RouteItem) => {
+	let { path, redirect } = v;
+	if (redirect) router.push(redirect);
+	else router.push(path);
+	// 一个路由设置自动收起菜单
+	// https://gitee.com/lyt-top/vue-next-admin/issues/I6HW7H
+	if (!v.children) themeConfig.value.isCollapse = true;
+	else if (v.children.length > 1) themeConfig.value.isCollapse = false;
+};
+// 鼠标移入时,显示当前的子级菜单
+const onColumnsAsideMenuMouseenter = (v: RouteRecordRaw, k: number) => {
+	if (!themeConfig.value.isColumnsMenuHoverPreload) return false;
+	let { path } = v;
+	state.liOldPath = path;
+	state.liOldIndex = k;
+	state.liHoverIndex = k;
+	mittBus.emit('setSendColumnsChildren', setSendChildren(path));
+	stores.setColumnsMenuHover(false);
+	stores.setColumnsNavHover(true);
+};
+// 鼠标移走时,显示原来的子级菜单
+const onColumnsAsideMenuMouseleave = async () => {
+	if (!themeConfig.value.isColumnsMenuHoverPreload) return false;
+	await stores.setColumnsNavHover(false);
+	// 添加延时器,防止拿到的 store.state.routesList 值不是最新的
+	setTimeout(() => {
+		if (!isColumnsMenuHover && !isColumnsNavHover) mittBus.emit('restoreDefault');
+	}, 100);
+};
+// 设置高亮动态位置
+const onColumnsAsideDown = (k: number) => {
+	nextTick(() => {
+		setColumnsAsideMove(k);
+	});
+};
+// 设置/过滤路由(非静态路由/是否显示在菜单中)
+const setFilterRoutes = () => {
+	state.columnsAsideList = filterRoutesFun(routesList.value);
+	const resData: MittMenu = setSendChildren(route.path);
+	if (Object.keys(resData).length <= 0) return false;
+	onColumnsAsideDown(resData.item?.k);
+	// 刷新时,初始化一个路由设置自动收起菜单
+	// https://gitee.com/lyt-top/vue-next-admin/issues/I6HW7H
+	resData.children.length <= 1 ? (themeConfig.value.isCollapse = true) : (themeConfig.value.isCollapse = false);
+	mittBus.emit('setSendColumnsChildren', resData);
+};
+// 传送当前子级数据到菜单中
+const setSendChildren = (path: string) => {
+	const currentPathSplit = path.split('/');
+	let currentData: MittMenu = { children: [] };
+	state.columnsAsideList.map((v: RouteItem, 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 = <T extends RouteItem>(arr: T[]): T[] => {
+	return arr
+		.filter((item: T) => !item.meta?.isHide)
+		.map((item: T) => {
+			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: RouteItem) => v.path === routeFirst);
+	if (!currentSplitRoute) return false;
+	// 延迟拿值,防止取不到
+	setTimeout(() => {
+		onColumnsAsideDown(currentSplitRoute.k);
+	}, 0);
+};
+// 页面加载时
+onMounted(() => {
+	setFilterRoutes();
+	// 销毁变量,防止鼠标再次移入时,保留了上次的记录
+	mittBus.on('restoreDefault', () => {
+		state.liOldIndex = null;
+		state.liOldPath = null;
+	});
+});
+// 页面卸载时
+onUnmounted(() => {
+	mittBus.off('restoreDefault', () => {});
+});
+// 路由更新时
+onBeforeRouteUpdate((to) => {
+	setColumnsMenuHighlight(to.path);
+	mittBus.emit('setSendColumnsChildren', setSendChildren(to.path));
+});
+// 监听布局配置信息的变化,动态增加菜单高亮位置移动像素
+watch(
+	pinia.state,
+	(val) => {
+		val.themeConfig.themeConfig.columnsAsideStyle === 'columnsRound' ? (state.difference = 3) : (state.difference = 0);
+		if (!val.routesList.isColumnsMenuHover && !val.routesList.isColumnsNavHover) {
+			state.liHoverIndex = null;
+			mittBus.emit('setSendColumnsChildren', setSendChildren(route.path));
+		} else {
+			state.liHoverIndex = state.liOldIndex;
+			if (!state.liOldPath) return false;
+			mittBus.emit('setSendColumnsChildren', setSendChildren(state.liOldPath));
+		}
+	},
+	{
+		deep: true,
+	}
+);
+</script>
+
+<style scoped lang="scss">
+.layout-columns-aside {
+	width: 70px;
+	height: 100%;
+	background: var(--next-bg-columnsMenuBar);
+	ul {
+		position: relative;
+		.layout-columns-active,
+		.layout-columns-active a {
+			color: var(--next-bg-columnsMenuBarColor) !important;
+			transition: 0.3s ease-in-out;
+		}
+		.layout-columns-hover {
+			color: var(--el-color-primary);
+			a {
+				color: var(--el-color-primary);
+			}
+		}
+		li {
+			color: var(--next-bg-columnsMenuBarColor);
+			width: 100%;
+			height: 50px;
+			text-align: center;
+			display: flex;
+			cursor: pointer;
+			position: relative;
+			z-index: 1;
+			&:hover {
+				@extend .layout-columns-hover;
+			}
+			.columns-vertical {
+				margin: auto;
+				.columns-vertical-title {
+					padding-top: 1px;
+				}
+			}
+			.columns-horizontal {
+				display: flex;
+				height: 50px;
+				width: 100%;
+				align-items: center;
+				padding: 0 5px;
+				i {
+					margin-right: 3px;
+				}
+				a {
+					display: flex;
+					.columns-horizontal-title {
+						padding-top: 1px;
+					}
+				}
+			}
+			a {
+				text-decoration: none;
+				color: var(--next-bg-columnsMenuBarColor);
+			}
+		}
+		.columns-round {
+			background: var(--el-color-primary);
+			color: var(--el-color-white);
+			position: absolute;
+			left: 50%;
+			top: 2px;
+			height: 44px;
+			width: 65px;
+			transform: translateX(-50%);
+			z-index: 0;
+			transition: 0.3s ease-in-out;
+			border-radius: 5px;
+		}
+		.columns-card {
+			@extend .columns-round;
+			top: 0;
+			height: 50px;
+			width: 100%;
+			border-radius: 0;
+		}
+	}
+}
+</style>

+ 18 - 0
admin-web/src/layout/component/header.vue

@@ -0,0 +1,18 @@
+<template>
+	<el-header class="layout-header" v-show="!isTagsViewCurrenFull">
+		<NavBarsIndex />
+	</el-header>
+</template>
+
+<script setup lang="ts" name="layoutHeader">
+import { defineAsyncComponent } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+
+// 引入组件
+const NavBarsIndex = defineAsyncComponent(() => import('/@/layout/navBars/index.vue'));
+
+// 定义变量内容
+const storesTagsViewRoutes = useTagsViewRoutes();
+const { isTagsViewCurrenFull } = storeToRefs(storesTagsViewRoutes);
+</script>

+ 65 - 0
admin-web/src/layout/component/main.vue

@@ -0,0 +1,65 @@
+<template>
+	<el-main class="layout-main" :style="isFixedHeader ? `height: calc(100% - ${setMainHeight})` : `minHeight: calc(100% - ${setMainHeight})`">
+		<el-scrollbar
+			ref="layoutMainScrollbarRef"
+			class="layout-main-scroll layout-backtop-header-fixed"
+			wrap-class="layout-main-scroll"
+			view-class="layout-main-scroll"
+		>
+			<LayoutParentView />
+			<LayoutFooter v-if="isFooter" />
+		</el-scrollbar>
+		<el-backtop :target="setBacktopClass" />
+	</el-main>
+</template>
+
+<script setup lang="ts" name="layoutMain">
+import { defineAsyncComponent, onMounted, computed, ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { storeToRefs } from 'pinia';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { NextLoading } from '/@/utils/loading';
+
+// 引入组件
+const LayoutParentView = defineAsyncComponent(() => import('/@/layout/routerView/parent.vue'));
+const LayoutFooter = defineAsyncComponent(() => import('/@/layout/footer/index.vue'));
+
+// 定义变量内容
+const layoutMainScrollbarRef = ref();
+const route = useRoute();
+const storesTagsViewRoutes = useTagsViewRoutes();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+const { isTagsViewCurrenFull } = storeToRefs(storesTagsViewRoutes);
+
+// 设置 footer 显示/隐藏
+const isFooter = computed(() => {
+	return themeConfig.value.isFooter && !route.meta.isIframe;
+});
+// 设置 header 固定
+const isFixedHeader = computed(() => {
+	return themeConfig.value.isFixedHeader;
+});
+// 设置 Backtop 回到顶部
+const setBacktopClass = computed(() => {
+	if (themeConfig.value.isFixedHeader) return `.layout-backtop-header-fixed .el-scrollbar__wrap`;
+	else return `.layout-backtop .el-scrollbar__wrap`;
+});
+// 设置主内容区的高度
+const setMainHeight = computed(() => {
+	if (isTagsViewCurrenFull.value) return '0px';
+	const { isTagsview, layout } = themeConfig.value;
+	if (isTagsview && layout !== 'classic') return '85px';
+	else return '51px';
+});
+// 页面加载前
+onMounted(() => {
+	NextLoading.done(600);
+});
+
+// 暴露变量
+defineExpose({
+	layoutMainScrollbarRef,
+});
+</script>

+ 25 - 0
admin-web/src/layout/footer/index.vue

@@ -0,0 +1,25 @@
+<template>
+	<div class="layout-footer pb15">
+		<div class="layout-footer-warp">
+			<div>vue-next-admin,Made by lyt with ❤️</div>
+			<div class="mt5">深圳市 xxx 公司版权所有</div>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts" name="layoutFooter">
+// 此处需有内容(注释也得),否则缓存将失败
+</script>
+
+<style scoped lang="scss">
+.layout-footer {
+	width: 100%;
+	display: flex;
+	&-warp {
+		margin: auto;
+		color: var(--el-text-color-secondary);
+		text-align: center;
+		animation: error-num 0.3s ease;
+	}
+}
+</style>

+ 56 - 0
admin-web/src/layout/index.vue

@@ -0,0 +1,56 @@
+<template>
+	<Component :is="layouts[themeConfig.layout]" />
+<!--  <Defaults/>-->
+</template>
+
+<!--管理后台基础组件-->
+<script setup lang="ts" name="layout">
+import { onBeforeMount, onUnmounted, defineAsyncComponent } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { Local } from '/@/utils/storage';
+import mittBus from '/@/utils/mitt';
+
+// 引入组件
+const layouts: any = {
+  //默认
+	defaults: defineAsyncComponent(() => import('/@/layout/main/defaults.vue')),
+
+	classic: defineAsyncComponent(() => import('/@/layout/main/classic.vue')),
+	transverse: defineAsyncComponent(() => import('/@/layout/main/transverse.vue')),
+	columns: defineAsyncComponent(() => import('/@/layout/main/columns.vue')),
+};
+
+// 定义变量内容
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+
+// 窗口大小改变时(适配移动端)
+const onLayoutResize = () => {
+	if (!Local.get('oldLayout')) Local.set('oldLayout', themeConfig.value.layout);
+	const clientWidth = document.body.clientWidth;
+	if (clientWidth < 1000) {
+		themeConfig.value.isCollapse = false;
+		mittBus.emit('layoutMobileResize', {
+			layout: 'defaults',
+			clientWidth,
+		});
+	} else {
+		mittBus.emit('layoutMobileResize', {
+			layout: Local.get('oldLayout') ? Local.get('oldLayout') : themeConfig.value.layout,
+			clientWidth,
+		});
+	}
+};
+// 页面加载前
+onBeforeMount(() => {
+	onLayoutResize();
+	window.addEventListener('resize', onLayoutResize);
+
+  console.error("admin home xxxx")
+});
+// 页面卸载时
+onUnmounted(() => {
+	window.removeEventListener('resize', onLayoutResize);
+});
+</script>

+ 352 - 0
admin-web/src/layout/lockScreen/index.vue

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

+ 78 - 0
admin-web/src/layout/logo/index.vue

@@ -0,0 +1,78 @@
+<template>
+	<div class="layout-logo" v-if="setShowLogo" @click="onThemeConfigChange">
+		<img :src="logoMini" class="layout-logo-medium-img" />
+		<span>{{ themeConfig.globalTitle }}</span>
+	</div>
+	<div class="layout-logo-size" v-else @click="onThemeConfigChange">
+		<img :src="logoMini" class="layout-logo-size-img" />
+	</div>
+</template>
+
+<script setup lang="ts" name="layoutLogo">
+import { useRouter} from 'vue-router';
+import { computed } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import logoMini from '/@/assets/logo.ico';
+
+// 定义变量内容
+const router = useRouter();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+
+// 设置 logo 的显示。classic 经典布局默认显示 logo
+const setShowLogo = computed(() => {
+	let { isCollapse, layout } = themeConfig.value;
+	return !isCollapse || layout === 'classic' || document.body.clientWidth < 1000;
+});
+// logo 点击实现菜单展开/收起
+const onThemeConfigChange = () => {
+	// if (themeConfig.value.layout === 'transverse') return false;
+	// themeConfig.value.isCollapse = !themeConfig.value.isCollapse;
+  router.push("/")
+};
+</script>
+
+<style scoped lang="scss">
+.layout-logo {
+	width: 220px;
+	height: 50px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	box-shadow: rgb(0 21 41 / 2%) 0px 1px 4px;
+	color: var(--el-color-primary);
+	font-size: 16px;
+	cursor: pointer;
+	animation: logoAnimation 0.3s ease-in-out;
+	span {
+		white-space: nowrap;
+		display: inline-block;
+	}
+	&:hover {
+		span {
+			color: var(--color-primary-light-2);
+		}
+	}
+	&-medium-img {
+		width: 20px;
+		margin-right: 5px;
+	}
+}
+.layout-logo-size {
+	width: 100%;
+	height: 50px;
+	display: flex;
+	cursor: pointer;
+	animation: logoAnimation 0.3s ease-in-out;
+	&-img {
+		width: 20px;
+		margin: auto;
+	}
+	&:hover {
+		img {
+			animation: logoAnimation 0.3s ease-in-out;
+		}
+	}
+}
+</style>

+ 71 - 0
admin-web/src/layout/main/classic.vue

@@ -0,0 +1,71 @@
+<template>
+	<el-container class="layout-container flex-center">
+		<LayoutHeader />
+		<el-container class="layout-mian-height-50">
+			<LayoutAside />
+			<div class="flex-center layout-backtop">
+				<LayoutTagsView v-if="isTagsview" />
+				<LayoutMain ref="layoutMainRef" />
+			</div>
+		</el-container>
+	</el-container>
+</template>
+
+<script setup lang="ts" name="layoutClassic">
+import { defineAsyncComponent, computed, ref, watch, nextTick, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+
+// 引入组件
+const LayoutAside = defineAsyncComponent(() => import('/@/layout/component/aside.vue'));
+const LayoutHeader = defineAsyncComponent(() => import('/@/layout/component/header.vue'));
+const LayoutMain = defineAsyncComponent(() => import('/@/layout/component/main.vue'));
+const LayoutTagsView = defineAsyncComponent(() => import('/@/layout/navBars/tagsView/tagsView.vue'));
+
+// 定义变量内容
+const layoutMainRef = ref<InstanceType<typeof LayoutMain>>();
+const route = useRoute();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+
+// 判断是否显示 tasgview
+const isTagsview = computed(() => {
+	return themeConfig.value.isTagsview;
+});
+// 重置滚动条高度,更新子级 scrollbar
+const updateScrollbar = () => {
+	layoutMainRef.value?.layoutMainScrollbarRef.update();
+};
+// 重置滚动条高度,由于组件是异步引入的
+const initScrollBarHeight = () => {
+	nextTick(() => {
+		setTimeout(() => {
+			updateScrollbar();
+			// '!' not null 断言操作符,不执行运行时检查
+			if (layoutMainRef.value) layoutMainRef.value!.layoutMainScrollbarRef.wrapRef.scrollTop = 0;
+		}, 500);
+	});
+};
+// 页面加载时
+onMounted(() => {
+	initScrollBarHeight();
+});
+// 监听路由的变化,切换界面时,滚动条置顶
+watch(
+	() => route.path,
+	() => {
+		initScrollBarHeight();
+	}
+);
+// 监听 themeConfig 配置文件的变化,更新菜单 el-scrollbar 的高度
+watch(
+	themeConfig,
+	() => {
+		updateScrollbar();
+	},
+	{
+		deep: true,
+	}
+);
+</script>

+ 71 - 0
admin-web/src/layout/main/columns.vue

@@ -0,0 +1,71 @@
+<template>
+	<el-container class="layout-container">
+		<ColumnsAside />
+		<el-container class="layout-columns-warp layout-container-view h100">
+			<LayoutAside />
+			<el-scrollbar ref="layoutScrollbarRef" class="layout-backtop">
+				<LayoutHeader />
+				<LayoutMain ref="layoutMainRef" />
+			</el-scrollbar>
+		</el-container>
+	</el-container>
+</template>
+
+<script setup lang="ts" name="layoutColumns">
+import { defineAsyncComponent, watch, onMounted, nextTick, ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+
+// 引入组件
+const LayoutAside = defineAsyncComponent(() => import('/@/layout/component/aside.vue'));
+const LayoutHeader = defineAsyncComponent(() => import('/@/layout/component/header.vue'));
+const LayoutMain = defineAsyncComponent(() => import('/@/layout/component/main.vue'));
+const ColumnsAside = defineAsyncComponent(() => import('/@/layout/component/columnsAside.vue'));
+
+// 定义变量内容
+const layoutScrollbarRef = ref<RefType>('');
+const layoutMainRef = ref<InstanceType<typeof LayoutMain>>();
+const route = useRoute();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+
+// 重置滚动条高度
+const updateScrollbar = () => {
+	// 更新父级 scrollbar
+	layoutScrollbarRef.value.update();
+	// 更新子级 scrollbar
+	layoutMainRef.value && layoutMainRef.value!.layoutMainScrollbarRef.update();
+};
+// 重置滚动条高度,由于组件是异步引入的
+const initScrollBarHeight = () => {
+	nextTick(() => {
+		setTimeout(() => {
+			updateScrollbar();
+			layoutScrollbarRef.value.wrapRef.scrollTop = 0;
+			layoutMainRef.value!.layoutMainScrollbarRef.wrapRef.scrollTop = 0;
+		}, 500);
+	});
+};
+// 页面加载时
+onMounted(() => {
+	initScrollBarHeight();
+});
+// 监听路由的变化,切换界面时,滚动条置顶
+watch(
+	() => route.path,
+	() => {
+		initScrollBarHeight();
+	}
+);
+// 监听 themeConfig 配置文件的变化,更新菜单 el-scrollbar 的高度
+watch(
+	themeConfig,
+	() => {
+		updateScrollbar();
+	},
+	{
+		deep: true,
+	}
+);
+</script>

+ 71 - 0
admin-web/src/layout/main/defaults.vue

@@ -0,0 +1,71 @@
+<template>
+	<el-container class="layout-container">
+		<LayoutAside />
+		<el-container class="layout-container-view h100">
+			<el-scrollbar ref="layoutScrollbarRef" class="layout-backtop">
+				<LayoutHeader />
+				<LayoutMain ref="layoutMainRef" />
+			</el-scrollbar>
+		</el-container>
+	</el-container>
+</template>
+
+<script setup lang="ts" name="layoutDefaults">
+import { defineAsyncComponent, watch, onMounted, nextTick, ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { NextLoading } from '/@/utils/loading';
+
+// 引入组件
+const LayoutAside = defineAsyncComponent(() => import('/@/layout/component/aside.vue'));
+const LayoutHeader = defineAsyncComponent(() => import('/@/layout/component/header.vue'));
+const LayoutMain = defineAsyncComponent(() => import('/@/layout/component/main.vue'));
+
+// 定义变量内容
+const layoutScrollbarRef = ref<RefType>('');
+const layoutMainRef = ref<InstanceType<typeof LayoutMain>>();
+const route = useRoute();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+
+// 重置滚动条高度
+const updateScrollbar = () => {
+	// 更新父级 scrollbar
+	layoutScrollbarRef.value.update();
+	// 更新子级 scrollbar
+	layoutMainRef.value!.layoutMainScrollbarRef.update();
+};
+// 重置滚动条高度,由于组件是异步引入的
+const initScrollBarHeight = () => {
+	nextTick(() => {
+		setTimeout(() => {
+			updateScrollbar();
+			layoutScrollbarRef.value.wrapRef.scrollTop = 0;
+			layoutMainRef.value!.layoutMainScrollbarRef.wrapRef.scrollTop = 0;
+		}, 500);
+	});
+};
+// 页面加载时
+onMounted(() => {
+	initScrollBarHeight();
+	NextLoading.done(600);
+});
+// 监听路由的变化,切换界面时,滚动条置顶
+watch(
+	() => route.path,
+	() => {
+		initScrollBarHeight();
+	}
+);
+// 监听 themeConfig 配置文件的变化,更新菜单 el-scrollbar 的高度
+watch(
+	themeConfig,
+	() => {
+		updateScrollbar();
+	},
+	{
+		deep: true,
+	}
+);
+</script>

+ 58 - 0
admin-web/src/layout/main/transverse.vue

@@ -0,0 +1,58 @@
+<template>
+	<el-container class="layout-container flex-center layout-backtop">
+		<LayoutHeader />
+		<LayoutMain ref="layoutMainRef" />
+	</el-container>
+</template>
+
+<script setup lang="ts" name="layoutTransverse">
+import { defineAsyncComponent, ref, watch, nextTick, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+
+// 引入组件
+const LayoutHeader = defineAsyncComponent(() => import('/@/layout/component/header.vue'));
+const LayoutMain = defineAsyncComponent(() => import('/@/layout/component/main.vue'));
+
+// 定义变量内容
+const layoutMainRef = ref<InstanceType<typeof LayoutMain>>();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+const route = useRoute();
+
+// 重置滚动条高度,更新子级 scrollbar
+const updateScrollbar = () => {
+	layoutMainRef.value!.layoutMainScrollbarRef.update();
+};
+// 重置滚动条高度,由于组件是异步引入的
+const initScrollBarHeight = () => {
+	nextTick(() => {
+		setTimeout(() => {
+			updateScrollbar();
+			layoutMainRef.value!.layoutMainScrollbarRef.wrapRef.scrollTop = 0;
+		}, 500);
+	});
+};
+// 页面加载时
+onMounted(() => {
+	initScrollBarHeight();
+});
+// 监听路由的变化,切换界面时,滚动条置顶
+watch(
+	() => route.path,
+	() => {
+		initScrollBarHeight();
+	}
+);
+// 监听 themeConfig 配置文件的变化,更新菜单 el-scrollbar 的高度
+watch(
+	themeConfig,
+	() => {
+		updateScrollbar();
+	},
+	{
+		deep: true,
+	}
+);
+</script>

+ 150 - 0
admin-web/src/layout/navBars/breadcrumb/breadcrumb.vue

@@ -0,0 +1,150 @@
+<template>
+	<div v-if="isShowBreadcrumb" class="layout-navbars-breadcrumb">
+		<SvgIcon
+			class="layout-navbars-breadcrumb-icon"
+			:name="themeConfig.isCollapse ? 'ele-Expand' : 'ele-Fold'"
+			:size="16"
+			@click="onThemeConfigChange"
+		/>
+		<el-breadcrumb class="layout-navbars-breadcrumb-hide">
+			<transition-group name="breadcrumb">
+				<el-breadcrumb-item v-for="(v, k) in state.breadcrumbList" :key="k">
+<!--				<el-breadcrumb-item v-for="(v, k) in state.breadcrumbList" :key="!v.meta.tagsViewName ? v.meta.title : v.meta.tagsViewName">-->
+					<span v-if="k === state.breadcrumbList.length - 1" class="layout-navbars-breadcrumb-span">
+						<SvgIcon :name="v.meta.icon" class="layout-navbars-breadcrumb-iconfont" v-if="themeConfig.isBreadcrumbIcon" />
+						<div v-if="!v.meta.tagsViewName">{{ $t(v.meta.title) }}</div>
+						<div v-else>{{ v.meta.tagsViewName }}</div>
+					</span>
+					<a v-else @click.prevent="onBreadcrumbClick(v)">
+						<SvgIcon :name="v.meta.icon" class="layout-navbars-breadcrumb-iconfont" v-if="themeConfig.isBreadcrumbIcon" />{{ $t(v.meta.title) }}
+					</a>
+				</el-breadcrumb-item>
+			</transition-group>
+		</el-breadcrumb>
+	</div>
+</template>
+
+<script setup lang="ts" name="layoutBreadcrumb">
+import { reactive, computed, onMounted } from 'vue';
+import { onBeforeRouteUpdate, useRoute, useRouter } from 'vue-router';
+import { Local } from '/@/utils/storage';
+import other from '/@/utils/other';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { useRoutesList } from '/@/stores/routesList';
+
+// 定义变量内容
+const stores = useRoutesList();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+const { routesList } = storeToRefs(stores);
+const route = useRoute();
+const router = useRouter();
+const state = reactive<BreadcrumbState>({
+	breadcrumbList: [],
+	routeSplit: [],
+	routeSplitFirst: '',
+	routeSplitIndex: 1,
+});
+
+// 动态设置经典、横向布局不显示
+const isShowBreadcrumb = computed(() => {
+	initRouteSplit(route.path);
+	const { layout, isBreadcrumb } = themeConfig.value;
+	if (layout === 'classic' || layout === 'transverse') return false;
+	else return isBreadcrumb ? true : false;
+});
+// 面包屑点击时
+const onBreadcrumbClick = (v: RouteItem) => {
+	const { redirect, path } = v;
+	if (redirect) router.push(redirect);
+	else router.push(path);
+};
+// 展开/收起左侧菜单点击
+const onThemeConfigChange = () => {
+	themeConfig.value.isCollapse = !themeConfig.value.isCollapse;
+	setLocalThemeConfig();
+};
+// 存储布局配置
+const setLocalThemeConfig = () => {
+	Local.remove('themeConfig');
+	Local.set('themeConfig', themeConfig.value);
+};
+// 处理面包屑数据
+const getBreadcrumbList = (arr: RouteItems) => {
+	arr.forEach((item: RouteItem) => {
+		state.routeSplit.forEach((v: string, k: number, arrs: string[]) => {
+			if (state.routeSplitFirst === item.path) {
+				state.routeSplitFirst += `/${arrs[state.routeSplitIndex]}`;
+				state.breadcrumbList.push(item);
+				state.routeSplitIndex++;
+				if (item.children) getBreadcrumbList(item.children);
+			}
+		});
+	});
+};
+// 当前路由字符串切割成数组,并删除第一项空内容
+const initRouteSplit = (path: string) => {
+	if (!themeConfig.value.isBreadcrumb) return false;
+  // console.log(path)
+  // console.log(routesList)
+	state.breadcrumbList = [];
+	// state.breadcrumbList = [routesList.value[0]];
+	state.routeSplit = path.split('/');
+	state.routeSplit.shift();
+	state.routeSplitFirst = `/${state.routeSplit[0]}`;
+	state.routeSplitIndex = 1;
+	getBreadcrumbList(routesList.value);
+	if (route.name === 'home' || (route.name === 'notFound' && state.breadcrumbList.length > 1)) state.breadcrumbList.shift();
+	if (state.breadcrumbList.length > 0)
+		state.breadcrumbList[state.breadcrumbList.length - 1].meta.tagsViewName = other.setTagsViewNameI18n(<RouteToFrom>route);
+};
+// 页面加载时
+onMounted(() => {
+	initRouteSplit(route.path);
+});
+// 路由更新时
+onBeforeRouteUpdate((to) => {
+	initRouteSplit(to.path);
+});
+</script>
+
+<style scoped lang="scss">
+.layout-navbars-breadcrumb {
+	flex: 1;
+	height: inherit;
+	display: flex;
+	align-items: center;
+	.layout-navbars-breadcrumb-icon {
+		cursor: pointer;
+		font-size: 18px;
+		color: var(--next-bg-topBarColor);
+		height: 100%;
+		width: 40px;
+		opacity: 0.8;
+		&:hover {
+			opacity: 1;
+		}
+	}
+	.layout-navbars-breadcrumb-span {
+		display: flex;
+		opacity: 0.7;
+		color: var(--next-bg-topBarColor);
+	}
+	.layout-navbars-breadcrumb-iconfont {
+		font-size: 14px;
+		margin-right: 5px;
+	}
+	:deep(.el-breadcrumb__separator) {
+		opacity: 0.7;
+		color: var(--next-bg-topBarColor);
+	}
+	:deep(.el-breadcrumb__inner a, .el-breadcrumb__inner.is-link) {
+		font-weight: unset !important;
+		color: var(--next-bg-topBarColor);
+		&:hover {
+			color: var(--el-color-primary) !important;
+		}
+	}
+}
+</style>

+ 53 - 0
admin-web/src/layout/navBars/breadcrumb/closeFull.vue

@@ -0,0 +1,53 @@
+<template>
+	<div class="layout-navbars-close-full" v-if="isTagsViewCurrenFull">
+		<div class="layout-navbars-close-full-icon">
+			<SvgIcon name="ele-Close" :title="$t('message.tagsView.closeFullscreen')" @click="onCloseFullscreen" />
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts" name="layoutCloseFull">
+import { storeToRefs } from 'pinia';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+
+// 定义变量内容
+const stores = useTagsViewRoutes();
+const { isTagsViewCurrenFull } = storeToRefs(stores);
+
+// 关闭当前全屏
+const onCloseFullscreen = () => {
+	stores.setCurrenFullscreen(false);
+};
+</script>
+
+<style scoped lang="scss">
+.layout-navbars-close-full {
+	position: fixed;
+	z-index: 9999999999;
+	right: -30px;
+	top: -30px;
+	.layout-navbars-close-full-icon {
+		width: 60px;
+		height: 60px;
+		border-radius: 100%;
+		cursor: pointer;
+		background: rgba(0, 0, 0, 0.1);
+		transition: all 0.3s ease;
+		position: relative;
+		:deep(i) {
+			position: absolute;
+			left: 10px;
+			top: 35px;
+			color: #333333;
+			transition: all 0.3s ease;
+		}
+	}
+	&:hover {
+		transition: all 0.3s ease;
+		:deep(i) {
+			color: var(--el-color-primary);
+			transition: all 0.3s ease;
+		}
+	}
+}
+</style>

+ 112 - 0
admin-web/src/layout/navBars/breadcrumb/index.vue

@@ -0,0 +1,112 @@
+<template>
+	<div class="layout-navbars-breadcrumb-index">
+		<Logo v-if="setIsShowLogo" />
+		<Breadcrumb />
+<!--		<Horizontal :menuList="state.menuList"  />-->
+<!--		<Horizontal :menuList="state.menuList" v-if="isLayoutTransverse" />-->
+		<Toolbar />
+	</div>
+</template>
+
+<script setup lang="ts" name="layoutBreadcrumbIndex">
+import { defineAsyncComponent, computed, reactive, onMounted, onUnmounted } from 'vue';
+import { useRoute } from 'vue-router';
+import { storeToRefs } from 'pinia';
+import { useRoutesList } from '/@/stores/routesList';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import mittBus from '/@/utils/mitt';
+
+// 引入组件
+const Breadcrumb = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/breadcrumb.vue'));
+const Toolbar = defineAsyncComponent(() => import('/@/layout/navBars/breadcrumb/toolbar.vue'));
+const Logo = defineAsyncComponent(() => import('/@/layout/logo/index.vue'));
+const Horizontal = defineAsyncComponent(() => import('/@/layout/navMenu/horizontal.vue'));
+
+// 定义变量内容
+const stores = useRoutesList();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+const { routesList } = storeToRefs(stores);
+const route = useRoute();
+const state = reactive({
+	menuList: [] as RouteItems,
+});
+
+// 设置 logo 显示/隐藏
+const setIsShowLogo = computed(() => {
+	let { isShowLogo, layout } = themeConfig.value;
+	return (isShowLogo && layout === 'classic') || (isShowLogo && layout === 'transverse');
+});
+// 设置是否显示横向导航菜单
+const isLayoutTransverse = computed(() => {
+	let { layout, isClassicSplitMenu } = themeConfig.value;
+	let b =  layout === 'transverse' || (isClassicSplitMenu && layout === 'classic');
+  return b;
+});
+// 设置/过滤路由(非静态路由/是否显示在菜单中)
+const setFilterRoutes = () => {
+	let { layout, isClassicSplitMenu } = themeConfig.value;
+  let routerList = routesList.value;
+	if (layout === 'classic' && isClassicSplitMenu) {
+
+    // console.log(routerList)
+		state.menuList = delClassicChildren(filterRoutesFun(routesList.value));
+		const resData = setSendClassicChildren(route.path);
+		mittBus.emit('setSendClassicChildren', resData);
+	} else {
+		state.menuList = filterRoutesFun(routesList.value);
+	}
+};
+// 设置了分割菜单时,删除底下 children
+const delClassicChildren = <T extends ChilType>(arr: T[]): T[] => {
+	arr.map((v: T) => {
+		if (v.children) delete v.children;
+	});
+	return arr;
+};
+// 路由过滤递归函数
+const filterRoutesFun = <T extends RouteItem>(arr: T[]): T[] => {
+	return arr
+		.filter((item: T) => !item.meta?.isHide)
+		.map((item: T) => {
+			item = Object.assign({}, item);
+			if (item.children) item.children = filterRoutesFun(item.children);
+			return item;
+		});
+};
+// 传送当前子级数据到菜单中
+const setSendClassicChildren = (path: string) => {
+	const currentPathSplit = path.split('/');
+	let currentData: MittMenu = { children: [] };
+	filterRoutesFun(routesList.value).map((v: RouteItem, 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;
+};
+// 页面加载时
+onMounted(() => {
+	setFilterRoutes();
+	mittBus.on('getBreadcrumbIndexSetFilterRoutes', () => {
+		setFilterRoutes();
+	});
+});
+// 页面卸载时
+onUnmounted(() => {
+	mittBus.off('getBreadcrumbIndexSetFilterRoutes', () => {});
+});
+</script>
+
+<style scoped lang="scss">
+.layout-navbars-breadcrumb-index {
+	height: 50px;
+	display: flex;
+	align-items: center;
+	background: var(--next-bg-topBar);
+	border-bottom: 1px solid var(--next-border-color-light);
+}
+</style>

+ 107 - 0
admin-web/src/layout/navBars/breadcrumb/notification.vue

@@ -0,0 +1,107 @@
+<template>
+	<div class="layout-navbars-breadcrumb-user-news">
+		<div class="head-box">
+			<div class="head-box-title">{{ $t('message.user.newTitle') }}</div>
+			<div class="head-box-btn" v-if="state.newsList.length > 0" @click="onAllReadClick">{{ $t('message.user.newBtn') }}</div>
+		</div>
+		<div class="content-box">
+			<template v-if="state.newsList.length > 0">
+				<div class="content-box-item" v-for="(v, k) in state.newsList" :key="k">
+					<div>{{ v.label }}</div>
+					<div class="content-box-msg">
+						{{ v.value }}
+					</div>
+					<div class="content-box-time">{{ v.time }}</div>
+				</div>
+			</template>
+			<el-empty :description="$t('message.user.newDesc')" v-else></el-empty>
+		</div>
+		<div class="foot-box" @click="gotoNotification" v-if="state.newsList.length > 0">{{ $t('message.user.newGo') }}</div>
+	</div>
+</template>
+
+<script setup lang="ts" name="layoutBreadcrumbUserNews">
+import { reactive } from 'vue';
+
+// 定义变量内容
+const state = reactive({
+	newsList: [
+		{
+			label: '关于版本发布的通知',
+			value: 'vue-next-admin,基于 vue3 + CompositionAPI + typescript + vite + element plus,正式发布时间:2021年02月28日!',
+			time: '2020-12-08',
+		},
+		{
+			label: '关于学习交流的通知',
+			value: 'QQ群号码 665452019,欢迎小伙伴入群学习交流探讨!',
+			time: '2020-12-08',
+		},
+	],
+});
+
+// 全部已读点击
+const onAllReadClick = () => {
+	state.newsList = [];
+};
+// 前往通知中心点击
+const gotoNotification = () => {
+	window.open('https://gitee.com/lyt-top/vue-next-admin');
+};
+</script>
+
+<style scoped lang="scss">
+.layout-navbars-breadcrumb-user-news {
+	.head-box {
+		display: flex;
+		border-bottom: 1px solid var(--el-border-color-lighter);
+		box-sizing: border-box;
+		color: var(--el-text-color-primary);
+		justify-content: space-between;
+		height: 35px;
+		align-items: center;
+		.head-box-btn {
+			color: var(--el-color-primary);
+			font-size: 13px;
+			cursor: pointer;
+			opacity: 0.8;
+			&:hover {
+				opacity: 1;
+			}
+		}
+	}
+	.content-box {
+		font-size: 13px;
+		.content-box-item {
+			padding-top: 12px;
+			&:last-of-type {
+				padding-bottom: 12px;
+			}
+			.content-box-msg {
+				color: var(--el-text-color-secondary);
+				margin-top: 5px;
+				margin-bottom: 5px;
+			}
+			.content-box-time {
+				color: var(--el-text-color-secondary);
+			}
+		}
+	}
+	.foot-box {
+		height: 35px;
+		color: var(--el-color-primary);
+		font-size: 13px;
+		cursor: pointer;
+		opacity: 0.8;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-top: 1px solid var(--el-border-color-lighter);
+		&:hover {
+			opacity: 1;
+		}
+	}
+	:deep(.el-empty__description p) {
+		font-size: 13px;
+	}
+}
+</style>

+ 125 - 0
admin-web/src/layout/navBars/breadcrumb/search.vue

@@ -0,0 +1,125 @@
+<template>
+	<div class="layout-search-dialog">
+		<el-dialog v-model="state.isShowSearch" destroy-on-close :show-close="false">
+			<template #footer>
+				<el-autocomplete
+					v-model="state.menuQuery"
+					:fetch-suggestions="menuSearch"
+					:placeholder="$t('message.user.searchPlaceholder')"
+					ref="layoutMenuAutocompleteRef"
+					@select="onHandleSelect"
+					:fit-input-width="true"
+				>
+					<template #prefix>
+						<el-icon class="el-input__icon">
+							<ele-Search />
+						</el-icon>
+					</template>
+					<template #default="{ item }">
+						<div>
+							<SvgIcon :name="item.meta.icon" class="mr5" />
+							{{ $t(item.meta.title) }}
+						</div>
+					</template>
+				</el-autocomplete>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup lang="ts" name="layoutBreadcrumbSearch">
+import { reactive, ref, nextTick } from 'vue';
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { storeToRefs } from 'pinia';
+import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
+
+// 定义变量内容
+const storesTagsViewRoutes = useTagsViewRoutes();
+const { tagsViewRoutes } = storeToRefs(storesTagsViewRoutes);
+const layoutMenuAutocompleteRef = ref();
+const { t } = useI18n();
+const router = useRouter();
+const state = reactive<SearchState>({
+	isShowSearch: false,
+	menuQuery: '',
+	tagsViewList: [],
+});
+
+// 搜索弹窗打开
+const openSearch = () => {
+	state.menuQuery = '';
+	state.isShowSearch = true;
+	initTageView();
+	nextTick(() => {
+		setTimeout(() => {
+			layoutMenuAutocompleteRef.value.focus();
+		});
+	});
+};
+// 搜索弹窗关闭
+const closeSearch = () => {
+	state.isShowSearch = false;
+};
+// 菜单搜索数据过滤
+const menuSearch = (queryString: string, cb: Function) => {
+	let results = queryString ? state.tagsViewList.filter(createFilter(queryString)) : state.tagsViewList;
+	cb(results);
+};
+// 菜单搜索过滤
+const createFilter = (queryString: string) => {
+	return (restaurant: RouteItem) => {
+		return (
+			restaurant.path.toLowerCase().indexOf(queryString.toLowerCase()) > -1 ||
+			restaurant.meta!.title!.toLowerCase().indexOf(queryString.toLowerCase()) > -1 ||
+			t(restaurant.meta!.title!).indexOf(queryString.toLowerCase()) > -1
+		);
+	};
+};
+// 初始化菜单数据
+const initTageView = () => {
+	if (state.tagsViewList.length > 0) return false;
+	tagsViewRoutes.value.map((v: RouteItem) => {
+		if (!v.meta?.isHide) state.tagsViewList.push({ ...v });
+	});
+};
+// 当前菜单选中时
+const onHandleSelect = (item: RouteItem) => {
+	let { path, redirect } = item;
+	if (item.meta?.isLink && !item.meta?.isIframe) window.open(item.meta?.isLink);
+	else if (redirect) router.push(redirect);
+	else router.push(path);
+	closeSearch();
+};
+
+// 暴露变量
+defineExpose({
+	openSearch,
+});
+</script>
+
+<style scoped lang="scss">
+.layout-search-dialog {
+	position: relative;
+	:deep(.el-dialog) {
+		.el-dialog__header,
+		.el-dialog__body {
+			display: none;
+		}
+		.el-dialog__footer {
+			width: 100%;
+			position: absolute;
+			left: 50%;
+			transform: translateX(-50%);
+			top: -53vh;
+		}
+	}
+	:deep(.el-autocomplete) {
+		width: 560px;
+		position: absolute;
+		top: 150px;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+}
+</style>

+ 826 - 0
admin-web/src/layout/navBars/breadcrumb/setings.vue

@@ -0,0 +1,826 @@
+<template>
+	<div class="layout-breadcrumb-seting">
+		<el-drawer
+			:title="$t('message.layout.configTitle')"
+			v-model="getThemeConfig.isDrawer"
+			direction="rtl"
+			destroy-on-close
+			size="260px"
+			@close="onDrawerClose"
+		>
+			<el-scrollbar class="layout-breadcrumb-seting-bar">
+				<!-- 全局主题 -->
+				<el-divider content-position="left">{{ $t('message.layout.oneTitle') }}</el-divider>
+				<div class="layout-breadcrumb-seting-bar-flex">
+					<div class="layout-breadcrumb-seting-bar-flex-label">primary</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-color-picker v-model="getThemeConfig.primary" size="default" @change="onColorPickerChange"> </el-color-picker>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsDark') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isIsDark" size="small" @change="onAddDarkChange"></el-switch>
+					</div>
+				</div>
+
+				<!-- 顶栏设置 -->
+				<el-divider content-position="left">{{ $t('message.layout.twoTopTitle') }}</el-divider>
+				<div class="layout-breadcrumb-seting-bar-flex">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoTopBar') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-color-picker v-model="getThemeConfig.topBar" size="default" @change="onBgColorPickerChange('topBar')"> </el-color-picker>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoTopBarColor') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-color-picker v-model="getThemeConfig.topBarColor" size="default" @change="onBgColorPickerChange('topBarColor')"> </el-color-picker>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt10">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoIsTopBarColorGradual') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isTopBarColorGradual" size="small" @change="onTopBarGradualChange"></el-switch>
+					</div>
+				</div>
+
+				<!-- 菜单设置 -->
+				<el-divider content-position="left">{{ $t('message.layout.twoMenuTitle') }}</el-divider>
+				<div class="layout-breadcrumb-seting-bar-flex">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoMenuBar') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-color-picker v-model="getThemeConfig.menuBar" size="default" @change="onBgColorPickerChange('menuBar')"> </el-color-picker>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoMenuBarColor') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-color-picker v-model="getThemeConfig.menuBarColor" size="default" @change="onBgColorPickerChange('menuBarColor')"> </el-color-picker>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoMenuBarActiveColor') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-color-picker
+							v-model="getThemeConfig.menuBarActiveColor"
+							size="default"
+							show-alpha
+							@change="onBgColorPickerChange('menuBarActiveColor')"
+						/>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt14">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoIsMenuBarColorGradual') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isMenuBarColorGradual" size="small" @change="onMenuBarGradualChange"></el-switch>
+					</div>
+				</div>
+
+				<!-- 分栏设置 -->
+				<el-divider content-position="left" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">{{
+					$t('message.layout.twoColumnsTitle')
+				}}</el-divider>
+				<div class="layout-breadcrumb-seting-bar-flex" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoColumnsMenuBar') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-color-picker
+							v-model="getThemeConfig.columnsMenuBar"
+							size="default"
+							@change="onBgColorPickerChange('columnsMenuBar')"
+							:disabled="getThemeConfig.layout !== 'columns'"
+						>
+						</el-color-picker>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoColumnsMenuBarColor') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-color-picker
+							v-model="getThemeConfig.columnsMenuBarColor"
+							size="default"
+							@change="onBgColorPickerChange('columnsMenuBarColor')"
+							:disabled="getThemeConfig.layout !== 'columns'"
+						>
+						</el-color-picker>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt14" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoIsColumnsMenuBarColorGradual') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch
+							v-model="getThemeConfig.isColumnsMenuBarColorGradual"
+							size="small"
+							@change="onColumnsMenuBarGradualChange"
+							:disabled="getThemeConfig.layout !== 'columns'"
+						></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt14" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoIsColumnsMenuHoverPreload') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch
+							v-model="getThemeConfig.isColumnsMenuHoverPreload"
+							size="small"
+							@change="onColumnsMenuHoverPreloadChange"
+							:disabled="getThemeConfig.layout !== 'columns'"
+						></el-switch>
+					</div>
+				</div>
+
+				<!-- 界面设置 -->
+				<el-divider content-position="left">{{ $t('message.layout.threeTitle') }}</el-divider>
+				<div class="layout-breadcrumb-seting-bar-flex" :style="{ opacity: getThemeConfig.layout === 'transverse' ? 0.5 : 1 }">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsCollapse') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch
+							v-model="getThemeConfig.isCollapse"
+							:disabled="getThemeConfig.layout === 'transverse'"
+							size="small"
+							@change="onThemeConfigChange"
+						></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15" :style="{ opacity: getThemeConfig.layout === 'transverse' ? 0.5 : 1 }">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsUniqueOpened') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch
+							v-model="getThemeConfig.isUniqueOpened"
+							:disabled="getThemeConfig.layout === 'transverse'"
+							size="small"
+							@change="setLocalThemeConfig"
+						></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsFixedHeader') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isFixedHeader" size="small" @change="onIsFixedHeaderChange"></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15" :style="{ opacity: getThemeConfig.layout !== 'classic' ? 0.5 : 1 }">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsClassicSplitMenu') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch
+							v-model="getThemeConfig.isClassicSplitMenu"
+							:disabled="getThemeConfig.layout !== 'classic'"
+							size="small"
+							@change="onClassicSplitMenuChange"
+						>
+						</el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsLockScreen') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isLockScreen" size="small" @change="setLocalThemeConfig"></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt11">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeLockScreenTime') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-input-number
+							v-model="getThemeConfig.lockScreenTime"
+							controls-position="right"
+							:min="1"
+							:max="9999"
+							@change="setLocalThemeConfig"
+							size="default"
+							style="width: 90px"
+						>
+						</el-input-number>
+					</div>
+				</div>
+
+				<!-- 界面显示 -->
+				<el-divider content-position="left">{{ $t('message.layout.fourTitle') }}</el-divider>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsShowLogo') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isShowLogo" size="small" @change="onIsShowLogoChange"></el-switch>
+					</div>
+				</div>
+				<div
+					class="layout-breadcrumb-seting-bar-flex mt15"
+					:style="{ opacity: getThemeConfig.layout === 'classic' || getThemeConfig.layout === 'transverse' ? 0.5 : 1 }"
+				>
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsBreadcrumb') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch
+							v-model="getThemeConfig.isBreadcrumb"
+							:disabled="getThemeConfig.layout === 'classic' || getThemeConfig.layout === 'transverse'"
+							size="small"
+							@change="onIsBreadcrumbChange"
+						></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsBreadcrumbIcon') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isBreadcrumbIcon" size="small" @change="setLocalThemeConfig"></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsTagsview') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isTagsview" size="small" @change="setLocalThemeConfig"></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsTagsviewIcon') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isTagsviewIcon" size="small" @change="setLocalThemeConfig"></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsCacheTagsView') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isCacheTagsView" size="small" @change="setLocalThemeConfig"></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15" :style="{ opacity: state.isMobile ? 0.5 : 1 }">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsSortableTagsView') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch
+							v-model="getThemeConfig.isSortableTagsView"
+							:disabled="state.isMobile ? true : false"
+							size="small"
+							@change="onSortableTagsViewChange"
+						></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsShareTagsView') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isShareTagsView" size="small" @change="onShareTagsViewChange"></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsFooter') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isFooter" size="small" @change="setLocalThemeConfig"></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsGrayscale') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isGrayscale" size="small" @change="onAddFilterChange('grayscale')"></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsInvert') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isInvert" size="small" @change="onAddFilterChange('invert')"></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsWartermark') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-switch v-model="getThemeConfig.isWartermark" size="small" @change="onWartermarkChange"></el-switch>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt14">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourWartermarkText') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-input v-model="getThemeConfig.wartermarkText" size="default" style="width: 90px" @input="onWartermarkTextInput"></el-input>
+					</div>
+				</div>
+
+				<!-- 其它设置 -->
+				<el-divider content-position="left">{{ $t('message.layout.fiveTitle') }}</el-divider>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveTagsStyle') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-select v-model="getThemeConfig.tagsStyle" placeholder="请选择" size="default" style="width: 90px" @change="setLocalThemeConfig">
+							<el-option label="风格1" value="tags-style-one"></el-option>
+							<el-option label="风格4" value="tags-style-four"></el-option>
+							<el-option label="风格5" value="tags-style-five"></el-option>
+						</el-select>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveAnimation') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-select v-model="getThemeConfig.animation" placeholder="请选择" size="default" style="width: 90px" @change="setLocalThemeConfig">
+							<el-option label="slide-right" value="slide-right"></el-option>
+							<el-option label="slide-left" value="slide-left"></el-option>
+							<el-option label="opacitys" value="opacitys"></el-option>
+						</el-select>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveColumnsAsideStyle') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-select
+							v-model="getThemeConfig.columnsAsideStyle"
+							placeholder="请选择"
+							size="default"
+							style="width: 90px"
+							:disabled="getThemeConfig.layout !== 'columns' ? true : false"
+							@change="setLocalThemeConfig"
+						>
+							<el-option label="圆角" value="columns-round"></el-option>
+							<el-option label="卡片" value="columns-card"></el-option>
+						</el-select>
+					</div>
+				</div>
+				<div class="layout-breadcrumb-seting-bar-flex mt15 mb27" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
+					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveColumnsAsideLayout') }}</div>
+					<div class="layout-breadcrumb-seting-bar-flex-value">
+						<el-select
+							v-model="getThemeConfig.columnsAsideLayout"
+							placeholder="请选择"
+							size="default"
+							style="width: 90px"
+							:disabled="getThemeConfig.layout !== 'columns' ? true : false"
+							@change="setLocalThemeConfig"
+						>
+							<el-option label="水平" value="columns-horizontal"></el-option>
+							<el-option label="垂直" value="columns-vertical"></el-option>
+						</el-select>
+					</div>
+				</div>
+
+				<!-- 布局切换 -->
+				<el-divider content-position="left">{{ $t('message.layout.sixTitle') }}</el-divider>
+				<div class="layout-drawer-content-flex">
+					<!-- defaults 布局 -->
+					<div class="layout-drawer-content-item" @click="onSetLayout('defaults')">
+						<section class="el-container el-circular" :class="{ 'drawer-layout-active': getThemeConfig.layout === 'defaults' }">
+							<aside class="el-aside" style="width: 20px"></aside>
+							<section class="el-container is-vertical">
+								<header class="el-header" style="height: 10px"></header>
+								<main class="el-main"></main>
+							</section>
+						</section>
+						<div class="layout-tips-warp" :class="{ 'layout-tips-warp-active': getThemeConfig.layout === 'defaults' }">
+							<div class="layout-tips-box">
+								<p class="layout-tips-txt">{{ $t('message.layout.sixDefaults') }}</p>
+							</div>
+						</div>
+					</div>
+					<!-- classic 布局 -->
+					<div class="layout-drawer-content-item" @click="onSetLayout('classic')">
+						<section class="el-container is-vertical el-circular" :class="{ 'drawer-layout-active': getThemeConfig.layout === 'classic' }">
+							<header class="el-header" style="height: 10px"></header>
+							<section class="el-container">
+								<aside class="el-aside" style="width: 20px"></aside>
+								<section class="el-container is-vertical">
+									<main class="el-main"></main>
+								</section>
+							</section>
+						</section>
+						<div class="layout-tips-warp" :class="{ 'layout-tips-warp-active': getThemeConfig.layout === 'classic' }">
+							<div class="layout-tips-box">
+								<p class="layout-tips-txt">{{ $t('message.layout.sixClassic') }}</p>
+							</div>
+						</div>
+					</div>
+					<!-- transverse 布局 -->
+					<div class="layout-drawer-content-item" @click="onSetLayout('transverse')">
+						<section class="el-container is-vertical el-circular" :class="{ 'drawer-layout-active': getThemeConfig.layout === 'transverse' }">
+							<header class="el-header" style="height: 10px"></header>
+							<section class="el-container">
+								<section class="el-container is-vertical">
+									<main class="el-main"></main>
+								</section>
+							</section>
+						</section>
+						<div class="layout-tips-warp" :class="{ 'layout-tips-warp-active': getThemeConfig.layout === 'transverse' }">
+							<div class="layout-tips-box">
+								<p class="layout-tips-txt">{{ $t('message.layout.sixTransverse') }}</p>
+							</div>
+						</div>
+					</div>
+					<!-- columns 布局 -->
+					<div class="layout-drawer-content-item" @click="onSetLayout('columns')">
+						<section class="el-container el-circular" :class="{ 'drawer-layout-active': getThemeConfig.layout === 'columns' }">
+							<aside class="el-aside-dark" style="width: 10px"></aside>
+							<aside class="el-aside" style="width: 20px"></aside>
+							<section class="el-container is-vertical">
+								<header class="el-header" style="height: 10px"></header>
+								<main class="el-main"></main>
+							</section>
+						</section>
+						<div class="layout-tips-warp" :class="{ 'layout-tips-warp-active': getThemeConfig.layout === 'columns' }">
+							<div class="layout-tips-box">
+								<p class="layout-tips-txt">{{ $t('message.layout.sixColumns') }}</p>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="copy-config">
+					<el-alert :title="$t('message.layout.tipText')" type="warning" :closable="false"> </el-alert>
+					<el-button size="default" class="copy-config-btn" type="primary" ref="copyConfigBtnRef" @click="onCopyConfigClick">
+						<el-icon class="mr5">
+							<ele-CopyDocument />
+						</el-icon>
+						{{ $t('message.layout.copyText') }}
+					</el-button>
+					<el-button size="default" class="copy-config-btn-reset" type="info" @click="onResetConfigClick">
+						<el-icon class="mr5">
+							<ele-RefreshRight />
+						</el-icon>
+						{{ $t('message.layout.resetText') }}
+					</el-button>
+				</div>
+			</el-scrollbar>
+		</el-drawer>
+	</div>
+</template>
+
+<script setup lang="ts" name="layoutBreadcrumbSeting">
+import { nextTick, onUnmounted, onMounted, computed, reactive } from 'vue';
+import { ElMessage } from 'element-plus';
+import { useI18n } from 'vue-i18n';
+import { storeToRefs } from 'pinia';
+import { useThemeConfig } from '/@/stores/themeConfig';
+import { useChangeColor } from '/@/utils/theme';
+import { verifyAndSpace } from '/@/utils/toolsValidate';
+import { Local } from '/@/utils/storage';
+import Watermark from '/@/utils/watermark';
+import commonFunction from '/@/utils/commonFunction';
+import other from '/@/utils/other';
+import mittBus from '/@/utils/mitt';
+
+// 定义变量内容
+const { locale } = useI18n();
+const storesThemeConfig = useThemeConfig();
+const { themeConfig } = storeToRefs(storesThemeConfig);
+const { copyText } = commonFunction();
+const { getLightColor, getDarkColor } = useChangeColor();
+const state = reactive({
+	isMobile: false,
+});
+
+// 获取布局配置信息
+const getThemeConfig = computed(() => {
+	return themeConfig.value;
+});
+// 1、全局主题
+const onColorPickerChange = () => {
+	if (!getThemeConfig.value.primary) return ElMessage.warning('全局主题 primary 颜色值不能为空');
+	// 颜色加深
+	document.documentElement.style.setProperty('--el-color-primary-dark-2', `${getDarkColor(getThemeConfig.value.primary, 0.1)}`);
+	document.documentElement.style.setProperty('--el-color-primary', getThemeConfig.value.primary);
+	// 颜色变浅
+	for (let i = 1; i <= 9; i++) {
+		document.documentElement.style.setProperty(`--el-color-primary-light-${i}`, `${getLightColor(getThemeConfig.value.primary, i / 10)}`);
+	}
+	setDispatchThemeConfig();
+};
+// 2、菜单 / 顶栏
+const onBgColorPickerChange = (bg: string) => {
+	document.documentElement.style.setProperty(`--next-bg-${bg}`, themeConfig.value[bg]);
+	if (bg === 'menuBar') {
+		document.documentElement.style.setProperty(`--next-bg-menuBar-light-1`, getLightColor(getThemeConfig.value.menuBar, 0.05));
+	}
+	onTopBarGradualChange();
+	onMenuBarGradualChange();
+	onColumnsMenuBarGradualChange();
+	setDispatchThemeConfig();
+};
+// 2、菜单 / 顶栏 --> 顶栏背景渐变
+const onTopBarGradualChange = () => {
+	setGraduaFun('.layout-navbars-breadcrumb-index', getThemeConfig.value.isTopBarColorGradual, getThemeConfig.value.topBar);
+};
+// 2、菜单 / 顶栏 --> 菜单背景渐变
+const onMenuBarGradualChange = () => {
+	setGraduaFun('.layout-container .el-aside', getThemeConfig.value.isMenuBarColorGradual, getThemeConfig.value.menuBar);
+};
+// 2、菜单 / 顶栏 --> 分栏菜单背景渐变
+const onColumnsMenuBarGradualChange = () => {
+	setGraduaFun('.layout-container .layout-columns-aside', getThemeConfig.value.isColumnsMenuBarColorGradual, getThemeConfig.value.columnsMenuBar);
+};
+// 2、菜单 / 顶栏 --> 背景渐变函数
+const setGraduaFun = (el: string, bool: boolean, color: string) => {
+	nextTick(() => {
+		setTimeout(() => {
+			let els = document.querySelector(el);
+			if (!els) return false;
+			document.documentElement.style.setProperty('--el-menu-bg-color', document.documentElement.style.getPropertyValue('--next-bg-menuBar'));
+			if (bool) els.setAttribute('style', `background:linear-gradient(to bottom , ${color}, ${getLightColor(color, 0.5)})`);
+			else els.setAttribute('style', ``);
+			setLocalThemeConfig();
+		}, 300);
+	});
+};
+// 2、分栏设置 ->
+const onColumnsMenuHoverPreloadChange = () => {
+	setLocalThemeConfig();
+};
+// 3、界面设置 --> 菜单水平折叠
+const onThemeConfigChange = () => {
+	setDispatchThemeConfig();
+};
+// 3、界面设置 --> 固定 Header
+const onIsFixedHeaderChange = () => {
+	getThemeConfig.value.isFixedHeaderChange = getThemeConfig.value.isFixedHeader ? false : true;
+	setLocalThemeConfig();
+};
+// 3、界面设置 --> 经典布局分割菜单
+const onClassicSplitMenuChange = () => {
+	getThemeConfig.value.isBreadcrumb = false;
+	setLocalThemeConfig();
+	mittBus.emit('getBreadcrumbIndexSetFilterRoutes');
+};
+// 4、界面显示 --> 侧边栏 Logo
+const onIsShowLogoChange = () => {
+	getThemeConfig.value.isShowLogoChange = getThemeConfig.value.isShowLogo ? false : true;
+	setLocalThemeConfig();
+};
+// 4、界面显示 --> 面包屑 Breadcrumb
+const onIsBreadcrumbChange = () => {
+	if (getThemeConfig.value.layout === 'classic') {
+		getThemeConfig.value.isClassicSplitMenu = false;
+	}
+	setLocalThemeConfig();
+};
+// 4、界面显示 --> 开启 TagsView 拖拽
+const onSortableTagsViewChange = () => {
+	mittBus.emit('openOrCloseSortable');
+	setLocalThemeConfig();
+};
+// 4、界面显示 --> 开启 TagsView 共用
+const onShareTagsViewChange = () => {
+	mittBus.emit('openShareTagsView');
+	setLocalThemeConfig();
+};
+// 4、界面显示 --> 灰色模式/色弱模式
+const onAddFilterChange = (attr: string) => {
+	if (attr === 'grayscale') {
+		if (getThemeConfig.value.isGrayscale) getThemeConfig.value.isInvert = false;
+	} else {
+		if (getThemeConfig.value.isInvert) getThemeConfig.value.isGrayscale = false;
+	}
+	const cssAttr =
+		attr === 'grayscale' ? `grayscale(${getThemeConfig.value.isGrayscale ? 1 : 0})` : `invert(${getThemeConfig.value.isInvert ? '80%' : '0%'})`;
+	const appEle = document.body;
+	appEle.setAttribute('style', `filter: ${cssAttr}`);
+	setLocalThemeConfig();
+};
+// 4、界面显示 --> 深色模式
+const onAddDarkChange = () => {
+	const body = document.documentElement as HTMLElement;
+	if (getThemeConfig.value.isIsDark) body.setAttribute('data-theme', 'dark');
+	else body.setAttribute('data-theme', '');
+};
+// 4、界面显示 --> 开启水印
+const onWartermarkChange = () => {
+	getThemeConfig.value.isWartermark ? Watermark.set(getThemeConfig.value.wartermarkText) : Watermark.del();
+	setLocalThemeConfig();
+};
+// 4、界面显示 --> 水印文案
+const onWartermarkTextInput = (val: string) => {
+	getThemeConfig.value.wartermarkText = verifyAndSpace(val);
+	if (getThemeConfig.value.wartermarkText === '') return false;
+	if (getThemeConfig.value.isWartermark) Watermark.set(getThemeConfig.value.wartermarkText);
+	setLocalThemeConfig();
+};
+// 5、布局切换
+const onSetLayout = (layout: string) => {
+	Local.set('oldLayout', layout);
+	if (getThemeConfig.value.layout === layout) return false;
+	if (layout === 'transverse') getThemeConfig.value.isCollapse = false;
+	getThemeConfig.value.layout = layout;
+	getThemeConfig.value.isDrawer = false;
+	initLayoutChangeFun();
+};
+// 设置布局切换函数
+const initLayoutChangeFun = () => {
+	onBgColorPickerChange('menuBar');
+	onBgColorPickerChange('menuBarColor');
+	onBgColorPickerChange('menuBarActiveColor');
+	onBgColorPickerChange('topBar');
+	onBgColorPickerChange('topBarColor');
+	onBgColorPickerChange('columnsMenuBar');
+	onBgColorPickerChange('columnsMenuBarColor');
+};
+// 关闭弹窗时,初始化变量。变量用于处理 layoutScrollbarRef.value.update() 更新滚动条高度
+const onDrawerClose = () => {
+	getThemeConfig.value.isFixedHeaderChange = false;
+	getThemeConfig.value.isShowLogoChange = false;
+	getThemeConfig.value.isDrawer = false;
+	setLocalThemeConfig();
+};
+// 布局配置弹窗打开
+const openDrawer = () => {
+	getThemeConfig.value.isDrawer = true;
+};
+// 触发 store 布局配置更新
+const setDispatchThemeConfig = () => {
+	setLocalThemeConfig();
+	setLocalThemeConfigStyle();
+};
+// 存储布局配置
+const setLocalThemeConfig = () => {
+	Local.remove('themeConfig');
+	Local.set('themeConfig', getThemeConfig.value);
+};
+// 存储布局配置全局主题样式(html根标签)
+const setLocalThemeConfigStyle = () => {
+	Local.set('themeConfigStyle', document.documentElement.style.cssText);
+};
+// 一键复制配置
+const onCopyConfigClick = () => {
+	let copyThemeConfig = Local.get('themeConfig');
+	copyThemeConfig.isDrawer = false;
+	copyText(JSON.stringify(copyThemeConfig)).then(() => {
+		getThemeConfig.value.isDrawer = false;
+	});
+};
+// 一键恢复默认
+const onResetConfigClick = () => {
+	Local.clear();
+	window.location.reload();
+	// @ts-ignore
+	Local.set('version', __NEXT_VERSION__);
+};
+// 初始化菜单样式等
+const initSetStyle = () => {
+	// 2、菜单 / 顶栏 --> 顶栏背景渐变
+	onTopBarGradualChange();
+	// 2、菜单 / 顶栏 --> 菜单背景渐变
+	onMenuBarGradualChange();
+	// 2、菜单 / 顶栏 --> 分栏菜单背景渐变
+	onColumnsMenuBarGradualChange();
+};
+onMounted(() => {
+	nextTick(() => {
+		// 判断当前布局是否不相同,不相同则初始化当前布局的样式,防止监听窗口大小改变时,布局配置logo、菜单背景等部分布局失效问题
+		if (!Local.get('frequency')) initLayoutChangeFun();
+		Local.set('frequency', 1);
+		// 监听窗口大小改变,非默认布局,设置成默认布局(适配移动端)
+		mittBus.on('layoutMobileResize', (res: LayoutMobileResize) => {
+			getThemeConfig.value.layout = res.layout;
+			getThemeConfig.value.isDrawer = false;
+			initLayoutChangeFun();
+			state.isMobile = other.isMobile();
+		});
+		setTimeout(() => {
+			// 默认样式
+			onColorPickerChange();
+			// 灰色模式
+			if (getThemeConfig.value.isGrayscale) onAddFilterChange('grayscale');
+			// 色弱模式
+			if (getThemeConfig.value.isInvert) onAddFilterChange('invert');
+			// 深色模式
+			if (getThemeConfig.value.isIsDark) onAddDarkChange();
+			// 开启水印
+			onWartermarkChange();
+			// 语言国际化
+			if (Local.get('themeConfig')) locale.value = Local.get('themeConfig').globalI18n;
+			// 初始化菜单样式等
+			initSetStyle();
+		}, 100);
+	});
+});
+onUnmounted(() => {
+	mittBus.off('layoutMobileResize', () => {});
+});
+
+// 暴露变量
+defineExpose({
+	openDrawer,
+});
+</script>
+
+<style scoped lang="scss">
+.layout-breadcrumb-seting-bar {
+	height: calc(100vh - 50px);
+	padding: 0 15px;
+	:deep(.el-scrollbar__view) {
+		overflow-x: hidden !important;
+	}
+	.layout-breadcrumb-seting-bar-flex {
+		display: flex;
+		align-items: center;
+		margin-bottom: 5px;
+		&-label {
+			flex: 1;
+			color: var(--el-text-color-primary);
+		}
+	}
+	.layout-drawer-content-flex {
+		overflow: hidden;
+		display: flex;
+		flex-wrap: wrap;
+		align-content: flex-start;
+		margin: 0 -5px;
+		.layout-drawer-content-item {
+			width: 50%;
+			height: 70px;
+			cursor: pointer;
+			border: 1px solid transparent;
+			position: relative;
+			padding: 5px;
+			.el-container {
+				height: 100%;
+				.el-aside-dark {
+					background-color: var(--next-color-seting-header);
+				}
+				.el-aside {
+					background-color: var(--next-color-seting-aside);
+				}
+				.el-header {
+					background-color: var(--next-color-seting-header);
+				}
+				.el-main {
+					background-color: var(--next-color-seting-main);
+				}
+			}
+			.el-circular {
+				border-radius: 2px;
+				overflow: hidden;
+				border: 1px solid transparent;
+				transition: all 0.3s ease-in-out;
+			}
+			.drawer-layout-active {
+				border: 1px solid;
+				border-color: var(--el-color-primary);
+			}
+			.layout-tips-warp,
+			.layout-tips-warp-active {
+				transition: all 0.3s ease-in-out;
+				position: absolute;
+				left: 50%;
+				top: 50%;
+				transform: translate(-50%, -50%);
+				border: 1px solid;
+				border-color: var(--el-color-primary-light-5);
+				border-radius: 100%;
+				padding: 4px;
+				.layout-tips-box {
+					transition: inherit;
+					width: 30px;
+					height: 30px;
+					z-index: 9;
+					border: 1px solid;
+					border-color: var(--el-color-primary-light-5);
+					border-radius: 100%;
+					.layout-tips-txt {
+						transition: inherit;
+						position: relative;
+						top: 5px;
+						font-size: 12px;
+						line-height: 1;
+						letter-spacing: 2px;
+						white-space: nowrap;
+						color: var(--el-color-primary-light-5);
+						text-align: center;
+						transform: rotate(30deg);
+						left: -1px;
+						background-color: var(--next-color-seting-main);
+						width: 32px;
+						height: 17px;
+						line-height: 17px;
+					}
+				}
+			}
+			.layout-tips-warp-active {
+				border: 1px solid;
+				border-color: var(--el-color-primary);
+				.layout-tips-box {
+					border: 1px solid;
+					border-color: var(--el-color-primary);
+					.layout-tips-txt {
+						color: var(--el-color-primary) !important;
+						background-color: var(--next-color-seting-main) !important;
+					}
+				}
+			}
+			&:hover {
+				.el-circular {
+					transition: all 0.3s ease-in-out;
+					border: 1px solid;
+					border-color: var(--el-color-primary);
+				}
+				.layout-tips-warp {
+					transition: all 0.3s ease-in-out;
+					border-color: var(--el-color-primary);
+					.layout-tips-box {
+						transition: inherit;
+						border-color: var(--el-color-primary);
+						.layout-tips-txt {
+							transition: inherit;
+							color: var(--el-color-primary) !important;
+							background-color: var(--next-color-seting-main) !important;
+						}
+					}
+				}
+			}
+		}
+	}
+	.copy-config {
+		margin: 10px 0;
+		.copy-config-btn {
+			width: 100%;
+			margin-top: 15px;
+		}
+		.copy-config-btn-reset {
+			width: 100%;
+			margin: 10px 0 0;
+		}
+	}
+}
+</style>

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません