vxe-table 3.8.10-beta.0 → 3.8.10-beta.2

package/lib/index.umd.js

@@ -11164,9 +11164,16 @@ var iconPrefix = 'vxe-icon-';
       allowFixed: true,
       allowSort: true,
       showFooter: true,
-      placement: 'topRight'
+      placement: 'topRight',
       //  storage: false,
-      //  checkMethod () {}
+      //  checkMethod () {},
+      modalOptions: {
+        showZoom: true,
+        mask: true,
+        lockView: true,
+        resize: true,
+        escClosable: true
+      }
     },
     sortConfig: {
       // remote: false,
@@ -11505,7 +11512,7 @@ var es_array_concat = __webpack_require__(8706);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.10-beta.0", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.8.10-beta.2", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -13200,7 +13207,7 @@ function component(comp) {
     components[comp.name] = comp;
   }
 }
-var version = "3.8.10-beta.0";
+var version = "3.8.10-beta.2";
 var tableVersion = version;
 var VxeUI = {
   v: v,
@@ -15212,6 +15219,9 @@ var cellType = 'header';
           $xetable.emitEvent('resizable-change', _objectSpread2(_objectSpread2({}, params), {}, {
             resizeWidth: resizeWidth
           }), evnt);
+          setTimeout(function () {
+            return $xetable.recalculate(true);
+          }, 300);
         });
         dom.removeClass($xetable.$el, 'drag--resize');
       };
@@ -18125,7 +18135,7 @@ var Methods = {
             var filterMethod = column.filterMethod,
               filterRender = column.filterRender,
               field = column.field;
-            var compConf = filterRender ? v_x_e_table.renderer.get(filterRender.name) : null;
+            var compConf = isEnableConf(filterRender) ? v_x_e_table.renderer.get(filterRender.name) : null;
             var compFilterMethod = compConf && compConf.renderFilter ? compConf.tableFilterMethod || compConf.filterMethod : null;
             var defaultFilterMethod = compConf ? compConf.defaultTableFilterMethod || compConf.defaultFilterMethod : null;
             var cellValue = utils.getCellValue(row, column);
@@ -18432,7 +18442,6 @@ var Methods = {
   setColumnFixed: function setColumnFixed(fieldOrColumn, fixed) {
     var isMaxFixedColumn = this.isMaxFixedColumn,
       columnOpts = this.columnOpts;
-    var maxFixedSize = columnOpts.maxFixedSize;
     var column = handleFieldOrColumn(this, fieldOrColumn);
     var targetColumn = getRootColumn(this, column);
     if (targetColumn && targetColumn.fixed !== fixed) {
@@ -18441,7 +18450,7 @@ var Methods = {
         if (v_x_e_table.modal) {
           v_x_e_table.modal.message({
             status: 'error',
-            content: conf.i18n('vxe.table.maxFixedCol', [maxFixedSize])
+            content: conf.i18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
           });
         }
         return this.$nextTick();
@@ -18574,19 +18583,22 @@ var Methods = {
     if (resizableData || sortData || visibleData || fixedData) {
       tableFullColumn.forEach(function (column) {
         var colKey = column.getKey();
+        // 支持一级
+        if (!parent) {
+          if (fixedData && fixedData[colKey]) {
+            column.fixed = fixedData[colKey];
+          }
+          if (sortData && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(sortData[colKey])) {
+            hasCustomSort = true;
+            column.renderSortNumber = sortData[colKey];
+          }
+        }
         if (resizableData && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(resizableData[colKey])) {
           column.resizeWidth = resizableData[colKey];
         }
         if (visibleData && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(visibleData[colKey])) {
           column.visible = visibleData[colKey];
         }
-        if (fixedData && fixedData[colKey]) {
-          column.fixed = fixedData[colKey];
-        }
-        if (sortData && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(sortData[colKey])) {
-          hasCustomSort = true;
-          column.renderSortNumber = sortData[colKey];
-        }
       });
       // 如果自定义了顺序
       if (hasCustomSort) {
@@ -18660,7 +18672,7 @@ var Methods = {
     var hasFixedt = 0;
     var hasVisible = 0;
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, function (column, index, items, path, parent) {
-      // 排序只支持一级
+      // 只支持一级
       if (!parent) {
         collectColumn.forEach(function (column) {
           var colKey = column.getKey();
@@ -18669,19 +18681,19 @@ var Methods = {
             sortData[colKey] = column.renderSortNumber;
           }
         });
-      }
-      if (column.resizeWidth) {
-        var colKey = column.getKey();
-        if (colKey) {
-          hasResizable = 1;
-          resizableData[colKey] = column.renderWidth;
+        if (column.fixed && column.fixed !== column.defaultFixed) {
+          var colKey = column.getKey();
+          if (colKey) {
+            hasFixedt = 1;
+            fixedData[colKey] = column.fixed;
+          }
         }
       }
-      if (column.fixed && column.fixed !== column.defaultFixed) {
+      if (column.resizeWidth) {
         var _colKey = column.getKey();
         if (_colKey) {
-          hasFixedt = 1;
-          fixedData[_colKey] = column.fixed;
+          hasResizable = 1;
+          resizableData[_colKey] = column.renderWidth;
         }
       }
       if (!checkMethod || checkMethod({
@@ -22677,7 +22689,9 @@ var Methods = {
       tableBodyElem.scrollLeft = 0;
     }
     scrollXStore.startIndex = 0;
+    scrollXStore.endIndex = scrollXStore.visibleSize;
     scrollYStore.startIndex = 0;
+    scrollYStore.endIndex = scrollYStore.visibleSize;
     return this.$nextTick();
   },
   /**
@@ -23004,7 +23018,6 @@ var Loading = (/* unused pure expression or super */ null && (VxeLoading));
 
 
 
-
 
 
 /**
@@ -23743,7 +23756,7 @@ function handleUupdateResize(_vm) {
       var collectColumn = this.collectColumn;
       var fixedSize = 0;
       collectColumn.forEach(function (column) {
-        if (column.fixed) {
+        if (column.renderFixed) {
           fixedSize++;
         }
       });
@@ -24087,13 +24100,14 @@ function handleUupdateResize(_vm) {
       hasTip = this.hasTip,
       columnOpts = this.columnOpts,
       rowOpts = this.rowOpts,
+      checkboxOpts = this.checkboxOpts,
       loadingOpts = this.loadingOpts,
       editRules = this.editRules;
     var leftList = columnStore.leftList,
       rightList = columnStore.rightList;
     var currLoading = this._isLoading || loading;
     return h('div', {
-      class: ['vxe-table', 'vxe-table--render-default', "tid_".concat(tId), vSize ? "size--".concat(vSize) : '', "border--".concat(tableBorder), (_ref = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, "valid-msg--".concat(validOpts.msgMode), !!editRules), 'vxe-editable', !!editConfig), 'old-cell-valid', editRules && conf.cellVaildMode === 'obsolete'), 'cell--highlight', highlightCell), 'cell--selected', mouseConfig && mouseOpts.selected), 'cell--area', mouseConfig && mouseOpts.area), 'row--highlight', rowOpts.isHover || highlightHoverRow), 'column--highlight', columnOpts.isHover || highlightHoverColumn), 'is--header', showHeader), 'is--footer', showFooter), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, 'is--group', isGroup), 'is--tree-line', treeConfig && (treeOpts.showLine || treeOpts.line)), 'is--fixed-left', leftList.length), 'is--fixed-right', rightList.length), 'is--animat', !!this.animat), 'is--round', this.round), 'is--stripe', !treeConfig && stripe), 'is--loading', currLoading), 'is--empty', !currLoading && !tableData.length), 'is--scroll-y', overflowY), _defineProperty(_defineProperty(_defineProperty(_ref, 'is--scroll-x', overflowX), 'is--virtual-x', scrollXLoad), 'is--virtual-y', scrollYLoad))],
+      class: ['vxe-table', 'vxe-table--render-default', "tid_".concat(tId), vSize ? "size--".concat(vSize) : '', "border--".concat(tableBorder), (_ref = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, "valid-msg--".concat(validOpts.msgMode), !!editRules), 'vxe-editable', !!editConfig), 'old-cell-valid', editRules && conf.cellVaildMode === 'obsolete'), 'cell--highlight', highlightCell), 'cell--selected', mouseConfig && mouseOpts.selected), 'cell--area', mouseConfig && mouseOpts.area), 'row--highlight', rowOpts.isHover || highlightHoverRow), 'column--highlight', columnOpts.isHover || highlightHoverColumn), 'checkbox--range', checkboxOpts.range), 'is--header', showHeader), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, 'is--footer', showFooter), 'is--group', isGroup), 'is--tree-line', treeConfig && (treeOpts.showLine || treeOpts.line)), 'is--fixed-left', leftList.length), 'is--fixed-right', rightList.length), 'is--animat', !!this.animat), 'is--round', this.round), 'is--stripe', !treeConfig && stripe), 'is--loading', currLoading), 'is--empty', !currLoading && !tableData.length), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, 'is--scroll-y', overflowY), 'is--scroll-x', overflowX), 'is--virtual-x', scrollXLoad), 'is--virtual-y', scrollYLoad))],
       on: {
         keydown: this.keydownEvent
       }
@@ -24335,7 +24349,7 @@ var Table = VxeTable;
     var args = filterStore.args,
       column = filterStore.column;
     var filterRender = column ? column.filterRender : null;
-    var compConf = filterRender ? v_x_e_table.renderer.get(filterRender.name) : null;
+    var compConf = isEnableConf(filterRender) ? v_x_e_table.renderer.get(filterRender.name) : null;
     var filterClassName = compConf ? compConf.tableFilterClassName || compConf.filterClassName : '';
     return h('div', {
       class: ['vxe-table--filter-wrapper', 'filter--prevent-default', compConf && compConf.className ? compConf.className : '', utils.getClass(filterClassName, Object.assign({
@@ -24433,7 +24447,7 @@ var Table = VxeTable;
       var column = filterStore.column,
         multiple = filterStore.multiple;
       var filterRender = column.filterRender;
-      var compConf = filterRender ? v_x_e_table.renderer.get(filterRender.name) : null;
+      var compConf = isEnableConf(filterRender) ? v_x_e_table.renderer.get(filterRender.name) : null;
       var isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate;
       return multiple && (compConf ? !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false) : true) ? [h('div', {
         class: 'vxe-table--filter-footer'
@@ -24529,6 +24543,7 @@ var Table = VxeTable;
 
 
 
+
 /* harmony default export */ var mixin = ({
   methods: {
     /**
@@ -24555,12 +24570,12 @@ var Table = VxeTable;
      * @param {ColumnInfo} fieldOrColumn 列
      * @param {Array} options 选项
      */
-    _setFilter: function _setFilter(fieldOrColumn, options) {
+    _setFilter: function _setFilter(fieldOrColumn, options, update) {
       var column = handleFieldOrColumn(this, fieldOrColumn);
       if (column && column.filters) {
         column.filters = toFilters(options || []);
       }
-      return this.$nextTick();
+      return update ? this.updateData() : this.$nextTick();
     },
     checkFilterOptions: function checkFilterOptions() {
       var filterStore = this.filterStore;
@@ -24591,7 +24606,7 @@ var Table = VxeTable;
         var filters = column.filters,
           filterMultiple = column.filterMultiple,
           filterRender = column.filterRender;
-        var compConf = filterRender ? v_x_e_table.renderer.get(filterRender.name) : null;
+        var compConf = isEnableConf(filterRender) ? v_x_e_table.renderer.get(filterRender.name) : null;
         var filterRecoverMethod = column.filterRecoverMethod || (compConf ? compConf.tableFilterRecoverMethod || compConf.filterRecoverMethod : null);
         var _DomTools$getDomNode = dom.getDomNode(),
           visibleWidth = _DomTools$getDomNode.visibleWidth;
@@ -24776,7 +24791,7 @@ var Table = VxeTable;
         var filters = column.filters,
           filterRender = column.filterRender;
         if (filters) {
-          var compConf = filterRender ? v_x_e_table.renderer.get(filterRender.name) : null;
+          var compConf = isEnableConf(filterRender) ? v_x_e_table.renderer.get(filterRender.name) : null;
           var filterResetMethod = column.filterResetMethod || (compConf ? compConf.tableFilterResetMethod || compConf.filterResetMethod : null);
           filters.forEach(function (item) {
             item._checked = false;
@@ -30028,7 +30043,7 @@ function renderExtraSuffixIcon(h, _vm) {
         change: this.changeEvent
       }
     }), h('span', {
-      class: ['vxe-checkbox--icon', indeterminate ? 'vxe-icon-checkbox-indeterminate' : isChecked ? 'vxe-icon-checkbox-checked' : 'vxe-icon-checkbox-unchecked']
+      class: ['vxe-checkbox--icon', indeterminate ? 'vxe-icon-checkbox-indeterminate' : isChecked ? 'vxe-icon-checkbox-checked-fill' : 'vxe-icon-checkbox-unchecked']
     }), h('span', {
       class: 'vxe-checkbox--label'
     }, $scopedSlots.default ? $scopedSlots.default.call(this, {}) : [getFuncText(content)])]);
@@ -31254,7 +31269,6 @@ Object.keys(props).forEach(function (name) {
 
 
 
-
 /* harmony default export */ var export_panel = ({
   name: 'VxeTableExportPanel',
   props: {
@@ -31384,21 +31398,15 @@ Object.keys(props).forEach(function (name) {
       }
     })])]), isPrint ? _e() : h('tr', [h('td', conf.i18n('vxe.export.expType')), h('td', [h('vxe-select', {
       props: {
-        value: defaultOptions.type
+        value: defaultOptions.type,
+        options: storeData.typeList
       },
       on: {
         input: function input(value) {
           defaultOptions.type = value;
         }
       }
-    }, storeData.typeList.map(function (item) {
-      return h('vxe-option', {
-        props: {
-          value: item.value,
-          label: conf.i18n(item.label)
-        }
-      });
-    }))])]), isPrint || showSheet ? h('tr', [h('td', conf.i18n('vxe.export.expSheetName')), h('td', [h('vxe-input', {
+    })])]), isPrint || showSheet ? h('tr', [h('td', conf.i18n('vxe.export.expSheetName')), h('td', [h('vxe-input', {
       ref: 'sheetname',
       props: {
         value: defaultOptions.sheetName,
@@ -31413,21 +31421,15 @@ Object.keys(props).forEach(function (name) {
       }
     })])]) : _e(), h('tr', [h('td', conf.i18n('vxe.export.expMode')), h('td', [h('vxe-select', {
       props: {
-        value: defaultOptions.mode
+        value: defaultOptions.mode,
+        options: storeData.modeList
       },
       on: {
         input: function input(value) {
           defaultOptions.mode = value;
         }
       }
-    }, storeData.modeList.map(function (item) {
-      return h('vxe-option', {
-        props: {
-          value: item.value,
-          label: conf.i18n(item.label)
-        }
-      });
-    }))])]), h('tr', [h('td', [conf.i18n('vxe.export.expColumn')]), h('td', [h('div', {
+    })])]), h('tr', [h('td', [conf.i18n('vxe.export.expColumn')]), h('td', [h('div', {
       class: 'vxe-export--panel-column'
     }, [h('ul', {
       class: 'vxe-export--panel-column-header'
@@ -31830,7 +31832,7 @@ Object.keys(props).forEach(function (name) {
         var selectItem = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().find(typeList, function (item) {
           return type === item.value;
         });
-        return selectItem ? conf.i18n(selectItem.label) : '*.*';
+        return selectItem ? selectItem.label : '*.*';
       }
       return "*.".concat(typeList.map(function (item) {
         return item.value;
@@ -31848,7 +31850,7 @@ Object.keys(props).forEach(function (name) {
       props: {
         value: storeData.visible,
         title: conf.i18n('vxe.import.impTitle'),
-        width: 440,
+        width: 520,
         mask: true,
         lockView: true,
         showFooter: false,
@@ -31889,22 +31891,17 @@ Object.keys(props).forEach(function (name) {
       on: {
         click: this.selectFileEvent
       }
-    }, conf.i18n('vxe.import.impSelect'))])]), h('tr', [h('td', conf.i18n('vxe.import.impType')), h('td', parseTypeLabel)]), h('tr', [h('td', conf.i18n('vxe.import.impOpts')), h('td', [h('vxe-radio-group', {
+    }, conf.i18n('vxe.import.impSelect'))])]), h('tr', [h('td', conf.i18n('vxe.import.impType')), h('td', parseTypeLabel)]), h('tr', [h('td', conf.i18n('vxe.import.impMode')), h('td', [h('vxe-select', {
       props: {
-        value: defaultOptions.mode
+        value: defaultOptions.mode,
+        options: storeData.modeList
       },
       on: {
         input: function input(value) {
           defaultOptions.mode = value;
         }
       }
-    }, storeData.modeList.map(function (item) {
-      return h('vxe-radio', {
-        props: {
-          label: item.value
-        }
-      }, conf.i18n(item.label));
-    }))])])])]), h('div', {
+    })])])])]), h('div', {
       class: 'vxe-export--panel-btns'
     }, [h('vxe-button', {
       on: {
@@ -32916,7 +32913,7 @@ function handleImport($xetable, content, opts) {
   if (status) {
     $xetable.createData(rows).then(function (data) {
       var loadRest;
-      if (opts.mode === 'insert') {
+      if (opts.mode === 'insert' || opts.mode === 'insertBottom') {
         loadRest = $xetable.insert(data);
       } else {
         loadRest = $xetable.reloadData(data);
@@ -32989,7 +32986,7 @@ function handleFileImport($xetable, file, opts) {
     $xetable._importReject = _importReject;
     if (window.FileReader) {
       var options = Object.assign({
-        mode: 'insert'
+        mode: 'insertBottom'
       }, opts, {
         type: type,
         filename: filename
@@ -33176,7 +33173,8 @@ function handlePrint($xetable, opts, content) {
   }
 }
 function handleExportAndPrint($xetable, options, isPrint) {
-  var initStore = $xetable.initStore,
+  var $xegrid = $xetable.$xegrid,
+    initStore = $xetable.initStore,
     customOpts = $xetable.customOpts,
     collectColumn = $xetable.collectColumn,
     footerTableData = $xetable.footerTableData,
@@ -33185,16 +33183,19 @@ function handleExportAndPrint($xetable, options, isPrint) {
     isGroup = $xetable.isGroup,
     exportParams = $xetable.exportParams,
     exportOpts = $xetable.exportOpts;
+  var proxyOpts = $xegrid ? $xegrid.proxyOpts : {};
   var selectRecords = $xetable.getCheckboxRecords();
   var hasFooter = !!footerTableData.length;
   var hasTree = treeConfig;
   var hasMerge = !hasTree && mergeList.length;
   var defOpts = Object.assign({
     message: true,
-    isHeader: true
+    isHeader: true,
+    current: 'current',
+    modes: ['current', 'selected'].concat(proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : [])
   }, options);
   var types = defOpts.types || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps);
-  var modes = defOpts.modes;
+  var modes = defOpts.modes || [];
   var checkMethod = customOpts.checkMethod;
   var exportColumns = collectColumn.slice(0);
   var columns = defOpts.columns;
@@ -33202,13 +33203,19 @@ function handleExportAndPrint($xetable, options, isPrint) {
   var typeList = types.map(function (value) {
     return {
       value: value,
-      label: "vxe.export.types.".concat(value)
+      label: conf.i18n("vxe.export.types.".concat(value))
     };
   });
-  var modeList = modes.map(function (value) {
+  var modeList = modes.map(function (item) {
+    if (item && item.value) {
+      return {
+        value: item.value,
+        label: item.label || item.value
+      };
+    }
     return {
-      value: value,
-      label: "vxe.export.modes.".concat(value)
+      value: item,
+      label: conf.i18n("vxe.export.modes.".concat(item))
     };
   });
   // 默认选中
@@ -33258,11 +33265,15 @@ function handleExportAndPrint($xetable, options, isPrint) {
   Object.assign(exportParams, {
     mode: selectRecords.length ? 'selected' : 'current'
   }, defOpts);
-  if (modes.indexOf(exportParams.mode) === -1) {
-    exportParams.mode = modes[0];
+  if (!modeList.some(function (item) {
+    return item.value === exportParams.mode;
+  })) {
+    exportParams.mode = modeList[0].value;
   }
-  if (types.indexOf(exportParams.type) === -1) {
-    exportParams.type = types[0];
+  if (!typeList.some(function (item) {
+    return item.value === exportParams.type;
+  })) {
+    exportParams.type = typeList[0].value;
   }
   initStore.export = true;
   return $xetable.$nextTick();
@@ -33470,7 +33481,7 @@ var convertToRows = function convertToRows(originColumns) {
         }
       }
       if (!opts.data) {
-        opts.data = afterFullData;
+        opts.data = [];
         if (mode === 'selected') {
           var selectRecords = this.getCheckboxRecords();
           if (['html', 'pdf'].indexOf(type) > -1 && treeConfig) {
@@ -33515,6 +33526,8 @@ var convertToRows = function convertToRows(originColumns) {
               });
             }
           }
+        } else if (mode === 'current') {
+          opts.data = afterFullData;
         }
       }
       return handleExport(this, opts);
@@ -33610,13 +33623,16 @@ var convertToRows = function convertToRows(originColumns) {
       });
     },
     _openImport: function _openImport(options) {
+      var _this4 = this;
       var importOpts = this.importOpts;
       var defOpts = Object.assign({
-        mode: 'insert',
+        mode: 'insertBottom',
         message: true,
-        types: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps)
+        types: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps),
+        modes: ['insertBottom', 'covering']
       }, options, importOpts);
-      var types = defOpts.types;
+      var types = defOpts.types || [];
+      var modes = defOpts.modes || [];
       var isTree = !!this.getTreeStatus();
       if (isTree) {
         if (defOpts.message) {
@@ -33634,13 +33650,19 @@ var convertToRows = function convertToRows(originColumns) {
       var typeList = types.map(function (value) {
         return {
           value: value,
-          label: "vxe.export.types.".concat(value)
+          label: conf.i18n("vxe.export.types.".concat(value))
         };
       });
-      var modeList = defOpts.modes.map(function (value) {
+      var modeList = modes.map(function (item) {
+        if (item && item.value) {
+          return {
+            value: item.value,
+            label: item.label || item.value
+          };
+        }
         return {
-          value: value,
-          label: "vxe.import.modes.".concat(value)
+          value: item,
+          label: conf.i18n("vxe.import.modes.".concat(item))
         };
       });
       Object.assign(this.importStore, {
@@ -33652,6 +33674,11 @@ var convertToRows = function convertToRows(originColumns) {
         visible: true
       });
       Object.assign(this.importParams, defOpts);
+      if (!modeList.some(function (item) {
+        return item.value === _this4.importParams.mode;
+      })) {
+        this.importParams.mode = modeList[0].value;
+      }
       this.initStore.import = true;
     },
     _openExport: function _openExport(options) {
@@ -35024,6 +35051,7 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
     allowResizable = customOpts.allowResizable,
     checkMethod = customOpts.checkMethod,
     visibleMethod = customOpts.visibleMethod;
+  var maxFixedSize = columnOpts.maxFixedSize;
   var modalOpts = Object.assign({}, modalOptions);
   var trVNs = [];
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, function (column, index, items, path, parent) {
@@ -35137,21 +35165,22 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
   var isAllChecked = customStore.isAll;
   var isAllIndeterminate = customStore.isIndeterminate;
   return h('vxe-modal', {
-    key: 'popup',
+    key: 'modal',
     props: {
       className: ['vxe-table-custom-popup-wrapper', 'vxe-table--ignore-clear', modalOpts.className || ''].join(' '),
       value: customStore.visible,
       title: modalOpts.title || conf.i18n('vxe.custom.cstmTitle'),
-      width: modalOpts.width || '50vw',
+      width: modalOpts.width || Math.min(880, document.documentElement.clientWidth),
       minWidth: modalOpts.minWidth || 700,
-      height: modalOpts.height || '50vh',
+      height: modalOpts.height || Math.min(680, document.documentElement.clientHeight),
       minHeight: modalOpts.minHeight || 400,
-      mask: true,
-      lockView: true,
-      showFooter: true,
-      resize: true,
-      escClosable: true,
-      destroyOnClose: true
+      showZoom: !!modalOpts.showZoom,
+      mask: !!modalOpts.mask,
+      lockView: !!modalOpts.lockView,
+      resize: !!modalOpts.resize,
+      escClosable: !!modalOpts.escClosable,
+      destroyOnClose: true,
+      showFooter: true
     },
     on: {
       input: function input(value) {
@@ -35214,7 +35243,7 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
               });
             }
           }
-        })]) : _e(), h('th', {}, conf.i18n('vxe.custom.setting.colTitle')), allowResizable ? h('th', {}, conf.i18n('vxe.custom.setting.colResizable')) : _e(), allowFixed ? h('th', {}, conf.i18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0])) : _e()])]), h('transition-group', {
+        })]) : _e(), h('th', {}, conf.i18n('vxe.custom.setting.colTitle')), allowResizable ? h('th', {}, conf.i18n('vxe.custom.setting.colResizable')) : _e(), allowFixed ? h('th', {}, conf.i18n("vxe.custom.setting.".concat(maxFixedSize ? 'colFixedMax' : 'colFixed'), [maxFixedSize])) : _e()])]), h('transition-group', {
           class: 'vxe-table-custom--body',
           props: {
             tag: 'tbody',
@@ -35279,7 +35308,7 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
   render: function render(h) {
     var $xetable = this.$xetable;
     var customOpts = $xetable.customOpts;
-    if (customOpts.mode === 'popup') {
+    if (['modal', 'popup'].includes("".concat(customOpts.mode))) {
       return renderPopupPanel(h, this);
     }
     return renderSimplePanel(h, this);
@@ -39029,7 +39058,7 @@ var Textarea = VxeTextarea;
     GlobalEvent.on(this, 'mousedown', this.handleGlobalMousedownEvent);
   },
   beforeDestroy: function beforeDestroy() {
-    var panelElem = this.$refs.panel;
+    var panelElem = this.$refs.btnPanel;
     if (panelElem && panelElem.parentNode) {
       panelElem.parentNode.removeChild(panelElem);
     }
@@ -39066,8 +39095,8 @@ var Textarea = VxeTextarea;
       // hover 触发
       btnOns.mouseenter = this.mouseenterTargetEvent;
       btnOns.mouseleave = this.mouseleaveTargetEvent;
-      panelOns.onMouseenter = this.mouseenterDropdownEvent;
-      panelOns.onMouseleave = this.mouseleaveDropdownEvent;
+      panelOns.mouseenter = this.mouseenterDropdownEvent;
+      panelOns.mouseleave = this.mouseleaveDropdownEvent;
     }
     return downsSlot ? h('div', {
       class: ['vxe-button--dropdown', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
@@ -39088,7 +39117,7 @@ var Textarea = VxeTextarea;
     }, this.renderContent(h).concat([h('i', {
       class: "vxe-button--dropdown-arrow ".concat(conf.icon.BUTTON_DROPDOWN)
     })])), h('div', {
-      ref: 'panel',
+      ref: 'btnPanel',
       class: ['vxe-button--dropdown-panel', popupClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(popupClassName) ? popupClassName({
         $button: this
       }) : popupClassName : '', _defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'animat--leave', animatVisible), 'animat--enter', visiblePanel)],
@@ -39153,7 +39182,7 @@ var Textarea = VxeTextarea;
       return contents;
     },
     handleGlobalMousewheelEvent: function handleGlobalMousewheelEvent(evnt) {
-      if (this.visiblePanel && !dom.getEventTargetNode(evnt, this.$refs.panel).flag) {
+      if (this.visiblePanel && !dom.getEventTargetNode(evnt, this.$refs.btnPanel).flag) {
         this.closePanel();
       }
     },
@@ -39162,7 +39191,7 @@ var Textarea = VxeTextarea;
         visiblePanel = this.visiblePanel;
       if (!disabled) {
         var el = this.$refs.$el;
-        var panelElem = this.$refs.panel;
+        var panelElem = this.$refs.btnPanel;
         this.isActivated = dom.getEventTargetNode(evnt, el).flag || dom.getEventTargetNode(evnt, panelElem).flag;
         if (visiblePanel && !this.isActivated) {
           this.closePanel();
@@ -39195,7 +39224,7 @@ var Textarea = VxeTextarea;
     clickDropdownEvent: function clickDropdownEvent(evnt) {
       var _this = this;
       var dropdownElem = evnt.currentTarget;
-      var panelElem = this.$refs.panel;
+      var panelElem = this.$refs.btnPanel;
       var _DomTools$getEventTar = dom.getEventTargetNode(evnt, dropdownElem, 'vxe-button'),
         flag = _DomTools$getEventTar.flag,
         targetElem = _DomTools$getEventTar.targetElem;
@@ -39237,21 +39266,23 @@ var Textarea = VxeTextarea;
     },
     mouseenterDropdownEvent: function mouseenterDropdownEvent() {
       var _this2 = this;
-      var panelElem = this.$refs.panel;
-      panelElem.dataset.active = 'Y';
-      this.animatVisible = true;
-      setTimeout(function () {
-        if (panelElem.dataset.active === 'Y') {
-          _this2.visiblePanel = true;
-          _this2.updateZindex();
-          _this2.updatePlacement();
-          setTimeout(function () {
-            if (_this2.visiblePanel) {
-              _this2.updatePlacement();
-            }
-          }, 50);
-        }
-      }, 20);
+      var panelElem = this.$refs.btnPanel;
+      if (panelElem) {
+        panelElem.dataset.active = 'Y';
+        this.animatVisible = true;
+        setTimeout(function () {
+          if (panelElem.dataset.active === 'Y') {
+            _this2.visiblePanel = true;
+            _this2.updateZindex();
+            _this2.updatePlacement();
+            setTimeout(function () {
+              if (_this2.visiblePanel) {
+                _this2.updatePlacement();
+              }
+            }, 50);
+          }
+        }, 20);
+      }
     },
     mouseleaveDropdownEvent: function mouseleaveDropdownEvent() {
       this.closePanel();
@@ -39270,26 +39301,28 @@ var Textarea = VxeTextarea;
     openPanel: function openPanel() {
       var _this3 = this;
       var trigger = this.trigger;
-      var panelElem = this.$refs.panel;
-      panelElem.dataset.active = 'Y';
-      if (!this.inited) {
-        this.inited = true;
-        if (this.transfer) {
-          document.body.appendChild(panelElem);
+      var panelElem = this.$refs.btnPanel;
+      if (panelElem) {
+        panelElem.dataset.active = 'Y';
+        if (!this.inited) {
+          this.inited = true;
+          if (this.transfer) {
+            document.body.appendChild(panelElem);
+          }
         }
+        this.showTime = setTimeout(function () {
+          if (panelElem.dataset.active === 'Y') {
+            _this3.mouseenterDropdownEvent();
+          } else {
+            _this3.animatVisible = false;
+          }
+        }, trigger === 'click' ? 50 : 250);
       }
-      this.showTime = setTimeout(function () {
-        if (panelElem.dataset.active === 'Y') {
-          _this3.mouseenterDropdownEvent();
-        } else {
-          _this3.animatVisible = false;
-        }
-      }, trigger === 'click' ? 50 : 250);
       return this.$nextTick();
     },
     closePanel: function closePanel() {
       var _this4 = this;
-      var panelElem = this.$refs.panel;
+      var panelElem = this.$refs.btnPanel;
       clearTimeout(this.showTime);
       if (panelElem) {
         panelElem.dataset.active = 'N';
@@ -39317,7 +39350,7 @@ var Textarea = VxeTextarea;
           placement = _this5.placement,
           panelIndex = _this5.panelIndex;
         var targetElem = $refs.xBtn;
-        var panelElem = $refs.panel;
+        var panelElem = $refs.btnPanel;
         if (panelElem && targetElem) {
           var targetHeight = targetElem.offsetHeight;
           var targetWidth = targetElem.offsetWidth;
@@ -42475,7 +42508,8 @@ var Pulldown = VxePulldown;
         colTitle: '标题',
         colResizable: '列宽（像素）',
         colVisible: '是否显示',
-        colFixed: '冻结列（最多 {0} 列）',
+        colFixed: '冻结列',
+        colFixedMax: '冻结列（最多 {0} 列）',
         fixedLeft: '左侧',
         fixedUnset: '不设置',
         fixedRight: '右侧'
@@ -42483,14 +42517,17 @@ var Pulldown = VxePulldown;
     },
     import: {
       modes: {
-        covering: '覆盖',
-        insert: '新增'
+        covering: '覆盖方式（直接覆盖表格数据）',
+        insert: '底部追加（在表格的底部追加新数据）',
+        insertTop: '顶部追加（在表格的顶部追加新数据）',
+        insertBottom: '底部追加（在表格的底部追加新数据）'
       },
       impTitle: '导入数据',
       impFile: '文件名',
       impSelect: '选择文件',
       impType: '文件类型',
       impOpts: '参数设置',
+      impMode: '导入模式',
       impConfirm: '导入',
       impCancel: '取消'
     },