vxe-pc-ui 4.6.9 → 4.6.10

package/lib/tree/src/tree.js

@@ -56,10 +56,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
       type: String,
       default: () => (0, _ui.getConfig)().tree.hasChildField
     },
-    // mapChildrenField: {
-    //   type: String as PropType<VxeTreePropTypes.MapChildrenField>,
-    //   default: () => getConfig().tree.mapChildrenField
-    // },
+    mapChildrenField: {
+      type: String,
+      default: () => (0, _ui.getConfig)().tree.mapChildrenField
+    },
     transform: Boolean,
     // 已废弃
     isCurrent: Boolean,
@@ -131,16 +131,18 @@ var _default = exports.default = (0, _vue.defineComponent)({
     const refElem = (0, _vue.ref)();
     const reactData = (0, _vue.reactive)({
       currentNode: null,
-      nodeMaps: {},
       selectRadioKey: props.checkNodeKey,
       treeList: [],
-      treeExpandedMaps: {},
-      treeExpandLazyLoadedMaps: {},
-      selectCheckboxMaps: {},
-      indeterminateCheckboxMaps: {}
+      updateExpandedFlag: 1,
+      updateCheckboxFlag: 1
     });
     const internalData = {
-      // initialized: false
+      // initialized: false,
+      nodeMaps: {},
+      selectCheckboxMaps: {},
+      indeterminateRowMaps: {},
+      treeExpandedMaps: {},
+      treeExpandLazyLoadedMaps: {}
     };
     const refMaps = {
       refElem
@@ -161,6 +163,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
     const computeChildrenField = (0, _vue.computed)(() => {
       return props.childrenField || 'children';
     });
+    const computeMapChildrenField = (0, _vue.computed)(() => {
+      return props.mapChildrenField || 'mapChildren';
+    });
     const computeHasChildField = (0, _vue.computed)(() => {
       return props.hasChildField || 'hasChild';
     });
@@ -235,10 +240,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     const isExpandByNode = node => {
       const {
-        treeExpandedMaps
+        updateExpandedFlag
       } = reactData;
+      const {
+        treeExpandedMaps
+      } = internalData;
       const nodeid = getNodeId(node);
-      return !!treeExpandedMaps[nodeid];
+      return !!(updateExpandedFlag && treeExpandedMaps[nodeid]);
     };
     const isCheckedByRadioNodeId = nodeid => {
       const {
@@ -251,18 +259,24 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     const isCheckedByCheckboxNodeId = nodeid => {
       const {
-        selectCheckboxMaps
+        updateCheckboxFlag
       } = reactData;
-      return !!selectCheckboxMaps[nodeid];
+      const {
+        selectCheckboxMaps
+      } = internalData;
+      return !!(updateCheckboxFlag && selectCheckboxMaps[nodeid]);
     };
     const isCheckedByCheckboxNode = node => {
       return isCheckedByCheckboxNodeId(getNodeId(node));
     };
     const isIndeterminateByCheckboxNodeid = nodeid => {
       const {
-        indeterminateCheckboxMaps
+        updateCheckboxFlag
       } = reactData;
-      return !!indeterminateCheckboxMaps[nodeid];
+      const {
+        indeterminateRowMaps
+      } = internalData;
+      return !!(updateCheckboxFlag && indeterminateRowMaps[nodeid]);
     };
     const isIndeterminateByCheckboxNode = node => {
       return isIndeterminateByCheckboxNodeid(getNodeId(node));
@@ -284,38 +298,66 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (!_xeUtils.default.isArray(nodeList)) {
           nodeList = [nodeList];
         }
-        handleCheckedCheckboxNode(nodeList.map(item => getNodeId(item)), checked);
+        handleCheckedCheckboxNode(nodeList, checked);
       }
       return (0, _vue.nextTick)();
     };
     const setCheckboxByNodeId = (nodeIds, checked) => {
+      const {
+        nodeMaps
+      } = internalData;
       if (nodeIds) {
         if (!_xeUtils.default.isArray(nodeIds)) {
           nodeIds = [nodeIds];
         }
-        handleCheckedCheckboxNode(nodeIds, checked);
+        const nodeList = [];
+        nodeIds.forEach(nodeid => {
+          const nodeItem = nodeMaps[nodeid];
+          if (nodeItem) {
+            nodeList.push(nodeItem.item);
+          }
+        });
+        handleCheckedCheckboxNode(nodeList, checked);
       }
       return (0, _vue.nextTick)();
     };
-    const handleCheckedCheckboxNode = (nodeIds, checked) => {
-      const selectKeyMaps = Object.assign({}, reactData.selectCheckboxMaps);
-      nodeIds.forEach(key => {
+    const handleCheckedCheckboxNode = (nodeList, checked) => {
+      const {
+        transform
+      } = props;
+      const {
+        selectCheckboxMaps
+      } = internalData;
+      const mapChildrenField = computeMapChildrenField.value;
+      const childrenField = computeChildrenField.value;
+      const checkboxOpts = computeCheckboxOpts.value;
+      const {
+        checkStrictly
+      } = checkboxOpts;
+      const handleSelect = node => {
+        const nodeid = getNodeId(node);
         if (checked) {
-          selectKeyMaps[key] = true;
-        } else if (selectKeyMaps[key]) {
-          delete selectKeyMaps[key];
+          if (!selectCheckboxMaps[nodeid]) {
+            selectCheckboxMaps[nodeid] = node;
+          }
+        } else {
+          if (selectCheckboxMaps[nodeid]) {
+            delete selectCheckboxMaps[nodeid];
+          }
         }
-      });
-      reactData.selectCheckboxMaps = selectKeyMaps;
-    };
-    const updateCheckboxChecked = nodeIds => {
-      const selectKeyMaps = {};
-      if (nodeIds) {
-        nodeIds.forEach(key => {
-          selectKeyMaps[key] = true;
+      };
+      if (checkStrictly) {
+        nodeList.forEach(handleSelect);
+      } else {
+        _xeUtils.default.eachTree(nodeList, handleSelect, {
+          children: transform ? mapChildrenField : childrenField
         });
       }
-      reactData.selectCheckboxMaps = selectKeyMaps;
+      reactData.updateCheckboxFlag++;
+      updateCheckboxStatus();
+    };
+    const updateCheckboxChecked = nodeIds => {
+      setCheckboxByNodeId(nodeIds, true);
     };
     const handleSetExpand = (nodeid, expanded, expandedMaps) => {
       if (expanded) {
@@ -362,9 +404,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
       },
       getCurrentNode() {
         const {
-          currentNode,
-          nodeMaps
+          currentNode
         } = reactData;
+        const {
+          nodeMaps
+        } = internalData;
         if (currentNode) {
           const nodeItem = nodeMaps[getNodeId(currentNode)];
           if (nodeItem) {
@@ -376,7 +420,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       setCurrentNodeId(nodeKey) {
         const {
           nodeMaps
-        } = reactData;
+        } = internalData;
         const nodeItem = nodeMaps[nodeKey];
         reactData.currentNode = nodeItem ? nodeItem.item : null;
         return (0, _vue.nextTick)();
@@ -394,9 +438,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
       },
       getRadioNode() {
         const {
-          selectRadioKey,
-          nodeMaps
+          selectRadioKey
         } = reactData;
+        const {
+          nodeMaps
+        } = internalData;
         if (selectRadioKey) {
           const nodeItem = nodeMaps[selectRadioKey];
           if (nodeItem) {
@@ -415,14 +461,14 @@ var _default = exports.default = (0, _vue.defineComponent)({
       getCheckboxNodeIds() {
         const {
           selectCheckboxMaps
-        } = reactData;
+        } = internalData;
         return Object.keys(selectCheckboxMaps);
       },
       getCheckboxNodes() {
         const {
           nodeMaps,
           selectCheckboxMaps
-        } = reactData;
+        } = internalData;
         const list = [];
         _xeUtils.default.each(selectCheckboxMaps, (item, nodeid) => {
           const nodeItem = nodeMaps[nodeid];
@@ -433,57 +479,69 @@ var _default = exports.default = (0, _vue.defineComponent)({
         return list;
       },
       clearCheckboxNode() {
-        reactData.selectCheckboxMaps = {};
+        internalData.selectCheckboxMaps = {};
+        reactData.updateCheckboxFlag++;
         return (0, _vue.nextTick)();
       },
       setAllCheckboxNode(checked) {
+        const {
+          transform
+        } = props;
         const selectMaps = {};
         const childrenField = computeChildrenField.value;
+        const mapChildrenField = computeMapChildrenField.value;
         if (checked) {
           _xeUtils.default.eachTree(reactData.treeList, node => {
             const nodeid = getNodeId(node);
             selectMaps[nodeid] = true;
           }, {
-            children: childrenField
+            children: transform ? mapChildrenField : childrenField
           });
         }
-        reactData.selectCheckboxMaps = selectMaps;
+        internalData.selectCheckboxMaps = selectMaps;
+        reactData.updateCheckboxFlag++;
         return (0, _vue.nextTick)();
       },
       clearExpandNode() {
         return treeMethods.clearAllExpandNode();
       },
       clearAllExpandNode() {
-        _xeUtils.default.each(reactData.nodeMaps, nodeItem => {
+        const {
+          nodeMaps
+        } = internalData;
+        _xeUtils.default.each(nodeMaps, nodeItem => {
           nodeItem.treeLoaded = false;
         });
-        reactData.treeExpandedMaps = {};
+        internalData.treeExpandedMaps = {};
+        reactData.updateExpandedFlag++;
         return (0, _vue.nextTick)();
       },
       setExpandByNodeId(nodeids, expanded) {
-        const expandedMaps = Object.assign({}, reactData.treeExpandedMaps);
+        const {
+          treeExpandedMaps
+        } = internalData;
         if (nodeids) {
           if (!_xeUtils.default.isArray(nodeids)) {
             nodeids = [nodeids];
           }
           nodeids.forEach(nodeid => {
-            handleSetExpand(nodeid, expanded, expandedMaps);
+            handleSetExpand(nodeid, expanded, treeExpandedMaps);
           });
-          reactData.treeExpandedMaps = expandedMaps;
+          reactData.updateExpandedFlag++;
         }
         return (0, _vue.nextTick)();
       },
       getExpandNodeIds() {
         const {
           treeExpandedMaps
-        } = reactData;
-        return Object.keys(treeExpandedMaps);
+        } = internalData;
+        return _xeUtils.default.keys(treeExpandedMaps);
       },
       getExpandNodes() {
         const {
           nodeMaps,
           treeExpandedMaps
-        } = reactData;
+        } = internalData;
         const list = [];
         _xeUtils.default.each(treeExpandedMaps, (item, nodeid) => {
           const nodeItem = nodeMaps[nodeid];
@@ -494,62 +552,74 @@ var _default = exports.default = (0, _vue.defineComponent)({
         return list;
       },
       setExpandNode(nodes, expanded) {
-        const expandedMaps = Object.assign({}, reactData.treeExpandedMaps);
+        const {
+          treeExpandedMaps
+        } = internalData;
         if (nodes) {
           if (!_xeUtils.default.isArray(nodes)) {
             nodes = [nodes];
           }
           nodes.forEach(node => {
             const nodeid = getNodeId(node);
-            handleSetExpand(nodeid, expanded, expandedMaps);
+            handleSetExpand(nodeid, expanded, treeExpandedMaps);
           });
-          reactData.treeExpandedMaps = expandedMaps;
+          reactData.updateExpandedFlag++;
         }
         return (0, _vue.nextTick)();
       },
       toggleExpandByNodeId(nodeids) {
-        const expandedMaps = Object.assign({}, reactData.treeExpandedMaps);
+        const {
+          treeExpandedMaps
+        } = internalData;
         if (nodeids) {
           if (!_xeUtils.default.isArray(nodeids)) {
             nodeids = [nodeids];
           }
           nodeids.forEach(nodeid => {
-            handleSetExpand(nodeid, !expandedMaps[nodeid], expandedMaps);
+            handleSetExpand(nodeid, !treeExpandedMaps[nodeid], treeExpandedMaps);
           });
-          reactData.treeExpandedMaps = expandedMaps;
+          reactData.updateExpandedFlag++;
         }
         return (0, _vue.nextTick)();
       },
       toggleExpandNode(nodes) {
-        const expandedMaps = Object.assign({}, reactData.treeExpandedMaps);
+        const {
+          treeExpandedMaps
+        } = internalData;
         if (nodes) {
           if (!_xeUtils.default.isArray(nodes)) {
             nodes = [nodes];
           }
           nodes.forEach(node => {
             const nodeid = getNodeId(node);
-            handleSetExpand(nodeid, !expandedMaps[nodeid], expandedMaps);
+            handleSetExpand(nodeid, !treeExpandedMaps[nodeid], treeExpandedMaps);
           });
-          reactData.treeExpandedMaps = expandedMaps;
+          reactData.updateExpandedFlag++;
         }
         return (0, _vue.nextTick)();
       },
       setAllExpandNode(expanded) {
-        const expandedMaps = {};
+        const {
+          transform
+        } = props;
+        const {
+          treeExpandedMaps
+        } = internalData;
         const childrenField = computeChildrenField.value;
+        const mapChildrenField = computeMapChildrenField.value;
         if (expanded) {
           _xeUtils.default.eachTree(reactData.treeList, node => {
             const childList = _xeUtils.default.get(node, childrenField);
             const hasChild = childList && childList.length;
             if (hasChild) {
               const nodeid = getNodeId(node);
-              expandedMaps[nodeid] = true;
+              treeExpandedMaps[nodeid] = true;
             }
           }, {
-            children: childrenField
+            children: transform ? mapChildrenField : childrenField
           });
         }
-        reactData.treeExpandedMaps = expandedMaps;
+        reactData.updateExpandedFlag++;
         return (0, _vue.nextTick)();
       },
       reloadExpandNode(node) {
@@ -568,7 +638,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = props;
         const {
           nodeMaps
-        } = reactData;
+        } = internalData;
         if (lazy) {
           const nodeItem = nodeMaps[getNodeId(node)];
           if (nodeItem) {
@@ -587,7 +657,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = props;
         const {
           nodeMaps
-        } = reactData;
+        } = internalData;
         if (!lazy) {
           return Promise.resolve([]);
         }
@@ -627,24 +697,29 @@ var _default = exports.default = (0, _vue.defineComponent)({
       isCheckedByCheckboxNode,
       getCheckboxIndeterminateNodes() {
         const {
-          treeList,
-          indeterminateCheckboxMaps
-        } = reactData;
-        const indeterminateNodes = [];
-        _xeUtils.default.eachTree(treeList, node => {
-          if (indeterminateCheckboxMaps[getNodeId(node)]) {
-            indeterminateNodes.push(node);
+          nodeMaps,
+          indeterminateRowMaps
+        } = internalData;
+        const list = [];
+        _xeUtils.default.each(indeterminateRowMaps, (item, nodeid) => {
+          const nodeItem = nodeMaps[nodeid];
+          if (nodeItem) {
+            list.push(nodeItem.item);
           }
         });
-        return indeterminateNodes;
+        return list;
       }
     };
     const cacheNodeMap = () => {
+      const {
+        transform
+      } = props;
       const {
         treeList
       } = reactData;
       const valueField = computeValueField.value;
       const childrenField = computeChildrenField.value;
+      const mapChildrenField = computeMapChildrenField.value;
       const keyMaps = {};
       _xeUtils.default.eachTree(treeList, (item, itemIndex, items, path, parent, nodes) => {
         let nodeid = getNodeId(item);
@@ -663,11 +738,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
           treeLoaded: false
         };
       }, {
-        children: childrenField
+        children: transform ? mapChildrenField : childrenField
       });
-      reactData.nodeMaps = keyMaps;
+      internalData.nodeMaps = keyMaps;
     };
-    const updateData = list => {
+    const loadTreeData = list => {
       const {
         expandAll,
         transform
@@ -677,28 +752,31 @@ var _default = exports.default = (0, _vue.defineComponent)({
       } = internalData;
       const keyField = computeKeyField.value;
       const parentField = computeParentField.value;
-      const childrenField = computeChildrenField.value;
+      const mapChildrenField = computeMapChildrenField.value;
       if (transform) {
         reactData.treeList = _xeUtils.default.toArrayTree(list, {
           key: keyField,
           parentKey: parentField,
-          mapChildren: childrenField
+          mapChildren: mapChildrenField
         });
       } else {
         reactData.treeList = list ? list.slice(0) : [];
       }
       cacheNodeMap();
-      if (expandAll && !initialized) {
+      if (!initialized) {
         if (list && list.length) {
           internalData.initialized = true;
-          $xeTree.setAllExpandNode(true);
+          if (expandAll) {
+            $xeTree.setAllExpandNode(true);
+          }
+          $xeTree.setCheckboxByNodeId(props.checkNodeKeys || [], true);
         }
       }
     };
     const handleCountLine = (item, isRoot, nodeItem) => {
       const {
         treeExpandedMaps
-      } = reactData;
+      } = internalData;
       const childrenField = computeChildrenField.value;
       const nodeid = getNodeId(item);
       nodeItem.lineCount++;
@@ -713,7 +791,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
     const updateNodeLine = node => {
       const {
         nodeMaps
-      } = reactData;
+      } = internalData;
       if (node) {
         const nodeid = getNodeId(node);
         const nodeItem = nodeMaps[nodeid];
@@ -783,21 +861,19 @@ var _default = exports.default = (0, _vue.defineComponent)({
       } = checkboxOpts;
       return new Promise(resolve => {
         if (loadMethod) {
-          const tempExpandLazyLoadedMaps = Object.assign({}, reactData.treeExpandLazyLoadedMaps);
           const {
             nodeMaps
-          } = reactData;
+          } = internalData;
           const nodeid = getNodeId(node);
           const nodeItem = nodeMaps[nodeid];
-          tempExpandLazyLoadedMaps[nodeid] = true;
-          reactData.treeExpandLazyLoadedMaps = tempExpandLazyLoadedMaps;
+          internalData.treeExpandLazyLoadedMaps[nodeid] = true;
           Promise.resolve(loadMethod({
             $tree: $xeTree,
             node
           })).then(childRecords => {
             const {
               treeExpandLazyLoadedMaps
-            } = reactData;
+            } = internalData;
             nodeItem.treeLoaded = true;
             if (treeExpandLazyLoadedMaps[nodeid]) {
               treeExpandLazyLoadedMaps[nodeid] = false;
@@ -806,15 +882,17 @@ var _default = exports.default = (0, _vue.defineComponent)({
               childRecords = [];
             }
             if (childRecords) {
-              return treeMethods.loadChildrenNode(node, childRecords).then(childRows => {
-                const tempExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
-                if (childRows.length && !tempExpandedMaps[nodeid]) {
-                  tempExpandedMaps[nodeid] = true;
+              return $xeTree.loadChildrenNode(node, childRecords).then(childRows => {
+                const {
+                  treeExpandedMaps
+                } = internalData;
+                if (childRows.length && !treeExpandedMaps[nodeid]) {
+                  treeExpandedMaps[nodeid] = true;
                 }
-                reactData.treeExpandedMaps = tempExpandedMaps;
+                reactData.updateExpandedFlag++;
                 // 如果当前节点已选中，则展开后子节点也被选中
-                if (!checkStrictly && treeMethods.isCheckedByCheckboxNodeId(nodeid)) {
-                  handleCheckedCheckboxNode(childRows.map(item => getNodeId(item)), true);
+                if (!checkStrictly && $xeTree.isCheckedByCheckboxNodeId(nodeid)) {
+                  handleCheckedCheckboxNode(childRows, true);
                 }
                 updateNodeLine(node);
                 dispatchEvent('load-success', {
@@ -833,7 +911,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           }).catch(e => {
             const {
               treeExpandLazyLoadedMaps
-            } = reactData;
+            } = internalData;
             nodeItem.treeLoaded = false;
             if (treeExpandLazyLoadedMaps[nodeid]) {
               treeExpandLazyLoadedMaps[nodeid] = false;
@@ -864,10 +942,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
         toggleMethod
       } = props;
       const {
-        nodeMaps,
-        treeExpandLazyLoadedMaps
-      } = reactData;
-      const tempExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
+        treeExpandLazyLoadedMaps,
+        treeExpandedMaps
+      } = internalData;
+      const {
+        nodeMaps
+      } = internalData;
       const childrenField = computeChildrenField.value;
       const hasChildField = computeHasChildField.value;
       const result = [];
@@ -884,8 +964,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (nodeItem) {
           nodeItem.items.forEach(item => {
             const itemNodeId = getNodeId(item);
-            if (tempExpandedMaps[itemNodeId]) {
-              delete tempExpandedMaps[itemNodeId];
+            if (treeExpandedMaps[itemNodeId]) {
+              delete treeExpandedMaps[itemNodeId];
             }
           });
         }
@@ -894,7 +974,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       if (expanded) {
         validNodes.forEach(item => {
           const itemNodeId = getNodeId(item);
-          if (!tempExpandedMaps[itemNodeId]) {
+          if (!treeExpandedMaps[itemNodeId]) {
             const nodeItem = nodeMaps[itemNodeId];
             const isLoad = lazy && item[hasChildField] && !nodeItem.treeLoaded && !treeExpandLazyLoadedMaps[itemNodeId];
             // 是否使用懒加载
@@ -902,7 +982,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
               result.push(handleAsyncTreeExpandChilds(item));
             } else {
               if (item[childrenField] && item[childrenField].length) {
-                tempExpandedMaps[itemNodeId] = true;
+                treeExpandedMaps[itemNodeId] = true;
                 expandNodes.push(item);
               }
             }
@@ -911,13 +991,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
       } else {
         validNodes.forEach(item => {
           const itemNodeId = getNodeId(item);
-          if (tempExpandedMaps[itemNodeId]) {
-            delete tempExpandedMaps[itemNodeId];
+          if (treeExpandedMaps[itemNodeId]) {
+            delete treeExpandedMaps[itemNodeId];
             expandNodes.push(item);
           }
         });
       }
-      reactData.treeExpandedMaps = tempExpandedMaps;
+      reactData.updateExpandedFlag++;
       expandNodes.forEach(updateNodeLine);
       return Promise.all(result);
     };
@@ -928,7 +1008,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const {
         treeExpandedMaps,
         treeExpandLazyLoadedMaps
-      } = reactData;
+      } = internalData;
       const nodeid = getNodeId(node);
       const expanded = !treeExpandedMaps[nodeid];
       evnt.stopPropagation();
@@ -936,74 +1016,107 @@ var _default = exports.default = (0, _vue.defineComponent)({
         handleBaseTreeExpand([node], expanded);
       }
     };
-    const handleNodeCheckboxStatus = (node, selectKeyMaps, indeterminateMaps) => {
-      const childrenField = computeChildrenField.value;
-      const childList = _xeUtils.default.get(node, childrenField);
-      const nodeid = getNodeId(node);
-      if (childList && childList.length) {
-        let checkSome = false;
-        let checkSize = 0;
-        childList.forEach(childNode => {
-          const childNodeid = getNodeId(childNode);
-          const isChecked = selectKeyMaps[childNodeid];
-          if (isChecked || indeterminateMaps[childNodeid]) {
-            if (isChecked) {
-              checkSize++;
-            }
-            checkSome = true;
-          }
-        });
-        const checkAll = checkSize === childList.length;
-        if (checkAll) {
-          if (!selectKeyMaps[nodeid]) {
-            selectKeyMaps[nodeid] = true;
-          }
-          if (indeterminateMaps[nodeid]) {
-            delete indeterminateMaps[nodeid];
-          }
-        } else {
-          if (selectKeyMaps[nodeid]) {
-            delete selectKeyMaps[nodeid];
-          }
-          indeterminateMaps[nodeid] = checkSome;
-        }
-      } else {
-        if (indeterminateMaps[nodeid]) {
-          delete indeterminateMaps[nodeid];
-        }
-      }
-    };
     const updateCheckboxStatus = () => {
+      const {
+        transform
+      } = props;
       const {
         treeList
       } = reactData;
+      const {
+        selectCheckboxMaps,
+        indeterminateRowMaps
+      } = internalData;
       const childrenField = computeChildrenField.value;
+      const mapChildrenField = computeMapChildrenField.value;
       const checkboxOpts = computeCheckboxOpts.value;
       const {
-        checkStrictly
+        checkStrictly,
+        checkMethod
       } = checkboxOpts;
       if (!checkStrictly) {
-        const selectKeyMaps = Object.assign({}, reactData.selectCheckboxMaps);
-        const indeterminateMaps = {};
-        _xeUtils.default.eachTree(treeList, (node, index, items, path, parent, nodes) => {
-          const childList = _xeUtils.default.get(node, childrenField);
-          if (!childList || !childList.length) {
-            handleNodeCheckboxStatus(node, selectKeyMaps, indeterminateMaps);
+        const childRowMaps = {};
+        const childRowList = [];
+        _xeUtils.default.eachTree(treeList, node => {
+          const nodeid = getNodeId(node);
+          const childList = node[childrenField];
+          if (childList && childList.length && !childRowMaps[nodeid]) {
+            childRowMaps[nodeid] = 1;
+            childRowList.unshift([node, nodeid, childList]);
           }
-          if (index === items.length - 1) {
-            for (let len = nodes.length - 2; len >= 0; len--) {
-              const parentItem = nodes[len];
-              handleNodeCheckboxStatus(parentItem, selectKeyMaps, indeterminateMaps);
+        }, {
+          children: transform ? mapChildrenField : childrenField
+        });
+        childRowList.forEach(vals => {
+          const node = vals[0];
+          const nodeid = vals[1];
+          const childList = vals[2];
+          let sLen = 0; // 已选
+          let hLen = 0; // 半选
+          let vLen = 0; // 有效行
+          childList.forEach(checkMethod ? item => {
+            const childNodeid = getNodeId(item);
+            const isSelect = selectCheckboxMaps[childNodeid];
+            if (checkMethod({
+              node: item
+            })) {
+              if (isSelect) {
+                sLen++;
+              } else if (indeterminateRowMaps[childNodeid]) {
+                hLen++;
+              }
+              vLen++;
+            } else {
+              if (isSelect) {
+                sLen++;
+              } else if (indeterminateRowMaps[childNodeid]) {
+                hLen++;
+              }
+            }
+          } : item => {
+            const childNodeid = getNodeId(item);
+            const isSelect = selectCheckboxMaps[childNodeid];
+            if (isSelect) {
+              sLen++;
+            } else if (indeterminateRowMaps[childNodeid]) {
+              hLen++;
+            }
+            vLen++;
+          });
+          const isSelected = sLen >= vLen;
+          const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
+          if (isSelected) {
+            selectCheckboxMaps[nodeid] = node;
+            if (indeterminateRowMaps[nodeid]) {
+              delete indeterminateRowMaps[nodeid];
+            }
+          } else {
+            if (selectCheckboxMaps[nodeid]) {
+              delete selectCheckboxMaps[nodeid];
+            }
+            if (halfSelect) {
+              indeterminateRowMaps[nodeid] = node;
+            } else {
+              if (indeterminateRowMaps[nodeid]) {
+                delete indeterminateRowMaps[nodeid];
+              }
             }
           }
         });
-        reactData.selectCheckboxMaps = selectKeyMaps;
-        reactData.indeterminateCheckboxMaps = indeterminateMaps;
+        reactData.updateCheckboxFlag++;
       }
     };
     const changeCheckboxEvent = (evnt, node) => {
       evnt.preventDefault();
       evnt.stopPropagation();
+      const {
+        transform
+      } = props;
+      const {
+        selectCheckboxMaps
+      } = internalData;
+      const childrenField = computeChildrenField.value;
+      const mapChildrenField = computeMapChildrenField.value;
       const checkboxOpts = computeCheckboxOpts.value;
       const {
         checkStrictly,
@@ -1018,35 +1131,33 @@ var _default = exports.default = (0, _vue.defineComponent)({
       if (isDisabled) {
         return;
       }
-      const selectKeyMaps = Object.assign({}, reactData.selectCheckboxMaps);
-      const childrenField = computeChildrenField.value;
       const nodeid = getNodeId(node);
       let isChecked = false;
-      if (selectKeyMaps[nodeid]) {
-        delete selectKeyMaps[nodeid];
+      if (selectCheckboxMaps[nodeid]) {
+        delete selectCheckboxMaps[nodeid];
       } else {
         isChecked = true;
-        selectKeyMaps[nodeid] = isChecked;
+        selectCheckboxMaps[nodeid] = node;
       }
       if (!checkStrictly) {
         _xeUtils.default.eachTree(_xeUtils.default.get(node, childrenField), childNode => {
           const childNodeid = getNodeId(childNode);
           if (isChecked) {
-            if (!selectKeyMaps[childNodeid]) {
-              selectKeyMaps[childNodeid] = true;
+            if (!selectCheckboxMaps[childNodeid]) {
+              selectCheckboxMaps[childNodeid] = true;
             }
           } else {
-            if (selectKeyMaps[childNodeid]) {
-              delete selectKeyMaps[childNodeid];
+            if (selectCheckboxMaps[childNodeid]) {
+              delete selectCheckboxMaps[childNodeid];
             }
           }
         }, {
-          children: childrenField
+          children: transform ? mapChildrenField : childrenField
         });
       }
-      reactData.selectCheckboxMaps = selectKeyMaps;
+      reactData.updateCheckboxFlag++;
       updateCheckboxStatus();
-      const value = Object.keys(reactData.selectCheckboxMaps);
+      const value = _xeUtils.default.keys(selectCheckboxMaps);
       emitCheckboxMode(value);
       dispatchEvent('checkbox-change', {
         node,
@@ -1204,12 +1315,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
         showIcon
       } = props;
       const {
-        nodeMaps,
-        treeExpandedMaps,
         currentNode,
         selectRadioKey,
-        treeExpandLazyLoadedMaps
+        updateExpandedFlag
       } = reactData;
+      const {
+        nodeMaps,
+        treeExpandedMaps,
+        treeExpandLazyLoadedMaps
+      } = internalData;
       const childrenField = computeChildrenField.value;
       const titleField = computeTitleField.value;
       const hasChildField = computeHasChildField.value;
@@ -1219,7 +1333,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const titleSlot = slots.title;
       const extraSlot = slots.extra;
       const nodeid = getNodeId(node);
-      const isExpand = treeExpandedMaps[nodeid];
+      const isExpand = updateExpandedFlag && treeExpandedMaps[nodeid];
       const nodeItem = nodeMaps[nodeid];
       const nodeValue = _xeUtils.default.get(node, titleField);
       const childVns = [];
@@ -1357,7 +1471,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       dataFlag.value++;
     });
     (0, _vue.watch)(dataFlag, () => {
-      updateData(props.data || []);
+      loadTreeData(props.data || []);
     });
     (0, _vue.watch)(() => props.checkNodeKey, val => {
       reactData.selectRadioKey = val;
@@ -1374,11 +1488,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
     });
     (0, _vue.onUnmounted)(() => {
       reactData.treeList = [];
-      reactData.treeExpandedMaps = {};
-      reactData.nodeMaps = {};
+      internalData.treeExpandedMaps = {};
+      internalData.indeterminateRowMaps = {};
+      internalData.nodeMaps = {};
     });
-    updateData(props.data || []);
-    updateCheckboxChecked(props.checkNodeKeys || []);
+    loadTreeData(props.data || []);
     $xeTree.renderVN = renderVN;
     return $xeTree;
   },