vxe-table 3.5.0-beta.2 → 3.5.0-beta.3

package/lib/index.umd.js

@@ -8471,7 +8471,7 @@ var iconPrefix = 'vxe-icon--';
       parentField: 'parentId',
       children: 'children',
       hasChild: 'hasChild',
-      mapChildren: '_X_CHILD',
+      mapChildren: '_X_ROW_CHILD',
       indent: 20,
       showIcon: true
     },
@@ -8756,7 +8756,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.5.0-beta.2", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.5.0-beta.3", "] ").concat(conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10025,7 +10025,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.5.0-beta.2",
+  version: "3.5.0-beta.3",
   reg: reg,
   use: use,
   setup: setup,
@@ -18689,8 +18689,14 @@ var Methods = {
     this.tableColumn = scrollXLoad ? visibleColumn.slice(scrollXStore.startIndex, scrollXStore.endIndex) : visibleColumn.slice(0);
   },
   updateScrollXData: function updateScrollXData() {
-    this.handleTableColumn();
-    this.updateScrollXSpace();
+    var _this49 = this;
+
+    this.tableColumn = [];
+    this.$nextTick(function () {
+      _this49.handleTableColumn();
+
+      _this49.updateScrollXSpace();
+    });
   },
   // 更新横向 X 可视渲染上下剩余空间大小
   updateScrollXSpace: function updateScrollXSpace() {
@@ -18746,8 +18752,14 @@ var Methods = {
     }
   },
   updateScrollYData: function updateScrollYData() {
-    this.handleTableData();
-    this.updateScrollYSpace();
+    var _this50 = this;
+
+    this.tableData = [];
+    this.$nextTick(function () {
+      _this50.handleTableData();
+
+      _this50.updateScrollYSpace();
+    });
   },
   // 更新纵向 Y 可视渲染上下剩余空间大小
   updateScrollYSpace: function updateScrollYSpace() {
@@ -18793,7 +18805,7 @@ var Methods = {
    * @param {Number} scrollTop 上距离
    */
   scrollTo: function scrollTo(scrollLeft, scrollTop) {
-    var _this49 = this;
+    var _this51 = this;
 
     var $refs = this.$refs;
     var tableBody = $refs.tableBody,
@@ -18814,7 +18826,7 @@ var Methods = {
     if (this.scrollXLoad || this.scrollYLoad) {
       return new Promise(function (resolve) {
         return setTimeout(function () {
-          return resolve(_this49.$nextTick());
+          return resolve(_this51.$nextTick());
         }, 50);
       });
     }
@@ -18865,7 +18877,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   scrollToTreeRow: function scrollToTreeRow(row) {
-    var _this50 = this;
+    var _this52 = this;
 
     var tableFullData = this.tableFullData,
         treeConfig = this.treeConfig,
@@ -18880,15 +18892,15 @@ var Methods = {
       if (matchObj) {
         var nodes = matchObj.nodes;
         nodes.forEach(function (row, index) {
-          if (index < nodes.length - 1 && !_this50.isTreeExpandByRow(row)) {
-            rests.push(_this50.setTreeExpand(row, true));
+          if (index < nodes.length - 1 && !_this52.isTreeExpandByRow(row)) {
+            rests.push(_this52.setTreeExpand(row, true));
           }
         });
       }
     }
 
     return Promise.all(rests).then(function () {
-      return dom.rowToVisible(_this50, row);
+      return dom.rowToVisible(_this52, row);
     });
   },
 
@@ -18952,29 +18964,29 @@ var Methods = {
    * 如果单元格配置了校验规则，则会进行校验
    */
   updateStatus: function updateStatus(scope, cellValue) {
-    var _this51 = this;
+    var _this53 = this;
 
     var customVal = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isUndefined(cellValue);
     return this.$nextTick().then(function () {
-      var $refs = _this51.$refs,
-          editRules = _this51.editRules,
-          validStore = _this51.validStore;
+      var $refs = _this53.$refs,
+          editRules = _this53.editRules,
+          validStore = _this53.validStore;
 
       if (scope && $refs.tableBody && editRules) {
         var row = scope.row,
             column = scope.column;
         var type = 'change';
 
-        if (_this51.hasCellRules(type, row, column)) {
-          var cell = _this51.getCell(row, column);
+        if (_this53.hasCellRules(type, row, column)) {
+          var cell = _this53.getCell(row, column);
 
           if (cell) {
-            return _this51.validCellRules(type, row, column, cellValue).then(function () {
+            return _this53.validCellRules(type, row, column, cellValue).then(function () {
               if (customVal && validStore.visible) {
                 methods_setCellValue(row, column, cellValue);
               }
 
-              _this51.clearValidate();
+              _this53.clearValidate();
             }).catch(function (_ref8) {
               var rule = _ref8.rule;
 
@@ -18982,7 +18994,7 @@ var Methods = {
                 methods_setCellValue(row, column, cellValue);
               }
 
-              _this51.showValidTooltip({
+              _this53.showValidTooltip({
                 rule: rule,
                 row: row,
                 column: column,
@@ -19003,7 +19015,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges { row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }
    */
   setMergeCells: function setMergeCells(merges) {
-    var _this52 = this;
+    var _this54 = this;
 
     if (this.spanMethod) {
       errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -19011,7 +19023,7 @@ var Methods = {
 
     setMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      return _this52.updateCellAreas();
+      return _this54.updateCellAreas();
     });
   },
 
@@ -19020,7 +19032,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
    */
   removeMergeCells: function removeMergeCells(merges) {
-    var _this53 = this;
+    var _this55 = this;
 
     if (this.spanMethod) {
       errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -19028,7 +19040,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      _this53.updateCellAreas();
+      _this55.updateCellAreas();
 
       return rest;
     });
@@ -19052,7 +19064,7 @@ var Methods = {
     this.setMergeFooterItems(this.mergeFooterItems);
   },
   setMergeFooterItems: function setMergeFooterItems(merges) {
-    var _this54 = this;
+    var _this56 = this;
 
     if (this.footerSpanMethod) {
       errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -19060,11 +19072,11 @@ var Methods = {
 
     setMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      return _this54.updateCellAreas();
+      return _this56.updateCellAreas();
     });
   },
   removeMergeFooterItems: function removeMergeFooterItems(merges) {
-    var _this55 = this;
+    var _this57 = this;
 
     if (this.footerSpanMethod) {
       errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -19072,7 +19084,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      _this55.updateCellAreas();
+      _this57.updateCellAreas();
 
       return rest;
     });