vxe-pc-ui 3.3.8 → 3.3.9

package/lib/index.umd.js

@@ -12799,7 +12799,7 @@ function handleBooleanDefaultValue(value) {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-var log_version = "ui v".concat("3.3.8");
+var log_version = "ui v".concat("3.3.9");
 var warnLog = log.create('warn', log_version);
 var errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
@@ -12807,7 +12807,7 @@ var errLog = log.create('error', log_version);
 
 
 
-var ui_version = "3.3.8";
+var ui_version = "3.3.9";
 core_VxeUI.version = ui_version;
 core_VxeUI.uiVersion = ui_version;
 core_VxeUI.tableVersion = '';
@@ -42624,6 +42624,17 @@ var Tooltip = VxeTooltip;
 function getNodeUniqueId() {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId('node_');
 }
+function handleSetExpand(nodeid, expanded, expandedMaps) {
+  if (expanded) {
+    if (expandedMaps[nodeid]) {
+      expandedMaps[nodeid] = true;
+    }
+  } else {
+    if (expandedMaps[nodeid]) {
+      delete expandedMaps[nodeid];
+    }
+  }
+}
 /* harmony default export */ var tree = (defineVxeComponent({
   name: 'VxeTree',
   mixins: [globalMixins.sizeMixin],
@@ -42896,7 +42907,7 @@ function getNodeUniqueId() {
     setAllCheckboxNode: function setAllCheckboxNode(checked) {
       var $xeTree = this;
       var reactData = $xeTree.reactData;
-      var selectMaps = Object.assign(reactData.selectCheckboxMaps);
+      var selectMaps = Object.assign({}, reactData.selectCheckboxMaps);
       var childrenField = $xeTree.computeChildrenField;
       if (checked) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(reactData.treeList, function (node) {
@@ -42925,13 +42936,13 @@ function getNodeUniqueId() {
     setExpandByNodeId: function setExpandByNodeId(nodeids, expanded) {
       var $xeTree = this;
       var reactData = $xeTree.reactData;
-      var expandedMaps = Object.assign(reactData.treeExpandedMaps);
+      var expandedMaps = Object.assign({}, reactData.treeExpandedMaps);
       if (nodeids) {
         if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(nodeids)) {
           nodeids = [nodeids];
         }
         nodeids.forEach(function (nodeid) {
-          $xeTree.handleSetExpand(nodeid, expanded, expandedMaps);
+          handleSetExpand(nodeid, expanded, expandedMaps);
         });
         reactData.treeExpandedMaps = expandedMaps;
       }
@@ -42940,14 +42951,14 @@ function getNodeUniqueId() {
     setExpandNode: function setExpandNode(nodes, expanded) {
       var $xeTree = this;
       var reactData = $xeTree.reactData;
-      var expandedMaps = Object.assign(reactData.treeExpandedMaps);
+      var expandedMaps = Object.assign({}, reactData.treeExpandedMaps);
       if (nodes) {
         if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(nodes)) {
           nodes = [nodes];
         }
         nodes.forEach(function (node) {
           var nodeid = $xeTree.getNodeId(node);
-          $xeTree.handleSetExpand(nodeid, expanded, expandedMaps);
+          handleSetExpand(nodeid, expanded, expandedMaps);
         });
         reactData.treeExpandedMaps = expandedMaps;
       }
@@ -42956,13 +42967,13 @@ function getNodeUniqueId() {
     toggleExpandByNodeId: function toggleExpandByNodeId(nodeids) {
       var $xeTree = this;
       var reactData = $xeTree.reactData;
-      var expandedMaps = Object.assign(reactData.treeExpandedMaps);
+      var expandedMaps = Object.assign({}, reactData.treeExpandedMaps);
       if (nodeids) {
         if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(nodeids)) {
           nodeids = [nodeids];
         }
         nodeids.forEach(function (nodeid) {
-          $xeTree.handleSetExpand(nodeid, !expandedMaps[nodeid], expandedMaps);
+          handleSetExpand(nodeid, !expandedMaps[nodeid], expandedMaps);
         });
         reactData.treeExpandedMaps = expandedMaps;
       }
@@ -42971,14 +42982,14 @@ function getNodeUniqueId() {
     toggleExpandNode: function toggleExpandNode(nodes) {
       var $xeTree = this;
       var reactData = $xeTree.reactData;
-      var expandedMaps = Object.assign(reactData.treeExpandedMaps);
+      var expandedMaps = Object.assign({}, reactData.treeExpandedMaps);
       if (nodes) {
         if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(nodes)) {
           nodes = [nodes];
         }
         nodes.forEach(function (node) {
           var nodeid = $xeTree.getNodeId(node);
-          $xeTree.handleSetExpand(nodeid, !expandedMaps[nodeid], expandedMaps);
+          handleSetExpand(nodeid, !expandedMaps[nodeid], expandedMaps);
         });
         reactData.treeExpandedMaps = expandedMaps;
       }
@@ -42987,7 +42998,7 @@ function getNodeUniqueId() {
     setAllExpandNode: function setAllExpandNode() {
       var $xeTree = this;
       var reactData = $xeTree.reactData;
-      var expandedMaps = Object.assign(reactData.treeExpandedMaps);
+      var expandedMaps = Object.assign({}, reactData.treeExpandedMaps);
       var childrenField = $xeTree.computeChildrenField;
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(reactData.treeList, function (node) {
         var nodeid = $xeTree.getNodeId(node);
@@ -43168,17 +43179,6 @@ function getNodeUniqueId() {
       }
       reactData.selectCheckboxMaps = selectKeyMaps;
     },
-    handleSetExpand: function handleSetExpand(nodeid, expanded, expandedMaps) {
-      if (expanded) {
-        if (expandedMaps[nodeid]) {
-          expandedMaps[nodeid] = true;
-        }
-      } else {
-        if (expandedMaps[nodeid]) {
-          delete expandedMaps[nodeid];
-        }
-      }
-    },
     createNode: function createNode(records) {
       var $xeTree = this;
       var valueField = $xeTree.computeValueField;
@@ -43328,28 +43328,31 @@ function getNodeUniqueId() {
       var checkStrictly = checkboxOpts.checkStrictly;
       return new Promise(function (resolve) {
         if (loadMethod) {
-          var treeExpandLazyLoadedMaps = reactData.treeExpandLazyLoadedMaps;
+          var tempExpandLazyLoadedMaps = Object.assign({}, reactData.treeExpandLazyLoadedMaps);
           var nodeMaps = reactData.nodeMaps;
           var nodeid = $xeTree.getNodeId(node);
           var nodeItem = nodeMaps[nodeid];
-          treeExpandLazyLoadedMaps[nodeid] = true;
+          tempExpandLazyLoadedMaps[nodeid] = true;
+          reactData.treeExpandLazyLoadedMaps = tempExpandLazyLoadedMaps;
           Promise.resolve(loadMethod({
             $tree: $xeTree,
             node: node
           })).then(function (childRecords) {
+            var treeExpandLazyLoadedMaps = reactData.treeExpandLazyLoadedMaps;
             nodeItem.treeLoaded = true;
             if (treeExpandLazyLoadedMaps[nodeid]) {
-              delete treeExpandLazyLoadedMaps[nodeid];
+              treeExpandLazyLoadedMaps[nodeid] = false;
             }
             if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(childRecords)) {
               childRecords = [];
             }
             if (childRecords) {
               return $xeTree.loadChildrenNode(node, childRecords).then(function (childRows) {
-                var treeExpandedMaps = reactData.treeExpandedMaps;
-                if (childRows.length && !treeExpandedMaps[nodeid]) {
-                  treeExpandedMaps[nodeid] = true;
+                var tempExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
+                if (childRows.length && !tempExpandedMaps[nodeid]) {
+                  tempExpandedMaps[nodeid] = true;
                 }
+                reactData.treeExpandedMaps = tempExpandedMaps;
                 // 如果当前节点已选中，则展开后子节点也被选中
                 if (!checkStrictly && $xeTree.isCheckedByCheckboxNodeId(nodeid)) {
                   $xeTree.handleCheckedCheckboxNode(childRows.map(function (item) {
@@ -43372,9 +43375,9 @@ function getNodeUniqueId() {
             }
           }).catch(function (e) {
             var treeExpandLazyLoadedMaps = reactData.treeExpandLazyLoadedMaps;
-            nodeItem.treeLoaded = false;
+            nodeItem.treeLoaded = true;
             if (treeExpandLazyLoadedMaps[nodeid]) {
-              delete treeExpandLazyLoadedMaps[nodeid];
+              treeExpandLazyLoadedMaps[nodeid] = false;
             }
             $xeTree.updateNodeLine(node);
             $xeTree.dispatchEvent('load-error', {
@@ -43761,22 +43764,6 @@ function getNodeUniqueId() {
       var isExpand = treeExpandedMaps[nodeid];
       var nodeItem = nodeMaps[nodeid];
       var nodeValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(node, titleField);
-      var childVns = [];
-      if (hasChild && treeExpandedMaps[nodeid]) {
-        if (showLine) {
-          childVns.push(h('div', {
-            key: 'line',
-            class: 'vxe-tree--node-child-line',
-            style: {
-              height: "calc(".concat(nodeItem.lineCount, " * var(--vxe-ui-tree-node-height) - var(--vxe-ui-tree-node-height) / 2)"),
-              left: "".concat((nodeItem.level + 1) * (indent || 1), "px")
-            }
-          }));
-        }
-        childList.forEach(function (childItem) {
-          childVns.push($xeTree.renderNode(h, childItem));
-        });
-      }
       var isRadioChecked = false;
       if (showRadio) {
         // eslint-disable-next-line eqeqeq
@@ -43794,6 +43781,22 @@ function getNodeUniqueId() {
         hasLazyChilds = node[hasChildField];
         isLazyLoaded = !!nodeItem.treeLoaded;
       }
+      var childVns = [];
+      if (hasChild && treeExpandedMaps[nodeid]) {
+        if (showLine) {
+          childVns.push(h('div', {
+            key: 'line',
+            class: 'vxe-tree--node-child-line',
+            style: {
+              height: "calc(".concat(nodeItem.lineCount, " * var(--vxe-ui-tree-node-height) - var(--vxe-ui-tree-node-height) / 2)"),
+              left: "".concat((nodeItem.level + 1) * (indent || 1), "px")
+            }
+          }));
+        }
+        childList.forEach(function (childItem) {
+          childVns.push($xeTree.renderNode(h, childItem));
+        });
+      }
       return h('div', {
         class: ['vxe-tree--node-wrapper', "node--level-".concat(nodeItem.level)],
         attrs: {