vxe-pc-ui 3.8.0 → 3.8.2

package/lib/index.umd.js

@@ -13158,14 +13158,14 @@ var defineVxeComponent = function defineVxeComponent(options) {
 };
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-var log_version = "ui v".concat("3.8.0");
+var log_version = "ui v".concat("3.8.2");
 var warnLog = log.create('warn', log_version);
 var errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
 
-var ui_version = "3.8.0";
+var ui_version = "3.8.2";
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -47113,7 +47113,6 @@ var TabPane = VxeTabPane;
 
 
 
-
 function getRowUniqueId() {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId('row_');
 }
@@ -47389,18 +47388,34 @@ function getRowUniqueId() {
       var reactData = $xeTableSelect.reactData;
       var multiple = props.multiple;
       var tableCols = [];
+      var hasRadioCol = false;
+      var hasCheckboxCol = false;
+      columns.forEach(function (column) {
+        if (!hasRadioCol && column.type === 'radio') {
+          hasRadioCol = true;
+        } else if (!hasCheckboxCol && column.type === 'checkbox') {
+          hasCheckboxCol = true;
+        }
+        tableCols.push(column);
+      });
       if (multiple) {
-        tableCols.push({
+        if (!hasCheckboxCol) {
+          errLog('vxe.error.reqProp', ['{ type: "checkbox" }']);
+        }
+        tableCols.unshift({
           type: 'checkbox',
           width: 70
         });
       } else {
-        tableCols.push({
+        if (!hasRadioCol) {
+          errLog('vxe.error.reqProp', ['{ type: "radio" }']);
+        }
+        tableCols.unshift({
           type: 'radio',
           width: 70
         });
       }
-      reactData.tableColumns = tableCols.concat(columns || []);
+      reactData.tableColumns = tableCols;
     },
     cacheDataMap: function cacheDataMap() {
       var $xeTableSelect = this;
@@ -49933,6 +49948,34 @@ function handleSetExpand(nodeid, expanded, expandedMaps) {
     }
   }
 }
+function handleScrollTo($xeTree, scrollLeft, scrollTop) {
+  var reactData = $xeTree.reactData;
+  var scrollBodyElem = $xeTree.$refs.refVirtualWrapper;
+  if (scrollLeft) {
+    if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollLeft)) {
+      scrollTop = scrollLeft.top;
+      scrollLeft = scrollLeft.left;
+    }
+  }
+  if (scrollBodyElem) {
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollLeft)) {
+      scrollBodyElem.scrollLeft = scrollLeft;
+    }
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollTop)) {
+      scrollBodyElem.scrollTop = scrollTop;
+    }
+  }
+  if (reactData.scrollYLoad) {
+    return new Promise(function (resolve) {
+      setTimeout(function () {
+        $xeTree.$nextTick(function () {
+          resolve();
+        });
+      }, 50);
+    });
+  }
+  return $xeTree.$nextTick();
+}
 /* harmony default export */ var tree = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeTree',
   mixins: [globalMixins.sizeMixin],
@@ -50785,32 +50828,48 @@ function handleSetExpand(nodeid, expanded, expandedMaps) {
      */
     scrollTo: function scrollTo(scrollLeft, scrollTop) {
       var $xeTree = this;
-      var reactData = $xeTree.reactData;
+      return handleScrollTo($xeTree, scrollLeft, scrollTop);
+    },
+    scrollToNode: function scrollToNode(node) {
+      var $xeTree = this;
+      return $xeTree.scrollToNodeId($xeTree.getNodeId(node));
+    },
+    scrollToNodeId: function scrollToNodeId(nodeid) {
+      var $xeTree = this;
+      var props = $xeTree;
+      var internalData = $xeTree.internalData;
+      var transform = props.transform;
+      var scrollYStore = internalData.scrollYStore,
+        afterTreeList = internalData.afterTreeList;
+      var childrenField = $xeTree.computeChildrenField;
+      var mapChildrenField = $xeTree.computeMapChildrenField;
       var scrollBodyElem = $xeTree.$refs.refVirtualWrapper;
-      if (scrollLeft) {
-        if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollLeft)) {
-          scrollTop = scrollLeft.top;
-          scrollLeft = scrollLeft.left;
-        }
-      }
-      if (scrollBodyElem) {
-        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollLeft)) {
-          scrollBodyElem.scrollLeft = scrollLeft;
-        }
-        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(scrollTop)) {
-          scrollBodyElem.scrollTop = scrollTop;
-        }
-      }
-      if (reactData.scrollYLoad) {
-        return new Promise(function (resolve) {
-          setTimeout(function () {
-            $xeTree.$nextTick(function () {
-              resolve();
+      if (nodeid && scrollBodyElem) {
+        if (transform) {
+          var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(afterTreeList, function (item) {
+            return $xeTree.getNodeId(item) === nodeid;
+          }, {
+            children: transform ? mapChildrenField : childrenField
+          });
+          if (matchObj) {
+            return $xeTree.setExpandNode(matchObj.nodes, true).then(function () {
+              var itemIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(internalData.afterVisibleList, function (item) {
+                return $xeTree.getNodeId(item) === nodeid;
+              });
+              if (itemIndex > -1) {
+                var targetTop = Math.max(0, (itemIndex - 1) * scrollYStore.rowHeight);
+                return handleScrollTo($xeTree, scrollBodyElem.scrollLeft, targetTop);
+              }
             });
-          }, 50);
-        });
+          }
+        } else {
+          var itemEl = scrollBodyElem.querySelector(".vxe-tree--node-wrapper[nodeid=\"".concat(nodeid, "\"]"));
+          if (itemEl) {
+            return handleScrollTo($xeTree, scrollBodyElem.scrollLeft, itemEl.offsetTop);
+          }
+        }
       }
-      return $xeTree.$nextTick();
+      return $xeTree.recalculate();
     },
     /**
      * 刷新滚动条
@@ -51387,7 +51446,7 @@ function handleSetExpand(nodeid, expanded, expandedMaps) {
       var reactData = $xeTree.reactData;
       var internalData = $xeTree.internalData;
       var nodeMaps = internalData.nodeMaps;
-      var nodeItem = nodeMaps[nodeKey];
+      var nodeItem = nodeMaps["".concat(nodeKey)];
       reactData.currentNode = nodeItem ? nodeItem.item : null;
       return $xeTree.$nextTick();
     },
@@ -51519,7 +51578,7 @@ function handleSetExpand(nodeid, expanded, expandedMaps) {
           nodeids = [nodeids];
         }
         nodeids.forEach(function (nodeid) {
-          handleSetExpand(nodeid, expanded, treeExpandedMaps);
+          handleSetExpand("".concat(nodeid), expanded, treeExpandedMaps);
         });
         reactData.updateExpandedFlag++;
       }
@@ -51576,7 +51635,7 @@ function handleSetExpand(nodeid, expanded, expandedMaps) {
           nodeids = [nodeids];
         }
         nodeids.forEach(function (nodeid) {
-          handleSetExpand(nodeid, !treeExpandedMaps[nodeid], treeExpandedMaps);
+          handleSetExpand("".concat(nodeid), !treeExpandedMaps["".concat(nodeid)], treeExpandedMaps);
         });
         reactData.updateExpandedFlag++;
       }