From cb80de3742d66cfee20bc3136c735e5ca5a7d45c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 29 十一月 2023 12:44:42 +0800
Subject: [PATCH] 优化字典标签支持自定义分隔符
---
src/views/system/menu/index.vue | 48 +++++++++++++++++++-----------------------------
1 files changed, 19 insertions(+), 29 deletions(-)
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 6ead733..271a021 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,37 +69,22 @@
<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">
@@ -132,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"
@@ -144,7 +130,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>
@@ -260,7 +246,7 @@
</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>
@@ -295,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");
@@ -373,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() {
--
Gitblit v1.9.3