@yqg/permission 1.3.13 → 1.3.14-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@yqg/permission",
-    "version": "1.3.13",
+    "version": "1.3.14-beta.1",
     "main": "dist/index.js",
     "module": "dist/index.js",
     "type": "module",
@@ -40,4 +40,4 @@
         "vue": "^3.5.12",
         "vue-tsc": "^2.1.8"
     }
-}
+}

package/src/App.vue

@@ -19,7 +19,7 @@ const changeLocale = () => {
 	locale.value = locale.value === 'id-ID' ? 'en-US' : 'id-ID';
 }
 
-const permissions = ref('TECH.SCHEDULER.JOB.VISIBLE,TECH.SCHEDULER.JOB.QUERY,TECH.SCHEDULER.JOB.MODIFY');
+const permissions = ref('APP_CENTER.APP.AUTHORITY');
 
 </script>
 
@@ -33,7 +33,7 @@ const permissions = ref('TECH.SCHEDULER.JOB.VISIBLE,TECH.SCHEDULER.JOB.QUERY,TEC
 			<!-- 03541 -->
 			<!-- 02124 -->
 			<!-- 05184 -->
-			<yqg-permission :omitCategoryIds="[]" :permissions="permissions" workNumber="03541" :color="color" :locale="locale"
+			<yqg-permission :omitCategoryIds="[]" :permissions="permissions" workNumber="03817" :color="color" :locale="locale"
 				@onSuccess="() => {console.log('成功')}">
 			</yqg-permission>
 		</div>

package/src/components/category-selector.vue

@@ -11,7 +11,7 @@
                     allowClear v-model:value="item.attributeValueIds_view"
                     treeNodeFilterProp="attributeName" v-model:searchValue="searchValue"
                     :fieldNames="{ label: 'attributeName', value: 'id' }" treeNodeLabelProp="attributeName"
-                    :show-checked-strategy="SHOW_PARENT">
+                    :show-checked-strategy="SHOW_PARENT" :virtual="true">
                     <template #title="{ attributeName }">
                         <span v-if="searchValue.toLowerCase() && attributeName.includes(searchValue.toLowerCase())"
                             style="color: #1677ff; font-weight: bold;">{{ attributeName

package/src/hooks/useAttributesCache.ts

@@ -5,7 +5,7 @@ const categoryValuesMap = reactive<Record<number, []>>({});
 export default function useAttributesCache(props: any) {
 
     watch(() => props.categoryList, (newVal) => {
-        newVal.forEach(async (item:CategoryType) => {
+        newVal.forEach(async (item: CategoryType) => {
             if (!categoryValuesMap[item.id]) {
                 const res = await Http.getCategoryValues(item.id);
                 const { flatAttributeValue, treeAttributeValue, showWay } = res.body;
@@ -24,16 +24,74 @@ export default function useAttributesCache(props: any) {
                 return item.attributeName;
             }
             if (item.children && item.children.length) {
-                return getCategoryName(id, item.children);
+                const result = getCategoryName(id, item.children);
+                if (result) {
+                    return result;
+                }
             }
         }
         return '';
-    };  
+    };
+
+    // 根据 ids 查找对应的节点及其所有后代节点，铺平并去重
+    const getAllViewAttributeNodes = (ids: number[], list: AttributeValueType[]): AttributeValueType[] => {
+        const allNodes: AttributeValueType[] = [];
+        const idSet = new Set<number>();
+
+        // 收集节点及其所有后代（内部函数）
+        const collect = (node: AttributeValueType) => {
+            if (!idSet.has(node.id)) {
+                idSet.add(node.id);
+                allNodes.push(node);
+            }
+            if (node.children && node.children.length) {
+                for (let j = 0; j < node.children.length; j++) {
+                    collect(node.children[j]);
+                }
+            }
+        };
+
+        // 查找节点并收集（内部函数）
+        const findAndCollect = (id: number, nodeList: AttributeValueType[]): boolean => {
+            for (let i = 0; i < nodeList.length; i++) {
+                const item = nodeList[i];
+                if (item.id === id) {
+                    collect(item);
+                    return true;
+                }
+                if (item.children && item.children.length) {
+                    if (findAndCollect(id, item.children)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        };
+
+        for (let i = 0; i < ids.length; i++) {
+            findAndCollect(ids[i], list);
+        }
+
+        return allNodes;
+    };
 
     const getDeleteAttributesNames = (item: CategoryType) => {
-        return item.defaultValueIds?.filter(id => !item.attributeValueIds_view.includes(id))?.map(id => {
-            return getCategoryName(id, categoryValuesMap[item.id]);
-        }).join('、');
+        const viewNodes = getAllViewAttributeNodes(item.attributeValueIds_view || [], categoryValuesMap[item.id] || []);
+        const viewNodeIdSet = new Set<number>();
+        for (let i = 0; i < viewNodes.length; i++) {
+            viewNodeIdSet.add(viewNodes[i].id);
+        }
+
+        // 获取所有原始节点（包括后代）的映射，用于快速查找 name
+        const allNodes = getAllViewAttributeNodes(item.defaultValueIds || [], categoryValuesMap[item.id] || []);
+        const allNodeMap = new Map<number, string>();
+        for (let i = 0; i < allNodes.length; i++) {
+            allNodeMap.set(allNodes[i].id, allNodes[i].attributeName);
+        }
+        const deleteAttributesNames = item.defaultValueIds?.filter(id => !viewNodeIdSet.has(id))?.map(id => {
+            return allNodeMap.get(id) || getCategoryName(id, categoryValuesMap[item.id] || []);
+        }).filter(Boolean).join('、');
+        return deleteAttributesNames;
     };
 
     return {