vxe-table 3.10.0-beta.2 → 3.10.0-beta.4

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.10.0-beta.2";
+const version = "3.10.0-beta.4";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2764,7 +2764,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.10.0-beta.2"}`;
+const log_version = `table v${"3.10.0-beta.4"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -11370,7 +11370,12 @@ const Methods = {
   },
   // 计算可视渲染相关数据
   computeScrollLoad() {
+    const $xeTable = this;
+    const props = $xeTable;
     return this.$nextTick().then(() => {
+      const {
+        showOverflow
+      } = props;
       const {
         sYOpts,
         sXOpts,
@@ -11384,7 +11389,9 @@ const Methods = {
         const {
           visibleSize: visibleXSize
         } = handleVirtualXVisible(this);
-        const offsetXSize = sXOpts.oSize ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(sXOpts.oSize) : browse.msie ? 10 : browse.edge ? 5 : 0;
+        // 动态列缓冲量
+        const bufferSize = showOverflow ? 0 : 2;
+        const offsetXSize = Math.max(bufferSize, sXOpts.oSize ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(sXOpts.oSize) : browse.msie ? 10 : browse.edge ? 5 : 0);
         scrollXStore.offsetSize = offsetXSize;
         scrollXStore.visibleSize = visibleXSize;
         scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
@@ -11401,7 +11408,9 @@ const Methods = {
         visibleSize: visibleYSize
       } = handleVirtualYVisible(this);
       if (scrollYLoad) {
-        const offsetYSize = sYOpts.oSize ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(sYOpts.oSize) : browse.msie ? 20 : browse.edge ? 10 : 0;
+        // 动态高缓冲量
+        const bufferSize = showOverflow ? 0 : 2;
+        const offsetYSize = Math.max(bufferSize, sYOpts.oSize ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(sYOpts.oSize) : browse.edge ? 10 : 0);
         scrollYStore.offsetSize = offsetYSize;
         scrollYStore.visibleSize = visibleYSize;
         scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
@@ -11937,7 +11946,7 @@ const Methods = {
   }
 };
 // Module methods
-const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,getPrintHtml,exportData,openImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom'.split(',');
+const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom'.split(',');
 funcs.forEach(name => {
   Methods[name] = function (...args) {
     if (true) {
@@ -12287,7 +12296,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     key: columnKey || columnOpts.useKey ? column.id : $columnIndex,
     attrs,
     style: Object.assign({
-      height: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : scrollYLoad ? `${rest.height || scrollYRHeight || rowHeight}px` : ''
+      height: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : scrollYLoad ? `${rest.height || 24}px` : ''
     }, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(compCellStyle) ? compCellStyle(params) : compCellStyle, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(cellStyle) ? cellStyle(params) : cellStyle),
     on: tdOns
   }, tdVNs);
@@ -15057,7 +15066,8 @@ const {
 const {
   getI18n: import_panel_getI18n,
   getIcon: import_panel_getIcon,
-  globalMixins
+  globalMixins,
+  renderEmptyElement: import_panel_renderEmptyElement
 } = core_.VxeUI;
 /* harmony default export */ var import_panel = ({
   name: 'VxeTableImportPanel',
@@ -15070,6 +15080,11 @@ const {
     // VxeModal,
     // VxeRadio
   },
+  inject: {
+    $xeTable: {
+      default: null
+    }
+  },
   data() {
     return {
       loading: false
@@ -15117,6 +15132,8 @@ const {
     }
   },
   render(h) {
+    const $xeTable = this.$xeTable;
+    const importOpts = $xeTable.importOpts;
     const {
       hasFile,
       parseTypeLabel,
@@ -15124,17 +15141,27 @@ const {
       storeData,
       selectName
     } = this;
+    const slots = importOpts.slots || {};
+    const topSlot = slots.top;
+    const bottomSlot = slots.bottom;
+    const defaultSlot = slots.default;
+    const footerSlot = slots.footer;
     return h('vxe-modal', {
       ref: 'modal',
       props: {
+        id: 'VXE_IMPORT_MODAL',
         value: storeData.visible,
         title: import_panel_getI18n('vxe.import.impTitle'),
         width: 540,
+        minWidth: 360,
+        minHeight: 240,
         mask: true,
         lockView: true,
-        showFooter: false,
+        showFooter: true,
         escClosable: true,
         maskClosable: true,
+        showMaximize: true,
+        resize: true,
         loading: this.loading
       },
       on: {
@@ -15142,59 +15169,88 @@ const {
           storeData.visible = value;
         },
         show: this.showEvent
-      }
-    }, [h('div', {
-      class: 'vxe-export--panel'
-    }, [h('table', {
-      attrs: {
-        cellspacing: 0,
-        cellpadding: 0,
-        border: 0
-      }
-    }, [h('tbody', [h('tr', [h('td', import_panel_getI18n('vxe.import.impFile')), h('td', [hasFile ? h('div', {
-      class: 'vxe-import-selected--file',
-      attrs: {
-        title: selectName
-      }
-    }, [h('span', selectName), h('i', {
-      class: import_panel_getIcon().INPUT_CLEAR,
-      on: {
-        click: this.clearFileEvent
-      }
-    })]) : h('button', {
-      ref: 'fileBtn',
-      class: 'vxe-import-select--file',
-      attrs: {
-        type: 'button'
       },
-      on: {
-        click: this.selectFileEvent
-      }
-    }, import_panel_getI18n('vxe.import.impSelect'))])]), h('tr', [h('td', import_panel_getI18n('vxe.import.impType')), h('td', parseTypeLabel)]), h('tr', [h('td', import_panel_getI18n('vxe.import.impMode')), h('td', [h('vxe-select', {
-      props: {
-        value: defaultOptions.mode,
-        options: storeData.modeList
-      },
-      on: {
-        input(value) {
-          defaultOptions.mode = value;
+      scopedSlots: {
+        default: () => {
+          const params = {
+            $table: $xeTable,
+            $grid: $xeTable.xegrid,
+            options: importOpts,
+            params: importOpts.params
+          };
+          return h('div', {
+            class: 'vxe-table-export--panel'
+          }, [topSlot ? h('div', {
+            class: 'vxe-table-export--panel-top'
+          }, $xeTable.callSlot(topSlot, params, h)) : import_panel_renderEmptyElement(this), h('div', {
+            class: 'vxe-table-export--panel-body'
+          }, defaultSlot ? $xeTable.callSlot(defaultSlot, params, h) : [h('table', {
+            class: 'vxe-table-export--panel-table',
+            attrs: {
+              cellspacing: 0,
+              cellpadding: 0,
+              border: 0
+            }
+          }, [h('tbody', [h('tr', [h('td', import_panel_getI18n('vxe.import.impFile')), h('td', [hasFile ? h('div', {
+            class: 'vxe-table-export--selected--file',
+            attrs: {
+              title: selectName
+            }
+          }, [h('span', selectName), h('i', {
+            class: import_panel_getIcon().INPUT_CLEAR,
+            on: {
+              click: this.clearFileEvent
+            }
+          })]) : h('button', {
+            ref: 'fileBtn',
+            class: 'vxe-table-export--select--file',
+            attrs: {
+              type: 'button'
+            },
+            on: {
+              click: this.selectFileEvent
+            }
+          }, import_panel_getI18n('vxe.import.impSelect'))])]), h('tr', [h('td', import_panel_getI18n('vxe.import.impType')), h('td', parseTypeLabel)]), h('tr', [h('td', import_panel_getI18n('vxe.import.impMode')), h('td', [h('vxe-select', {
+            props: {
+              value: defaultOptions.mode,
+              options: storeData.modeList
+            },
+            on: {
+              input(value) {
+                defaultOptions.mode = value;
+              }
+            }
+          })])])])])]), bottomSlot ? h('div', {
+            class: 'vxe-table-export--panel-bottom'
+          }, $xeTable.callSlot(bottomSlot, params, h)) : import_panel_renderEmptyElement(this)]);
+        },
+        footer: () => {
+          const params = {
+            $table: $xeTable,
+            $grid: $xeTable.xegrid,
+            options: importOpts,
+            params: importOpts.params
+          };
+          return h('div', {
+            class: 'vxe-table-export--panel-footer'
+          }, footerSlot ? $xeTable.callSlot(footerSlot, params, h) : [h('div', {
+            class: 'vxe-table-export--panel-btns'
+          }, [h('vxe-button', {
+            on: {
+              click: this.cancelEvent
+            }
+          }, import_panel_getI18n('vxe.import.impCancel')), h('vxe-button', {
+            props: {
+              status: 'primary',
+              disabled: !hasFile
+            },
+            on: {
+              click: this.importEvent
+            }
+          }, import_panel_getI18n('vxe.import.impConfirm'))])]);
         }
       }
-    })])])])]), h('div', {
-      class: 'vxe-export--panel-btns'
-    }, [h('vxe-button', {
-      on: {
-        click: this.cancelEvent
-      }
-    }, import_panel_getI18n('vxe.import.impCancel')), h('vxe-button', {
-      props: {
-        status: 'primary',
-        disabled: !hasFile
-      },
-      on: {
-        click: this.importEvent
-      }
-    }, import_panel_getI18n('vxe.import.impConfirm'))])])]);
+    });
   },
   methods: {
     clearFileEvent() {
@@ -15250,7 +15306,8 @@ const {
 const {
   getI18n: export_panel_getI18n,
   getIcon: export_panel_getIcon,
-  globalMixins: export_panel_globalMixins
+  globalMixins: export_panel_globalMixins,
+  renderEmptyElement: export_panel_renderEmptyElement
 } = core_.VxeUI;
 /* harmony default export */ var export_panel = ({
   name: 'VxeTableExportPanel',
@@ -15266,6 +15323,11 @@ const {
     // VxeSelect,
     // VxeOption
   },
+  inject: {
+    $xeTable: {
+      default: null
+    }
+  },
   data() {
     return {
       isAll: false,
@@ -15322,6 +15384,8 @@ const {
     }
   },
   render(h) {
+    const $xeTable = this.$xeTable;
+    const exportOpts = $xeTable.exportOpts;
     const {
       _e,
       checkedAll,
@@ -15337,20 +15401,27 @@ const {
       hasTree,
       hasMerge,
       isPrint,
-      hasColgroup
+      hasColgroup,
+      columns
     } = storeData;
     const {
       isHeader
     } = defaultOptions;
+    const slots = exportOpts.slots || {};
+    const topSlot = slots.top;
+    const bottomSlot = slots.bottom;
+    const defaultSlot = slots.default;
+    const footerSlot = slots.footer;
+    const parameterSlot = slots.parameter;
     const cols = [];
-    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(storeData.columns, column => {
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(columns, column => {
       const colTitle = formatText(column.getTitle(), 1);
       const isColGroup = column.children && column.children.length;
       const isChecked = column.checked;
       const indeterminate = column.halfChecked;
       const isHtml = column.type === 'html';
       cols.push(h('li', {
-        class: ['vxe-export--panel-column-option', `level--${column.level}`, {
+        class: ['vxe-table-export--panel-column-option', `level--${column.level}`, {
           'is--group': isColGroup,
           'is--checked': isChecked,
           'is--indeterminate': indeterminate,
@@ -15382,14 +15453,19 @@ const {
     return h('vxe-modal', {
       ref: 'modal',
       props: {
+        id: 'VXE_EXPORT_MODAL',
         value: storeData.visible,
         title: export_panel_getI18n(isPrint ? 'vxe.export.printTitle' : 'vxe.export.expTitle'),
         width: 660,
+        minWidth: 500,
+        minHeight: 400,
         mask: true,
         lockView: true,
-        showFooter: false,
+        showFooter: true,
         escClosable: true,
         maskClosable: true,
+        showMaximize: true,
+        resize: true,
         loading: this.loading
       },
       on: {
@@ -15397,187 +15473,220 @@ const {
           storeData.visible = value;
         },
         show: this.showEvent
-      }
-    }, [h('div', {
-      class: 'vxe-export--panel'
-    }, [h('table', {
-      attrs: {
-        cellspacing: 0,
-        cellpadding: 0,
-        border: 0
-      }
-    }, [h('tbody', [[isPrint ? _e() : h('tr', [h('td', export_panel_getI18n('vxe.export.expName')), h('td', [h('vxe-input', {
-      ref: 'filename',
-      props: {
-        value: defaultOptions.filename,
-        type: 'text',
-        clearable: true,
-        placeholder: export_panel_getI18n('vxe.export.expNamePlaceholder')
-      },
-      on: {
-        modelValue(value) {
-          defaultOptions.filename = value;
-        }
-      }
-    })])]), isPrint ? _e() : h('tr', [h('td', export_panel_getI18n('vxe.export.expType')), h('td', [h('vxe-select', {
-      props: {
-        value: defaultOptions.type,
-        options: storeData.typeList
-      },
-      on: {
-        input(value) {
-          defaultOptions.type = value;
-        }
-      }
-    })])]), isPrint || showSheet ? h('tr', [h('td', export_panel_getI18n('vxe.export.expSheetName')), h('td', [h('vxe-input', {
-      ref: 'sheetname',
-      props: {
-        value: defaultOptions.sheetName,
-        type: 'text',
-        clearable: true,
-        placeholder: export_panel_getI18n('vxe.export.expSheetNamePlaceholder')
-      },
-      on: {
-        modelValue(value) {
-          defaultOptions.sheetName = value;
-        }
-      }
-    })])]) : _e(), h('tr', [h('td', export_panel_getI18n('vxe.export.expMode')), h('td', [h('vxe-select', {
-      props: {
-        value: defaultOptions.mode,
-        options: storeData.modeList
       },
-      on: {
-        input(value) {
-          defaultOptions.mode = value;
-        }
-      }
-    })])]), h('tr', [h('td', [export_panel_getI18n('vxe.export.expColumn')]), h('td', [h('div', {
-      class: 'vxe-export--panel-column'
-    }, [h('ul', {
-      class: 'vxe-export--panel-column-header'
-    }, [h('li', {
-      class: ['vxe-export--panel-column-option', {
-        'is--checked': isAllChecked,
-        'is--indeterminate': isAllIndeterminate
-      }],
-      attrs: {
-        title: export_panel_getI18n('vxe.table.allTitle')
-      },
-      on: {
-        click: this.allColumnEvent
-      }
-    }, [h('span', {
-      class: ['vxe-checkbox--icon', isAllIndeterminate ? export_panel_getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? export_panel_getIcon().TABLE_CHECKBOX_CHECKED : export_panel_getIcon().TABLE_CHECKBOX_UNCHECKED]
-    }), h('span', {
-      class: 'vxe-checkbox--label'
-    }, export_panel_getI18n('vxe.export.expCurrentColumn'))])]), h('ul', {
-      class: 'vxe-export--panel-column-body'
-    }, cols)])])]), h('tr', [h('td', export_panel_getI18n('vxe.export.expOpts')), h('td', [h('div', {
-      class: 'vxe-export--panel-option-row'
-    }, [h('vxe-checkbox', {
-      props: {
-        value: isHeader,
-        title: export_panel_getI18n('vxe.export.expHeaderTitle'),
-        content: export_panel_getI18n('vxe.export.expOptHeader')
-      },
-      on: {
-        input(value) {
-          defaultOptions.isHeader = value;
-        }
-      }
-    }), h('vxe-checkbox', {
-      props: {
-        value: defaultOptions.isFooter,
-        disabled: !storeData.hasFooter,
-        title: export_panel_getI18n('vxe.export.expFooterTitle'),
-        content: export_panel_getI18n('vxe.export.expOptFooter')
-      },
-      on: {
-        input(value) {
-          defaultOptions.isFooter = value;
-        }
-      }
-    }), h('vxe-checkbox', {
-      props: {
-        value: defaultOptions.original,
-        title: export_panel_getI18n('vxe.export.expOriginalTitle'),
-        content: export_panel_getI18n('vxe.export.expOptOriginal')
-      },
-      on: {
-        input(value) {
-          defaultOptions.original = value;
-        }
-      }
-    })]), h('div', {
-      class: 'vxe-export--panel-option-row'
-    }, [h('vxe-checkbox', {
-      props: {
-        value: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
-        disabled: !isHeader || !hasColgroup || !supportMerge,
-        title: export_panel_getI18n('vxe.export.expColgroupTitle'),
-        content: export_panel_getI18n('vxe.export.expOptColgroup')
-      },
-      on: {
-        input(value) {
-          defaultOptions.isColgroup = value;
-        }
-      }
-    }), h('vxe-checkbox', {
-      props: {
-        value: hasMerge && supportMerge && checkedAll ? defaultOptions.isMerge : false,
-        disabled: !hasMerge || !supportMerge || !checkedAll,
-        title: export_panel_getI18n('vxe.export.expMergeTitle'),
-        content: export_panel_getI18n('vxe.export.expOptMerge')
-      },
-      on: {
-        input(value) {
-          defaultOptions.isMerge = value;
-        }
-      }
-    }), isPrint ? _e() : h('vxe-checkbox', {
-      props: {
-        value: supportStyle ? defaultOptions.useStyle : false,
-        disabled: !supportStyle,
-        title: export_panel_getI18n('vxe.export.expUseStyleTitle'),
-        content: export_panel_getI18n('vxe.export.expOptUseStyle')
-      },
-      on: {
-        input(value) {
-          defaultOptions.useStyle = value;
-        }
-      }
-    }), h('vxe-checkbox', {
-      props: {
-        value: hasTree ? defaultOptions.isAllExpand : false,
-        disabled: !hasTree,
-        title: export_panel_getI18n('vxe.export.expAllExpandTitle'),
-        content: export_panel_getI18n('vxe.export.expOptAllExpand')
-      },
-      on: {
-        input(value) {
-          defaultOptions.isAllExpand = value;
+      scopedSlots: {
+        default: () => {
+          const params = {
+            $table: $xeTable,
+            $grid: $xeTable.xegrid,
+            options: exportOpts,
+            columns,
+            params: exportOpts.params
+          };
+          return h('div', {
+            class: 'vxe-table-export--panel'
+          }, [topSlot ? h('div', {
+            class: 'vxe-table-export--panel-top'
+          }, $xeTable.callSlot(topSlot, params, h)) : export_panel_renderEmptyElement(this), h('div', {
+            class: 'vxe-table-export--panel-body'
+          }, defaultSlot ? $xeTable.callSlot(defaultSlot, params, h) : [h('table', {
+            attrs: {
+              class: 'vxe-table-export--panel-table',
+              cellspacing: 0,
+              cellpadding: 0,
+              border: 0
+            }
+          }, [h('tbody', [[isPrint ? _e() : h('tr', [h('td', export_panel_getI18n('vxe.export.expName')), h('td', [h('vxe-input', {
+            ref: 'filename',
+            props: {
+              value: defaultOptions.filename,
+              type: 'text',
+              clearable: true,
+              placeholder: export_panel_getI18n('vxe.export.expNamePlaceholder')
+            },
+            on: {
+              modelValue(value) {
+                defaultOptions.filename = value;
+              }
+            }
+          })])]), isPrint ? _e() : h('tr', [h('td', export_panel_getI18n('vxe.export.expType')), h('td', [h('vxe-select', {
+            props: {
+              value: defaultOptions.type,
+              options: storeData.typeList
+            },
+            on: {
+              input(value) {
+                defaultOptions.type = value;
+              }
+            }
+          })])]), isPrint || showSheet ? h('tr', [h('td', export_panel_getI18n('vxe.export.expSheetName')), h('td', [h('vxe-input', {
+            ref: 'sheetname',
+            props: {
+              value: defaultOptions.sheetName,
+              type: 'text',
+              clearable: true,
+              placeholder: export_panel_getI18n('vxe.export.expSheetNamePlaceholder')
+            },
+            on: {
+              modelValue(value) {
+                defaultOptions.sheetName = value;
+              }
+            }
+          })])]) : _e(), h('tr', [h('td', export_panel_getI18n('vxe.export.expMode')), h('td', [h('vxe-select', {
+            props: {
+              value: defaultOptions.mode,
+              options: storeData.modeList
+            },
+            on: {
+              input(value) {
+                defaultOptions.mode = value;
+              }
+            }
+          })])]), h('tr', [h('td', [export_panel_getI18n('vxe.export.expColumn')]), h('td', [h('div', {
+            class: 'vxe-table-export--panel-column'
+          }, [h('ul', {
+            class: 'vxe-table-export--panel-column-header'
+          }, [h('li', {
+            class: ['vxe-table-export--panel-column-option', {
+              'is--checked': isAllChecked,
+              'is--indeterminate': isAllIndeterminate
+            }],
+            attrs: {
+              title: export_panel_getI18n('vxe.table.allTitle')
+            },
+            on: {
+              click: this.allColumnEvent
+            }
+          }, [h('span', {
+            class: ['vxe-checkbox--icon', isAllIndeterminate ? export_panel_getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? export_panel_getIcon().TABLE_CHECKBOX_CHECKED : export_panel_getIcon().TABLE_CHECKBOX_UNCHECKED]
+          }), h('span', {
+            class: 'vxe-checkbox--label'
+          }, export_panel_getI18n('vxe.export.expCurrentColumn'))])]), h('ul', {
+            class: 'vxe-table-export--panel-column-body'
+          }, cols)])])]), h('tr', [h('td', export_panel_getI18n('vxe.export.expOpts')), parameterSlot ? h('td', [h('div', {
+            class: 'vxe-table-export--panel-option-row'
+          }, $xeTable.callSlot(parameterSlot, params))]) : h('td', [h('div', {
+            class: 'vxe-table-export--panel-option-row'
+          }, [h('vxe-checkbox', {
+            props: {
+              value: isHeader,
+              title: export_panel_getI18n('vxe.export.expHeaderTitle'),
+              content: export_panel_getI18n('vxe.export.expOptHeader')
+            },
+            on: {
+              input(value) {
+                defaultOptions.isHeader = value;
+              }
+            }
+          }), h('vxe-checkbox', {
+            props: {
+              value: defaultOptions.isFooter,
+              disabled: !storeData.hasFooter,
+              title: export_panel_getI18n('vxe.export.expFooterTitle'),
+              content: export_panel_getI18n('vxe.export.expOptFooter')
+            },
+            on: {
+              input(value) {
+                defaultOptions.isFooter = value;
+              }
+            }
+          }), h('vxe-checkbox', {
+            props: {
+              value: defaultOptions.original,
+              title: export_panel_getI18n('vxe.export.expOriginalTitle'),
+              content: export_panel_getI18n('vxe.export.expOptOriginal')
+            },
+            on: {
+              input(value) {
+                defaultOptions.original = value;
+              }
+            }
+          })]), h('div', {
+            class: 'vxe-table-export--panel-option-row'
+          }, [h('vxe-checkbox', {
+            props: {
+              value: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
+              disabled: !isHeader || !hasColgroup || !supportMerge,
+              title: export_panel_getI18n('vxe.export.expColgroupTitle'),
+              content: export_panel_getI18n('vxe.export.expOptColgroup')
+            },
+            on: {
+              input(value) {
+                defaultOptions.isColgroup = value;
+              }
+            }
+          }), h('vxe-checkbox', {
+            props: {
+              value: hasMerge && supportMerge && checkedAll ? defaultOptions.isMerge : false,
+              disabled: !hasMerge || !supportMerge || !checkedAll,
+              title: export_panel_getI18n('vxe.export.expMergeTitle'),
+              content: export_panel_getI18n('vxe.export.expOptMerge')
+            },
+            on: {
+              input(value) {
+                defaultOptions.isMerge = value;
+              }
+            }
+          }), isPrint ? _e() : h('vxe-checkbox', {
+            props: {
+              value: supportStyle ? defaultOptions.useStyle : false,
+              disabled: !supportStyle,
+              title: export_panel_getI18n('vxe.export.expUseStyleTitle'),
+              content: export_panel_getI18n('vxe.export.expOptUseStyle')
+            },
+            on: {
+              input(value) {
+                defaultOptions.useStyle = value;
+              }
+            }
+          }), h('vxe-checkbox', {
+            props: {
+              value: hasTree ? defaultOptions.isAllExpand : false,
+              disabled: !hasTree,
+              title: export_panel_getI18n('vxe.export.expAllExpandTitle'),
+              content: export_panel_getI18n('vxe.export.expOptAllExpand')
+            },
+            on: {
+              input(value) {
+                defaultOptions.isAllExpand = value;
+              }
+            }
+          })])])])]])])]), bottomSlot ? h('div', {
+            class: 'vxe-table-export--panel-bottom'
+          }, $xeTable.callSlot(bottomSlot, params, h)) : export_panel_renderEmptyElement(this)]);
+        },
+        footer: () => {
+          const params = {
+            $table: $xeTable,
+            $grid: $xeTable.xegrid,
+            options: exportOpts,
+            columns,
+            params: exportOpts.params
+          };
+          return h('div', {
+            class: 'vxe-table-export--panel-footer'
+          }, footerSlot ? $xeTable.callSlot(footerSlot, params) : [h('div', {
+            class: 'vxe-table-export--panel-btns'
+          }, [h('vxe-button', {
+            props: {
+              content: export_panel_getI18n('vxe.export.expCancel')
+            },
+            on: {
+              click: this.cancelEvent
+            }
+          }), h('vxe-button', {
+            ref: 'confirmBtn',
+            props: {
+              status: 'primary',
+              content: export_panel_getI18n(isPrint ? 'vxe.export.expPrint' : 'vxe.export.expConfirm')
+            },
+            on: {
+              click: this.confirmEvent
+            }
+          })])]);
         }
       }
-    })])])])]])]), h('div', {
-      class: 'vxe-export--panel-btns'
-    }, [h('vxe-button', {
-      props: {
-        content: export_panel_getI18n('vxe.export.expCancel')
-      },
-      on: {
-        click: this.cancelEvent
-      }
-    }), h('vxe-button', {
-      ref: 'confirmBtn',
-      props: {
-        status: 'primary',
-        content: export_panel_getI18n(isPrint ? 'vxe.export.expPrint' : 'vxe.export.expConfirm')
-      },
-      on: {
-        click: this.confirmEvent
-      }
-    })])])]);
+    });
   },
   methods: {
     changeOption(column) {
@@ -15667,9 +15776,10 @@ const {
       $xetable.print(Object.assign({}, $xetable.printOpts, this.getExportOption()));
     },
     exportEvent() {
-      const $xetable = this.$parent;
+      const $xeTable = this.$xeTable;
+      const exportOpts = $xeTable.exportOpts;
       this.loading = true;
-      $xetable.exportData(Object.assign({}, $xetable.exportOpts, this.getExportOption())).then(() => {
+      $xeTable.exportData(Object.assign({}, exportOpts, this.getExportOption())).then(() => {
         this.loading = false;
         this.storeData.visible = false;
       }).catch(() => {
@@ -18580,6 +18690,12 @@ function handleFileImport($xetable, file, opts) {
     return Promise.reject(e);
   });
 }
+function handleCloseExport() {
+  if (core_.VxeUI.modal) {
+    return core_.VxeUI.modal.close('VXE_EXPORT_MODAL');
+  }
+  return Promise.resolve();
+}
 /**
  * 读取本地文件
  * @param {*} options 参数
@@ -19172,6 +19288,12 @@ const convertToRows = originColumns => {
         };
       });
     },
+    _closeImport() {
+      if (core_.VxeUI.modal) {
+        return core_.VxeUI.modal.close('VXE_IMPORT_MODAL');
+      }
+      return Promise.resolve();
+    },
     _openImport(options) {
       const {
         importOpts
@@ -19230,6 +19352,7 @@ const convertToRows = originColumns => {
       }
       this.initStore.import = true;
     },
+    _closeExport: handleCloseExport,
     _openExport(options) {
       const {
         exportOpts
@@ -19241,6 +19364,7 @@ const convertToRows = originColumns => {
       }
       return handleExportAndPrint(this, Object.assign({}, exportOpts, options));
     },
+    _closePrint: handleCloseExport,
     _openPrint(options) {
       const {
         printOpts
@@ -25124,6 +25248,7 @@ const Toolbar = VxeToolbar;
       checkProp: '当数据量过大时可能会导致复选框卡顿，建议设置参数 "{0}" 提升渲染速度',
       coverProp: '"{0}" 的参数 "{1}" 重复定义，这可能会出现错误',
       uniField: '字段名 "{0}" 重复定义，这可能会出现错误',
+      repeatKey: '主键重复 {0}="{1}"，这可能会出现错误',
       delFunc: '方法 "{0}" 已废弃，请使用 "{1}"',
       delProp: '参数 "{0}" 已废弃，请使用 "{1}"',
       delEvent: '事件 "{0}" 已废弃，请使用 "{1}"',