diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 8fc97863ce84dc537b4edcd5b7d48e9b62c89146..d9799257a47f942971cd97eb392aa3ec9a56b12d 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -17,6 +17,7 @@
 "MaybeRefOrGetter": true,
 "PropType": true,
 "Ref": true,
+ "ShallowRef": true,
 "Slot": true,
 "Slots": true,
 "VNode": true,
@@ -54,6 +55,7 @@
 "getActivePinia": true,
 "getCurrentInstance": true,
 "getCurrentScope": true,
+ "getCurrentWatcher": true,
 "h": true,
 "ignorableWatch": true,
 "inject": true,
@@ -63,6 +65,7 @@
 "isReactive": true,
 "isReadonly": true,
 "isRef": true,
+ "isShallow": true,
 "makeDestructurable": true,
 "mapActions": true,
 "mapGetters": true,
@@ -106,11 +109,11 @@
 "refAutoReset": true,
 "refDebounced": true,
 "refDefault": true,
+ "refManualReset": true,
 "refThrottled": true,
 "refWithControl": true,
 "resolveComponent": true,
 "resolveRef": true,
- "resolveUnref": true,
 "setActivePinia": true,
 "setMapStoreSuffix": true,
 "shallowReactive": true,
@@ -168,6 +171,7 @@
 "useCountdown": true,
 "useCounter": true,
 "useCssModule": true,
+ "useCssSupports": true,
 "useCssVar": true,
 "useCssVars": true,
 "useCurrentElement": true,
diff --git a/README.md b/README.md
index 1c89bf95f18852950fbb7e0e24b39f1e6cf87ca9..b0152d13de76a533feaa6e33d7216a0988937f67 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 ## 平台简介
 
 - 本仓库为前端技术栈 [Vue3](https://v3.cn.vuejs.org) + [TS](https://www.typescriptlang.org/) + [Element Plus](https://element-plus.org/zh-CN) + [Vite](https://cn.vitejs.dev) 版本。
-- 成员项目: 基于 vben5(ant-design-vue) 的前端项目 [ruoyi-plus-vben5](https://gitee.com/dapppp/ruoyi-plus-vben5)
+- 成员项目: 基于 vben5(ant-design-vue) 的前端项目 [ruoyi-plus-vben5](https://github.com/imdap/ruoyi-plus-vben5)
 - 成员项目: 基于soybean 的前端项目 [ruoyi-plus-soybean](https://gitee.com/xlsea/ruoyi-plus-soybean)
 
 ## 配套后端代码仓库地址
diff --git a/package.json b/package.json
index 478c18ba82ef5924a797314ca57ed60694f39c95..cf44b03036a8b08c484017b380e1852a2be4e163 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 "$schema": "https://json.schemastore.org/package",
 "name": "ruoyi-vue-plus",
- "version": "5.5.3-2.5.3",
+ "version": "5.6.0-2.6.0",
 "description": "RuoYi-Vue-Plus多租户管理系统",
 "author": "LionLi",
 "license": "MIT",
@@ -23,68 +23,67 @@
 "@element-plus/icons-vue": "2.3.2",
 "@highlightjs/vue-plugin": "2.1.2",
 "@vueup/vue-quill": "1.2.0",
- "@vueuse/core": "13.9.0",
+ "@vueuse/core": "14.2.1",
 "animate.css": "4.1.1",
 "await-to-js": "3.0.0",
- "axios": "1.13.1",
+ "axios": "1.13.6",
 "crypto-js": "4.2.0",
- "echarts": "5.6.0",
- "element-plus": "2.11.7",
+ "echarts": "6.0.0",
+ "element-plus": "2.13.5",
 "file-saver": "2.0.5",
 "highlight.js": "11.11.1",
 "image-conversion": "2.1.1",
 "js-cookie": "3.0.5",
 "jsencrypt": "3.5.4",
 "nprogress": "0.2.0",
- "pinia": "3.0.3",
+ "pinia": "3.0.4",
 "screenfull": "6.0.2",
- "vue": "3.5.22",
+ "vue": "3.5.30",
 "vue-cropper": "1.1.4",
- "vue-i18n": "11.1.12",
+ "vue-i18n": "11.3.0",
 "vue-json-pretty": "2.6.0",
- "vue-router": "4.6.3",
+ "vue-router": "5.0.3",
 "vue-types": "6.0.0",
- "vxe-table": "4.17.7"
+ "vxe-table": "4.18.1"
 },
 "devDependencies": {
- "@iconify/json": "^2.2.403",
+ "@iconify/json": "^2.2.448",
 "@types/crypto-js": "4.2.2",
 "@types/file-saver": "2.0.7",
 "@types/js-cookie": "3.0.6",
- "@types/node": "^22.19.0",
+ "@types/node": "^25.4.0",
 "@types/nprogress": "0.2.3",
- "@unocss/preset-attributify": "66.5.4",
- "@unocss/preset-icons": "66.5.4",
- "@unocss/preset-uno": "66.5.4",
- "@vitejs/plugin-vue": "5.2.4",
- "@vue/compiler-sfc": "3.5.22",
+ "@unocss/preset-attributify": "66.6.6",
+ "@unocss/preset-icons": "66.6.6",
+ "@unocss/preset-uno": "66.6.6",
+ "@vitejs/plugin-vue": "6.0.4",
+ "@vue/compiler-sfc": "3.5.30",
 "@vue/eslint-config-prettier": "10.2.0",
 "@vue/eslint-config-typescript": "14.6.0",
- "autoprefixer": "10.4.21",
+ "autoprefixer": "10.4.27",
 "eslint": "9.39.1",
- "eslint-plugin-prettier": "5.5.4",
+ "eslint-plugin-prettier": "5.5.5",
 "eslint-plugin-vue": "9.33.0",
- "globals": "16.5.0",
- "prettier": "3.6.2",
- "sass": "1.93.3",
+ "globals": "17.4.0",
+ "prettier": "3.8.1",
+ "sass": "1.98.0",
 "typescript": "~5.9.3",
- "unocss": "66.5.4",
- "unplugin-auto-import": "19.3.0",
- "unplugin-icons": "22.5.0",
- "unplugin-vue-components": "28.8.0",
+ "unocss": "66.6.6",
+ "unplugin-auto-import": "21.0.0",
+ "unplugin-icons": "23.0.1",
+ "unplugin-vue-components": "31.0.0",
 "unplugin-vue-setup-extend-plus": "1.0.1",
- "vite": "6.4.1",
- "vite-plugin-compression": "0.5.1",
+ "vite": "7.3.1",
 "vite-plugin-svg-icons-ng": "^1.5.2",
- "vite-plugin-vue-devtools": "8.0.3",
- "vitest": "3.2.4",
- "vue-tsc": "^2.2.12"
+ "vite-plugin-vue-devtools": "8.0.7",
+ "vitest": "4.0.18",
+ "vue-tsc": "^3.2.5"
 },
 "overrides": {
- "quill": "2.0.2"
+ "quill": "1.3.7"
 },
 "engines": {
- "node": ">=20.15.0",
+ "node": ">=20.19.0",
 "npm": ">=8.19.0"
 },
 "browserslist": [
diff --git a/src/api/workflow/task/types.ts b/src/api/workflow/task/types.ts
index e3c9abfc1535cf4ce88ff7ced060353d2215506a..482bd33830c6bf08404d23f8e73ffc1e7d6dcb54 100644
--- a/src/api/workflow/task/types.ts
+++ b/src/api/workflow/task/types.ts
@@ -43,7 +43,7 @@ export interface ButtonList {
 }
 export interface FlowCopyVo {
 userId: string | number;
- userName: string;
+ nickName: string;
 }
 
 export interface TaskOperationBo {
@@ -53,6 +53,8 @@ export interface TaskOperationBo {
 userIds?: string[];
 //任务ID(必填)
 taskId: string | number;
+ //消息类型
+ messageType?: string[];
 //意见或备注信息(可选)
 message?: string;
 }
diff --git a/src/assets/styles/btn.scss b/src/assets/styles/btn.scss
index d614f2fd2cbe02cc2e6c0439564bad2116ef9955..13a464a46d9f4e61aa3c0be858fc723e82ce3c72 100644
--- a/src/assets/styles/btn.scss
+++ b/src/assets/styles/btn.scss
@@ -45,7 +45,7 @@
 font-size: 14px;
 color: #fff;
 padding: 14px 36px;
- border-radius: 8px;
+ border-radius: var(--app-radius-md);
 border: none;
 outline: none;
 transition: 600ms ease all;
@@ -95,5 +95,5 @@
 margin: 0;
 padding: 10px 15px;
 font-size: 14px;
- border-radius: 4px;
+ border-radius: var(--app-radius-sm);
 }
diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss
index e38c7035b6b559947050a02422140bcd4578a19d..106a64710047333d8d96d106e311b326efdf7b1e 100644
--- a/src/assets/styles/element-ui.scss
+++ b/src/assets/styles/element-ui.scss
@@ -74,6 +74,9 @@
 
 .el-dialog {
 margin: 0 auto !important;
+ border-radius: var(--app-radius-lg);
+ box-shadow: var(--app-shadow-md);
+ overflow: hidden;
 
 .el-dialog__body {
 padding: 15px !important;
@@ -108,6 +111,8 @@
 
 // dropdown
 .el-dropdown-menu {
+ border-radius: var(--app-radius-md);
+ box-shadow: var(--app-shadow-sm);
 a {
 display: block;
 }
@@ -151,3 +156,122 @@
 .el-message-box .el-message-box__message {
 word-break: break-word;
 }
+
+.el-message-box {
+ border-radius: var(--app-radius-lg);
+ box-shadow: var(--app-shadow-md);
+}
+
+.el-message,
+.el-notification,
+.el-alert {
+ border-radius: var(--app-radius-md);
+ box-shadow: var(--app-shadow-sm);
+}
+
+// Modern rounded inputs
+.el-input__wrapper,
+.el-textarea__inner,
+.el-select__wrapper,
+.el-date-editor,
+.el-range-editor,
+.el-input-number,
+.el-input-number__decrease,
+.el-input-number__increase {
+ border-radius: var(--app-radius-md);
+ transition: box-shadow 0.2s ease, border-color 0.2s ease, background-color 0.2s ease;
+}
+
+.el-input__wrapper.is-focus,
+.el-textarea__inner:focus,
+.el-select__wrapper.is-focus,
+.el-date-editor.is-focus,
+.el-range-editor.is-focus {
+ box-shadow: 0 0 0 2px var(--el-color-primary-light-8);
+}
+
+// Buttons
+.el-button {
+ border-radius: var(--app-radius-md);
+ transition: transform 0.15s ease, box-shadow 0.2s ease, background-color 0.2s ease, border-color 0.2s ease;
+}
+
+.el-button:not(.is-text):not(.is-link):hover {
+ transform: translateY(-1px);
+ box-shadow: var(--app-shadow-sm);
+}
+
+// Tags and badges
+.el-tag {
+ border-radius: var(--app-radius-md);
+}
+
+// Cards, popovers, drawers
+.el-popover,
+.el-tooltip__popper,
+.el-popper {
+ border-radius: var(--app-radius-md);
+ box-shadow: var(--app-shadow-sm);
+}
+
+.el-drawer {
+ border-radius: var(--app-radius-lg);
+ box-shadow: var(--app-shadow-md);
+}
+
+.el-drawer__header {
+ margin-bottom: 0;
+ padding: 16px 20px;
+ border-bottom: 1px solid var(--el-border-color-light);
+}
+
+// Table polish
+.el-table {
+ border-radius: var(--app-radius-lg);
+ overflow: hidden;
+ box-shadow: var(--app-shadow-sm);
+ border: 1px solid var(--el-border-color-lighter);
+}
+
+.el-table__header-wrapper,
+.el-table__body-wrapper {
+ background: var(--el-bg-color);
+}
+
+.el-table__row:hover td.el-table__cell {
+ background-color: var(--el-fill-color-light) !important;
+}
+
+// Tabs
+.el-tabs__header {
+ margin: 0 0 12px 0;
+}
+
+.el-tabs__item {
+ border-radius: var(--app-radius-md);
+ margin: 0 2px;
+}
+
+.el-tabs__nav-wrap::after {
+ background-color: var(--el-border-color-lighter);
+}
+
+// Pagination
+.el-pagination .btn-prev,
+.el-pagination .btn-next,
+.el-pagination .el-pager li {
+ border-radius: var(--app-radius-sm);
+ transition: background-color 0.2s ease, color 0.2s ease, box-shadow 0.2s ease;
+}
+
+.el-pagination .el-pager li.is-active {
+ box-shadow: var(--app-shadow-sm);
+}
+
+// Breadcrumb
+.el-breadcrumb {
+ padding: 0;
+ background: transparent;
+ border: none;
+ border-radius: 0;
+}
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 7228c52fedfd0e62d0f954ef3a2de903be573db1..bd853d4e253d490f5eb5728d31cebcb50894d8b3 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -14,18 +14,20 @@ body {
 -moz-osx-font-smoothing: grayscale;
 -webkit-font-smoothing: antialiased;
 text-rendering: optimizeLegibility;
+ background: var(--el-bg-color-page);
 font-family:
- Helvetica Neue,
- Helvetica,
- PingFang SC,
- Hiragino Sans GB,
- Microsoft YaHei,
- Arial,
+ 'MiSans',
+ 'HarmonyOS Sans SC',
+ 'PingFang SC',
+ 'Source Han Sans SC',
+ 'Noto Sans SC',
+ 'Hiragino Sans GB',
+ 'Microsoft YaHei',
 sans-serif;
 }
 
 label {
- font-weight: 700;
+ font-weight: 600;
 }
 
 html {
@@ -116,11 +118,18 @@ aside {
 background: #eef1f6;
 padding: 8px 24px;
 margin-bottom: 20px;
- border-radius: 2px;
+ border-radius: var(--app-radius-md);
 display: block;
 line-height: 32px;
 font-size: 16px;
- font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
+ font-family:
+ 'MiSans',
+ 'HarmonyOS Sans SC',
+ 'PingFang SC',
+ 'Source Han Sans SC',
+ 'Noto Sans SC',
+ 'Hiragino Sans GB',
+ 'Microsoft YaHei',
 sans-serif;
 color: #2c3e50;
 -webkit-font-smoothing: antialiased;
@@ -139,21 +148,27 @@ aside {
 //main-container全局样式
 .app-container {
 padding: 20px;
+ background: var(--app-surface-bg);
+ border: 1px solid var(--app-surface-border);
+ border-radius: var(--app-radius-lg);
+ box-shadow: var(--app-shadow-sm);
 }
 
 // search面板样式
 .panel,
 .search {
 margin-bottom: 0.75rem;
- border-radius: 0.25rem;
+ border-radius: var(--app-radius-lg);
 border: 1px solid var(--el-border-color-light);
 background-color: var(--el-bg-color-overlay);
 padding: 0.75rem;
- transition: all ease 0.3s;
+ box-shadow: 0 0 0 rgba(0, 0, 0, 0);
+ transition: box-shadow 0.2s ease, transform 0.2s ease, border-color 0.2s ease;
 
 &:hover {
- box-shadow: 0 2px 12px #0000001a;
- transition: all ease 0.3s;
+ box-shadow: var(--app-shadow-sm);
+ border-color: var(--el-border-color);
+ transform: translateY(-1px);
 }
 }
 
diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index 952601784349d31b6b52f3006caf6a97974cdace..d50f46f8d9adcf61915b0c7d0385c73ba410e39e 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -74,7 +74,7 @@ h6 {
 }
 
 .el-form .el-form-item__label {
- font-weight: 700;
+ font-weight: 600;
 }
 .el-dialog:not(.is-fullscreen) {
 margin-top: 6vh !important;
@@ -127,7 +127,7 @@ h6 {
 margin-top: 5px;
 border: 1px solid #e5e6e7;
 background: #ffffff none;
- border-radius: 4px;
+ border-radius: var(--app-radius-md);
 width: 100%;
 }
 
@@ -190,12 +190,27 @@ h6 {
 .el-card__header {
 padding: 14px 15px 7px !important;
 min-height: 40px;
+ background: var(--el-fill-color-blank);
+ border-bottom: 1px solid var(--el-border-color-light);
 }
 
 .el-card__body {
 padding: 15px 20px 20px 20px !important;
 }
 
+.el-card {
+ border-radius: var(--app-radius-lg);
+ box-shadow: var(--app-shadow-sm);
+ border-color: var(--el-border-color-lighter);
+ overflow: hidden;
+ transition: box-shadow 0.2s ease, transform 0.2s ease;
+}
+
+.el-card:hover {
+ box-shadow: var(--app-shadow-md);
+ transform: translateY(-1px);
+}
+
 .card-box {
 margin-bottom: 10px;
 }
@@ -282,3 +297,9 @@ h6 {
 .top-right-btn {
 margin-left: auto;
 }
+
+/* horizontal el menu */
+.el-menu--horizontal .el-menu-item .svg-icon + span,
+.el-menu--horizontal .el-sub-menu__title .svg-icon + span {
+ margin-left: 3px;
+}
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index 6ffcd336581f14dbb06726f921f351cc13b20e38..534582eee50fb97dd23c32b746fded26ee0fbcac 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -6,6 +6,7 @@
 transition: margin-left 0.28s;
 margin-left: $base-sidebar-width;
 position: relative;
+ background: var(--el-bg-color-page);
 }
 
 .sidebarHide {
@@ -88,7 +89,7 @@
 // menu hover
 .theme-dark .sub-menu-title-noDropdown,
 .theme-dark .el-sub-menu__title {
- border-radius: 8px;
+ border-radius: var(--app-radius-md);
 margin: 1px 5px 1px 5px;
 &:hover {
 background-color: $base-sub-menu-title-hover !important;
@@ -96,7 +97,7 @@
 }
 .sub-menu-title-noDropdown,
 .el-sub-menu__title {
- border-radius: 8px;
+ border-radius: var(--app-radius-md);
 margin: 1px 5px 1px 5px;
 &:hover {
 background-color: rgba(0, 0, 0, 0.05) !important;
@@ -110,7 +111,7 @@
 & .nest-menu .el-sub-menu> .el-sub-menu__title,
 & .el-sub-menu .el-menu-item {
 min-width: calc($base-sidebar-width - 20px) !important;
- border-radius: 8px;
+ border-radius: var(--app-radius-md);
 height: 45px;
 margin: 1px 5px 1px 5px;
 &:not(.is-active):hover {
@@ -121,7 +122,7 @@
 & .theme-dark .nest-menu .el-sub-menu> .el-sub-menu__title,
 & .theme-dark .el-sub-menu .el-menu-item {
 background-color: $base-sub-menu-background !important;
- border-radius: 8px;
+ border-radius: var(--app-radius-md);
 height: 45px;
 margin: 1px 5px 1px 5px;
 
@@ -137,7 +138,7 @@
 
 & .theme-dark .nest-menu .el-sub-menu> .el-sub-menu__title,
 & .theme-dark .el-menu-item {
- border-radius: 8px;
+ border-radius: var(--app-radius-md);
 height: 45px;
 margin: 1px 5px 1px 5px;
 
@@ -153,7 +154,7 @@
 
 & .nest-menu .el-sub-menu> .el-sub-menu__title,
 & .el-menu-item {
- border-radius: 8px;
+ border-radius: var(--app-radius-md);
 height: 45px;
 margin: 1px 5px 1px 5px;
 
@@ -196,9 +197,9 @@
 
 & .el-sub-menu {
 overflow: hidden;
- border-radius: 8px;
+ border-radius: var(--app-radius-md);
 .el-sub-menu__title.el-tooltip__trigger {
- border-radius: 8px;
+ border-radius: var(--app-radius-md);
 height: 45px;
 }
 
@@ -286,11 +287,11 @@
 }
 // 收起菜单后悬浮的菜单样式
 .el-popper.is-pure{
- border-radius: 8px;
+ border-radius: var(--app-radius-md);
 .el-menu--popup{
- border-radius: 8px;
+ border-radius: var(--app-radius-md);
 }
 .el-menu-item{
- border-radius: 4px;
+ border-radius: var(--app-radius-sm);
 }
 }
diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss
index 8f9c4bd9cc34de7bf82fff4c5eddca2c0159eb75..1c9db81b2bb16c536150253fd855e882a0d9a98d 100644
--- a/src/assets/styles/variables.module.scss
+++ b/src/assets/styles/variables.module.scss
@@ -25,6 +25,24 @@
 // 添加 tag 相关变量
 --tags-view-active-bg: var(--el-color-primary);
 --tags-view-active-border-color: var(--el-color-primary);
+
+ // Modern rounded style + soft shadows
+ --app-radius-sm: 6px;
+ --app-radius-md: 10px;
+ --app-radius-lg: 14px;
+ --app-shadow-sm: 0 1px 2px rgba(15, 23, 42, 0.08), 0 6px 16px rgba(15, 23, 42, 0.08);
+ --app-shadow-md: 0 8px 24px rgba(15, 23, 42, 0.12);
+ --app-shadow-lg: 0 12px 32px rgba(15, 23, 42, 0.16);
+ --app-surface-bg: #ffffff;
+ --app-surface-border: var(--el-border-color-lighter);
+
+ // Element Plus tokens
+ --el-border-radius-base: var(--app-radius-md);
+ --el-border-radius-small: var(--app-radius-sm);
+ --el-border-radius-round: 999px;
+ --el-box-shadow-light: var(--app-shadow-sm);
+ --el-box-shadow: var(--app-shadow-md);
+ --el-bg-color-page: #f5f7fb;
 }
 
 html.dark {
@@ -48,8 +66,103 @@ html.dark {
 }
 
 .el-button--primary {
- --el-button-bg-color: var(--el-color-primary-dark-6);
- --el-button-border-color: var(--el-color-primary-light-2);
+ --el-button-bg-color: #2b6bd3;
+ --el-button-border-color: #3a7be8;
+ --el-button-text-color: #eef4ff;
+ --el-button-hover-bg-color: #3a7be8;
+ --el-button-hover-border-color: #3a7be8;
+ --el-button-active-bg-color: #255fb8;
+ --el-button-active-border-color: #255fb8;
+ }
+
+ .el-button--primary.is-plain {
+ --el-button-bg-color: rgba(43, 107, 211, 0.12);
+ --el-button-border-color: rgba(58, 123, 232, 0.5);
+ --el-button-text-color: #dbe8ff;
+ --el-button-hover-bg-color: rgba(58, 123, 232, 0.2);
+ --el-button-hover-border-color: rgba(58, 123, 232, 0.7);
+ --el-button-active-bg-color: rgba(43, 107, 211, 0.28);
+ --el-button-active-border-color: rgba(43, 107, 211, 0.8);
+ }
+
+ .el-button--success {
+ --el-button-bg-color: #1f8a5a;
+ --el-button-border-color: #29a46d;
+ --el-button-text-color: #eefaf4;
+ --el-button-hover-bg-color: #29a46d;
+ --el-button-hover-border-color: #29a46d;
+ --el-button-active-bg-color: #1b784f;
+ --el-button-active-border-color: #1b784f;
+ }
+
+ .el-button--success.is-plain {
+ --el-button-bg-color: rgba(31, 138, 90, 0.12);
+ --el-button-border-color: rgba(41, 164, 109, 0.5);
+ --el-button-text-color: #dbf6e8;
+ --el-button-hover-bg-color: rgba(41, 164, 109, 0.2);
+ --el-button-hover-border-color: rgba(41, 164, 109, 0.7);
+ --el-button-active-bg-color: rgba(31, 138, 90, 0.28);
+ --el-button-active-border-color: rgba(31, 138, 90, 0.8);
+ }
+
+ .el-button--warning {
+ --el-button-bg-color: #b87922;
+ --el-button-border-color: #d6953b;
+ --el-button-text-color: #fff7e6;
+ --el-button-hover-bg-color: #d6953b;
+ --el-button-hover-border-color: #d6953b;
+ --el-button-active-bg-color: #a56c1d;
+ --el-button-active-border-color: #a56c1d;
+ }
+
+ .el-button--warning.is-plain {
+ --el-button-bg-color: rgba(184, 121, 34, 0.12);
+ --el-button-border-color: rgba(214, 149, 59, 0.5);
+ --el-button-text-color: #ffecc8;
+ --el-button-hover-bg-color: rgba(214, 149, 59, 0.2);
+ --el-button-hover-border-color: rgba(214, 149, 59, 0.7);
+ --el-button-active-bg-color: rgba(184, 121, 34, 0.28);
+ --el-button-active-border-color: rgba(184, 121, 34, 0.8);
+ }
+
+ .el-button--danger {
+ --el-button-bg-color: #b24a4a;
+ --el-button-border-color: #d16060;
+ --el-button-text-color: #ffecec;
+ --el-button-hover-bg-color: #d16060;
+ --el-button-hover-border-color: #d16060;
+ --el-button-active-bg-color: #9c3f3f;
+ --el-button-active-border-color: #9c3f3f;
+ }
+
+ .el-button--danger.is-plain {
+ --el-button-bg-color: rgba(178, 74, 74, 0.12);
+ --el-button-border-color: rgba(209, 96, 96, 0.5);
+ --el-button-text-color: #ffd6d6;
+ --el-button-hover-bg-color: rgba(209, 96, 96, 0.2);
+ --el-button-hover-border-color: rgba(209, 96, 96, 0.7);
+ --el-button-active-bg-color: rgba(178, 74, 74, 0.28);
+ --el-button-active-border-color: rgba(178, 74, 74, 0.8);
+ }
+
+ .el-button--info {
+ --el-button-bg-color: #4b5563;
+ --el-button-border-color: #667085;
+ --el-button-text-color: #f3f4f6;
+ --el-button-hover-bg-color: #667085;
+ --el-button-hover-border-color: #667085;
+ --el-button-active-bg-color: #3f4753;
+ --el-button-active-border-color: #3f4753;
+ }
+
+ .el-button--info.is-plain {
+ --el-button-bg-color: rgba(75, 85, 99, 0.16);
+ --el-button-border-color: rgba(102, 112, 133, 0.55);
+ --el-button-text-color: #e5e7eb;
+ --el-button-hover-bg-color: rgba(102, 112, 133, 0.22);
+ --el-button-hover-border-color: rgba(102, 112, 133, 0.75);
+ --el-button-active-bg-color: rgba(75, 85, 99, 0.3);
+ --el-button-active-border-color: rgba(75, 85, 99, 0.85);
 }
 
 .el-switch {
@@ -62,9 +175,41 @@ html.dark {
 --el-tag-border-color: var(--el-color-primary-light-2);
 }
 
+ .el-tag--success {
+ --el-tag-bg-color: rgba(31, 138, 90, 0.18);
+ --el-tag-border-color: rgba(41, 164, 109, 0.6);
+ --el-tag-text-color: #c7f2df;
+ }
+
+ .el-tag--warning {
+ --el-tag-bg-color: rgba(184, 121, 34, 0.18);
+ --el-tag-border-color: rgba(214, 149, 59, 0.6);
+ --el-tag-text-color: #ffe6bb;
+ }
+
+ .el-tag--danger {
+ --el-tag-bg-color: rgba(178, 74, 74, 0.18);
+ --el-tag-border-color: rgba(209, 96, 96, 0.6);
+ --el-tag-text-color: #ffd0d0;
+ }
+
+ .el-tag--info {
+ --el-tag-bg-color: rgba(75, 85, 99, 0.18);
+ --el-tag-border-color: rgba(102, 112, 133, 0.6);
+ --el-tag-text-color: #e5e7eb;
+ }
+
 // 在深色模式下使用更深的颜色
 --tags-view-active-bg: var(--el-color-primary-dark-6);
 --tags-view-active-border-color: var(--el-color-primary-light-2);
+
+ // Modern rounded style + soft shadows (dark)
+ --app-shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.28), 0 8px 18px rgba(0, 0, 0, 0.25);
+ --app-shadow-md: 0 10px 26px rgba(0, 0, 0, 0.35);
+ --app-shadow-lg: 0 14px 34px rgba(0, 0, 0, 0.4);
+ --app-surface-bg: #151922;
+ --app-surface-border: var(--el-border-color);
+ --el-bg-color-page: #0f1115;
 // vxe-table 主题
 --vxe-font-color: #98989e;
 --vxe-primary-color: #2c7ecf;
@@ -137,4 +282,4 @@ $base-sidebar-width: 200px;
 dangerColor: $--color-danger;
 infoColor: $--color-info;
 warningColor: $--color-warning;
-}
\ No newline at end of file
+}
diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue
index 67394aae49b2d75ef72867fd689c23d6191c543c..f21ef2e236150a4b8a955398459b2a914b4193d3 100644
--- a/src/components/Editor/index.vue
+++ b/src/components/Editor/index.vue
@@ -1,15 +1,13 @@
 <template>
 <div>
 <el-upload - v-if="type === 'url'" - :action="upload.url" + v-if="type" + action="/index.cgi/contrast/https://gitee.com/JavaLionLi/plus-ui/pulls/" :before-upload="handleBeforeUpload" - :on-success="handleUploadSuccess" - :on-error="handleUploadError" + :http-request="handleUploadRequest" name="file" :show-file-list="false" - :headers="upload.headers">
 
 </el-upload>
@@ -31,7 +29,7 @@ import '@vueup/vue-quill/dist/vue-quill.snow.css';
 
 import { QuillEditor, Quill } from '@vueup/vue-quill';
 import { propTypes } from '@/utils/propTypes';
-import { globalHeaders } from '@/utils/request';
+import type { UploadRequestHandler, UploadRequestOptions } from 'element-plus';
 
 defineEmits(['update:modelValue']);
 
@@ -47,15 +45,11 @@ const props = defineProps({
 /* 上传文件大小限制(MB) */
 fileSize: propTypes.number.def(5),
 /* 类型(base64格式、url格式) */
- type: propTypes.string.def('url')
+ type: propTypes.string.def('base64')
 });
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
-const upload = reactive<uploadoption>({
- headers: globalHeaders(),
- url: import.meta.env.VITE_APP_BASE_API + '/resource/oss/upload'
-});
 const quillEditorRef = ref();
 const uploadRef = ref<htmldivelement>();
 
@@ -116,28 +110,9 @@ watch(
 { immediate: true }
 );
 
-// 图片上传成功返回图片地址
-const handleUploadSuccess = (res: any) => {
- // 如果上传成功
- if (res.code === 200) {
- // 获取富文本实例
- const quill = toRaw(quillEditorRef.value).getQuill();
- // 获取光标位置
- const length = quill.selection.savedRange.index;
- // 插入图片,res为服务器返回的图片链接地址
- quill.insertEmbed(length, 'image', res.data.url);
- // 调整光标到最后
- quill.setSelection(length + 1);
- proxy?.$modal.closeLoading();
- } else {
- proxy?.$modal.msgError('图片插入失败');
- proxy?.$modal.closeLoading();
- }
-};
-
 // 图片上传前拦截
 const handleBeforeUpload = (file: any) => {
- const type = ['image/jpeg', 'image/jpg', 'image/png', 'image/svg'];
+ const type = ['image/jpeg', 'image/jpg', 'image/png', 'image/svg', 'image/svg+xml'];
 const isJPG = type.includes(file.type);
 //检验文件格式
 if (!isJPG) {
@@ -156,9 +131,41 @@ const handleBeforeUpload = (file: any) => {
 return true;
 };
 
-// 图片失败拦截
-const handleUploadError = (err: any) => {
- proxy?.$modal.msgError('上传文件失败');
+// base64 模式插入图片
+const handleUploadRequest: UploadRequestHandler = (options: UploadRequestOptions) => {
+ return new Promise<void>((resolve, reject) => {
+ const file = options.file as File;
+ const quill = toRaw(quillEditorRef.value)?.getQuill();
+ if (!quill) {
+ proxy?.$modal.msgError('编辑器未就绪');
+ proxy?.$modal.closeLoading();
+ reject(new Error('editor not ready'));
+ return;
+ }
+ const reader = new FileReader();
+ reader.onload = () => {
+ const base64 = reader.result as string;
+ const range = quill.selection?.savedRange;
+ const length = range ? range.index : quill.getLength();
+ quill.insertEmbed(length, 'image', base64);
+ quill.setSelection(length + 1);
+ proxy?.$modal.closeLoading();
+ options.onSuccess?.({ url: base64 });
+ resolve();
+ };
+ reader.onerror = () => {
+ proxy?.$modal.msgError('图片插入失败');
+ proxy?.$modal.closeLoading();
+ const err = Object.assign(new Error('read image failed'), {
+ status: 0,
+ method: 'POST',
+ url: options.action &#124;&#124; ''
+ });
+ options.onError?.(err as any);
+ reject(err);
+ };
+ reader.readAsDataURL(file);
+ });
 };
 </script>
 
diff --git a/src/components/Process/processMeddle.vue b/src/components/Process/processMeddle.vue
index d024b6915cd5defd8f750152314ebb6f211cb4e9..444bbdc1ad453a08f6d05ec67a50b2597bc98a89 100644
--- a/src/components/Process/processMeddle.vue
+++ b/src/components/Process/processMeddle.vue
@@ -113,7 +113,8 @@ const handleTransferTask = async (data) => {
 const taskOperationBo = reactive<taskoperationbo>({
 userId: data[0].userId,
 taskId: task.value.id,
- message: ''
+ message: '',
+ messageType: ['1']
 });
 await proxy?.$modal.confirm('是否确认提交?');
 loading.value = true;
@@ -139,7 +140,8 @@ const addMultiInstanceUser = async (data) => {
 const taskOperationBo = reactive<taskoperationbo>({
 userIds: data.map((e) => e.userId),
 taskId: task.value.id,
- message: ''
+ message: '',
+ messageType: ['1']
 });
 await proxy?.$modal.confirm('是否确认提交?');
 loading.value = true;
@@ -163,7 +165,8 @@ const deleteMultiInstanceUser = async (row) => {
 const taskOperationBo = reactive<taskoperationbo>({
 userIds: [row.userId],
 taskId: task.value.id,
- message: ''
+ message: '',
+ messageType: ['1']
 });
 await taskOperation(taskOperationBo, 'reductionSignature').finally(() => {
 loading.value = false;
diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue
index 477178cc985849d43e7ec033756e08154465ba0e..b958d8edc3252efe44f834920cfc16a7b74e524d 100644
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -14,7 +14,7 @@
 <el-form-item label="抄送" v-if="buttonObj.copy">
 <el-button type="primary" icon="Plus" circle @click="openUserSelectCopy" />
 <el-tag v-for="user in selectCopyUserList" :key="user.userId" closable @close="handleCopyCloseTag(user)">
- {{ user.userName }}
+ {{ user.nickName }}
 </el-tag>
 </el-form-item>
 <el-form-item v-if="buttonObj.pop && nestNodeList && nestNodeList.length> 0" label="下一步审批人" prop="assigneeMap">
@@ -80,7 +80,13 @@
 
 <userselect ref="multiInstanceUserRef" :multiple="true" @confirm-call-back="addMultiInstanceUser"></userselect>
 
- <userselect ref="porUserRef" :data="form.assigneeMap[nodeCode]" :multiple="true" :userIds="popUserIds" @confirm-call-back="handlePopUser"></userselect>
+ <userselect + ref="porUserRef" + :data="form.assigneeMap[nodeCode]" + :multiple="true" + :userIds="popUserIds" + @confirm-call-back="handlePopUser" +></userselect>
 
 
 <el-dialog v-model="backVisible" draggable title="驳回" :close-on-click-modal="false">
@@ -265,7 +271,7 @@ const openDialog = async (id?: string) => {
 selectCopyUserList.value = task.value.copyList;
 selectCopyUserIds.value = task.value.copyList.map((e) => e.userId).join(',');
 varNodeList.value = task.value.varList;
- console.log('varNodeList', varNodeList.value)
+ console.log('varNodeList', varNodeList.value);
 buttonDisabled.value = false;
 try {
 const data = {
@@ -310,7 +316,7 @@ const handleCompleteTask = async () => {
 selectCopyUserList.value.forEach((e) => {
 const copyUser = {
 userId: e.userId,
- userName: e.userName
+ nickName: e.nickName
 };
 flowCopyList.push(copyUser);
 });
@@ -397,7 +403,8 @@ const addMultiInstanceUser = async (data) => {
 const taskOperationBo = reactive<taskoperationbo>({
 userIds: data.map((e) => e.userId),
 taskId: taskId.value,
- message: form.value.message
+ message: form.value.message,
+ messageType: ['1']
 });
 await proxy?.$modal.confirm('是否确认提交?');
 loading.value = true;
@@ -421,7 +428,8 @@ const deleteMultiInstanceUser = async (row) => {
 const taskOperationBo = reactive<taskoperationbo>({
 userIds: [row.userId],
 taskId: taskId.value,
- message: form.value.message
+ message: form.value.message,
+ messageType: ['1']
 });
 await taskOperation(taskOperationBo, 'reductionSignature').finally(() => {
 loading.value = false;
@@ -441,7 +449,8 @@ const handleTransferTask = async (data) => {
 const taskOperationBo = reactive<taskoperationbo>({
 userId: data[0].userId,
 taskId: taskId.value,
- message: form.value.message
+ message: form.value.message,
+ messageType: ['1']
 });
 await proxy?.$modal.confirm('是否确认提交?');
 loading.value = true;
@@ -468,7 +477,8 @@ const handleDelegateTask = async (data) => {
 const taskOperationBo = reactive<taskoperationbo>({
 userId: data[0].userId,
 taskId: taskId.value,
- message: form.value.message
+ message: form.value.message,
+ messageType: ['1']
 });
 await proxy?.$modal.confirm('是否确认提交?');
 loading.value = true;
diff --git a/src/enums/NavTypeEnum.ts b/src/enums/NavTypeEnum.ts
new file mode 100644
index 0000000000000000000000000000000000000000..58573cec85148876bdb4b170b2ca7afa8f1a289c
--- /dev/null
+++ b/src/enums/NavTypeEnum.ts
@@ -0,0 +1,17 @@
+/**
+ * 导航栏布局枚举
+ */
+export enum NavTypeEnum {
+ /**
+ * 左侧导航
+ */
+ LEFT = 'left',
+ /**
+ * 顶部导航
+ */
+ TOP = 'top',
+ /**
+ * 混合导航
+ */
+ MIX = 'mix'
+}
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index b6c7b61c3ead68d26967b0d5fd5c38f2284b5dd6..3c007aa9f5821beb78d7022934bb5c7b174eccac 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -89,11 +89,11 @@ function addIframe() {
 }
 
 ::-webkit-scrollbar-track {
- background-color: #f1f1f1;
+ background-color: var(--el-fill-color-lighter);
 }
 
 ::-webkit-scrollbar-thumb {
- background-color: #c0c0c0;
- border-radius: 3px;
+ background-color: var(--el-text-color-placeholder);
+ border-radius: 999px;
 }
 </style>
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index efb1ae3b78b395a2dda62fe00a212bfed3a8e436..d39c81ad515fb6de7824839bccf4c7fe6d31bbf5 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,9 +1,14 @@
 <template>
- <div>
+ <div :nav' + navType">
 <hamburger id="hamburger-container" :is-active="appStore.sidebar.opened" @toggle-click="toggleSideBar" />
- <breadcrumb v-if="!settingsStore.topNav" id="breadcrumb-container" />
- <top-nav v-if="settingsStore.topNav" id="topmenu-container" />
 
+ <breadcrumb v-if="navType == NavTypeEnum.LEFT" id="breadcrumb-container" />
+ <top-nav v-if="navType == NavTypeEnum.MIX" id="topmenu-container" />
+
+ <template v-if="navType == NavTypeEnum.TOP">
+ <logo v-show="showLogo" :collapse="false"></logo>
+ <top-bar id="topbar-container" />
+ </template>
 <div>
 <template v-if="appStore.device !== 'mobile'">
 <el-select @@ -99,6 +104,9 @@ import { TenantVO } from '@/api/types'; import notice from './notice/index.vue'; import router from '@/router'; import { ElMessageBoxOptions } from 'element-plus/es/components/message-box/src/message-box.type'; +import { NavTypeEnum } from '@/enums/NavTypeEnum'; +import Logo from "@/layout/components/Sidebar/Logo.vue"; +import TopBar from './TopBar' const appStore = useAppStore(); const userStore = useUserStore(); @@ -109,6 +117,9 @@ const newNotice = ref(<number>0);
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const userId = ref(userStore.userId);
+const navType = computed(() => settingsStore.navType);
+const showLogo = computed(() => settingsStore.sidebarLogo);
+
 const companyName = ref(undefined);
 const tenantList = ref<tenantvo[]>([]);
 // 是否切换了租户
@@ -201,6 +212,12 @@ watch(
 </script>
 
 
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 997b77667ee32b53167f07485dcaab184afd0dab..df2a403f2eddb4fa6bfc4c3eca7fd2e1ee155c4d 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -2,18 +2,17 @@
 <div : - :theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
 <div class="naked_tr"> <router-link v-if="collapse" key="collapse" to="/">
 
- <h1 v-else :theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">
+ <h1 v-else>
 {{ title }}
 </h1>
 </router-link>
 <router-link v-else key="expand" to="/">
 
- <h1 :theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">
+ <h1>
 {{ title }}
 </h1>
 </router-link>
@@ -26,6 +25,7 @@ import variables from '@/assets/styles/variables.module.scss';
 import logo from '@/assets/logo/logo.png';
 import { useSettingsStore } from '@/store/modules/settings';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+import { NavTypeEnum } from '@/enums/NavTypeEnum';
 
 defineProps({
 collapse: {
@@ -37,6 +37,28 @@ defineProps({
 const title = import.meta.env.VITE_APP_LOGO_TITLE;
 const settingsStore = useSettingsStore();
 const sideTheme = computed(() => settingsStore.sideTheme);
+
+// 获取Logo背景色
+const getLogoBackground = computed(() => {
+ if (settingsStore.isDark) {
+ return 'var(--sidebar-bg)'
+ }
+ if (settingsStore.navType == NavTypeEnum.TOP) {
+ return variables.menuLightBackground
+ }
+ return sideTheme.value === 'theme-dark' ? variables.menuBg : variables.menuLightBackground
+})
+
+// 获取Logo文字颜色
+const getLogoTextColor = computed(() => {
+ if (settingsStore.isDark) {
+ return 'var(--sidebar-text)'
+ }
+ if (settingsStore.navType == NavTypeEnum.TOP) {
+ return variables.logoLightTitleColor
+ }
+ return sideTheme.value === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor
+})
 </script>
 
 
diff --git a/src/layout/index.vue b/src/layout/index.vue
index b2d06dcb2c0b1700b793b1978a0fbb21d451017e..51740322718adda8097ee7c072a56cde09939b55 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -26,6 +26,7 @@ import SideBar from './components/Sidebar/index.vue';
 import { AppMain, Navbar, Settings, TagsView } from './components';
 import { useAppStore } from '@/store/modules/app';
 import { useSettingsStore } from '@/store/modules/settings';
+import { NavTypeEnum } from '@/enums/NavTypeEnum';
 import { initWebSocket } from '@/utils/websocket';
 import { initSSE } from '@/utils/sse';
 
@@ -35,6 +36,13 @@ const sidebar = computed(() => useAppStore().sidebar);
 const device = computed(() => useAppStore().device);
 const needTagsView = computed(() => settingsStore.tagsView);
 const fixedHeader = computed(() => settingsStore.fixedHeader);
+const layout = computed(() => settingsStore.navType);
+
+// 根据布局模式判断是否显示侧边栏
+const showSidebar = computed(() => {
+ if (sidebar.value.hide) return false;
+ return layout.value === NavTypeEnum.LEFT &#124;&#124; layout.value === NavTypeEnum.MIX;
+});
 
 const classObj = computed(() => ({
 hideSidebar: !sidebar.value.opened,
diff --git a/src/main.ts b/src/main.ts
index 7a6e4d7f6dd50f205d66cbc75cb73d58c57fd55d..16ac6101ef15d49d08021ec4408f170455913e78 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -28,9 +28,6 @@ import ElementIcons from '@/plugins/svgicon';
 // permission control
 import './permission';
 
-// 开发者工具保护
-import { initDevToolsProtection } from '@/utils/devtools-protection';
-
 // 国际化
 import i18n from '@/lang/index';
 
@@ -58,6 +55,3 @@ app.use(plugins);
 directive(app);
 
 app.mount('#app');
-
-// 初始化开发者工具保护(仅生产环境)
-initDevToolsProtection();
diff --git a/src/settings.ts b/src/settings.ts
index 5d53a2340678fdad8eebd67f37d77281b291d5ec..bf1c536377200326cb5b03387c536413147db5f6 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -1,4 +1,5 @@
 import { LanguageEnum } from '@/enums/LanguageEnum';
+import { NavTypeEnum } from '@/enums/NavTypeEnum';
 
 const setting: DefaultSettings = {
 /**
@@ -18,9 +19,9 @@ const setting: DefaultSettings = {
 showSettings: true,
 
 /**
- * 是否显示顶部导航
+ * 默认布局
 */
- topNav: false,
+ navType: NavTypeEnum.LEFT,
 
 /**
 * 是否显示 tagsView
@@ -35,7 +36,7 @@ const setting: DefaultSettings = {
 /**
 * 是否固定头部
 */
- fixedHeader: false,
+ fixedHeader: true,
 
 /**
 * 是否显示logo
diff --git a/src/store/modules/settings.ts b/src/store/modules/settings.ts
index 7d0a4c9c07789198b03ce818960c105c80d54c2e..ec52fcdff45b0c286753d9d2aecf9e8a51bb11b9 100644
--- a/src/store/modules/settings.ts
+++ b/src/store/modules/settings.ts
@@ -3,6 +3,7 @@ import defaultSettings from '@/settings';
 import { useDynamicTitle } from '@/utils/dynamicTitle';
 import { useStorage } from '@vueuse/core';
 import { ref } from 'vue';
+import { NavTypeEnum } from '@/enums/NavTypeEnum';
 
 export const useSettingsStore = defineStore('setting', () => {
 const storageSetting = useStorage<layoutsetting>('layout-setting', {
@@ -13,13 +14,13 @@ export const useSettingsStore = defineStore('setting', () => {
 sidebarLogo: defaultSettings.sidebarLogo,
 dynamicTitle: defaultSettings.dynamicTitle,
 sideTheme: defaultSettings.sideTheme,
- theme: defaultSettings.theme
+ theme: defaultSettings.theme,
+ navType: defaultSettings.navType
 });
 const title = ref<string>(defaultSettings.title);
 const theme = ref<string>(storageSetting.value.theme);
 const sideTheme = ref<string>(storageSetting.value.sideTheme);
 const showSettings = ref<boolean>(defaultSettings.showSettings);
- const topNav = ref<boolean>(storageSetting.value.topNav);
 const tagsView = ref<boolean>(storageSetting.value.tagsView);
 const tagsIcon = ref<boolean>(storageSetting.value.tagsIcon);
 const fixedHeader = ref<boolean>(storageSetting.value.fixedHeader);
@@ -27,6 +28,7 @@ export const useSettingsStore = defineStore('setting', () => {
 const dynamicTitle = ref<boolean>(storageSetting.value.dynamicTitle);
 const animationEnable = ref<boolean>(defaultSettings.animationEnable);
 const dark = ref<boolean>(defaultSettings.dark);
+ const navType = ref<navtypeenum>(storageSetting.value.navType &#124;&#124; NavTypeEnum.LEFT);
 
 const setTitle = (value: string) => {
 title.value = value;
@@ -37,7 +39,6 @@ export const useSettingsStore = defineStore('setting', () => {
 theme,
 sideTheme,
 showSettings,
- topNav,
 tagsView,
 tagsIcon,
 fixedHeader,
@@ -45,6 +46,7 @@ export const useSettingsStore = defineStore('setting', () => {
 dynamicTitle,
 animationEnable,
 dark,
+ navType,
 setTitle
 };
 });
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index a31f87c070dc7a1638fb6e4dec79dab96affef6a..cd4a9f41f92961704c6e16b4090977b768a4cbdd 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -1,5 +1,6 @@
 import type { PropType as VuePropType, ComponentInternalInstance as ComponentInstance } from 'vue';
 import { LanguageEnum } from '@/enums/LanguageEnum';
+import { NavTypeEnum } from '@/enums/NavTypeEnum';
 
 declare global {
 /** vue Instance */
@@ -90,9 +91,9 @@ declare global {
 }
 declare interface LayoutSetting {
 /**
- * 是否显示顶部导航
+ * 默认布局
 */
- topNav: boolean;
+ navType: NavTypeEnum;
 
 /**
 * 是否显示多标签导航
diff --git a/src/utils/devtools-protection.ts b/src/utils/devtools-protection.ts
deleted file mode 100644
index 4efd3b3f16c1914fc07c4424444d00db2bc768fe..0000000000000000000000000000000000000000
--- a/src/utils/devtools-protection.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
- * 开发者工具保护
- * 检测开发者工具是否打开,如果打开则循环执行 debugger 阻止调试
- */
-
-// 检测开发者工具是否打开
-function detectDevTools(): boolean {
- try {
- // 方法1: 检测窗口尺寸差异(最可靠的方法)
- const widthThreshold = 160; // 开发者工具最小宽度
- const heightThreshold = 160; // 开发者工具最小高度
-
- const widthDiff = window.outerWidth - window.innerWidth;
- const heightDiff = window.outerHeight - window.innerHeight;
-
- if (widthDiff> widthThreshold &#124;&#124; heightDiff> heightThreshold) {
- return true;
- }
-
- // 方法2: 检测 debugger 执行时间(最准确的方法)
- const start = performance.now();
- debugger; // 这个 debugger 用于检测,不会被移除
- const end = performance.now();
- const timeDiff = end - start;
-
- // 如果 debugger 被跳过(开发者工具关闭),时间差会很小(通常 < 1ms) - // 如果 debugger 暂停(开发者工具打开),时间差会很大(通常> 100ms)
- // 降低阈值以提高检测灵敏度
- if (timeDiff> 10) {
- return true;
- }
-
- // 方法3: 检测控制台对象
- let devtoolsDetected = false;
- const element = document.createElement('div');
- Object.defineProperty(element, 'id', {
- get: function () {
- devtoolsDetected = true;
- return '';
- }
- });
-
- // 使用 console 来触发 getter(仅在开发者工具打开时)
- try {
- console.log(element);
- console.clear();
- } catch (e) {
- // 忽略错误
- }
-
- if (devtoolsDetected) {
- return true;
- }
-
- // 方法4: 检测控制台是否被重写(开发者工具打开时)
- const devtoolsRegex = /./;
- // @ts-expect-error - 动态添加属性
- devtoolsRegex.toString = function () {
- // @ts-expect-error - 动态添加属性
- this.opened = true;
- };
- console.log('%c', devtoolsRegex);
- // @ts-expect-error - 检查动态添加的属性
- if (devtoolsRegex.opened) {
- return true;
- }
- } catch (e) {
- // 如果检测过程中出错,默认返回 false
- return false;
- }
-
- return false;
-}
-
-// 开发者工具保护主函数
-export function initDevToolsProtection(): void {
- // 可以通过环境变量控制是否启用
- // 生产环境默认启用,开发环境可以通过 VITE_ENABLE_ANTI_DEBUG=true 来启用测试
- const isProduction = import.meta.env.MODE === 'production';
- const enableAntiDebug = import.meta.env.VITE_ENABLE_ANTI_DEBUG === 'true' &#124;&#124; isProduction;
-
- if (!enableAntiDebug) {
- return;
- }
-
- let devToolsOpen = false;
- let debuggerInterval: number &#124; null = null;
-
- // 立即执行一次检测
- const initialCheck = detectDevTools();
- if (initialCheck) {
- devToolsOpen = true;
- debuggerInterval = window.setInterval(() => {
- debugger; // 循环执行 debugger
- }, 50); // 更频繁的 debugger,每 50ms 一次
- }
-
- // 循环检测开发者工具(更频繁的检测)
- const checkInterval = setInterval(() => {
- const isOpen = detectDevTools();
-
- if (isOpen && !devToolsOpen) {
- // 开发者工具刚打开
- devToolsOpen = true;
-
- // 开始循环执行 debugger(更频繁)
- if (debuggerInterval === null) {
- debuggerInterval = window.setInterval(() => {
- debugger; // 循环执行 debugger
- }, 50); // 每 50ms 执行一次,更激进
- }
- } else if (!isOpen && devToolsOpen) {
- // 开发者工具关闭了
- devToolsOpen = false;
-
- // 停止循环 debugger
- if (debuggerInterval !== null) {
- clearInterval(debuggerInterval);
- debuggerInterval = null;
- }
- }
- }, 500); // 每 500ms 检测一次,更频繁
-
- // 页面卸载时清理
- window.addEventListener('beforeunload', () => {
- clearInterval(checkInterval);
- if (debuggerInterval !== null) {
- clearInterval(debuggerInterval);
- }
- });
-
- // 额外的检测:监听窗口大小变化
- let lastWidth = window.innerWidth;
- let lastHeight = window.innerHeight;
-
- window.addEventListener('resize', () => {
- const currentWidth = window.innerWidth;
- const currentHeight = window.innerHeight;
-
- // 如果窗口尺寸变化很大,可能是开发者工具打开/关闭
- if (Math.abs(currentWidth - lastWidth)> 200 &#124;&#124; Math.abs(currentHeight - lastHeight)> 200) {
- // 重新检测
- const isOpen = detectDevTools();
- if (isOpen && !devToolsOpen) {
- devToolsOpen = true;
- if (debuggerInterval === null) {
- debuggerInterval = window.setInterval(() => {
- debugger; // 循环执行 debugger
- }, 50); // 更频繁的 debugger
- }
- }
- }
-
- lastWidth = currentWidth;
- lastHeight = currentHeight;
- });
-}
-
diff --git a/src/views/index.vue b/src/views/index.vue
index 546891078b76b43e3ad6ecdabd6998b1b0759daf..cf350cc1067ef011821192e249a904bd78fa8c07 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -33,7 +33,7 @@
 * 部署方式 Docker 容器编排 一键部署业务集群<br />
 * 国际化 SpringMessage Spring标准国际化方案<br />
 </p>
- <p><strong>当前版本:</strong> <span>v5.5.3</span></p>
+ <p><strong>当前版本:</strong> <span>v5.6.0</span></p>
 <p>
 <el-tag type="danger">&yen;免费开源</el-tag>
 </p>
@@ -77,7 +77,7 @@
 * 分布式监控 Prometheus、Grafana 全方位性能监控<br />
 * 其余与 Vue 版本一致<br />
 </p>
- <p><strong>当前版本:</strong> <span>v2.5.3</span></p>
+ <p><strong>当前版本:</strong> <span>v2.6.0</span></p>
 <p>
 <el-tag type="danger">&yen;免费开源</el-tag>
 </p>
diff --git a/src/views/login.vue b/src/views/login.vue
index 9225ac93d5588f05991ce6fc4328717c8b1e226c..a890c633cb6c4bb656b6948d49962e47aeeb05d5 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -240,29 +240,38 @@ onMounted(() => {
 height: 100%;
 background-image: url('../assets/images/login-background.jpg');
 background-size: cover;
+ background-position: center;
 }
 
 .title-box {
 display: flex;
+ align-items: center;
+ gap: 8px;
 
 .title {
- margin: 0px auto 30px auto;
+ margin: 0px auto 26px auto;
 text-align: center;
- color: #707070;
+ color: var(--el-text-color-primary);
+ font-weight: 600;
+ letter-spacing: 0.5px;
 }
 
 :deep(.lang-select--style) {
 line-height: 0;
- color: #7483a3;
+ color: var(--el-text-color-secondary);
 }
 }
 
 .login-form {
- border-radius: 6px;
- background: #ffffff;
- width: 400px;
- padding: 25px 25px 5px 25px;
+ border-radius: var(--app-radius-lg);
+ background: rgba(255, 255, 255, 0.94);
+ border: 1px solid rgba(255, 255, 255, 0.5);
+ width: min(420px, 90vw);
+ padding: 32px 30px 12px 30px;
 z-index: 1;
+ box-shadow: var(--app-shadow-lg);
+ backdrop-filter: blur(6px);
+ -webkit-backdrop-filter: blur(6px);
 .el-input {
 height: 40px;
 input {
@@ -283,14 +292,48 @@ onMounted(() => {
 color: #bfbfbf;
 }
 
+.login-form :deep(.el-input__wrapper) {
+ background-color: rgba(255, 255, 255, 0.9);
+}
+
+.login-form :deep(.el-input__wrapper.is-focus) {
+ box-shadow: 0 0 0 2px rgba(59, 130, 246, 0.2);
+}
+
+.login-form :deep(.el-button--primary) {
+ border-radius: var(--app-radius-md);
+ box-shadow: 0 8px 20px rgba(59, 130, 246, 0.25);
+}
+
+.login-form :deep(.el-button.is-circle) {
+ background: rgba(15, 23, 42, 0.04);
+ border: 1px solid rgba(15, 23, 42, 0.08);
+ color: var(--el-text-color-regular);
+}
+
+.login-form :deep(.el-button.is-circle:hover) {
+ background: rgba(59, 130, 246, 0.1);
+ border-color: rgba(59, 130, 246, 0.2);
+}
+
 .login-code {
- width: 33%;
+ width: calc(37% - 10px);
 height: 40px;
 float: right;
+ margin-left: 10px;
+ box-sizing: border-box;
+ border-radius: var(--app-radius-sm);
+ overflow: hidden;
+ background: rgba(255, 255, 255, 0.9);
+ border: 1px solid var(--el-border-color-light);
 
 img {
 cursor: pointer;
 vertical-align: middle;
+ display: block;
+ width: 100%;
+ height: 40px;
+ object-fit: cover;
 }
 }
 
@@ -301,7 +344,7 @@ onMounted(() => {
 bottom: 0;
 width: 100%;
 text-align: center;
- color: #fff;
+ color: rgba(255, 255, 255, 0.75);
 font-family: Arial, serif;
 font-size: 12px;
 letter-spacing: 1px;
@@ -309,6 +352,27 @@ onMounted(() => {
 
 .login-code-img {
 height: 40px;
- padding-left: 12px;
+ padding-left: 0;
+}
+
+:global(html.dark) {
+ .login-form {
+ background: rgba(17, 24, 39, 0.9);
+ border-color: rgba(148, 163, 184, 0.2);
+ }
+
+ .login-form :deep(.el-input__wrapper) {
+ background-color: rgba(17, 24, 39, 0.7);
+ }
+
+ .login-form :deep(.el-button.is-circle) {
+ background: rgba(148, 163, 184, 0.12);
+ border-color: rgba(148, 163, 184, 0.25);
+ color: #e5e7eb;
+ }
+
+ .el-login-footer {
+ color: rgba(226, 232, 240, 0.65);
+ }
 }
 </style>
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
deleted file mode 100644
index be5c87a9c42dcc13cb185f98bc32988f556eb789..0000000000000000000000000000000000000000
--- a/src/views/system/dict/data.vue
+++ /dev/null
@@ -1,309 +0,0 @@
-<template>
- <div>
- <div class="naked_tr">- <div v-show="showSearch">
- <el-card shadow="hover">
- <el-form ref="queryFormRef" :model="queryParams" :inline="true">
- <el-form-item label="字典名称" prop="dictType">
- <el-select v-model="queryParams.dictType">
- <el-option v-for="item in typeOptions" :key="item.dictId" :label="item.dictName" :value="item.dictType" />
- </el-select>
- </el-form-item>
- <el-form-item label="字典标签" prop="dictLabel">
- <el-input v-model="queryParams.dictLabel" placeholder="请输入字典标签" clearable @keyup.enter="handleQuery" />
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
- <el-button icon="Refresh" @click="resetQuery">重置</el-button>
- </el-form-item>
- </el-form>
- </el-card>
- </div>
- </transition>
- <el-card shadow="hover">
- <template #header>
- <el-row :gutter="10">
- <el-col :span="1.5">
- <el-button v-hasPermi="['system:dict:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button v-hasPermi="['system:dict:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">修改</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
- 删除
- </el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button v-hasPermi="['system:dict:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="warning" plain icon="Close" @click="handleClose">关闭</el-button>
- </el-col>
- <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
- </el-row>
- </template>
-
- <el-table v-loading="loading" border :data="dataList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" />
- <el-table-column v-if="false" label="字典编码" prop="dictCode" />
- <el-table-column label="字典标签" prop="dictLabel">
- <template #default="scope">
- <span - v-if="(scope.row.listClass === '' &#124;&#124; scope.row.listClass === 'default') && (scope.row.cssClass === '' &#124;&#124; scope.row.cssClass == null)" ->{{ scope.row.dictLabel }}</span ->
- <el-tag - v-else - :type="scope.row.listClass === 'primary' &#124;&#124; scope.row.listClass === 'default' ? 'primary' : scope.row.listClass" - : ->{{ scope.row.dictLabel }}</el-tag ->
- </template>
- </el-table-column>
- <el-table-column label="字典键值" prop="dictValue" />
- <el-table-column label="字典排序" prop="dictSort" />
- <el-table-column label="备注" prop="remark" :show-overflow-tooltip="true" />
- <el-table-column label="创建时间" prop="createTime">
- <template #default="scope">
- <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
- </template>
- </el-table-column>
- <el-table-column label="操作" class-name="small-padding fixed-width">
- <template #default="scope">
- <el-tooltip content="修改" placement="top">
- <el-button v-hasPermi="['system:dict:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
- </el-tooltip>
- <el-tooltip content="删除" placement="top">
- <el-button v-hasPermi="['system:dict:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
- </el-tooltip>
- </template>
- </el-table-column>
- </el-table>
-
- <pagination v-show="total> 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
- </el-card>
- 
- <el-dialog v-model="dialog.visible" :title="dialog.title" append-to-body>
- <el-form ref="dataFormRef" :model="form" :rules="rules" label->
- <el-form-item label="字典类型">
- <el-input v-model="form.dictType" :disabled="true" />
- </el-form-item>
- <el-form-item label="数据标签" prop="dictLabel">
- <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
- </el-form-item>
- <el-form-item label="数据键值" prop="dictValue">
- <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
- </el-form-item>
- <el-form-item label="样式属性" prop="cssClass">
- <el-input v-model="form.cssClass" placeholder="请输入样式属性" />
- </el-form-item>
- <el-form-item label="显示排序" prop="dictSort">
- <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
- </el-form-item>
- <el-form-item label="回显样式" prop="listClass">
- <el-select v-model="form.listClass">
- <el-option - v-for="item in listClassOptions" - :key="item.value" - :label="item.label + '(' + item.value + ')'" - :value="item.value" -></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="备注" prop="remark">
- <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
- </el-form-item>
- </el-form>
- <template #footer>
- <div>
- <el-button type="primary" @click="submitForm">确 定</el-button>
- <el-button @click="cancel">取 消</el-button>
- </div>
- </template>
- </el-dialog>
- </div>
-</template>
-
-
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index c97b92e71b21a612df3aa362d1c2d584c67f7bc0..a2f7b9da1e93590cd7b8ead20ac86930ce2c5b43 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -1,106 +1,274 @@
-<template>
- <div>
- <div class="naked_tr">- <div v-show="showSearch">
- <el-card shadow="hover">
- <el-form ref="queryFormRef" :model="queryParams" :inline="true">
- <el-form-item label="字典名称" prop="dictName">
- <el-input v-model="queryParams.dictName" placeholder="请输入字典名称" clearable @keyup.enter="handleQuery" />
- </el-form-item>
- <el-form-item label="字典类型" prop="dictType">
- <el-input v-model="queryParams.dictType" placeholder="请输入字典类型" clearable @keyup.enter="handleQuery" />
- </el-form-item>
- <el-form-item label="创建时间">
- <el-date-picker - v-model="dateRange" - value-format="YYYY-MM-DD HH:mm:ss" - type="daterange" - range-separator="-" - start-placeholder="开始日期" - end-placeholder="结束日期" - :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]" -></el-date-picker>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
- <el-button icon="Refresh" @click="resetQuery">重置</el-button>
- </el-form-item>
- </el-form>
- </el-card>
- </div>
- </transition>
- <el-card shadow="hover">
- <template #header>
- <el-row :gutter="10">
- <el-col :span="1.5">
- <el-button v-hasPermi="['system:dict:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button v-hasPermi="['system:dict:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">修改</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
- 删除
- </el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button v-hasPermi="['system:dict:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
- </el-col>
- <el-col :span="1.5">
+<template>
+ <div>
+ <el-row :gutter="16">
+ 
+ <el-col :xs="24" :lg="12">
+ <el-card shadow="hover">
+ <template #header>
+ <div>
+ <div>字典管理</div>
+ <right-toolbar v-model:show-search="showTypeSearch" @query-table="getTypeList" />
+ </div>
+ </template>
+
+ <div v-show="showTypeSearch">
+ <el-form ref="typeQueryFormRef" :model="typeQueryParams" :inline="true">
+ <el-form-item label="字典名称" prop="dictName">
+ <el-input v-model="typeQueryParams.dictName" placeholder="请输入字典名称" clearable @keyup.enter="handleTypeQuery" />
+ </el-form-item>
+ <el-form-item label="字典类型" prop="dictType">
+ <el-input v-model="typeQueryParams.dictType" placeholder="请输入字典类型" clearable @keyup.enter="handleTypeQuery" />
+ </el-form-item>
+ <el-form-item label="创建时间">
+ <el-date-picker + v-model="dateRange" + value-format="YYYY-MM-DD HH:mm:ss" + type="daterange" + range-separator="-" + start-placeholder="开始日期" + end-placeholder="结束日期" + :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]" +></el-date-picker>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="Search" @click="handleTypeQuery">搜索</el-button>
+ <el-button icon="Refresh" @click="handleTypeResetQuery">重置</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+
+ <div>
+ <el-button v-hasPermi="['system:dict:add']" type="primary" plain icon="Plus" @click="handleTypeAdd">新增</el-button>
+ <el-button v-hasPermi="['system:dict:edit']" type="success" plain icon="Edit" :disabled="typeSingle" @click="handleTypeUpdate()" +>修改</el-button +>
+ <el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Delete" :disabled="typeMultiple" @click="handleTypeDelete()" +>删除</el-button +>
+ <el-button v-hasPermi="['system:dict:export']" type="warning" plain icon="Download" @click="handleTypeExport">导出</el-button>
 <el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Refresh" @click="handleRefreshCache">刷新缓存</el-button>
- </el-col>
- <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
- </el-row>
- </template>
+ </div>
 
- <el-table v-loading="loading" border :data="typeList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" />
- <el-table-column v-if="false" label="字典编号" prop="dictId" />
- <el-table-column label="字典名称" prop="dictName" :show-overflow-tooltip="true" />
- <el-table-column label="字典类型" :show-overflow-tooltip="true">
- <template #default="scope">
- <router-link :to="'/system/dict-data/index/' + scope.row.dictId">
- <span>{{ scope.row.dictType }}</span>
- </router-link>
- </template>
- </el-table-column>
- <el-table-column label="备注" prop="remark" :show-overflow-tooltip="true" />
- <el-table-column label="创建时间" prop="createTime">
- <template #default="scope">
- <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
- </template>
- </el-table-column>
- <el-table-column label="操作" class-name="small-padding fixed-width">
- <template #default="scope">
- <el-tooltip content="修改" placement="top">
- <el-button v-hasPermi="['system:dict:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
- </el-tooltip>
- <el-tooltip content="删除" placement="top">
- <el-button v-hasPermi="['system:dict:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
- </el-tooltip>
+ <div>
+ <el-table + ref="typeTableRef" + v-loading="typeLoading" + border + :data="typeList" + highlight-current-row + @row-click="handleTypeRowClick" + @selection-change="handleTypeSelectionChange" +>
+ <el-table-column type="selection" />
+ <el-table-column v-if="false" label="字典编号" prop="dictId" />
+ <el-table-column label="字典名称" prop="dictName" />
+ <el-table-column label="字典类型" prop="dictType">
+ <template #default="scope">
+ <span @click.stop="handleTypeRowClick(scope.row)">{{ scope.row.dictType }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="备注" prop="remark" />
+ <el-table-column label="创建时间" prop="createTime">
+ <template #default="scope">
+ <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="操作" fixed="right" class-name="small-padding fixed-width">
+ <template #default="scope">
+ <el-tooltip content="修改" placement="top">
+ <el-button v-hasPermi="['system:dict:edit']" link type="primary" icon="Edit" @click="handleTypeUpdate(scope.row)"></el-button>
+ </el-tooltip>
+ <el-tooltip content="删除" placement="top">
+ <el-button v-hasPermi="['system:dict:remove']" link type="primary" icon="Delete" @click="handleTypeDelete(scope.row)"></el-button>
+ </el-tooltip>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+
+ <pagination + v-show="typeTotal> 0"
+ v-model:page="typeQueryParams.pageNum"
+ v-model:limit="typeQueryParams.pageSize"
+ :total="typeTotal"
+ @pagination="getTypeList"
+ />
+ </el-card>
+ </el-col>
+
+ 
+ <el-col :xs="24" :lg="12">
+ <el-card shadow="hover">
+ <template #header>
+ <div>
+ <div>
+ 字典数据
+ <span>{{ currentDictLabel }}</span>
+ </div>
+ <right-toolbar v-model:show-search="showDataSearch" @query-table="getDataList" />
+ </div>
 </template>
- </el-table-column>
- </el-table>
-
- <pagination v-show="total> 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
- </el-card>
- 
- <el-dialog v-model="dialog.visible" :title="dialog.title" append-to-body>
- <el-form ref="dictFormRef" :model="form" :rules="rules" label->
+
+ <div v-show="showDataSearch">
+ <el-form ref="dataQueryFormRef" :model="dataQueryParams" :inline="true">
+ <el-form-item label="字典标签" prop="dictLabel">
+ <el-input + v-model="dataQueryParams.dictLabel" + placeholder="请输入字典标签" + clearable + :disabled="!hasCurrentDict" + @keyup.enter="handleDataQuery" + />
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="Search" :disabled="!hasCurrentDict" @click="handleDataQuery">搜索</el-button>
+ <el-button icon="Refresh" :disabled="!hasCurrentDict" @click="handleDataResetQuery">重置</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+
+ <div>
+ <el-button v-hasPermi="['system:dict:add']" type="primary" plain icon="Plus" :disabled="!hasCurrentDict" @click="handleDataAdd" +>新增</el-button +>
+ <el-button + v-hasPermi="['system:dict:edit']" + type="success" + plain + icon="Edit" + :disabled="dataSingle &#124;&#124; !hasCurrentDict" + @click="handleDataUpdate()" +>修改</el-button +>
+ <el-button + v-hasPermi="['system:dict:remove']" + type="danger" + plain + icon="Delete" + :disabled="dataMultiple &#124;&#124; !hasCurrentDict" + @click="handleDataDelete()" +>删除</el-button +>
+ <el-button v-hasPermi="['system:dict:export']" type="warning" plain icon="Download" :disabled="!hasCurrentDict" @click="handleDataExport" +>导出</el-button +>
+ </div>
+
+ <div>
+ <el-table v-loading="dataLoading" border :data="dataList" @selection-change="handleDataSelectionChange">
+ <el-table-column type="selection" />
+ <el-table-column v-if="false" label="字典编码" prop="dictCode" />
+ <el-table-column label="字典标签" prop="dictLabel">
+ <template #default="scope">
+ <span + v-if=" + (scope.row.listClass === '' &#124;&#124; scope.row.listClass === 'default') && (scope.row.cssClass === '' &#124;&#124; scope.row.cssClass == null) + " +>{{ scope.row.dictLabel }}</span +>
+ <el-tag + v-else + :type="scope.row.listClass === 'primary' &#124;&#124; scope.row.listClass === 'default' ? 'primary' : scope.row.listClass" + : +>{{ scope.row.dictLabel }}</el-tag +>
+ </template>
+ </el-table-column>
+ <el-table-column label="字典键值" prop="dictValue" />
+ <el-table-column label="字典排序" prop="dictSort" />
+ <el-table-column label="备注" prop="remark" />
+ <el-table-column label="创建时间" prop="createTime">
+ <template #default="scope">
+ <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="操作" fixed="right" class-name="small-padding fixed-width">
+ <template #default="scope">
+ <el-tooltip content="修改" placement="top">
+ <el-button v-hasPermi="['system:dict:edit']" link type="primary" icon="Edit" @click="handleDataUpdate(scope.row)"></el-button>
+ </el-tooltip>
+ <el-tooltip content="删除" placement="top">
+ <el-button v-hasPermi="['system:dict:remove']" link type="primary" icon="Delete" @click="handleDataDelete(scope.row)"></el-button>
+ </el-tooltip>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+
+ <pagination + v-show="dataTotal> 0"
+ v-model:page="dataQueryParams.pageNum"
+ v-model:limit="dataQueryParams.pageSize"
+ :total="dataTotal"
+ @pagination="getDataList"
+ />
+ </el-card>
+ </el-col>
+ </el-row>
+
+ 
+ <el-dialog v-model="typeDialog.visible" :title="typeDialog.title" append-to-body>
+ <el-form ref="typeFormRef" :model="typeForm" :rules="typeRules" label->
 <el-form-item label="字典名称" prop="dictName">
- <el-input v-model="form.dictName" placeholder="请输入字典名称" />
+ <el-input v-model="typeForm.dictName" placeholder="请输入字典名称" />
+ </el-form-item>
+ <el-form-item prop="dictType">
+ <el-input v-model="typeForm.dictType" placeholder="请输入字典类型" maxlength="100" />
+ <span slot="label">
+ <el-tooltip content="数据存储中的Key值,如:sys_user_sex" placement="top">
+ 
+ </el-tooltip>
+ 字典类型
+ </span>
+ </el-form-item>
+ <el-form-item label="备注" prop="remark">
+ <el-input v-model="typeForm.remark" type="textarea" placeholder="请输入内容"></el-input>
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <div>
+ <el-button type="primary" @click="submitTypeForm">确 定</el-button>
+ <el-button @click="cancelType">取 消</el-button>
+ </div>
+ </template>
+ </el-dialog>
+
+ 
+ <el-dialog v-model="dataDialog.visible" :title="dataDialog.title" append-to-body>
+ <el-form ref="dataFormRef" :model="dataForm" :rules="dataRules" label->
+ <el-form-item label="字典类型">
+ <el-input v-model="dataForm.dictType" :disabled="true" />
+ </el-form-item>
+ <el-form-item label="数据标签" prop="dictLabel">
+ <el-input v-model="dataForm.dictLabel" placeholder="请输入数据标签" />
+ </el-form-item>
+ <el-form-item label="数据键值" prop="dictValue">
+ <el-input v-model="dataForm.dictValue" placeholder="请输入数据键值" />
 </el-form-item>
- <el-form-item label="字典类型" prop="dictType">
- <el-input v-model="form.dictType" placeholder="请输入字典类型" />
+ <el-form-item label="样式属性" prop="cssClass">
+ <el-input v-model="dataForm.cssClass" placeholder="请输入样式属性" />
+ </el-form-item>
+ <el-form-item label="显示排序" prop="dictSort">
+ <el-input-number v-model="dataForm.dictSort" controls-position="right" :min="0" />
+ </el-form-item>
+ <el-form-item label="回显样式" prop="listClass">
+ <el-select v-model="dataForm.listClass">
+ <el-option + v-for="item in listClassOptions" + :key="item.value" + :label="item.label + '(' + item.value + ')'" + :value="item.value" +></el-option>
+ </el-select>
 </el-form-item>
 <el-form-item label="备注" prop="remark">
- <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+ <el-input v-model="dataForm.remark" type="textarea" placeholder="请输入内容"></el-input>
 </el-form-item>
 </el-form>
 <template #footer>
 <div>
- <el-button type="primary" @click="submitForm">确 定</el-button>
- <el-button @click="cancel">取 消</el-button>
+ <el-button type="primary" @click="submitDataForm">确 定</el-button>
+ <el-button @click="cancelData">取 消</el-button>
 </div>
 </template>
 </el-dialog>
@@ -110,35 +278,39 @@
 
+
+
diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue
index 2d027c39841c4c628976bfbf4b214ee1d61679f9..e7a45a1d65a64f40a173e9aea293deefd0ca89d9 100644
--- a/src/views/workflow/processDefinition/index.vue
+++ b/src/views/workflow/processDefinition/index.vue
@@ -42,19 +42,19 @@
 <template #header>
 <el-row :gutter="10">
 <el-col :span="1.5">
- <el-button type="primary" icon="Plus" @click="handleAdd()">添加</el-button>
+ <el-button v-hasPermi="['workflow:definition:add']" type="primary" icon="Plus" @click="handleAdd()">添加</el-button>
 </el-col>
 <el-col :span="1.5">
- <el-button type="success" icon="Edit" :disabled="single" @click="handleUpdate()">修改</el-button>
+ <el-button v-hasPermi="['workflow:definition:edit']" type="success" icon="Edit" :disabled="single" @click="handleUpdate()">修改</el-button>
 </el-col>
 <el-col :span="1.5">
- <el-button type="danger" icon="Delete" :disabled="multiple" @click="handleDelete()">删除</el-button>
+ <el-button v-hasPermi="['workflow:definition:remove']" type="danger" icon="Delete" :disabled="multiple" @click="handleDelete()">删除</el-button>
 </el-col>
 <el-col :span="1.5">
- <el-button type="primary" icon="UploadFilled" @click="uploadDialog.visible = true">部署流程文件</el-button>
+ <el-button v-hasPermi="['workflow:definition:import']" type="primary" icon="UploadFilled" @click="uploadDialog.visible = true">部署流程文件</el-button>
 </el-col>
 <el-col :span="1.5">
- <el-button type="warning" icon="Download" :disabled="single" @click="handleExportDef">导出</el-button>
+ <el-button v-hasPermi="['workflow:definition:export']" type="warning" icon="Download" :disabled="single" @click="handleExportDef">导出</el-button>
 </el-col>
 <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
 </el-row>
@@ -74,6 +74,7 @@
 <el-table-column prop="activityStatus" label="激活状态">
 <template #default="scope">
 <el-switch + v-hasPermi="['workflow:definition:active']" v-model="scope.row.activityStatus" :active-value="1" :inactive-value="0" @@ -92,21 +93,21 @@ <template #default="scope">
 <el-row :gutter="10">
 <el-col :span="1.5">
- <el-button link type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">删除流程</el-button>
+ <el-button v-hasPermi="['workflow:definition:remove']" link type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">删除流程</el-button>
 </el-col>
 <el-col :span="1.5">
- <el-button link type="primary" size="small" icon="CopyDocument" @click="handleCopyDef(scope.row)">复制流程</el-button>
+ <el-button v-hasPermi="['workflow:definition:copy']" link type="primary" size="small" icon="CopyDocument" @click="handleCopyDef(scope.row)">复制流程</el-button>
 </el-col>
 </el-row>
 <el-row :gutter="10">
 <el-col :span="1.5">
- <el-button link type="primary" v-if="scope.row.isPublish === 0" icon="Pointer" size="small" @click="design(scope.row)" + <el-button v-hasPermi="['workflow:definition:query']" link type="primary" v-if="scope.row.isPublish === 0" icon="Pointer" size="small" @click="design(scope.row)">流程设计</el-button>
- <el-button link type="primary" v-else icon="View" size="small" @click="designView(scope.row)">查看流程</el-button>
+ <el-button v-hasPermi="['workflow:definition:query']" link type="primary" v-else icon="View" size="small" @click="designView(scope.row)">查看流程</el-button>
 </el-col>
 <el-col v-if="scope.row.isPublish !== 1" :span="1.5">
- <el-button link type="primary" size="small" icon="CircleCheck" @click="handlePublish(scope.row)">发布流程</el-button>
+ <el-button v-hasPermi="['workflow:definition:publish']" link type="primary" size="small" icon="CircleCheck" @click="handlePublish(scope.row)">发布流程</el-button>
 </el-col>
 </el-row>
 </template>
diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue
index d4b4f3fcc8673248245cf7dca4ebc2673d602dac..0e21a001c416b0b61a3ba8bd097c4eeacf6b2a5d 100644
--- a/src/views/workflow/processInstance/index.vue
+++ b/src/views/workflow/processInstance/index.vue
@@ -50,7 +50,7 @@
 <template #header>
 <el-row :gutter="10">
 <el-col :span="1.5">
- <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete">删除</el-button>
+ <el-button v-hasPermi="['workflow:instance:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete">删除</el-button>
 </el-col>
 <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
 </el-row>
@@ -75,7 +75,7 @@
 <el-table-column prop="version" label="版本号">
 <template #default="scope"> v{{ scope.row.version }}.0</template>
 </el-table-column>
- <el-table-column v-if="tab === 'running'" prop="isSuspended" label="状态" min->
+ <el-table-column v-if="tab === 'running'" v-hasPermi="['workflow:instance:active']" prop="isSuspended" label="状态" min->
 <template #default="scope">
 <el-tag v-if="!scope.row.isSuspended" type="success">激活</el-tag>
 <el-tag v-else type="danger">挂起</el-tag>
@@ -104,15 +104,15 @@
 </el-popover>
 </el-col>
 <el-col :span="1.5">
- <el-button type="danger" size="small" icon="Delete" @click="handleDelete(scope.row)">删除 </el-button>
+ <el-button v-hasPermi="['workflow:instance:remove']" type="danger" size="small" icon="Delete" @click="handleDelete(scope.row)">删除 </el-button>
 </el-col>
 </el-row>
 <el-row :gutter="10">
 <el-col :span="1.5">
- <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
+ <el-button v-hasPermi="['workflow:instance:query']" type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
 </el-col>
 <el-col :span="1.5">
- <el-button type="primary" size="small" icon="Document" @click="handleInstanceVariable(scope.row)"> 变量 </el-button>
+ <el-button v-hasPermi="['workflow:instance:variableQuery']" type="primary" size="small" icon="Document" @click="handleInstanceVariable(scope.row)"> 变量 </el-button>
 </el-col>
 </el-row>
 </template>
@@ -138,7 +138,7 @@
 <el-table-column prop="version" label="版本号">
 <template #default="scope"> v{{ scope.row.version }}.0</template>
 </el-table-column>
- <el-table-column prop="suspensionState" label="状态" min->
+ <el-table-column v-hasPermi="['workflow:instance:active']" prop="suspensionState" label="状态" min->
 <template #default="scope">
 <el-tag v-if="scope.row.suspensionState == 1" type="success">激活</el-tag>
 <el-tag v-else type="danger">挂起</el-tag>
@@ -170,7 +170,7 @@
 <el-input v-model="form.value" placeholder="请输入变量值" />
 </el-form-item>
 <el-form-item>
- <el-button type="primary" @click="handleVariable(ruleFormRef)">确认</el-button>
+ <el-button v-hasPermi="['workflow:instance:variable']" type="primary" @click="handleVariable(ruleFormRef)">确认</el-button>
 </el-form-item>
 </el-form>
 </el-card>
diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue
index eef3c0a4854e178bf16cff0c462a7185b31375a0..1610559e0d1de3f71f41c37a427b83f7b29c49d4 100644
--- a/src/views/workflow/task/allTaskWaiting.vue
+++ b/src/views/workflow/task/allTaskWaiting.vue
@@ -27,8 +27,12 @@
 <template #header>
 <el-row :gutter="10">
 <el-col :span="1.5" v-if="tab === 'waiting'">
- <el-button type="primary" plain icon="Edit" :disabled="multiple" @click="handleUserOpen()">修改办理人 </el-button>
- <el-button type="primary" plain icon="Bell" :disabled="multiple" @click="handleUrgeTaskOpen()">催办 </el-button>
+ <el-button type="primary" plain icon="Edit" :disabled="multiple" @click="handleUserOpen()" +>修改办理人
+ </el-button>
+ <el-button type="warning" plain icon="Bell" :disabled="multiple" @click="handleUrgeTaskOpen()" +>催办
+ </el-button>
 </el-col>
 <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
 </el-row>
@@ -277,3 +281,59 @@ onMounted(() => {
 getWaitingList();
 });
 </script>
+
+
diff --git a/vite.config.ts b/vite.config.ts
index 58ca5f21a9e906d60f39cebb6fba060016f20cf7..070846c2138a9457b83dd3188f26e2961c6de173 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -36,7 +36,6 @@ export default defineConfig(({ mode, command }) => {
 scss: {
 // additionalData: '@use "@/assets/styles/variables.module.scss as *";'
 // javascriptEnabled: true
- api: 'modern-compiler'
 }
 },
 postcss: {
diff --git a/vite/plugins/compression.ts b/vite/plugins/compression.ts
index aa8c779681022dd5a46b15391436fd86b9b70a7a..4660ab84cd2578464151e7b51c48eb2f0a93acf7 100644
--- a/vite/plugins/compression.ts
+++ b/vite/plugins/compression.ts
@@ -1,28 +1,110 @@
-import compression from 'vite-plugin-compression';
+import { promises as fs } from 'fs';
+import path from 'path';
+import zlib from 'zlib';
+import { promisify } from 'util';
+import type { Plugin, ResolvedConfig } from 'vite';
 
-export default (env: any) => {
- const { VITE_BUILD_COMPRESS } = env;
- const plugin: any[] = [];
- if (VITE_BUILD_COMPRESS) {
- const compressList = VITE_BUILD_COMPRESS.split(',');
- if (compressList.includes('gzip')) {
- // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
- plugin.push(
- compression({
- ext: '.gz',
- deleteOriginFile: false
- })
- );
- }
- if (compressList.includes('brotli')) {
- plugin.push(
- compression({
- ext: '.br',
- algorithm: 'brotliCompress',
- deleteOriginFile: false
+const gzip = promisify(zlib.gzip);
+const brotliCompress = promisify(zlib.brotliCompress);
+const compressibleFileRE = /\.(js&#124;mjs&#124;json&#124;css&#124;html)$/i;
+const defaultThreshold = 1025;
+
+type CompressionKind = 'gzip' &#124; 'brotli';
+
+const compressionHandlers: Record<compressionkind, { ext: string; compress: (content: Buffer) => Promise<buffer> }> = {
+ gzip: {
+ ext: '.gz',
+ compress: (content) => gzip(content, { level: zlib.constants.Z_BEST_COMPRESSION })
+ },
+ brotli: {
+ ext: '.br',
+ compress: (content) =>
+ brotliCompress(content, {
+ params: {
+ [zlib.constants.BROTLI_PARAM_QUALITY]: zlib.constants.BROTLI_MAX_QUALITY,
+ [zlib.constants.BROTLI_PARAM_MODE]: zlib.constants.BROTLI_MODE_TEXT
+ }
+ })
+ }
+};
+
+async function collectFiles(rootDir: string): Promise<string[]> {
+ const entries = await fs.readdir(rootDir, { withFileTypes: true });
+ const files = await Promise.all(
+ entries.map(async (entry) => {
+ const fullPath = path.join(rootDir, entry.name);
+ if (entry.isDirectory()) {
+ return collectFiles(fullPath);
+ }
+ return compressibleFileRE.test(entry.name) ? [fullPath] : [];
+ })
+ );
+ return files.flat();
+}
+
+function createCompressionPlugin(kind: CompressionKind): Plugin {
+ const handler = compressionHandlers[kind];
+ let config: ResolvedConfig &#124; undefined;
+
+ return {
+ name: `local:compression:${kind}`,
+ apply: 'build',
+ enforce: 'post',
+ configResolved(resolvedConfig) {
+ config = resolvedConfig;
+ },
+ async closeBundle() {
+ const outputDir = path.resolve(process.cwd(), config?.build.outDir ?? 'dist');
+ const files = await collectFiles(outputDir);
+ const compressedEntries: Array<{ file: string; originalKb: string; compressedKb: string }> = [];
+
+ await Promise.all(
+ files.map(async (filePath) => {
+ const stat = await fs.stat(filePath);
+ if (stat.size < defaultThreshold) { + return; + } + + const content = await fs.readFile(filePath); + const compressed = await handler.compress(content); + const outputFile = `${filePath}${handler.ext}`; + + await fs.writeFile(outputFile, compressed); + compressedEntries.push({ + file: path.relative(outputDir, outputFile).replaceAll('\\', '/'), + originalKb: (stat.size / 1024).toFixed(2), + compressedKb: (compressed.byteLength / 1024).toFixed(2) + }); }) ); + + if (!compressedEntries.length) { + return; + } + + compressedEntries.sort((a, b) => a.file.localeCompare(b.file));
+ config?.logger.info(`\n[compression:${kind}] generated ${compressedEntries.length} files`);
+ for (const entry of compressedEntries) {
+ config?.logger.info(`${path.basename(outputDir)}/${entry.file} ${entry.originalKb}kb -> ${entry.compressedKb}kb`);
+ }
+ config?.logger.info('');
 }
+ };
+}
+
+export default (env: Record<string, string>) => {
+ const { VITE_BUILD_COMPRESS } = env;
+ const plugins: Plugin[] = [];
+ if (!VITE_BUILD_COMPRESS) {
+ return plugins;
+ }
+
+ const compressionList = VITE_BUILD_COMPRESS.split(',').map((item) => item.trim()) as CompressionKind[];
+ if (compressionList.includes('gzip')) {
+ plugins.push(createCompressionPlugin('gzip'));
+ }
+ if (compressionList.includes('brotli')) {
+ plugins.push(createCompressionPlugin('brotli'));
 }
- return plugin;
+ return plugins;
 };
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://gitee.com/JavaLionLi/plus-ui/pulls/262.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://gitee.com/JavaLionLi/plus-ui/pulls/262.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>