若依 3.8.8

修复移动端左侧菜单无法显示问题
菜单管理新增路由名称
2024-06-30 08:01:12 +08:00 · 2024-06-29 21:44:21 +08:00 · 2024-06-29 18:53:38 +08:00 · 2024-06-29 16:21:36 +08:00 · 2024-06-29 15:59:59 +08:00 · 2024-06-29 15:39:18 +08:00
66 changed files with 945 additions and 336 deletions
--- a/20
+++ b/20
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2018 RuoYi
+
+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.
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 <p align="center">
 	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.8.6</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.8.8</h1>
 <h4 align="center">基于SpringBoot+Vue3前后端分离的Java快速开发框架</h4>
 <p align="center">
 	<a href="https://gitee.com/y_project/RuoYi-Vue/stargazers"><img src="https://gitee.com/y_project/RuoYi-Vue/badge/star.svg?theme=dark"></a>
-	<a href="https://gitee.com/y_project/RuoYi-Vue"><img src="https://img.shields.io/badge/RuoYi-v3.8.6-brightgreen.svg"></a>
+	<a href="https://gitee.com/y_project/RuoYi-Vue"><img src="https://img.shields.io/badge/RuoYi-v3.8.8-brightgreen.svg"></a>
 	<a href="https://gitee.com/y_project/RuoYi-Vue/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
 </p>

@@ -106,4 +106,4 @@ yarn dev

 ## 若依前后端分离交流群

-QQ群： [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/已满-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![加入QQ群](https://img.shields.io/badge/已满-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![加入QQ群](https://img.shields.io/badge/已满-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![加入QQ群](https://img.shields.io/badge/已满-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![加入QQ群](https://img.shields.io/badge/已满-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![加入QQ群](https://img.shields.io/badge/已满-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![加入QQ群](https://img.shields.io/badge/已满-104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [![加入QQ群](https://img.shields.io/badge/已满-160110482-blue.svg)](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) [![加入QQ群](https://img.shields.io/badge/已满-170801498-blue.svg)](https://jq.qq.com/?_wv=1027&k=7xw4xUG1) [![加入QQ群](https://img.shields.io/badge/已满-108482800-blue.svg)](https://jq.qq.com/?_wv=1027&k=eCx8eyoJ) [![加入QQ群](https://img.shields.io/badge/已满-101046199-blue.svg)](https://jq.qq.com/?_wv=1027&k=SpyH2875) [![加入QQ群](https://img.shields.io/badge/136919097-blue.svg)](https://jq.qq.com/?_wv=1027&k=tKEt51dz) 点击按钮入群。
+QQ群： [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/已满-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![加入QQ群](https://img.shields.io/badge/已满-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![加入QQ群](https://img.shields.io/badge/已满-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![加入QQ群](https://img.shields.io/badge/已满-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![加入QQ群](https://img.shields.io/badge/已满-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![加入QQ群](https://img.shields.io/badge/已满-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![加入QQ群](https://img.shields.io/badge/已满-104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [![加入QQ群](https://img.shields.io/badge/已满-160110482-blue.svg)](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) [![加入QQ群](https://img.shields.io/badge/已满-170801498-blue.svg)](https://jq.qq.com/?_wv=1027&k=7xw4xUG1) [![加入QQ群](https://img.shields.io/badge/已满-108482800-blue.svg)](https://jq.qq.com/?_wv=1027&k=eCx8eyoJ) [![加入QQ群](https://img.shields.io/badge/已满-101046199-blue.svg)](https://jq.qq.com/?_wv=1027&k=SpyH2875) [![加入QQ群](https://img.shields.io/badge/已满-136919097-blue.svg)](https://jq.qq.com/?_wv=1027&k=tKEt51dz) [![加入QQ群](https://img.shields.io/badge/已满-143961921-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=0vBbSb0ztbBgVtn3kJS-Q4HUNYwip89G&authKey=8irq5PhutrZmWIvsUsklBxhj57l%2F1nOZqjzigkXZVoZE451GG4JHPOqW7AW6cf0T&noverify=0&group_code=143961921) [![加入QQ群](https://img.shields.io/badge/已满-174951577-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=ZFAPAbp09S2ltvwrJzp7wGlbopsc0rwi&authKey=HB2cxpxP2yspk%2Bo3WKTBfktRCccVkU26cgi5B16u0KcAYrVu7sBaE7XSEqmMdFQp&noverify=0&group_code=174951577) [![加入QQ群](https://img.shields.io/badge/已满-161281055-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Fn2aF5IHpwsy8j6VlalNJK6qbwFLFHat&authKey=uyIT%2B97x2AXj3odyXpsSpVaPMC%2Bidw0LxG5MAtEqlrcBcWJUA%2FeS43rsF1Tg7IRJ&noverify=0&group_code=161281055) [![加入QQ群](https://img.shields.io/badge/已满-138988063-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=XIzkm_mV2xTsUtFxo63bmicYoDBA6Ifm&authKey=dDW%2F4qsmw3x9govoZY9w%2FoWAoC4wbHqGal%2BbqLzoS6VBarU8EBptIgPKN%2FviyC8j&noverify=0&group_code=138988063) [![加入QQ群](https://img.shields.io/badge/151450850-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=DkugnCg68PevlycJSKSwjhFqfIgrWWwR&authKey=pR1Pa5lPIeGF%2FFtIk6d%2FGB5qFi0EdvyErtpQXULzo03zbhopBHLWcuqdpwY241R%2F&noverify=0&group_code=151450850) 点击按钮入群。
--- a/package.json
+++ b/package.json
@@ -1,9 +1,10 @@
 {
  "name": "ruoyi",
-  "version": "3.8.6",
+  "version": "3.8.8",
  "description": "若依管理系统",
  "author": "若依",
  "license": "MIT",
+  "type": "module",
  "scripts": {
    "dev": "vite",
    "build:prod": "vite build",
@@ -15,30 +16,29 @@
    "url": "https://gitee.com/y_project/RuoYi-Vue.git"
  },
  "dependencies": {
-    "@element-plus/icons-vue": "2.0.10",
-    "@vueup/vue-quill": "1.1.0",
-    "@vueuse/core": "9.5.0",
-    "axios": "0.27.2",
-    "echarts": "5.4.0",
-    "element-plus": "2.2.27",
+    "@element-plus/icons-vue": "2.3.1",
+    "@vueup/vue-quill": "1.2.0",
+    "@vueuse/core": "10.11.0",
+    "axios": "0.28.1",
+    "echarts": "5.5.1",
+    "element-plus": "2.7.6",
    "file-saver": "2.0.5",
    "fuse.js": "6.6.2",
-    "js-cookie": "3.0.1",
-    "jsencrypt": "3.3.1",
+    "js-cookie": "3.0.5",
+    "jsencrypt": "3.3.2",
    "nprogress": "0.2.0",
-    "pinia": "2.0.22",
-    "vue": "3.2.45",
-    "vue-cropper": "1.0.3",
-    "vue-router": "4.1.4"
+    "pinia": "2.1.7",
+    "vue": "3.4.31",
+    "vue-cropper": "1.1.1",
+    "vue-router": "4.4.0"
  },
  "devDependencies": {
-    "@vitejs/plugin-vue": "3.1.0",
-    "@vue/compiler-sfc": "3.2.45",
-    "sass": "1.56.1",
-    "unplugin-auto-import": "0.11.4",
-    "vite": "3.2.3",
+    "@vitejs/plugin-vue": "5.0.5",
+    "sass": "1.77.5",
+    "unplugin-auto-import": "0.17.6",
+    "vite": "5.3.2",
    "vite-plugin-compression": "0.5.1",
    "vite-plugin-svg-icons": "2.0.1",
-    "vite-plugin-vue-setup-extend": "0.4.0"
+    "unplugin-vue-setup-extend-plus": "1.0.1"
  }
 }
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -11,7 +11,8 @@ export function login(username, password, code, uuid) {
  return request({
    url: '/login',
    headers: {
-      isToken: false
+      isToken: false,
+      repeatSubmit: false
    },
    method: 'post',
    data: data
--- a/src/api/tool/gen.js
+++ b/src/api/tool/gen.js
@@ -43,6 +43,15 @@ export function importTable(data) {
  })
 }

+// 创建表
+export function createTable(data) {
+  return request({
+    url: '/tool/gen/createTable',
+    method: 'post',
+    params: data
+  })
+}
+
 // 预览生成代码
 export function previewTable(tableId) {
  return request({
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -102,11 +102,15 @@

 /** 表格布局 **/
 .pagination-container {
-	// position: relative;
-	height: 25px;
-	margin-bottom: 10px;
-	margin-top: 15px;
-	padding: 10px 20px !important;
+    position: relative;
+    height: 25px;
+    margin-bottom: 10px;
+    margin-top: 15px;
+    padding: 10px 20px !important;
+}
+
+.el-dialog .pagination-container {
+    position: static !important;
 }

 /* tree border */
--- a/src/components/Crontab/day.vue
+++ b/src/components/Crontab/day.vue
@@ -1,19 +1,19 @@
 <template>
-    <el-form size="small">
+    <el-form>
        <el-form-item>
-            <el-radio v-model='radioValue' :label="1">
+            <el-radio v-model='radioValue' :value="1">
                日，允许的通配符[, - * ? / L W]
            </el-radio>
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="2">
+            <el-radio v-model='radioValue' :value="2">
                不指定
            </el-radio>
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="3">
+            <el-radio v-model='radioValue' :value="3">
                周期从
                <el-input-number v-model='cycle01' :min="1" :max="30" /> -
                <el-input-number v-model='cycle02' :min="cycle01 + 1" :max="31" /> 日
@@ -21,7 +21,7 @@
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="4">
+            <el-radio v-model='radioValue' :value="4">
                从
                <el-input-number v-model='average01' :min="1" :max="30" /> 号开始，每
                <el-input-number v-model='average02' :min="1" :max="31 - average01" /> 日执行一次
@@ -29,20 +29,20 @@
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="5">
+            <el-radio v-model='radioValue' :value="5">
                每月
                <el-input-number v-model='workday' :min="1" :max="31" /> 号最近的那个工作日
            </el-radio>
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="6">
+            <el-radio v-model='radioValue' :value="6">
                本月最后一天
            </el-radio>
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="7">
+            <el-radio v-model='radioValue' :value="7">
                指定
                <el-select clearable v-model="checkboxList" placeholder="可多选" multiple :multiple-limit="10">
                    <el-option v-for="item in 31" :key="item" :label="item" :value="item" />
--- a/src/components/Crontab/hour.vue
+++ b/src/components/Crontab/hour.vue
@@ -1,13 +1,13 @@
 <template>
-    <el-form size="small">
+    <el-form>
        <el-form-item>
-            <el-radio v-model='radioValue' :label="1">
+            <el-radio v-model='radioValue' :value="1">
                小时，允许的通配符[, - * /]
            </el-radio>
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="2">
+            <el-radio v-model='radioValue' :value="2">
                周期从
                <el-input-number v-model='cycle01' :min="0" :max="22" /> -
                <el-input-number v-model='cycle02' :min="cycle01 + 1" :max="23" /> 时
@@ -15,7 +15,7 @@
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="3">
+            <el-radio v-model='radioValue' :value="3">
                从
                <el-input-number v-model='average01' :min="0" :max="22" /> 时开始，每
                <el-input-number v-model='average02' :min="1" :max="23 - average01" /> 小时执行一次
@@ -23,7 +23,7 @@
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="4">
+            <el-radio v-model='radioValue' :value="4">
                指定
                <el-select clearable v-model="checkboxList" placeholder="可多选" multiple :multiple-limit="10">
                    <el-option v-for="item in 24" :key="item" :label="item - 1" :value="item - 1" />
--- a/src/components/Crontab/min.vue
+++ b/src/components/Crontab/min.vue
@@ -1,13 +1,13 @@
 <template>
-    <el-form size="small">
+    <el-form>
        <el-form-item>
-            <el-radio v-model='radioValue' :label="1">
+            <el-radio v-model='radioValue' :value="1">
                分钟，允许的通配符[, - * /]
            </el-radio>
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="2">
+            <el-radio v-model='radioValue' :value="2">
                周期从
                <el-input-number v-model='cycle01' :min="0" :max="58" /> -
                <el-input-number v-model='cycle02' :min="cycle01 + 1" :max="59" /> 分钟
@@ -15,7 +15,7 @@
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="3">
+            <el-radio v-model='radioValue' :value="3">
                从
                <el-input-number v-model='average01' :min="0" :max="58" /> 分钟开始， 每
                <el-input-number v-model='average02' :min="1" :max="59 - average01" /> 分钟执行一次
@@ -23,7 +23,7 @@
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="4">
+            <el-radio v-model='radioValue' :value="4">
                指定
                <el-select clearable v-model="checkboxList" placeholder="可多选" multiple :multiple-limit="10">
                    <el-option v-for="item in 60" :key="item" :label="item - 1" :value="item - 1" />
--- a/src/components/Crontab/month.vue
+++ b/src/components/Crontab/month.vue
@@ -1,13 +1,13 @@
 <template>
-    <el-form size='small'>
+    <el-form>
        <el-form-item>
-            <el-radio v-model='radioValue' :label="1">
+            <el-radio v-model='radioValue' :value="1">
                月，允许的通配符[, - * /]
            </el-radio>
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="2">
+            <el-radio v-model='radioValue' :value="2">
                周期从
                <el-input-number v-model='cycle01' :min="1" :max="11" /> -
                <el-input-number v-model='cycle02' :min="cycle01 + 1" :max="12" /> 月
@@ -15,7 +15,7 @@
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="3">
+            <el-radio v-model='radioValue' :value="3">
                从
                <el-input-number v-model='average01' :min="1" :max="11" /> 月开始，每
                <el-input-number v-model='average02' :min="1" :max="12 - average01" /> 月月执行一次
@@ -23,7 +23,7 @@
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="4">
+            <el-radio v-model='radioValue' :value="4">
                指定
                <el-select clearable v-model="checkboxList" placeholder="可多选" multiple :multiple-limit="8">
                    <el-option v-for="item in monthList" :key="item.key" :label="item.value" :value="item.key" />
--- a/src/components/Crontab/second.vue
+++ b/src/components/Crontab/second.vue
@@ -1,13 +1,13 @@
 <template>
-    <el-form size="small">
+    <el-form>
        <el-form-item>
-            <el-radio v-model='radioValue' :label="1">
+            <el-radio v-model='radioValue' :value="1">
                秒，允许的通配符[, - * /]
            </el-radio>
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="2">
+            <el-radio v-model='radioValue' :value="2">
                周期从
                <el-input-number v-model='cycle01' :min="0" :max="58" /> -
                <el-input-number v-model='cycle02' :min="cycle01 + 1" :max="59" /> 秒
@@ -15,7 +15,7 @@
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="3">
+            <el-radio v-model='radioValue' :value="3">
                从
                <el-input-number v-model='average01' :min="0" :max="58" /> 秒开始，每
                <el-input-number v-model='average02' :min="1" :max="59 - average01" /> 秒执行一次
@@ -23,7 +23,7 @@
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="4">
+            <el-radio v-model='radioValue' :value="4">
                指定
                <el-select clearable v-model="checkboxList" placeholder="可多选" multiple :multiple-limit="10">
                    <el-option v-for="item in 60" :key="item" :label="item - 1" :value="item - 1" />
--- a/src/components/Crontab/week.vue
+++ b/src/components/Crontab/week.vue
@@ -1,19 +1,19 @@
 <template>
-    <el-form size='small'>
+    <el-form>
        <el-form-item>
-            <el-radio v-model='radioValue' :label="1">
+            <el-radio v-model='radioValue' :value="1">
                周，允许的通配符[, - * ? / L #]
            </el-radio>
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="2">
+            <el-radio v-model='radioValue' :value="2">
                不指定
            </el-radio>
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="3">
+            <el-radio v-model='radioValue' :value="3">
                周期从
                <el-select clearable v-model="cycle01">
                    <el-option
@@ -38,7 +38,7 @@
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="4">
+            <el-radio v-model='radioValue' :value="4">
                第
                <el-input-number v-model='average01' :min="1" :max="4" /> 周的
                <el-select clearable v-model="average02">
@@ -48,7 +48,7 @@
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="5">
+            <el-radio v-model='radioValue' :value="5">
                本月最后一个
                <el-select clearable v-model="weekday">
                    <el-option v-for="item in weekList" :key="item.key" :label="item.value" :value="item.key" />
@@ -57,7 +57,7 @@
        </el-form-item>

        <el-form-item>
-            <el-radio v-model='radioValue' :label="6">
+            <el-radio v-model='radioValue' :value="6">
                指定
                <el-select class="multiselect" clearable v-model="checkboxList" placeholder="可多选" multiple :multiple-limit="6">
                    <el-option v-for="item in weekList" :key="item.key" :label="item.value" :value="item.key" />
--- a/src/components/Crontab/year.vue
+++ b/src/components/Crontab/year.vue
@@ -1,36 +1,36 @@
 <template>
-    <el-form size="small">
+    <el-form>
        <el-form-item>
-            <el-radio :label="1" v-model='radioValue'>
+            <el-radio :value="1" v-model='radioValue'>
                不填，允许的通配符[, - * /]
            </el-radio>
        </el-form-item>

        <el-form-item>
-            <el-radio :label="2" v-model='radioValue'>
+            <el-radio :value="2" v-model='radioValue'>
                每年
            </el-radio>
        </el-form-item>

        <el-form-item>
-            <el-radio :label="3" v-model='radioValue'>
+            <el-radio :value="3" v-model='radioValue'>
                周期从
-                <el-input-number v-model='cycle01' :min='fullYear' :max="maxFullYear - 1" /> -
-                <el-input-number v-model='cycle02' :min="cycle01 + 1" :max="maxFullYear" />
+                <el-input-number v-model='cycle01' :min='fullYear' :max="2098"/> -
+                <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : fullYear + 1" :max="2099"/>
            </el-radio>
        </el-form-item>

        <el-form-item>
-            <el-radio :label="4" v-model='radioValue'>
+            <el-radio :value="4" v-model='radioValue'>
                从
-                <el-input-number v-model='average01' :min='fullYear' :max="maxFullYear - 1"/> 年开始，每
-                <el-input-number v-model='average02' :min="1" :max="10" /> 年执行一次
+                <el-input-number v-model='average01' :min='fullYear' :max="2098"/> 年开始，每
+                <el-input-number v-model='average02' :min="1" :max="2099 - average01 || fullYear"/> 年执行一次
            </el-radio>

        </el-form-item>

        <el-form-item>
-            <el-radio :label="5" v-model='radioValue'>
+            <el-radio :value="5" v-model='radioValue'>
                指定
                <el-select clearable v-model="checkboxList" placeholder="可多选" multiple :multiple-limit="8">
                    <el-option v-for="item in 9" :key="item" :value="item - 1 + fullYear" :label="item -1 + fullYear" />
@@ -96,7 +96,7 @@ function changeRadioValue(value) {
        cycle02.value = Number(indexArr[1])
        radioValue.value = 3
    } else if (value.indexOf("/") > -1) {
-        const indexArr = value.split('#')
+        const indexArr = value.split('/')
        average01.value = Number(indexArr[1])
        average02.value = Number(indexArr[0])
        radioValue.value = 4
--- a/src/components/DictTag/index.vue
+++ b/src/components/DictTag/index.vue
@@ -3,12 +3,11 @@
    <template v-for="(item, index) in options">
      <template v-if="values.includes(item.value)">
        <span
-          v-if="item.elTagType == 'default' || item.elTagType == ''"
+          v-if="(item.elTagType == 'default' || item.elTagType == '') && (item.elTagClass == '' || item.elTagClass == null)"
          :key="item.value"
          :index="index"
          :class="item.elTagClass"
-          >{{ item.label + " " }}</span
-        >
+        >{{ item.label + " " }}</span>
        <el-tag
          v-else
          :disable-transitions="true"
@@ -16,8 +15,7 @@
          :index="index"
          :type="item.elTagType === 'primary' ? '' : item.elTagType"
          :class="item.elTagClass"
-          >{{ item.label + " " }}</el-tag
-        >
+        >{{ item.label + " " }}</el-tag>
      </template>
    </template>
    <template v-if="unmatch && showValue">
@@ -27,7 +25,7 @@
 </template>

 <script setup>
-// // 记录未匹配的项
+// 记录未匹配的项
 const unmatchArray = ref([]);

 const props = defineProps({
@@ -43,34 +41,30 @@ const props = defineProps({
    type: Boolean,
    default: true,
  },
+  separator: {
+    type: String,
+    default: ",",
+  }
 });

 const values = computed(() => {
-  if (props.value !== null && typeof props.value !== "undefined") {
-    return Array.isArray(props.value) ? props.value : [String(props.value)];
-  } else {
-    return [];
-  }
+  if (props.value === null || typeof props.value === 'undefined' || props.value === '') return [];
+  return Array.isArray(props.value) ? props.value.map(item => '' + item) : String(props.value).split(props.separator);
 });

 const unmatch = computed(() => {
  unmatchArray.value = [];
-  if (props.value !== null && typeof props.value !== "undefined") {
-    // 传入值为非数组
-    if (!Array.isArray(props.value)) {
-      if (props.options.some((v) => v.value == props.value)) return false;
-      unmatchArray.value.push(props.value);
-      return true;
-    }
-    // 传入值为Array
-    props.value.forEach((item) => {
-      if (!props.options.some((v) => v.value == item))
-        unmatchArray.value.push(item);
-    });
-    return true;
-  }
  // 没有value不显示
-  return false;
+  if (props.value === null || typeof props.value === 'undefined' || props.value === '' || props.options.length === 0) return false
+  // 传入值为数组
+  let unmatch = false // 添加一个标志来判断是否有未匹配项
+  values.value.forEach(item => {
+    if (!props.options.some(v => v.value === item)) {
+      unmatchArray.value.push(item)
+      unmatch = true // 如果有未匹配项，将标志设置为true
+    }
+  })
+  return unmatch // 返回标志的值
 });

 function handleArray(array) {
@@ -85,4 +79,4 @@ function handleArray(array) {
 .el-tag + .el-tag {
  margin-left: 10px;
 }
-</style>
+</style>
--- a/src/components/Editor/index.vue
+++ b/src/components/Editor/index.vue
@@ -1,18 +1,43 @@
 <template>
+  <div>
+    <el-upload
+      :action="uploadUrl"
+      :before-upload="handleBeforeUpload"
+      :on-success="handleUploadSuccess"
+      :on-error="handleUploadError"
+      name="file"
+      :show-file-list="false"
+      :headers="headers"
+      class="editor-img-uploader"
+      v-if="type == 'url'"
+    >
+      <i ref="uploadRef" class="editor-img-uploader"></i>
+    </el-upload>
+  </div>
  <div class="editor">
-      <quill-editor
-        v-model:content="content"
-        contentType="html"
-        @textChange="(e) => $emit('update:modelValue', content)"
-        :options="options"
-        :style="styles"
-      />
+    <quill-editor
+      ref="quillEditorRef"
+      v-model:content="content"
+      contentType="html"
+      @textChange="(e) => $emit('update:modelValue', content)"
+      :options="options"
+      :style="styles"
+    />
  </div>
 </template>

 <script setup>
-import { QuillEditor } from '@vueup/vue-quill';
-import '@vueup/vue-quill/dist/vue-quill.snow.css';
+import { QuillEditor } from "@vueup/vue-quill";
+import "@vueup/vue-quill/dist/vue-quill.snow.css";
+import { getToken } from "@/utils/auth";
+
+const { proxy } = getCurrentInstance();
+
+const quillEditorRef = ref();
+const uploadUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传的图片服务器地址
+const headers = ref({
+  Authorization: "Bearer " + getToken()
+});

 const props = defineProps({
  /* 编辑器的内容 */
@@ -34,6 +59,16 @@ const props = defineProps({
    type: Boolean,
    default: false,
  },
+  /* 上传文件大小限制(MB) */
+  fileSize: {
+    type: Number,
+    default: 5,
+  },
+  /* 类型（base64格式、url格式） */
+  type: {
+    type: String,
+    default: "url",
+  }
 });

 const options = ref({
@@ -43,21 +78,20 @@ const options = ref({
  modules: {
    // 工具栏配置
    toolbar: [
-      ["bold", "italic", "underline", "strike"],       // 加粗 斜体 下划线 删除线
-      ["blockquote", "code-block"],                    // 引用  代码块
-      [{ list: "ordered" }, { list: "bullet" }],       // 有序、无序列表
-      [{ indent: "-1" }, { indent: "+1" }],            // 缩进
-      [{ size: ["small", false, "large", "huge"] }],   // 字体大小
-      [{ header: [1, 2, 3, 4, 5, 6, false] }],         // 标题
-      [{ color: [] }, { background: [] }],             // 字体颜色、字体背景颜色
-      [{ align: [] }],                                 // 对齐方式
-      ["clean"],                                       // 清除文本格式
-      ["link", "image", "video"]                       // 链接、图片、视频
+      ["bold", "italic", "underline", "strike"],      // 加粗 斜体 下划线 删除线
+      ["blockquote", "code-block"],                   // 引用  代码块
+      [{ list: "ordered" }, { list: "bullet" }],      // 有序、无序列表
+      [{ indent: "-1" }, { indent: "+1" }],           // 缩进
+      [{ size: ["small", false, "large", "huge"] }],  // 字体大小
+      [{ header: [1, 2, 3, 4, 5, 6, false] }],        // 标题
+      [{ color: [] }, { background: [] }],            // 字体颜色、字体背景颜色
+      [{ align: [] }],                                // 对齐方式
+      ["clean"],                                      // 清除文本格式
+      ["link", "image", "video"]                      // 链接、图片、视频
    ],
  },
-  placeholder: '请输入内容',
-  readOnly: props.readOnly,
-  theme: 'snow'
+  placeholder: "请输入内容",
+  readOnly: props.readOnly
 });

 const styles = computed(() => {
@@ -69,7 +103,7 @@ const styles = computed(() => {
    style.height = `${props.height}px`;
  }
  return style;
-})
+});

 const content = ref("");
 watch(() => props.modelValue, (v) => {
@@ -78,10 +112,68 @@ watch(() => props.modelValue, (v) => {
  }
 }, { immediate: true });

+// 如果设置了上传地址则自定义图片上传事件
+onMounted(() => {
+  if (props.type == 'url') {
+    let quill = quillEditorRef.value.getQuill();
+    let toolbar = quill.getModule("toolbar");
+    toolbar.addHandler("image", (value) => {
+      if (value) {
+        proxy.$refs.uploadRef.click();
+      } else {
+        quill.format("image", false);
+      }
+    });
+  }
+});

+// 上传前校检格式和大小
+function handleBeforeUpload(file) {
+  const type = ["image/jpeg", "image/jpg", "image/png", "image/svg"];
+  const isJPG = type.includes(file.type);
+  //检验文件格式
+  if (!isJPG) {
+    proxy.$modal.msgError(`图片格式错误!`);
+    return false;
+  }
+  // 校检文件大小
+  if (props.fileSize) {
+    const isLt = file.size / 1024 / 1024 < props.fileSize;
+    if (!isLt) {
+      proxy.$modal.msgError(`上传文件大小不能超过 ${props.fileSize} MB!`);
+      return false;
+    }
+  }
+  return true;
+}
+
+// 上传成功处理
+function handleUploadSuccess(res, file) {
+  // 如果上传成功
+  if (res.code == 200) {
+    // 获取富文本实例
+    let quill = toRaw(quillEditorRef.value).getQuill();
+    // 获取光标位置
+    let length = quill.selection.savedRange.index;
+    // 插入图片，res.url为服务器返回的图片链接地址
+    quill.insertEmbed(length, "image", import.meta.env.VITE_APP_BASE_API + res.fileName);
+    // 调整光标到最后
+    quill.setSelection(length + 1);
+  } else {
+    proxy.$modal.msgError("图片插入失败");
+  }
+}
+
+// 上传失败处理
+function handleUploadError() {
+  proxy.$modal.msgError("图片插入失败");
+}
 </script>

 <style>
+.editor-img-uploader {
+  display: none;
+}
 .editor, .ql-toolbar {
  white-space: pre-wrap !important;
  line-height: normal !important;
@@ -97,11 +189,9 @@ watch(() => props.modelValue, (v) => {
  content: "保存";
  padding-right: 0px;
 }
-
 .ql-snow .ql-tooltip[data-mode="video"]::before {
  content: "请输入视频地址:";
 }
-
 .ql-snow .ql-picker.ql-size .ql-picker-label::before,
 .ql-snow .ql-picker.ql-size .ql-picker-item::before {
  content: "14px";
@@ -118,7 +208,6 @@ watch(() => props.modelValue, (v) => {
 .ql-snow .ql-picker.ql-size .ql-picker-item[data-value="huge"]::before {
  content: "32px";
 }
-
 .ql-snow .ql-picker.ql-header .ql-picker-label::before,
 .ql-snow .ql-picker.ql-header .ql-picker-item::before {
  content: "文本";
@@ -147,7 +236,6 @@ watch(() => props.modelValue, (v) => {
 .ql-snow .ql-picker.ql-header .ql-picker-item[data-value="6"]::before {
  content: "标题6";
 }
-
 .ql-snow .ql-picker.ql-font .ql-picker-label::before,
 .ql-snow .ql-picker.ql-font .ql-picker-item::before {
  content: "标准字体";
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -164,10 +164,11 @@ function uploadedSuccessfully() {

 // 获取文件名称
 function getFileName(name) {
+  // 如果是url那么取最后的名字 如果不是直接返回
  if (name.lastIndexOf("/") > -1) {
    return name.slice(name.lastIndexOf("/") + 1);
  } else {
-    return "";
+    return name;
  }
 }

--- a/src/components/HeaderSearch/index.vue
+++ b/src/components/HeaderSearch/index.vue
@@ -45,12 +45,17 @@ function close() {
 }
 function change(val) {
  const path = val.path;
+  const query = val.query;
  if (isHttp(path)) {
    // http(s):// 路径新窗口打开
    const pindex = path.indexOf("http");
    window.open(path.substr(pindex, path.length), "_blank");
  } else {
-    router.push(path)
+    if (query) {
+      router.push({ path: path, query: JSON.parse(query) });
+    } else {
+      router.push(path)
+    }
  }

  search.value = ''
@@ -98,6 +103,9 @@ function generateRoutes(routes, basePath = '', prefixTitle = []) {
        res.push(data)
      }
    }
+    if (r.query) {
+      data.query = r.query
+    }

    // recursive child routes
    if (r.children) {
--- a/src/components/ImagePreview/index.vue
+++ b/src/components/ImagePreview/index.vue
@@ -4,7 +4,7 @@
    fit="cover"
    :style="`width:${realWidth};height:${realHeight};`"
    :preview-src-list="realSrcList"
-    append-to-body="true"
+    preview-teleported
  >
    <template #error>
      <div class="image-slot">
--- a/src/components/RightToolbar/index.vue
+++ b/src/components/RightToolbar/index.vue
@@ -8,7 +8,19 @@
        <el-button circle icon="Refresh" @click="refresh()" />
      </el-tooltip>
      <el-tooltip class="item" effect="dark" content="显隐列" placement="top" v-if="columns">
-        <el-button circle icon="Menu" @click="showColumn()" />
+        <el-button circle icon="Menu" @click="showColumn()" v-if="showColumnsType == 'transfer'"/>
+        <el-dropdown trigger="click" :hide-on-click="false" style="padding-left: 12px" v-if="showColumnsType == 'checkbox'">
+          <el-button circle icon="Menu" />
+          <template #dropdown>
+            <el-dropdown-menu>
+              <template v-for="item in columns" :key="item.key">
+                <el-dropdown-item>
+                  <el-checkbox :checked="item.visible" @change="checkboxChange($event, item.label)" :label="item.label" />
+                </el-dropdown-item>
+              </template>
+            </el-dropdown-menu>
+          </template>
+        </el-dropdown>
      </el-tooltip>
    </el-row>
    <el-dialog :title="title" v-model="open" append-to-body>
@@ -24,17 +36,26 @@

 <script setup>
 const props = defineProps({
+  /* 是否显示检索条件 */
  showSearch: {
    type: Boolean,
    default: true,
  },
+  /* 显隐列信息 */
  columns: {
    type: Array,
  },
+  /* 是否显示检索图标 */
  search: {
    type: Boolean,
    default: true,
  },
+  /* 显隐列类型（transfer穿梭框、checkbox复选框） */
+  showColumnsType: {
+    type: String,
+    default: "checkbox",
+  },
+  /* 右外边距 */
  gutter: {
    type: Number,
    default: 10,
@@ -81,12 +102,20 @@ function showColumn() {
  open.value = true;
 }

-// 显隐列初始默认隐藏列
-for (let item in props.columns) {
-  if (props.columns[item].visible === false) {
-    value.value.push(parseInt(item));
+if (props.showColumnsType == 'transfer') {
+  // 显隐列初始默认隐藏列
+  for (let item in props.columns) {
+    if (props.columns[item].visible === false) {
+      value.value.push(parseInt(item));
+    }
  }
 }
+
+// 勾选
+function checkboxChange(event, label) {
+  props.columns.filter(item => item.label == label)[0].visible = event;
+}
+
 </script>

 <style lang='scss' scoped>
@@ -98,8 +127,8 @@ for (let item in props.columns) {
 :deep(.el-transfer__button:first-child) {
  margin-bottom: 10px;
 }
-
-.my-el-transfer {
-  text-align: center;
+:deep(.el-dropdown-menu__item) {
+  line-height: 30px;
+  padding: 0 17px;
 }
-</style>
+</style>
--- a/src/components/TopNav/index.vue
+++ b/src/components/TopNav/index.vue
@@ -6,10 +6,12 @@
    :ellipsis="false"
  >
    <template v-for="(item, index) in topMenus">
-      <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber"
-        ><svg-icon :icon-class="item.meta.icon" />
-        {{ item.meta.title }}</el-menu-item
-      >
+      <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber">
+        <svg-icon
+        v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
+        :icon-class="item.meta.icon"/>
+        {{ item.meta.title }}
+      </el-menu-item>
    </template>

    <!-- 顶部菜单超出数量折叠 -->
@@ -19,10 +21,12 @@
        <el-menu-item
          :index="item.path"
          :key="index"
-          v-if="index >= visibleNumber"
-          ><svg-icon :icon-class="item.meta.icon" />
-          {{ item.meta.title }}</el-menu-item
-        >
+          v-if="index >= visibleNumber">
+        <svg-icon
+          v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
+          :icon-class="item.meta.icon"/>
+        {{ item.meta.title }}
+        </el-menu-item>
      </template>
    </el-sub-menu>
  </el-menu>
@@ -189,4 +193,22 @@ onMounted(() => {
  padding: 0 5px !important;
  margin: 0 10px !important;
 }
+
+/* 背景色隐藏 */
+.topmenu-container.el-menu--horizontal>.el-menu-item:not(.is-disabled):focus, .topmenu-container.el-menu--horizontal>.el-menu-item:not(.is-disabled):hover, .topmenu-container.el-menu--horizontal>.el-submenu .el-submenu__title:hover {
+  background-color: #ffffff !important;
+}
+
+/* 图标右间距 */
+.topmenu-container .svg-icon {
+  margin-right: 4px;
+}
+
+/* topmenu more arrow */
+.topmenu-container .el-sub-menu .el-sub-menu__icon-arrow {
+  position: static;
+  vertical-align: middle;
+  margin-left: 8px;
+  margin-top: 0px;
+}
 </style>
--- a/src/layout/components/IframeToggle/index.vue
+++ b/src/layout/components/IframeToggle/index.vue
@@ -1,19 +1,25 @@
 <template>
-  <transition-group name="fade-transform" mode="out-in">
-    <inner-link
-      v-for="(item, index) in tagsViewStore.iframeViews"
-      :key="item.path"
-      :iframeId="'iframe' + index"
-      v-show="route.path === item.path"
-      :src="item.meta.link"
-    ></inner-link>
-  </transition-group>
+  <inner-link
+    v-for="(item, index) in tagsViewStore.iframeViews"
+    :key="item.path"
+    :iframeId="'iframe' + index"
+    v-show="route.path === item.path"
+    :src="iframeUrl(item.meta.link, item.query)"
+  ></inner-link>
 </template>

 <script setup>
-import InnerLink from "../InnerLink/index"
-import useTagsViewStore from '@/store/modules/tagsView'
+import InnerLink from "../InnerLink/index";
+import useTagsViewStore from "@/store/modules/tagsView";

 const route = useRoute();
-const tagsViewStore = useTagsViewStore()
+const tagsViewStore = useTagsViewStore();
+
+function iframeUrl(url, query) {
+  if (Object.keys(query).length > 0) {
+    let params = Object.keys(query).map((key) => key + "=" + query[key]).join("&");
+    return url + "?" + params;
+  }
+  return url;
+}
 </script>
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -33,7 +33,7 @@
              <router-link to="/user/profile">
                <el-dropdown-item>个人中心</el-dropdown-item>
              </router-link>
-              <el-dropdown-item command="setLayout">
+              <el-dropdown-item command="setLayout" v-if="settingsStore.showSettings">
                <span>布局设置</span>
              </el-dropdown-item>
              <el-dropdown-item divided command="logout">
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -38,35 +38,35 @@
    <div class="drawer-item">
      <span>开启 TopNav</span>
      <span class="comp-style">
-        <el-switch v-model="topNav" class="drawer-switch" />
+        <el-switch v-model="settingsStore.topNav" @change="topNavChange" class="drawer-switch" />
      </span>
    </div>

    <div class="drawer-item">
      <span>开启 Tags-Views</span>
      <span class="comp-style">
-        <el-switch v-model="tagsView" class="drawer-switch" />
+        <el-switch v-model="settingsStore.tagsView" class="drawer-switch" />
      </span>
    </div>

    <div class="drawer-item">
      <span>固定 Header</span>
      <span class="comp-style">
-        <el-switch v-model="fixedHeader" class="drawer-switch" />
+        <el-switch v-model="settingsStore.fixedHeader" class="drawer-switch" />
      </span>
    </div>

    <div class="drawer-item">
      <span>显示 Logo</span>
      <span class="comp-style">
-        <el-switch v-model="sidebarLogo" class="drawer-switch" />
+        <el-switch v-model="settingsStore.sidebarLogo" class="drawer-switch" />
      </span>
    </div>

    <div class="drawer-item">
      <span>动态标题</span>
      <span class="comp-style">
-        <el-switch v-model="dynamicTitle" class="drawer-switch" />
+        <el-switch v-model="settingsStore.dynamicTitle" class="drawer-switch" />
      </span>
    </div>

@@ -80,7 +80,6 @@

 <script setup>
 import variables from '@/assets/styles/variables.module.scss'
-import originElementPlus from 'element-plus/theme-chalk/index.css'
 import axios from 'axios'
 import { ElLoading, ElMessage } from 'element-plus'
 import { useDynamicTitle } from '@/utils/dynamicTitle'
@@ -100,56 +99,23 @@ const storeSettings = computed(() => settingsStore);
 const predefineColors = ref(["#409EFF", "#ff4500", "#ff8c00", "#ffd700", "#90ee90", "#00ced1", "#1e90ff", "#c71585"]);

 /** 是否需要topnav */
-const topNav = computed({
-  get: () => storeSettings.value.topNav,
-  set: (val) => {
-    settingsStore.changeSetting({ key: 'topNav', value: val })
-    if (!val) {
-      appStore.toggleSideBarHide(false);
-      permissionStore.setSidebarRouters(permissionStore.defaultRoutes);
-    }
+function topNavChange(val) {
+  if (!val) {
+    appStore.toggleSideBarHide(false);
+    permissionStore.setSidebarRouters(permissionStore.defaultRoutes);
  }
-})
-/** 是否需要tagview */
-const tagsView = computed({
-  get: () => storeSettings.value.tagsView,
-  set: (val) => {
-    settingsStore.changeSetting({ key: 'tagsView', value: val })
-  }
-})
-/**是否需要固定头部 */
-const fixedHeader = computed({
-  get: () => storeSettings.value.fixedHeader,
-  set: (val) => {
-    settingsStore.changeSetting({ key: 'fixedHeader', value: val })
-  }
-})
-/**是否需要侧边栏的logo */
-const sidebarLogo = computed({
-  get: () => storeSettings.value.sidebarLogo,
-  set: (val) => {
-    settingsStore.changeSetting({ key: 'sidebarLogo', value: val })
-  }
-})
-/**是否需要侧边栏的动态网页的title */
-const dynamicTitle = computed({
-  get: () => storeSettings.value.dynamicTitle,
-  set: (val) => {
-    settingsStore.changeSetting({ key: 'dynamicTitle', value: val })
-    // 动态设置网页标题
-    useDynamicTitle()
-  }
-})
+}

 function themeChange(val) {
-  settingsStore.changeSetting({ key: 'theme', value: val })
-  theme.value = val;
+  settingsStore.theme = val;
  handleThemeStyle(val);
 }
+
 function handleTheme(val) {
-  settingsStore.changeSetting({ key: 'sideTheme', value: val })
+  settingsStore.sideTheme = val;
  sideTheme.value = val;
 }
+
 function saveSetting() {
  proxy.$modal.loading("正在保存到本地，请稍候...");
  let layoutSetting = {
@@ -164,11 +130,13 @@ function saveSetting() {
  localStorage.setItem("layout-setting", JSON.stringify(layoutSetting));
  setTimeout(proxy.$modal.closeLoading(), 1000)
 }
+
 function resetSetting() {
  proxy.$modal.loading("正在清除设置缓存并刷新，请稍候...");
  localStorage.removeItem("layout-setting")
  setTimeout("window.location.reload()", 1000)
 }
+
 function openSetting() {
  showSettings.value = true;
 }
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -9,15 +9,15 @@
      </app-link>
    </template>

-    <el-sub-menu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
+    <el-sub-menu v-else ref="subMenu" :index="resolvePath(item.path)" teleported>
      <template v-if="item.meta" #title>
        <svg-icon :icon-class="item.meta && item.meta.icon" />
        <span class="menu-title" :title="hasTitle(item.meta.title)">{{ item.meta.title }}</span>
      </template>

      <sidebar-item
-        v-for="child in item.children"
-        :key="child.path"
+        v-for="(child, index) in item.children"
+        :key="child.path + index"
        :is-nest="true"
        :item="child"
        :base-path="resolvePath(child.path)"
--- a/src/layout/components/TagsView/ScrollPane.vue
+++ b/src/layout/components/TagsView/ScrollPane.vue
@@ -20,6 +20,7 @@ const scrollWrapper = computed(() => proxy.$refs.scrollContainer.$refs.wrapRef);
 onMounted(() => {
  scrollWrapper.value.addEventListener('scroll', emitScroll, true)
 })
+
 onBeforeUnmount(() => {
  scrollWrapper.value.removeEventListener('scroll', emitScroll)
 })
@@ -29,6 +30,7 @@ function handleScroll(e) {
  const $scrollWrapper = scrollWrapper.value;
  $scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4
 }
+
 const emits = defineEmits()
 const emitScroll = () => {
  emits('scroll')
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -67,6 +67,7 @@ watch(route, () => {
  addTags()
  moveToCurrentTag()
 })
+
 watch(visible, (value) => {
  if (value) {
    document.body.addEventListener('click', closeMenu)
@@ -74,6 +75,7 @@ watch(visible, (value) => {
    document.body.removeEventListener('click', closeMenu)
  }
 })
+
 onMounted(() => {
  initTags()
  addTags()
@@ -82,6 +84,7 @@ onMounted(() => {
 function isActive(r) {
  return r.path === route.path
 }
+
 function activeStyle(tag) {
  if (!isActive(tag)) return {};
  return {
@@ -89,9 +92,11 @@ function activeStyle(tag) {
    "border-color": theme.value
  };
 }
+
 function isAffix(tag) {
  return tag.meta && tag.meta.affix
 }
+
 function isFirstView() {
  try {
    return selectedTag.value.fullPath === '/index' || selectedTag.value.fullPath === visitedViews.value[1].fullPath
@@ -99,6 +104,7 @@ function isFirstView() {
    return false
  }
 }
+
 function isLastView() {
  try {
    return selectedTag.value.fullPath === visitedViews.value[visitedViews.value.length - 1].fullPath
@@ -106,6 +112,7 @@ function isLastView() {
    return false
  }
 }
+
 function filterAffixTags(routes, basePath = '') {
  let tags = []
  routes.forEach(route => {
@@ -127,6 +134,7 @@ function filterAffixTags(routes, basePath = '') {
  })
  return tags
 }
+
 function initTags() {
  const res = filterAffixTags(routes.value);
  affixTags.value = res;
@@ -137,6 +145,7 @@ function initTags() {
    }
  }
 }
+
 function addTags() {
  const { name } = route
  if (name) {
@@ -147,6 +156,7 @@ function addTags() {
  }
  return false
 }
+
 function moveToCurrentTag() {
  nextTick(() => {
    for (const r of visitedViews.value) {
@@ -160,12 +170,14 @@ function moveToCurrentTag() {
    }
  })
 }
+
 function refreshSelectedTag(view) {
  proxy.$tab.refreshPage(view);
  if (route.meta.link) {
    useTagsViewStore().delIframeView(route);
  }
 }
+
 function closeSelectedTag(view) {
  proxy.$tab.closePage(view).then(({ visitedViews }) => {
    if (isActive(view)) {
@@ -173,6 +185,7 @@ function closeSelectedTag(view) {
    }
  })
 }
+
 function closeRightTags() {
  proxy.$tab.closeRightPage(selectedTag.value).then(visitedViews => {
    if (!visitedViews.find(i => i.fullPath === route.fullPath)) {
@@ -180,6 +193,7 @@ function closeRightTags() {
    }
  })
 }
+
 function closeLeftTags() {
  proxy.$tab.closeLeftPage(selectedTag.value).then(visitedViews => {
    if (!visitedViews.find(i => i.fullPath === route.fullPath)) {
@@ -187,12 +201,14 @@ function closeLeftTags() {
    }
  })
 }
+
 function closeOthersTags() {
  router.push(selectedTag.value).catch(() => { });
  proxy.$tab.closeOtherPage(selectedTag.value).then(() => {
    moveToCurrentTag()
  })
 }
+
 function closeAllTags(view) {
  proxy.$tab.closeAllPage().then(({ visitedViews }) => {
    if (affixTags.value.some(tag => tag.path === route.path)) {
@@ -201,6 +217,7 @@ function closeAllTags(view) {
    toLastView(visitedViews, view)
  })
 }
+
 function toLastView(visitedViews, view) {
  const latestView = visitedViews.slice(-1)[0]
  if (latestView) {
@@ -216,6 +233,7 @@ function toLastView(visitedViews, view) {
    }
  }
 }
+
 function openMenu(tag, e) {
  const menuMinWidth = 105
  const offsetLeft = proxy.$el.getBoundingClientRect().left // container margin left
@@ -233,9 +251,11 @@ function openMenu(tag, e) {
  visible.value = true
  selectedTag.value = tag
 }
+
 function closeMenu() {
  visible.value = false
 }
+
 function handleScroll() {
  closeMenu()
 }
@@ -280,7 +300,7 @@ function handleScroll() {
          height: 8px;
          border-radius: 50%;
          position: relative;
-          margin-right: 2px;
+          margin-right: 5px;
        }
      }
    }
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -9,7 +9,7 @@
      </div>
      <app-main />
      <settings ref="settingRef" />
-    </div> 
+    </div>
  </div>
 </template>

@@ -40,10 +40,13 @@ const classObj = computed(() => ({
 const { width, height } = useWindowSize();
 const WIDTH = 992; // refer to Bootstrap's responsive design

-watchEffect(() => {
+watch(() => device.value, () => {
  if (device.value === 'mobile' && sidebar.value.opened) {
    useAppStore().closeSideBar({ withoutAnimation: false })
  }
+})
+
+watchEffect(() => {
  if (width.value - 1 < WIDTH) {
    useAppStore().toggleDevice('mobile')
    useAppStore().closeSideBar({ withoutAnimation: true })
--- a/src/main.js
+++ b/src/main.js
@@ -3,7 +3,8 @@ import { createApp } from 'vue'
 import Cookies from 'js-cookie'

 import ElementPlus from 'element-plus'
-import locale from 'element-plus/lib/locale/lang/zh-cn' // 中文语言
+import 'element-plus/dist/index.css'
+import locale from 'element-plus/es/locale/lang/zh-cn'

 import '@/assets/styles/index.scss' // global css

--- a/src/permission.js
+++ b/src/permission.js
@@ -21,6 +21,8 @@ router.beforeEach((to, from, next) => {
    if (to.path === '/login') {
      next({ path: '/' })
      NProgress.done()
+    } else if (whiteList.indexOf(to.path) !== -1) {
+      next()
    } else {
      if (useUserStore().roles.length === 0) {
        isRelogin.show = true
--- a/src/plugins/download.js
+++ b/src/plugins/download.js
@@ -1,11 +1,12 @@
-import axios from 'axios'
-import { ElMessage } from 'element-plus'
+import axios from 'axios'
+import { ElLoading, ElMessage } from 'element-plus'
 import { saveAs } from 'file-saver'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import { blobValidate } from '@/utils/ruoyi'

 const baseURL = import.meta.env.VITE_APP_BASE_API
+let downloadLoadingInstance;

 export default {
  name(name, isDelete = true) {
@@ -44,6 +45,7 @@ export default {
  },
  zip(url, name) {
    var url = baseURL + url
+    downloadLoadingInstance = ElLoading.service({ text: "正在下载数据，请稍候", background: "rgba(0, 0, 0, 0.7)", })
    axios({
      method: 'get',
      url: url,
@@ -57,6 +59,11 @@ export default {
      } else {
        this.printErrMsg(res.data);
      }
+      downloadLoadingInstance.close();
+    }).catch((r) => {
+      console.error(r)
+      ElMessage.error('下载文件出现错误，请联系管理员！')
+      downloadLoadingInstance.close();
    })
  },
  saveAs(text, name, opts) {
--- a/src/plugins/tab.js
+++ b/src/plugins/tab.js
@@ -35,7 +35,7 @@ export default {
      return useTagsViewStore().delView(router.currentRoute.value).then(({ visitedViews }) => {
        const latestView = visitedViews.slice(-1)[0]
        if (latestView) {
-            return router.push(latestView.fullPath)
+          return router.push(latestView.fullPath)
        }
        return router.push('/');
      });
--- a/src/settings.js
+++ b/src/settings.js
@@ -10,7 +10,7 @@ export default {
  /**
   * 是否系统布局配置
   */
-  showSettings: false,
+  showSettings: true,

  /**
   * 是否显示顶部导航
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -101,6 +101,10 @@ function filterChildren(childrenMap, lastRouter = false) {
    }
    if (lastRouter) {
      el.path = lastRouter.path + '/' + el.path
+      if (el.children && el.children.length) {
+        children = children.concat(filterChildren(el.children, el))
+        return
+      }
    }
    children = children.concat(el)
  })
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -7,6 +7,7 @@ const useUserStore = defineStore(
  {
    state: () => ({
      token: getToken(),
+      id: '',
      name: '',
      avatar: '',
      roles: [],
@@ -42,8 +43,9 @@ const useUserStore = defineStore(
            } else {
              this.roles = ['ROLE_DEFAULT']
            }
+            this.id = user.userId
            this.name = user.userName
-            this.avatar = avatar;
+            this.avatar = avatar
            resolve(res)
          }).catch(error => {
            reject(error)
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -42,6 +42,12 @@ service.interceptors.request.use(config => {
      data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
      time: new Date().getTime()
    }
+    const requestSize = Object.keys(JSON.stringify(requestObj)).length; // 请求数据大小
+    const limitSize = 5 * 1024 * 1024; // 限制存放数据5M
+    if (requestSize >= limitSize) {
+      console.warn(`[${config.url}]: ` + '请求数据大小超出允许的5M限制，无法进行防重复提交验证。')
+      return config;
+    }
    const sessionObj = cache.session.getJSON('sessionObj')
    if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
      cache.session.setJSON('sessionObj', requestObj)
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -122,7 +122,8 @@
              <s> 满180251782 </s> <s> 满104180207 </s> <s> 满186866453 </s> <s> 满201396349 </s>
              <s> 满101456076 </s> <s> 满101539465 </s> <s> 满264312783 </s> <s> 满167385320 </s> 
              <s> 满104748341 </s> <s> 满160110482 </s> <s> 满170801498 </s> <s> 满108482800 </s> 
-              <s> 满101046199 </s> <a href="https://jq.qq.com/?_wv=1027&k=tKEt51dz" target="_blank">136919097</a>
+              <s> 满101046199 </s> <s> 满136919097 </s> <s> 满143961921 </s> <s> 满174951577 </s> 
+              <s> 满161281055 </s> <s> 满138988063 </s> <a href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=SUc-msaypcqB2UTFif4eqGlBHkKcvMNP&authKey=JdQBouY2PG%2BS%2BCzAfIgbCGNgxyahpfh24IW%2F03rPxGilhqVbisLma%2FFFnt79DHNh&noverify=0&group_code=151450850" target="_blank">151450850</a>
            </p>
            <p>
              <i class="el-icon-chat-dot-round"></i> 微信：<a
@@ -148,6 +149,79 @@
            </div>
          </template>
          <el-collapse accordion>
+            <el-collapse-item title="v3.8.8 - 2024-06-30">
+              <ol>
+                <li>菜单管理新增路由名称</li>
+                <li>新增数据脱敏过滤注解</li>
+                <li>用户密码新增非法字符验证</li>
+                <li>限制用户操作数据权限范围</li>
+                <li>代码生成新增创建表结构功能</li>
+                <li>定时任务白名单配置范围缩小</li>
+                <li>优化代码生成主子表关联查询方式</li>
+                <li>Excel注解新增属性comboReadDict</li>
+                <li>Excel注解ColumnType类型新增文本</li>
+                <li>新增国际化资源文件配置</li>
+                <li>升级oshi到最新版本6.6.1</li>
+                <li>升级druid到最新版本1.2.23</li>
+                <li>升级core-js到最新版本3.37.1</li>
+                <li>更新HttpUtils中的User-Agent</li>
+                <li>更新compressionPlugin到6.1.2以兼容node18+</li>
+                <li>升级spring-security到安全版本，防止漏洞风险</li>
+                <li>升级spring-framework到安全版本，防止漏洞风险</li>
+                <li>优化自定义XSS注解匹配方式</li>
+                <li>优化缓存监控键名列表排序显示</li>
+                <li>优化定时任务日志默认按时间排序</li>
+                <li>优化默认文件大小超过2G无效的问题</li>
+                <li>优化查表特殊字符使用反斜杠进行转义</li>
+                <li>优化定时任务cron表达式小时配置显示错误问题</li>
+                <li>优化多个自定数据权限使用in查询,避免多次拼接</li>
+                <li>优化导入Excel时设置dictType属性重复查缓存问题</li>
+                <li>其他细节优化</li>
+              </ol>
+            </el-collapse-item>
+            <el-collapse-item title="v3.8.7 - 2023-12-08">
+              <ol>
+                <li>操作日志记录部门名称</li>
+                <li>全局数据存储用户编号</li>
+                <li>新增编程式判断资源访问权限</li>
+                <li>操作日志列表新增IP地址查询</li>
+                <li>定时任务新增页去除状态选项</li>
+                <li>代码生成支持选择前端模板类型</li>
+                <li>显隐列组件支持复选框弹出类型</li>
+                <li>通用排序属性orderBy参数限制长度</li>
+                <li>Excel自定义数据处理器增加单元格/工作簿对象</li>
+                <li>升级oshi到最新版本6.4.8</li>
+                <li>升级druid到最新版本1.2.20</li>
+                <li>升级fastjson到最新版2.0.43</li>
+                <li>升级pagehelper到最新版1.4.7</li>
+                <li>升级commons.io到最新版本2.13.0</li>
+                <li>升级element-ui到最新版本2.15.14</li>
+                <li>修复五级路由缓存无效问题</li>
+                <li>修复外链带端口出现的异常</li>
+                <li>修复树模板父级编码变量错误</li>
+                <li>修复字典表详情页面搜索问题</li>
+                <li>修复内链iframe没有传递参数问题</li>
+                <li>修复自定义字典样式不生效的问题</li>
+                <li>修复字典缓存删除方法参数错误问题</li>
+                <li>修复Excel导入数据临时文件无法删除问题</li>
+                <li>修复未登录带参数访问成功后参数丢失问题</li>
+                <li>修复HeaderSearch组件跳转query参数丢失问题</li>
+                <li>修复代码生成导入后必填项与数据库不匹配问题</li>
+                <li>修复Excels导入时无法获取到dictType字典值问题</li>
+                <li>优化下载zip方法新增遮罩层</li>
+                <li>优化头像上传参数新增文件名称</li>
+                <li>优化字典标签支持自定义分隔符</li>
+                <li>优化菜单管理类型为按钮状态可选</li>
+                <li>优化前端防重复提交数据大小限制</li>
+                <li>优化TopNav菜单没有图标svg不显示</li>
+                <li>优化数字金额大写转换精度丢失问题</li>
+                <li>优化富文本Editor组件检验图片格式</li>
+                <li>优化页签在Firefox浏览器被遮挡的问题</li>
+                <li>优化个人中心/基本资料修改时数据显示问题</li>
+                <li>优化缓存监控图表支持跟随屏幕大小自适应调整</li>
+                <li>其他细节优化</li>
+              </ol>
+            </el-collapse-item>
            <el-collapse-item title="v3.8.6 - 2023-06-30">
              <ol>
                <li>支持登录IP黑名单限制</li>
@@ -945,7 +1019,7 @@
 </template>

 <script setup name="Index">
-const version = ref('3.8.6')
+const version = ref('3.8.8')

 function goTarget(url) {
  window.open(url, '__blank')
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -59,7 +59,7 @@
    </el-form>
    <!--  底部  -->
    <div class="el-login-footer">
-      <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span>
    </div>
  </div>
 </template>
@@ -71,6 +71,7 @@ import { encrypt, decrypt } from "@/utils/jsencrypt";
 import useUserStore from '@/store/modules/user'

 const userStore = useUserStore()
+const route = useRoute();
 const router = useRouter();
 const { proxy } = getCurrentInstance();

@@ -96,6 +97,10 @@ const captchaEnabled = ref(true);
 const register = ref(false);
 const redirect = ref(undefined);

+watch(route, (newRoute) => {
+    redirect.value = newRoute.query && newRoute.query.redirect;
+}, { immediate: true });
+
 function handleLogin() {
  proxy.$refs.loginRef.validate(valid => {
    if (valid) {
@@ -113,7 +118,14 @@ function handleLogin() {
      }
      // 调用action的登录方法
      userStore.login(loginForm.value).then(() => {
-        router.push({ path: redirect.value || "/" });
+        const query = route.query;
+        const otherQueryParams = Object.keys(query).reduce((acc, cur) => {
+          if (cur !== "redirect") {
+            acc[cur] = query[cur];
+          }
+          return acc;
+        }, {});
+        router.push({ path: redirect.value || "/", query: otherQueryParams });
      }).catch(() => {
        loading.value = false;
        // 重新获取验证码
--- a/src/views/monitor/cache/index.vue
+++ b/src/views/monitor/cache/index.vue
@@ -98,7 +98,6 @@ function getList() {
        }
      ]
    });
-
    const usedmemoryInstance = echarts.init(usedmemory.value, "macarons");
    usedmemoryInstance.setOption({
      tooltip: {
@@ -122,6 +121,10 @@ function getList() {
        }
      ]
    })
+    window.addEventListener("resize", () => {
+      commandstatsIntance.resize();
+      usedmemoryInstance.resize();
+    });
  })
 }

--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -138,7 +138,7 @@
      />

      <!-- 添加或修改定时任务对话框 -->
-      <el-dialog :title="title" v-model="open" width="800px" append-to-body>
+      <el-dialog :title="title" v-model="open" width="820px" append-to-body>
         <el-form ref="jobRef" :model="form" :rules="rules" label-width="120px">
            <el-row>
               <el-col :span="12">
@@ -190,31 +190,31 @@
                     </el-input>
                  </el-form-item>
               </el-col>
-               <el-col :span="24">
+               <el-col :span="24" v-if="form.jobId !== undefined">
+                  <el-form-item label="状态">
+                     <el-radio-group v-model="form.status">
+                        <el-radio
+                           v-for="dict in sys_job_status"
+                           :key="dict.value"
+                           :value="dict.value"
+                        >{{ dict.label }}</el-radio>
+                     </el-radio-group>
+                  </el-form-item>
+               </el-col>
+               <el-col :span="12">
                  <el-form-item label="执行策略" prop="misfirePolicy">
                     <el-radio-group v-model="form.misfirePolicy">
-                        <el-radio-button label="1">立即执行</el-radio-button>
-                        <el-radio-button label="2">执行一次</el-radio-button>
-                        <el-radio-button label="3">放弃执行</el-radio-button>
+                        <el-radio-button value="1">立即执行</el-radio-button>
+                        <el-radio-button value="2">执行一次</el-radio-button>
+                        <el-radio-button value="3">放弃执行</el-radio-button>
                     </el-radio-group>
                  </el-form-item>
               </el-col>
               <el-col :span="12">
                  <el-form-item label="是否并发" prop="concurrent">
                     <el-radio-group v-model="form.concurrent">
-                        <el-radio-button label="0">允许</el-radio-button>
-                        <el-radio-button label="1">禁止</el-radio-button>
-                     </el-radio-group>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="12">
-                  <el-form-item label="状态">
-                     <el-radio-group v-model="form.status">
-                        <el-radio
-                           v-for="dict in sys_job_status"
-                           :key="dict.value"
-                           :label="dict.value"
-                        >{{ dict.label }}</el-radio>
+                        <el-radio-button value="0">允许</el-radio-button>
+                        <el-radio-button value="1">禁止</el-radio-button>
                     </el-radio-group>
                  </el-form-item>
               </el-col>
@@ -256,7 +256,7 @@
               <el-col :span="12">
                  <el-form-item label="任务状态：">
                     <div v-if="form.status == 0">正常</div>
-                     <div v-else-if="form.status == 1">失败</div>
+                     <div v-else-if="form.status == 1">暂停</div>
                  </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -331,15 +331,18 @@ function getList() {
    loading.value = false;
  });
 }
+
 /** 任务组名字典翻译 */
 function jobGroupFormat(row, column) {
  return proxy.selectDictLabel(sys_job_group.value, row.jobGroup);
 }
+
 /** 取消按钮 */
 function cancel() {
  open.value = false;
  reset();
 }
+
 /** 表单重置 */
 function reset() {
  form.value = {
@@ -354,22 +357,26 @@ function reset() {
  };
  proxy.resetForm("jobRef");
 }
+
 /** 搜索按钮操作 */
 function handleQuery() {
  queryParams.value.pageNum = 1;
  getList();
 }
+
 /** 重置按钮操作 */
 function resetQuery() {
  proxy.resetForm("queryRef");
  handleQuery();
 }
+
 // 多选框选中数据
 function handleSelectionChange(selection) {
  ids.value = selection.map(item => item.jobId);
  single.value = selection.length != 1;
  multiple.value = !selection.length;
 }
+
 // 更多操作触发
 function handleCommand(command, row) {
  switch (command) {
@@ -386,6 +393,7 @@ function handleCommand(command, row) {
      break;
  }
 }
+
 // 任务状态修改
 function handleStatusChange(row) {
  let text = row.status === "0" ? "启用" : "停用";
@@ -397,6 +405,7 @@ function handleStatusChange(row) {
    row.status = row.status === "0" ? "1" : "0";
  });
 }
+
 /* 立即执行一次 */
 function handleRun(row) {
  proxy.$modal.confirm('确认要立即执行一次"' + row.jobName + '"任务吗?').then(function () {
@@ -405,6 +414,7 @@ function handleRun(row) {
    proxy.$modal.msgSuccess("执行成功");})
  .catch(() => {});
 }
+
 /** 任务详细信息 */
 function handleView(row) {
  getJob(row.jobId).then(response => {
@@ -412,26 +422,31 @@ function handleView(row) {
    openView.value = true;
  });
 }
+
 /** cron表达式按钮操作 */
 function handleShowCron() {
  expression.value = form.value.cronExpression;
  openCron.value = true;
 }
+
 /** 确定后回传值 */
 function crontabFill(value) {
  form.value.cronExpression = value;
 }
+
 /** 任务日志列表查询 */
 function handleJobLog(row) {
  const jobId = row.jobId || 0;
  router.push('/monitor/job-log/index/' + jobId)
 }
+
 /** 新增按钮操作 */
 function handleAdd() {
  reset();
  open.value = true;
  title.value = "添加任务";
 }
+
 /** 修改按钮操作 */
 function handleUpdate(row) {
  reset();
@@ -442,6 +457,7 @@ function handleUpdate(row) {
    title.value = "修改任务";
  });
 }
+
 /** 提交按钮 */
 function submitForm() {
  proxy.$refs["jobRef"].validate(valid => {
@@ -462,6 +478,7 @@ function submitForm() {
    }
  });
 }
+
 /** 删除按钮操作 */
 function handleDelete(row) {
  const jobIds = row.jobId || ids.value;
@@ -472,6 +489,7 @@ function handleDelete(row) {
    proxy.$modal.msgSuccess("删除成功");
  }).catch(() => {});
 }
+
 /** 导出按钮操作 */
 function handleExport() {
  proxy.download("monitor/job/export", {
--- a/src/views/monitor/job/log.vue
+++ b/src/views/monitor/job/log.vue
@@ -209,32 +209,38 @@ function getList() {
    loading.value = false;
  });
 }
+
 // 返回按钮
 function handleClose() {
  const obj = { path: "/monitor/job" };
  proxy.$tab.closeOpenPage(obj);
 }
+
 /** 搜索按钮操作 */
 function handleQuery() {
  queryParams.value.pageNum = 1;
  getList();
 }
+
 /** 重置按钮操作 */
 function resetQuery() {
  dateRange.value = [];
  proxy.resetForm("queryRef");
  handleQuery();
 }
+
 // 多选框选中数据
 function handleSelectionChange(selection) {
  ids.value = selection.map(item => item.jobLogId);
  multiple.value = !selection.length;
 }
+
 /** 详细按钮操作 */
 function handleView(row) {
  open.value = true;
  form.value = row;
 }
+
 /** 删除按钮操作 */
 function handleDelete(row) {
  proxy.$modal.confirm('是否确认删除调度日志编号为"' + ids.value + '"的数据项?').then(function () {
@@ -244,6 +250,7 @@ function handleDelete(row) {
    proxy.$modal.msgSuccess("删除成功");
  }).catch(() => {});
 }
+
 /** 清空按钮操作 */
 function handleClean() {
  proxy.$modal.confirm("是否确认清空所有调度日志数据项?").then(function () {
@@ -253,6 +260,7 @@ function handleClean() {
    proxy.$modal.msgSuccess("清空成功");
  }).catch(() => {});
 }
+
 /** 导出按钮操作 */
 function handleExport() {
  proxy.download("monitor/jobLog/export", {
@@ -272,6 +280,4 @@ function handleExport() {
    getList();
  }
 })();
-
-getList();
 </script>
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -161,11 +161,13 @@ function getList() {
    loading.value = false;
  });
 }
+
 /** 搜索按钮操作 */
 function handleQuery() {
  queryParams.value.pageNum = 1;
  getList();
 }
+
 /** 重置按钮操作 */
 function resetQuery() {
  dateRange.value = [];
@@ -173,6 +175,7 @@ function resetQuery() {
  queryParams.value.pageNum = 1;
  proxy.$refs["logininforRef"].sort(defaultSort.value.prop, defaultSort.value.order);
 }
+
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
  ids.value = selection.map(item => item.infoId);
@@ -180,12 +183,14 @@ function handleSelectionChange(selection) {
  single.value = selection.length != 1;
  selectName.value = selection.map(item => item.userName);
 }
+
 /** 排序触发事件 */
 function handleSortChange(column, prop, order) {
  queryParams.value.orderByColumn = column.prop;
  queryParams.value.isAsc = column.order;
  getList();
 }
+
 /** 删除按钮操作 */
 function handleDelete(row) {
  const infoIds = row.infoId || ids.value;
@@ -196,6 +201,7 @@ function handleDelete(row) {
    proxy.$modal.msgSuccess("删除成功");
  }).catch(() => {});
 }
+
 /** 清空按钮操作 */
 function handleClean() {
  proxy.$modal.confirm("是否确认清空所有登录日志数据项?").then(function () {
@@ -205,6 +211,7 @@ function handleClean() {
    proxy.$modal.msgSuccess("清空成功");
  }).catch(() => {});
 }
+
 /** 解锁按钮操作 */
 function handleUnlock() {
  const username = selectName.value;
@@ -214,6 +221,7 @@ function handleUnlock() {
    proxy.$modal.msgSuccess("用户" + username + "解锁成功");
  }).catch(() => {});
 }
+
 /** 导出按钮操作 */
 function handleExport() {
  proxy.download("monitor/logininfor/export", {
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -82,16 +82,19 @@ function getList() {
    loading.value = false;
  });
 }
+
 /** 搜索按钮操作 */
 function handleQuery() {
  pageNum.value = 1;
  getList();
 }
+
 /** 重置按钮操作 */
 function resetQuery() {
  proxy.resetForm("queryRef");
  handleQuery();
 }
+
 /** 强退按钮操作 */
 function handleForceLogout(row) {
    proxy.$modal.confirm('是否确认强退名称为"' + row.userName + '"的用户?').then(function () {
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -1,6 +1,15 @@
 <template>
   <div class="app-container">
      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+         <el-form-item label="操作地址" prop="operIp">
+            <el-input
+               v-model="queryParams.operIp"
+               placeholder="请输入操作地址"
+               clearable
+               style="width: 240px;"
+               @keyup.enter="handleQuery"
+            />
+         </el-form-item>
         <el-form-item label="系统模块" prop="title">
            <el-input
               v-model="queryParams.title"
@@ -108,7 +117,7 @@
            </template>
         </el-table-column>
         <el-table-column label="操作人员" align="center" width="110" prop="operName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
-         <el-table-column label="主机" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
+         <el-table-column label="操作地址" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
         <el-table-column label="操作状态" align="center" prop="status">
            <template #default="scope">
               <dict-tag :options="sys_common_status" :value="scope.row.status" />
@@ -140,7 +149,7 @@
      />

      <!-- 操作日志详细 -->
-      <el-dialog title="操作日志详细" v-model="open" width="700px" append-to-body>
+      <el-dialog title="操作日志详细" v-model="open" width="800px" append-to-body>
         <el-form :model="form" label-width="100px">
            <el-row>
               <el-col :span="12">
@@ -162,7 +171,7 @@
               <el-col :span="24">
                  <el-form-item label="返回参数：">{{ form.jsonResult }}</el-form-item>
               </el-col>
-               <el-col :span="6">
+               <el-col :span="8">
                  <el-form-item label="操作状态：">
                     <div v-if="form.status === 0">正常</div>
                     <div v-else-if="form.status === 1">失败</div>
@@ -171,7 +180,7 @@
               <el-col :span="8">
                  <el-form-item label="消耗时间：">{{ form.costTime }}毫秒</el-form-item>
               </el-col>
-               <el-col :span="10">
+               <el-col :span="8">
                  <el-form-item label="操作时间：">{{ parseTime(form.operTime) }}</el-form-item>
               </el-col>
               <el-col :span="24">
@@ -211,6 +220,7 @@ const data = reactive({
  queryParams: {
    pageNum: 1,
    pageSize: 10,
+    operIp: undefined,
    title: undefined,
    operName: undefined,
    businessType: undefined,
@@ -229,15 +239,18 @@ function getList() {
    loading.value = false;
  });
 }
+
 /** 操作日志类型字典翻译 */
 function typeFormat(row, column) {
  return proxy.selectDictLabel(sys_oper_type.value, row.businessType);
 }
+
 /** 搜索按钮操作 */
 function handleQuery() {
  queryParams.value.pageNum = 1;
  getList();
 }
+
 /** 重置按钮操作 */
 function resetQuery() {
  dateRange.value = [];
@@ -245,22 +258,26 @@ function resetQuery() {
  queryParams.value.pageNum = 1;
  proxy.$refs["operlogRef"].sort(defaultSort.value.prop, defaultSort.value.order);
 }
+
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
  ids.value = selection.map(item => item.operId);
  multiple.value = !selection.length;
 }
+
 /** 排序触发事件 */
 function handleSortChange(column, prop, order) {
  queryParams.value.orderByColumn = column.prop;
  queryParams.value.isAsc = column.order;
  getList();
 }
+
 /** 详细按钮操作 */
 function handleView(row) {
  open.value = true;
  form.value = row;
 }
+
 /** 删除按钮操作 */
 function handleDelete(row) {
  const operIds = row.operId || ids.value;
@@ -271,6 +288,7 @@ function handleDelete(row) {
    proxy.$modal.msgSuccess("删除成功");
  }).catch(() => {});
 }
+
 /** 清空按钮操作 */
 function handleClean() {
  proxy.$modal.confirm("是否确认清空所有操作日志数据项?").then(function () {
@@ -280,6 +298,7 @@ function handleClean() {
    proxy.$modal.msgSuccess("清空成功");
  }).catch(() => {});
 }
+
 /** 导出按钮操作 */
 function handleExport() {
  proxy.download("monitor/operlog/export",{
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -70,7 +70,7 @@
    </el-form>
    <!--  底部  -->
    <div class="el-register-footer">
-      <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span>
    </div>
  </div>
 </template>
@@ -105,7 +105,8 @@ const registerRules = {
  ],
  password: [
    { required: true, trigger: "blur", message: "请输入您的密码" },
-    { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }
+    { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" },
+    { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
  ],
  confirmPassword: [
    { required: true, trigger: "blur", message: "请再次输入您的密码" },
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -146,7 +146,7 @@
                  <el-radio
                     v-for="dict in sys_yes_no"
                     :key="dict.value"
-                     :label="dict.value"
+                     :value="dict.value"
                  >{{ dict.label }}</el-radio>
               </el-radio-group>
            </el-form-item>
@@ -208,11 +208,13 @@ function getList() {
    loading.value = false;
  });
 }
+
 /** 取消按钮 */
 function cancel() {
  open.value = false;
  reset();
 }
+
 /** 表单重置 */
 function reset() {
  form.value = {
@@ -225,29 +227,34 @@ function reset() {
  };
  proxy.resetForm("configRef");
 }
+
 /** 搜索按钮操作 */
 function handleQuery() {
  queryParams.value.pageNum = 1;
  getList();
 }
+
 /** 重置按钮操作 */
 function resetQuery() {
  dateRange.value = [];
  proxy.resetForm("queryRef");
  handleQuery();
 }
+
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
  ids.value = selection.map(item => item.configId);
  single.value = selection.length != 1;
  multiple.value = !selection.length;
 }
+
 /** 新增按钮操作 */
 function handleAdd() {
  reset();
  open.value = true;
  title.value = "添加参数";
 }
+
 /** 修改按钮操作 */
 function handleUpdate(row) {
  reset();
@@ -258,6 +265,7 @@ function handleUpdate(row) {
    title.value = "修改参数";
  });
 }
+
 /** 提交按钮 */
 function submitForm() {
  proxy.$refs["configRef"].validate(valid => {
@@ -278,6 +286,7 @@ function submitForm() {
    }
  });
 }
+
 /** 删除按钮操作 */
 function handleDelete(row) {
  const configIds = row.configId || ids.value;
@@ -288,12 +297,14 @@ function handleDelete(row) {
    proxy.$modal.msgSuccess("删除成功");
  }).catch(() => {});
 }
+
 /** 导出按钮操作 */
 function handleExport() {
  proxy.download("system/config/export", {
    ...queryParams.value
  }, `config_${new Date().getTime()}.xlsx`);
 }
+
 /** 刷新缓存按钮操作 */
 function handleRefreshCache() {
  refreshCache().then(() => {
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -123,7 +123,7 @@
                        <el-radio
                           v-for="dict in sys_normal_disable"
                           :key="dict.value"
-                           :label="dict.value"
+                           :value="dict.value"
                        >{{ dict.label }}</el-radio>
                     </el-radio-group>
                  </el-form-item>
@@ -180,11 +180,13 @@ function getList() {
    loading.value = false;
  });
 }
+
 /** 取消按钮 */
 function cancel() {
  open.value = false;
  reset();
 }
+
 /** 表单重置 */
 function reset() {
  form.value = {
@@ -199,15 +201,18 @@ function reset() {
  };
  proxy.resetForm("deptRef");
 }
+
 /** 搜索按钮操作 */
 function handleQuery() {
  getList();
 }
+
 /** 重置按钮操作 */
 function resetQuery() {
  proxy.resetForm("queryRef");
  handleQuery();
 }
+
 /** 新增按钮操作 */
 function handleAdd(row) {
  reset();
@@ -220,6 +225,7 @@ function handleAdd(row) {
  open.value = true;
  title.value = "添加部门";
 }
+
 /** 展开/折叠操作 */
 function toggleExpandAll() {
  refreshTable.value = false;
@@ -228,6 +234,7 @@ function toggleExpandAll() {
    refreshTable.value = true;
  });
 }
+
 /** 修改按钮操作 */
 function handleUpdate(row) {
  reset();
@@ -240,6 +247,7 @@ function handleUpdate(row) {
    title.value = "修改部门";
  });
 }
+
 /** 提交按钮 */
 function submitForm() {
  proxy.$refs["deptRef"].validate(valid => {
@@ -260,6 +268,7 @@ function submitForm() {
    }
  });
 }
+
 /** 删除按钮操作 */
 function handleDelete(row) {
  proxy.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function() {
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -91,8 +91,8 @@
         <el-table-column label="字典编码" align="center" prop="dictCode" />
         <el-table-column label="字典标签" align="center" prop="dictLabel">
            <template #default="scope">
-               <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{ scope.row.dictLabel }}</span>
-               <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{ scope.row.dictLabel }}</el-tag>
+               <span v-if="(scope.row.listClass == '' || scope.row.listClass == 'default') && (scope.row.cssClass == '' || scope.row.cssClass == null)">{{ scope.row.dictLabel }}</span>
+               <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass" :class="scope.row.cssClass">{{ scope.row.dictLabel }}</el-tag>
            </template>
         </el-table-column>
         <el-table-column label="字典键值" align="center" prop="dictValue" />
@@ -157,7 +157,7 @@
                  <el-radio
                     v-for="dict in sys_normal_disable"
                     :key="dict.value"
-                     :label="dict.value"
+                     :value="dict.value"
                  >{{ dict.label }}</el-radio>
               </el-radio-group>
            </el-form-item>
@@ -210,8 +210,8 @@ const data = reactive({
  queryParams: {
    pageNum: 1,
    pageSize: 10,
-    dictName: undefined,
    dictType: undefined,
+    dictLabel: undefined,
    status: undefined
  },
  rules: {
@@ -238,6 +238,7 @@ function getTypeList() {
    typeOptions.value = response.data;
  });
 }
+
 /** 查询字典数据列表 */
 function getList() {
  loading.value = true;
@@ -247,11 +248,13 @@ function getList() {
    loading.value = false;
  });
 }
+
 /** 取消按钮 */
 function cancel() {
  open.value = false;
  reset();
 }
+
 /** 表单重置 */
 function reset() {
  form.value = {
@@ -266,22 +269,26 @@ function reset() {
  };
  proxy.resetForm("dataRef");
 }
+
 /** 搜索按钮操作 */
 function handleQuery() {
  queryParams.value.pageNum = 1;
  getList();
 }
+
 /** 返回按钮操作 */
 function handleClose() {
  const obj = { path: "/system/dict" };
  proxy.$tab.closeOpenPage(obj);
 }
+
 /** 重置按钮操作 */
 function resetQuery() {
  proxy.resetForm("queryRef");
-  queryParams.value.dictType = defaultDictType;
+  queryParams.value.dictType = defaultDictType.value;
  handleQuery();
 }
+
 /** 新增按钮操作 */
 function handleAdd() {
  reset();
@@ -289,12 +296,14 @@ function handleAdd() {
  title.value = "添加字典数据";
  form.value.dictType = queryParams.value.dictType;
 }
+
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
  ids.value = selection.map(item => item.dictCode);
  single.value = selection.length != 1;
  multiple.value = !selection.length;
 }
+
 /** 修改按钮操作 */
 function handleUpdate(row) {
  reset();
@@ -305,6 +314,7 @@ function handleUpdate(row) {
    title.value = "修改字典数据";
  });
 }
+
 /** 提交按钮 */
 function submitForm() {
  proxy.$refs["dataRef"].validate(valid => {
@@ -327,6 +337,7 @@ function submitForm() {
    }
  });
 }
+
 /** 删除按钮操作 */
 function handleDelete(row) {
  const dictCodes = row.dictCode || ids.value;
@@ -338,6 +349,7 @@ function handleDelete(row) {
    useDictStore().removeDict(queryParams.value.dictType);
  }).catch(() => {});
 }
+
 /** 导出按钮操作 */
 function handleExport() {
  proxy.download("system/dict/data/export", {
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -153,7 +153,7 @@
                  <el-radio
                     v-for="dict in sys_normal_disable"
                     :key="dict.value"
-                     :label="dict.value"
+                     :value="dict.value"
                  >{{ dict.label }}</el-radio>
               </el-radio-group>
            </el-form-item>
@@ -215,11 +215,13 @@ function getList() {
    loading.value = false;
  });
 }
+
 /** 取消按钮 */
 function cancel() {
  open.value = false;
  reset();
 }
+
 /** 表单重置 */
 function reset() {
  form.value = {
@@ -231,29 +233,34 @@ function reset() {
  };
  proxy.resetForm("dictRef");
 }
+
 /** 搜索按钮操作 */
 function handleQuery() {
  queryParams.value.pageNum = 1;
  getList();
 }
+
 /** 重置按钮操作 */
 function resetQuery() {
  dateRange.value = [];
  proxy.resetForm("queryRef");
  handleQuery();
 }
+
 /** 新增按钮操作 */
 function handleAdd() {
  reset();
  open.value = true;
  title.value = "添加字典类型";
 }
+
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
  ids.value = selection.map(item => item.dictId);
  single.value = selection.length != 1;
  multiple.value = !selection.length;
 }
+
 /** 修改按钮操作 */
 function handleUpdate(row) {
  reset();
@@ -264,6 +271,7 @@ function handleUpdate(row) {
    title.value = "修改字典类型";
  });
 }
+
 /** 提交按钮 */
 function submitForm() {
  proxy.$refs["dictRef"].validate(valid => {
@@ -284,6 +292,7 @@ function submitForm() {
    }
  });
 }
+
 /** 删除按钮操作 */
 function handleDelete(row) {
  const dictIds = row.dictId || ids.value;
@@ -294,12 +303,14 @@ function handleDelete(row) {
    proxy.$modal.msgSuccess("删除成功");
  }).catch(() => {});
 }
+
 /** 导出按钮操作 */
 function handleExport() {
  proxy.download("system/dict/type/export", {
    ...queryParams.value
  }, `dict_${new Date().getTime()}.xlsx`);
 }
+
 /** 刷新缓存按钮操作 */
 function handleRefreshCache() {
  refreshCache().then(() => {
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -102,23 +102,21 @@
               <el-col :span="24">
                  <el-form-item label="菜单类型" prop="menuType">
                     <el-radio-group v-model="form.menuType">
-                        <el-radio label="M">目录</el-radio>
-                        <el-radio label="C">菜单</el-radio>
-                        <el-radio label="F">按钮</el-radio>
+                        <el-radio value="M">目录</el-radio>
+                        <el-radio value="C">菜单</el-radio>
+                        <el-radio value="F">按钮</el-radio>
                     </el-radio-group>
                  </el-form-item>
               </el-col>
-               <el-col :span="24" v-if="form.menuType != 'F'">
+               <el-col :span="12" v-if="form.menuType != 'F'">
                  <el-form-item label="菜单图标" prop="icon">
                     <el-popover
                        placement="bottom-start"
                        :width="540"
-                        v-model:visible="showChooseIcon"
                        trigger="click"
-                        @show="showSelectIcon"
                     >
                        <template #reference>
-                           <el-input v-model="form.icon" placeholder="点击选择图标" @blur="showSelectIcon" v-click-outside="hideSelectIcon" readonly>
+                           <el-input v-model="form.icon" placeholder="点击选择图标" @blur="showSelectIcon" readonly>
                              <template #prefix>
                                 <svg-icon
                                    v-if="form.icon"
@@ -134,14 +132,27 @@
                     </el-popover>
                  </el-form-item>
               </el-col>
+               <el-col :span="12">
+                  <el-form-item label="显示排序" prop="orderNum">
+                     <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+                  </el-form-item>
+               </el-col>
               <el-col :span="12">
                  <el-form-item label="菜单名称" prop="menuName">
                     <el-input v-model="form.menuName" placeholder="请输入菜单名称" />
                  </el-form-item>
               </el-col>
-               <el-col :span="12">
-                  <el-form-item label="显示排序" prop="orderNum">
-                     <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+               <el-col :span="12" v-if="form.menuType == 'C'">
+                  <el-form-item prop="routeName">
+                     <template #label>
+                        <span>
+                           <el-tooltip content="默认不填则和路由地址相同：如地址为：`user`，则名称为`User`（注意：因为router会删除名称相同路由，为避免名字的冲突，特殊情况下请自定义，保证唯一性）" placement="top">
+                              <el-icon><question-filled /></el-icon>
+                           </el-tooltip>
+                           路由名称
+                        </span>
+                     </template>
+                     <el-input v-model="form.routeName" placeholder="请输入路由名称" />
                  </el-form-item>
               </el-col>
               <el-col :span="12" v-if="form.menuType != 'F'">
@@ -154,8 +165,8 @@
                        </span>
                     </template>
                     <el-radio-group v-model="form.isFrame">
-                        <el-radio label="0">是</el-radio>
-                        <el-radio label="1">否</el-radio>
+                        <el-radio value="0">是</el-radio>
+                        <el-radio value="1">否</el-radio>
                     </el-radio-group>
                  </el-form-item>
               </el-col>
@@ -222,8 +233,8 @@
                        </span>
                     </template>
                     <el-radio-group v-model="form.isCache">
-                        <el-radio label="0">缓存</el-radio>
-                        <el-radio label="1">不缓存</el-radio>
+                        <el-radio value="0">缓存</el-radio>
+                        <el-radio value="1">不缓存</el-radio>
                     </el-radio-group>
                  </el-form-item>
               </el-col>
@@ -241,12 +252,12 @@
                        <el-radio
                           v-for="dict in sys_show_hide"
                           :key="dict.value"
-                           :label="dict.value"
+                           :value="dict.value"
                        >{{ dict.label }}</el-radio>
                     </el-radio-group>
                  </el-form-item>
               </el-col>
-               <el-col :span="12" v-if="form.menuType != 'F'">
+               <el-col :span="12">
                  <el-form-item>
                     <template #label>
                        <span>
@@ -260,7 +271,7 @@
                        <el-radio
                           v-for="dict in sys_normal_disable"
                           :key="dict.value"
-                           :label="dict.value"
+                           :value="dict.value"
                        >{{ dict.label }}</el-radio>
                     </el-radio-group>
                  </el-form-item>
@@ -281,7 +292,6 @@
 import { addMenu, delMenu, getMenu, listMenu, updateMenu } from "@/api/system/menu";
 import SvgIcon from "@/components/SvgIcon";
 import IconSelect from "@/components/IconSelect";
-import { ClickOutside as vClickOutside } from 'element-plus'

 const { proxy } = getCurrentInstance();
 const { sys_show_hide, sys_normal_disable } = proxy.useDict("sys_show_hide", "sys_normal_disable");
@@ -294,7 +304,6 @@ const title = ref("");
 const menuOptions = ref([]);
 const isExpandAll = ref(false);
 const refreshTable = ref(true);
-const showChooseIcon = ref(false);
 const iconSelectRef = ref(null);

 const data = reactive({
@@ -320,6 +329,7 @@ function getList() {
    loading.value = false;
  });
 }
+
 /** 查询菜单下拉树结构 */
 function getTreeselect() {
  menuOptions.value = [];
@@ -329,11 +339,13 @@ function getTreeselect() {
    menuOptions.value.push(menu);
  });
 }
+
 /** 取消按钮 */
 function cancel() {
  open.value = false;
  reset();
 }
+
 /** 表单重置 */
 function reset() {
  form.value = {
@@ -350,33 +362,28 @@ function reset() {
  };
  proxy.resetForm("menuRef");
 }
+
 /** 展示下拉图标 */
 function showSelectIcon() {
  iconSelectRef.value.reset();
-  showChooseIcon.value = true;
 }
+
 /** 选择图标 */
 function selected(name) {
  form.value.icon = name;
-  showChooseIcon.value = false;
-}
-/** 图标外层点击隐藏下拉列表 */
-function hideSelectIcon(event) {
-  var elem = event.relatedTarget || event.srcElement || event.target || event.currentTarget;
-  var className = elem.className;
-  if (className !== "el-input__inner") {
-    showChooseIcon.value = false;
-  }
 }
+
 /** 搜索按钮操作 */
 function handleQuery() {
  getList();
 }
+
 /** 重置按钮操作 */
 function resetQuery() {
  proxy.resetForm("queryRef");
  handleQuery();
 }
+
 /** 新增按钮操作 */
 function handleAdd(row) {
  reset();
@@ -389,6 +396,7 @@ function handleAdd(row) {
  open.value = true;
  title.value = "添加菜单";
 }
+
 /** 展开/折叠操作 */
 function toggleExpandAll() {
  refreshTable.value = false;
@@ -397,6 +405,7 @@ function toggleExpandAll() {
    refreshTable.value = true;
  });
 }
+
 /** 修改按钮操作 */
 async function handleUpdate(row) {
  reset();
@@ -407,6 +416,7 @@ async function handleUpdate(row) {
    title.value = "修改菜单";
  });
 }
+
 /** 提交按钮 */
 function submitForm() {
  proxy.$refs["menuRef"].validate(valid => {
@@ -427,6 +437,7 @@ function submitForm() {
    }
  });
 }
+
 /** 删除按钮操作 */
 function handleDelete(row) {
  proxy.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项?').then(function() {
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -136,7 +136,7 @@
                        <el-radio
                           v-for="dict in sys_notice_status"
                           :key="dict.value"
-                           :label="dict.value"
+                           :value="dict.value"
                        >{{ dict.label }}</el-radio>
                     </el-radio-group>
                  </el-form-item>
@@ -200,11 +200,13 @@ function getList() {
    loading.value = false;
  });
 }
+
 /** 取消按钮 */
 function cancel() {
  open.value = false;
  reset();
 }
+
 /** 表单重置 */
 function reset() {
  form.value = {
@@ -216,28 +218,33 @@ function reset() {
  };
  proxy.resetForm("noticeRef");
 }
+
 /** 搜索按钮操作 */
 function handleQuery() {
  queryParams.value.pageNum = 1;
  getList();
 }
+
 /** 重置按钮操作 */
 function resetQuery() {
  proxy.resetForm("queryRef");
  handleQuery();
 }
+
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
  ids.value = selection.map(item => item.noticeId);
  single.value = selection.length != 1;
  multiple.value = !selection.length;
 }
+
 /** 新增按钮操作 */
 function handleAdd() {
  reset();
  open.value = true;
  title.value = "添加公告";
 }
+
 /**修改按钮操作 */
 function handleUpdate(row) {
  reset();
@@ -248,6 +255,7 @@ function handleUpdate(row) {
    title.value = "修改公告";
  });
 }
+
 /** 提交按钮 */
 function submitForm() {
  proxy.$refs["noticeRef"].validate(valid => {
@@ -268,6 +276,7 @@ function submitForm() {
    }
  });
 }
+
 /** 删除按钮操作 */
 function handleDelete(row) {
  const noticeIds = row.noticeId || ids.value
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -126,7 +126,7 @@
                  <el-radio
                     v-for="dict in sys_normal_disable"
                     :key="dict.value"
-                     :label="dict.value"
+                     :value="dict.value"
                  >{{ dict.label }}</el-radio>
               </el-radio-group>
            </el-form-item>
@@ -187,11 +187,13 @@ function getList() {
    loading.value = false;
  });
 }
+
 /** 取消按钮 */
 function cancel() {
  open.value = false;
  reset();
 }
+
 /** 表单重置 */
 function reset() {
  form.value = {
@@ -204,28 +206,33 @@ function reset() {
  };
  proxy.resetForm("postRef");
 }
+
 /** 搜索按钮操作 */
 function handleQuery() {
  queryParams.value.pageNum = 1;
  getList();
 }
+
 /** 重置按钮操作 */
 function resetQuery() {
  proxy.resetForm("queryRef");
  handleQuery();
 }
+
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
  ids.value = selection.map(item => item.postId);
  single.value = selection.length != 1;
  multiple.value = !selection.length;
 }
+
 /** 新增按钮操作 */
 function handleAdd() {
  reset();
  open.value = true;
  title.value = "添加岗位";
 }
+
 /** 修改按钮操作 */
 function handleUpdate(row) {
  reset();
@@ -236,6 +243,7 @@ function handleUpdate(row) {
    title.value = "修改岗位";
  });
 }
+
 /** 提交按钮 */
 function submitForm() {
  proxy.$refs["postRef"].validate(valid => {
@@ -256,6 +264,7 @@ function submitForm() {
    }
  });
 }
+
 /** 删除按钮操作 */
 function handleDelete(row) {
  const postIds = row.postId || ids.value;
@@ -266,6 +275,7 @@ function handleDelete(row) {
    proxy.$modal.msgSuccess("删除成功");
  }).catch(() => {});
 }
+
 /** 导出按钮操作 */
 function handleExport() {
  proxy.download("system/post/export", {
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -123,30 +123,36 @@ function getList() {
    loading.value = false;
  });
 }
-// 返回按钮
+
+/** 返回按钮 */
 function handleClose() {
  const obj = { path: "/system/role" };
  proxy.$tab.closeOpenPage(obj);
 }
+
 /** 搜索按钮操作 */
 function handleQuery() {
  queryParams.pageNum = 1;
  getList();
 }
+
 /** 重置按钮操作 */
 function resetQuery() {
  proxy.resetForm("queryRef");
  handleQuery();
 }
-// 多选框选中数据
+
+/** 多选框选中数据 */
 function handleSelectionChange(selection) {
  userIds.value = selection.map(item => item.userId);
  multiple.value = !selection.length;
 }
+
 /** 打开授权用户表弹窗 */
 function openSelectUser() {
  proxy.$refs["selectRef"].show();
 }
+
 /** 取消授权按钮操作 */
 function cancelAuthUser(row) {
  proxy.$modal.confirm('确认要取消该用户"' + row.userName + '"角色吗？').then(function () {
@@ -156,6 +162,7 @@ function cancelAuthUser(row) {
    proxy.$modal.msgSuccess("取消授权成功");
  }).catch(() => {});
 }
+
 /** 批量取消授权按钮操作 */
 function cancelAuthUserAll(row) {
  const roleId = queryParams.roleId;
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -164,7 +164,7 @@
                  <el-radio
                     v-for="dict in sys_normal_disable"
                     :key="dict.value"
-                     :label="dict.value"
+                     :value="dict.value"
                  >{{ dict.label }}</el-radio>
               </el-radio-group>
            </el-form-item>
@@ -305,17 +305,20 @@ function getList() {
    loading.value = false;
  });
 }
+
 /** 搜索按钮操作 */
 function handleQuery() {
  queryParams.value.pageNum = 1;
  getList();
 }
+
 /** 重置按钮操作 */
 function resetQuery() {
  dateRange.value = [];
  proxy.resetForm("queryRef");
  handleQuery();
 }
+
 /** 删除按钮操作 */
 function handleDelete(row) {
  const roleIds = row.roleId || ids.value;
@@ -326,18 +329,21 @@ function handleDelete(row) {
    proxy.$modal.msgSuccess("删除成功");
  }).catch(() => {});
 }
+
 /** 导出按钮操作 */
 function handleExport() {
  proxy.download("system/role/export", {
    ...queryParams.value,
  }, `role_${new Date().getTime()}.xlsx`);
 }
+
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
  ids.value = selection.map(item => item.roleId);
  single.value = selection.length != 1;
  multiple.value = !selection.length;
 }
+
 /** 角色状态修改 */
 function handleStatusChange(row) {
  let text = row.status === "0" ? "启用" : "停用";
@@ -349,6 +355,7 @@ function handleStatusChange(row) {
    row.status = row.status === "0" ? "1" : "0";
  });
 }
+
 /** 更多操作 */
 function handleCommand(command, row) {
  switch (command) {
@@ -362,16 +369,19 @@ function handleCommand(command, row) {
      break;
  }
 }
+
 /** 分配用户 */
 function handleAuthUser(row) {
  router.push("/system/role-auth/user/" + row.roleId);
 }
+
 /** 查询菜单树结构 */
 function getMenuTreeselect() {
  menuTreeselect().then(response => {
    menuOptions.value = response.data;
  });
 }
+
 /** 所有部门节点数据 */
 function getDeptAllCheckedKeys() {
  // 目前被选中的部门节点
@@ -381,6 +391,7 @@ function getDeptAllCheckedKeys() {
  checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
  return checkedKeys;
 }
+
 /** 重置新增的表单以及其他数据  */
 function reset() {
  if (menuRef.value != undefined) {
@@ -404,6 +415,7 @@ function reset() {
  };
  proxy.resetForm("roleRef");
 }
+
 /** 添加角色 */
 function handleAdd() {
  reset();
@@ -411,6 +423,7 @@ function handleAdd() {
  open.value = true;
  title.value = "添加角色";
 }
+
 /** 修改角色 */
 function handleUpdate(row) {
  reset();
@@ -433,6 +446,7 @@ function handleUpdate(row) {
    title.value = "修改角色";
  });
 }
+
 /** 根据角色ID查询菜单树结构 */
 function getRoleMenuTreeselect(roleId) {
  return roleMenuTreeselect(roleId).then(response => {
@@ -440,6 +454,7 @@ function getRoleMenuTreeselect(roleId) {
    return response;
  });
 }
+
 /** 根据角色ID查询部门树结构 */
 function getDeptTree(roleId) {
  return deptTreeSelect(roleId).then(response => {
@@ -447,6 +462,7 @@ function getDeptTree(roleId) {
    return response;
  });
 }
+
 /** 树权限（展开/折叠）*/
 function handleCheckedTreeExpand(value, type) {
  if (type == "menu") {
@@ -461,6 +477,7 @@ function handleCheckedTreeExpand(value, type) {
    }
  }
 }
+
 /** 树权限（全选/全不选） */
 function handleCheckedTreeNodeAll(value, type) {
  if (type == "menu") {
@@ -469,6 +486,7 @@ function handleCheckedTreeNodeAll(value, type) {
    deptRef.value.setCheckedNodes(value ? deptOptions.value : []);
  }
 }
+
 /** 树权限（父子联动） */
 function handleCheckedTreeConnect(value, type) {
  if (type == "menu") {
@@ -477,6 +495,7 @@ function handleCheckedTreeConnect(value, type) {
    form.value.deptCheckStrictly = value ? true : false;
  }
 }
+
 /** 所有菜单节点数据 */
 function getMenuAllCheckedKeys() {
  // 目前被选中的菜单节点
@@ -486,6 +505,7 @@ function getMenuAllCheckedKeys() {
  checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
  return checkedKeys;
 }
+
 /** 提交按钮 */
 function submitForm() {
  proxy.$refs["roleRef"].validate(valid => {
@@ -508,17 +528,20 @@ function submitForm() {
    }
  });
 }
+
 /** 取消按钮 */
 function cancel() {
  open.value = false;
  reset();
 }
+
 /** 选择角色权限范围触发 */
 function dataScopeSelectChange(value) {
  if (value !== "2") {
    deptRef.value.setCheckedKeys([]);
  }
 }
+
 /** 分配数据权限操作 */
 function handleDataScope(row) {
  reset();
@@ -538,6 +561,7 @@ function handleDataScope(row) {
    title.value = "分配数据权限";
  });
 }
+
 /** 提交按钮（数据权限） */
 function submitDataScope() {
  if (form.value.roleId != undefined) {
@@ -549,6 +573,7 @@ function submitDataScope() {
    });
  }
 }
+
 /** 取消按钮（数据权限）*/
 function cancelDataScope() {
  openDataScope.value = false;
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -7,7 +7,7 @@
               v-model="queryParams.userName"
               placeholder="请输入用户名称"
               clearable
-               style="width: 200px"
+               style="width: 180px"
               @keyup.enter="handleQuery"
            />
         </el-form-item>
@@ -16,7 +16,7 @@
               v-model="queryParams.phonenumber"
               placeholder="请输入手机号码"
               clearable
-               style="width: 200px"
+               style="width: 180px"
               @keyup.enter="handleQuery"
            />
         </el-form-item>
@@ -91,14 +91,17 @@ function show() {
  getList();
  visible.value = true;
 }
+
 /**选择行 */
 function clickRow(row) {
  proxy.$refs["refTable"].toggleRowSelection(row);
 }
+
 // 多选框选中数据
 function handleSelectionChange(selection) {
  userIds.value = selection.map(item => item.userId);
 }
+
 // 查询表数据
 function getList() {
  unallocatedUserList(queryParams).then(res => {
@@ -106,16 +109,19 @@ function getList() {
    total.value = res.total;
  });
 }
+
 /** 搜索按钮操作 */
 function handleQuery() {
  queryParams.pageNum = 1;
  getList();
 }
+
 /** 重置按钮操作 */
 function resetQuery() {
  proxy.resetForm("queryRef");
  handleQuery();
 }
+
 const emit = defineEmits(["ok"]);
 /** 选择授权用户操作 */
 function handleSelectUser() {
@@ -127,10 +133,8 @@ function handleSelectUser() {
  }
  authUserSelectAll({ roleId: roleId, userIds: uIds }).then(res => {
    proxy.$modal.msgSuccess(res.msg);
-    if (res.code === 200) {
-      visible.value = false;
-      emit("ok");
-    }
+    visible.value = false;
+    emit("ok");
  });
 }

--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -67,19 +67,23 @@ const form = ref({
 function clickRow(row) {
  proxy.$refs["roleRef"].toggleRowSelection(row);
 };
+
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
  roleIds.value = selection.map(item => item.roleId);
 };
+
 /** 保存选中的数据编号 */
 function getRowKey(row) {
  return row.roleId;
 };
+
 /** 关闭按钮 */
 function close() {
  const obj = { path: "/system/user" };
  proxy.$tab.closeOpenPage(obj);
 };
+
 /** 提交按钮 */
 function submitForm() {
  const userId = form.value.userId;
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -243,7 +243,7 @@
                        <el-radio
                           v-for="dict in sys_normal_disable"
                           :key="dict.value"
-                           :label="dict.value"
+                           :value="dict.value"
                        >{{ dict.label }}</el-radio>
                     </el-radio-group>
                  </el-form-item>
@@ -391,7 +391,7 @@ const data = reactive({
  rules: {
    userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
    nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
-    password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }],
+    password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }, { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }],
    email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
    phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
  }
@@ -404,16 +404,19 @@ const filterNode = (value, data) => {
  if (!value) return true;
  return data.label.indexOf(value) !== -1;
 };
+
 /** 根据名称筛选部门树 */
 watch(deptName, val => {
  proxy.$refs["deptTreeRef"].filter(val);
 });
+
 /** 查询部门下拉树结构 */
 function getDeptTree() {
  deptTreeSelect().then(response => {
    deptOptions.value = response.data;
  });
 };
+
 /** 查询用户列表 */
 function getList() {
  loading.value = true;
@@ -423,16 +426,19 @@ function getList() {
    total.value = res.total;
  });
 };
+
 /** 节点单击事件 */
 function handleNodeClick(data) {
  queryParams.value.deptId = data.id;
  handleQuery();
 };
+
 /** 搜索按钮操作 */
 function handleQuery() {
  queryParams.value.pageNum = 1;
  getList();
 };
+
 /** 重置按钮操作 */
 function resetQuery() {
  dateRange.value = [];
@@ -441,6 +447,7 @@ function resetQuery() {
  proxy.$refs.deptTreeRef.setCurrentKey(null);
  handleQuery();
 };
+
 /** 删除按钮操作 */
 function handleDelete(row) {
  const userIds = row.userId || ids.value;
@@ -451,12 +458,14 @@ function handleDelete(row) {
    proxy.$modal.msgSuccess("删除成功");
  }).catch(() => {});
 };
+
 /** 导出按钮操作 */
 function handleExport() {
  proxy.download("system/user/export", {
    ...queryParams.value,
  },`user_${new Date().getTime()}.xlsx`);
 };
+
 /** 用户状态修改  */
 function handleStatusChange(row) {
  let text = row.status === "0" ? "启用" : "停用";
@@ -468,6 +477,7 @@ function handleStatusChange(row) {
    row.status = row.status === "0" ? "1" : "0";
  });
 };
+
 /** 更多操作 */
 function handleCommand(command, row) {
  switch (command) {
@@ -481,11 +491,13 @@ function handleCommand(command, row) {
      break;
  }
 };
+
 /** 跳转角色分配 */
 function handleAuthRole(row) {
  const userId = row.userId;
  router.push("/system/user-auth/role/" + userId);
 };
+
 /** 重置密码按钮操作 */
 function handleResetPwd(row) {
  proxy.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
@@ -494,32 +506,42 @@ function handleResetPwd(row) {
    closeOnClickModal: false,
    inputPattern: /^.{5,20}$/,
    inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
+    inputValidator: (value) => {
+      if (/<|>|"|'|\||\\/.test(value)) {
+        return "不能包含非法字符：< > \" ' \\\ |"
+      }
+    },
  }).then(({ value }) => {
    resetUserPwd(row.userId, value).then(response => {
      proxy.$modal.msgSuccess("修改成功，新密码是：" + value);
    });
  }).catch(() => {});
 };
+
 /** 选择条数  */
 function handleSelectionChange(selection) {
  ids.value = selection.map(item => item.userId);
  single.value = selection.length != 1;
  multiple.value = !selection.length;
 };
+
 /** 导入按钮操作 */
 function handleImport() {
  upload.title = "用户导入";
  upload.open = true;
 };
+
 /** 下载模板操作 */
 function importTemplate() {
  proxy.download("system/user/importTemplate", {
  }, `user_template_${new Date().getTime()}.xlsx`);
 };
+
 /**文件上传中处理 */
 const handleFileUploadProgress = (event, file, fileList) => {
  upload.isUploading = true;
 };
+
 /** 文件上传成功处理 */
 const handleFileSuccess = (response, file, fileList) => {
  upload.open = false;
@@ -528,10 +550,12 @@ const handleFileSuccess = (response, file, fileList) => {
  proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
  getList();
 };
+
 /** 提交上传文件 */
 function submitFileForm() {
  proxy.$refs["uploadRef"].submit();
 };
+
 /** 重置操作表单 */
 function reset() {
  form.value = {
@@ -550,11 +574,13 @@ function reset() {
  };
  proxy.resetForm("userRef");
 };
+
 /** 取消按钮 */
 function cancel() {
  open.value = false;
  reset();
 };
+
 /** 新增按钮操作 */
 function handleAdd() {
  reset();
@@ -566,6 +592,7 @@ function handleAdd() {
    form.value.password = initPassword.value;
  });
 };
+
 /** 修改按钮操作 */
 function handleUpdate(row) {
  reset();
@@ -581,6 +608,7 @@ function handleUpdate(row) {
    form.password = "";
  });
 };
+
 /** 提交按钮 */
 function submitForm() {
  proxy.$refs["userRef"].validate(valid => {
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -10,7 +10,7 @@
               </template>
               <div>
                  <div class="text-center">
-                     <userAvatar :user="state.user" />
+                     <userAvatar />
                  </div>
                  <ul class="list-group list-group-striped">
                     <li class="list-group-item">
--- a/src/views/system/user/profile/resetPwd.vue
+++ b/src/views/system/user/profile/resetPwd.vue
@@ -34,9 +34,10 @@ const equalToPassword = (rule, value, callback) => {
    callback();
  }
 };
+
 const rules = ref({
  oldPassword: [{ required: true, message: "旧密码不能为空", trigger: "blur" }],
-  newPassword: [{ required: true, message: "新密码不能为空", trigger: "blur" }, { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }],
+  newPassword: [{ required: true, message: "新密码不能为空", trigger: "blur" }, { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }, { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }],
  confirmPassword: [{ required: true, message: "确认密码不能为空", trigger: "blur" }, { required: true, validator: equalToPassword, trigger: "blur" }]
 });

@@ -50,6 +51,7 @@ function submit() {
    }
  });
 };
+
 /** 关闭按钮 */
 function close() {
  proxy.$tab.closePage();
--- a/src/views/system/user/profile/userAvatar.vue
+++ b/src/views/system/user/profile/userAvatar.vue
@@ -73,38 +73,45 @@ const title = ref("修改头像");

 //图片裁剪数据
 const options = reactive({
-  img: userStore.avatar, // 裁剪图片的地址
-  autoCrop: true, // 是否默认生成截图框
-  autoCropWidth: 200, // 默认生成截图框宽度
-  autoCropHeight: 200, // 默认生成截图框高度
-  fixedBox: true, // 固定截图框大小 不允许改变
-  outputType: "png", // 默认生成截图为PNG格式
-  previews: {} //预览数据
+  img: userStore.avatar,     // 裁剪图片的地址
+  autoCrop: true,            // 是否默认生成截图框
+  autoCropWidth: 200,        // 默认生成截图框宽度
+  autoCropHeight: 200,       // 默认生成截图框高度
+  fixedBox: true,            // 固定截图框大小 不允许改变
+  outputType: "png",         // 默认生成截图为PNG格式
+  filename: 'avatar',        // 文件名称
+  previews: {}               //预览数据
 });

 /** 编辑头像 */
 function editCropper() {
  open.value = true;
 }
+
 /** 打开弹出层结束时的回调 */
 function modalOpened() {
  visible.value = true;
 }
+
 /** 覆盖默认上传行为 */
 function requestUpload() {}
+
 /** 向左旋转 */
 function rotateLeft() {
  proxy.$refs.cropper.rotateLeft();
 }
+
 /** 向右旋转 */
 function rotateRight() {
  proxy.$refs.cropper.rotateRight();
 }
+
 /** 图片缩放 */
 function changeScale(num) {
  num = num || 1;
  proxy.$refs.cropper.changeScale(num);
 }
+
 /** 上传预处理 */
 function beforeUpload(file) {
  if (file.type.indexOf("image/") == -1) {
@@ -114,14 +121,16 @@ function beforeUpload(file) {
    reader.readAsDataURL(file);
    reader.onload = () => {
      options.img = reader.result;
+      options.filename = file.name;
    };
  }
 }
+
 /** 上传图片 */
 function uploadImg() {
  proxy.$refs.cropper.getCropBlob(data => {
    let formData = new FormData();
-    formData.append("avatarfile", data);
+    formData.append("avatarfile", data, options.filename);
    uploadAvatar(formData).then(response => {
      open.value = false;
      options.img = import.meta.env.VITE_APP_BASE_API + response.imgUrl;
@@ -131,10 +140,12 @@ function uploadImg() {
    });
  });
 }
+
 /** 实时预览 */
 function realTime(data) {
  options.previews = data;
 }
+
 /** 关闭窗口 */
 function closeDialog() {
  options.img = userStore.avatar;
--- a/src/views/system/user/profile/userInfo.vue
+++ b/src/views/system/user/profile/userInfo.vue
@@ -1,18 +1,18 @@
 <template>
-   <el-form ref="userRef" :model="user" :rules="rules" label-width="80px">
+   <el-form ref="userRef" :model="form" :rules="rules" label-width="80px">
      <el-form-item label="用户昵称" prop="nickName">
-         <el-input v-model="user.nickName" maxlength="30" />
+         <el-input v-model="form.nickName" maxlength="30" />
      </el-form-item>
      <el-form-item label="手机号码" prop="phonenumber">
-         <el-input v-model="user.phonenumber" maxlength="11" />
+         <el-input v-model="form.phonenumber" maxlength="11" />
      </el-form-item>
      <el-form-item label="邮箱" prop="email">
-         <el-input v-model="user.email" maxlength="50" />
+         <el-input v-model="form.email" maxlength="50" />
      </el-form-item>
      <el-form-item label="性别">
-         <el-radio-group v-model="user.sex">
-            <el-radio label="0">男</el-radio>
-            <el-radio label="1">女</el-radio>
+         <el-radio-group v-model="form.sex">
+            <el-radio value="0">男</el-radio>
+            <el-radio value="1">女</el-radio>
         </el-radio-group>
      </el-form-item>
      <el-form-item>
@@ -33,6 +33,7 @@ const props = defineProps({

 const { proxy } = getCurrentInstance();

+const form = ref({});
 const rules = ref({
  nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
  email: [{ required: true, message: "邮箱地址不能为空", trigger: "blur" }, { type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
@@ -43,14 +44,24 @@ const rules = ref({
 function submit() {
  proxy.$refs.userRef.validate(valid => {
    if (valid) {
-      updateUserProfile(props.user).then(response => {
+      updateUserProfile(form.value).then(response => {
        proxy.$modal.msgSuccess("修改成功");
+        props.user.phonenumber = form.value.phonenumber;
+        props.user.email = form.value.email;
      });
    }
  });
 };
+
 /** 关闭按钮 */
 function close() {
  proxy.$tab.closePage();
 };
+
+// 回显当前登录用户信息
+watch(() => props.user, user => {
+  if (user) {
+    form.value = { nickName: user.nickName, phonenumber: user.phonenumber, email: user.email, sex: user.sex };
+  }
+},{ immediate: true });
 </script>
--- a/src/views/tool/gen/createTable.vue
+++ b/src/views/tool/gen/createTable.vue
@@ -0,0 +1,46 @@
+<template>
+  <!-- 创建表 -->
+  <el-dialog title="创建表" v-model="visible" width="800px" top="5vh" append-to-body>
+    <span>创建表语句(支持多个建表语句)：</span>
+    <el-input type="textarea" :rows="10" placeholder="请输入文本" v-model="content"></el-input>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="handleImportTable">确 定</el-button>
+        <el-button @click="visible = false">取 消</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { createTable } from "@/api/tool/gen";
+
+const visible = ref(false);
+const content = ref("");
+const { proxy } = getCurrentInstance();
+const emit = defineEmits(["ok"]);
+
+/** 显示弹框 */
+function show() {
+  visible.value = true;
+}
+
+/** 导入按钮操作 */
+function handleImportTable() {
+  if (content.value === "") {
+    proxy.$modal.msgError("请输入建表语句");
+    return;
+  }
+  createTable({ sql: content.value }).then(res => {
+    proxy.$modal.msgSuccess(res.msg);
+    if (res.code === 200) {
+      visible.value = false;
+      emit("ok");
+    }
+  });
+}
+
+defineExpose({
+  show,
+});
+</script>
--- a/src/views/tool/gen/editTable.vue
+++ b/src/views/tool/gen/editTable.vue
@@ -168,6 +168,7 @@ function submitForm() {
    }
  });
 }
+
 function getFormPromise(form) {
  return new Promise(resolve => {
    form.validate(res => {
@@ -175,6 +176,7 @@ function getFormPromise(form) {
    });
  });
 }
+
 function close() {
  const obj = { path: "/tool/gen", query: { t: Date.now(), pageNum: route.query.pageNum } };
  proxy.$tab.closeOpenPage(obj);
--- a/src/views/tool/gen/genInfoForm.vue
+++ b/src/views/tool/gen/genInfoForm.vue
@@ -12,6 +12,16 @@
        </el-form-item>
      </el-col>

+      <el-col :span="12">
+        <el-form-item prop="tplWebType">
+          <template #label>前端类型</template>
+          <el-select v-model="info.tplWebType">
+            <el-option label="Vue2 Element UI 模版" value="element-ui" />
+            <el-option label="Vue3 Element Plus 模版" value="element-plus" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+
      <el-col :span="12">
        <el-form-item prop="packageName">
          <template #label>
@@ -60,6 +70,19 @@
        </el-form-item>
      </el-col>

+      <el-col :span="12">
+        <el-form-item prop="genType">
+          <template #label>
+            生成代码方式
+            <el-tooltip content="默认为zip压缩包下载，也可以自定义生成路径" placement="top">
+              <el-icon><question-filled /></el-icon>
+            </el-tooltip>
+          </template>
+          <el-radio v-model="info.genType" value="0">zip压缩包</el-radio>
+          <el-radio v-model="info.genType" value="1">自定义路径</el-radio>
+        </el-form-item>
+      </el-col>
+
      <el-col :span="12">
        <el-form-item>
          <template #label>
@@ -77,19 +100,6 @@
        </el-form-item>
      </el-col>

-      <el-col :span="12">
-        <el-form-item prop="genType">
-          <template #label>
-            生成代码方式
-            <el-tooltip content="默认为zip压缩包下载，也可以自定义生成路径" placement="top">
-              <el-icon><question-filled /></el-icon>
-            </el-tooltip>
-          </template>
-          <el-radio v-model="info.genType" label="0">zip压缩包</el-radio>
-          <el-radio v-model="info.genType" label="1">自定义路径</el-radio>
-        </el-form-item>
-      </el-col>
-
      <el-col :span="24" v-if="info.genType == '1'">
        <el-form-item prop="genPath">
          <template #label>
@@ -248,15 +258,18 @@ const rules = ref({
  businessName: [{ required: true, message: "请输入生成业务名", trigger: "blur" }],
  functionName: [{ required: true, message: "请输入生成功能名", trigger: "blur" }]
 });
+
 function subSelectChange(value) {
  props.info.subTableFkName = "";
 }
+
 function tplSelectChange(value) {
  if (value !== "sub") {
    props.info.subTableName = "";
    props.info.subTableFkName = "";
  }
 }
+
 function setSubTableColumns(value) {
  for (var item in props.tables) {
    const name = props.tables[item].tableName;
@@ -266,6 +279,7 @@ function setSubTableColumns(value) {
    }
  }
 }
+
 /** 查询菜单下拉树结构 */
 function getMenuTreeselect() {
  listMenu().then(response => {
@@ -277,5 +291,11 @@ watch(() => props.info.subTableName, val => {
  setSubTableColumns(val);
 });

+watch(() => props.info.tplWebType, val => {
+  if (val === '') {
+    props.info.tplWebType = "element-plus";
+  }
+});
+
 getMenuTreeselect();
 </script>
--- a/src/views/tool/gen/importTable.vue
+++ b/src/views/tool/gen/importTable.vue
@@ -7,6 +7,7 @@
          v-model="queryParams.tableName"
          placeholder="请输入表名称"
          clearable
+          style="width: 180px"
          @keyup.enter="handleQuery"
        />
      </el-form-item>
@@ -15,6 +16,7 @@
          v-model="queryParams.tableComment"
          placeholder="请输入表描述"
          clearable
+          style="width: 180px"
          @keyup.enter="handleQuery"
        />
      </el-form-item>
@@ -71,14 +73,17 @@ function show() {
  getList();
  visible.value = true;
 }
+
 /** 单击选择行 */
 function clickRow(row) {
  proxy.$refs.table.toggleRowSelection(row);
 }
+
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
  tables.value = selection.map(item => item.tableName);
 }
+
 /** 查询表数据 */
 function getList() {
  listDbTable(queryParams).then(res => {
@@ -86,16 +91,19 @@ function getList() {
    total.value = res.total;
  });
 }
+
 /** 搜索按钮操作 */
 function handleQuery() {
  queryParams.pageNum = 1;
  getList();
 }
+
 /** 重置按钮操作 */
 function resetQuery() {
  proxy.resetForm("queryRef");
  handleQuery();
 }
+
 /** 导入按钮操作 */
 function handleImportTable() {
  const tableNames = tables.value.join(",");
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -41,10 +41,20 @@
          type="primary"
          plain
          icon="Download"
+          :disabled="multiple"
          @click="handleGenTable"
          v-hasPermi="['tool:gen:code']"
        >生成</el-button>
      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="openCreateTable"
+          v-hasRole="['admin']"
+        >创建</el-button>
+      </el-col>
      <el-col :span="1.5">
        <el-button
          type="info"
@@ -146,6 +156,7 @@
      </el-tabs>
    </el-dialog>
    <import-table ref="importRef" @ok="handleQuery" />
+    <create-table ref="createRef" @ok="handleQuery" />
  </div>
 </template>

@@ -153,6 +164,7 @@
 import { listTable, previewTable, delTable, genCode, synchDb } from "@/api/tool/gen";
 import router from "@/router";
 import importTable from "./importTable";
+import createTable from "./createTable";

 const route = useRoute();
 const { proxy } = getCurrentInstance();
@@ -205,11 +217,13 @@ function getList() {
    loading.value = false;
  });
 }
+
 /** 搜索按钮操作 */
 function handleQuery() {
  queryParams.value.pageNum = 1;
  getList();
 }
+
 /** 生成代码操作 */
 function handleGenTable(row) {
  const tbNames = row.tableName || tableNames.value;
@@ -225,6 +239,7 @@ function handleGenTable(row) {
    proxy.$download.zip("/tool/gen/batchGenCode?tables=" + tbNames, "ruoyi.zip");
  }
 }
+
 /** 同步数据库操作 */
 function handleSynchDb(row) {
  const tableName = row.tableName;
@@ -234,16 +249,24 @@ function handleSynchDb(row) {
    proxy.$modal.msgSuccess("同步成功");
  }).catch(() => {});
 }
+
 /** 打开导入表弹窗 */
 function openImportTable() {
  proxy.$refs["importRef"].show();
 }
+
+/** 打开创建表弹窗 */
+function openCreateTable() {
+  proxy.$refs["createRef"].show();
+}
+
 /** 重置按钮操作 */
 function resetQuery() {
  dateRange.value = [];
  proxy.resetForm("queryRef");
  handleQuery();
 }
+
 /** 预览按钮 */
 function handlePreview(row) {
  previewTable(row.tableId).then(response => {
@@ -252,10 +275,12 @@ function handlePreview(row) {
    preview.value.activeName = "domain.java";
  });
 }
+
 /** 复制代码成功 */
 function copyTextSuccess() {
  proxy.$modal.msgSuccess("复制成功");
 }
+
 // 多选框选中数据
 function handleSelectionChange(selection) {
  ids.value = selection.map(item => item.tableId);
@@ -263,11 +288,13 @@ function handleSelectionChange(selection) {
  single.value = selection.length != 1;
  multiple.value = !selection.length;
 }
+
 /** 修改按钮操作 */
 function handleEditTable(row) {
  const tableId = row.tableId || ids.value[0];
  router.push({ path: "/tool/gen-edit/index/" + tableId, query: { pageNum: queryParams.value.pageNum } });
 }
+
 /** 删除按钮操作 */
 function handleDelete(row) {
  const tableIds = row.tableId || ids.value;
--- a/vite/plugins/setup-extend.js
+++ b/vite/plugins/setup-extend.js
@@ -1,5 +1,5 @@
-import setupExtend from 'vite-plugin-vue-setup-extend'
+import setupExtend from 'unplugin-vue-setup-extend-plus/vite'

 export default function createSetupExtend() {
-    return setupExtend()
+    return setupExtend({})
 }
Author	SHA1	Message	Date
RuoYi	c01ac5ccac	若依 3.8.8	2024-06-30 08:01:12 +08:00
RuoYi	0780d9659b	修复移动端左侧菜单无法显示问题	2024-06-29 21:44:21 +08:00
RuoYi	c227751acb	菜单管理新增路由名称	2024-06-29 18:53:38 +08:00
RuoYi	30f52f9946	fix repeat getList	2024-06-29 16:21:36 +08:00
RuoYi	4805cc9ea5	remove merge dictTag type	2024-06-29 15:59:59 +08:00
若依	1abf0641b0	Merge pull request #287 from 593496637/main 修复升级element-plus出现的警告⚠️提示	2024-06-29 15:39:18 +08:00
likaikai	e3d4018c14	chore:1.修复升级element-plus后el-radio使用label过期的问题。2.修复DictTag组件缺少type的问题	2024-06-29 14:11:19 +08:00
RuoYi	cae65bb74b	升级组件依赖到最新版本	2024-06-28 17:02:24 +08:00
RuoYi	6666ce5526	优化代码	2024-06-28 17:01:39 +08:00
RuoYi	49d0fc0bdc	添加新群号：151450850	2024-05-29 14:49:15 +08:00
RuoYi	84b3565732	update copyright 2024	2024-03-11 10:47:10 +08:00
RuoYi	ea4a870302	添加新群号：138988063	2024-03-11 10:46:45 +08:00
RuoYi	6a10846b6d	用户密码新增非法字符验证	2024-03-01 21:54:12 +08:00
RuoYi	69c189a0c9	代码生成新增创建表结构功能	2024-03-01 20:08:52 +08:00
RuoYi	1270e6e3c9	添加新群号：161281055	2023-12-13 11:18:51 +08:00
RuoYi	7d09f25218	若依 3.8.7	2023-12-08 09:02:39 +08:00
RuoYi	353f76740a	修复定时任务年表达式出现NaN问题	2023-12-01 21:54:17 +08:00
RuoYi	5186e2be77	TopNav开关事件控制	2023-12-01 21:53:23 +08:00
RuoYi	64036d520f	升级组件依赖到最新版本	2023-12-01 14:20:45 +08:00
RuoYi	15b2acbcd5	显隐列组件支持复选框弹出类型	2023-12-01 12:02:01 +08:00
RuoYi	51db1ec865	代码生成支持选择前端模板类型	2023-11-30 09:41:14 +08:00
RuoYi	0b124ef12b	优化菜单图标选择后点击其他区域闪烁问题	2023-11-30 09:41:05 +08:00
RuoYi	9e1616b075	优化控制台提示路由重复问题	2023-11-30 09:40:51 +08:00
RuoYi	ad0c7f5c94	优化头像上传参数新增文件名称	2023-11-29 12:45:00 +08:00
RuoYi	cb80de3742	优化字典标签支持自定义分隔符	2023-11-29 12:44:42 +08:00
RuoYi	438cb0d1dd	优化下载zip方法新增遮罩层	2023-11-29 12:44:01 +08:00
RuoYi	6ec98f2e64	优化缓存监控图表支持跟随屏幕大小自适应调整	2023-11-29 12:43:44 +08:00
RuoYi	dfb8096387	优化代码	2023-11-29 12:43:28 +08:00
RuoYi	e6f582bd1a	优化白名单页面放行逻辑	2023-11-28 13:00:15 +08:00
RuoYi	afd8de5094	优化个人中心/基本资料修改时数据显示问题	2023-11-28 11:26:51 +08:00
RuoYi	87be9b7acf	修复五级路由缓存无效问题	2023-11-10 15:34:08 +08:00
RuoYi	d3672b2714	优化样式	2023-11-10 14:48:44 +08:00
RuoYi	46da1d5ed1	修复内链iframe没有传递参数问题(I8DUOJ)	2023-11-10 11:13:38 +08:00
RuoYi	29355eb630	优化pagination样式	2023-11-01 10:13:19 +08:00
RuoYi	a4004968ec	修复字典数据重置选项置空问题	2023-11-01 09:55:42 +08:00
RuoYi	aea6ee2900	更换表格内预览图片被覆盖问题	2023-10-27 12:56:16 +08:00
RuoYi	98cba51541	登录不做数据重复提交验证	2023-10-21 14:31:24 +08:00
RuoYi	40648703fc	添加新群号：174951577	2023-10-09 21:28:31 +08:00
RuoYi	c12a0976ef	去除多余的参数	2023-10-09 21:28:17 +08:00
RuoYi	e8fe5f1455	修复HeaderSearch组件跳转query参数丢失问题	2023-09-28 22:12:58 +08:00
RuoYi	8e7754c5d7	富文本编辑器支持fileSize和type	2023-09-28 11:30:32 +08:00
RuoYi	895d9a37d5	升级vue-quill到最新版本1.2.0	2023-09-28 11:29:40 +08:00
RuoYi	27a1153b5a	操作日志列表新增IP地址查询	2023-09-27 15:22:27 +08:00
RuoYi	205a67504b	全局数据存储用户编号	2023-09-27 15:22:15 +08:00
RuoYi	8491d97001	优化菜单管理类型为按钮状态可选	2023-09-18 15:05:09 +08:00
RuoYi	1b45f0a1cd	修复自定义字典样式不生效的问题(I81F03)	2023-09-14 16:54:43 +08:00
RuoYi	accdc1be7a	LICENSE	2023-09-01 08:44:50 +08:00
RuoYi	df9c850302	优化代码	2023-09-01 08:44:35 +08:00
RuoYi	54ad578ec0	TopNav更多菜单arrow样式优化	2023-08-31 18:00:47 +08:00
RuoYi	c5fe5bf3cb	修改未登录访问需要登录的资源,在登录后重定向丢失请求参数问题	2023-08-31 11:47:54 +08:00
RuoYi	a9196bbdf7	优化菜单样式	2023-08-31 10:02:21 +08:00
RuoYi	64014ba81a	优化控制台debuger位置错误问题	2023-08-28 13:02:33 +08:00
RuoYi	2e1bd34d58	防重复提交数据大小限制(I7KZDA)	2023-08-21 11:57:30 +08:00
RuoYi	38c52a9265	登录页面redirect重定向功能(I7DBUP)	2023-08-15 16:31:59 +08:00
RuoYi	d6aa40cf3b	优化定时任务状态页面显示	2023-08-14 19:21:29 +08:00
RuoYi	cce8921b52	添加新群号：143961921	2023-07-28 11:09:34 +08:00