vxe-table 3.5.1 → 3.5.4

package/lib/index.umd.js

@@ -8756,7 +8756,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.5.1", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.5.4", "] ").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.1",
+  version: "3.5.4",
   reg: reg,
   use: use,
   setup: setup,
@@ -21592,7 +21592,7 @@ var Menu = {
 
 
 
-var mixin_getRowid = utils.getRowid;
+
 
 function insertTreeRow(_vm, newRecords, isAppend) {
   var tableFullTreeData = _vm.tableFullTreeData,
@@ -21607,7 +21607,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
   var funcName = isAppend ? 'push' : 'unshift';
   newRecords.forEach(function (item) {
     var parentRowId = item[parentField];
-    var rowid = mixin_getRowid(_vm, item);
+    var rowid = getRowid(_vm, item);
     var matchObj = parentRowId ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableFullTreeData, function (item) {
       return parentRowId === item[rowField];
     }, {
@@ -21616,7 +21616,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
 
     if (matchObj) {
       var parentRow = matchObj.item;
-      var parentRest = fullAllDataRowIdData[mixin_getRowid(_vm, parentRow)];
+      var parentRest = fullAllDataRowIdData[getRowid(_vm, parentRow)];
       var parentLevel = parentRest ? parentRest.level : 0;
       var parentChilds = parentRow[children];
 
@@ -21750,10 +21750,10 @@ function insertTreeRow(_vm, newRecords, isAppend) {
             if (matchObj) {
               var parentRow = matchObj.parent;
               var parentChilds = matchObj.items;
-              var parentRest = fullAllDataRowIdData[mixin_getRowid(this, parentRow)];
+              var parentRest = fullAllDataRowIdData[getRowid(this, parentRow)];
               var parentLevel = parentRest ? parentRest.level : 0;
               newRecords.forEach(function (item, i) {
-                var rowid = mixin_getRowid(_this, item);
+                var rowid = getRowid(_this, item);
 
                 if (false) {}
 
@@ -21904,9 +21904,9 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         // 如果为虚拟树
         if (treeConfig && transform) {
           rows.forEach(function (row) {
-            var rowid = mixin_getRowid(_this2, row);
+            var rowid = getRowid(_this2, row);
             var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableFullTreeData, function (item) {
-              return rowid === mixin_getRowid(_this2, item);
+              return rowid === getRowid(_this2, item);
             }, treeOpts);
 
             if (matchObj) {
@@ -22057,9 +22057,9 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         // 如果为虚拟树
         if (treeConfig && treeOpts.transform) {
           insertList.forEach(function (row) {
-            var rowid = mixin_getRowid(_this6, row);
+            var rowid = getRowid(_this6, row);
             var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableFullTreeData, function (item) {
-              return rowid === mixin_getRowid(_this6, item);
+              return rowid === getRowid(_this6, item);
             }, treeOpts);
 
             if (matchObj) {
@@ -22155,7 +22155,11 @@ function insertTreeRow(_vm, newRecords, isAppend) {
             }
 
             this.closeTooltip();
-            this.clearActived(evnt);
+
+            if (actived.column) {
+              this.clearActived(evnt);
+            }
+
             type = 'edit-actived';
             column.renderHeight = cell.offsetHeight;
             actived.args = params;
@@ -22281,7 +22285,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         }, evnt);
       }
 
-      return (v_x_e_table._valid ? this.clearValidate() : this.$nextTick()).then(this.recalculate);
+      return v_x_e_table._valid ? this.clearValidate() : this.$nextTick();
     },
     _getActiveRecord: function _getActiveRecord() {
       var $el = this.$el,
@@ -32806,7 +32810,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
                 if (rest) {
                   if (isEnableConf(pagerConfig)) {
                     var total = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(rest, proxyProps.total || 'page.total') || 0;
-                    tablePage.total = total;
+                    tablePage.total = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(total);
                     _this5.tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(rest, proxyProps.result || 'result') || []; // 检验当前页码，不能超出当前最大页数
 
                     var pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);
@@ -36761,19 +36765,15 @@ function renderItems(h, _vm, itemList) {
 
       if (!this.preventSubmit) {
         this.clearValidate();
-        this.beginValidate(this.getItems()).then(function () {
-          _this3.$emit('submit', {
-            data: _this3.data,
-            $form: _this3,
-            $event: evnt
-          });
-        }).catch(function (errMap) {
-          _this3.$emit('submit-invalid', {
-            data: _this3.data,
-            errMap: errMap,
-            $form: _this3,
-            $event: evnt
-          });
+        this.beginValidate(this.getItems()).then(function (errMap) {
+          if (errMap) {
+            _this3.$emit('submit-invalid', {
+              data: _this3.data,
+              errMap: errMap,
+              $form: _this3,
+              $event: evnt
+            });
+          } else {}
         });
       }
     },