From 6666ce5526b1ed17f5c3906c94620cad586745a5 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 28 六月 2024 17:01:39 +0800
Subject: [PATCH] 优化代码

---
 src/views/system/menu/index.vue |   92 ++++++++++++++++++++-------------------------
 1 files changed, 41 insertions(+), 51 deletions(-)

diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index c221f4e..1df5fb9 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -6,11 +6,12 @@
                v-model="queryParams.menuName"
                placeholder="璇疯緭鍏ヨ彍鍗曞悕绉�"
                clearable
+               style="width: 200px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
          <el-form-item label="鐘舵��" prop="status">
-            <el-select v-model="queryParams.status" placeholder="鑿滃崟鐘舵��" clearable>
+            <el-select v-model="queryParams.status" placeholder="鑿滃崟鐘舵��" clearable style="width: 200px">
                <el-option
                   v-for="dict in sys_normal_disable"
                   :key="dict.value"
@@ -68,46 +69,33 @@
                <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
             </template>
          </el-table-column>
-         <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime">
+         <el-table-column label="鍒涘缓鏃堕棿" align="center" width="160" prop="createTime">
             <template #default="scope">
                <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
          </el-table-column>
-         <el-table-column label="鎿嶄綔" align="center" width="200" class-name="small-padding fixed-width">
+         <el-table-column label="鎿嶄綔" align="center" width="210" class-name="small-padding fixed-width">
             <template #default="scope">
-               <el-button
-                  type="text"
-                  icon="Edit"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="['system:menu:edit']"
-               >淇敼</el-button>
-               <el-button
-                  type="text"
-                  icon="Plus"
-                  @click="handleAdd(scope.row)"
-                  v-hasPermi="['system:menu:add']"
-               >鏂板</el-button>
-               <el-button
-                  type="text"
-                  icon="Delete"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="['system:menu:remove']"
-               >鍒犻櫎</el-button>
+               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:menu:edit']">淇敼</el-button>
+               <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['system:menu:add']">鏂板</el-button>
+               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:menu:remove']">鍒犻櫎</el-button>
             </template>
          </el-table-column>
       </el-table>
 
       <!-- 娣诲姞鎴栦慨鏀硅彍鍗曞璇濇 -->
-      <el-dialog :title="title" v-model="open" width="680px" :before-close="handleClose" append-to-body>
+      <el-dialog :title="title" v-model="open" width="680px" append-to-body>
          <el-form ref="menuRef" :model="form" :rules="rules" label-width="100px">
             <el-row>
                <el-col :span="24">
                   <el-form-item label="涓婄骇鑿滃崟">
-                     <tree-select
-                        v-model:value="form.parentId"
-                        :options="menuOptions"
-                        :objMap="{ value: 'menuId', label: 'menuName', children: 'children' }"
+                     <el-tree-select
+                        v-model="form.parentId"
+                        :data="menuOptions"
+                        :props="{ value: 'menuId', label: 'menuName', children: 'children' }"
+                        value-key="menuId"
                         placeholder="閫夋嫨涓婄骇鑿滃崟"
+                        check-strictly
                      />
                   </el-form-item>
                </el-col>
@@ -125,12 +113,10 @@
                      <el-popover
                         placement="bottom-start"
                         :width="540"
-                        v-model:visible="showChooseIcon"
                         trigger="click"
-                        @show="showSelectIcon"
                      >
                         <template #reference>
-                           <el-input v-model="form.icon" placeholder="鐐瑰嚮閫夋嫨鍥炬爣" @click="showSelectIcon" readonly>
+                           <el-input v-model="form.icon" placeholder="鐐瑰嚮閫夋嫨鍥炬爣" @blur="showSelectIcon" readonly>
                               <template #prefix>
                                  <svg-icon
                                     v-if="form.icon"
@@ -142,7 +128,7 @@
                               </template>
                            </el-input>
                         </template>
-                        <icon-select ref="iconSelectRef" @selected="selected" />
+                        <icon-select ref="iconSelectRef" @selected="selected" :active-icon="form.icon" />
                      </el-popover>
                   </el-form-item>
                </el-col>
@@ -161,7 +147,7 @@
                      <template #label>
                         <span>
                            <el-tooltip content="閫夋嫨鏄閾惧垯璺敱鍦板潃闇�瑕佷互`http(s)://`寮�澶�" placement="top">
-                              <i class="el-icon-question"></i>
+                              <el-icon><question-filled /></el-icon>
                            </el-tooltip>鏄惁澶栭摼
                         </span>
                      </template>
@@ -176,7 +162,7 @@
                      <template #label>
                         <span>
                            <el-tooltip content="璁块棶鐨勮矾鐢卞湴鍧�锛屽锛歚user`锛屽澶栫綉鍦板潃闇�鍐呴摼璁块棶鍒欎互`http(s)://`寮�澶�" placement="top">
-                              <i class="el-icon-question"></i>
+                              <el-icon><question-filled /></el-icon>
                            </el-tooltip>
                            璺敱鍦板潃
                         </span>
@@ -189,7 +175,7 @@
                      <template #label>
                         <span>
                            <el-tooltip content="璁块棶鐨勭粍浠惰矾寰勶紝濡傦細`system/user/index`锛岄粯璁ゅ湪`views`鐩綍涓�" placement="top">
-                              <i class="el-icon-question"></i>
+                              <el-icon><question-filled /></el-icon>
                            </el-tooltip>
                            缁勪欢璺緞
                         </span>
@@ -203,7 +189,7 @@
                      <template #label>
                         <span>
                            <el-tooltip content="鎺у埗鍣ㄤ腑瀹氫箟鐨勬潈闄愬瓧绗︼紝濡傦細@PreAuthorize(`@ss.hasPermi('system:user:list')`)" placement="top">
-                              <i class="el-icon-question"></i>
+                              <el-icon><question-filled /></el-icon>
                            </el-tooltip>
                            鏉冮檺瀛楃
                         </span>
@@ -216,7 +202,7 @@
                      <template #label>
                         <span>
                            <el-tooltip content='璁块棶璺敱鐨勯粯璁や紶閫掑弬鏁帮紝濡傦細`{"id": 1, "name": "ry"}`' placement="top">
-                              <i class="el-icon-question"></i>
+                              <el-icon><question-filled /></el-icon>
                            </el-tooltip>
                            璺敱鍙傛暟
                         </span>
@@ -228,7 +214,7 @@
                      <template #label>
                         <span>
                            <el-tooltip content="閫夋嫨鏄垯浼氳`keep-alive`缂撳瓨锛岄渶瑕佸尮閰嶇粍浠剁殑`name`鍜屽湴鍧�淇濇寔涓�鑷�" placement="top">
-                              <i class="el-icon-question"></i>
+                              <el-icon><question-filled /></el-icon>
                            </el-tooltip>
                            鏄惁缂撳瓨
                         </span>
@@ -244,7 +230,7 @@
                      <template #label>
                         <span>
                            <el-tooltip content="閫夋嫨闅愯棌鍒欒矾鐢卞皢涓嶄細鍑虹幇鍦ㄤ晶杈规爮锛屼絾浠嶇劧鍙互璁块棶" placement="top">
-                              <i class="el-icon-question"></i>
+                              <el-icon><question-filled /></el-icon>
                            </el-tooltip>
                            鏄剧ず鐘舵��
                         </span>
@@ -258,12 +244,12 @@
                      </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>
                            <el-tooltip content="閫夋嫨鍋滅敤鍒欒矾鐢卞皢涓嶄細鍑虹幇鍦ㄤ晶杈规爮锛屼篃涓嶈兘琚闂�" placement="top">
-                              <i class="el-icon-question"></i>
+                              <el-icon><question-filled /></el-icon>
                            </el-tooltip>
                            鑿滃崟鐘舵��
                         </span>
@@ -305,7 +291,6 @@
 const menuOptions = ref([]);
 const isExpandAll = ref(false);
 const refreshTable = ref(true);
-const showChooseIcon = ref(false);
 const iconSelectRef = ref(null);
 
 const data = reactive({
@@ -331,20 +316,23 @@
     loading.value = false;
   });
 }
+
 /** 鏌ヨ鑿滃崟涓嬫媺鏍戠粨鏋� */
-async function getTreeselect() {
+function getTreeselect() {
   menuOptions.value = [];
-  await listMenu().then(response => {
+  listMenu().then(response => {
     const menu = { menuId: 0, menuName: "涓荤被鐩�", children: [] };
     menu.children = proxy.handleTree(response.data, "menuId");
     menuOptions.value.push(menu);
   });
 }
+
 /** 鍙栨秷鎸夐挳 */
 function cancel() {
   open.value = false;
   reset();
 }
+
 /** 琛ㄥ崟閲嶇疆 */
 function reset() {
   form.value = {
@@ -361,34 +349,32 @@
   };
   proxy.resetForm("menuRef");
 }
+
 /** 灞曠ず涓嬫媺鍥炬爣 */
 function showSelectIcon() {
   iconSelectRef.value.reset();
-  showChooseIcon.value = true;
 }
+
 /** 閫夋嫨鍥炬爣 */
 function selected(name) {
   form.value.icon = name;
-  showChooseIcon.value = false;
 }
-/** 鍏抽棴寮圭獥闅愯棌鍥炬爣閫夋嫨 */
-function handleClose() {
- cancel();
- showChooseIcon.value = false;
-}
+
 /** 鎼滅储鎸夐挳鎿嶄綔 */
 function handleQuery() {
   getList();
 }
+
 /** 閲嶇疆鎸夐挳鎿嶄綔 */
 function resetQuery() {
   proxy.resetForm("queryRef");
   handleQuery();
 }
+
 /** 鏂板鎸夐挳鎿嶄綔 */
-async function handleAdd(row) {
+function handleAdd(row) {
   reset();
-  await getTreeselect();
+  getTreeselect();
   if (row != null && row.menuId) {
     form.value.parentId = row.menuId;
   } else {
@@ -397,6 +383,7 @@
   open.value = true;
   title.value = "娣诲姞鑿滃崟";
 }
+
 /** 灞曞紑/鎶樺彔鎿嶄綔 */
 function toggleExpandAll() {
   refreshTable.value = false;
@@ -405,6 +392,7 @@
     refreshTable.value = true;
   });
 }
+
 /** 淇敼鎸夐挳鎿嶄綔 */
 async function handleUpdate(row) {
   reset();
@@ -415,6 +403,7 @@
     title.value = "淇敼鑿滃崟";
   });
 }
+
 /** 鎻愪氦鎸夐挳 */
 function submitForm() {
   proxy.$refs["menuRef"].validate(valid => {
@@ -435,6 +424,7 @@
     }
   });
 }
+
 /** 鍒犻櫎鎸夐挳鎿嶄綔 */
 function handleDelete(row) {
   proxy.$modal.confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.menuName + '"鐨勬暟鎹」?').then(function() {

--
Gitblit v1.9.3