From cad6506ac856d3a7658d503baa2fe07e3a0c48a1 Mon Sep 17 00:00:00 2001
From: dataprince <dataprince@163.com>
Date: Fri, 17 Nov 2023 09:27:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=8F=9C=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BF=AE=E6=AD=A3=E2=80=9C?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=9B=BE=E6=A0=87=E2=80=9D=E7=94=BB=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/system/menu/index.vue | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue
index edd5d57..3152bc8 100644
--- a/ruoyi-ui/src/views/system/menu/index.vue
+++ b/ruoyi-ui/src/views/system/menu/index.vue
@@ -130,7 +130,7 @@
                 @show="showSelectIcon"
               >
                 <template #reference>
-                  <el-input v-model="form.icon" placeholder="点击选择图标" @click="showSelectIcon" readonly>
+                  <el-input v-model="form.icon" v-click-outside="hideSelectIcon" placeholder="点击选择图标" @blur="showSelectIcon" readonly>
                     <template #prefix>
                       <svg-icon
                         v-if="form.icon"
@@ -202,7 +202,7 @@
               <el-input v-model="form.perms" placeholder="请输入权限标识" maxlength="100" />
               <template #label>
                         <span>
-                           <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasPermi('system:user:list')`)" placement="top">
+                           <el-tooltip content="控制器中定义的权限字符，如：@SaCheckPermission('system:user:query')" placement="top">
                               <i class="el-icon-question"></i>
                            </el-tooltip>
                            权限字符
@@ -258,7 +258,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="12" v-if="form.menuType != 'F'">
             <el-form-item>
               <template #label>
                         <span>
@@ -291,8 +291,10 @@
 
 <script setup name="Menu">
 import { addMenu, delMenu, getMenu, listMenu,  updateMenu } from "@/api/system/menu";
-import SvgIcon from "@/components/SvgIcon";
-import IconSelect from "@/components/IconSelect";
+import SvgIcon from "@/components/SvgIcon/index.vue";
+import IconSelect from "@/components/IconSelect/index.vue";
+import { ClickOutside as vClickOutside } from 'element-plus';
+import { ref, reactive, toRefs, nextTick } from 'vue';
 
 const { proxy } = getCurrentInstance();
 const { sys_show_hide, sys_normal_disable } = proxy.useDict("sys_show_hide", "sys_normal_disable");
@@ -366,6 +368,14 @@ function showSelectIcon() {
   iconSelectRef.value.reset();
   showChooseIcon.value = true;
 }
+/** 图标外层点击隐藏下拉列表 */
+function hideSelectIcon(event) {
+  let elem = event.relatedTarget || event.srcElement || event.target || event.currentTarget;
+  let className = elem.className;
+  if (className !== 'el-input__inner') {
+    showChooseIcon.value = false;
+  }
+}
 /** 选择图标 */
 function selected(name) {
   form.value.icon = name;