From f6a8e02d37b130992a67f43c6eb4055bf22379f1 Mon Sep 17 00:00:00 2001 From: RuoYi <yzz_ivy@163.com> Date: 星期六, 02 四月 2022 17:27:33 +0800 Subject: [PATCH] 修复文字提示不显示问题 --- src/views/system/menu/index.vue | 41 ++++++++++++++++++++--------------------- 1 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 4bd2c03..c7362a6 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -6,12 +6,11 @@ v-model="queryParams.menuName" placeholder="璇疯緭鍏ヨ彍鍗曞悕绉�" clearable - size="small" @keyup.enter="handleQuery" /> </el-form-item> <el-form-item label="鐘舵��" prop="status"> - <el-select v-model="queryParams.status" placeholder="鑿滃崟鐘舵��" clearable size="small"> + <el-select v-model="queryParams.status" placeholder="鑿滃崟鐘舵��" clearable> <el-option v-for="dict in sys_normal_disable" :key="dict.value" @@ -21,8 +20,8 @@ </el-select> </el-form-item> <el-form-item> - <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button> - <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button> + <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button> + <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button> </el-form-item> </el-form> @@ -32,7 +31,6 @@ type="primary" plain icon="Plus" - size="mini" @click="handleAdd" v-hasPermi="['system:menu:add']" >鏂板</el-button> @@ -42,7 +40,6 @@ type="info" plain icon="Sort" - size="mini" @click="toggleExpandAll" >灞曞紑/鎶樺彔</el-button> </el-col> @@ -79,21 +76,18 @@ <el-table-column label="鎿嶄綔" align="center" width="200" class-name="small-padding fixed-width"> <template #default="scope"> <el-button - size="mini" type="text" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:menu:edit']" >淇敼</el-button> <el-button - size="mini" type="text" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['system:menu:add']" >鏂板</el-button> <el-button - size="mini" type="text" icon="Delete" @click="handleDelete(scope.row)" @@ -104,7 +98,7 @@ </el-table> <!-- 娣诲姞鎴栦慨鏀硅彍鍗曞璇濇 --> - <el-dialog :title="title" v-model="open" width="680px" append-to-body> + <el-dialog :title="title" v-model="open" width="680px" :before-close="handleClose" append-to-body> <el-form ref="menuRef" :model="form" :rules="rules" label-width="100px"> <el-row> <el-col :span="24"> @@ -135,9 +129,8 @@ trigger="click" @show="showSelectIcon" > - <icon-select ref="iconSelectRef" @selected="selected" /> <template #reference> - <el-input v-model="form.icon" placeholder="鐐瑰嚮閫夋嫨鍥炬爣" readonly> + <el-input v-model="form.icon" placeholder="鐐瑰嚮閫夋嫨鍥炬爣" @click="showSelectIcon" readonly> <template #prefix> <svg-icon v-if="form.icon" @@ -145,10 +138,11 @@ class="el-input__icon" style="height: 32px;width: 16px;" /> - <i v-else class="el-icon-search el-input__icon" /> + <el-icon v-else style="height: 32px;width: 16px;"><search /></el-icon> </template> </el-input> </template> + <icon-select ref="iconSelectRef" @selected="selected" /> </el-popover> </el-form-item> </el-col> @@ -167,7 +161,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> @@ -182,7 +176,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> @@ -195,7 +189,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> @@ -209,7 +203,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> @@ -222,7 +216,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> @@ -234,7 +228,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> @@ -250,7 +244,7 @@ <template #label> <span> <el-tooltip content="閫夋嫨闅愯棌鍒欒矾鐢卞皢涓嶄細鍑虹幇鍦ㄤ晶杈规爮锛屼絾浠嶇劧鍙互璁块棶" placement="top"> - <i class="el-icon-question"></i> + <el-icon><question-filled /></el-icon> </el-tooltip> 鏄剧ず鐘舵�� </span> @@ -269,7 +263,7 @@ <template #label> <span> <el-tooltip content="閫夋嫨鍋滅敤鍒欒矾鐢卞皢涓嶄細鍑虹幇鍦ㄤ晶杈规爮锛屼篃涓嶈兘琚闂�" placement="top"> - <i class="el-icon-question"></i> + <el-icon><question-filled /></el-icon> </el-tooltip> 鑿滃崟鐘舵�� </span> @@ -377,6 +371,11 @@ form.value.icon = name; showChooseIcon.value = false; } +/** 鍏抽棴寮圭獥闅愯棌鍥炬爣閫夋嫨 */ +function handleClose() { + cancel(); + showChooseIcon.value = false; +} /** 鎼滅储鎸夐挳鎿嶄綔 */ function handleQuery() { getList(); -- Gitblit v1.9.3