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

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

@@ -276,7 +276,7 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
         return handleInsertRowAt($xeTable, records.map((item) => Object.assign({}, item, { [parentField]: parentRow[rowField] })), targetRow, isInsertNextRow);
     }
     else {
-        errLog('vxe.error.errProp', ['tree-config.treeConfig=false', 'tree-config.treeConfig=true']);
+        errLog('vxe.error.errProp', ['tree-config.transform=false', 'tree-config.transform=true']);
     }
     return Promise.resolve({ row: null, rows: [] });
 }

package/es/table/module/export/export-panel.js

@@ -53,30 +53,28 @@ export default {
     },
     created() {
         const $xeTableExportPanel = this;
-        if (process.env.NODE_ENV === 'development') {
-            const VxeUIModalComponent = VxeUI.getComponent('VxeModal');
-            const VxeUIButtonComponent = VxeUI.getComponent('VxeButton');
-            const VxeUISelectComponent = VxeUI.getComponent('VxeSelect');
-            const VxeUIInputComponent = VxeUI.getComponent('VxeInput');
-            const VxeUICheckboxComponent = VxeUI.getComponent('VxeCheckbox');
-            $xeTableExportPanel.$nextTick(() => {
-                if (!VxeUIModalComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-modal']);
-                }
-                if (!VxeUIButtonComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-button']);
-                }
-                if (!VxeUISelectComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-select']);
-                }
-                if (!VxeUIInputComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-input']);
-                }
-                if (!VxeUICheckboxComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-checkbox']);
-                }
-            });
-        }
+        const VxeUIModalComponent = VxeUI.getComponent('VxeModal');
+        const VxeUIButtonComponent = VxeUI.getComponent('VxeButton');
+        const VxeUISelectComponent = VxeUI.getComponent('VxeSelect');
+        const VxeUIInputComponent = VxeUI.getComponent('VxeInput');
+        const VxeUICheckboxComponent = VxeUI.getComponent('VxeCheckbox');
+        $xeTableExportPanel.$nextTick(() => {
+            if (!VxeUIModalComponent) {
+                errLog('vxe.error.reqComp', ['vxe-modal']);
+            }
+            if (!VxeUIButtonComponent) {
+                errLog('vxe.error.reqComp', ['vxe-button']);
+            }
+            if (!VxeUISelectComponent) {
+                errLog('vxe.error.reqComp', ['vxe-select']);
+            }
+            if (!VxeUIInputComponent) {
+                errLog('vxe.error.reqComp', ['vxe-input']);
+            }
+            if (!VxeUICheckboxComponent) {
+                errLog('vxe.error.reqComp', ['vxe-checkbox']);
+            }
+        });
     },
     render(h) {
         const $xeTable = this.$xeTable;

package/es/table/module/export/import-panel.js

@@ -45,22 +45,20 @@ export default {
     },
     created() {
         const $xeTableImportPanel = this;
-        if (process.env.NODE_ENV === 'development') {
-            const VxeUIModalComponent = VxeUI.getComponent('VxeModal');
-            const VxeUIButtonComponent = VxeUI.getComponent('VxeButton');
-            const VxeUISelectComponent = VxeUI.getComponent('VxeSelect');
-            $xeTableImportPanel.$nextTick(() => {
-                if (!VxeUIModalComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-modal']);
-                }
-                if (!VxeUIButtonComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-button']);
-                }
-                if (!VxeUISelectComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-select']);
-                }
-            });
-        }
+        const VxeUIModalComponent = VxeUI.getComponent('VxeModal');
+        const VxeUIButtonComponent = VxeUI.getComponent('VxeButton');
+        const VxeUISelectComponent = VxeUI.getComponent('VxeSelect');
+        $xeTableImportPanel.$nextTick(() => {
+            if (!VxeUIModalComponent) {
+                errLog('vxe.error.reqComp', ['vxe-modal']);
+            }
+            if (!VxeUIButtonComponent) {
+                errLog('vxe.error.reqComp', ['vxe-button']);
+            }
+            if (!VxeUISelectComponent) {
+                errLog('vxe.error.reqComp', ['vxe-select']);
+            }
+        });
     },
     render(h) {
         const $xeTable = this.$xeTable;

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

@@ -568,10 +568,8 @@ function downloadFile($xetable, opts, content) {
     saveLocalFile({ filename, type, content }).then(() => {
         if (opts.message !== false) {
             // 检测弹窗模块
-            if (process.env.NODE_ENV === 'development') {
-                if (!VxeUI.modal) {
-                    errLog('vxe.error.reqModule', ['Modal']);
-                }
+            if (!VxeUI.modal) {
+                errLog('vxe.error.reqModule', ['Modal']);
             }
             VxeUI.modal.message({ content: getI18n('vxe.table.expSuccess'), status: 'success' });
         }
@@ -800,10 +798,8 @@ function handleImport($xeTable, content, opts) {
             }
             if (opts.message !== false) {
                 // 检测弹窗模块
-                if (process.env.NODE_ENV === 'development') {
-                    if (!VxeUI.modal) {
-                        errLog('vxe.error.reqModule', ['Modal']);
-                    }
+                if (!VxeUI.modal) {
+                    errLog('vxe.error.reqModule', ['Modal']);
                 }
                 VxeUI.modal.message({ content: getI18n('vxe.table.impSuccess', [rows.length]), status: 'success' });
             }
@@ -816,10 +812,8 @@ function handleImport($xeTable, content, opts) {
     }
     else if (opts.message !== false) {
         // 检测弹窗模块
-        if (process.env.NODE_ENV === 'development') {
-            if (!VxeUI.modal) {
-                errLog('vxe.error.reqModule', ['Modal']);
-            }
+        if (!VxeUI.modal) {
+            errLog('vxe.error.reqModule', ['Modal']);
         }
         VxeUI.modal.message({ content: getI18n('vxe.error.impFields'), status: 'error' });
         if (_importReject) {
@@ -835,10 +829,8 @@ function handleFileImport($xetable, file, opts) {
     if (!importMethod && !XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)) {
         if (opts.message !== false) {
             // 检测弹窗模块
-            if (process.env.NODE_ENV === 'development') {
-                if (!VxeUI.modal) {
-                    errLog('vxe.error.reqModule', ['Modal']);
-                }
+            if (!VxeUI.modal) {
+                errLog('vxe.error.reqModule', ['Modal']);
             }
             VxeUI.modal.message({ content: getI18n('vxe.error.notType', [type]), status: 'error' });
         }
@@ -888,9 +880,7 @@ function handleFileImport($xetable, file, opts) {
         }
         else {
             // 不支持的浏览器
-            if (process.env.NODE_ENV === 'development') {
-                errLog('vxe.error.notExp');
-            }
+            errLog('vxe.error.notExp');
             _importResolve({ status: true });
         }
     });
@@ -950,10 +940,8 @@ export function readLocalFile(options = {}) {
             else {
                 if (options.message !== false) {
                     // 检测弹窗模块
-                    if (process.env.NODE_ENV === 'development') {
-                        if (!VxeUI.modal) {
-                            errLog('vxe.error.reqModule', ['Modal']);
-                        }
+                    if (!VxeUI.modal) {
+                        errLog('vxe.error.reqModule', ['Modal']);
                     }
                     VxeUI.modal.message({ content: getI18n('vxe.error.notType', [errType]), status: 'error' });
                 }
@@ -1618,20 +1606,16 @@ export default {
         _closeExport: handleCloseExport,
         _openExport(options) {
             const { exportOpts } = this;
-            if (process.env.NODE_ENV === 'development') {
-                if (!this.exportConfig) {
-                    errLog('vxe.error.reqProp', ['export-config']);
-                }
+            if (!this.exportConfig) {
+                errLog('vxe.error.reqProp', ['export-config']);
             }
             return handleExportAndPrint(this, Object.assign({}, exportOpts, options));
         },
         _closePrint: handleCloseExport,
         _openPrint(options) {
             const { printOpts } = this;
-            if (process.env.NODE_ENV === 'development') {
-                if (!this.printConfig) {
-                    errLog('vxe.error.reqProp', ['print-config']);
-                }
+            if (!this.printConfig) {
+                errLog('vxe.error.reqProp', ['print-config']);
             }
             return handleExportAndPrint(this, Object.assign({}, printOpts, options), true);
         }

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

@@ -231,9 +231,10 @@ export default {
             });
         },
         handleCellMousedownEvent(evnt, params) {
+            const $xeTable = this;
             const { editConfig, editOpts, handleSelected, checkboxConfig, checkboxOpts, mouseConfig, mouseOpts } = this;
-            if (mouseConfig && mouseOpts.area && this.handleMousedownCellAreaEvent) {
-                return this.handleMousedownCellAreaEvent(evnt, params);
+            if (mouseConfig && mouseOpts.area && $xeTable.handleCellAreaMousedownEvent) {
+                return $xeTable.handleCellAreaMousedownEvent(evnt, params);
             }
             else {
                 if (checkboxConfig && checkboxOpts.range) {

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

@@ -355,9 +355,7 @@ export default {
                                         }
                                     }
                                     else {
-                                        if (process.env.NODE_ENV === 'development') {
-                                            errLog('vxe.error.notValidators', [validator]);
-                                        }
+                                        errLog('vxe.error.notValidators', [validator]);
                                     }
                                 }
                                 else {

package/es/table/render/index.js

@@ -151,10 +151,8 @@ function getComponentOns(renderOpts, params, eFns) {
     const ons = {};
     XEUtils.objectEach(events, (func, key) => {
         ons[getOnName(key)] = function (...args) {
-            if (process.env.NODE_ENV === 'development') {
-                if (!XEUtils.isFunction(func)) {
-                    errLog('vxe.error.errFunc', [func]);
-                }
+            if (!XEUtils.isFunction(func)) {
+                errLog('vxe.error.errFunc', [func]);
             }
             func(params, ...args);
         };

package/es/table/src/body.js

@@ -64,7 +64,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     const tableReactData = $xeTable;
     const tableInternalData = $xeTable;
     const { fullAllDataRowIdData } = tableInternalData;
-    const { columnKey, resizable: allResizable, border, height, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps;
+    const { columnKey, resizable: allResizable, showOverflow: allShowOverflow, border, height, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps;
     const { tableData, dragRow, overflowX, currentColumn, scrollXLoad, scrollYLoad, calcCellHeightFlag, resizeHeightFlag, mergeList, editStore, isAllOverflow, validErrorMaps } = tableReactData;
     const { afterFullData, scrollXStore, scrollYStore } = tableInternalData;
     const cellOpts = $xeTable.computeCellOpts;
@@ -98,7 +98,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     const resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
     let fixedHiddenColumn = fixedType ? column.fixed !== fixedType : column.fixed && overflowX;
     const isCellPadding = XEUtils.eqNull(padding) ? (allPadding === null ? cellOpts.padding : allPadding) : padding;
-    const cellOverflow = XEUtils.eqNull(showOverflow) ? isAllOverflow : showOverflow;
+    const cellOverflow = XEUtils.eqNull(showOverflow) ? allShowOverflow : showOverflow;
     const showEllipsis = cellOverflow === 'ellipsis';
     const showTitle = cellOverflow === 'title';
     const showTooltip = cellOverflow === true || cellOverflow === 'tooltip';

package/es/table/src/column.js

@@ -143,7 +143,7 @@ Object.keys(columnProps).forEach(name => {
         }
     };
 });
-export default defineVxeComponent({
+export default {
     name: 'VxeColumn',
     props: columnProps,
     provide() {
@@ -175,4 +175,4 @@ export default defineVxeComponent({
         return h('div', this.$slots.default);
     },
     methods: Cell
-});
+};

package/es/table/src/columnInfo.js

@@ -12,41 +12,39 @@ export class ColumnInfo {
         const formatter = _vm.formatter;
         const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true;
         const tableProps = $xetable;
-        if (process.env.NODE_ENV === 'development') {
-            const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
-            if (_vm.type && types.indexOf(_vm.type) === -1) {
-                warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);
-            }
-            if (XEUtils.isBoolean(_vm.cellRender) || (_vm.cellRender && !XEUtils.isObject(_vm.cellRender))) {
-                warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}']);
-            }
-            if (XEUtils.isBoolean(_vm.editRender) || (_vm.editRender && !XEUtils.isObject(_vm.editRender))) {
-                warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
+        const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
+        if (_vm.type && types.indexOf(_vm.type) === -1) {
+            warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);
+        }
+        if (XEUtils.isBoolean(_vm.cellRender) || (_vm.cellRender && !XEUtils.isObject(_vm.cellRender))) {
+            warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}']);
+        }
+        if (XEUtils.isBoolean(_vm.editRender) || (_vm.editRender && !XEUtils.isObject(_vm.editRender))) {
+            warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
+        }
+        if (_vm.type === 'expand') {
+            const { treeConfig } = tableProps;
+            if (treeConfig && ($xetable.treeOpts.showLine || $xetable.treeOpts.line)) {
+                errLog('vxe.error.errConflicts', ['tree-config.line', 'column.type=expand']);
             }
-            if (_vm.type === 'expand') {
-                const { treeConfig } = tableProps;
-                if (treeConfig && ($xetable.treeOpts.showLine || $xetable.treeOpts.line)) {
-                    errLog('vxe.error.errConflicts', ['tree-config.line', 'column.type=expand']);
+        }
+        if (_vm.remoteSort) {
+            warnLog('vxe.error.delProp', ['column.remote-sort', 'sort-config.remote']);
+        }
+        if (_vm.sortMethod) {
+            warnLog('vxe.error.delProp', ['column.sort-method', 'sort-config.sortMethod']);
+        }
+        if (formatter) {
+            if (XEUtils.isString(formatter)) {
+                const gFormatOpts = formats.get(formatter) || XEUtils[formatter];
+                if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
+                    errLog('vxe.error.notFormats', [formatter]);
                 }
             }
-            if (_vm.remoteSort) {
-                warnLog('vxe.error.delProp', ['column.remote-sort', 'sort-config.remote']);
-            }
-            if (_vm.sortMethod) {
-                warnLog('vxe.error.delProp', ['column.sort-method', 'sort-config.sortMethod']);
-            }
-            if (formatter) {
-                if (XEUtils.isString(formatter)) {
-                    const gFormatOpts = formats.get(formatter) || XEUtils[formatter];
-                    if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
-                        errLog('vxe.error.notFormats', [formatter]);
-                    }
-                }
-                else if (XEUtils.isArray(formatter)) {
-                    const gFormatOpts = formats.get(formatter[0]) || XEUtils[formatter[0]];
-                    if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
-                        errLog('vxe.error.notFormats', [formatter[0]]);
-                    }
+            else if (XEUtils.isArray(formatter)) {
+                const gFormatOpts = formats.get(formatter[0]) || XEUtils[formatter[0]];
+                if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
+                    errLog('vxe.error.notFormats', [formatter[0]]);
                 }
             }
         }

package/es/table/src/group.js

@@ -2,7 +2,7 @@ import Cell from './cell';
 import { defineVxeComponent } from '../../ui/src/comp';
 import { assembleColumn, destroyColumn } from './util';
 import { columnProps, columnWatch } from './column';
-export default defineVxeComponent({
+export default {
     name: 'VxeColgroup',
     props: columnProps,
     provide() {
@@ -39,4 +39,4 @@ export default defineVxeComponent({
         return h('div', this.$slots.default);
     },
     methods: Cell
-});
+};