@sy-common/organize-select-help 1.0.0-beta.62 → 1.0.0-beta.64

package/src/organize-tree.vue

@@ -54,13 +54,34 @@ export default {
     return {
       data: [],
       manageUnitId: '',
-      loading: true
+      loading: true,
+      // 内部状态存储禁用懒加载的标识
+      isDisableLazyLoad: false
     };
   },
   mounted() {
-    this.initData();
+    // 优先使用 props 的 disableLazyLoad，覆盖内部状态
+    this.isDisableLazyLoad = this.disableLazyLoad;
+    // 优先使用 props 的 isCustomTree，覆盖内部判断
+    this.isCustomTree = this.isCustomTree;
+    // 仅在未禁用懒加载且非自定义树时执行 initData
+    if (!this.isDisableLazyLoad && !this.isCustomTree) {
+      this.initData();
+    } else {
+      // 直接使用父组件传递的树数据
+      this.loading = false;
+      let tree = deepCopy(this.treeList);
+      this.initTree(tree);
+      this.data = tree;
+    }
+
   },
   methods: {
+    setDisableLazyLoad(disabled) {
+      this.isDisableLazyLoad = disabled;
+      // 同时标记为自定义树，跳过子组件自身的 initData 逻辑
+      this.isCustomTree = disabled;
+    },
     safeDeepCopy(obj, hash = new WeakMap()) {
       if (obj === null || typeof obj !== 'object') {
         return obj;
@@ -108,14 +129,15 @@ export default {
       return copy;
     },
     async initData() {
-      if (this.isCustomTree) {
+      // 优先判断内部禁用状态，而非仅依赖 isCustomTree prop
+      if (this.isCustomTree || this.isDisableLazyLoad) {
         this.loading = false;
         let tree = deepCopy(this.treeList);
         this.initTree(tree);
         this.data = tree;
         return;
       }
-      // 仅在非自定义树场景下生效
+      // 仅在非自定义/非禁用场景下执行原有逻辑
       let data = await this.getOrgChildren();
       this.loading = false;
       this.data = data;
@@ -179,7 +201,23 @@ export default {
     },
 
     async loadData(item, callback) {
-      // 自定义树场景（defaultOrgUnitId 不为空）：原有逻辑不变
+      // 核心修改：即使禁用懒加载，也允许加载已有子节点
+      if (this.disableLazyLoad) {
+        let children = item.orgChildrenList || item.children || [];
+        const formattedChildren = this.safeDeepCopy(children).map(child => ({
+          ...child,
+          title: child.orgUnitName || child.orgNodeName || child.name || `未命名组织(${child.orgUnitId || child.id || ''})`,
+          checked: false,
+          expand: false,
+          leafNode: child.leafNode || false,
+          orgChildrenList: child.orgChildrenList || [],
+          children: child.children || []
+        }));
+        callback(formattedChildren);
+        return;
+      }
+
+      // 原有逻辑保持不变
       if (this.isCustomTree) {
         let children = item.orgChildrenList || item.children || [];
         const formattedChildren = this.safeDeepCopy(children).map(child => ({
@@ -201,7 +239,6 @@ export default {
             });
             if (res.data.code === 1) {
               const apiChildren = res.data.data || [];
-              // 关键：对接口返回的二级节点进行 initTree 初始化
               const initializedApiChildren = this.initTree(apiChildren);
               const apiFormattedChildren = initializedApiChildren.map(child => ({
                 ...child,
@@ -225,18 +262,16 @@ export default {
         return;
       }
 
-      // 非自定义树场景（defaultOrgUnitId 为空）：补充子节点初始化
-      if (this.disableLazyLoad) {
-        callback([]);
-        return;
-      }
-      // 加载子节点后，先经过 initTree 处理再返回
       let children = await this.getOrgChildren(item.orgUnitId);
       const initializedChildren = this.initTree(children);
       callback(initializedChildren);
     },
 
     getOrgChildren(orgUnitId = '') {
+      // 优先判断内部禁用状态
+      if (this.isDisableLazyLoad) {
+        return Promise.resolve([]);
+      }
       if (this.isCustomTree) {
         return Promise.resolve([]);
       }
@@ -517,18 +552,38 @@ export default {
     'treeList': {
       handler(val) {
         // 自定义树场景：直接使用父组件传递的树数据，不初始化旧接口
-        if (this.isCustomTree) {
-          let tree = deepCopy(val);
+        if (this.isCustomTree || this.isDisableLazyLoad) {
+          let tree = this.safeDeepCopy(val);
           this.initTree(tree);
           this.data = tree;
           return;
         }
-        // 原有逻辑
         let tree = deepCopy(val);
         this.initTree(tree);
         this.data = tree;
       },
       deep: true
+    },
+    // 监听 isCustomTree 变化
+    isCustomTree(newVal) {
+      if (newVal) {
+        this.isDisableLazyLoad = true;
+        this.loading = false;
+        let tree = this.safeDeepCopy(this.treeList);
+        this.initTree(tree);
+        this.data = tree;
+      }
+    },
+    // 监听 disableLazyLoad 变化
+    disableLazyLoad(newVal) {
+      this.isDisableLazyLoad = newVal;
+      if (newVal) {
+        this.isCustomTree = true;
+        this.loading = false;
+        let tree = this.safeDeepCopy(this.treeList);
+        this.initTree(tree);
+        this.data = tree;
+      }
     }
   }
 };
@@ -624,4 +679,4 @@ export default {
   text-shadow: none !important;
   background: none !important;
 }
-</style>
+</style>