test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-12-01 19:38:09 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix 工作空间菜单配置无法使用

Browse Source
This commit is contained in:
bwcx_jzy 2024-01-02 17:40:10 +08:00
parent 3afd18a35c
commit 6c75c23830
No known key found for this signature in database
GPG Key ID: E187D6E9DDDE8C53
2 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG-BETA.md
View File

@ -1,11 +1,21 @@
# 🚀 版本日志
### 2.11.0.4-beta
### 🐞 解决BUG、优化功能
1. 【server】修复 工作空间菜单配置无法使用（感谢@新）
------
### 2.11.0.3-beta (2024-01-02)
### 🐞 解决BUG、优化功能
1. 【server】修复 没有对应的工作空间权限
------
### 2.11.0.2-beta (2024-01-02)
### 🐞 解决BUG、优化功能

37
web-vue/src/pages/system/workspace-list.vue
View File

@ -109,22 +109,11 @@
<a-form-model ref="editWhiteForm" :model="menusConfigData">
<a-row type="flex" justify="center">
<a-alert :message="`菜单配置只对非超级管理员生效`" style="margin-top: 10px; margin-bottom: 20px" banner />
<a-col :span="12">
<a-col :span="20">
<a-card title="服务端菜单" :bordered="false">
<a-tree show-icon v-if="menusConfigData.serverMenus" checkable :tree-data="menusConfigData.serverMenus" :replaceFields="replaceFields" v-model="menusConfigData.serverMenuKeys">
<a-icon slot="switcherIcon" type="down" />
<template slot="custom" slot-scope="{ dataRef }">
<a-icon :type="dataRef.icon_v3" />
</template>
</a-tree>
</a-card>
</a-col>
<a-col :span="12">
<a-card title="节点菜单" :bordered="false">
<a-tree show-icon v-if="menusConfigData.nodeMenus" checkable :tree-data="menusConfigData.nodeMenus" :replaceFields="replaceFields" v-model="menusConfigData.nodeMenuKeys">
<a-icon slot="switcherIcon" type="down" />
<template slot="custom" slot-scope="{ dataRef }">
<a-icon :type="dataRef.icon_v3" />
</template>
@ -400,14 +389,7 @@ export default {
});
return item;
});
this.menusConfigData.nodeMenus = this.menusConfigData?.nodeMenus.map((item) => {
item.scopedSlots = { icon: "custom" };
item.childs?.map((item2) => {
item2.id = item.id + ":" + item2.id;
return item2;
});
return item;
});
if (!this.menusConfigData?.serverMenuKeys) {
//
const serverMenuKeys = [];
@ -422,26 +404,13 @@ export default {
this.menusConfigData = { ...this.menusConfigData, serverMenuKeys: serverMenuKeys };
}
if (!this.menusConfigData?.nodeMenuKeys) {
//
const nodeMenuKeys = [];
this.menusConfigData.nodeMenus.forEach((item) => {
nodeMenuKeys.push(item.id);
if (item.childs) {
item.childs.forEach((item2) => {
nodeMenuKeys.push(item2.id);
});
}
});
this.menusConfigData = { ...this.menusConfigData, nodeMenuKeys: nodeMenuKeys };
}
this.configMenuVisible = true;
});
},
onSubmitMenus() {
saveMenusConfig({
serverMenuKeys: this.menusConfigData.serverMenuKeys.join(","),
nodeMenuKeys: this.menusConfigData.nodeMenuKeys.join(","),
workspaceId: this.temp.id,
}).then((res) => {
if (res.code === 200) {