vxe-table 3.8.7-beta.5 → 3.8.7-beta.7

package/lib/index.umd.js

@@ -11449,7 +11449,7 @@ var es_array_concat = __webpack_require__(8706);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.7-beta.5", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.8.7-beta.7", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -13116,7 +13116,7 @@ function setIcon(options) {
 var globalStore = {};
 var VXETable = {
   v: v,
-  version: "3.8.7-beta.5",
+  version: "3.8.7-beta.7",
   reg: reg,
   use: use,
   setConfig: setConfig,
@@ -17865,8 +17865,14 @@ var Methods = {
       var selectCheckboxMaps = this.selectCheckboxMaps,
         fullDataRowIdData = this.fullDataRowIdData;
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(selectCheckboxMaps, function (row, rowid) {
-        if (isFull ? fullDataRowIdData[rowid] : afterFullRowMaps[rowid]) {
-          rowList.push(row);
+        if (isFull) {
+          if (fullDataRowIdData[rowid]) {
+            rowList.push(fullDataRowIdData[rowid].row);
+          }
+        } else {
+          if (afterFullRowMaps[rowid]) {
+            rowList.push(afterFullRowMaps[rowid]);
+          }
         }
       });
     }
@@ -33517,6 +33523,7 @@ var convertToRows = function convertToRows(originColumns) {
 
 
 
+
 function print(options) {
   var opts = Object.assign({}, options, {
     type: 'html'
@@ -33531,7 +33538,7 @@ var VxeTableExportModule = {
     v_x_e_table.saveFile = saveLocalFile;
     v_x_e_table.readFile = readLocalFile;
     v_x_e_table.print = print;
-    v_x_e_table.setup({
+    v_x_e_table.setConfig({
       export: {
         types: {
           csv: 0,
@@ -34130,18 +34137,18 @@ function validErrorRuleValue(rule, val) {
         treeConfig = this.treeConfig,
         treeOpts = this.treeOpts;
       var childrenField = treeOpts.children || treeOpts.childrenField;
-      var validDatas;
+      var validList;
       if (rows === true) {
-        validDatas = afterFullData;
+        validList = afterFullData;
       } else if (rows) {
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rows)) {
           cb = rows;
         } else {
-          validDatas = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows) ? rows : [rows];
+          validList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows) ? rows : [rows];
         }
       }
-      if (!validDatas) {
-        validDatas = this.getInsertRecords().concat(this.getUpdateRecords());
+      if (!validList) {
+        validList = this.getInsertRecords().concat(this.getUpdateRecords());
       }
       var rowValidErrs = [];
       this.lastCallTime = Date.now();
@@ -34189,11 +34196,11 @@ function validErrorRuleValue(rule, val) {
           }
         };
         if (treeConfig) {
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(validDatas, handleVaild, {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(validList, handleVaild, {
             children: childrenField
           });
         } else {
-          validDatas.forEach(handleVaild);
+          validList.forEach(handleVaild);
         }
         return Promise.all(rowValidErrs).then(function () {
           var ruleProps = Object.keys(validRest);
@@ -34285,7 +34292,7 @@ function validErrorRuleValue(rule, val) {
       var editRules = this.editRules;
       var property = column.property;
       var errorRules = [];
-      var syncVailds = [];
+      var syncValidList = [];
       if (property && editRules) {
         var rules = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(editRules, property);
         if (rules) {
@@ -34334,7 +34341,7 @@ function validErrorRuleValue(rule, val) {
                     }));
                   } else if (customValid.catch) {
                     // 如果为异步校验（注：异步校验是并发无序的）
-                    syncVailds.push(customValid.catch(function (e) {
+                    syncValidList.push(customValid.catch(function (e) {
                       _this3.validRuleErr = true;
                       errorRules.push(new Rule({
                         type: 'custom',
@@ -34365,7 +34372,7 @@ function validErrorRuleValue(rule, val) {
           });
         }
       }
-      return Promise.all(syncVailds).then(function () {
+      return Promise.all(syncValidList).then(function () {
         if (errorRules.length) {
           var rest = {
             rules: errorRules,
@@ -34404,11 +34411,11 @@ function validErrorRuleValue(rule, val) {
           });
         });
       } else if (rowList.length) {
-        var rowidList = rowList.map(function (row) {
+        var rowIdList = rowList.map(function (row) {
           return "".concat(getRowid(_this4, row));
         });
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(validErrorMaps, function (item, key) {
-          if (rowidList.indexOf(key.split(':')[0]) > -1) {
+          if (rowIdList.indexOf(key.split(':')[0]) > -1) {
             validErrMaps[key] = item;
           }
         });
@@ -40090,14 +40097,10 @@ function getResetValue(value, resetValue) {
     }
   },
   created: function created() {
-    var _this = this;
-    this.$nextTick(function () {
-      var items = _this.items;
-      if (false) {}
-      if (items) {
-        _this.loadItem(items);
-      }
-    });
+    var items = this.items;
+    if (items && items.length) {
+      this.loadItem(items);
+    }
   },
   render: function render(h) {
     var _e = this._e,
@@ -40172,10 +40175,10 @@ function getResetValue(value, resetValue) {
       return [];
     },
     loadItem: function loadItem(list) {
-      var _this2 = this;
+      var _this = this;
       if (false) { var $scopedSlots; }
       this.staticItems = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().mapTree(list, function (item) {
-        return createItem(_this2, item);
+        return createItem(_this, item);
       }, {
         children: 'children'
       });
@@ -40219,26 +40222,26 @@ function getResetValue(value, resetValue) {
       }, evnt);
     },
     submitEvent: function submitEvent(evnt) {
-      var _this3 = this;
+      var _this2 = this;
       evnt.preventDefault();
       if (!this.preventSubmit) {
         this.clearValidate();
         this.beginValidate(this.getItems()).then(function (errMap) {
           if (errMap) {
-            _this3.dispatchEvent('submit-invalid', {
-              data: _this3.data,
+            _this2.dispatchEvent('submit-invalid', {
+              data: _this2.data,
               errMap: errMap
             }, evnt);
           } else {
-            _this3.dispatchEvent('submit', {
-              data: _this3.data
+            _this2.dispatchEvent('submit', {
+              data: _this2.data
             }, evnt);
           }
         });
       }
     },
     reset: function reset() {
-      var _this4 = this;
+      var _this3 = this;
       var data = this.data;
       if (data) {
         var itemList = this.getItems();
@@ -40254,8 +40257,8 @@ function getResetValue(value, resetValue) {
                 field: field,
                 property: field,
                 item: item,
-                $form: _this4,
-                $grid: _this4.xegrid
+                $form: _this3,
+                $grid: _this3.xegrid
               });
             } else if (field) {
               external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(data, field, resetValue === null ? getResetValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, field), undefined) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(resetValue, true));
@@ -40308,7 +40311,7 @@ function getResetValue(value, resetValue) {
       }
     },
     handleTitleTipLeaveEvent: function handleTitleTipLeaveEvent() {
-      var _this5 = this;
+      var _this4 = this;
       var tooltipOpts = this.tooltipOpts;
       var $tooltip = this.$refs.tooltip;
       if ($tooltip) {
@@ -40316,9 +40319,9 @@ function getResetValue(value, resetValue) {
       }
       if (tooltipOpts.enterable) {
         this.tooltipTimeout = setTimeout(function () {
-          $tooltip = _this5.$refs.tooltip;
+          $tooltip = _this4.$refs.tooltip;
           if ($tooltip && !$tooltip.isActived()) {
-            _this5.closeTooltip();
+            _this4.closeTooltip();
           }
         }, tooltipOpts.leaveDelay);
       } else {
@@ -40326,7 +40329,7 @@ function getResetValue(value, resetValue) {
       }
     },
     clearValidate: function clearValidate(fieldOrItem) {
-      var _this6 = this;
+      var _this5 = this;
       if (fieldOrItem) {
         var fields = fieldOrItem;
         if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrItem)) {
@@ -40334,7 +40337,7 @@ function getResetValue(value, resetValue) {
         }
         fields.forEach(function (field) {
           if (field) {
-            var item = handleFieldOrItem(_this6, field);
+            var item = handleFieldOrItem(_this5, field);
             if (item) {
               item.showError = false;
             }
@@ -40352,7 +40355,7 @@ function getResetValue(value, resetValue) {
       return this.beginValidate(this.getItems(), '', callback);
     },
     validateField: function validateField(fieldOrItem, callback) {
-      var _this7 = this;
+      var _this6 = this;
       var fields = [];
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrItem)) {
         fields = fieldOrItem;
@@ -40360,11 +40363,11 @@ function getResetValue(value, resetValue) {
         fields = [fieldOrItem];
       }
       return this.beginValidate(fields.map(function (field) {
-        return handleFieldOrItem(_this7, field);
+        return handleFieldOrItem(_this6, field);
       }), '', callback);
     },
     beginValidate: function beginValidate(itemList, type, callback) {
-      var _this8 = this;
+      var _this7 = this;
       var data = this.data,
         formRules = this.rules,
         validOpts = this.validOpts;
@@ -40375,8 +40378,8 @@ function getResetValue(value, resetValue) {
       if (data && formRules) {
         itemList.forEach(function (item) {
           var field = item.field;
-          if (field && !isHiddenItem(_this8, item) && isActivetem(_this8, item)) {
-            itemValids.push(_this8.validItemRules(type || 'all', field).then(function () {
+          if (field && !isHiddenItem(_this7, item) && isActivetem(_this7, item)) {
+            itemValids.push(_this7.validItemRules(type || 'all', field).then(function () {
               item.errRule = null;
             }).catch(function (errorMaps) {
               var rest = errorMaps[field];
@@ -40396,7 +40399,7 @@ function getResetValue(value, resetValue) {
           }
         }).catch(function () {
           return new Promise(function (resolve) {
-            _this8.showErrTime = setTimeout(function () {
+            _this7.showErrTime = setTimeout(function () {
               itemList.forEach(function (item) {
                 if (item.errRule) {
                   item.showError = true;
@@ -40404,8 +40407,8 @@ function getResetValue(value, resetValue) {
               });
             }, 20);
             if (validOpts.autoPos) {
-              _this8.$nextTick(function () {
-                _this8.handleFocus(validFields);
+              _this7.$nextTick(function () {
+                _this7.handleFocus(validFields);
               });
             }
             if (callback) {
@@ -40437,7 +40440,7 @@ function getResetValue(value, resetValue) {
      *  trigger=change 触发方式
      */
     validItemRules: function validItemRules(validType, fields, val) {
-      var _this9 = this;
+      var _this8 = this;
       var data = this.data,
         formRules = this.rules;
       var errorMaps = {};
@@ -40465,7 +40468,7 @@ function getResetValue(value, resetValue) {
                     data: data,
                     field: property,
                     property: property,
-                    $form: _this9
+                    $form: _this8
                   };
                   var customValid;
                   if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(validator)) {
@@ -40525,7 +40528,7 @@ function getResetValue(value, resetValue) {
           if (errorRules.length) {
             errorMaps[property] = errorRules.map(function (rule) {
               return {
-                $form: _this9,
+                $form: _this8,
                 rule: rule,
                 data: data,
                 field: property,
@@ -40575,13 +40578,13 @@ function getResetValue(value, resetValue) {
       }
     },
     triggerItemEvent: function triggerItemEvent(evnt, field, itemValue) {
-      var _this10 = this;
+      var _this9 = this;
       if (field) {
         return this.validItemRules(evnt ? ['blur'].includes(evnt.type) ? 'blur' : 'change' : 'all', field, itemValue).then(function () {
-          _this10.clearValidate(field);
+          _this9.clearValidate(field);
         }).catch(function (errorMaps) {
           var rest = errorMaps[field];
-          var item = _this10.getItemByField(field);
+          var item = _this9.getItemByField(field);
           if (item && rest) {
             item.showError = true;
             item.errRule = rest[0].rule;
@@ -42356,7 +42359,7 @@ Icon, Column, Colgroup, Table, Grid, Toolbar, Pager, Checkbox, CheckboxGroup, Ra
 // 默认安装
 function install(Vue, options) {
   if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isPlainObject(options)) {
-    VXETable.config(options);
+    setConfig(options);
     if (options.theme) {
       setTheme(options);
     }
@@ -42367,7 +42370,7 @@ function install(Vue, options) {
 }
 
 // 默认中文
-VXETable.config({
+setConfig({
   i18n: function i18n(key, args) {
     return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFormatString(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(zh_CN, key), args);
   }