vxe-table 4.7.0-alpha.5 → 4.7.0-alpha.8

package/README.en.md

@@ -12,7 +12,7 @@
 [![pull requests closed](https://img.shields.io/github/issues-pr-closed/x-extends/vxe-table.svg)](https://github.com/x-extends/vxe-table/pulls?q=is%3Apr+is%3Aclosed)
 [![npm license](https://img.shields.io/github/license/mashape/apistatus.svg)](LICENSE)
 
-A [vue](https://www.npmjs.com/package/vue) based PC form component, support add delete change check, virtual tree, column drag and drop, lazy loading, shortcut menu, data verification, print export, form rendering, custom template, renderer, JSON configuration...
+A [vue](https://www.npmjs.com/package/vue) based PC form component, support add delete change check, virtual tree, column drag and drop, lazy loading, shortcut menu, data verification, import/export/print, form rendering, custom template, renderer, JSON configuration...
 
 * Design concept
   * Efficient and concise API design for modern browsers.
@@ -24,6 +24,7 @@ A [vue](https://www.npmjs.com/package/vue) based PC form component, support add
   * [x] ~~v2.0 Based on vue2.6, Support for all major browsers.~~
   * [x] v3.0 Based on vue2.6, supports modern browsers and retains compatibility with IE11.
   * [x] v4.0 Based on vue3.x, Only support modern browser, not IE.
+  * [x] v4.7 Based on vue3.x, refactor the components, split the excess components, and keep only the table.
 
 ## Browser Support
 

package/README.md

@@ -12,7 +12,7 @@
 [![pull requests closed](https://img.shields.io/github/issues-pr-closed/x-extends/vxe-table.svg)](https://github.com/x-extends/vxe-table/pulls?q=is%3Apr+is%3Aclosed)
 [![npm license](https://img.shields.io/github/license/mashape/apistatus.svg)](LICENSE)
 
-一个基于 [vue](https://www.npmjs.com/package/vue) 的 PC 端表单/表格组件，支持增删改查、虚拟树、列拖拽、懒加载、快捷菜单、数据校验、打印导出、表单渲染、自定义模板、渲染器、JSON 配置式...  
+一个基于 [vue](https://www.npmjs.com/package/vue) 的 PC 端表单/表格组件，支持增删改查、虚拟树、列拖拽、懒加载、快捷菜单、数据校验、导入/导出/打印、表单渲染、自定义模板、渲染器、JSON 配置式...  
 
 * 设计理念
   * 面向现代浏览器，高效的简洁 API 设计
@@ -24,6 +24,7 @@
   * [x] ~~v2.0 基于 vue2.6，支持所有主流的浏览器，同时兼具功能与性能~~
   * [x] v3.0 基于 vue2.6，支持现代浏览器并保留兼容 IE11
   * [x] v4.0 基于 vue3.x，只支持现代浏览器，不支持 IE
+  * [x] v4.7 基于 vue3.x，重构组件，拆分多余组件，只保留表格
   * [ ] 下一阶段：sticky 渲染模式、将虚拟滚动提升到极致、虚拟滚动动态行高、数据图表可视化
 
 ## 浏览器支持

package/README.zh-TW.md

@@ -12,7 +12,7 @@
 [![pull requests closed](https://img.shields.io/github/issues-pr-closed/x-extends/vxe-table.svg)](https://github.com/x-extends/vxe-table/pulls?q=is%3Apr+is%3Aclosed)
 [![npm license](https://img.shields.io/github/license/mashape/apistatus.svg)](LICENSE)
 
-一個基於 [vue](https://www.npmjs.com/package/vue) 的PC端表格組件，支持增刪改查、虛擬樹、列拖拽、懶加載、快捷菜單、數據校驗、打印導出、表單渲染、自定義模板、渲染器、JSON 配置式…
+一個基於 [vue](https://www.npmjs.com/package/vue) 的PC端表格組件，支持增刪改查、虛擬樹、列拖拽、懶加載、快捷菜單、數據校驗、導入/匯出/列印、表單渲染、自定義模板、渲染器、JSON 配置式…
 
 * 設計理念
   * 面向現代瀏覽器，高效的簡潔 API 設計
@@ -24,6 +24,7 @@
   * [x] ~~v2.0 基於 vue2.6，支持所有主流的瀏覽器，同時兼具功能與效能~~
   * [x] v3.0 基於 vue2.6，支持現代瀏覽器並保留相容IE11
   * [x] v4.0 基于 vue3.x，只支持現代瀏覽器，不支持IE
+  * [x] v4.7 基於 vue3.x，重構組件，拆分多餘組件，只保留表格
 
 ## 瀏覽器支持
 

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

@@ -2,8 +2,6 @@ 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: {

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
@@ -21066,11 +21068,9 @@ __webpack_require__.r(__webpack_exports__);
 /* 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.5","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.8","BASE_URL":"/"}).VUE_APP_VXE_TABLE_VERSION;
 (0,_vxe_ui_core__WEBPACK_IMPORTED_MODULE_0__.setConfig)({
   emptyCell: '　',
-  exportTypes: [],
-  importTypes: [],
   table: {
     fit: true,
     showHeader: true,
@@ -21160,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: {