vxe-table 4.7.0-alpha.4 → 4.7.0-alpha.7

package/es/table/module/export/hook.js

@@ -1,6 +1,6 @@
 import { inject, nextTick } from 'vue';
 import XEUtils from 'xe-utils';
-import { VxeUI, getConfig, getI18n, hooks, renderer, log } from '@vxe-ui/core';
+import { VxeUI, getI18n, hooks, renderer, log } from '@vxe-ui/core';
 import { isColumnInfo, mergeBodyMethod, getCellValue } from '../../src/util';
 import { parseFile, formatText } from '../../../ui/src/utils';
 import { createHtmlPage, getExportBlobByContent } from './util';
@@ -807,8 +807,9 @@ hooks.add('tableExportModule', {
         const handleFileImport = (file, opts) => {
             const { importMethod, afterImportMethod } = opts;
             const { type, filename } = parseFile(file);
+            const importOpts = computeImportOpts.value;
             // 检查类型，如果为自定义导出，则不需要校验类型
-            if (!importMethod && !XEUtils.includes(getConfig().importTypes, type)) {
+            if (!importMethod && !XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)) {
                 if (opts.message !== false) {
                     if (VxeUI.modal) {
                         VxeUI.modal.message({ content: getI18n('vxe.error.notType', [type]), status: 'error' });
@@ -882,13 +883,14 @@ hooks.add('tableExportModule', {
             const { treeConfig, showHeader, showFooter } = props;
             const { initStore, mergeList, isGroup, footerTableData, exportStore, exportParams } = reactData;
             const { collectColumn } = internalData;
+            const exportOpts = computeExportOpts.value;
             const hasTree = treeConfig;
             const customOpts = computeCustomOpts.value;
             const selectRecords = $xeTable.getCheckboxRecords();
             const hasFooter = !!footerTableData.length;
             const hasMerge = !hasTree && mergeList.length;
             const defOpts = Object.assign({ message: true, isHeader: showHeader, isFooter: showFooter }, options);
-            const types = defOpts.types || getConfig().exportTypes;
+            const types = defOpts.types || XEUtils.keys(exportOpts._typeMaps);
             const modes = defOpts.modes;
             const checkMethod = customOpts.checkMethod;
             const exportColumns = collectColumn.slice(0);
@@ -1072,7 +1074,7 @@ hooks.add('tableExportModule', {
                     opts.sheetName = document.title;
                 }
                 // 检查类型，如果为自定义导出，则不需要校验类型
-                if (!opts.exportMethod && !XEUtils.includes(getConfig().exportTypes, type)) {
+                if (!opts.exportMethod && !XEUtils.includes(XEUtils.keys(exportOpts._typeMaps), type)) {
                     if (process.env.NODE_ENV === 'development') {
                         log.err('vxe.error.notType', [type]);
                     }
@@ -1148,7 +1150,7 @@ hooks.add('tableExportModule', {
             importData(options) {
                 const importOpts = computeImportOpts.value;
                 const opts = Object.assign({
-                    types: getConfig().importTypes
+                    types: XEUtils.keys(importOpts._typeMaps)
                     // beforeImportMethod: null,
                     // afterImportMethod: null
                 }, importOpts, options);
@@ -1211,7 +1213,7 @@ hooks.add('tableExportModule', {
                 const { treeConfig, importConfig } = props;
                 const { initStore, importStore, importParams } = reactData;
                 const importOpts = computeImportOpts.value;
-                const defOpts = Object.assign({ mode: 'insert', message: true, types: getConfig().importTypes }, options, importOpts);
+                const defOpts = Object.assign({ mode: 'insert', message: true, types: XEUtils.keys(importOpts._typeMaps) }, options, importOpts);
                 const { types } = defOpts;
                 const isTree = !!treeConfig;
                 if (isTree) {

package/es/table/src/table.js

@@ -6607,11 +6607,11 @@ export default defineComponent({
                     const { exportConfig, importConfig } = props;
                     const exportOpts = computeExportOpts.value;
                     const importOpts = computeImportOpts.value;
-                    if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(getConfig().importTypes, importOpts.types)) {
-                        log.warn('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter((type) => XEUtils.includes(getConfig().importTypes, type)).join(',') || getConfig().importTypes.join(',')]);
+                    if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(XEUtils.keys(importOpts._typeMaps), importOpts.types)) {
+                        log.warn('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter((type) => XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)).join(',') || XEUtils.keys(importOpts._typeMaps).join(',')]);
                     }
-                    if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !XEUtils.includeArrays(getConfig().exportTypes, exportOpts.types)) {
-                        log.warn('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter((type) => XEUtils.includes(getConfig().exportTypes, type)).join(',') || getConfig().exportTypes.join(',')]);
+                    if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !XEUtils.includeArrays(XEUtils.keys(exportOpts._typeMaps), exportOpts.types)) {
+                        log.warn('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter((type) => XEUtils.includes(XEUtils.keys(exportOpts._typeMaps), type)).join(',') || XEUtils.keys(exportOpts._typeMaps).join(',')]);
                     }
                 }
                 if (process.env.NODE_ENV === 'development') {

package/es/ui/index.js

@@ -1,9 +1,7 @@
-import { VxeUI, setConfig, setIcon } from '@vxe-ui/core';
+import { VxeUI, setConfig, setIcon, log } from '@vxe-ui/core';
 VxeUI.tableVersion = process.env.VUE_APP_VXE_TABLE_VERSION;
 setConfig({
     emptyCell: '　',
-    exportTypes: [],
-    importTypes: [],
     table: {
         fit: true,
         showHeader: true,
@@ -93,9 +91,16 @@ setConfig({
             showAsterisk: true
         },
         importConfig: {
+            _typeMaps: {},
             modes: ['insert', 'covering']
         },
         exportConfig: {
+            _typeMaps: {
+                csv: 1,
+                html: 1,
+                xml: 1,
+                txt: 1
+            },
             modes: ['current', 'selected']
         },
         printConfig: {
@@ -216,5 +221,15 @@ setIcon({
     TOOLBAR_TOOLS_FIXED_RIGHT: iconPrefix + 'fixed-right',
     TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE: iconPrefix + 'fixed-right-fill'
 });
+export function config(options) {
+    log.warn('vxe.error.delFunc', ['config', 'setConfig']);
+    return setConfig(options);
+}
+export function setup(options) {
+    log.warn('vxe.error.delFunc', ['setup', 'setConfig']);
+    return setConfig(options);
+}
+// 兼容老版本
+export const VXETable = VxeUI;
 export * from '@vxe-ui/core';
 export default VxeUI;

package/lib/index.umd.js

@@ -12584,11 +12584,11 @@ const sortStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_SORT';
           } = props;
           const exportOpts = computeExportOpts.value;
           const importOpts = computeImportOpts.value;
-          if (importConfig && importOpts.types && !importOpts.importMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays((0,core_.getConfig)().importTypes, importOpts.types)) {
-            core_.log.warn('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter(type => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes((0,core_.getConfig)().importTypes, type)).join(',') || (0,core_.getConfig)().importTypes.join(',')]);
+          if (importConfig && importOpts.types && !importOpts.importMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps), importOpts.types)) {
+            core_.log.warn('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter(type => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps), type)).join(',') || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps).join(',')]);
           }
-          if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays((0,core_.getConfig)().exportTypes, exportOpts.types)) {
-            core_.log.warn('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter(type => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes((0,core_.getConfig)().exportTypes, type)).join(',') || (0,core_.getConfig)().exportTypes.join(',')]);
+          if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps), exportOpts.types)) {
+            core_.log.warn('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter(type => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps), type)).join(',') || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps).join(',')]);
           }
         }
         if (true) {
@@ -15735,8 +15735,9 @@ core_.hooks.add('tableExportModule', {
         type,
         filename
       } = (0,utils/* parseFile */.CJ)(file);
+      const importOpts = computeImportOpts.value;
       // 检查类型，如果为自定义导出，则不需要校验类型
-      if (!importMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes((0,core_.getConfig)().importTypes, type)) {
+      if (!importMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps), type)) {
         if (opts.message !== false) {
           if (core_.VxeUI.modal) {
             core_.VxeUI.modal.message({
@@ -15858,6 +15859,7 @@ core_.hooks.add('tableExportModule', {
       const {
         collectColumn
       } = internalData;
+      const exportOpts = computeExportOpts.value;
       const hasTree = treeConfig;
       const customOpts = computeCustomOpts.value;
       const selectRecords = $xeTable.getCheckboxRecords();
@@ -15868,7 +15870,7 @@ core_.hooks.add('tableExportModule', {
         isHeader: showHeader,
         isFooter: showFooter
       }, options);
-      const types = defOpts.types || (0,core_.getConfig)().exportTypes;
+      const types = defOpts.types || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps);
       const modes = defOpts.modes;
       const checkMethod = customOpts.checkMethod;
       const exportColumns = collectColumn.slice(0);
@@ -16073,7 +16075,7 @@ core_.hooks.add('tableExportModule', {
           opts.sheetName = document.title;
         }
         // 检查类型，如果为自定义导出，则不需要校验类型
-        if (!opts.exportMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes((0,core_.getConfig)().exportTypes, type)) {
+        if (!opts.exportMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps), type)) {
           if (true) {
             core_.log.err('vxe.error.notType', [type]);
           }
@@ -16167,7 +16169,7 @@ core_.hooks.add('tableExportModule', {
       importData(options) {
         const importOpts = computeImportOpts.value;
         const opts = Object.assign({
-          types: (0,core_.getConfig)().importTypes
+          types: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps)
           // beforeImportMethod: null,
           // afterImportMethod: null
         }, importOpts, options);
@@ -16254,7 +16256,7 @@ core_.hooks.add('tableExportModule', {
         const defOpts = Object.assign({
           mode: 'insert',
           message: true,
-          types: (0,core_.getConfig)().importTypes
+          types: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps)
         }, options, importOpts);
         const {
           types
@@ -21055,17 +21057,20 @@ const Toolbar = VxeToolbar;
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 __webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   VXETable: function() { return /* binding */ VXETable; },
+/* harmony export */   config: function() { return /* binding */ config; },
+/* harmony export */   setup: function() { return /* binding */ setup; }
+/* harmony export */ });
 /* harmony import */ var _vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8514);
 /* harmony import */ var _vxe_ui_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ var __WEBPACK_REEXPORT_OBJECT__ = {};
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__) if(__WEBPACK_IMPORT_KEY__ !== "default") __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = function(key) { return _vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__[key]; }.bind(0, __WEBPACK_IMPORT_KEY__)
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__) if(["default","config","setup","VXETable"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = function(key) { return _vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__[key]; }.bind(0, __WEBPACK_IMPORT_KEY__)
 /* harmony reexport (unknown) */ __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
 
-_vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__.VxeUI.tableVersion = ({"NODE_ENV":"production","VUE_APP_VXE_ENV":"development","VUE_APP_VXE_VERSION":"4.7.0-alpha.4","BASE_URL":"/"}).VUE_APP_VXE_TABLE_VERSION;
+_vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__.VxeUI.tableVersion = ({"NODE_ENV":"production","VUE_APP_VXE_ENV":"development","VUE_APP_VXE_VERSION":"4.7.0-alpha.6","BASE_URL":"/"}).VUE_APP_VXE_TABLE_VERSION;
 (0,_vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__.setConfig)({
   emptyCell: '　',
-  exportTypes: [],
-  importTypes: [],
   table: {
     fit: true,
     showHeader: true,
@@ -21155,9 +21160,16 @@ _vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__.VxeUI.tableVersion = ({"NODE_ENV":"pro
       showAsterisk: true
     },
     importConfig: {
+      _typeMaps: {},
       modes: ['insert', 'covering']
     },
     exportConfig: {
+      _typeMaps: {
+        csv: 1,
+        html: 1,
+        xml: 1,
+        txt: 1
+      },
       modes: ['current', 'selected']
     },
     printConfig: {
@@ -21278,6 +21290,16 @@ const iconPrefix = 'vxe-icon-';
   TOOLBAR_TOOLS_FIXED_RIGHT: iconPrefix + 'fixed-right',
   TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE: iconPrefix + 'fixed-right-fill'
 });
+function config(options) {
+  _vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__.log.warn('vxe.error.delFunc', ['config', 'setConfig']);
+  return (0,_vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__.setConfig)(options);
+}
+function setup(options) {
+  _vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__.log.warn('vxe.error.delFunc', ['setup', 'setConfig']);
+  return (0,_vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__.setConfig)(options);
+}
+// 兼容老版本
+const VXETable = _vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__.VxeUI;
 
 /* harmony default export */ __webpack_exports__["default"] = (_vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__.VxeUI);