diff --git a/src/views/system/Department/components/EditPermissionDialog.vue b/src/views/system/Department/components/EditPermissionDialog.vue index 5ca42c47..d63dba83 100644 --- a/src/views/system/Department/components/EditPermissionDialog.vue +++ b/src/views/system/Department/components/EditPermissionDialog.vue @@ -8,12 +8,13 @@ visible @cancel="emits('update:visible', false)" > - -
+
+ + + 只能分配有'共享'权限的资产数据 + +
+
资产权限: { }); - + diff --git a/src/views/system/Platforms/Api/components/ApiTest.vue b/src/views/system/Platforms/Api/components/ApiTest.vue index e9019723..3a1de1d8 100644 --- a/src/views/system/Platforms/Api/components/ApiTest.vue +++ b/src/views/system/Platforms/Api/components/ApiTest.vue @@ -83,7 +83,7 @@
diff --git a/src/views/system/Platforms/Api/components/ChooseApi.vue b/src/views/system/Platforms/Api/components/ChooseApi.vue index 9aae81d3..621734b5 100644 --- a/src/views/system/Platforms/Api/components/ChooseApi.vue +++ b/src/views/system/Platforms/Api/components/ChooseApi.vue @@ -83,10 +83,27 @@ const rowSelection = { selectedRowKeys: ref([]), }; const save = async () => { - const keys = props.selectedRowKeys; + // fix: #bug10828 + // 当前节点表格数据id + const currenTableKeys = props.tableData.map((m: any) => m.id); + // 当前表格选中的id + const currentSelectedKeys = rowSelection.selectedRowKeys.value; + // 当前表格, 原有选中的id + const oldSelectedKeys = currenTableKeys.filter((key) => + props.sourceKeys.includes(key), + ); - const removeKeys = props.sourceKeys.filter((key) => !keys.includes(key)); - const addKeys = keys.filter((key) => !props.sourceKeys.includes(key)); + // const keys = props.selectedRowKeys; + // const removeKeys = props.sourceKeys.filter((key) => !keys.includes(key)); + // const addKeys = keys.filter((key) => !props.sourceKeys.includes(key)); + // 取消选择的数据项 + const removeKeys = oldSelectedKeys.filter( + (key) => !currentSelectedKeys.includes(key), + ); + // 新增选择的项 + const addKeys = currentSelectedKeys.filter( + (key) => !oldSelectedKeys.includes(key), + ); if (props.mode === 'api') { // 此时是api配置 diff --git a/src/views/system/User/components/EditUserDialog.vue b/src/views/system/User/components/EditUserDialog.vue index a9fb8531..5a53dcc2 100644 --- a/src/views/system/User/components/EditUserDialog.vue +++ b/src/views/system/User/components/EditUserDialog.vue @@ -117,9 +117,12 @@ show-search style="width: 100%" placeholder="请选择组织" - multiple :tree-data="form.departmentOptions" :fieldNames="{ label: 'name', value: 'id' }" + multiple + :filterTreeNode=" + (v: string, node: any) => filterSelectNode(v, node, 'name') + " >