@ebiz/designer-components 0.0.19-beta.13 → 0.0.19-beta.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ebiz/designer-components",
-  "version": "0.0.19-beta.13",
+  "version": "0.0.19-beta.16",
   "private": false,
   "publishConfig": {
     "access": "public"

package/src/components/EbizTreeMergeTable.vue

@@ -161,7 +161,7 @@
             <div class="org-selected-container">
               <div v-if="tempGlobalSelectedOrgs.length === 0" class="no-selected-tip">请从左侧选择组织</div>
               <div v-else class="selected-orgs-tags">
-                <t-tag v-for="org in tempGlobalSelectedOrgs" :key="org.id" closable @close="removeGlobalOrg(org.id)"
+                <t-tag v-for="org in tempGlobalSelectedOrgs" :key="org.id" closable @close="removeGlobalSelectedOrg(org.id)"
                   theme="primary" variant="light" class="org-tag">
                   {{ org.name }}
                 </t-tag>
@@ -310,7 +310,8 @@ import {
   Input as TInput,
   Tree as TTree,
   Tag as TTag,
-  Icon as TIcon
+  Icon as TIcon,
+  Message
 } from 'tdesign-vue-next'
 
 const apis = {
@@ -372,10 +373,12 @@ function getRoleConfig() {
         if (matchedFunction) {
           // 设置功能勾选状态为true
           matchedFunction.checked = true;
-
+          
           // 保存数据权限配置（如果有）
           if (item.dataScope) {
             row.dataPermission = item.dataScope;
+            // 标记为自定义配置
+            row.hasCustomConfig = true;
             // 如果是自定义数据权限，则设置已选组织
             if (item.dataScope === 6 && item.deptIds && item.deptIds.length > 0) {
               row.selectedOrgs = item.deptIds.map(id => {
@@ -387,7 +390,7 @@ function getRoleConfig() {
               });
             }
           }
-
+          
           // 更新父级勾选状态（模块、子模块）
           updateParentCheckStatus(row);
         }
@@ -761,16 +764,17 @@ const handleOrgNodeExpand = (value) => {
 // 打开数据权限配置弹窗
 const openPermissionDialog = (row) => {
   currentRow.value = row
-  // 只做展示，不写入行权限
-  if (row.dataPermission) {
-    selectedPermission.value = row.dataPermission
+  // 检查是否已有自定义配置
+  if (row.hasCustomConfig) {
+    // 已有自定义配置，使用自身配置
+    selectedPermission.value = row.dataPermission || 1
     if (row.dataPermission === 6 && row.selectedOrgs) {
       selectedOrgs.value = [...row.selectedOrgs]
     } else {
       selectedOrgs.value = []
     }
   } else {
-    // 没有配置则展示全局，但不写入行
+    // 没有自定义配置，继承全局配置
     selectedPermission.value = globalPermission.value
     if (globalPermission.value === 6) {
       selectedOrgs.value = [...globalSelectedOrgs.value]
@@ -818,15 +822,19 @@ const handleGlobalOrgNodeSelect = (node, checked) => {
     }
   } else {
     // 从已选中中移除
-    removeGlobalOrg(node.id)
+    removeGlobalSelectedOrg(node.id)
   }
 }
 
 // 移除选中的全局组织（对话框中使用）
 const removeGlobalSelectedOrg = (id) => {
-  const index = tempGlobalSelectedOrgs.value.findIndex((org) => org.id === id)
+  console.log('移除临时全局组织', id);
+  const index = tempGlobalSelectedOrgs.value.findIndex((org) => org.id === id);
   if (index !== -1) {
-    tempGlobalSelectedOrgs.value.splice(index, 1)
+    tempGlobalSelectedOrgs.value.splice(index, 1);
+    console.log('移除成功，剩余组织数量:', tempGlobalSelectedOrgs.value.length);
+  } else {
+    console.log('未找到对应组织');
   }
 }
 
@@ -864,7 +872,7 @@ const handleGlobalOrgConfirm = () => {
   // 保存选择结果
   globalSelectedOrgs.value = [...tempGlobalSelectedOrgs.value]
 
-  // 应用到所有选择了自定义数据的行
+  // 应用到未配置自定义数据权限的行
   applyGlobalOrgsToCustomRows()
 
   globalOrgDialogVisible.value = false
@@ -875,11 +883,21 @@ const handleGlobalOrgCancel = () => {
   globalOrgDialogVisible.value = false
 }
 
-// 将全局组织应用到所有自定义数据权限的行
+// 将全局组织应用到未配置自定义数据权限的行
 const applyGlobalOrgsToCustomRows = () => {
+  // 遍历每一行数据
   data.value.forEach((row) => {
-    if (row.dataPermission === 6) {
-      row.selectedOrgs = [...globalSelectedOrgs.value]
+    // 只对没有自定义配置的行应用全局设置
+    if (!row.hasCustomConfig) {
+      // 应用全局权限设置
+      row.dataPermission = globalPermission.value
+      
+      // 如果全局设置是自定义数据权限，则应用全局选择的组织
+      if (globalPermission.value === 6) {
+        row.selectedOrgs = [...globalSelectedOrgs.value]
+      } else {
+        row.selectedOrgs = []
+      }
     }
   })
 }
@@ -887,6 +905,8 @@ const applyGlobalOrgsToCustomRows = () => {
 // 确认权限配置（修改处理全局配置的情况）
 const handlePermissionConfirm = () => {
   if (currentRow.value) {
+    // 标记该行已有自定义配置
+    currentRow.value.hasCustomConfig = true;
     currentRow.value.dataPermission = selectedPermission.value
     if (selectedPermission.value === 6) {
       currentRow.value.selectedOrgs = [...selectedOrgs.value]
@@ -899,6 +919,7 @@ const handlePermissionConfirm = () => {
 
 // 取消权限配置（修改处理全局配置的情况）
 const handlePermissionCancel = () => {
+  // 只关闭弹窗，不做其他操作
   permissionDialogVisible.value = false
 }
 

package/src/index.js

@@ -57,6 +57,7 @@ import EbizTreeSelector from './components/EbizTreeSelector.vue';
 import EbizTimePicker from './components/EbizTimePicker.vue';
 import EbizPopconfirm from './components/EbizPopconfirm.vue';
 import EbizTreeMergeTable from './components/EbizTreeMergeTable.vue';
+import EbizTdesignLoading from './components/EbizTdesignLoading.vue';
 import { MessagePlugin as EbizMessage } from 'tdesign-vue-next';
 
 // import EbizDescriptions from './components/EbizDescriptions.vue';
@@ -181,5 +182,6 @@ export {
   // 新增 EbizDescriptions 和 EbizDescriptionsItem
   EbizDescriptions,
   EbizDescriptionsItem,
-  TDescriptionsItem
+  TDescriptionsItem,
+  EbizTdesignLoading
 };