ocpview-plus 1.2.7 → 1.2.8

package/src/components/tree/basetree.vue

@@ -300,81 +300,140 @@ export default {
                     })
                     ]);
         },
-        toTreeData (expandMap = new Set(), selectedId = null) {
+        toTreeData(expandMap = new Set(), selectedId = null) {
             let pos = {};
             let tree = [];
             let i = 0;
-            let autoExpandId = this._autoExpandId;
+
+            const idField = this.myConfig.idField;
+            const parentField = this.myConfig.parentField;
+            const rootId = this.rootNode[idField];
+
+            const focusId = (selectedId !== null && selectedId !== undefined)
+                ? selectedId
+                : this._autoExpandId;
+
             let autoExpandParents = new Set();
 
-            if (autoExpandId) {
-                let current = this.data.find(
-                    item => item[this.myConfig.idField] === autoExpandId
-                );
+            // 根据 focusId 反查父链（并防环）
+            if (focusId !== null && focusId !== undefined) {
+                let current = this.data.find(item => item[idField] === focusId);
+                const visited = new Set();
 
                 while (current) {
-                    autoExpandParents.add(current[this.myConfig.idField]);
+                    const cid = current[idField];
+                    if (visited.has(cid)) {
+                        console.warn('[toTreeData] parent chain cycle detected:', cid);
+                        break;
+                    }
+                    visited.add(cid);
 
-                    const parentId = current[this.myConfig.parentField];
-                    if (!parentId) break;
+                    autoExpandParents.add(cid); // 选中节点本身 + 全部祖先都加入展开集合
 
-                    current = this.data.find(
-                        item => item[this.myConfig.idField] === parentId
-                    );
+                    const pid = current[parentField];
+                    if (pid == null) break; // 注意：不要写 !pid，避免 0 被误判
+
+                    current = this.data.find(item => item[idField] === pid);
                 }
             }
 
+
             let data = this.$Method.copy(this.data);
             data.forEach(el => {
-                this.setSelected(el);
+                this.setSelected(el); // 保留你原逻辑
             });
             let tempData = this.$Method.copy(data);
+
+            // 统一状态赋值（避免到处重复写漏）
+            const applyNodeState = (node) => {
+                const nid = node[idField];
+
+                // 展开：外部传入 expandMap 或者 focusId 的祖先链
+                if (expandMap.has(nid) || autoExpandParents.has(nid)) {
+                    node.expand = true;
+                }
+
+                // 选中：focusId 命中
+                node.selected = (focusId !== null && focusId !== undefined && nid === focusId);
+            };
+
+            // 防死循环控制
+            let guard = 0;
+            const maxGuard = data.length * 5 + 20;
+            let movedInRound = 0;
+
             while (data.length !== 0) {
-                // 解决找不到节点，而导致的死循环
-                const index = tempData.findIndex(item => item[this.myConfig.idField] === data[i][this.myConfig.parentField]);
+                const current = data[i];
+                const currentId = current[idField];
+                const parentId = current[parentField];
 
-                const currentId = data[i][this.myConfig.idField]
-                if (data[i][this.myConfig.parentField] === this.rootNode[this.myConfig.idField] || index < 0) {
+                // 父是否存在于原始数据（判断孤儿）
+                const index = tempData.findIndex(item => item[idField] === parentId);
 
-                    if (expandMap.has(currentId)) {
-                        data[i].expand = true
-                    }
+                if (parentId === rootId || index < 0) {
+                    applyNodeState(current);
 
-                    data[i].selected = (currentId === selectedId)
-                    tree.push(data[i]);
-                    pos[data[i][this.myConfig.idField]] = [tree.length - 1];
+                    tree.push(current);
+                    pos[currentId] = [tree.length - 1];
                     data.splice(i, 1);
                     i--;
+                    movedInRound++;
                 } else {
-                    let posArr = pos[data[i][this.myConfig.parentField]];
+                    const posArr = pos[parentId];
                     if (posArr) {
                         let obj = tree[posArr[0]];
-                        for (var j = 1; j < posArr.length; j++) {
+                        for (let j = 1; j < posArr.length; j++) {
                             obj = obj.children[posArr[j]];
                         }
-                        if (expandMap.has(currentId)) {
-                            data[i].expand = true;
-                        }
-                        data[i].selected = (currentId === selectedId)
-                        obj.children.push(data[i]);
-                        pos[data[i][this.myConfig.idField]] = posArr.concat([obj.children.length - 1]);
+
+                        applyNodeState(current);
+
+                        obj.children.push(current);
+                        pos[currentId] = posArr.concat([obj.children.length - 1]);
                         data.splice(i, 1);
                         i--;
+                        movedInRound++;
                     }
                 }
+
                 i++;
                 if (i > data.length - 1) {
+                    // 一轮下来没挂上任何节点 -> 环/坏链路，兜底退出
+                    if (movedInRound === 0 && data.length > 0) {
+                        console.warn('[toTreeData] unresolved/cyclic nodes, force attach to root level:', data);
+
+                        data.forEach(node => {
+                            applyNodeState(node);
+                            const nid = node[idField];
+                            tree.push(node);
+                            pos[nid] = [tree.length - 1];
+                        });
+
+                        data = [];
+                        break;
+                    }
+
+                    movedInRound = 0;
                     i = 0;
+
+                    guard++;
+                    if (guard > maxGuard) {
+                        console.warn('[toTreeData] safety break triggered');
+                        break;
+                    }
                 }
             }
+
+
             if (this.myConfig.showRootNode) {
-                let root =  {
-                    title:  '  ' + this.myConfig.rootNode.name,
+                let root = {
+                    title: '  ' + this.myConfig.rootNode.name,
                     expand: true,
-                    disabled :this.myConfig.readOnly,
+                    disabled: this.myConfig.readOnly,
                     children: tree,
-                    selected:false
+                    selected: false
                 };
+
                 if (this.myConfig.rootNode.disabled !== undefined) {
                     root.disabled = this.myConfig.rootNode.disabled;
                 }
@@ -386,18 +445,15 @@ export default {
                         root = this.setIcon(root);
                     }
                 }
-                if (this.myConfig.nodeRender) {
-                    root.render = this.myConfig.nodeRender;
-                } else{
-                    root.render = this.iconRender;
-                }
+
+                root.render = this.myConfig.nodeRender ? this.myConfig.nodeRender : this.iconRender;
+
                 this._autoExpandId = null;
                 return [root];
             } else {
                 this._autoExpandId = null;
                 return tree;
             }
-
         },
         setSelected (reTemp) {
             if (this.myConfig.expand) {
@@ -742,7 +798,70 @@ export default {
             updateNode(this.data)
 
         },
-        setNodes(data, name, value) {
+
+        setNodes(data = [], name, value) {
+            let tempName = name;
+            if (name === 'readOnly') {
+                tempName = 'disabled';
+            } else if (name === 'selected') {
+                tempName = (this.myConfig.multiSelect && this.myConfig.showCheckBox) ? 'checked' : 'selected';
+            }
+
+            const responseId = this.myConfig.idField || this.myConfig.responseId;
+
+            // 统一字符串，避免 1 / "1" 不匹配
+            const idSet = new Set(
+                (data || []).map(item => String(item?.[responseId]))
+            );
+
+            // 确认真实渲染源
+            const source = Array.isArray(this.data)
+                ? this.data
+                : (Array.isArray(this.treeData) ? this.treeData : []);
+
+            let hitCount = 0;
+
+            const updateNode = (nodes) => {
+                if (!Array.isArray(nodes)) return;
+
+                nodes.forEach(node => {
+                    const exists = idSet.has(String(node?.[responseId]));
+                    if (exists) hitCount++;
+
+                    let newValue;
+
+                    // 只有“选中=true”时，才清空其他节点（单选常见需求）
+                    if (name === 'selected' && value === true) {
+                        newValue = exists;
+                    } else if (exists) {
+                        // 其他场景只改命中节点
+                        newValue = value;
+                    } else {
+                        newValue = node[tempName];
+                    }
+
+                    if (node[tempName] !== newValue) {
+                        // Vue2: 动态键必须用 $set 才响应
+                        // this.$set(node, tempName, newValue);
+                        node[tempName] = newValue;
+                    }
+
+                    if (node.children && node.children.length > 0) {
+                        updateNode(node.children);
+                    }
+                });
+            };
+
+            updateNode(source);
+
+            // 兜底触发视图更新
+            if (source === this.data) this.data = [...source];
+            if (source === this.treeData) this.treeData = [...source];
+
+            console.log('[setNodes]', { tempName, responseId, targetIds: [...idSet], hitCount });
+            return hitCount;
+        },
+        setNodes2(data, name, value) {
             let tempName = name;
             if (name === 'readOnly') {
                 tempName = 'disabled';
@@ -753,7 +872,7 @@ export default {
                     tempName = 'selected';
                 }
             }
-            let responseId = this.myConfig.responseId;
+            let responseId = this.myConfig.idField || this.myConfig.responseId;
             // 把目标列表变成 Set，提高查找效率
             const idSet = new Set(
                 data.map(item => item[responseId])
@@ -802,14 +921,12 @@ export default {
             return expandSet;
         },
         updateNode(data, flag) {
-
             const idField = this.myConfig.idField
             const parentField = this.myConfig.parentField
             const targetId = data[idField]
 
             // ① 保存当前展开状态
             const expandSet = this.saveExpandState()
-
             // ② 数据更新
             const index = this.data.findIndex(
                 el => el[idField] === targetId
@@ -843,7 +960,6 @@ export default {
                     this.data.splice(index, 1)
                 }
             }
-
             // ③ 重建树（带展开状态）
             this.treeData = this.toTreeData(expandSet, targetId)
         },