@ebiz/designer-components 0.0.19-beta.10 → 0.0.19-beta.12

package/package.json

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

package/src/components/EbizTreeMergeTable.vue

@@ -207,8 +207,8 @@
                     </div>
                   </div>
                   <div class="org-tree-container">
-                    <t-tree :data="filteredOrgTreeData" :keys="orgTreeKeys" activable hover expandAll line expand-on-click-node
-                      :expanded="expandedKeys" :active="activeKey" @active="handleOrgNodeActive"
+                    <t-tree :data="filteredOrgTreeData" :keys="orgTreeKeys" activable hover expandAll line
+                      expand-on-click-node :expanded="expandedKeys" :active="activeKey" @active="handleOrgNodeActive"
                       @expand="handleOrgNodeExpand">
                       <template #operations="{ node }">
                         <t-checkbox :checked="isOrgNodeSelected(node.data.id)"
@@ -359,41 +359,42 @@ dataService.fetch({}, {}, apis.tree).then((res) => {
     row.functionChecked = false
   })
   data.value = processedData;
-  dataService.fetch({}, {}, apis.getConfig.replace('{roleId}', props.id)).then((res) => {
-      res.forEach(item => {
-        // 获取functionId
-        const functionId = item.functionId;
-        // 在data.value中查找对应功能所在的行
-        data.value.forEach(row => {
-          // 检查functions数组中是否有匹配的功能
-          const matchedFunction = row.functions.find(func => func.id === functionId);
-          if (matchedFunction) {
-            // 设置功能勾选状态为true
-            matchedFunction.checked = true;
-            
-            // 保存数据权限配置（如果有）
-            if (item.dataScope) {
-              row.dataPermission = item.dataScope;
-              // 如果是自定义数据权限，则设置已选组织
-              if (item.dataScope === 6 && item.deptIds && item.deptIds.length > 0) {
-                row.selectedOrgs = item.deptIds.map(id => {
-                  const org = findOrgInTree(orgTreeData.value, id);
-                  return {
-                    id: id,
-                    name: org ? org.name : `组织${id}`
-                  };
-                });
-              }
+})
+function getRoleConfig() {
+  dataService.fetch({}, {}, apis.getConfig.replace('{roleId}', roleId.value || props.id)).then((res) => {
+    res.forEach(item => {
+      // 获取functionId
+      const functionId = item.functionId;
+      // 在data.value中查找对应功能所在的行
+      data.value.forEach(row => {
+        // 检查functions数组中是否有匹配的功能
+        const matchedFunction = row.functions.find(func => func.id === functionId);
+        if (matchedFunction) {
+          // 设置功能勾选状态为true
+          matchedFunction.checked = true;
+
+          // 保存数据权限配置（如果有）
+          if (item.dataScope) {
+            row.dataPermission = item.dataScope;
+            // 如果是自定义数据权限，则设置已选组织
+            if (item.dataScope === 6 && item.deptIds && item.deptIds.length > 0) {
+              row.selectedOrgs = item.deptIds.map(id => {
+                const org = findOrgInTree(orgTreeData.value, id);
+                return {
+                  id: id,
+                  name: org ? org.name : `组织${id}`
+                };
+              });
             }
-            
-            // 更新父级勾选状态（模块、子模块）
-            updateParentCheckStatus(row);
           }
-        });
+
+          // 更新父级勾选状态（模块、子模块）
+          updateParentCheckStatus(row);
+        }
       });
+    });
   })
-})
-
+}
 /**
  * 处理树形数据，生成四级结构（模块、子模块1、子模块2、功能列表）
  * @param {Array} treeData 原始树形数据
@@ -929,26 +930,30 @@ const onOrgSearch = () => {
     )
     .then(async (res) => {
       orgTreeData.value = res;
-        if(props.type === 'post'){
-          roleId.value = await dataService.fetch({}, {}, apis.getRole.replace('{positionId}', props.id)).then((res) => {
-            roleId.value = res?.id
-          })
-        }else{
-          roleId.value = props.id;
+      if (props.type === 'post') {
+        roleId.value = (await dataService.fetch({}, {}, apis.getRole.replace('{positionId}', props.id))).id
+      } else {
+        roleId.value = props.id;
+      }
+      if (!roleId.value) return;
+      let timer = setInterval(() => {
+        if (data.value.length > 0) {
+          clearInterval(timer)
+          getRoleConfig()
         }
-        if(!roleId.value)return;
-        dataService.fetch({}, {}, apis.gerRoleInfo.replace('{id}', props.id)).then(res => {
-          globalPermission.value = res.dataScope;
-          // 使用递归查找函数获取完整组织信息
-          globalSelectedOrgs.value = [...res.deptIds].map(id => {
-            const org = findOrgInTree(orgTreeData.value, id);
-            return {
-              id: id,
-              name: org ? org.name : `组织${id}` // 如果找不到组织，提供一个默认名称
-            };
-          });
-          // 查询角色信息
-        })
+      }, 500);
+      dataService.fetch({}, {}, apis.gerRoleInfo.replace('{id}', roleId.value)).then(res => {
+        globalPermission.value = res.dataScope;
+        // 使用递归查找函数获取完整组织信息
+        globalSelectedOrgs.value = [...res.deptIds].map(id => {
+          const org = findOrgInTree(orgTreeData.value, id);
+          return {
+            id: id,
+            name: org ? org.name : `组织${id}` // 如果找不到组织，提供一个默认名称
+          };
+        });
+        // 查询角色信息
+      })
     })
 }
 onOrgSearch()
@@ -983,7 +988,7 @@ const computedSelectedData = computed(() => {
   }
   if (roleId.value) {
     role.id = roleId.value
-  }else{
+  } else {
     role.positionId = props.id
   }
   return {
@@ -1006,7 +1011,7 @@ function handleSaveRolePermission() {
     {},
     apis.saveRole
   ).then(res => {
-    if(!res){
+    if (!res) {
       Message.error('保存失败')
       return
     }
@@ -1022,11 +1027,11 @@ defineExpose({
 // 先添加一个从树形结构中递归查找组织的辅助函数
 const findOrgInTree = (tree, id) => {
   if (!tree || !Array.isArray(tree)) return null;
-  
+
   // 先在当前层级查找
   const found = tree.find(item => item.id === id);
   if (found) return found;
-  
+
   // 如果当前层级没找到，递归查找子节点
   for (const node of tree) {
     if (node.childs && node.childs.length > 0) {
@@ -1034,7 +1039,7 @@ const findOrgInTree = (tree, id) => {
       if (foundInChild) return foundInChild;
     }
   }
-  
+
   return null; // 未找到
 };
 
@@ -1042,27 +1047,27 @@ const findOrgInTree = (tree, id) => {
 const updateParentCheckStatus = (row) => {
   // 判断当前行的功能是否全部勾选
   const allFunctionsChecked = row.functions.every(func => func.checked);
-  
+
   // 更新子模块2的勾选状态
   if (row.subModule2) {
     // 寻找同组的所有行
-    const sameGroup = data.value.filter(item => 
-      item.moduleId === row.moduleId && 
-      item.subModule1Id === row.subModule1Id && 
+    const sameGroup = data.value.filter(item =>
+      item.moduleId === row.moduleId &&
+      item.subModule1Id === row.subModule1Id &&
       item.subModule2Id === row.subModule2Id
     );
-    
+
     // 判断同组的所有行是否全部勾选了功能
-    const allRowsChecked = sameGroup.every(item => 
+    const allRowsChecked = sameGroup.every(item =>
       item.functions.every(func => func.checked)
     );
-    
+
     // 更新子模块2的勾选状态
     sameGroup.forEach(item => {
       item.subModule2Checked = allRowsChecked;
     });
   }
-  
+
   // 更新子模块1的勾选状态
   updateSubModule1Checked(row.moduleId, row.subModule1Id);
 }
@@ -1218,6 +1223,7 @@ const updateParentCheckStatus = (row) => {
     transition: all 0.2s ease;
     border-radius: 4px;
     cursor: pointer;
+
     &:hover {
       box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
       transform: translateY(-1px);
@@ -1285,6 +1291,7 @@ const updateParentCheckStatus = (row) => {
   border-radius: 6px;
   overflow: hidden;
   background-color: #fff;
+
   .panel-header {
     background-color: #f5f5f5;
     padding: 12px 16px;
@@ -1383,4 +1390,4 @@ const updateParentCheckStatus = (row) => {
   color: #999;
   font-size: 14px;
 }
-</style> 
+</style>

package/src/components/EbizTreeSelector.vue

@@ -154,7 +154,7 @@ const fetchApiData = async () => {
       '/appdata/execute/plugin?key=organizational_structure'
     )
     employeeData.value = (await dataService.fetch(
-      {keyWord:activeTab.value === 'employee' ? searchText.value : ''},
+      {postEnable:true, keyWord:activeTab.value === 'employee' ? searchText.value : ''},
       {},
       "/appdata/execute/plugin?key=all_active_employesse"
     )).map(i=>({

package/src/components/EbizTreeMergeTableConfig.vue

@@ -1,36 +0,0 @@
-<template>
-  <div>
-    <EbizTreeMergeTable :type="type" :id="id" @success="handleSuccess"/>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'EbizTreeMergeTableConfig'
-}
-</script>
-
-<script setup>
-import { defineProps, defineEmits } from 'vue'
-import EbizTreeMergeTable from './EbizTreeMergeTable.vue'
-
-const props = defineProps({
-  type: {
-    type: String,
-    default: 'role' // role,post 角色，岗位
-  },
-  id: {
-    type: String,
-    default: ''
-  }
-})
-
-const emits = defineEmits(['success'])
-
-const handleSuccess = () => {
-  emits('success')
-}
-</script>
-
-<style scoped>
-</style>