vxe-table 4.4.6 → 4.5.0-beta.2

package/lib/index.umd.js

@@ -1952,6 +1952,9 @@ const GlobalConfig = {
       showMessage: true,
       message: 'default'
     },
+    columnConfig: {
+      maxFixedSize: 4
+    },
     // menuConfig: {
     //   visibleMethod () {}
     // },
@@ -2093,6 +2096,10 @@ const GlobalConfig = {
     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',
@@ -2203,11 +2210,13 @@ const GlobalConfig = {
     // export: {
     //   types: ['csv', 'html', 'xml', 'txt']
     // },
-    // custom: {
-    //   isFooter: true
-    // },
+    custom: {
+      allowFixed: true,
+      showFooter: true
+    }
     // buttons: []
   },
+
   button: {
     // size: null,
     // transfer: false
@@ -2263,7 +2272,7 @@ const GlobalConfig = {
 ;// CONCATENATED MODULE: ./packages/tools/log.ts
 
 function getLog(message, params) {
-  return `[vxe-table v${"4.4.6"}] ${conf.i18n(message, params)}`;
+  return `[vxe-table v${"4.5.0-beta.1"}] ${conf.i18n(message, params)}`;
 }
 function outLog(type) {
   return function (message, params) {
@@ -2398,7 +2407,7 @@ class ColumnInfo {
   } = {}) {
     _defineProperty(this, "title", void 0);
     _defineProperty(this, "type", void 0);
-    _defineProperty(this, "property", void 0);
+    _defineProperty(this, "field", void 0);
     const $xegrid = $xetable.xegrid;
     const formatter = _vm.formatter;
     const visible = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.visible) ? _vm.visible : true;
@@ -2498,11 +2507,18 @@ class ColumnInfo {
       checked: false,
       halfChecked: false,
       disabled: false,
+      // 分组层级
       level: 1,
+      // 跨行
       rowSpan: 1,
+      // 跨列
       colSpan: 1,
+      // 数据排序-自定义排序
       order: null,
+      // 数据排序-用于多列的先后顺序
       sortTime: 0,
+      // 列排序
+      customOrder: 0,
       renderWidth: 0,
       renderHeight: 0,
       resizeWidth: 0,
@@ -2966,6 +2982,26 @@ function destroyColumn($xetable, column) {
   }
   reactData.staticColumns = staticColumns.slice(0);
 }
+function getRootColumn($xetable, column) {
+  const {
+    internalData
+  } = $xetable;
+  const {
+    fullColumnIdData
+  } = internalData;
+  if (!column) {
+    return null;
+  }
+  let parentColId = column.parentId;
+  while (fullColumnIdData[parentColId]) {
+    const column = fullColumnIdData[parentColId].column;
+    parentColId = column.parentId;
+    if (!parentColId) {
+      return column;
+    }
+  }
+  return column;
+}
 function mergeBodyMethod(mergeList, _rowIndex, _columnIndex) {
   for (let mIndex = 0; mIndex < mergeList.length; mIndex++) {
     const {
@@ -4070,7 +4106,7 @@ const config = new VXETableConfig();
 const v = 'v4';
 const VXETable = {
   v,
-  version: "4.4.6",
+  version: "4.5.0-beta.1",
   setup: setup,
   interceptor: interceptor,
   renderer: renderer,
@@ -5937,7 +5973,7 @@ const editHook = {
             $columnIndex: $xetable.getVMColumnIndex(column)
           }, evnt || null);
         }
-        return $xetable.clearValidate ? $xetable.clearValidate() : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
       /**
        * 清除所选中源状态
@@ -6137,7 +6173,7 @@ const editHook = {
                 setCellValue(row, oldColumn, oldModel.value);
               }
               if ($xetable.clearValidate) {
-                $xetable.clearValidate();
+                $xetable.clearValidate(row, column);
               }
             }
             column.renderHeight = cell.offsetHeight;
@@ -12832,7 +12868,8 @@ const tableExportHook = {
       computeCustomOpts,
       computeSeqOpts,
       computeRadioOpts,
-      computeCheckboxOpts
+      computeCheckboxOpts,
+      computeColumnOpts
     } = $xetable.getComputeMaps();
     const $xegrid = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('$xegrid', null);
     const hasTreeChildren = row => {
@@ -12855,11 +12892,11 @@ const tableExportHook = {
       return $xetable.getRowSeq(row);
     };
     function getHeaderTitle(opts, column) {
-      const {
-        headerExportMethod
-      } = column;
-      return headerExportMethod ? headerExportMethod({
+      const columnOpts = computeColumnOpts.value;
+      const headExportMethod = column.headerExportMethod || columnOpts.headerExportMethod;
+      return headExportMethod ? headExportMethod({
         column,
+        options: opts,
         $table: $xetable
       }) : (opts.original ? column.property : column.getTitle()) || '';
     }
@@ -12877,6 +12914,7 @@ const tableExportHook = {
       const radioOpts = computeRadioOpts.value;
       const checkboxOpts = computeCheckboxOpts.value;
       const treeOpts = computeTreeOpts.value;
+      const columnOpts = computeColumnOpts.value;
       if (!htmlCellElem) {
         htmlCellElem = document.createElement('div');
       }
@@ -12898,15 +12936,18 @@ const tableExportHook = {
             columns.forEach((column, $columnIndex) => {
               let cellValue = '';
               const renderOpts = column.editRender || column.cellRender;
-              let exportLabelMethod = column.exportMethod;
-              if (!exportLabelMethod && renderOpts && renderOpts.name) {
+              let bodyExportMethod = column.exportMethod;
+              if (!bodyExportMethod && renderOpts && renderOpts.name) {
                 const compConf = VXETable.renderer.get(renderOpts.name);
                 if (compConf) {
-                  exportLabelMethod = compConf.exportMethod;
+                  bodyExportMethod = compConf.exportMethod;
                 }
               }
-              if (exportLabelMethod) {
-                cellValue = exportLabelMethod({
+              if (!bodyExportMethod) {
+                bodyExportMethod = columnOpts.exportMethod;
+              }
+              if (bodyExportMethod) {
+                cellValue = bodyExportMethod({
                   $table: $xetable,
                   row,
                   column,
@@ -13033,16 +13074,20 @@ const tableExportHook = {
       return getLabelData(opts, columns, datas);
     };
     const getFooterCellValue = (opts, items, column) => {
+      const columnOpts = computeColumnOpts.value;
       const renderOpts = column.editRender || column.cellRender;
-      let exportLabelMethod = column.footerExportMethod;
-      if (!exportLabelMethod && renderOpts && renderOpts.name) {
+      let footLabelMethod = column.footerExportMethod;
+      if (!footLabelMethod && renderOpts && renderOpts.name) {
         const compConf = VXETable.renderer.get(renderOpts.name);
         if (compConf) {
-          exportLabelMethod = compConf.footerExportMethod;
+          footLabelMethod = compConf.footerExportMethod;
         }
       }
+      if (!footLabelMethod) {
+        footLabelMethod = columnOpts.footerExportMethod;
+      }
       const _columnIndex = $xetable.getVTColumnIndex(column);
-      const cellValue = exportLabelMethod ? exportLabelMethod({
+      const cellValue = footLabelMethod ? footLabelMethod({
         $table: $xetable,
         items,
         itemIndex: _columnIndex,
@@ -14580,6 +14625,7 @@ const Keyboard = VxeModuleKeyboard;
 
 
 
+
 /**
  * 校验规则
  */
@@ -14638,9 +14684,7 @@ const validatorHook = {
             type: 'valid-error',
             trigger: 'call'
           }).then(() => {
-            setTimeout(() => {
-              resolve(validatorPrivateMethods.showValidTooltip(params));
-            }, 10);
+            resolve(validatorPrivateMethods.showValidTooltip(params));
           });
         }
       });
@@ -14686,6 +14730,7 @@ const validatorHook = {
       internalData._lastCallTime = Date.now();
       validRuleErr = false; // 如果为快速校验，当存在某列校验不通过时将终止执行
       validatorMethods.clearValidate();
+      const validErrMaps = {};
       if (editRules) {
         const columns = $xetable.getColumns();
         const handleVaild = row => {
@@ -14710,6 +14755,12 @@ const validatorHook = {
                   if (!validRest[column.property]) {
                     validRest[column.property] = [];
                   }
+                  validErrMaps[`${getRowid($xetable, row)}:${column.id}`] = {
+                    column,
+                    row,
+                    rule,
+                    content: rule.content
+                  };
                   validRest[column.property].push(rest);
                   if (!isFull) {
                     validRuleErr = true;
@@ -14728,6 +14779,7 @@ const validatorHook = {
         }
         return Promise.all(rowValids).then(() => {
           const ruleProps = Object.keys(validRest);
+          reactData.validErrorMaps = validErrMaps;
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
             if (ruleProps.length) {
               return Promise.reject(validRest[ruleProps[0]][0]);
@@ -14766,6 +14818,7 @@ const validatorHook = {
             const row = firstErrParams.row;
             const rowIndex = afterFullData.indexOf(row);
             const locatRow = rowIndex > 0 ? afterFullData[rowIndex - 1] : row;
+            reactData.validErrorMaps = validErrMaps;
             if (validOpts.autoPos === false) {
               finish();
             } else {
@@ -14778,6 +14831,7 @@ const validatorHook = {
           });
         });
       }
+      // reactData.validErrorMaps = validErrMaps
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
         if (cb) {
           cb();
@@ -14797,17 +14851,36 @@ const validatorHook = {
       validate(rows, cb) {
         return beginValidate(rows, cb);
       },
-      clearValidate() {
-        const {
-          validStore
-        } = reactData;
-        Object.assign(validStore, {
-          visible: false,
-          row: null,
-          column: null,
-          content: '',
-          rule: null
-        });
+      clearValidate(rows, fieldOrColumn) {
+        const rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows) ? rows : rows ? [rows] : [];
+        const colList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrColumn) ? fieldOrColumn : (fieldOrColumn ? [fieldOrColumn] : []).map(column => handleFieldOrColumn($xetable, column));
+        let validErrMaps = {};
+        if (rowList.length && colList.length) {
+          validErrMaps = Object.assign({}, reactData.validErrorMaps);
+          rowList.forEach(row => {
+            colList.forEach(column => {
+              const vaildKey = `${getRowid($xetable, row)}:${column.id}`;
+              if (validErrMaps[vaildKey]) {
+                delete validErrMaps[vaildKey];
+              }
+            });
+          });
+        } else if (rowList.length) {
+          const rowidList = rowList.map(row => `${getRowid($xetable, row)}`);
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(reactData.validErrorMaps, (item, key) => {
+            if (rowidList.indexOf(key.split(':')[0]) > -1) {
+              validErrMaps[key] = item;
+            }
+          });
+        } else if (colList.length) {
+          const colidList = colList.map(column => `${column.id}`);
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(reactData.validErrorMaps, (item, key) => {
+            if (colidList.indexOf(key.split(':')[1]) > -1) {
+              validErrMaps[key] = item;
+            }
+          });
+        }
+        reactData.validErrorMaps = validErrMaps;
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       }
     };
@@ -14942,10 +15015,10 @@ const validatorHook = {
           editRules
         } = props;
         const {
-          property
+          field
         } = column;
-        if (property && editRules) {
-          const rules = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(editRules, property);
+        if (field && editRules) {
+          const rules = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(editRules, field);
           return rules && !!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().find(rules, rule => type === 'all' || !rule.trigger || type === rule.trigger);
         }
         return false;
@@ -14959,8 +15032,7 @@ const validatorHook = {
           editRules
         } = props;
         const {
-          editStore,
-          validStore
+          editStore
         } = reactData;
         const {
           actived
@@ -14975,9 +15047,7 @@ const validatorHook = {
           if (validatorPrivateMethods.hasCellRules(type, row, column)) {
             return validatorPrivateMethods.validCellRules(type, row, column).then(() => {
               if (editOpts.mode === 'row') {
-                if (validStore.visible && validStore.row === row && validStore.column === column) {
-                  validatorMethods.clearValidate();
-                }
+                validatorMethods.clearValidate(row, column);
               }
             }).catch(({
               rule
@@ -15006,22 +15076,17 @@ const validatorHook = {
         const {
           validStore
         } = reactData;
-        const {
-          rule,
-          row,
-          column
-        } = params;
-        const content = rule.content;
-        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
-          Object.assign(validStore, {
-            row,
-            column,
-            rule,
-            content,
-            visible: true
-          });
-          $xetable.dispatchEvent('valid-error', params, null);
+        validStore.visible = true;
+        reactData.validErrorMaps = Object.assign({}, reactData.validErrorMaps, {
+          [`${getRowid($xetable, params.row)}:${params.column.id}`]: {
+            column: params.column,
+            row: params.row,
+            rule: params.rule,
+            content: params.rule.content
+          }
         });
+        $xetable.dispatchEvent('valid-error', params, null);
+        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       }
     };
     return {
@@ -18093,7 +18158,7 @@ dynamicApp.component(grid.name, grid);
         }
       }
     };
-    const changeCustomOption = column => {
+    const changeCheckboxOption = column => {
       const isChecked = !column.visible;
       const customOpts = computeCustomOpts.value;
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], item => {
@@ -18106,6 +18171,19 @@ dynamicApp.component(grid.name, grid);
       }
       checkCustomStatus();
     };
+    const changeFixedOption = (column, colFixed) => {
+      const {
+        computeIsMaxFixedColumn
+      } = $xetable.getComputeMaps();
+      const isMaxFixedColumn = computeIsMaxFixedColumn.value;
+      if (column.fixed === colFixed) {
+        $xetable.clearColumnFixed(column);
+      } else {
+        if (!isMaxFixedColumn || column.fixed) {
+          $xetable.setColumnFixed(column, colFixed);
+        }
+      }
+    };
     const allCustomEvent = () => {
       const {
         columns
@@ -18404,16 +18482,19 @@ dynamicApp.component(grid.name, grid);
         columns
       } = reactData;
       const customOpts = computeCustomOpts.value;
+      let isMaxFixedColumn = true;
       const colVNs = [];
       const customBtnOns = {};
       const customWrapperOns = {};
       let checkMethod;
       if ($xetable) {
         const {
-          computeCustomOpts: computeTableCustomOpts
+          computeCustomOpts: computeTableCustomOpts,
+          computeIsMaxFixedColumn
         } = $xetable.getComputeMaps();
         const tableCustomOpts = computeTableCustomOpts.value;
         checkMethod = tableCustomOpts.checkMethod;
+        isMaxFixedColumn = computeIsMaxFixedColumn.value;
       }
       if (customOpts.trigger === 'manual') {
         // 手动触发
@@ -18427,7 +18508,7 @@ dynamicApp.component(grid.name, grid);
         // 点击触发
         customBtnOns.onClick = handleClickSettingEvent;
       }
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(columns, column => {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(columns, (column, index, items, path, parent) => {
         const colTitle = formatText(column.getTitle(), 1);
         const colKey = column.getKey();
         const isColGroup = column.children && column.children.length;
@@ -18439,22 +18520,45 @@ dynamicApp.component(grid.name, grid);
           const isIndeterminate = column.halfVisible;
           colVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('li', {
             class: ['vxe-custom--option', `level--${column.level}`, {
-              'is--group': isColGroup,
+              'is--group': isColGroup
+            }]
+          }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+            title: colTitle,
+            class: ['vxe-custom--checkbox-option', {
               'is--checked': isChecked,
               'is--indeterminate': isIndeterminate,
               'is--disabled': isDisabled
             }],
-            title: colTitle,
             onClick: () => {
               if (!isDisabled) {
-                changeCustomOption(column);
+                changeCheckboxOption(column);
               }
             }
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
             class: ['vxe-checkbox--icon', isIndeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
           }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
             class: 'vxe-checkbox--label'
-          }, colTitle)]));
+          }, colTitle)]), !parent && customOpts.allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+            class: 'vxe-custom--fixed-option'
+          }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.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
+            }],
+            title: conf.i18n(column.fixed === 'left' ? 'vxe.toolbar.cancelfixed' : 'vxe.toolbar.fixedLeft'),
+            onClick: () => {
+              changeFixedOption(column, 'left');
+            }
+          }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.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
+            }],
+            title: conf.i18n(column.fixed === 'right' ? 'vxe.toolbar.cancelfixed' : 'vxe.toolbar.fixedRight'),
+            onClick: () => {
+              changeFixedOption(column, 'right');
+            }
+          })]) : null]));
         }
       });
       const isAllChecked = customStore.isAll;
@@ -18474,7 +18578,9 @@ dynamicApp.component(grid.name, grid);
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('ul', {
         class: 'vxe-custom--header'
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('li', {
-        class: ['vxe-custom--option', {
+        class: 'vxe-custom--option'
+      }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        class: ['vxe-custom--checkbox-option', {
           'is--checked': isAllChecked,
           'is--indeterminate': isAllIndeterminate
         }],
@@ -18484,18 +18590,18 @@ dynamicApp.component(grid.name, grid);
         class: ['vxe-checkbox--icon', isAllIndeterminate ? conf.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? conf.icon.TABLE_CHECKBOX_CHECKED : conf.icon.TABLE_CHECKBOX_UNCHECKED]
       }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
         class: 'vxe-checkbox--label'
-      }, conf.i18n('vxe.toolbar.customAll'))])]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('ul', {
+      }, conf.i18n('vxe.toolbar.customAll'))])])]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('ul', {
         class: 'vxe-custom--body',
         ...customWrapperOns
-      }, colVNs), customOpts.isFooter === false ? null : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }, colVNs), customOpts.showFooter || customOpts.isFooter ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-custom--footer'
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('button', {
-        class: 'btn--confirm',
-        onClick: confirmCustomEvent
-      }, conf.i18n('vxe.toolbar.customConfirm')), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('button', {
         class: 'btn--reset',
         onClick: resetCustomEvent
-      }, conf.i18n('vxe.toolbar.customRestore'))])])]);
+      }, customOpts.resetButtonText || conf.i18n('vxe.toolbar.customRestore')), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('button', {
+        class: 'btn--confirm',
+        onClick: confirmCustomEvent
+      }, customOpts.confirmButtonText || conf.i18n('vxe.toolbar.customConfirm'))]) : null])]);
     };
     toolbarMethods = {
       dispatchEvent(type, params, evnt) {
@@ -23048,8 +23154,8 @@ const lineOffsetSizes = {
         currentColumn,
         mergeList,
         editStore,
-        validStore,
-        isAllOverflow
+        isAllOverflow,
+        validErrorMaps
       } = tableReactData;
       const {
         afterFullData
@@ -23096,7 +23202,7 @@ const lineOffsetSizes = {
       let isDirty;
       const tdOns = {};
       const cellAlign = align || allAlign;
-      const hasValidError = validStore.row === row && validStore.column === column;
+      const errorValidItem = validErrorMaps[`${rowid}:${column.id}`];
       const showValidTip = editRules && validOpts.showMessage;
       const attrs = {
         colid: column.id
@@ -23240,15 +23346,15 @@ const lineOffsetSizes = {
           },
           title: showTitle ? $xetable.getCellLabel(row, column) : null
         }, column.renderCell(params)));
-        if (showValidTip && hasValidError) {
+        if (showValidTip && errorValidItem) {
           tdVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
             class: 'vxe-cell--valid',
-            style: validStore.rule && validStore.rule.maxWidth ? {
-              width: `${validStore.rule.maxWidth}px`
+            style: errorValidItem.rule && errorValidItem.rule.maxWidth ? {
+              width: `${errorValidItem.rule.maxWidth}px`
             } : null
           }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
             class: 'vxe-cell--valid-msg'
-          }, validStore.content)]));
+          }, errorValidItem.content)]));
         }
       }
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
@@ -23262,7 +23368,7 @@ const lineOffsetSizes = {
           'fixed--hidden': fixedHiddenColumn,
           'col--dirty': isDirty,
           'col--actived': editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row'),
-          'col--valid-error': hasValidError,
+          'col--valid-error': !!errorValidItem,
           'col--current': currentColumn === column
         }, getPropClass(compCellClassName, params), getPropClass(className, params), getPropClass(allCellClassName, params)],
         key: columnKey || columnOpts.useKey ? column.id : $columnIndex,
@@ -24870,13 +24976,9 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
       },
       // 存放数据校验相关信息
       validStore: {
-        visible: false,
-        row: null,
-        column: null,
-        content: '',
-        rule: null,
-        isArrow: false
+        visible: false
       },
+      validErrorMaps: {},
       // 导入相关信息
       importStore: {
         inited: false,
@@ -24980,6 +25082,7 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
       // 总的缓存数据集
       fullAllDataRowIdData: {},
       // 渲染中缓存数据
+      sourceDataRowIdData: {},
       fullDataRowIdData: {},
       fullColumnIdData: {},
       fullColumnFieldData: {},
@@ -25154,6 +25257,29 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
     const computeCustomOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return Object.assign({}, conf.table.customConfig, props.customConfig);
     });
+    const computeFixedColumnSize = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const {
+        tableFullColumn
+      } = internalData;
+      let fixedSize = 0;
+      tableFullColumn.forEach(column => {
+        if (column.fixed) {
+          fixedSize++;
+        }
+      });
+      return fixedSize;
+    });
+    const computeIsMaxFixedColumn = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const fixedColumnSize = computeFixedColumnSize.value;
+      const columnOpts = computeColumnOpts.value;
+      const {
+        maxFixedSize
+      } = columnOpts;
+      if (maxFixedSize) {
+        return fixedColumnSize >= maxFixedSize;
+      }
+      return false;
+    });
     const computeTableBorder = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const {
         border
@@ -25250,6 +25376,8 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
       computeEmptyOpts,
       computeLoadingOpts,
       computeCustomOpts,
+      computeFixedColumnSize,
+      computeIsMaxFixedColumn,
       computeIsAllCheckboxDisabled
     };
     const $xetable = {
@@ -25550,9 +25678,8 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
         if (isCustomResizable) {
           const columnWidthStorage = getCustomStorageMap(resizableStorageKey)[id];
           if (columnWidthStorage) {
-            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(columnWidthStorage, (resizeWidth, field) => {
-              customMap[field] = {
-                field,
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(columnWidthStorage, (resizeWidth, colKey) => {
+              customMap[colKey] = {
                 resizeWidth
               };
             });
@@ -25564,12 +25691,11 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
           if (columnFixedStorage) {
             const colFixeds = columnFixedStorage.split(',');
             colFixeds.forEach(fixConf => {
-              const [field, fixed] = fixConf.split('|');
-              if (customMap[field]) {
-                customMap[field].fixed = fixed;
+              const [colKey, fixed] = fixConf.split('|');
+              if (customMap[colKey]) {
+                customMap[colKey].fixed = fixed;
               } else {
-                customMap[field] = {
-                  field,
+                customMap[colKey] = {
                   fixed
                 };
               }
@@ -25580,7 +25706,15 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
         if (isCustomOrder) {
           const columnOrderStorage = getCustomStorageMap(orderStorageKey)[id];
           if (columnOrderStorage) {
-            // 开发中...
+            // const colOrderSeqs = columnOrderStorage.split(',')
+            // colOrderSeqs.forEach((orderConf: any) => {
+            //   const [colKey, order] = orderConf.split('|')
+            //   if (customMap[colKey]) {
+            //     customMap[colKey].order = order
+            //   } else {
+            //     customMap[colKey] = { order }
+            //   }
+            // })
           }
         }
         // 自定义隐藏列
@@ -25590,22 +25724,20 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
             const colVisibles = columnVisibleStorage.split('|');
             const colHides = colVisibles[0] ? colVisibles[0].split(',') : [];
             const colShows = colVisibles[1] ? colVisibles[1].split(',') : [];
-            colHides.forEach(field => {
-              if (customMap[field]) {
-                customMap[field].visible = false;
+            colHides.forEach(colKey => {
+              if (customMap[colKey]) {
+                customMap[colKey].visible = false;
               } else {
-                customMap[field] = {
-                  field,
+                customMap[colKey] = {
                   visible: false
                 };
               }
             });
-            colShows.forEach(field => {
-              if (customMap[field]) {
-                customMap[field].visible = true;
+            colShows.forEach(colKey => {
+              if (customMap[colKey]) {
+                customMap[colKey].visible = true;
               } else {
-                customMap[field] = {
-                  field,
+                customMap[colKey] = {
                   visible: true
                 };
               }
@@ -25622,9 +25754,10 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(customMap, ({
           visible,
           resizeWidth,
-          fixed
-        }, field) => {
-          const column = keyMap[field];
+          fixed,
+          order
+        }, colKey) => {
+          const column = keyMap[colKey];
           if (column) {
             if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(resizeWidth)) {
               column.resizeWidth = resizeWidth;
@@ -25635,6 +25768,9 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
             if (fixed) {
               column.fixed = fixed;
             }
+            if (order) {
+              column.customOrder = order;
+            }
           }
         });
       }
@@ -27145,7 +27281,7 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
       internalData.tableSynchData = datas;
       // 克隆原数据，用于显示编辑状态，与编辑值做对比
       if (keepSource) {
-        internalData.tableSourceData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(fullData, true);
+        tablePrivateMethods.cacheSourceMap(fullData);
       }
       if (true) {
         if (sYLoad) {
@@ -28028,43 +28164,27 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
        */
       isUpdateByRow(row, field) {
         const {
-          keepSource,
-          treeConfig
+          keepSource
         } = props;
         const {
-          visibleColumn,
-          tableSourceData,
-          fullDataRowIdData
+          tableFullColumn,
+          fullDataRowIdData,
+          sourceDataRowIdData
         } = internalData;
-        const treeOpts = computeTreeOpts.value;
         if (keepSource) {
-          let oRow, property;
           const rowid = getRowid($xetable, row);
           // 新增的数据不需要检测
           if (!fullDataRowIdData[rowid]) {
             return false;
           }
-          if (treeConfig) {
-            const children = treeOpts.children;
-            const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableSourceData, item => rowid === getRowid($xetable, item), treeOpts);
-            row = Object.assign({}, row, {
-              [children]: null
-            });
-            if (matchObj) {
-              oRow = Object.assign({}, matchObj.item, {
-                [children]: null
-              });
-            }
-          } else {
-            const oRowIndex = fullDataRowIdData[rowid].index;
-            oRow = tableSourceData[oRowIndex];
-          }
-          if (oRow) {
+          const oldRest = sourceDataRowIdData[rowid];
+          if (oldRest) {
+            const oRow = oldRest.row;
             if (arguments.length > 1) {
               return !eqCellValue(oRow, row, field);
             }
-            for (let index = 0, len = visibleColumn.length; index < len; index++) {
-              property = visibleColumn[index].field;
+            for (let index = 0, len = tableFullColumn.length; index < len; index++) {
+              const property = tableFullColumn[index].field;
               if (property && !eqCellValue(oRow, row, property)) {
                 return true;
               }
@@ -28230,8 +28350,20 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
        */
       setColumnFixed(fieldOrColumn, fixed) {
         const column = handleFieldOrColumn($xetable, fieldOrColumn);
-        if (column && column.fixed !== fixed) {
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], column => {
+        const targetColumn = getRootColumn($xetable, column);
+        const isMaxFixedColumn = computeIsMaxFixedColumn.value;
+        if (targetColumn && targetColumn.fixed !== fixed) {
+          // 是否超过最大固定列数量
+          if (!targetColumn.fixed && isMaxFixedColumn) {
+            if (VXETable.modal) {
+              VXETable.modal.message({
+                status: 'error',
+                content: conf.i18n('vxe.table.maxFixedCol')
+              });
+            }
+            return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+          }
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([targetColumn], column => {
             column.fixed = fixed;
           });
           tablePrivateMethods.saveCustomFixed();
@@ -28244,8 +28376,9 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
        */
       clearColumnFixed(fieldOrColumn) {
         const column = handleFieldOrColumn($xetable, fieldOrColumn);
-        if (column && column.fixed) {
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([column], column => {
+        const targetColumn = getRootColumn($xetable, column);
+        if (targetColumn && targetColumn.fixed) {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([targetColumn], column => {
             column.fixed = null;
           });
           tablePrivateMethods.saveCustomFixed();
@@ -28304,7 +28437,7 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
        */
       resetColumn(options) {
         const {
-          tableFullColumn
+          collectColumn
         } = internalData;
         const customOpts = computeCustomOpts.value;
         const {
@@ -28315,7 +28448,7 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
           resizable: options === true,
           fixed: options === true
         }, options);
-        tableFullColumn.forEach(column => {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, column => {
           if (opts.resizable) {
             column.resizeWidth = 0;
           }
@@ -29412,7 +29545,7 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
                     if (customVal && validStore.visible) {
                       setCellValue(row, column, cellValue);
                     }
-                    $xetable.clearValidate();
+                    $xetable.clearValidate(row, column);
                   }).catch(({
                     rule
                   }) => {
@@ -30238,7 +30371,7 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
         } = internalData;
         const rowkey = getRowkey($xetable);
         const isLazy = treeConfig && treeOpts.lazy;
-        const handleCache = (row, index, items, path, parent, nodes) => {
+        const handleRow = (row, index, items, path, parent, nodes) => {
           let rowid = getRowid($xetable, row);
           const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
           const level = nodes ? nodes.length - 1 : 0;
@@ -30270,10 +30403,40 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
         }
         fullAllDataRowIdData = internalData.fullAllDataRowIdData = {};
         if (treeConfig) {
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, handleCache, treeOpts);
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, handleRow, treeOpts);
+        } else {
+          tableFullData.forEach(handleRow);
+        }
+      },
+      cacheSourceMap(fullData) {
+        const {
+          treeConfig
+        } = props;
+        const treeOpts = computeTreeOpts.value;
+        let {
+          sourceDataRowIdData
+        } = internalData;
+        const sourceData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(fullData, true);
+        const rowkey = getRowkey($xetable);
+        sourceDataRowIdData = internalData.sourceDataRowIdData = {};
+        const handleSourceRow = row => {
+          let rowid = getRowid($xetable, row);
+          if (eqEmptyValue(rowid)) {
+            rowid = getRowUniqueId();
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, rowkey, rowid);
+          }
+          sourceDataRowIdData[rowid] = {
+            row,
+            rowid
+          };
+        };
+        // 源数据缓存
+        if (treeConfig && !treeOpts.transform) {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(sourceData, handleSourceRow, treeOpts);
         } else {
-          tableFullData.forEach(handleCache);
+          sourceData.forEach(handleSourceRow);
         }
+        internalData.tableSourceData = sourceData;
       },
       /**
        * 指定列宽的列进行拆分
@@ -32220,7 +32383,8 @@ dynamicApp.component(table.name, table);
       customTitle: '列设置',
       customAll: '全部',
       customConfirm: '确认',
-      customRestore: '还原'
+      customRestore: '重置',
+      maxFixedCol: '最大固定列的数量不能超过 {0} 个'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',
@@ -32329,7 +32493,10 @@ dynamicApp.component(table.name, table);
       custom: '列设置',
       customAll: '全部',
       customConfirm: '确认',
-      customRestore: '重置'
+      customRestore: '重置',
+      fixedLeft: '固定在左侧',
+      fixedRight: '固定在右侧',
+      cancelfixed: '取消固定'
     },
     input: {
       date: {