vxe-table 3.15.29 → 3.15.31

package/es/table/module/edit/mixin.js

@@ -75,10 +75,8 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
             fullAllDataRowIdData[rowid] = rest;
         }
         else {
-            if (process.env.NODE_ENV === 'development') {
-                if (parentRowId) {
-                    warnLog('vxe.error.unableInsert');
-                }
+            if (parentRowId) {
+                warnLog('vxe.error.unableInsert');
             }
             afterFullData[funcName](item);
             tableFullTreeData[funcName](item);
@@ -159,11 +157,9 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
                     const parentLevel = parentRest ? parentRest.level : 0;
                     newRecords.forEach((item, i) => {
                         const rowid = getRowid($xeTable, item);
-                        if (process.env.NODE_ENV === 'development') {
-                            if (item[treeOpts.parentField]) {
-                                if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
-                                    errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`]);
-                                }
+                        if (item[treeOpts.parentField]) {
+                            if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
+                                errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`]);
                             }
                         }
                         if (parentRow) {
@@ -192,9 +188,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
                     }
                 }
                 else {
-                    if (process.env.NODE_ENV === 'development') {
-                        warnLog('vxe.error.unableInsert');
-                    }
+                    warnLog('vxe.error.unableInsert');
                     insertTreeRow($xeTable, newRecords, true);
                 }
             }
@@ -733,9 +727,7 @@ export default {
             syncActivedCell($xeTable);
         },
         _clearActived(row) {
-            if (process.env.NODE_ENV === 'development') {
-                warnLog('vxe.error.delFunc', ['clearActived', 'clearEdit']);
-            }
+            warnLog('vxe.error.delFunc', ['clearActived', 'clearEdit']);
             // 即将废弃
             return this.clearEdit(row);
         },
@@ -755,9 +747,7 @@ export default {
         },
         _getActiveRecord() {
             const $xeTable = this;
-            if (process.env.NODE_ENV === 'development') {
-                warnLog('vxe.error.delFunc', ['getActiveRecord', 'getEditRecord']);
-            }
+            warnLog('vxe.error.delFunc', ['getActiveRecord', 'getEditRecord']);
             // 即将废弃
             return $xeTable.getEditRecord();
         },
@@ -776,9 +766,7 @@ export default {
         },
         _isActiveByRow(row) {
             const $xeTable = this;
-            if (process.env.NODE_ENV === 'development') {
-                warnLog('vxe.error.delFunc', ['isActiveByRow', 'isEditByRow']);
-            }
+            warnLog('vxe.error.delFunc', ['isActiveByRow', 'isEditByRow']);
             // 即将废弃
             return $xeTable.isEditByRow(row);
         },
@@ -856,9 +844,7 @@ export default {
         },
         _setActiveRow(row) {
             const $xeTable = this;
-            if (process.env.NODE_ENV === 'development') {
-                warnLog('vxe.error.delFunc', ['setActiveRow', 'setEditRow']);
-            }
+            warnLog('vxe.error.delFunc', ['setActiveRow', 'setEditRow']);
             // 即将废弃
             return $xeTable.setEditRow(row);
         },
@@ -878,9 +864,7 @@ export default {
             return handleEditCell($xeTable, row, column, isPos);
         },
         _setActiveCell(row, fieldOrColumn) {
-            if (process.env.NODE_ENV === 'development') {
-                warnLog('vxe.error.delFunc', ['setActiveCell', 'setEditCell']);
-            }
+            warnLog('vxe.error.delFunc', ['setActiveCell', 'setEditCell']);
             // 即将废弃
             return this.setEditCell(row, fieldOrColumn);
         },

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

@@ -7,9 +7,6 @@ import { createHtmlPage, getExportBlobByContent } from './util';
 import { warnLog, errLog } from '../../../ui/src/log';
 const { getI18n, renderer } = VxeUI;
 let htmlCellElem;
-// 导入
-let fileForm;
-let fileInput;
 const csvBOM = '\ufeff';
 const enterSymbol = '\r\n';
 function hasTreeChildren($xeTable, row) {
@@ -34,7 +31,7 @@ function getSeq($xeTable, cellValue, row, $rowIndex, column, $columnIndex) {
     return cellValue;
 }
 function defaultFilterExportColumn(column) {
-    return column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type) > -1;
+    return !!column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type || '') === -1;
 }
 function toTableBorder(border) {
     if (border === true) {
@@ -532,53 +529,21 @@ function getContent($xeTable, opts, columns, datas) {
     }
     return '';
 }
-/**
- * 保存文件到本地
- * @param {*} options 参数
- */
-export function saveLocalFile(options) {
-    const { filename, type, content } = options;
-    const name = `${filename}.${type}`;
-    if (window.Blob) {
-        const blob = content instanceof Blob ? content : getExportBlobByContent(XEUtils.toValueString(content), options);
-        if (navigator.msSaveBlob) {
-            navigator.msSaveBlob(blob, name);
-        }
-        else {
-            const url = URL.createObjectURL(blob);
-            const linkElem = document.createElement('a');
-            linkElem.target = '_blank';
-            linkElem.download = name;
-            linkElem.href = url;
-            document.body.appendChild(linkElem);
-            linkElem.click();
-            document.body.removeChild(linkElem);
-            requestAnimationFrame(() => {
-                if (linkElem.parentNode) {
-                    linkElem.parentNode.removeChild(linkElem);
-                }
-                URL.revokeObjectURL(url);
-            });
-        }
-        return Promise.resolve();
-    }
-    return Promise.reject(new Error(getI18n('vxe.error.notExp')));
-}
 function downloadFile($xeTable, opts, content) {
     const { filename, type, download } = opts;
     if (!download) {
         const blob = getExportBlobByContent(content, opts);
         return Promise.resolve({ type, content, blob });
     }
-    saveLocalFile({ filename, type, content }).then(() => {
-        if (opts.message !== false) {
-            // 检测弹窗模块
-            if (!VxeUI.modal) {
-                errLog('vxe.error.reqModule', ['Modal']);
+    if (VxeUI.saveFile) {
+        VxeUI.saveFile({ filename, type, content }).then(() => {
+            if (opts.message !== false) {
+                if (VxeUI.modal) {
+                    VxeUI.modal.message({ content: getI18n('vxe.table.expSuccess'), status: 'success' });
+                }
             }
-            VxeUI.modal.message({ content: getI18n('vxe.table.expSuccess'), status: 'success' });
-        }
-    });
+        });
+    }
 }
 function clearColumnConvert(columns) {
     XEUtils.eachTree(columns, column => {
@@ -908,58 +873,6 @@ function handleCloseExport() {
     }
     return Promise.resolve();
 }
-/**
- * 读取本地文件
- * @param {*} options 参数
- */
-export function readLocalFile(options = {}) {
-    if (!fileForm) {
-        fileForm = document.createElement('form');
-        fileInput = document.createElement('input');
-        fileForm.className = 'vxe-table--file-form';
-        fileInput.name = 'file';
-        fileInput.type = 'file';
-        fileForm.appendChild(fileInput);
-        document.body.appendChild(fileForm);
-    }
-    return new Promise((resolve, reject) => {
-        const types = options.types || [];
-        const isAllType = !types.length || types.some((type) => type === '*');
-        fileInput.multiple = !!options.multiple;
-        fileInput.accept = isAllType ? '' : `.${types.join(', .')}`;
-        fileInput.onchange = (evnt) => {
-            const { files } = evnt.target;
-            const file = files[0];
-            let errType;
-            // 校验类型
-            if (!isAllType) {
-                for (let fIndex = 0; fIndex < files.length; fIndex++) {
-                    const { type } = parseFile(files[fIndex]);
-                    if (!XEUtils.includes(types, type)) {
-                        errType = type;
-                        break;
-                    }
-                }
-            }
-            if (!errType) {
-                resolve({ status: true, files, file });
-            }
-            else {
-                if (options.message !== false) {
-                    // 检测弹窗模块
-                    if (!VxeUI.modal) {
-                        errLog('vxe.error.reqModule', ['Modal']);
-                    }
-                    VxeUI.modal.message({ content: getI18n('vxe.error.notType', [errType]), status: 'error' });
-                }
-                const params = { status: false, files, file };
-                reject(params);
-            }
-        };
-        fileForm.reset();
-        fileInput.click();
-    });
-}
 function handleFilterColumns(exportOpts, column, columns) {
     return columns.some((item) => {
         if (isColumnInfo(item)) {
@@ -1000,7 +913,7 @@ function handleFilterFields(exportOpts, column, includeFields, excludeFields) {
         }
         return false;
     }
-    return exportOpts.original ? column.field : defaultFilterExportColumn(column);
+    return exportOpts.original ? !!column.field : defaultFilterExportColumn(column);
 }
 function handleExportAndPrint($xeTable, options, isPrint) {
     const props = $xeTable;
@@ -1054,7 +967,7 @@ function handleExportAndPrint($xeTable, options, isPrint) {
     });
     // 默认选中
     XEUtils.eachTree(exportColumns, (column, index, items, path, parent) => {
-        const isColGroup = column.children && column.children.length;
+        const isColGroup = column.children && column.children.length > 0;
         let isChecked = false;
         if (columns && columns.length) {
             isChecked = handleFilterColumns(defOpts, column, columns);
@@ -1188,8 +1101,8 @@ export default {
             const internalData = $xeTable;
             const $xeGrid = $xeTable.$xeGrid;
             const { treeConfig, showHeader, showFooter } = props;
-            const { mergeFooterList, isGroup } = reactData;
-            const { tableFullColumn, afterFullData, mergeBodyList, collectColumn } = internalData;
+            const { isGroup } = reactData;
+            const { tableFullColumn, afterFullData, collectColumn, mergeBodyList, mergeFooterList } = internalData;
             const exportOpts = $xeTable.computeExportOpts;
             const treeOpts = $xeTable.computeTreeOpts;
             const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : {};
@@ -1225,10 +1138,15 @@ export default {
             if (!mode) {
                 mode = selectRecords.length ? 'selected' : 'current';
             }
-            const customCols = columns && columns.length
-                ? columns
-                : XEUtils.searchTree(collectColumn, column => {
-                    const isColGroup = column.children && column.children.length;
+            let isCustomCol = false;
+            let customCols = [];
+            if (columns && columns.length) {
+                isCustomCol = true;
+                customCols = columns;
+            }
+            else {
+                customCols = XEUtils.searchTree(collectColumn, column => {
+                    const isColGroup = column.children && column.children.length > 0;
                     let isChecked = false;
                     if (columns && columns.length) {
                         isChecked = handleFilterColumns(opts, column, columns);
@@ -1241,10 +1159,11 @@ export default {
                     }
                     return isChecked;
                 }, { children: 'children', mapChildren: 'childNodes', original: true });
+            }
             const handleOptions = Object.assign({}, opts, { filename: '', sheetName: '' });
             // 如果设置源数据，则默认导出设置了字段的列
-            if (!customCols && !columnFilterMethod) {
-                handleOptions.columnFilterMethod = ({ column }) => {
+            if (!isCustomCol && !columnFilterMethod) {
+                columnFilterMethod = ({ column }) => {
                     if (excludeFields) {
                         if (XEUtils.includes(excludeFields, column.field)) {
                             return false;
@@ -1256,8 +1175,9 @@ export default {
                         }
                         return false;
                     }
-                    return original ? column.field : defaultFilterExportColumn(column);
+                    return original ? !!column.field : defaultFilterExportColumn(column);
                 };
+                handleOptions.columnFilterMethod = columnFilterMethod;
             }
             if (customCols) {
                 handleOptions._isCustomColumn = true;
@@ -1292,14 +1212,14 @@ export default {
                 }, {
                     children: 'childNodes',
                     mapChildren: '_children'
-                }), (column, index) => isColumnInfo(column) && (!columnFilterMethod || columnFilterMethod({ column: column, $columnIndex: index })), {
+                }), (column, index) => isColumnInfo(column) && (!columnFilterMethod || columnFilterMethod({ $table: $xeTable, column: column, $columnIndex: index })), {
                     children: '_children',
                     mapChildren: 'childNodes',
                     original: true
                 });
             }
             else {
-                groups = XEUtils.searchTree(isGroup ? collectColumn : tableFullColumn, (column, index) => column.visible && (!columnFilterMethod || columnFilterMethod({ column, $columnIndex: index })), { children: 'children', mapChildren: 'childNodes', original: true });
+                groups = XEUtils.searchTree(isGroup ? collectColumn : tableFullColumn, (column, index) => column.visible && (!columnFilterMethod || columnFilterMethod({ $table: $xeTable, column, $columnIndex: index })), { children: 'children', mapChildren: 'childNodes', original: true });
             }
             // 获取所有列
             const cols = [];
@@ -1345,10 +1265,8 @@ export default {
             // 检查类型，如果为自定义导出，则不需要校验类型
             if (!handleOptions.exportMethod && !XEUtils.includes(XEUtils.keys(exportOpts._typeMaps), type)) {
                 errLog('vxe.error.notType', [type]);
-                if (process.env.NODE_ENV === 'development') {
-                    if (['xlsx', 'pdf'].includes(type)) {
-                        warnLog('vxe.error.reqPlugin', [4, 'plugin-export-xlsx']);
-                    }
+                if (['xlsx', 'pdf'].includes(type)) {
+                    warnLog('vxe.error.reqPlugin', [4, 'plugin-export-xlsx']);
                 }
                 const params = { status: false };
                 return Promise.reject(params);
@@ -1369,10 +1287,8 @@ export default {
                     }
                 }
                 else if (mode === 'all') {
-                    if (process.env.NODE_ENV === 'development') {
-                        if (!$xeGrid) {
-                            warnLog('vxe.error.errProp', ['all', 'mode=current,selected']);
-                        }
+                    if (!$xeGrid) {
+                        errLog('vxe.error.errProp', ['all', 'mode=current,selected']);
                     }
                     if ($xeGrid && !handleOptions.remote) {
                         const gridReactData = $xeGrid;
@@ -1383,10 +1299,8 @@ export default {
                         const ajaxMethods = ajax.queryAll;
                         const queryAllSuccessMethods = ajax.queryAllSuccess;
                         const queryAllErrorMethods = ajax.queryAllError;
-                        if (process.env.NODE_ENV === 'development') {
-                            if (!ajaxMethods) {
-                                warnLog('vxe.error.notFunc', ['proxy-config.ajax.queryAll']);
-                            }
+                        if (!ajaxMethods) {
+                            errLog('vxe.error.notFunc', ['proxy-config.ajax.queryAll']);
                         }
                         if (ajaxMethods) {
                             const params = {
@@ -1425,14 +1339,16 @@ export default {
             return handleExport($xeTable, handleOptions);
         },
         _importByFile(file, options) {
+            const $xeTable = this;
             const opts = Object.assign({}, options);
             const { beforeImportMethod } = opts;
             if (beforeImportMethod) {
-                beforeImportMethod({ options: opts, $table: this });
+                beforeImportMethod({ options: opts, $table: $xeTable });
             }
-            return handleFileImport(this, file, opts);
+            return handleFileImport($xeTable, file, opts);
         },
         _importData(options) {
+            const $xeTable = this;
             const { importOpts } = this;
             const opts = Object.assign({
                 types: XEUtils.keys(importOpts._typeMaps)
@@ -1443,21 +1359,21 @@ export default {
             if (beforeImportMethod) {
                 beforeImportMethod({ options: opts, $table: this });
             }
-            return readLocalFile(opts).catch(e => {
+            return VxeUI.readFile(opts).catch(e => {
                 if (afterImportMethod) {
-                    afterImportMethod({ status: false, options: opts, $table: this });
+                    afterImportMethod({ status: false, options: opts, $table: $xeTable });
                 }
                 return Promise.reject(e);
             }).then((params) => {
                 const { file } = params;
-                return handleFileImport(this, file, opts);
+                return handleFileImport($xeTable, file, opts);
             });
         },
         _saveFile(options) {
-            return saveLocalFile(options);
+            return VxeUI.saveFile(options);
         },
         _readFile(options) {
-            return readLocalFile(options);
+            return VxeUI.readFile(options);
         },
         _print(options) {
             const $xeTable = this;
@@ -1560,23 +1476,28 @@ export default {
             return Promise.resolve();
         },
         _openImport(options) {
-            const { importOpts } = this;
+            const $xeTable = this;
+            const props = $xeTable;
+            const reactData = $xeTable;
+            const { treeConfig, importConfig } = props;
+            const { initStore, importStore, importParams } = reactData;
+            const importOpts = $xeTable.computeImportOpts;
             const defOpts = Object.assign({
                 mode: 'insertTop',
                 message: true,
                 types: XEUtils.keys(importOpts._typeMaps),
                 modes: ['insertTop', 'covering']
-            }, options, importOpts);
+            }, importOpts, options);
             const types = defOpts.types || [];
             const modes = defOpts.modes || [];
-            const isTree = !!this.getTreeStatus();
+            const isTree = !!treeConfig;
             if (isTree) {
                 if (defOpts.message) {
                     VxeUI.modal.message({ content: getI18n('vxe.error.treeNotImp'), status: 'error' });
                 }
                 return;
             }
-            if (!this.importConfig) {
+            if (!importConfig) {
                 errLog('vxe.error.reqProp', ['import-config']);
             }
             // 处理类型
@@ -1598,7 +1519,7 @@ export default {
                     label: getI18n(`vxe.import.modes.${item}`)
                 };
             });
-            Object.assign(this.importStore, {
+            Object.assign(importStore, {
                 file: null,
                 type: '',
                 filename: '',
@@ -1606,27 +1527,38 @@ export default {
                 typeList,
                 visible: true
             });
-            Object.assign(this.importParams, defOpts);
-            if (!modeList.some((item) => item.value === this.importParams.mode)) {
-                this.importParams.mode = modeList[0].value;
+            Object.assign(importParams, defOpts);
+            if (!modeList.some(item => item.value === importParams.mode)) {
+                importParams.mode = modeList[0].value;
             }
-            this.initStore.import = true;
+            initStore.import = true;
         },
         _closeExport: handleCloseExport,
         _openExport(options) {
-            const { exportOpts } = this;
-            if (!this.exportConfig) {
+            const $xeTable = this;
+            const props = $xeTable;
+            const exportOpts = $xeTable.computeExportOpts;
+            const defOpts = Object.assign({
+                message: true,
+                types: XEUtils.keys(exportOpts._typeMaps)
+            }, exportOpts, options);
+            if (!props.exportConfig) {
                 errLog('vxe.error.reqProp', ['export-config']);
             }
-            return handleExportAndPrint(this, Object.assign({}, exportOpts, options));
+            return handleExportAndPrint($xeTable, defOpts);
         },
         _closePrint: handleCloseExport,
         _openPrint(options) {
-            const { printOpts } = this;
-            if (!this.printConfig) {
+            const $xeTable = this;
+            const props = $xeTable;
+            const printOpts = $xeTable.computePrintOpts;
+            const defOpts = Object.assign({
+                message: true
+            }, printOpts, options);
+            if (!props.printConfig) {
                 errLog('vxe.error.reqProp', ['print-config']);
             }
-            return handleExportAndPrint(this, Object.assign({}, printOpts, options), true);
+            return handleExportAndPrint($xeTable, defOpts, true);
         }
     }
 };

package/es/table/module/menu/mixin.js

@@ -115,9 +115,7 @@ export default {
                         this.handleOpenMenuEvent(evnt, layout, params);
                         // 在 v4 中废弃事件 cell-context-menu、header-cell-context-menu、footer-cell-context-menu
                         if (this.$listeners[`${typePrefix}cell-context-menu`]) {
-                            if (process.env.NODE_ENV === 'development') {
-                                warnLog('vxe.error.delEvent', [`${typePrefix}cell-context-menu`, `${typePrefix}cell-menu`]);
-                            }
+                            warnLog('vxe.error.delEvent', [`${typePrefix}cell-context-menu`, `${typePrefix}cell-menu`]);
                             this.emitEvent(`${typePrefix}cell-context-menu`, params, evnt);
                         }
                         else {
@@ -274,9 +272,7 @@ export default {
                 }
                 // 在 v4 中废弃事件 context-menu-click
                 if (this.$listeners['context-menu-click']) {
-                    if (process.env.NODE_ENV === 'development') {
-                        warnLog('vxe.error.delEvent', ['context-menu-click', 'menu-click']);
-                    }
+                    warnLog('vxe.error.delEvent', ['context-menu-click', 'menu-click']);
                     this.emitEvent('context-menu-click', params, evnt);
                 }
                 else {