From c334c2d76c1b51d0fbe1531bf524e1b90f921a7c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 20 五月 2025 15:16:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/system/menu/index.vue | 254 ++++++++++++++++++++++++++------------------------
1 files changed, 131 insertions(+), 123 deletions(-)
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index c863463..78c49cf 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,31 +69,16 @@
<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>
@@ -103,34 +89,34 @@
<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>
<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>
- <el-col :span="24" v-if="form.menuType != 'F'">
+ <el-col :span="12" v-if="form.menuType != 'F'">
<el-form-item label="鑿滃崟鍥炬爣" prop="icon">
<el-popover
placement="bottom-start"
:width="540"
- v-model:visible="showChooseIcon"
trigger="click"
- @show="showSelectIcon"
>
<template #reference>
- <el-input v-model="form.icon" placeholder="鐐瑰嚮閫夋嫨鍥炬爣" @click="showSelectIcon" readonly>
+ <el-input v-model="form.icon" placeholder="鐐瑰嚮閫夋嫨鍥炬爣" @blur="showSelectIcon" readonly>
<template #prefix>
<svg-icon
v-if="form.icon"
@@ -142,13 +128,8 @@
</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>
- <el-col :span="12">
- <el-form-item label="鑿滃崟鍚嶇О" prop="menuName">
- <el-input v-model="form.menuName" placeholder="璇疯緭鍏ヨ彍鍗曞悕绉�" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -156,18 +137,36 @@
<el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="鑿滃崟鍚嶇О" prop="menuName">
+ <el-input v-model="form.menuName" placeholder="璇疯緭鍏ヨ彍鍗曞悕绉�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12" v-if="form.menuType == 'C'">
+ <el-form-item prop="routeName">
+ <template #label>
+ <span>
+ <el-tooltip content="榛樿涓嶅～鍒欏拰璺敱鍦板潃鐩稿悓锛氬鍦板潃涓猴細`user`锛屽垯鍚嶇О涓篳User`锛堟敞鎰忥細鍥犱负router浼氬垹闄ゅ悕绉扮浉鍚岃矾鐢憋紝涓洪伩鍏嶅悕瀛楃殑鍐茬獊锛岀壒娈婃儏鍐典笅璇疯嚜瀹氫箟锛屼繚璇佸敮涓�鎬э級" placement="top">
+ <el-icon><question-filled /></el-icon>
+ </el-tooltip>
+ 璺敱鍚嶇О
+ </span>
+ </template>
+ <el-input v-model="form.routeName" placeholder="璇疯緭鍏ヨ矾鐢卞悕绉�" />
+ </el-form-item>
+ </el-col>
<el-col :span="12" v-if="form.menuType != 'F'">
<el-form-item>
<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>
<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>
@@ -176,7 +175,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>
@@ -189,7 +188,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>
@@ -203,7 +202,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>
@@ -216,7 +215,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>
@@ -228,14 +227,14 @@
<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>
</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>
@@ -244,7 +243,7 @@
<template #label>
<span>
<el-tooltip content="閫夋嫨闅愯棌鍒欒矾鐢卞皢涓嶄細鍑虹幇鍦ㄤ晶杈规爮锛屼絾浠嶇劧鍙互璁块棶" placement="top">
- <i class="el-icon-question"></i>
+ <el-icon><question-filled /></el-icon>
</el-tooltip>
鏄剧ず鐘舵��
</span>
@@ -253,17 +252,17 @@
<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>
<el-tooltip content="閫夋嫨鍋滅敤鍒欒矾鐢卞皢涓嶄細鍑虹幇鍦ㄤ晶杈规爮锛屼篃涓嶈兘琚闂�" placement="top">
- <i class="el-icon-question"></i>
+ <el-icon><question-filled /></el-icon>
</el-tooltip>
鑿滃崟鐘舵��
</span>
@@ -272,7 +271,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>
@@ -290,23 +289,22 @@
</template>
<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 { addMenu, delMenu, getMenu, listMenu, updateMenu } from "@/api/system/menu"
+import SvgIcon from "@/components/SvgIcon"
+import IconSelect from "@/components/IconSelect"
-const { proxy } = getCurrentInstance();
-const { sys_show_hide, sys_normal_disable } = proxy.useDict("sys_show_hide", "sys_normal_disable");
+const { proxy } = getCurrentInstance()
+const { sys_show_hide, sys_normal_disable } = proxy.useDict("sys_show_hide", "sys_normal_disable")
-const menuList = ref([]);
-const open = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const title = ref("");
-const menuOptions = ref([]);
-const isExpandAll = ref(false);
-const refreshTable = ref(true);
-const showChooseIcon = ref(false);
-const iconSelectRef = ref(null);
+const menuList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const title = ref("")
+const menuOptions = ref([])
+const isExpandAll = ref(false)
+const refreshTable = ref(true)
+const iconSelectRef = ref(null)
const data = reactive({
form: {},
@@ -319,32 +317,35 @@
orderNum: [{ required: true, message: "鑿滃崟椤哄簭涓嶈兘涓虹┖", trigger: "blur" }],
path: [{ required: true, message: "璺敱鍦板潃涓嶈兘涓虹┖", trigger: "blur" }]
},
-});
+})
-const { queryParams, form, rules } = toRefs(data);
+const { queryParams, form, rules } = toRefs(data)
/** 鏌ヨ鑿滃崟鍒楄〃 */
function getList() {
- loading.value = true;
+ loading.value = true
listMenu(queryParams.value).then(response => {
- menuList.value = proxy.handleTree(response.data, "menuId");
- loading.value = false;
- });
+ menuList.value = proxy.handleTree(response.data, "menuId")
+ loading.value = false
+ })
}
+
/** 鏌ヨ鑿滃崟涓嬫媺鏍戠粨鏋� */
-async function getTreeselect() {
- menuOptions.value = [];
- await listMenu().then(response => {
- const menu = { menuId: 0, menuName: "涓荤被鐩�", children: [] };
- menu.children = proxy.handleTree(response.data, "menuId");
- menuOptions.value.push(menu);
- });
+function getTreeselect() {
+ menuOptions.value = []
+ listMenu().then(response => {
+ const menu = { menuId: 0, menuName: "涓荤被鐩�", children: [] }
+ menu.children = proxy.handleTree(response.data, "menuId")
+ menuOptions.value.push(menu)
+ })
}
+
/** 鍙栨秷鎸夐挳 */
function cancel() {
- open.value = false;
- reset();
+ open.value = false
+ reset()
}
+
/** 琛ㄥ崟閲嶇疆 */
function reset() {
form.value = {
@@ -358,87 +359,94 @@
isCache: "0",
visible: "0",
status: "0"
- };
- proxy.resetForm("menuRef");
+ }
+ proxy.resetForm("menuRef")
}
+
/** 灞曠ず涓嬫媺鍥炬爣 */
function showSelectIcon() {
- iconSelectRef.value.reset();
- showChooseIcon.value = true;
+ iconSelectRef.value.reset()
}
+
/** 閫夋嫨鍥炬爣 */
function selected(name) {
- form.value.icon = name;
- showChooseIcon.value = false;
+ form.value.icon = name
}
+
/** 鎼滅储鎸夐挳鎿嶄綔 */
function handleQuery() {
- getList();
+ getList()
}
+
/** 閲嶇疆鎸夐挳鎿嶄綔 */
function resetQuery() {
- proxy.resetForm("queryRef");
- handleQuery();
+ proxy.resetForm("queryRef")
+ handleQuery()
}
+
/** 鏂板鎸夐挳鎿嶄綔 */
-async function handleAdd(row) {
- reset();
- await getTreeselect();
+function handleAdd(row) {
+ reset()
+ getTreeselect()
if (row != null && row.menuId) {
- form.value.parentId = row.menuId;
+ form.value.parentId = row.menuId
} else {
- form.value.parentId = 0;
+ form.value.parentId = 0
}
- open.value = true;
- title.value = "娣诲姞鑿滃崟";
+ open.value = true
+ title.value = "娣诲姞鑿滃崟"
}
+
/** 灞曞紑/鎶樺彔鎿嶄綔 */
function toggleExpandAll() {
- refreshTable.value = false;
- isExpandAll.value = !isExpandAll.value;
+ refreshTable.value = false
+ isExpandAll.value = !isExpandAll.value
nextTick(() => {
- refreshTable.value = true;
- });
+ refreshTable.value = true
+ })
}
+
/** 淇敼鎸夐挳鎿嶄綔 */
async function handleUpdate(row) {
- reset();
- await getTreeselect();
+ reset()
+ await getTreeselect()
getMenu(row.menuId).then(response => {
- form.value = response.data;
- open.value = true;
- title.value = "淇敼鑿滃崟";
- });
+ form.value = response.data
+ open.value = true
+ title.value = "淇敼鑿滃崟"
+ })
}
+
/** 鎻愪氦鎸夐挳 */
function submitForm() {
proxy.$refs["menuRef"].validate(valid => {
if (valid) {
if (form.value.menuId != undefined) {
updateMenu(form.value).then(response => {
- proxy.$modal.msgSuccess("淇敼鎴愬姛");
- open.value = false;
- getList();
- });
+ proxy.$modal.msgSuccess("淇敼鎴愬姛")
+ open.value = false
+ getList()
+ })
} else {
addMenu(form.value).then(response => {
- proxy.$modal.msgSuccess("鏂板鎴愬姛");
- open.value = false;
- getList();
- });
+ proxy.$modal.msgSuccess("鏂板鎴愬姛")
+ open.value = false
+ getList()
+ })
}
}
- });
+ })
}
+
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
function handleDelete(row) {
proxy.$modal.confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.menuName + '"鐨勬暟鎹」?').then(function() {
- return delMenu(row.menuId);
+ return delMenu(row.menuId)
}).then(() => {
- getList();
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ getList()
+ proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+ }).catch(() => {})
}
-getList();
+getList()
</script>
--
Gitblit v1.9.3