From 1d2f37bfe138fcbfa316d817a8b8fbccdf0ba2be Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 15 八月 2022 12:07:45 +0800
Subject: [PATCH] 修复图片预览组件src属性为null值控制台报错问题(I5KBAS)
---
src/views/system/menu/index.vue | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index c7362a6..f6b118f 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -98,16 +98,18 @@
</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 +132,7 @@
@show="showSelectIcon"
>
<template #reference>
- <el-input v-model="form.icon" placeholder="鐐瑰嚮閫夋嫨鍥炬爣" @click="showSelectIcon" readonly>
+ <el-input v-model="form.icon" placeholder="鐐瑰嚮閫夋嫨鍥炬爣" @click="showSelectIcon" v-click-outside="hideSelectIcon" readonly>
<template #prefix>
<svg-icon
v-if="form.icon"
@@ -293,6 +295,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 +335,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 +374,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 +392,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