vxe-table 3.6.0-beta.0 → 3.6.0-beta.11

package/lib/index.umd.js

@@ -8447,7 +8447,7 @@ function _createClass(Constructor, protoProps, staticProps) {
   return Constructor;
 }
 // CONCATENATED MODULE: ./packages/v-x-e-table/src/conf.js
-var iconPrefix = 'vxe-icon--';
+var iconPrefix = 'vxe-icon-';
 /* harmony default export */ var src_conf = ({
   size: null,
   // 全局尺寸
@@ -8457,8 +8457,7 @@ var iconPrefix = 'vxe-icon--';
   // 版本号，对于某些带数据缓存的功能有用到，上升版本号可以用于重置数据
   // resizeInterval: 500,
   emptyCell: '　',
-  loadingText: null,
-  // 自定义loading提示内容，如果为null则不显示文本
+  // loadingText: null, // 自定义loading提示内容，如果为null则不显示文本
   table: {
     fit: true,
     showHeader: true,
@@ -8577,65 +8576,70 @@ var iconPrefix = 'vxe-icon--';
   },
   icon: {
     // loading
-    // LOADING: iconPrefix + 'refresh roll vxe-loading--default-icon',
+    LOADING: iconPrefix + 'spinner roll vxe-loading--default-icon',
     // table
-    TABLE_SORT_ASC: iconPrefix + 'caret-top',
-    TABLE_SORT_DESC: iconPrefix + 'caret-bottom',
+    TABLE_SORT_ASC: iconPrefix + 'caret-up',
+    TABLE_SORT_DESC: iconPrefix + 'caret-down',
     TABLE_FILTER_NONE: iconPrefix + 'funnel',
     TABLE_FILTER_MATCH: iconPrefix + 'funnel',
-    TABLE_EDIT: iconPrefix + 'edit-outline',
-    TABLE_HELP: iconPrefix + 'question',
-    TABLE_TREE_LOADED: iconPrefix + 'refresh roll',
+    TABLE_EDIT: iconPrefix + 'edit',
+    TABLE_HELP: iconPrefix + 'question-circle-fill',
+    TABLE_TREE_LOADED: iconPrefix + 'spinner roll',
     TABLE_TREE_OPEN: iconPrefix + 'caret-right rotate90',
     TABLE_TREE_CLOSE: iconPrefix + 'caret-right',
-    TABLE_EXPAND_LOADED: iconPrefix + 'refresh roll',
+    TABLE_EXPAND_LOADED: iconPrefix + 'spinner roll',
     TABLE_EXPAND_OPEN: iconPrefix + 'arrow-right rotate90',
     TABLE_EXPAND_CLOSE: iconPrefix + 'arrow-right',
+    TABLE_CHECKBOX_CHECKED: iconPrefix + 'checkbox-checked',
+    TABLE_CHECKBOX_UNCHECKED: iconPrefix + 'checkbox-unchecked',
+    TABLE_CHECKBOX_INDETERMINATE: iconPrefix + 'checkbox-indeterminate',
+    TABLE_RADIO_CHECKED: iconPrefix + 'radio-checked',
+    TABLE_RADIO_UNCHECKED: iconPrefix + 'radio-unchecked',
     // button
-    BUTTON_DROPDOWN: iconPrefix + 'arrow-bottom',
-    BUTTON_LOADING: iconPrefix + 'refresh roll',
+    BUTTON_DROPDOWN: iconPrefix + 'arrow-down',
+    BUTTON_LOADING: iconPrefix + 'spinner roll',
     // select
-    SELECT_LOADED: iconPrefix + 'refresh roll',
-    SELECT_OPEN: iconPrefix + 'caret-bottom rotate180',
-    SELECT_CLOSE: iconPrefix + 'caret-bottom',
+    SELECT_LOADED: iconPrefix + 'spinner roll',
+    SELECT_OPEN: iconPrefix + 'caret-down rotate180',
+    SELECT_CLOSE: iconPrefix + 'caret-down',
     // pager
-    PAGER_JUMP_PREV: iconPrefix + 'd-arrow-left',
-    PAGER_JUMP_NEXT: iconPrefix + 'd-arrow-right',
+    PAGER_JUMP_PREV: iconPrefix + 'arrow-double-left',
+    PAGER_JUMP_NEXT: iconPrefix + 'arrow-double-right',
     PAGER_PREV_PAGE: iconPrefix + 'arrow-left',
     PAGER_NEXT_PAGE: iconPrefix + 'arrow-right',
-    PAGER_JUMP_MORE: iconPrefix + 'more',
+    PAGER_JUMP_MORE: iconPrefix + 'ellipsis-h',
     // input
-    INPUT_CLEAR: iconPrefix + 'close',
-    INPUT_PWD: iconPrefix + 'eye-slash',
-    INPUT_SHOW_PWD: iconPrefix + 'eye',
-    INPUT_PREV_NUM: iconPrefix + 'caret-top',
-    INPUT_NEXT_NUM: iconPrefix + 'caret-bottom',
+    INPUT_CLEAR: iconPrefix + 'error-circle-fill',
+    INPUT_PWD: iconPrefix + 'eye-fill',
+    INPUT_SHOW_PWD: iconPrefix + 'eye-fill-close',
+    INPUT_PREV_NUM: iconPrefix + 'caret-up',
+    INPUT_NEXT_NUM: iconPrefix + 'caret-down',
     INPUT_DATE: iconPrefix + 'calendar',
     INPUT_SEARCH: iconPrefix + 'search',
     // modal
     MODAL_ZOOM_IN: iconPrefix + 'square',
-    MODAL_ZOOM_OUT: iconPrefix + 'zoomout',
+    MODAL_ZOOM_OUT: iconPrefix + 'maximize',
     MODAL_CLOSE: iconPrefix + 'close',
-    MODAL_INFO: iconPrefix + 'info',
-    MODAL_SUCCESS: iconPrefix + 'success',
-    MODAL_WARNING: iconPrefix + 'warning',
-    MODAL_ERROR: iconPrefix + 'error',
-    MODAL_QUESTION: iconPrefix + 'question',
-    MODAL_LOADING: iconPrefix + 'refresh roll',
+    MODAL_INFO: iconPrefix + 'info-circle-fill',
+    MODAL_SUCCESS: iconPrefix + 'success-circle-fill',
+    MODAL_WARNING: iconPrefix + 'warnion-circle-fill',
+    MODAL_ERROR: iconPrefix + 'error-circle-fill',
+    MODAL_QUESTION: iconPrefix + 'question-circle-fill',
+    MODAL_LOADING: iconPrefix + 'spinner roll',
     // toolbar
-    TOOLBAR_TOOLS_REFRESH: iconPrefix + 'refresh',
-    TOOLBAR_TOOLS_REFRESH_LOADING: iconPrefix + 'refresh roll',
+    TOOLBAR_TOOLS_REFRESH: iconPrefix + 'repeat',
+    TOOLBAR_TOOLS_REFRESH_LOADING: iconPrefix + 'repeat roll',
     TOOLBAR_TOOLS_IMPORT: iconPrefix + 'upload',
     TOOLBAR_TOOLS_EXPORT: iconPrefix + 'download',
     TOOLBAR_TOOLS_PRINT: iconPrefix + 'print',
-    TOOLBAR_TOOLS_ZOOM_IN: iconPrefix + 'zoomin',
-    TOOLBAR_TOOLS_ZOOM_OUT: iconPrefix + 'zoomout',
-    TOOLBAR_TOOLS_CUSTOM: iconPrefix + 'menu',
+    TOOLBAR_TOOLS_FULLSCREEN: iconPrefix + 'fullscreen',
+    TOOLBAR_TOOLS_MINIMIZE: iconPrefix + 'minimize',
+    TOOLBAR_TOOLS_CUSTOM: iconPrefix + 'custom-column',
     // form
-    FORM_PREFIX: iconPrefix + 'question',
-    FORM_SUFFIX: iconPrefix + 'question',
-    FORM_FOLDING: iconPrefix + 'arrow-top rotate180',
-    FORM_UNFOLDING: iconPrefix + 'arrow-top'
+    FORM_PREFIX: iconPrefix + 'question-circle-fill',
+    FORM_SUFFIX: iconPrefix + 'question-circle-fill',
+    FORM_FOLDING: iconPrefix + 'arrow-up rotate180',
+    FORM_UNFOLDING: iconPrefix + 'arrow-up'
   },
   grid: {
     // size: null,
@@ -8808,7 +8812,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.5.9", "] ").concat(src_conf.i18n(message, params));
+  return "[vxe-table v".concat("3.6.0-beta.10", "] ").concat(src_conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10089,7 +10093,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.5.9",
+  version: "3.6.0-beta.10",
   reg: reg,
   use: use,
   setup: setup,
@@ -10109,11 +10113,39 @@ var VXETable = {
 
 
 /* harmony default export */ var v_x_e_table = (VXETable);
+// CONCATENATED MODULE: ./packages/icon/src/icon.js
+
+/* harmony default export */ var src_icon = ({
+  name: 'VxeIcon',
+  props: {
+    name: String,
+    roll: Boolean
+  },
+  render: function render(h) {
+    return h('i', {
+      class: ["vxe-icon-".concat(this.name), this.roll ? 'roll' : ''],
+      on: {
+        click: this.clickEvent
+      }
+    });
+  },
+  methods: {
+    clickEvent: function clickEvent(evnt) {
+      this.$emit('click', {
+        $event: evnt
+      });
+    }
+  }
+});
 // CONCATENATED MODULE: ./packages/icon/index.js
-var Icon = {
-  /* eslint-disable @typescript-eslint/no-empty-function */
-  install: function install() {}
-};
+
+
+
+var Icon = Object.assign(src_icon, {
+  install: function install(Vue) {
+    Vue.component(src_icon.name, src_icon);
+  }
+});
 /* harmony default export */ var packages_icon = (Icon);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.keys.js
 var es_object_keys = __webpack_require__("b64b");
@@ -11227,6 +11259,7 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
       allColumnOverflow = $xetable.showOverflow,
       treeConfig = $xetable.treeConfig,
       treeOpts = $xetable.treeOpts,
+      expandOpts = $xetable.expandOpts,
       editOpts = $xetable.editOpts,
       treeExpandeds = $xetable.treeExpandeds,
       scrollYLoad = $xetable.scrollYLoad,
@@ -11322,12 +11355,15 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
     }))); // 如果行被展开了
 
     if (isExpandRow) {
-      var cellStyle;
+      var expandHeight = expandOpts.height;
+      var cellStyle = {};
+
+      if (expandHeight) {
+        cellStyle.height = "".concat(expandHeight, "px");
+      }
 
       if (treeConfig) {
-        cellStyle = {
-          paddingLeft: "".concat(rowLevel * treeOpts.indent + 30, "px")
-        };
+        cellStyle.paddingLeft = "".concat(rowLevel * treeOpts.indent + 30, "px");
       }
 
       var showOverflow = expandColumn.showOverflow;
@@ -11349,15 +11385,19 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
         style: rowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(rowStyle) ? rowStyle(expandParams) : rowStyle : null,
         on: trOn
       }, [h('td', {
-        class: ['vxe-body--expanded-column', {
+        class: {
+          'vxe-body--expanded-column': 1,
           'fixed--hidden': fixedType && !hasFixedColumn,
           'col--ellipsis': hasEllipsis
-        }],
+        },
         attrs: {
           colspan: tableColumn.length
         }
       }, [h('div', {
-        class: 'vxe-body--expanded-cell',
+        class: {
+          'vxe-body--expanded-cell': 1,
+          'is--ellipsis': expandHeight
+        },
         style: cellStyle
       }, [expandColumn.renderData(h, expandParams)])])]));
     } // 如果是树形表格
@@ -12909,9 +12949,7 @@ var Cell = {
 
     if (isVisible) {
       radioVNs.push(h('span', {
-        class: 'vxe-radio--icon vxe-radio--checked-icon'
-      }), h('span', {
-        class: 'vxe-radio--icon vxe-radio--unchecked-icon'
+        class: ['vxe-radio--icon', isChecked ? src_conf.icon.TABLE_RADIO_CHECKED : src_conf.icon.TABLE_RADIO_UNCHECKED]
       }));
     }
 
@@ -12987,11 +13025,7 @@ var Cell = {
       },
       on: on
     }, [h('span', {
-      class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-    }), h('span', {
-      class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-    }), h('span', {
-      class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+      class: ['vxe-checkbox--icon', isAllCheckboxIndeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isAllCheckboxSelected ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
     })].concat(titleSlot || headerTitle ? [h('span', {
       class: 'vxe-checkbox--label'
     }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : headerTitle)] : []))]);
@@ -13055,11 +13089,7 @@ var Cell = {
 
     if (isVisible) {
       checkVNs.push(h('span', {
-        class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-      }), h('span', {
-        class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-      }), h('span', {
-        class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+        class: ['vxe-checkbox--icon', indeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
       }));
     }
 
@@ -13141,11 +13171,7 @@ var Cell = {
 
     if (isVisible) {
       checkVNs.push(h('span', {
-        class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-      }), h('span', {
-        class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-      }), h('span', {
-        class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+        class: ['vxe-checkbox--icon', indeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
       }));
     }
 
@@ -19844,25 +19870,35 @@ funcs.forEach(function (name) {
 /* harmony default export */ var src_loading = ({
   name: 'VxeLoading',
   props: {
-    loading: Boolean
+    value: Boolean,
+    icon: String,
+    text: String
+  },
+  computed: {
+    loadingIcon: function loadingIcon() {
+      return this.icon || src_conf.icon.LOADING;
+    },
+    loadingText: function loadingText() {
+      var loadingText = src_conf.loadingText;
+      return this.text || (loadingText === null ? loadingText : src_conf.i18n('vxe.loading.text'));
+    }
   },
   render: function render(h) {
-    var icon = src_conf.icon.LOADING;
-    var loadingText = src_conf.loadingText;
-    var text = loadingText === null ? loadingText : src_conf.i18n('vxe.loading.text');
+    var loadingIcon = this.loadingIcon,
+        loadingText = this.loadingText;
     return h('div', {
       class: ['vxe-loading', {
-        'is--visible': this.loading
+        'is--visible': this.value
       }]
     }, [h('div', {
       class: 'vxe-loading--chunk'
-    }, [icon ? h('i', {
-      class: icon
+    }, [loadingIcon ? h('i', {
+      class: loadingIcon
     }) : h('div', {
       class: 'vxe-loading--spinner'
-    }), text ? h('div', {
+    }), loadingText ? h('div', {
       class: 'vxe-loading--text'
-    }, "".concat(text)) : null])]);
+    }, "".concat(loadingText)) : null])]);
   }
 });
 // CONCATENATED MODULE: ./packages/loading/index.js
@@ -20242,6 +20278,8 @@ function handleUupdateResize(_vm) {
     validConfig: Object,
     // 校验规则配置项
     editRules: Object,
+    // 加载中配置项
+    loadingConfig: Object,
     // 空内容渲染配置项
     emptyRender: [Boolean, Object],
     // 自定义列配置项
@@ -20595,6 +20633,9 @@ function handleUupdateResize(_vm) {
     emptyOpts: function emptyOpts() {
       return Object.assign({}, src_conf.table.emptyRender, this.emptyRender);
     },
+    loadingOpts: function loadingOpts() {
+      return Object.assign({}, src_conf.table.loadingConfig, this.loadingConfig);
+    },
     cellOffsetWidth: function cellOffsetWidth() {
       return this.border ? Math.max(2, Math.ceil(this.scrollbarWidth / this.tableColumn.length)) : 1;
     },
@@ -20930,7 +20971,8 @@ function handleUupdateResize(_vm) {
         footerTableData = this.footerTableData,
         hasTip = this.hasTip,
         columnOpts = this.columnOpts,
-        rowOpts = this.rowOpts;
+        rowOpts = this.rowOpts,
+        loadingOpts = this.loadingOpts;
     var leftList = columnStore.leftList,
         rightList = columnStore.rightList;
     return h('div', {
@@ -21047,7 +21089,9 @@ function handleUupdateResize(_vm) {
     h(packages_loading, {
       class: 'vxe-table--loading',
       props: {
-        loading: loading
+        value: loading,
+        icon: loadingOpts.icon,
+        text: loadingOpts.text
       }
     }),
     /**
@@ -21219,14 +21263,16 @@ var Table = Object.assign(table, {
         }, args)))];
       }
 
+      var isAllChecked = multiple ? filterStore.isAllSelected : !filterStore.options.some(function (item) {
+        return item._checked;
+      });
+      var isAllIndeterminate = multiple && filterStore.isIndeterminate;
       return [h('ul', {
         class: 'vxe-table--filter-header'
       }, [h('li', {
         class: ['vxe-table--filter-option', {
-          'is--checked': multiple ? filterStore.isAllSelected : !filterStore.options.some(function (item) {
-            return item._checked;
-          }),
-          'is--indeterminate': multiple && filterStore.isIndeterminate
+          'is--checked': isAllChecked,
+          'is--indeterminate': isAllIndeterminate
         }],
         attrs: {
           title: src_conf.i18n(multiple ? 'vxe.table.allTitle' : 'vxe.table.allFilter')
@@ -21237,11 +21283,7 @@ var Table = Object.assign(table, {
           }
         }
       }, (multiple ? [h('span', {
-        class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-      }), h('span', {
-        class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-      }), h('span', {
-        class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+        class: ['vxe-checkbox--icon', isAllIndeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
       })] : []).concat([h('span', {
         class: 'vxe-checkbox--label'
       }, src_conf.i18n('vxe.table.allFilter'))]))]), h('ul', {
@@ -21250,9 +21292,11 @@ var Table = Object.assign(table, {
           maxHeight: "".concat(maxHeight, "px")
         } : {}
       }, filterStore.options.map(function (item) {
+        var isChecked = item._checked;
+        var isIndeterminate = false;
         return h('li', {
           class: ['vxe-table--filter-option', {
-            'is--checked': item._checked
+            'is--checked': isChecked
           }],
           attrs: {
             title: item.label
@@ -21263,11 +21307,7 @@ var Table = Object.assign(table, {
             }
           }
         }, (multiple ? [h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-        }), h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-        }), h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+          class: ['vxe-checkbox--icon', isIndeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
         })] : []).concat([h('span', {
           class: 'vxe-checkbox--label'
         }, utils.formatText(item.label, 1))]));
@@ -22430,7 +22470,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
                 afIndex = row;
               }
             } else {
-              afIndex = afterFullData.indexOf(row);
+              afIndex = this.findRowIndexOf(afterFullData, row);
             }
 
             if (afIndex === -1) {
@@ -22438,7 +22478,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
             }
 
             afterFullData.splice.apply(afterFullData, [afIndex, 0].concat(_toConsumableArray(newRecords)));
-            tableFullData.splice.apply(tableFullData, [tableFullData.indexOf(row), 0].concat(_toConsumableArray(newRecords))); // 刷新单元格合并
+            tableFullData.splice.apply(tableFullData, [this.findRowIndexOf(tableFullData, row), 0].concat(_toConsumableArray(newRecords))); // 刷新单元格合并
 
             mergeList.forEach(function (mergeItem) {
               var mergeRowIndex = mergeItem.row,
@@ -22523,7 +22563,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
 
       if (!checkField) {
         rows.forEach(function (row) {
-          var sIndex = selection.indexOf(row);
+          var sIndex = _this2.findRowIndexOf(selection, row);
 
           if (sIndex > -1) {
             selection.splice(sIndex, 1);
@@ -22551,7 +22591,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
               rest.push(rItems[0]);
             }
 
-            var afIndex = afterFullData.indexOf(row);
+            var afIndex = _this2.findRowIndexOf(afterFullData, row);
 
             if (afIndex > -1) {
               afterFullData.splice(afIndex, 1);
@@ -22559,14 +22599,14 @@ function insertTreeRow(_vm, newRecords, isAppend) {
           });
         } else {
           rows.forEach(function (row) {
-            var tfIndex = tableFullData.indexOf(row);
+            var tfIndex = _this2.findRowIndexOf(tableFullData, row);
 
             if (tfIndex > -1) {
               var rItems = tableFullData.splice(tfIndex, 1);
               rest.push(rItems[0]);
             }
 
-            var afIndex = afterFullData.indexOf(row);
+            var afIndex = _this2.findRowIndexOf(afterFullData, row);
 
             if (afIndex > -1) {
               // 刷新单元格合并
@@ -22587,13 +22627,13 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       } // 如果当前行被激活编辑，则清除激活状态
 
 
-      if (actived.row && rows.indexOf(actived.row) > -1) {
+      if (actived.row && this.findRowIndexOf(rows, actived.row) > -1) {
         this.clearActived();
       } // 从新增中移除已删除的数据
 
 
       rows.forEach(function (row) {
-        var iIndex = insertList.indexOf(row);
+        var iIndex = _this2.findRowIndexOf(insertList, row);
 
         if (iIndex > -1) {
           insertList.splice(iIndex, 1);
@@ -22946,7 +22986,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       var args = actived.args,
           row = actived.row;
 
-      if (args && afterFullData.indexOf(row) > -1 && $el.querySelectorAll('.vxe-body--column.col--actived').length) {
+      if (args && this.findRowIndexOf(afterFullData, row) > -1 && $el.querySelectorAll('.vxe-body--column.col--actived').length) {
         return Object.assign({}, args);
       }
 
@@ -23080,7 +23120,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       var column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn;
 
       if (row && column && editOpts.trigger !== 'manual') {
-        var rowIndex = tableData.indexOf(row);
+        var rowIndex = this.findRowIndexOf(tableData, row);
 
         if (rowIndex > -1) {
           var cell = this.getCell(row, column);
@@ -23593,6 +23633,7 @@ var msgQueue = [];
     var footerSlot = $scopedSlots.footer || slots.footer;
     var headerSlot = $scopedSlots.header || slots.header;
     var titleSlot = $scopedSlots.title || slots.title;
+    var cornerSlot = $scopedSlots.corner || slots.corner;
     var headerOns = {};
 
     if (draggable) {
@@ -23626,11 +23667,17 @@ var msgQueue = [];
       on: headerOns
     }, headerSlot ? !inited || destroyOnClose && !visible ? [] : getSlotVNs(headerSlot.call(this, {
       $modal: this
-    }, h)) : [titleSlot ? getSlotVNs(titleSlot.call(this, {
+    }, h)) : [h('div', {
+      class: 'vxe-modal--header-title'
+    }, titleSlot ? getSlotVNs(titleSlot.call(this, {
       $modal: this
-    }, h)) : h('span', {
-      class: 'vxe-modal--title'
-    }, title ? getFuncText(title) : src_conf.i18n('vxe.alert.title')), showZoom ? h('i', {
+    }, h)) : title ? getFuncText(title) : src_conf.i18n('vxe.alert.title')), h('div', {
+      class: 'vxe-modal--header-right'
+    }, [cornerSlot ? h('span', {
+      class: 'vxe-modal--corner-warpper'
+    }, getSlotVNs(cornerSlot({
+      $modal: this
+    }))) : _e(), showZoom ? h('i', {
       class: ['vxe-modal--zoom-btn', 'trigger--btn', zoomLocat ? src_conf.icon.MODAL_ZOOM_OUT : src_conf.icon.MODAL_ZOOM_IN],
       attrs: {
         title: src_conf.i18n("vxe.modal.zoom".concat(zoomLocat ? 'Out' : 'In'))
@@ -23646,7 +23693,7 @@ var msgQueue = [];
       on: {
         click: this.closeEvent
       }
-    }) : _e()]) : null, h('div', {
+    }) : _e()])]) : null, h('div', {
       class: 'vxe-modal--body'
     }, [status ? h('div', {
       class: 'vxe-modal--status-wrapper'
@@ -23663,7 +23710,7 @@ var msgQueue = [];
     !isMsg ? h(packages_loading, {
       class: 'vxe-modal--loading',
       props: {
-        loading: loading
+        value: loading
       }
     }) : null]), showFooter ? h('div', {
       class: 'vxe-modal--footer'
@@ -24921,14 +24968,14 @@ function renderDatePanel(h, _vm) {
       click: _vm.datePrevEvent
     }
   }, [h('i', {
-    class: 'vxe-icon--caret-left'
+    class: 'vxe-icon-caret-left'
   })]), h('span', {
     class: 'vxe-input--date-picker-btn vxe-input--date-picker-current-btn',
     on: {
       click: _vm.dateTodayMonthEvent
     }
   }, [h('i', {
-    class: 'vxe-icon--dot'
+    class: 'vxe-icon-dot'
   })]), h('span', {
     class: ['vxe-input--date-picker-btn vxe-input--date-picker-next-btn', {
       'is--disabled': isDisabledNextDateBtn
@@ -24937,7 +24984,7 @@ function renderDatePanel(h, _vm) {
       click: _vm.dateNextEvent
     }
   }, [h('i', {
-    class: 'vxe-icon--caret-right'
+    class: 'vxe-icon-caret-right'
   })]), multiple && supportMultiples ? h('span', {
     class: 'vxe-input--date-picker-btn vxe-input--date-picker-confirm-btn'
   }, [h('button', {
@@ -27220,24 +27267,37 @@ function renderExtraSuffixIcon(h, _vm) {
     isGroup: function isGroup() {
       return this.$xecheckboxgroup;
     },
+    isMaximize: function isMaximize() {
+      return this.isGroup && this.$xecheckboxgroup.props.isMaximize;
+    },
     isDisabled: function isDisabled() {
-      return this.disabled || this.isGroup && this.$xecheckboxgroup.disabled;
+      if (this.disabled) {
+        return true;
+      }
+
+      if (this.isGroup) {
+        var _this$$xecheckboxgrou = this.$xecheckboxgroup,
+            disabled = _this$$xecheckboxgrou.disabled,
+            isMaximize = _this$$xecheckboxgrou.isMaximize;
+        return disabled || isMaximize && !this.isChecked;
+      }
+
+      return false;
+    },
+    isChecked: function isChecked() {
+      return this.isGroup ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.includes(this.$xecheckboxgroup.value, this.label) : this.value === this.checkedValue;
     }
   },
   render: function render(h) {
     var _ref;
 
     var $scopedSlots = this.$scopedSlots,
-        $xecheckboxgroup = this.$xecheckboxgroup,
-        isGroup = this.isGroup,
         isDisabled = this.isDisabled,
         title = this.title,
         vSize = this.vSize,
         indeterminate = this.indeterminate,
-        value = this.value,
-        label = this.label,
         content = this.content,
-        checkedValue = this.checkedValue;
+        isChecked = this.isChecked;
     var attrs = {};
 
     if (title) {
@@ -27245,7 +27305,7 @@ function renderExtraSuffixIcon(h, _vm) {
     }
 
     return h('label', {
-      class: ['vxe-checkbox', (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, 'is--indeterminate', indeterminate), _defineProperty(_ref, 'is--disabled', isDisabled), _ref)],
+      class: ['vxe-checkbox', (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, 'is--indeterminate', indeterminate), _defineProperty(_ref, 'is--disabled', isDisabled), _defineProperty(_ref, 'is--checked', isChecked), _ref)],
       attrs: attrs
     }, [h('input', {
       class: 'vxe-checkbox--input',
@@ -27254,13 +27314,13 @@ function renderExtraSuffixIcon(h, _vm) {
         disabled: isDisabled
       },
       domProps: {
-        checked: isGroup ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.includes($xecheckboxgroup.value, label) : value === checkedValue
+        checked: isChecked
       },
       on: {
         change: this.changeEvent
       }
     }), h('span', {
-      class: 'vxe-checkbox--icon'
+      class: ['vxe-checkbox--icon', indeterminate ? 'vxe-icon-checkbox-indeterminate' : isChecked ? 'vxe-icon-checkbox-checked' : 'vxe-icon-checkbox-unchecked']
     }), h('span', {
       class: 'vxe-checkbox--label'
     }, $scopedSlots.default ? $scopedSlots.default.call(this, {}) : [getFuncText(content)])]);
@@ -27476,6 +27536,22 @@ function getSelectLabel(_vm, value) {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toValueString(item ? item[_vm.labelField] : value);
 }
 
+function checkOptionDisabled(_vm, isSelected, option, group) {
+  if (option.disabled) {
+    return true;
+  }
+
+  if (group && group.disabled) {
+    return true;
+  }
+
+  if (_vm.isMaximize && !isSelected) {
+    return true;
+  }
+
+  return false;
+}
+
 function renderOption(h, _vm, list, group) {
   var isGroup = _vm.isGroup,
       labelField = _vm.labelField,
@@ -27488,16 +27564,17 @@ function renderOption(h, _vm, list, group) {
   var useKey = optionOpts.useKey;
   return list.map(function (option, cIndex) {
     var slots = option.slots;
-    var isVisible = !isGroup || isOptionVisible(option);
-    var isDisabled = group && group.disabled || option.disabled;
     var optionValue = option[valueField];
+    var isSelected = multiple ? value && value.indexOf(optionValue) > -1 : value === optionValue;
+    var isVisible = !isGroup || isOptionVisible(option);
+    var isDisabled = checkOptionDisabled(_vm, isSelected, option, group);
     var optid = getOptid(_vm, option);
     var defaultSlot = slots ? slots.default : null;
     return isVisible ? h('div', {
       key: useKey || optionKey ? optid : cIndex,
       class: ['vxe-select-option', option.className, {
         'is--disabled': isDisabled,
-        'is--selected': multiple ? value && value.indexOf(optionValue) > -1 : value === optionValue,
+        'is--selected': isSelected,
         'is--hover': currentValue === optionValue
       }],
       attrs: {
@@ -27608,6 +27685,7 @@ function select_renderOpts(h, _vm) {
     optionGroupProps: Object,
     optionConfig: Object,
     className: [String, Function],
+    max: [String, Number],
     size: {
       type: String,
       default: function _default() {
@@ -27735,6 +27813,17 @@ function select_renderOpts(h, _vm) {
       }
 
       return getSelectLabel(this, value);
+    },
+    isMaximize: function isMaximize() {
+      var value = this.value,
+          multiple = this.multiple,
+          max = this.max;
+
+      if (multiple && max) {
+        return (value ? value.length : 0) >= external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(max);
+      }
+
+      return false;
     }
   },
   watch: {
@@ -28590,8 +28679,8 @@ Object.keys(option_props).forEach(function (name) {
 
     var _e = this._e,
         checkedAll = this.checkedAll,
-        isAll = this.isAll,
-        isIndeterminate = this.isIndeterminate,
+        isAllChecked = this.isAll,
+        isAllIndeterminate = this.isIndeterminate,
         showSheet = this.showSheet,
         supportMerge = this.supportMerge,
         supportStyle = this.supportStyle,
@@ -28606,11 +28695,13 @@ Object.keys(option_props).forEach(function (name) {
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(storeData.columns, function (column) {
       var colTitle = utils.formatText(column.getTitle(), 1);
       var isColGroup = column.children && column.children.length;
+      var isChecked = column.checked;
+      var indeterminate = column.halfChecked;
       cols.push(h('li', {
         class: ['vxe-export--panel-column-option', "level--".concat(column.level), {
           'is--group': isColGroup,
-          'is--checked': column.checked,
-          'is--indeterminate': column.halfChecked,
+          'is--checked': isChecked,
+          'is--indeterminate': indeterminate,
           'is--disabled': column.disabled
         }],
         attrs: {
@@ -28624,11 +28715,7 @@ Object.keys(option_props).forEach(function (name) {
           }
         }
       }, [h('span', {
-        class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-      }), h('span', {
-        class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-      }), h('span', {
-        class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+        class: ['vxe-checkbox--icon', indeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
       }), h('span', {
         class: 'vxe-checkbox--label'
       }, colTitle)]));
@@ -28724,8 +28811,8 @@ Object.keys(option_props).forEach(function (name) {
       class: 'vxe-export--panel-column-header'
     }, [h('li', {
       class: ['vxe-export--panel-column-option', {
-        'is--checked': isAll,
-        'is--indeterminate': isIndeterminate
+        'is--checked': isAllChecked,
+        'is--indeterminate': isAllIndeterminate
       }],
       attrs: {
         title: src_conf.i18n('vxe.table.allTitle')
@@ -28734,11 +28821,7 @@ Object.keys(option_props).forEach(function (name) {
         click: this.allColumnEvent
       }
     }, [h('span', {
-      class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-    }), h('span', {
-      class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-    }), h('span', {
-      class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+      class: ['vxe-checkbox--icon', isAllIndeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
     }), h('span', {
       class: 'vxe-checkbox--label'
     }, src_conf.i18n('vxe.export.expCurrentColumn'))])]), h('ul', {
@@ -29008,6 +29091,9 @@ Object.keys(option_props).forEach(function (name) {
     isStrict: function isStrict() {
       var $xeradiogroup = this.$xeradiogroup;
       return $xeradiogroup ? $xeradiogroup.strict : this.strict;
+    },
+    isChecked: function isChecked() {
+      return this.$xeradiogroup ? this.$xeradiogroup.value === this.label : this.value === this.label;
     }
   },
   render: function render(h) {
@@ -29016,10 +29102,9 @@ Object.keys(option_props).forEach(function (name) {
     var $scopedSlots = this.$scopedSlots,
         $xeradiogroup = this.$xeradiogroup,
         isDisabled = this.isDisabled,
+        isChecked = this.isChecked,
         title = this.title,
         vSize = this.vSize,
-        value = this.value,
-        label = this.label,
         name = this.name,
         content = this.content;
     var attrs = {};
@@ -29029,7 +29114,7 @@ Object.keys(option_props).forEach(function (name) {
     }
 
     return h('label', {
-      class: ['vxe-radio', (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, 'is--disabled', isDisabled), _ref)],
+      class: ['vxe-radio', (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, 'is--checked', isChecked), _defineProperty(_ref, 'is--disabled', isDisabled), _ref)],
       attrs: attrs
     }, [h('input', {
       class: 'vxe-radio--input',
@@ -29039,14 +29124,14 @@ Object.keys(option_props).forEach(function (name) {
         disabled: isDisabled
       },
       domProps: {
-        checked: $xeradiogroup ? $xeradiogroup.value === label : value === label
+        checked: isChecked
       },
       on: {
         change: this.changeEvent,
         click: this.clickEvent
       }
     }), h('span', {
-      class: 'vxe-radio--icon'
+      class: ['vxe-radio--icon', isChecked ? 'vxe-icon-radio-checked' : 'vxe-icon-radio-unchecked']
     }), h('span', {
       class: 'vxe-radio--label'
     }, $scopedSlots.default ? $scopedSlots.default.call(this, {}) : [getFuncText(content)])]);
@@ -34215,11 +34300,13 @@ function renderCustoms(h, _vm) {
     }) : false;
 
     if (isColGroup || colKey) {
+      var isChecked = column.visible;
+      var isIndeterminate = column.halfVisible;
       cols.push(h('li', {
         class: ['vxe-custom--option', "level--".concat(column.level), {
           'is--group': isColGroup,
-          'is--checked': column.visible,
-          'is--indeterminate': column.halfVisible,
+          'is--checked': isChecked,
+          'is--indeterminate': isIndeterminate,
           'is--disabled': isDisabled
         }],
         attrs: {
@@ -34233,16 +34320,14 @@ function renderCustoms(h, _vm) {
           }
         }
       }, [h('span', {
-        class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-      }), h('span', {
-        class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-      }), h('span', {
-        class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+        class: ['vxe-checkbox--icon', isIndeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
       }), h('span', {
         class: 'vxe-checkbox--label'
       }, colTitle)]));
     }
   });
+  var isAllChecked = customStore.isAll;
+  var isAllIndeterminate = customStore.isIndeterminate;
   return h('div', {
     class: ['vxe-custom--wrapper', {
       'is--active': customStore.visible
@@ -34263,8 +34348,8 @@ function renderCustoms(h, _vm) {
     class: 'vxe-custom--header'
   }, [h('li', {
     class: ['vxe-custom--option', {
-      'is--checked': customStore.isAll,
-      'is--indeterminate': customStore.isIndeterminate
+      'is--checked': isAllChecked,
+      'is--indeterminate': isAllIndeterminate
     }],
     attrs: {
       title: src_conf.i18n('vxe.table.allTitle')
@@ -34273,11 +34358,7 @@ function renderCustoms(h, _vm) {
       click: _vm.allCustomEvent
     }
   }, [h('span', {
-    class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-  }), h('span', {
-    class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-  }), h('span', {
-    class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+    class: ['vxe-checkbox--icon', isAllIndeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
   }), h('span', {
     class: 'vxe-checkbox--label'
   }, src_conf.i18n('vxe.toolbar.customAll'))])]), h('ul', {
@@ -34470,7 +34551,7 @@ function renderCustoms(h, _vm) {
     }) : _e(), zoom && $xegrid ? h('vxe-button', {
       props: {
         circle: true,
-        icon: $xegrid.isMaximized() ? zoomOpts.iconOut || src_conf.icon.TOOLBAR_TOOLS_ZOOM_OUT : zoomOpts.iconIn || src_conf.icon.TOOLBAR_TOOLS_ZOOM_IN
+        icon: $xegrid.isMaximized() ? zoomOpts.iconOut || src_conf.icon.TOOLBAR_TOOLS_MINIMIZE : zoomOpts.iconIn || src_conf.icon.TOOLBAR_TOOLS_FULLSCREEN
       },
       attrs: {
         title: src_conf.i18n("vxe.toolbar.zoom".concat($xegrid.isMaximized() ? 'Out' : 'In'))
@@ -35309,11 +35390,14 @@ var Checkbox = Object.assign(src_checkbox, {
 
 
 
+
+
 /* harmony default export */ var checkbox_src_group = ({
   name: 'VxeCheckboxGroup',
   props: {
     value: Array,
     disabled: Boolean,
+    max: [String, Number],
     size: {
       type: String,
       default: function _default() {
@@ -35337,6 +35421,16 @@ var Checkbox = Object.assign(src_checkbox, {
   computed: {
     vSize: function vSize() {
       return this.size || this.$parent.size || this.$parent.vSize;
+    },
+    isMaximize: function isMaximize() {
+      var value = this.value,
+          max = this.max;
+
+      if (max) {
+        return value.length >= external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(max);
+      }
+
+      return false;
     }
   },
   render: function render(h) {
@@ -37510,7 +37604,7 @@ function getResetValue(value, resetValue) {
     h(packages_loading, {
       class: 'vxe-form--loading',
       props: {
-        loading: loading
+        value: loading
       }
     }),
     /**
@@ -37638,7 +37732,7 @@ function getResetValue(value, resetValue) {
                 $form: _this4
               });
             } else if (field) {
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(data, field, resetValue === null ? getResetValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(data, field), undefined) : resetValue);
+              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(data, field, resetValue === null ? getResetValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(data, field), undefined) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.clone(resetValue, true));
             }
           }
         });
@@ -38647,7 +38741,7 @@ var Switch = Object.assign(src_switch, {
     h(packages_loading, {
       class: 'vxe-list--loading',
       props: {
-        loading: loading
+        value: loading
       }
     })]);
   },
@@ -39213,7 +39307,7 @@ var Pulldown = Object.assign(pulldown, {
 /* harmony default export */ var zh_CN = ({
   vxe: {
     loading: {
-      text: '加载中'
+      text: '加载中...'
     },
     error: {
       groupFixed: '如果使用分组表头，固定列必须按组设置',