vxe-table 4.12.0-beta.2 → 4.12.0-beta.4

package/es/table/render/index.js

@@ -500,6 +500,63 @@ function handleExportTreeSelectMethod(params) {
     const { row, column, options } = params;
     return options.original ? getCellValue(row, column) : getTreeSelectCellValue(column.editRender || column.cellRender, params);
 }
+function handleNumberCell(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(renderOpts, params, cellValue, isNegative
+        ? {
+            class: 'is--negative'
+        }
+        : {});
+}
 /**
  * 表格 - 渲染器
  */
@@ -559,66 +616,19 @@ renderer.mixin({
         renderTableFilter: defaultFilterRender,
         tableFilterDefaultMethod: handleInputFilterMethod
     },
+    FormatNumberInput: {
+        renderTableDefault: handleNumberCell,
+        tableFilterDefaultMethod: handleInputFilterMethod,
+        tableExportMethod(params) {
+            const { row, column } = params;
+            const cellValue = XEUtils.get(row, column.field);
+            return cellValue;
+        }
+    },
     VxeNumberInput: {
         tableAutoFocus: 'input',
         renderTableEdit: defaultEditRender,
-        renderTableCell(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(renderOpts, params, cellValue, isNegative
-                ? {
-                    class: 'is--negative'
-                }
-                : {});
-        },
+        renderTableCell: handleNumberCell,
         renderTableFooter(renderOpts, params) {
             const { props = {} } = renderOpts;
             const { row, column, _columnIndex } = params;
@@ -721,11 +731,22 @@ renderer.mixin({
         tableFilterDefaultMethod: handleFilterMethod,
         tableExportMethod: handleExportSelectMethod
     },
+    /**
+     * 已废弃，被 FormatSelect 替换
+     * @deprecated
+     */
     formatOption: {
         renderTableDefault(renderOpts, params) {
             return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params));
         }
     },
+    FormatSelect: {
+        renderTableDefault(renderOpts, params) {
+            return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params));
+        },
+        tableFilterDefaultMethod: handleFilterMethod,
+        tableExportMethod: handleExportSelectMethod
+    },
     VxeTreeSelect: {
         tableAutoFocus: 'input',
         renderTableEdit: defaultTableOrTreeSelectEditRender,
@@ -734,11 +755,21 @@ renderer.mixin({
         },
         tableExportMethod: handleExportTreeSelectMethod
     },
+    /**
+     * 已废弃，被 FormatTreeSelect 替换
+     * @deprecated
+     */
     formatTree: {
         renderTableDefault(renderOpts, params) {
             return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
         }
     },
+    FormatTreeSelect: {
+        renderTableDefault(renderOpts, params) {
+            return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
+        },
+        tableExportMethod: handleExportTreeSelectMethod
+    },
     VxeTableSelect: {
         tableAutoFocus: 'input',
         renderTableEdit: defaultTableOrTreeSelectEditRender,

package/es/table/src/table.js

@@ -2746,7 +2746,7 @@ export default defineComponent({
                     //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
                     // }
                     if (props.spanMethod) {
-                        warnLog('vxe.error.scrollErrProp', ['table.span-method']);
+                        errLog('vxe.error.scrollErrProp', ['table.span-method']);
                     }
                 }
                 handleReserveStatus();

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.12.0-beta.2";
+export const version = "4.12.0-beta.4";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.12.0-beta.2"}`;
+const version = `table v${"4.12.0-beta.4"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.12.0-beta.2";
+const version = "4.12.0-beta.4";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3586,7 +3586,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.12.0-beta.2"}`;
+const log_version = `table v${"4.12.0-beta.4"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -13522,7 +13522,7 @@ const maxXWidth = 5e6;
           //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
           // }
           if (props.spanMethod) {
-            warnLog('vxe.error.scrollErrProp', ['table.span-method']);
+            errLog('vxe.error.scrollErrProp', ['table.span-method']);
           }
         }
         handleReserveStatus();
@@ -28258,6 +28258,69 @@ function handleExportTreeSelectMethod(params) {
   } = params;
   return options.original ? getCellValue(row, column) : getTreeSelectCellValue(column.editRender || column.cellRender, params);
 }
+function handleNumberCell(renderOpts, params) {
+  const {
+    props = {},
+    showNegativeStatus
+  } = renderOpts;
+  const {
+    row,
+    column
+  } = params;
+  const {
+    type
+  } = props;
+  let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+  let isNegative = false;
+  if (!isEmptyValue(cellValue)) {
+    const numberInputConfig = render_getConfig().numberInput || {};
+    if (type === 'float') {
+      const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
+      const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 1);
+      cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(cellValue, digits), digits);
+      if (!autoFill) {
+        cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);
+      if (showNegativeStatus) {
+        if (cellValue < 0) {
+          isNegative = true;
+        }
+      }
+      cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 || render_getI18n('vxe.numberInput.currencySymbol') || ''}${cellValue}`;
+      }
+    } else {
+      if (showNegativeStatus) {
+        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue) < 0) {
+          isNegative = true;
+        }
+      }
+    }
+  }
+  return getCellLabelVNs(renderOpts, params, cellValue, isNegative ? {
+    class: 'is--negative'
+  } : {});
+}
 /**
  * 表格 - 渲染器
  */
@@ -28329,72 +28392,22 @@ render_renderer.mixin({
     renderTableFilter: defaultFilterRender,
     tableFilterDefaultMethod: handleInputFilterMethod
   },
-  VxeNumberInput: {
-    tableAutoFocus: 'input',
-    renderTableEdit: defaultEditRender,
-    renderTableCell(renderOpts, params) {
-      const {
-        props = {},
-        showNegativeStatus
-      } = renderOpts;
+  FormatNumberInput: {
+    renderTableDefault: handleNumberCell,
+    tableFilterDefaultMethod: handleInputFilterMethod,
+    tableExportMethod(params) {
       const {
         row,
         column
       } = params;
-      const {
-        type
-      } = props;
-      let cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
-      let isNegative = false;
-      if (!isEmptyValue(cellValue)) {
-        const numberInputConfig = render_getConfig().numberInput || {};
-        if (type === 'float') {
-          const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
-          const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 1);
-          cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor(cellValue, digits), digits);
-          if (!autoFill) {
-            cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue);
-          if (showNegativeStatus) {
-            if (cellValue < 0) {
-              isNegative = true;
-            }
-          }
-          cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().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 || render_getI18n('vxe.numberInput.currencySymbol') || ''}${cellValue}`;
-          }
-        } else {
-          if (showNegativeStatus) {
-            if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellValue) < 0) {
-              isNegative = true;
-            }
-          }
-        }
-      }
-      return getCellLabelVNs(renderOpts, params, cellValue, isNegative ? {
-        class: 'is--negative'
-      } : {});
-    },
+      const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+      return cellValue;
+    }
+  },
+  VxeNumberInput: {
+    tableAutoFocus: 'input',
+    renderTableEdit: defaultEditRender,
+    renderTableCell: handleNumberCell,
     renderTableFooter(renderOpts, params) {
       const {
         props = {}
@@ -28537,11 +28550,22 @@ render_renderer.mixin({
     tableFilterDefaultMethod: handleFilterMethod,
     tableExportMethod: handleExportSelectMethod
   },
+  /**
+   * 已废弃，被 FormatSelect 替换
+   * @deprecated
+   */
   formatOption: {
     renderTableDefault(renderOpts, params) {
       return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params));
     }
   },
+  FormatSelect: {
+    renderTableDefault(renderOpts, params) {
+      return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params));
+    },
+    tableFilterDefaultMethod: handleFilterMethod,
+    tableExportMethod: handleExportSelectMethod
+  },
   VxeTreeSelect: {
     tableAutoFocus: 'input',
     renderTableEdit: defaultTableOrTreeSelectEditRender,
@@ -28550,11 +28574,21 @@ render_renderer.mixin({
     },
     tableExportMethod: handleExportTreeSelectMethod
   },
+  /**
+   * 已废弃，被 FormatTreeSelect 替换
+   * @deprecated
+   */
   formatTree: {
     renderTableDefault(renderOpts, params) {
       return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
     }
   },
+  FormatTreeSelect: {
+    renderTableDefault(renderOpts, params) {
+      return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
+    },
+    tableExportMethod: handleExportTreeSelectMethod
+  },
   VxeTableSelect: {
     tableAutoFocus: 'input',
     renderTableEdit: defaultTableOrTreeSelectEditRender,