From a4ca216c5b215f323b3c439b2f445dad72bbfce1 Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期一, 26 八月 2024 16:44:31 +0800
Subject: [PATCH] fix: 修改bug
---
src/views/authority/role/index.vue | 159 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 122 insertions(+), 37 deletions(-)
diff --git a/src/views/authority/role/index.vue b/src/views/authority/role/index.vue
index baa7842..9f38faf 100644
--- a/src/views/authority/role/index.vue
+++ b/src/views/authority/role/index.vue
@@ -93,7 +93,7 @@
@click="operation(4, record)"
>瑙掕壊鏉冮檺</a-button>
<a-popconfirm
- content="Are you sure you want to delete?"
+ content="璇风‘璁ゆ槸鍚﹀垹闄わ紵"
type="success"
@ok="operation(3, record)"
>
@@ -111,8 +111,8 @@
@cancel="handleCancel(1)"
@ok="editHandleOk"
>
- <a-form :model="editform">
- <a-form-item required field="roleName" label="瑙掕壊鍚�">
+ <a-form ref="formRef" :model="editform">
+ <a-form-item required field="roleName" label="瑙掕壊鍚�" :rules="[{required:true,message:'瑙掕壊鍚嶅繀濉�'},{maxLength:50,message:'闀垮害涓嶈秴杩�50'}]">
<a-input v-model="editform.roleName" />
</a-form-item>
<a-form-item field="remark" label="澶囨敞">
@@ -140,16 +140,15 @@
class="tree-demo"
v-model:checked-keys="checkedKeysMenu"
v-model:expanded-keys="expandKdysMenu"
+ :only-check-leaf=true
:checkable="true"
:data="treeDataMenu"
- :show-line="showLineMenu"
@check="onCheckMenu"
:fieldNames="{
key: 'menuId',
title: 'menuName',
children: 'children',
}"
- :check-strictly="checkStrictlyMenu"
>
</a-tree>
</a-tab-pane>
@@ -193,8 +192,8 @@
</a-checkbox>
</a-checkbox-group>
<a-checkbox-group
- v-model="checkedKeysDialog"
- @change="onCheckDialog"
+ v-model="checkedKeysAgent"
+ @change="onCheckAgent"
>
<a-checkbox
v-for="(agent, index) of AgentList"
@@ -215,7 +214,7 @@
'margin': '1px',
}"
class="card-demo"
- title="鐢ㄦ埛鎵�鏈夋潈闄�"
+ title="瑙掕壊鎵�鏈夋潈闄�"
hoverable
>
<a-space wrap>
@@ -249,6 +248,13 @@
>
{{ tag.dialogName }}
</a-tag>
+ <a-tag
+ v-for="(tag, index) of checkStrictlyAgent"
+ :key="tag.agentId"
+ @close="handleDialogRemove(tag)"
+ >
+ {{ tag.agentTitle }}
+ </a-tag>
</a-space>
</a-card>
</div>
@@ -279,6 +285,8 @@
import Authheader from '@/views/authority/components/authheader.vue';
import router from "@/router";
import { queryCanvasList } from "@/api/Agent";
+ import { getUserInfo, getUserResources } from "@/utils/auth";
+ import { forEach } from "lodash";
let treeDataMenu = ref([]);
let checkedKeysMenu = ref([]);
@@ -330,18 +338,51 @@
let resourcevisible = ref(false);
let selectRole = ref({});
+
+ const eachChildrenAdd=(node)=>{
+ if (node.children?.length > 0) {
+ node.children.forEach((child) => {
+ checkStrictlyMenu.value.push({ menuId: child.menuId, menuName: child.menuName });
+ eachChildrenAdd(child);
+ });
+ }
+ }
+
+ const findChild = (node, val): boolean => {
+ let isExist = false;
+ if (node.children?.length > 0) {
+ node.children.forEach((child) => {
+ if (val.menuId == child.menuId) {
+ isExist = isExist || true;
+ } else {
+ isExist = isExist || findChild(child, val);
+ }
+ });
+ }
+ return isExist;
+ };
+
const onCheckMenu = (newCheckedKeys, event) => {
let o = { menuId: event.node.menuId, menuName: event.node.menuName };
if (event.checked) {
checkStrictlyMenu.value.push(o);
+ eachChildrenAdd(event.node);
+ if (event.halfCheckedNodes?.length > 0) {
+ event.halfCheckedNodes.forEach((child) => {
+ let e = { menuId: child.menuId, menuName: child.menuName };
+ if (checkStrictlyMenu.value.find((item) => item.menuId === e.menuId) == undefined) {
+ checkStrictlyMenu.value.push(e);
+ }
+ });
+ }
} else {
+ let menus=[];
checkStrictlyMenu.value.forEach((val, idx, array) => {
- // val: 褰撳墠鍊�
- if (val.menuId == event.node.menuId) {
- checkStrictlyMenu.value.splice(idx, 1);
- return true;
+ if (val.menuId != event.node.menuId && !findChild(event.node, val)) {
+ menus.push({ menuId: val.menuId, menuName: val.menuName });
}
});
+ checkStrictlyMenu.value = menus;
}
};
const onCheckKnowledge = (newCheckedKeys, event) => {
@@ -396,9 +437,7 @@
}
};
- const handleRemove = (key) => {
- checkStrictly.value = checkStrictly.value.filter((tag) => tag !== key);
- };
+
const handleMenuRemove = (key) => {
checkStrictlyMenu.value = checkStrictlyMenu.value.filter(
(tag) => tag !== key
@@ -414,7 +453,7 @@
(tag) => tag !== key
);
};
-
+ let formRef = ref();
const basePagination: Pagination = {
current: 1,
pageSize: 15,
@@ -480,6 +519,7 @@
const editResourceHandleOk = async () => {
let resources: Array = [],
dialogs: Array = [],
+ agents: Array = [],
Knowledges: Array = [],
role: Role = { roleId: selectRole.value.roleId };
checkStrictlyMenu.value.forEach((val) => {
@@ -497,32 +537,39 @@
});
role.dialogs = dialogs;
+ checkStrictlyAgent.value.forEach((val) => {
+ agents.push(val.agentId);
+ });
+ role.agents = agents;
+
await RoleEdit(role).then((res) => {
fetchData();
});
};
- const editHandleOk = async () => {
- if(editform.value.roleName==""){
- Modal.warning({
- title: '璀﹀憡',
- content: '鍚嶇О涓嶈兘涓虹┖'
- });
- return;
- }
- if (editform.value.roleId.length > 0) {
- await RoleEdit({
- ...editform.value,
- } as unknown as Role).then((res) => {
- fetchData();
- });
+ const cb = async (err) => {
+ if (err) {
+ visible.value = true;
} else {
- await RoleAdd({
- ...editform.value,
- } as unknown as Role).then((res) => {
- fetchData();
- });
+ if (editform.value.roleId.length > 0) {
+ await RoleEdit({
+ ...editform.value,
+ } as unknown as Role).then((res) => {
+ fetchData();
+ });
+ } else {
+ await RoleAdd({
+ ...editform.value,
+ } as unknown as Role).then((res) => {
+ fetchData();
+ });
+ }
}
+
+ };
+
+ const editHandleOk = () => {
+ formRef.value.validate(cb);
};
const operation = async (t, record) => {
if (t == 0) {
@@ -550,6 +597,7 @@
checkStrictlyKnowledge.value = [];
checkedKeysKnowledge.value = [];
checkStrictlyDialog.value = [];
+ checkStrictlyAgent.value = [];
checkedKeysDialog.value = [];
selectRole.value = record;
if (record.resources) {
@@ -578,6 +626,15 @@
dialogName: val.name,
});
checkedKeysDialog.value.push(val.id);
+ });
+ }
+ if (record.agents) {
+ record.agents.forEach((val) => {
+ checkStrictlyAgent.value.push({
+ agentId: val.id,
+ agentTitle: val.title,
+ });
+ checkedKeysAgent.value.push(val.id);
});
}
}
@@ -613,18 +670,46 @@
};
+ let userResources = JSON.parse(getUserResources());
+ const isExist = (val): boolean => {
+ let isok = false;
+ userResources.forEach((r) => {
+ if (val == r.menuId) {
+ isok = true;
+ }
+ });
+ return isok;
+ };
+ const removeChild = (nodes,newT) => {
+ nodes.forEach((child) => {
+ if (isExist(child.menuId)){
+ newT.push(child);
+ let nt = [];
+ if (child.children?.length > 0) {
+ removeChild(child.children, nt);
+ child.children = nt;
+ }
+ }
+ });
+ };
+
const MenuData = async (key) => {
await ResourceList(key).then((res) => {
+ let newTree = [];
+ let u =JSON.parse(getUserInfo());
+ if (u.role != "admin") {
+ removeChild(res.rows, newTree);
+ }
treeDataMenu.value = [...res.rows];
});
};
KnowledgeList().then((res) => {
- knowledgeList.value = res.rows;
+ knowledgeList.value = res.data;
});
DialogList().then((res) => {
- DialogsList.value = res.rows;
+ DialogsList.value = res.data;
});
queryCanvasList(null).then((canvas) => {
AgentList= canvas.data
--
Gitblit v1.8.0