vxe-table 4.9.34 → 4.9.35

package/lib/ui/index.js

@@ -13,7 +13,7 @@ Object.defineProperty(exports, "VxeUI", {
 exports.version = exports.validators = exports.use = exports.t = exports.setup = exports.setTheme = exports.setLanguage = exports.setIcon = exports.setI18n = exports.setConfig = exports.saveFile = exports.renderer = exports.readFile = exports.print = exports.modal = exports.menus = exports.log = exports.interceptor = exports.hooks = exports.globalResize = exports.globalEvents = exports.getTheme = exports.getIcon = exports.getI18n = exports.getConfig = exports.formats = exports.default = exports.config = exports.commands = exports.clipboard = exports._t = void 0;
 var _core = require("@vxe-ui/core");
 var _utils = require("./src/utils");
-const version = exports.version = "4.9.34";
+const version = exports.version = "4.9.35";
 _core.VxeUI.version = version;
 _core.VxeUI.tableVersion = version;
 _core.VxeUI.setConfig({

package/lib/ui/index.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.hooks=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");const version=exports.version="4.9.34",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0},columnDragConfig:{showIcon:!0,animation:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,hooks=exports.hooks=_core.VxeUI.hooks,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.hooks=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");const version=exports.version="4.9.35",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0},columnDragConfig:{showIcon:!0,animation:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,hooks=exports.hooks=_core.VxeUI.hooks,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;

package/lib/ui/src/log.js

@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
 const {
   log
 } = _core.VxeUI;
-const version = `table v${"4.9.34"}`;
+const version = `table v${"4.9.35"}`;
 const warnLog = exports.warnLog = log.create('warn', version);
 const errLog = exports.errLog = log.create('error', version);

package/lib/ui/src/log.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");const log=_core.VxeUI["log"],version="table v4.9.34",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");const log=_core.VxeUI["log"],version="table v4.9.35",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.9.34",
+  "version": "4.9.35",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、拖拽排序，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "dependencies": {
-    "vxe-pc-ui": "^4.3.42"
+    "vxe-pc-ui": "^4.3.43"
   },
   "devDependencies": {
     "@types/resize-observer-browser": "^0.1.11",

package/packages/table/render/index.ts

@@ -15,6 +15,10 @@ const componentDefaultModelProp = 'modelValue'
 
 const defaultCompProps = {}
 
+function handleDefaultValue (value: any, defaultVal: any, initVal: any) {
+  return XEUtils.eqNull(value) ? (XEUtils.eqNull(defaultVal) ? initVal : defaultVal) : value
+}
+
 function parseDate (value: any, props: any) {
   return value && props.valueFormat ? XEUtils.toStringDate(value, props.valueFormat) : value
 }
@@ -612,13 +616,25 @@ renderer.mixin({
       if (cellValue) {
         const numberInputConfig = getConfig().numberInput || {}
         if (type === 'float') {
-          const digits = props.digits || numberInputConfig.digits || 1
+          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)
+          }
         } else if (type === 'amount') {
-          const digits = props.digits || numberInputConfig.digits || 2
+          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.commafy(XEUtils.toNumber(cellValue), { digits })
-          const showCurrency = props.showCurrency
-          if (XEUtils.isBoolean(showCurrency) ? showCurrency : numberInputConfig.showCurrency) {
+          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}`
           }
         }
@@ -630,18 +646,36 @@ renderer.mixin({
       const { row, column, _columnIndex } = params
       const { type } = props
       // 兼容老模式
-      const cellValue = XEUtils.isArray(row) ? row[_columnIndex] : XEUtils.get(row, column.field)
-      if (XEUtils.isNumber(cellValue)) {
+      const itemValue = XEUtils.isArray(row) ? row[_columnIndex] : XEUtils.get(row, column.field)
+      if (XEUtils.isNumber(itemValue)) {
         const numberInputConfig = getConfig().numberInput || {}
         if (type === 'float') {
-          const digits = props.digits || numberInputConfig.digits || 1
-          return XEUtils.toFixed(XEUtils.floor(cellValue, digits), digits)
+          const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true)
+          const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 1)
+          let amountLabel = XEUtils.toFixed(XEUtils.floor(itemValue, digits), digits)
+          if (!autoFill) {
+            amountLabel = XEUtils.toNumber(amountLabel)
+          }
+          return amountLabel
         } else if (type === 'amount') {
-          const digits = props.digits || numberInputConfig.digits || 2
-          return XEUtils.commafy(XEUtils.toNumber(cellValue), { digits })
+          const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true)
+          const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 2)
+          const showCurrency = handleDefaultValue(props.showCurrency, numberInputConfig.showCurrency, false)
+          let amountLabel = XEUtils.commafy(XEUtils.toNumber(itemValue), { digits })
+          if (!autoFill) {
+            const [iStr, dStr] = amountLabel.split('.')
+            if (dStr) {
+              const dRest = dStr.replace(/0+$/, '')
+              amountLabel = dRest ? [iStr, '.', dRest].join('') : iStr
+            }
+          }
+          if (showCurrency) {
+            amountLabel = `${props.currencySymbol || numberInputConfig.currencySymbol || getI18n('vxe.numberInput.currencySymbol') || ''}${amountLabel}`
+          }
+          return amountLabel
         }
       }
-      return getFuncText(cellValue, 1)
+      return getFuncText(itemValue, 1)
     },
     renderTableDefault: defaultEditRender,
     renderTableFilter: defaultFilterRender,

package/packages/table/src/body.ts

@@ -1,4 +1,4 @@
-import { createCommentVNode, defineComponent, TransitionGroup, h, ref, Ref, PropType, inject, nextTick, ComputedRef, onBeforeUnmount, onMounted, onUnmounted } from 'vue'
+import { defineComponent, TransitionGroup, h, ref, Ref, PropType, inject, nextTick, ComputedRef, onBeforeUnmount, onMounted, onUnmounted } from 'vue'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
 import { mergeBodyMethod, getRowid, getRefElem } from './util'
@@ -36,7 +36,7 @@ export default defineComponent({
 
     const { xID, props: tableProps, context: tableContext, reactData: tableReactData, internalData: tableInternalData } = $xeTable
     const { refTableBody, refTableHeader, refTableFooter, refTableLeftBody, refTableRightBody, refScrollXHandleElem, refScrollYHandleElem } = $xeTable.getRefMaps()
-    const { computeEditOpts, computeMouseOpts, computeAreaOpts, computeSYOpts, computeEmptyOpts, computeKeyboardOpts, computeTooltipOpts, computeRadioOpts, computeExpandOpts, computeTreeOpts, computeCheckboxOpts, computeCellOpts, computeValidOpts, computeRowOpts, computeColumnOpts, computeRowDragOpts, computeColumnDragOpts } = $xeTable.getComputeMaps()
+    const { computeEditOpts, computeMouseOpts, computeAreaOpts, computeSYOpts, computeEmptyOpts, computeTooltipOpts, computeRadioOpts, computeExpandOpts, computeTreeOpts, computeCheckboxOpts, computeCellOpts, computeValidOpts, computeRowOpts, computeColumnOpts, computeRowDragOpts, computeColumnDragOpts } = $xeTable.getComputeMaps()
 
     const refElem = ref() as Ref<HTMLDivElement>
     const refBodyTable = ref() as Ref<HTMLTableElement>
@@ -762,40 +762,32 @@ export default defineComponent({
     })
 
     const renderVN = () => {
-      let { fixedColumn, fixedType, tableColumn } = props
-      const { keyboardConfig, showOverflow: allColumnOverflow, spanMethod, mouseConfig } = tableProps
-      const { tableData, mergeList, scrollYLoad, isAllOverflow, isDragRowMove } = tableReactData
+      const { fixedColumn, fixedType, tableColumn } = props
+      const { showOverflow: allColumnOverflow, spanMethod, footerSpanMethod, mouseConfig } = tableProps
+      const { tableData, scrollXLoad, scrollYLoad, isAllOverflow, isDragRowMove, expandColumn } = tableReactData
       const { visibleColumn } = tableInternalData
       const { slots } = tableContext
       const rowOpts = computeRowOpts.value
       const sYOpts = computeSYOpts.value
       const emptyOpts = computeEmptyOpts.value
-      const keyboardOpts = computeKeyboardOpts.value
       const mouseOpts = computeMouseOpts.value
       const rowDragOpts = computeRowDragOpts.value
-      // const isMergeLeftFixedExceeded = computeIsMergeLeftFixedExceeded.value
-      // const isMergeRightFixedExceeded = computeIsMergeRightFixedExceeded.value
-      // 如果是使用优化模式
+
+      let renderColumnList = tableColumn
+
       if (fixedType) {
-        // 如果存在展开行使用全量渲染
-        if (!tableReactData.expandColumn && (scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
-          if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
-            tableColumn = fixedColumn
+        renderColumnList = visibleColumn
+        // 如果是使用优化模式
+        if (scrollXLoad || scrollYLoad || (allColumnOverflow && isAllOverflow)) {
+          // 如果不支持优化模式
+          if (expandColumn || spanMethod || footerSpanMethod) {
+            renderColumnList = visibleColumn
           } else {
-            tableColumn = visibleColumn
-            // 检查固定列是否被合并，合并范围是否超出固定列
-            // if (mergeList.length && !isMergeLeftFixedExceeded && fixedType === 'left') {
-            //   tableColumn = fixedColumn
-            // } else if (mergeList.length && !isMergeRightFixedExceeded && fixedType === 'right') {
-            //   tableColumn = fixedColumn
-            // } else {
-            //   tableColumn = visibleColumn
-            // }
+            renderColumnList = fixedColumn || []
           }
-        } else {
-          tableColumn = visibleColumn
         }
       }
+
       let emptyContent: string | VxeComponentSlotType | VxeComponentSlotType[]
       const emptySlot = slots ? slots.empty : null
       if (emptySlot) {
@@ -824,7 +816,7 @@ export default defineComponent({
         ...ons
       }, [
         fixedType
-          ? createCommentVNode()
+          ? renderEmptyElement($xeTable)
           : h('div', {
             ref: refBodyXSpace,
             class: 'vxe-body--x-space'
@@ -846,7 +838,7 @@ export default defineComponent({
            */
           h('colgroup', {
             ref: refBodyColgroup
-          }, (tableColumn as any[]).map((column, $columnIndex) => {
+          }, (renderColumnList as any[]).map((column, $columnIndex) => {
             return h('col', {
               name: column.id,
               key: $columnIndex
@@ -861,11 +853,11 @@ export default defineComponent({
               name: `vxe-body--row-list${isDragRowMove ? '' : '-disabled'}`,
               tag: 'tbody'
             }, {
-              default: () => renderRows(fixedType, tableData, tableColumn)
+              default: () => renderRows(fixedType, tableData, renderColumnList)
             })
             : h('tbody', {
               ref: refBodyTBody
-            }, renderRows(fixedType, tableData, tableColumn))
+            }, renderRows(fixedType, tableData, renderColumnList))
         ]),
         h('div', {
           class: 'vxe-table--checkbox-range'

package/packages/table/src/footer.ts

@@ -1,11 +1,11 @@
-import { createCommentVNode, defineComponent, TransitionGroup, h, ref, Ref, PropType, inject, nextTick, onMounted, onUnmounted } from 'vue'
+import { defineComponent, TransitionGroup, h, ref, Ref, PropType, inject, nextTick, onMounted, onUnmounted } from 'vue'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
 import { updateCellTitle, getPropClass, setScrollLeft } from '../../ui/src/dom'
 
 import type { VxeTablePrivateMethods, VxeTableConstructor, VxeTableMethods, VxeColumnPropTypes, VxeTableDefines } from '../../../types'
 
-const { renderer } = VxeUI
+const { renderer, renderEmptyElement } = VxeUI
 
 const renderType = 'footer'
 
@@ -228,8 +228,8 @@ export default defineComponent({
         : [])
     }
 
-    const renderHeads = (footerTableData: any[]) => {
-      const { fixedType, tableColumn } = props
+    const renderHeads = (renderColumnList: VxeTableDefines.ColumnInfo[]) => {
+      const { fixedType, footerTableData } = props
       const { footerRowClassName, footerRowStyle } = tableProps
       const { isDragColMove } = tableReactData
       const columnOpts = computeColumnOpts.value
@@ -250,7 +250,7 @@ export default defineComponent({
             ],
             style: footerRowStyle ? (XEUtils.isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle) : null
           }, {
-            default: () => renderRows(tableColumn, footerTableData, row, $rowIndex, _rowIndex)
+            default: () => renderRows(renderColumnList, footerTableData, row, $rowIndex, _rowIndex)
           })
         }
         return h('tr', {
@@ -260,27 +260,28 @@ export default defineComponent({
             footerRowClassName ? XEUtils.isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ''
           ],
           style: footerRowStyle ? (XEUtils.isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle) : null
-        }, renderRows(tableColumn, footerTableData, row, $rowIndex, _rowIndex))
+        }, renderRows(renderColumnList, footerTableData, row, $rowIndex, _rowIndex))
       })
     }
 
     const renderVN = () => {
-      let { fixedType, fixedColumn, tableColumn, footerTableData } = props
-      const { footerSpanMethod, showFooterOverflow: allColumnFooterOverflow } = tableProps
+      const { fixedType, fixedColumn, tableColumn } = props
+      const { spanMethod, footerSpanMethod, showFooterOverflow: allColumnFooterOverflow } = tableProps
       const { visibleColumn } = tableInternalData
-      const { scrollXLoad, scrollbarWidth, mergeFooterList } = tableReactData
+      const { scrollbarWidth } = tableReactData
+
+      let renderColumnList = tableColumn
 
-      // 如果是使用优化模式
       if (fixedType) {
-        // 如果存在展开行使用全量渲染
-        if (!tableReactData.expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
-          if (!mergeFooterList.length || !footerSpanMethod) {
-            tableColumn = fixedColumn
+        renderColumnList = visibleColumn
+        // 如果是使用优化模式
+        if (allColumnFooterOverflow) {
+          // 如果不支持优化模式
+          if (spanMethod || footerSpanMethod) {
+            renderColumnList = visibleColumn
           } else {
-            tableColumn = visibleColumn
+            renderColumnList = fixedColumn || []
           }
-        } else {
-          tableColumn = visibleColumn
         }
       }
 
@@ -296,7 +297,7 @@ export default defineComponent({
         ...ons
       }, [
         fixedType
-          ? createCommentVNode()
+          ? renderEmptyElement($xeTable)
           : h('div', {
             ref: refFooterXSpace,
             class: 'vxe-body--x-space'
@@ -314,7 +315,7 @@ export default defineComponent({
            */
           h('colgroup', {
             ref: refFooterColgroup
-          }, tableColumn.map((column, $columnIndex) => {
+          }, renderColumnList.map((column, $columnIndex) => {
             return h('col', {
               name: column.id,
               key: $columnIndex
@@ -331,7 +332,7 @@ export default defineComponent({
            */
           h('tfoot', {
             ref: refFooterTFoot
-          }, renderHeads(footerTableData))
+          }, renderHeads(renderColumnList))
         ])
       ])
     }

package/packages/table/src/header.ts

@@ -1,4 +1,4 @@
-import { createCommentVNode, defineComponent, TransitionGroup, h, ref, Ref, PropType, inject, nextTick, watch, onMounted, onUnmounted } from 'vue'
+import { defineComponent, TransitionGroup, h, ref, Ref, PropType, inject, nextTick, watch, onMounted, onUnmounted } from 'vue'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
 import { convertHeaderColumnToRows, getColReMinWidth } from './util'
@@ -6,7 +6,7 @@ import { hasClass, getOffsetPos, addClass, removeClass } from '../../ui/src/dom'
 
 import type { VxeTablePrivateMethods, VxeTableConstructor, VxeTableMethods, VxeTableDefines, VxeColumnPropTypes } from '../../../types'
 
-const { renderer } = VxeUI
+const { renderer, renderEmptyElement } = VxeUI
 
 const renderType = 'header'
 
@@ -311,18 +311,24 @@ export default defineComponent({
 
     const renderVN = () => {
       const { fixedType, fixedColumn, tableColumn } = props
-      const { showHeaderOverflow: allColumnHeaderOverflow } = tableProps
-      const { isGroup, scrollXLoad, scrollbarWidth } = tableReactData
+      const { showHeaderOverflow: allColumnHeaderOverflow, spanMethod, footerSpanMethod } = tableProps
+      const { isGroup, scrollbarWidth } = tableReactData
       const { visibleColumn } = tableInternalData
       let headerGroups: VxeTableDefines.ColumnInfo[][] = headerColumn.value
       let renderColumnList = tableColumn as VxeTableDefines.ColumnInfo[]
       if (isGroup) {
         renderColumnList = visibleColumn
       } else {
-        // 如果是使用优化模式
         if (fixedType) {
-          if (scrollXLoad || allColumnHeaderOverflow) {
-            renderColumnList = fixedColumn as VxeTableDefines.ColumnInfo[]
+          renderColumnList = visibleColumn
+          // 如果是使用优化模式
+          if (allColumnHeaderOverflow) {
+            // 如果不支持优化模式
+            if (spanMethod || footerSpanMethod) {
+              renderColumnList = visibleColumn
+            } else {
+              renderColumnList = fixedColumn || []
+            }
           }
         }
         headerGroups = [renderColumnList]
@@ -333,7 +339,7 @@ export default defineComponent({
         xid: xID
       }, [
         fixedType
-          ? createCommentVNode()
+          ? renderEmptyElement($xeTable)
           : h('div', {
             ref: refHeaderXSpace,
             class: 'vxe-body--x-space'

package/packages/table/src/table.ts

@@ -1730,14 +1730,13 @@ export default defineComponent({
     }
 
     const updateStyle = () => {
-      const { border, showFooter, showOverflow: allColumnOverflow, showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, mouseConfig, spanMethod, footerSpanMethod, keyboardConfig } = props
-      const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, scrollbarHeight, columnStore, editStore, mergeList, mergeFooterList, isAllOverflow } = reactData
+      const { border, showFooter, showOverflow: allColumnOverflow, showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, mouseConfig, spanMethod, footerSpanMethod } = props
+      const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, scrollbarHeight, columnStore, editStore, isAllOverflow, expandColumn } = reactData
       let { visibleColumn, fullColumnIdData, tableHeight, tableWidth, headerHeight, footerHeight, elemStore, customHeight, customMinHeight, customMaxHeight } = internalData
       const containerList = ['main', 'left', 'right']
       const emptyPlaceholderElem = refEmptyPlaceholder.value
       const cellOffsetWidth = computeCellOffsetWidth.value
       const mouseOpts = computeMouseOpts.value
-      const keyboardOpts = computeKeyboardOpts.value
       const bodyWrapperElem = getRefElem(elemStore['main-body-wrapper'])
       if (emptyPlaceholderElem) {
         emptyPlaceholderElem.style.top = `${headerHeight}px`
@@ -1797,10 +1796,16 @@ export default defineComponent({
             if (isGroup) {
               renderColumnList = visibleColumn
             } else {
-              // 如果是使用优化模式
               if (fixedType) {
-                if (scrollXLoad || allColumnHeaderOverflow) {
-                  renderColumnList = fixedColumn
+                renderColumnList = visibleColumn
+                // 如果是使用优化模式
+                if (allColumnHeaderOverflow) {
+                  // 如果不支持优化模式
+                  if (spanMethod || footerSpanMethod) {
+                    renderColumnList = visibleColumn
+                  } else {
+                    renderColumnList = fixedColumn || []
+                  }
                 }
               }
             }
@@ -1884,19 +1889,19 @@ export default defineComponent({
             let tWidth = tableWidth
             let renderColumnList = tableColumn
 
-            // 如果是使用优化模式
             if (fixedType) {
-              // 如果存在展开行使用全量渲染
-              if (!reactData.expandColumn && (scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
-                if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
-                  renderColumnList = fixedColumn
-                } else {
+              renderColumnList = visibleColumn
+              // 如果是使用优化模式
+              if (scrollXLoad || scrollYLoad || (allColumnOverflow && isAllOverflow)) {
+                // 如果不支持优化模式
+                if (expandColumn || spanMethod || footerSpanMethod) {
                   renderColumnList = visibleColumn
+                } else {
+                  renderColumnList = fixedColumn || []
                 }
-              } else {
-                renderColumnList = visibleColumn
               }
             }
+
             tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0)
 
             if (tableElem) {
@@ -1911,19 +1916,20 @@ export default defineComponent({
             let tWidth = tableWidth
 
             let renderColumnList = tableColumn
-            // 如果是使用优化模式
+
             if (fixedType) {
-              // 如果存在展开行使用全量渲染
-              if (!reactData.expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
-                if (!mergeFooterList.length || !footerSpanMethod) {
-                  renderColumnList = fixedColumn
-                } else {
+              renderColumnList = visibleColumn
+              // 如果是使用优化模式
+              if (allColumnFooterOverflow) {
+                // 如果不支持优化模式
+                if (spanMethod || footerSpanMethod) {
                   renderColumnList = visibleColumn
+                } else {
+                  renderColumnList = fixedColumn || []
                 }
-              } else {
-                renderColumnList = visibleColumn
               }
             }
+
             tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0)
 
             if (isNodeElement(wrapperElem)) {