vxe-table 3.6.16 → 3.7.0-beta.0

package/lib/index.umd.js

@@ -10712,6 +10712,9 @@ var iconPrefix = 'vxe-icon-';
       showMessage: true,
       message: 'default'
     },
+    columnConfig: {
+      maxFixedSize: 4
+    },
     // menuConfig: {
     //   visibleMethod () {}
     // },
@@ -10853,6 +10856,10 @@ var iconPrefix = 'vxe-icon-';
     TOOLBAR_TOOLS_FULLSCREEN: iconPrefix + 'fullscreen',
     TOOLBAR_TOOLS_MINIMIZE: iconPrefix + 'minimize',
     TOOLBAR_TOOLS_CUSTOM: iconPrefix + 'custom-column',
+    TOOLBAR_TOOLS_FIXED_LEFT: iconPrefix + 'fixed-left',
+    TOOLBAR_TOOLS_FIXED_LEFT_ACTIVED: iconPrefix + 'fixed-left-fill',
+    TOOLBAR_TOOLS_FIXED_RIGHT: iconPrefix + 'fixed-right',
+    TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVED: iconPrefix + 'fixed-right-fill',
     // form
     FORM_PREFIX: iconPrefix + 'question-circle-fill',
     FORM_SUFFIX: iconPrefix + 'question-circle-fill',
@@ -10963,11 +10970,13 @@ var iconPrefix = 'vxe-icon-';
     // export: {
     //   types: ['csv', 'html', 'xml', 'txt']
     // },
-    // custom: {
-    //   isFooter: true
-    // },
+    custom: {
+      allowFixed: true,
+      showFooter: true
+    }
     // buttons: []
   },
+
   button: {
     // size: null,
     // transfer: false
@@ -11033,7 +11042,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.7.0-beta.0", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -12220,7 +12229,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.6.16",
+  version: "3.7.0-beta.0",
   reg: reg,
   use: use,
   setup: setup,
@@ -12320,6 +12329,8 @@ function _objectSpread2(target) {
 }
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.constructor.js
 var es_number_constructor = __webpack_require__(9653);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.fixed.js
+var es_string_fixed = __webpack_require__(9253);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.every.js
 var es_array_every = __webpack_require__(6541);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/web.timers.js
@@ -12328,8 +12339,6 @@ var web_timers = __webpack_require__(2564);
 var es_map = __webpack_require__(1532);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.date.now.js
 var es_date_now = __webpack_require__(3843);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.fixed.js
-var es_string_fixed = __webpack_require__(9253);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.js
 var es_promise = __webpack_require__(8674);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.js
@@ -12396,6 +12405,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,
@@ -12418,6 +12428,7 @@ var ColumnInfo = /*#__PURE__*/function () {
       colSpan: 1,
       order: null,
       sortTime: 0,
+      customOrder: 0,
       renderWidth: 0,
       renderHeight: 0,
       resizeWidth: 0,
@@ -12746,6 +12757,21 @@ function handleFieldOrColumn(_vm, fieldOrColumn) {
   }
   return null;
 }
+function getRootColumn($xetable, column) {
+  var fullColumnIdData = $xetable.fullColumnIdData;
+  if (!column) {
+    return null;
+  }
+  var parentColId = column.parentId;
+  while (fullColumnIdData[parentColId]) {
+    var _column = fullColumnIdData[parentColId].column;
+    parentColId = _column.parentId;
+    if (!parentColId) {
+      return _column;
+    }
+  }
+  return column;
+}
 function queryCellElement(cell, selector) {
   return cell.querySelector('.vxe-cell' + selector);
 }
@@ -14813,7 +14839,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 +14920,7 @@ var Cell = {
       on = {
         click: function click(evnt) {
           if (!isDisabled && isVisible) {
+            evnt.stopPropagation();
             $table.triggerRadioRowEvent(evnt, params);
           }
         }
@@ -14953,6 +14981,7 @@ var Cell = {
       on = {
         click: function click(evnt) {
           if (!isAllCheckboxDisabled) {
+            evnt.stopPropagation();
             $table.triggerCheckAllEvent(evnt, !isAllCheckboxSelected);
           }
         }
@@ -15014,6 +15043,7 @@ var Cell = {
       on = {
         click: function click(evnt) {
           if (!isDisabled && isVisible) {
+            evnt.stopPropagation();
             $table.triggerCheckRowEvent(evnt, params, !isChecked);
           }
         }
@@ -15087,6 +15117,7 @@ var Cell = {
       on = {
         click: function click(evnt) {
           if (!isDisabled && isVisible) {
+            evnt.stopPropagation();
             $table.triggerCheckRowEvent(evnt, params, !isChecked);
           }
         }
@@ -15169,6 +15200,7 @@ var Cell = {
       }],
       on: {
         click: function click(evnt) {
+          evnt.stopPropagation();
           $table.triggerRowExpandEvent(evnt, params);
         }
       }
@@ -16519,7 +16551,7 @@ var Methods = {
    */
   isUpdateByRow: function isUpdateByRow(row, field) {
     var _this16 = this;
-    var visibleColumn = this.visibleColumn,
+    var tableFullColumn = this.tableFullColumn,
       keepSource = this.keepSource,
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts,
@@ -16549,8 +16581,8 @@ var Methods = {
         if (arguments.length > 1) {
           return !eqCellValue(oRow, row, field);
         }
-        for (var index = 0, len = visibleColumn.length; index < len; index++) {
-          property = visibleColumn[index].field;
+        for (var index = 0, len = tableFullColumn.length; index < len; index++) {
+          property = tableFullColumn[index].field;
           if (property && !eqCellValue(oRow, row, property)) {
             return true;
           }
@@ -17042,8 +17074,9 @@ var Methods = {
    */
   setColumnFixed: function setColumnFixed(fieldOrColumn, fixed) {
     var column = handleFieldOrColumn(this, fieldOrColumn);
-    if (column && column.fixed !== fixed) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], function (column) {
+    var targetColumn = getRootColumn(this, column);
+    if (targetColumn && targetColumn.fixed !== fixed) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([targetColumn], function (column) {
         column.fixed = fixed;
       });
       this.saveCustomFixed();
@@ -17056,8 +17089,9 @@ var Methods = {
    */
   clearColumnFixed: function clearColumnFixed(fieldOrColumn) {
     var column = handleFieldOrColumn(this, fieldOrColumn);
-    if (column && column.fixed) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], function (column) {
+    var targetColumn = getRootColumn(this, column);
+    if (targetColumn && targetColumn.fixed) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([targetColumn], function (column) {
         column.fixed = null;
       });
       this.saveCustomFixed();
@@ -17115,14 +17149,15 @@ var Methods = {
    * 如果已关联工具栏，则会同步更新
    */
   resetColumn: function resetColumn(options) {
-    var customOpts = this.customOpts;
+    var collectColumn = this.collectColumn,
+      customOpts = this.customOpts;
     var checkMethod = customOpts.checkMethod;
     var opts = Object.assign({
       visible: true,
       resizable: options === true,
       fixed: options === true
     }, options);
-    this.tableFullColumn.forEach(function (column) {
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, function (column) {
       if (opts.resizable) {
         column.resizeWidth = 0;
       }
@@ -17204,7 +17239,15 @@ var Methods = {
       if (isCustomOrder) {
         var columnOrderStorage = getCustomStorageMap(orderStorageKey)[id];
         if (columnOrderStorage) {
-          // 开发中...
+          // const colOrderSeqs = columnOrderStorage.split(',')
+          // colOrderSeqs.forEach((orderConf) => {
+          //   const [colKey, order] = orderConf.split('|')
+          //   if (customMap[colKey]) {
+          //     customMap[colKey].order = order
+          //   } else {
+          //     customMap[colKey] = { order }
+          //   }
+          // })
         }
       }
       if (isCustomVisible) {
@@ -17245,7 +17288,8 @@ var Methods = {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(customMap, function (_ref5, field) {
         var visible = _ref5.visible,
           resizeWidth = _ref5.resizeWidth,
-          fixed = _ref5.fixed;
+          fixed = _ref5.fixed,
+          order = _ref5.order;
         var column = keyMap[field];
         if (column) {
           if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(resizeWidth)) {
@@ -17257,6 +17301,9 @@ var Methods = {
           if (fixed) {
             column.fixed = fixed;
           }
+          if (order) {
+            column.colSeq = order;
+          }
         }
       });
     }
@@ -21216,6 +21263,7 @@ var Loading = Object.assign(loading, {
 
 
 
+
 
 
 /**
@@ -21924,6 +21972,23 @@ function handleUupdateResize(_vm) {
     customOpts: function customOpts() {
       return Object.assign({}, conf.table.customConfig, this.customConfig);
     },
+    fixedColumnSize: function fixedColumnSize() {
+      var tableFullColumn = this.tableFullColumn;
+      var fixedSize = 0;
+      tableFullColumn.forEach(function (column) {
+        if (column.fixed) {
+          fixedSize++;
+        }
+      });
+      return fixedSize;
+    },
+    isMaxFixedColumn: function isMaxFixedColumn() {
+      var maxFixedSize = this.columnOpts.maxFixedSize;
+      if (maxFixedSize) {
+        return this.fixedColumnSize >= maxFixedSize;
+      }
+      return false;
+    },
     tableBorder: function tableBorder() {
       var border = this.border;
       if (border === true) {
@@ -30216,8 +30281,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 +30349,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 +30372,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 +30442,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 +30467,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 +30581,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 +31386,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 +33020,8 @@ var column_props = {
     type: Boolean,
     "default": null
   },
+  // 表头单元格数据导出方法
+  headerExportMethod: Function,
   // 单元格数据导出方法
   exportMethod: Function,
   // 表尾单元格数据导出方法
@@ -34251,6 +34323,7 @@ var Grid = Object.assign(grid, {
 
 
 
+
 
 
 var renderDropdowns = function renderDropdowns(h, _vm, item, isBtn) {
@@ -34416,6 +34489,7 @@ function renderCustoms(h, _vm) {
     customStore = _vm.customStore,
     customOpts = _vm.customOpts,
     columns = _vm.columns;
+  var isMaxFixedColumn = $xetable ? $xetable.isMaxFixedColumn : true;
   var cols = [];
   var customBtnOns = {};
   var customWrapperOns = {};
@@ -34432,7 +34506,7 @@ function renderCustoms(h, _vm) {
     // 点击触发
     customBtnOns.click = _vm.handleClickSettingEvent;
   }
-  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(columns, function (column) {
+  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(columns, function (column, index, items, path, parent) {
     var colTitle = utils.formatText(column.getTitle(), 1);
     var colKey = column.getKey();
     var isColGroup = column.children && column.children.length;
@@ -34444,7 +34518,11 @@ function renderCustoms(h, _vm) {
       var isIndeterminate = column.halfVisible;
       cols.push(h('li', {
         "class": ['vxe-custom--option', "level--".concat(column.level), {
-          'is--group': isColGroup,
+          'is--group': isColGroup
+        }]
+      }, [h('div', {
+        title: colTitle,
+        "class": ['vxe-custom--checkbox-option', {
           'is--checked': isChecked,
           'is--indeterminate': isIndeterminate,
           'is--disabled': isDisabled
@@ -34463,7 +34541,35 @@ function renderCustoms(h, _vm) {
         "class": ['vxe-checkbox--icon', isIndeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
       }), h('span', {
         "class": 'vxe-checkbox--label'
-      }, colTitle)]));
+      }, colTitle)]), !parent && customOpts.allowFixed ? h('div', {
+        "class": 'vxe-custom--fixed-option'
+      }, [h('span', {
+        "class": ['vxe-custom--fixed-left-option', column.fixed === 'left' ? conf.icon.TOOLBAR_TOOLS_FIXED_LEFT_ACTIVED : conf.icon.TOOLBAR_TOOLS_FIXED_LEFT, {
+          'is--checked': column.fixed === 'left',
+          'is--disabled': isMaxFixedColumn && !column.fixed
+        }],
+        attrs: {
+          title: conf.i18n(column.fixed === 'left' ? 'vxe.toolbar.cancelfixed' : 'vxe.toolbar.fixedLeft')
+        },
+        on: {
+          click: function click() {
+            _vm.changeFixedOption(column, 'left');
+          }
+        }
+      }), h('span', {
+        "class": ['vxe-custom--fixed-right-option', column.fixed === 'right' ? conf.icon.TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVED : conf.icon.TOOLBAR_TOOLS_FIXED_RIGHT, {
+          'is--checked': column.fixed === 'right',
+          'is--disabled': isMaxFixedColumn && !column.fixed
+        }],
+        attrs: {
+          title: conf.i18n(column.fixed === 'right' ? 'vxe.toolbar.cancelfixed' : 'vxe.toolbar.fixedRight')
+        },
+        on: {
+          click: function click() {
+            _vm.changeFixedOption(column, 'right');
+          }
+        }
+      })]) : null]));
     }
   });
   var isAllChecked = customStore.isAll;
@@ -34487,7 +34593,9 @@ function renderCustoms(h, _vm) {
   }, [h('ul', {
     "class": 'vxe-custom--header'
   }, [h('li', {
-    "class": ['vxe-custom--option', {
+    "class": 'vxe-custom--option'
+  }, [h('div', {
+    "class": ['vxe-custom--checkbox-option', {
       'is--checked': isAllChecked,
       'is--indeterminate': isAllIndeterminate
     }],
@@ -34501,22 +34609,22 @@ function renderCustoms(h, _vm) {
     "class": ['vxe-checkbox--icon', isAllIndeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
   }), h('span', {
     "class": 'vxe-checkbox--label'
-  }, conf.i18n('vxe.toolbar.customAll'))])]), h('ul', {
+  }, conf.i18n('vxe.toolbar.customAll'))])])]), h('ul', {
     "class": 'vxe-custom--body',
     on: customWrapperOns
-  }, cols), customOpts.isFooter === false ? null : h('div', {
+  }, cols), customOpts.showFooter || customOpts.isFooter ? h('div', {
     "class": 'vxe-custom--footer'
   }, [h('button', {
-    "class": 'btn--confirm',
-    on: {
-      click: _vm.confirmCustomEvent
-    }
-  }, conf.i18n('vxe.toolbar.customConfirm')), h('button', {
     "class": 'btn--reset',
     on: {
       click: _vm.resetCustomEvent
     }
-  }, conf.i18n('vxe.toolbar.customRestore'))])])]);
+  }, customOpts.resetButtonText || conf.i18n('vxe.toolbar.customRestore')), h('button', {
+    "class": 'btn--confirm',
+    on: {
+      click: _vm.confirmCustomEvent
+    }
+  }, customOpts.confirmButtonText || conf.i18n('vxe.toolbar.customConfirm'))]) : null])]);
 }
 /* harmony default export */ const toolbar = ({
   name: 'VxeToolbar',
@@ -34779,6 +34887,16 @@ function renderCustoms(h, _vm) {
       }
       this.checkCustomStatus();
     },
+    changeFixedOption: function changeFixedOption(column, colFixed) {
+      var $xetable = this.$xetable;
+      if (column.fixed === colFixed) {
+        $xetable.clearColumnFixed(column);
+      } else {
+        if (!$xetable.isMaxFixedColumn || column.fixed) {
+          $xetable.setColumnFixed(column, colFixed);
+        }
+      }
+    },
     handleOptionCheck: function handleOptionCheck(column) {
       var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(this.columns, function (item) {
         return item === column;
@@ -37777,11 +37895,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 +37921,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 +37942,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 +37963,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 +37971,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 +38003,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 +38126,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;
           }
         });
       }
@@ -39358,7 +39496,8 @@ var Pulldown = Object.assign(pulldown, {
       customTitle: '列设置',
       customAll: '全部',
       customConfirm: '确认',
-      customRestore: '重置'
+      customRestore: '重置',
+      maxFixedCol: '最大固定列的数量不能超过 {0} 个'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',
@@ -39467,7 +39606,10 @@ var Pulldown = Object.assign(pulldown, {
       custom: '列设置',
       customAll: '全部',
       customConfirm: '确认',
-      customRestore: '还原'
+      customRestore: '重置',
+      fixedLeft: '固定在左侧',
+      fixedRight: '固定在右侧',
+      cancelfixed: '取消固定'
     },
     input: {
       date: {