From fc3aa2047c0d612cd545e3d8400193a6117c14ff Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 17 Feb 2022 00:46:18 +0800
Subject: [PATCH] =?UTF-8?q?v3.7.0=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9B=B4=E5=A4=9A=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/src/assets/styles/ruoyi.scss   | 31 ++++++++++++++--
 yudao-ui-admin/src/views/infra/job/index.vue  | 35 +++++++++++++++----
 .../src/views/system/user/index.vue           | 18 +++-------
 更新日志.md                                   |  2 +-
 4 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/yudao-ui-admin/src/assets/styles/ruoyi.scss b/yudao-ui-admin/src/assets/styles/ruoyi.scss
index 6dc1dd464..4c2bde64d 100644
--- a/yudao-ui-admin/src/assets/styles/ruoyi.scss
+++ b/yudao-ui-admin/src/assets/styles/ruoyi.scss
@@ -37,7 +37,7 @@
 .mb10 {
   margin-bottom: 10px;
 }
-.ml0 {
+.ml10 {
   margin-left: 10px;
 }
 .mt20 {
@@ -49,14 +49,28 @@
 .mb20 {
   margin-bottom: 20px;
 }
-.m20 {
+.ml20 {
   margin-left: 20px;
 }
 
-.el-dialog:not(.is-fullscreen){
+.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
+  font-family: inherit;
+  font-weight: 500;
+  line-height: 1.1;
+  color: inherit;
+}
+
+.el-dialog:not(.is-fullscreen) {
   margin-top: 6vh !important;
 }
 
+.el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body {
+  overflow: auto;
+  overflow-x: hidden;
+  max-height: 70vh;
+  padding: 10px 20px 0;
+}
+
 .el-table {
   .el-table__header-wrapper, .el-table__fixed-header-wrapper {
     th {
@@ -120,6 +134,17 @@
   width: inherit;
 }
 
+/** 表格更多操作下拉样式 */
+.el-table .el-dropdown-link {
+  cursor: pointer;
+  color: #409EFF;
+  margin-left: 5px;
+}
+
+.el-table .el-dropdown, .el-icon-arrow-down {
+  font-size: 12px;
+}
+
 .el-tree-node__content > .el-checkbox {
   margin-right: 8px;
 }
diff --git a/yudao-ui-admin/src/views/infra/job/index.vue b/yudao-ui-admin/src/views/infra/job/index.vue
index bb3b2259f..1409ad1fe 100644
--- a/yudao-ui-admin/src/views/infra/job/index.vue
+++ b/yudao-ui-admin/src/views/infra/job/index.vue
@@ -48,20 +48,27 @@
       <el-table-column label="CRON 表达式" align="center" prop="cronExpression" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
-                     v-hasPermi="['infra:job:query']">详细</el-button>
-          <el-button size="mini" icon="el-icon-s-operation" @click="handleJobLog(scope.row)"
-                     v-hasPermi="['infra:job:query']">执行日志</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['infra:job:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-check" @click="handleChangeStatus(scope.row, true)"
                      v-if="scope.row.status === InfJobStatusEnum.STOP" v-hasPermi="['infra:job:update']">开启</el-button>
           <el-button size="mini" type="text" icon="el-icon-close" @click="handleChangeStatus(scope.row, false)"
                      v-if="scope.row.status === InfJobStatusEnum.NORMAL" v-hasPermi="['infra:job:update']">暂停</el-button>
-          <el-button size="mini" type="text" icon="el-icon-caret-right" @click="handleRun(scope.row)"
-                     v-hasPermi="['infra:job:trigger']">执行一次</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                      v-hasPermi="['infra:job:delete']">删除</el-button>
+          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)">
+            <span class="el-dropdown-link">
+              <i class="el-icon-d-arrow-right el-icon--right"></i>更多
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="handleRun" icon="el-icon-caret-right"
+                                v-hasPermi="['infra:job:trigger']">执行一次</el-dropdown-item>
+              <el-dropdown-item command="handleView" icon="el-icon-view"
+                                v-hasPermi="['infra:job:query']">任务详细</el-dropdown-item>
+              <el-dropdown-item command="handleJobLog" icon="el-icon-s-operation"
+                                v-hasPermi="['infra:job:query']">调度日志</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
@@ -323,6 +330,22 @@ export default {
         this.msgSuccess(statusStr + "成功");
       }).catch(() => {});
     },
+    // 更多操作触发
+    handleCommand(command, row) {
+      switch (command) {
+        case "handleRun":
+          this.handleRun(row);
+          break;
+        case "handleView":
+          this.handleView(row);
+          break;
+        case "handleJobLog":
+          this.handleJobLog(row);
+          break;
+        default:
+          break;
+      }
+    },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
diff --git a/yudao-ui-admin/src/views/system/user/index.vue b/yudao-ui-admin/src/views/system/user/index.vue
index 56442cb76..91fce6d6a 100644
--- a/yudao-ui-admin/src/views/system/user/index.vue
+++ b/yudao-ui-admin/src/views/system/user/index.vue
@@ -71,12 +71,12 @@
           </el-table-column>
           <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button size="large" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                          v-hasPermi="['system:user:update']">修改</el-button>
               <el-dropdown  @command="(command) => handleCommand(command, scope.$index, scope.row)">
-                    <span class="el-dropdown-link">
-                      更多操作<i class="el-icon-arrow-down el-icon--right"></i>
-                    </span>
+                <span class="el-dropdown-link">
+                  <i class="el-icon-d-arrow-right el-icon--right"></i>更多
+                </span>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="handleDelete" v-if="scope.row.id !== 1" size="mini" type="text" icon="el-icon-delete"
                                     v-hasPermi="['system:user:delete']">删除</el-dropdown-item>
@@ -657,13 +657,3 @@ export default {
   }
 };
 </script>
-<style>
-  .el-dropdown-link {
-    cursor: pointer;
-    color: #1890ff;
-    margin-left: 5px;
-  }
-  .el-icon-arrow-down {
-    font-size: 14px;
-  }
-</style>
diff --git a/更新日志.md b/更新日志.md
index d0c915b83..b2bc10cb7 100644
--- a/更新日志.md
+++ b/更新日志.md
@@ -37,7 +37,7 @@
 * 【新增】前端的网页标题支持根据选择的菜单，动态展示标题 [commit](https://gitee.com/zhijiantianya/ruoyi-vue-pro/commit/7bf9a85263e0c44b2bc88485b83557c129583f5c)
 * 【新增】字典标签样式回显，例如说开启的状态展示为 primary 蓝色，禁用的状态为 info 灰色 [commit](https://gitee.com/zhijiantianya/ruoyi-vue-pro/commit/986d1328e0a0d37e2de2fb9d937faeed9d9bee7b)
 * 【新增】前端的 iframe 组件，方便内嵌网页 [commit](https://gitee.com/zhijiantianya/ruoyi-vue-pro/commit/4a8129bffa9e3928c56333e29f5874f55a079764)
-* 【新增】在基础设施-配置管理菜单，可通过修改 `yudao.captcha.enable` 配置项，动态修改登录是否需要验证码 [commit]()
+* 【新增】在基础设施-配置管理菜单，可通过修改 `yudao.captcha.enable` 配置项，动态修改登录是否需要验证码 [commit](https://gitee.com/zhijiantianya/ruoyi-vue-pro/commit/ec378d75de5660d873514fa16cfabb3671b9eeb4)
 
 ### 🐞 Bug Fixes