From 1abf0641b04125f413ead8283819171dac186601 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期六, 29 六月 2024 15:39:18 +0800
Subject: [PATCH] Merge pull request #287 from 593496637/main
---
src/views/system/menu/index.vue | 50 ++++++++++++++++++++++++--------------------------
1 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index c3f55a4..036c085 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -102,9 +102,9 @@
<el-col :span="24">
<el-form-item label="鑿滃崟绫诲瀷" prop="menuType">
<el-radio-group v-model="form.menuType">
- <el-radio label="M">鐩綍</el-radio>
- <el-radio label="C">鑿滃崟</el-radio>
- <el-radio label="F">鎸夐挳</el-radio>
+ <el-radio value="M">鐩綍</el-radio>
+ <el-radio value="C">鑿滃崟</el-radio>
+ <el-radio value="F">鎸夐挳</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -113,12 +113,10 @@
<el-popover
placement="bottom-start"
:width="540"
- v-model:visible="showChooseIcon"
trigger="click"
- @show="showSelectIcon"
>
<template #reference>
- <el-input v-model="form.icon" placeholder="鐐瑰嚮閫夋嫨鍥炬爣" @blur="showSelectIcon" v-click-outside="hideSelectIcon" readonly>
+ <el-input v-model="form.icon" placeholder="鐐瑰嚮閫夋嫨鍥炬爣" @blur="showSelectIcon" readonly>
<template #prefix>
<svg-icon
v-if="form.icon"
@@ -130,7 +128,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>
@@ -154,8 +152,8 @@
</span>
</template>
<el-radio-group v-model="form.isFrame">
- <el-radio label="0">鏄�</el-radio>
- <el-radio label="1">鍚�</el-radio>
+ <el-radio value="0">鏄�</el-radio>
+ <el-radio value="1">鍚�</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -222,8 +220,8 @@
</span>
</template>
<el-radio-group v-model="form.isCache">
- <el-radio label="0">缂撳瓨</el-radio>
- <el-radio label="1">涓嶇紦瀛�</el-radio>
+ <el-radio value="0">缂撳瓨</el-radio>
+ <el-radio value="1">涓嶇紦瀛�</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -241,12 +239,12 @@
<el-radio
v-for="dict in sys_show_hide"
:key="dict.value"
- :label="dict.value"
+ :value="dict.value"
>{{ dict.label }}</el-radio>
</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>
@@ -260,7 +258,7 @@
<el-radio
v-for="dict in sys_normal_disable"
:key="dict.value"
- :label="dict.value"
+ :value="dict.value"
>{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
@@ -281,7 +279,6 @@
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");
@@ -294,7 +291,6 @@
const menuOptions = ref([]);
const isExpandAll = ref(false);
const refreshTable = ref(true);
-const showChooseIcon = ref(false);
const iconSelectRef = ref(null);
const data = reactive({
@@ -320,6 +316,7 @@
loading.value = false;
});
}
+
/** 鏌ヨ鑿滃崟涓嬫媺鏍戠粨鏋� */
function getTreeselect() {
menuOptions.value = [];
@@ -329,11 +326,13 @@
menuOptions.value.push(menu);
});
}
+
/** 鍙栨秷鎸夐挳 */
function cancel() {
open.value = false;
reset();
}
+
/** 琛ㄥ崟閲嶇疆 */
function reset() {
form.value = {
@@ -350,33 +349,28 @@
};
proxy.resetForm("menuRef");
}
+
/** 灞曠ず涓嬫媺鍥炬爣 */
function showSelectIcon() {
iconSelectRef.value.reset();
- showChooseIcon.value = true;
}
+
/** 閫夋嫨鍥炬爣 */
function selected(name) {
form.value.icon = name;
- 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() {
getList();
}
+
/** 閲嶇疆鎸夐挳鎿嶄綔 */
function resetQuery() {
proxy.resetForm("queryRef");
handleQuery();
}
+
/** 鏂板鎸夐挳鎿嶄綔 */
function handleAdd(row) {
reset();
@@ -389,6 +383,7 @@
open.value = true;
title.value = "娣诲姞鑿滃崟";
}
+
/** 灞曞紑/鎶樺彔鎿嶄綔 */
function toggleExpandAll() {
refreshTable.value = false;
@@ -397,6 +392,7 @@
refreshTable.value = true;
});
}
+
/** 淇敼鎸夐挳鎿嶄綔 */
async function handleUpdate(row) {
reset();
@@ -407,6 +403,7 @@
title.value = "淇敼鑿滃崟";
});
}
+
/** 鎻愪氦鎸夐挳 */
function submitForm() {
proxy.$refs["menuRef"].validate(valid => {
@@ -427,6 +424,7 @@
}
});
}
+
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
function handleDelete(row) {
proxy.$modal.confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.menuName + '"鐨勬暟鎹」?').then(function() {
--
Gitblit v1.9.3