vxe-table 3.6.16 → 3.6.17

package/lib/index.umd.js

@@ -11033,7 +11033,7 @@ var es_array_concat = __webpack_require__(2222);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.6.16", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.6.17", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -12220,7 +12220,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.6.16",
+  version: "3.6.17",
   reg: reg,
   use: use,
   setup: setup,
@@ -12396,6 +12396,7 @@ var ColumnInfo = /*#__PURE__*/function () {
       cellRender: _vm.cellRender,
       editRender: _vm.editRender,
       contentRender: _vm.contentRender,
+      headerExportMethod: _vm.headerExportMethod,
       exportMethod: _vm.exportMethod,
       footerExportMethod: _vm.footerExportMethod,
       titleHelp: _vm.titleHelp,
@@ -14813,7 +14814,8 @@ var Cell = {
     }
     if (!trigger || trigger === 'default') {
       on.click = function (evnt) {
-        return $table.triggerTreeExpandEvent(evnt, params);
+        evnt.stopPropagation();
+        $table.triggerTreeExpandEvent(evnt, params);
       };
     }
     return [h('div', {
@@ -14893,6 +14895,7 @@ var Cell = {
       on = {
         click: function click(evnt) {
           if (!isDisabled && isVisible) {
+            evnt.stopPropagation();
             $table.triggerRadioRowEvent(evnt, params);
           }
         }
@@ -14953,6 +14956,7 @@ var Cell = {
       on = {
         click: function click(evnt) {
           if (!isAllCheckboxDisabled) {
+            evnt.stopPropagation();
             $table.triggerCheckAllEvent(evnt, !isAllCheckboxSelected);
           }
         }
@@ -15014,6 +15018,7 @@ var Cell = {
       on = {
         click: function click(evnt) {
           if (!isDisabled && isVisible) {
+            evnt.stopPropagation();
             $table.triggerCheckRowEvent(evnt, params, !isChecked);
           }
         }
@@ -15087,6 +15092,7 @@ var Cell = {
       on = {
         click: function click(evnt) {
           if (!isDisabled && isVisible) {
+            evnt.stopPropagation();
             $table.triggerCheckRowEvent(evnt, params, !isChecked);
           }
         }
@@ -15169,6 +15175,7 @@ var Cell = {
       }],
       on: {
         click: function click(evnt) {
+          evnt.stopPropagation();
           $table.triggerRowExpandEvent(evnt, params);
         }
       }
@@ -30216,8 +30223,12 @@ function getExportData($xetable, opts) {
 function getBooleanValue(cellValue) {
   return cellValue === 'TRUE' || cellValue === 'true' || cellValue === true;
 }
-function getHeaderTitle(opts, column) {
-  return (opts.original ? column.property : column.getTitle()) || '';
+function getHeaderTitle($xetable, opts, column) {
+  var headerExportMethod = column.headerExportMethod;
+  return headerExportMethod ? headerExportMethod({
+    column: column,
+    $table: $xetable
+  }) : (opts.original ? column.property : column.getTitle()) || '';
 }
 function getFooterCellValue($xetable, opts, items, column) {
   var renderOpts = column.editRender || column.cellRender;
@@ -30280,7 +30291,7 @@ function toCsv($xetable, opts, columns, datas) {
   var content = csvBOM;
   if (opts.isHeader) {
     content += columns.map(function (column) {
-      return toTxtCellLabel(getHeaderTitle(opts, column));
+      return toTxtCellLabel(getHeaderTitle($xetable, opts, column));
     }).join(',') + enterSymbol;
   }
   datas.forEach(function (row) {
@@ -30303,7 +30314,7 @@ function toTxt($xetable, opts, columns, datas) {
   var content = '';
   if (opts.isHeader) {
     content += columns.map(function (column) {
-      return toTxtCellLabel(getHeaderTitle(opts, column));
+      return toTxtCellLabel(getHeaderTitle($xetable, opts, column));
     }).join('\t') + enterSymbol;
   }
   datas.forEach(function (row) {
@@ -30373,7 +30384,7 @@ function toHtml($xetable, opts, columns, datas) {
         tables.push("<tr>".concat(cols.map(function (column) {
           var headAlign = column.headerAlign || column.align || allHeaderAlign || allAlign;
           var classNames = hasEllipsis($xetable, column, 'showHeaderOverflow', allColumnHeaderOverflow) ? ['col--ellipsis'] : [];
-          var cellTitle = getHeaderTitle(opts, column);
+          var cellTitle = getHeaderTitle($xetable, opts, column);
           var childWidth = 0;
           var countChild = 0;
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], function (item) {
@@ -30398,7 +30409,7 @@ function toHtml($xetable, opts, columns, datas) {
       tables.push("<tr>".concat(columns.map(function (column) {
         var headAlign = column.headerAlign || column.align || allHeaderAlign || allAlign;
         var classNames = hasEllipsis($xetable, column, 'showHeaderOverflow', allColumnHeaderOverflow) ? ['col--ellipsis'] : [];
-        var cellTitle = getHeaderTitle(opts, column);
+        var cellTitle = getHeaderTitle($xetable, opts, column);
         if (headAlign) {
           classNames.push("col--".concat(headAlign));
         }
@@ -30512,7 +30523,7 @@ function toXML($xetable, opts, columns, datas) {
   }).join('')].join('');
   if (opts.isHeader) {
     xml += "<Row>".concat(columns.map(function (column) {
-      return "<Cell><Data ss:Type=\"String\">".concat(getHeaderTitle(opts, column), "</Data></Cell>");
+      return "<Cell><Data ss:Type=\"String\">".concat(getHeaderTitle($xetable, opts, column), "</Data></Cell>");
     }).join(''), "</Row>");
   }
   datas.forEach(function (row) {
@@ -31317,6 +31328,7 @@ var mixin_convertToRows = function convertToRows(originColumns) {
         };
       }
       if (customCols) {
+        opts._isCustomColumn = true;
         groups = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().mapTree(customCols, function (item) {
           var targetColumn;
           if (item) {
@@ -32950,6 +32962,8 @@ var column_props = {
     type: Boolean,
     "default": null
   },
+  // 表头单元格数据导出方法
+  headerExportMethod: Function,
   // 单元格数据导出方法
   exportMethod: Function,
   // 表尾单元格数据导出方法
@@ -37777,11 +37791,20 @@ function getResetValue(value, resetValue) {
       }
     },
     clearValidate: function clearValidate(fieldOrItem) {
+      var _this6 = this;
       if (fieldOrItem) {
-        var item = handleFieldOrItem(this, fieldOrItem);
-        if (item) {
-          item.showError = false;
+        var fields = fieldOrItem;
+        if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrItem)) {
+          fields = [fieldOrItem];
         }
+        fields.forEach(function (field) {
+          if (field) {
+            var item = handleFieldOrItem(_this6, field);
+            if (item) {
+              item.showError = false;
+            }
+          }
+        });
       } else {
         this.getItems().forEach(function (item) {
           item.showError = false;
@@ -37794,11 +37817,17 @@ function getResetValue(value, resetValue) {
       return this.beginValidate(this.getItems(), '', callback);
     },
     validateField: function validateField(fieldOrItem, callback) {
-      var item = handleFieldOrItem(this, fieldOrItem);
-      return this.beginValidate(item ? [item] : [], '', callback);
+      var _this7 = this;
+      var fields = [];
+      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrItem)) {
+        fields = [fieldOrItem];
+      }
+      return this.beginValidate(fields.map(function (field) {
+        return handleFieldOrItem(_this7, field);
+      }), '', callback);
     },
     beginValidate: function beginValidate(itemList, type, callback) {
-      var _this6 = this;
+      var _this8 = this;
       var data = this.data,
         formRules = this.rules,
         validOpts = this.validOpts;
@@ -37809,26 +37838,17 @@ function getResetValue(value, resetValue) {
       if (data && formRules) {
         itemList.forEach(function (item) {
           var field = item.field;
-          if (field && !isHiddenItem(_this6, item) && isActivetem(_this6, item)) {
-            itemValids.push(_this6.validItemRules(type || 'all', field).then(function () {
+          if (field && !isHiddenItem(_this8, item) && isActivetem(_this8, item)) {
+            itemValids.push(_this8.validItemRules(type || 'all', field).then(function () {
               item.errRule = null;
-            })["catch"](function (_ref2) {
-              var rule = _ref2.rule,
-                rules = _ref2.rules;
-              var rest = {
-                rule: rule,
-                rules: rules,
-                data: data,
-                field: field,
-                property: field,
-                $form: _this6
-              };
+            })["catch"](function (errorMaps) {
+              var rest = errorMaps[field];
               if (!validRest[field]) {
                 validRest[field] = [];
               }
               validRest[field].push(rest);
               validFields.push(field);
-              item.errRule = rule;
+              item.errRule = rest[0].rule;
               return Promise.reject(rest);
             }));
           }
@@ -37839,7 +37859,7 @@ function getResetValue(value, resetValue) {
           }
         })["catch"](function () {
           return new Promise(function (resolve) {
-            _this6.showErrTime = setTimeout(function () {
+            _this8.showErrTime = setTimeout(function () {
               itemList.forEach(function (item) {
                 if (item.errRule) {
                   item.showError = true;
@@ -37847,8 +37867,8 @@ function getResetValue(value, resetValue) {
               });
             }, 20);
             if (validOpts.autoPos) {
-              _this6.$nextTick(function () {
-                _this6.handleFocus(validFields);
+              _this8.$nextTick(function () {
+                _this8.handleFocus(validFields);
               });
             }
             if (callback) {
@@ -37879,77 +37899,91 @@ function getResetValue(value, resetValue) {
      *  validator=Function({ itemValue, rule, rules, data, property }) 自定义校验，接收一个 Promise
      *  trigger=change 触发方式
      */
-    validItemRules: function validItemRules(validType, property, val) {
-      var _this7 = this;
+    validItemRules: function validItemRules(validType, fields, val) {
+      var _this9 = this;
       var data = this.data,
         formRules = this.rules;
-      var errorRules = [];
-      var syncVailds = [];
-      if (property && formRules) {
-        var rules = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(formRules, property);
-        if (rules) {
-          var itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(val) ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, property) : val;
-          rules.forEach(function (rule) {
-            var type = rule.type,
-              trigger = rule.trigger,
-              required = rule.required;
-            if (validType === 'all' || !trigger || validType === rule.trigger) {
-              if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rule.validator)) {
-                var customValid = rule.validator({
-                  itemValue: itemValue,
-                  rule: rule,
-                  rules: rules,
-                  data: data,
-                  field: property,
-                  property: property,
-                  $form: _this7
-                });
-                if (customValid) {
-                  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isError(customValid)) {
-                    errorRules.push(new form_Rule({
-                      type: 'custom',
-                      trigger: trigger,
-                      content: customValid.message,
-                      rule: new form_Rule(rule)
-                    }));
-                  } else if (customValid["catch"]) {
-                    // 如果为异步校验（注：异步校验是并发无序的）
-                    syncVailds.push(customValid["catch"](function (e) {
+      var errorMaps = {};
+      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fields)) {
+        fields = [fields];
+      }
+      return Promise.all(fields.map(function (property) {
+        var syncVailds = [];
+        var errorRules = [];
+        if (property && formRules) {
+          var rules = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(formRules, property);
+          if (rules) {
+            var itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(val) ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, property) : val;
+            rules.forEach(function (rule) {
+              var type = rule.type,
+                trigger = rule.trigger,
+                required = rule.required;
+              if (validType === 'all' || !trigger || validType === rule.trigger) {
+                if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rule.validator)) {
+                  var customValid = rule.validator({
+                    itemValue: itemValue,
+                    rule: rule,
+                    rules: rules,
+                    data: data,
+                    field: property,
+                    property: property,
+                    $form: _this9
+                  });
+                  if (customValid) {
+                    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isError(customValid)) {
                       errorRules.push(new form_Rule({
                         type: 'custom',
                         trigger: trigger,
-                        content: e ? e.message : rule.content || rule.message,
+                        content: customValid.message,
                         rule: new form_Rule(rule)
                       }));
-                    }));
+                    } else if (customValid["catch"]) {
+                      // 如果为异步校验（注：异步校验是并发无序的）
+                      syncVailds.push(customValid["catch"](function (e) {
+                        errorRules.push(new form_Rule({
+                          type: 'custom',
+                          trigger: trigger,
+                          content: e ? e.message : rule.content || rule.message,
+                          rule: new form_Rule(rule)
+                        }));
+                      }));
+                    }
                   }
-                }
-              } else {
-                var isArrType = type === 'array';
-                var isArrVal = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(itemValue);
-                var hasEmpty = true;
-                if (isArrType || isArrVal) {
-                  hasEmpty = !isArrVal || !itemValue.length;
-                } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(itemValue)) {
-                  hasEmpty = eqEmptyValue(itemValue.trim());
                 } else {
-                  hasEmpty = eqEmptyValue(itemValue);
-                }
-                if (required ? hasEmpty || form_validErrorRuleValue(rule, itemValue) : !hasEmpty && form_validErrorRuleValue(rule, itemValue)) {
-                  errorRules.push(new form_Rule(rule));
+                  var isArrType = type === 'array';
+                  var isArrVal = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(itemValue);
+                  var hasEmpty = true;
+                  if (isArrType || isArrVal) {
+                    hasEmpty = !isArrVal || !itemValue.length;
+                  } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(itemValue)) {
+                    hasEmpty = eqEmptyValue(itemValue.trim());
+                  } else {
+                    hasEmpty = eqEmptyValue(itemValue);
+                  }
+                  if (required ? hasEmpty || form_validErrorRuleValue(rule, itemValue) : !hasEmpty && form_validErrorRuleValue(rule, itemValue)) {
+                    errorRules.push(new form_Rule(rule));
+                  }
                 }
               }
-            }
-          });
+            });
+          }
         }
-      }
-      return Promise.all(syncVailds).then(function () {
-        if (errorRules.length) {
-          var rest = {
-            rules: errorRules,
-            rule: errorRules[0]
-          };
-          return Promise.reject(rest);
+        return Promise.all(syncVailds).then(function () {
+          if (errorRules.length) {
+            errorMaps[property] = errorRules.map(function (rule) {
+              return {
+                $form: _this9,
+                rule: rule,
+                data: data,
+                field: property,
+                property: property
+              };
+            });
+          }
+        });
+      })).then(function () {
+        if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isEmpty(errorMaps)) {
+          return Promise.reject(errorMaps);
         }
       });
     },
@@ -37988,16 +38022,16 @@ function getResetValue(value, resetValue) {
       }
     },
     triggerItemEvent: function triggerItemEvent(evnt, field, itemValue) {
-      var _this8 = this;
+      var _this10 = this;
       if (field) {
         return this.validItemRules(evnt ? ['blur'].includes(evnt.type) ? 'blur' : 'change' : 'all', field, itemValue).then(function () {
-          _this8.clearValidate(field);
-        })["catch"](function (_ref3) {
-          var rule = _ref3.rule;
-          var item = _this8.getItemByField(field);
-          if (item) {
+          _this10.clearValidate(field);
+        })["catch"](function (errorMaps) {
+          var rest = errorMaps[field];
+          var item = _this10.getItemByField(field);
+          if (item && rest) {
             item.showError = true;
-            item.errRule = rule;
+            item.errRule = rest[0].rule;
           }
         });
       }