vxe-table 3.14.0-beta.1 → 3.14.0-beta.3

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/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);
         };
@@ -558,6 +556,63 @@ function handleExportTreeSelectMethod(params) {
     const { row, column, options } = params;
     return options.original ? getCellValue(row, column) : getTreeSelectCellValue(column.editRender || column.cellRender, params);
 }
+function handleNumberCell(h, renderOpts, params) {
+    const { props = {}, showNegativeStatus } = renderOpts;
+    const { row, column } = params;
+    const { type } = props;
+    let cellValue = XEUtils.get(row, column.field);
+    let isNegative = false;
+    if (!isEmptyValue(cellValue)) {
+        const numberInputConfig = getConfig().numberInput || {};
+        if (type === 'float') {
+            const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
+            const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 1);
+            cellValue = XEUtils.toFixed(XEUtils.floor(cellValue, digits), digits);
+            if (!autoFill) {
+                cellValue = XEUtils.toNumber(cellValue);
+            }
+            if (showNegativeStatus) {
+                if (cellValue < 0) {
+                    isNegative = true;
+                }
+            }
+        }
+        else if (type === 'amount') {
+            const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
+            const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 2);
+            const showCurrency = handleDefaultValue(props.showCurrency, numberInputConfig.showCurrency, false);
+            cellValue = XEUtils.toNumber(cellValue);
+            if (showNegativeStatus) {
+                if (cellValue < 0) {
+                    isNegative = true;
+                }
+            }
+            cellValue = XEUtils.commafy(cellValue, { digits });
+            if (!autoFill) {
+                const [iStr, dStr] = cellValue.split('.');
+                if (dStr) {
+                    const dRest = dStr.replace(/0+$/, '');
+                    cellValue = dRest ? [iStr, '.', dRest].join('') : iStr;
+                }
+            }
+            if (showCurrency) {
+                cellValue = `${props.currencySymbol || numberInputConfig.currencySymbol || getI18n('vxe.numberInput.currencySymbol') || ''}${cellValue}`;
+            }
+        }
+        else {
+            if (showNegativeStatus) {
+                if (XEUtils.toNumber(cellValue) < 0) {
+                    isNegative = true;
+                }
+            }
+        }
+    }
+    return getCellLabelVNs(h, renderOpts, params, cellValue, isNegative
+        ? {
+            class: 'is--negative'
+        }
+        : {});
+}
 /**
  * 表格 - 渲染器
  */
@@ -622,66 +677,13 @@ renderer.mixin({
         renderTableFilter: defaultFilterRender,
         tableFilterDefaultMethod: handleInputFilterMethod
     },
+    FormatNumberInput: {
+        renderTableDefault: handleNumberCell
+    },
     VxeNumberInput: {
         tableAutoFocus: 'input',
         renderTableEdit: defaultEditRender,
-        renderTableCell(h, renderOpts, params) {
-            const { props = {}, showNegativeStatus } = renderOpts;
-            const { row, column } = params;
-            const { type } = props;
-            let cellValue = XEUtils.get(row, column.field);
-            let isNegative = false;
-            if (!isEmptyValue(cellValue)) {
-                const numberInputConfig = getConfig().numberInput || {};
-                if (type === 'float') {
-                    const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
-                    const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 1);
-                    cellValue = XEUtils.toFixed(XEUtils.floor(cellValue, digits), digits);
-                    if (!autoFill) {
-                        cellValue = XEUtils.toNumber(cellValue);
-                    }
-                    if (showNegativeStatus) {
-                        if (cellValue < 0) {
-                            isNegative = true;
-                        }
-                    }
-                }
-                else if (type === 'amount') {
-                    const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
-                    const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 2);
-                    const showCurrency = handleDefaultValue(props.showCurrency, numberInputConfig.showCurrency, false);
-                    cellValue = XEUtils.toNumber(cellValue);
-                    if (showNegativeStatus) {
-                        if (cellValue < 0) {
-                            isNegative = true;
-                        }
-                    }
-                    cellValue = XEUtils.commafy(cellValue, { digits });
-                    if (!autoFill) {
-                        const [iStr, dStr] = cellValue.split('.');
-                        if (dStr) {
-                            const dRest = dStr.replace(/0+$/, '');
-                            cellValue = dRest ? [iStr, '.', dRest].join('') : iStr;
-                        }
-                    }
-                    if (showCurrency) {
-                        cellValue = `${props.currencySymbol || numberInputConfig.currencySymbol || getI18n('vxe.numberInput.currencySymbol') || ''}${cellValue}`;
-                    }
-                }
-                else {
-                    if (showNegativeStatus) {
-                        if (XEUtils.toNumber(cellValue) < 0) {
-                            isNegative = true;
-                        }
-                    }
-                }
-            }
-            return getCellLabelVNs(h, renderOpts, params, cellValue, isNegative
-                ? {
-                    class: 'is--negative'
-                }
-                : {});
-        },
+        renderTableCell: handleNumberCell,
         renderTableFooter(h, renderOpts, params) {
             const { props = {} } = renderOpts;
             const { row, column, _columnIndex } = params;
@@ -786,11 +788,20 @@ renderer.mixin({
         tableFilterDefaultMethod: handleFilterMethod,
         tableExportMethod: handleExportSelectMethod
     },
+    /**
+     * 已废弃，被 FormatSelect 替换
+     * @deprecated
+     */
     formatOption: {
         renderTableDefault(h, renderOpts, params) {
             return getCellLabelVNs(h, renderOpts, params, getSelectCellValue(renderOpts, params));
         }
     },
+    FormatSelect: {
+        renderTableDefault(h, renderOpts, params) {
+            return getCellLabelVNs(h, renderOpts, params, getSelectCellValue(renderOpts, params));
+        }
+    },
     VxeTreeSelect: {
         tableAutoFocus: 'input',
         renderTableEdit: defaultTableOrTreeSelectEditRender,
@@ -807,11 +818,20 @@ renderer.mixin({
         },
         tableExportMethod: handleExportTreeSelectMethod
     },
+    /**
+     * 已废弃，被 FormatTreeSelect 替换
+     * @deprecated
+     */
     formatTree: {
         renderTableDefault(h, renderOpts, params) {
             return getCellLabelVNs(h, renderOpts, params, getTreeSelectCellValue(renderOpts, params));
         }
     },
+    FormatTreeSelect: {
+        renderTableDefault(h, renderOpts, params) {
+            return getCellLabelVNs(h, renderOpts, params, getTreeSelectCellValue(renderOpts, params));
+        }
+    },
     VxeColorPicker: {
         tableAutoFocus: 'input',
         renderTableEdit(h, renderOpts, params) {

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]]);
                 }
             }
         }