@ebiz/designer-components 0.1.58 → 0.1.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ebiz/designer-components",
-  "version": "0.1.58",
+  "version": "0.1.60",
   "private": false,
   "publishConfig": {
     "access": "public"

package/src/components/EbizDiv.vue

@@ -9,7 +9,7 @@ const props = defineProps({
 });
 
 const isShow = computed(() => {
-  if( !props.permissionKey ) {
+  if (!props.permissionKey) {
     return true;
   }
   const developMode = localStorage.getItem('ebiz-develop-mode')
@@ -20,7 +20,7 @@ const isShow = computed(() => {
   try {
     const permissionKeysStr = localStorage.getItem('permissionKeys') || '[]';
     const permissionKeys = JSON.parse(permissionKeysStr);
-    const hasPermission = permissionKeys.includes(props.key);
+    const hasPermission = permissionKeys.includes(props.permissionKey);
     return hasPermission;
   } catch (error) {
     return false;
@@ -28,7 +28,7 @@ const isShow = computed(() => {
 });
 
 const checkPermission = () => {
-  
+
 };
 
 watch(() => props.key, checkPermission, { immediate: true });
@@ -38,4 +38,4 @@ watch(() => props.key, checkPermission, { immediate: true });
   <div v-if="isShow">
     <slot name="default"></slot>
   </div>
-</template> 
+</template>

package/src/components/EbizTreeMergeTable.vue

@@ -61,7 +61,10 @@
       <template #module="{ row }">
         <div class="cell-with-checkbox">
           <t-checkbox v-model="row.moduleChecked" @change="(checked) => handleModuleCheck(row, checked)"></t-checkbox>
-          <span class="cell-text">{{ row.module }}</span>
+          <div class="cell-content">
+            <div class="cell-text">{{ row.module }}</div>
+            <div class="cell-id" v-if="row.moduleKey">{{ row.moduleKey }}</div>
+          </div>
         </div>
       </template>
 
@@ -70,7 +73,10 @@
         <div class="cell-with-checkbox">
           <t-checkbox v-model="row.subModule1Checked"
             @change="(checked) => handleSubModule1Check(row, checked)"></t-checkbox>
-          <span class="cell-text">{{ row.subModule1 || row.module }}</span>
+          <div class="cell-content">
+            <div class="cell-text">{{ row.subModule1 || row.module }}</div>
+            <div class="cell-id" v-if="row.subModule1Key">{{ row.subModule1Key }}</div>
+          </div>
         </div>
       </template>
 
@@ -79,7 +85,10 @@
         <div class="cell-with-checkbox" v-if="row.subModule2">
           <t-checkbox v-model="row.subModule2Checked"
             @change="(checked) => handleSubModule2Check(row, checked)"></t-checkbox>
-          <span class="cell-text">{{ row.subModule2 }}</span>
+          <div class="cell-content">
+            <div class="cell-text">{{ row.subModule2 }}</div>
+            <div class="cell-id" v-if="row.subModule2Key">{{ row.subModule2Key }}</div>
+          </div>
         </div>
         <div v-else class="cell-with-checkbox">
           <span class="cell-text empty-cell">-</span>
@@ -92,7 +101,10 @@
           <div v-for="(func, idx) in row.functions" :key="func.id || idx" class="function-item">
             <t-checkbox v-model="func.checked"
               @change="(checked) => handleFunctionCheck(row, func, checked)"></t-checkbox>
-            <span class="cell-text">{{ func.name }}</span>
+            <div class="cell-content">
+              <div class="cell-text">{{ func.name }}</div>
+              <div class="cell-id" v-if="func.funcKey">{{ func.funcKey }}</div>
+            </div>
           </div>
         </div>
       </template>
@@ -413,10 +425,13 @@ const processTreeData = (treeData) => {
         id: `${moduleItem.id}_all`,
         module: moduleItem.name,
         moduleId: moduleItem.id,
+        moduleKey: moduleItem.funcKey,
         subModule1: null,
         subModule1Id: null,
+        subModule1Key: null,
         subModule2: null,
         subModule2Id: null,
+        subModule2Key: null,
         functions: [{ id: null, name: '全部', checked: false }]
       })
       return
@@ -428,10 +443,13 @@ const processTreeData = (treeData) => {
           id: `${moduleItem.id}_${subModule1Item.id}_all`,
           module: moduleItem.name,
           moduleId: moduleItem.id,
+          moduleKey: moduleItem.funcKey,
           subModule1: subModule1Item.name,
           subModule1Id: subModule1Item.id,
+          subModule1Key: subModule1Item.funcKey,
           subModule2: null,
           subModule2Id: null,
+          subModule2Key: null,
           functions: [{ id: null, name: '全部', checked: false }]
         })
       } else {
@@ -444,6 +462,7 @@ const processTreeData = (treeData) => {
               const func = {
                 id: functionItem.id,
                 name: functionItem.name,
+                funcKey: functionItem.funcKey,
                 checked: false
               }
               functions.push(func)
@@ -453,6 +472,7 @@ const processTreeData = (treeData) => {
                   functions.push({
                     id: childFunc.id,
                     name: childFunc.name,
+                    funcKey: childFunc.funcKey,
                     checked: false
                   })
                 })
@@ -465,10 +485,13 @@ const processTreeData = (treeData) => {
             id: `${moduleItem.id}_${subModule1Item.id}_${subModule2Item.id}`,
             module: moduleItem.name,
             moduleId: moduleItem.id,
+            moduleKey: moduleItem.funcKey,
             subModule1: subModule1Item.name,
             subModule1Id: subModule1Item.id,
+            subModule1Key: subModule1Item.funcKey,
             subModule2: subModule2Item.name,
             subModule2Id: subModule2Item.id,
+            subModule2Key: subModule2Item.funcKey,
             functions
           })
         })
@@ -620,9 +643,9 @@ const handleSubModule2Check = (row, checked) => {
 // 勾选功能时，自动判断父级
 const handleFunctionCheck = (row, func, checked) => {
   func.checked = checked
-  // 判断本组所有功能是否全选
-  const allChecked = row.functions.every((f) => f.checked)
-  row.subModule2Checked = allChecked
+  // 判断本组是否有功能被选中
+  const hasChecked = row.functions.some((f) => f.checked)
+  row.subModule2Checked = hasChecked
   // 向上联动
   updateSubModule1Checked(row.moduleId, row.subModule1Id)
 }
@@ -631,9 +654,9 @@ const handleFunctionCheck = (row, func, checked) => {
 const updateSubModule1Checked = (moduleId, subModule1Id) => {
   // 找到所有同模块+同子模块1的行
   const group = data.value.filter((item) => item.moduleId === moduleId && item.subModule1Id === subModule1Id)
-  const allChecked = group.every((item) => item.subModule2Checked)
+  const hasChecked = group.some((item) => item.subModule2Checked)
   group.forEach((item) => {
-    item.subModule1Checked = allChecked
+    item.subModule1Checked = hasChecked
   })
   // 向上联动模块
   updateModuleChecked(moduleId)
@@ -642,9 +665,9 @@ const updateSubModule1Checked = (moduleId, subModule1Id) => {
 // 更新模块的勾选状态
 const updateModuleChecked = (moduleId) => {
   const group = data.value.filter((item) => item.moduleId === moduleId)
-  const allChecked = group.every((item) => item.subModule1Checked)
+  const hasChecked = group.some((item) => item.subModule1Checked)
   group.forEach((item) => {
-    item.moduleChecked = allChecked
+    item.moduleChecked = hasChecked
   })
 }
 
@@ -979,6 +1002,29 @@ const onOrgSearch = () => {
 }
 onOrgSearch()
 
+// 获取所有父级权限ID的辅助函数
+const getParentPermissionIds = (functionIds, row) => {
+  const parentIds = new Set()
+  
+  // 添加模块ID（如果存在）
+  if (row.moduleId) {
+    parentIds.add(row.moduleId)
+  }
+  
+  // 添加子模块1 ID（如果存在）
+  if (row.subModule1Id) {
+    parentIds.add(row.subModule1Id)
+  }
+  
+  // 添加子模块2 ID（如果存在）
+  if (row.subModule2Id) {
+    parentIds.add(row.subModule2Id)
+  }
+  
+  // 将Set转换为数组并去重
+  return Array.from(parentIds)
+}
+
 // 计算选中的数据权限结构
 const computedSelectedData = computed(() => {
   // 全局数据权限
@@ -993,8 +1039,14 @@ const computedSelectedData = computed(() => {
       .map((f) => f.id)
       .filter(Boolean)
     if (checkedFunctionIds.length > 0) {
+      // 获取父级权限ID
+      const parentIds = getParentPermissionIds(checkedFunctionIds, row)
+      
+      // 合并功能ID和父级权限ID，去重
+      const allFunctionIds = [...new Set([...checkedFunctionIds, ...parentIds])]
+      
       functionList.push({
-        functionIds: checkedFunctionIds,
+        functionIds: allFunctionIds,
         dataScope: row.dataPermission || undefined,
         deptIds:
           row.dataPermission === 6 && row.selectedOrgs && row.selectedOrgs.length > 0
@@ -1066,8 +1118,8 @@ const findOrgInTree = (tree, id) => {
 
 // 添加用于更新父级勾选状态的辅助函数
 const updateParentCheckStatus = (row) => {
-  // 判断当前行的功能是否全部勾选
-  const allFunctionsChecked = row.functions.every(func => func.checked);
+  // 判断当前行的功能是否有被勾选
+  const hasFunctionsChecked = row.functions.some(func => func.checked);
 
   // 更新子模块2的勾选状态
   if (row.subModule2) {
@@ -1078,14 +1130,14 @@ const updateParentCheckStatus = (row) => {
       item.subModule2Id === row.subModule2Id
     );
 
-    // 判断同组的所有行是否全部勾选了功能
-    const allRowsChecked = sameGroup.every(item =>
-      item.functions.every(func => func.checked)
+    // 判断同组的所有行是否有功能被勾选
+    const hasRowsChecked = sameGroup.some(item =>
+      item.functions.some(func => func.checked)
     );
 
     // 更新子模块2的勾选状态
     sameGroup.forEach(item => {
-      item.subModule2Checked = allRowsChecked;
+      item.subModule2Checked = hasRowsChecked;
     });
   }
 
@@ -1097,10 +1149,24 @@ const updateParentCheckStatus = (row) => {
 <style lang="less" scoped>
 .cell-with-checkbox {
   display: flex;
-  align-items: center;
+  align-items: flex-start;
 
-  .cell-text {
+  .cell-content {
     margin-left: 8px;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .cell-text {
+    line-height: 1.4;
+  }
+
+  .cell-id {
+    margin-top: 2px;
+    color: #999;
+    font-size: 12px;
+    font-family: monospace;
+    line-height: 1.2;
   }
 
   .empty-cell {
@@ -1116,11 +1182,25 @@ const updateParentCheckStatus = (row) => {
 
   .function-item {
     display: flex;
-    align-items: center;
+    align-items: flex-start;
     margin-right: 12px;
 
-    .cell-text {
+    .cell-content {
       margin-left: 8px;
+      display: flex;
+      flex-direction: column;
+    }
+
+    .cell-text {
+      line-height: 1.4;
+    }
+
+    .cell-id {
+      margin-top: 2px;
+      color: #999;
+      font-size: 12px;
+      font-family: monospace;
+      line-height: 1.2;
     }
   }
 }