From 0effee74b176638329d6d378de44293219fd8de2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 21 十一月 2022 18:57:42 +0800
Subject: [PATCH] 消除控制台出现的警告信息

---
 src/views/system/menu/index.vue |   76 +++++++++++++++++---------------------
 1 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index c221f4e..533ad73 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"
@@ -73,41 +74,28 @@
                <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>
@@ -130,7 +118,7 @@
                         @show="showSelectIcon"
                      >
                         <template #reference>
-                           <el-input v-model="form.icon" placeholder="鐐瑰嚮閫夋嫨鍥炬爣" @click="showSelectIcon" readonly>
+                           <el-input v-model="form.icon" placeholder="鐐瑰嚮閫夋嫨鍥炬爣" @blur="showSelectIcon" v-click-outside="hideSelectIcon" readonly>
                               <template #prefix>
                                  <svg-icon
                                     v-if="form.icon"
@@ -161,7 +149,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 +164,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 +177,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 +191,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 +204,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 +216,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 +232,7 @@
                      <template #label>
                         <span>
                            <el-tooltip content="閫夋嫨闅愯棌鍒欒矾鐢卞皢涓嶄細鍑虹幇鍦ㄤ晶杈规爮锛屼絾浠嶇劧鍙互璁块棶" placement="top">
-                              <i class="el-icon-question"></i>
+                              <el-icon><question-filled /></el-icon>
                            </el-tooltip>
                            鏄剧ず鐘舵��
                         </span>
@@ -263,7 +251,7 @@
                      <template #label>
                         <span>
                            <el-tooltip content="閫夋嫨鍋滅敤鍒欒矾鐢卞皢涓嶄細鍑虹幇鍦ㄤ晶杈规爮锛屼篃涓嶈兘琚闂�" placement="top">
-                              <i class="el-icon-question"></i>
+                              <el-icon><question-filled /></el-icon>
                            </el-tooltip>
                            鑿滃崟鐘舵��
                         </span>
@@ -293,6 +281,7 @@
 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");
@@ -332,9 +321,9 @@
   });
 }
 /** 鏌ヨ鑿滃崟涓嬫媺鏍戠粨鏋� */
-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);
@@ -371,10 +360,13 @@
   form.value.icon = name;
   showChooseIcon.value = false;
 }
-/** 鍏抽棴寮圭獥闅愯棌鍥炬爣閫夋嫨 */
-function handleClose() {
- cancel();
- 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() {
@@ -386,9 +378,9 @@
   handleQuery();
 }
 /** 鏂板鎸夐挳鎿嶄綔 */
-async function handleAdd(row) {
+function handleAdd(row) {
   reset();
-  await getTreeselect();
+  getTreeselect();
   if (row != null && row.menuId) {
     form.value.parentId = row.menuId;
   } else {

--
Gitblit v1.9.3