vxe-table 3.11.38 → 3.11.39

package/lib/ui/index.min.js

@@ -1 +1 @@
-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.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");let version=exports.version="3.11.38",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,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;
+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.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");let version=exports.version="3.11.39",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,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${"3.11.38"}`;
+const version = `table v${"3.11.39"}`;
 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 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v3.11.38",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v3.11.39",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": "3.11.38",
+  "version": "3.11.39",
   "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": "^3.3.45"
+    "vxe-pc-ui": "^3.3.46"
   },
   "devDependencies": {
     "@babel/plugin-transform-modules-commonjs": "^7.25.7",

package/packages/table/render/index.ts

@@ -14,6 +14,10 @@ const componentDefaultModelProp = 'value'
 
 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
 }
@@ -623,13 +627,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}`
           }
         }
@@ -641,18 +657,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

@@ -579,44 +579,50 @@ export default {
     elemStore[`${prefix}emptyBlock`] = null
   },
   render (this: any, h: CreateElement) {
+    const props = this
     const $xeTable = this.$parent
+    const tableProps = $xeTable
+    const tableReactData = $xeTable
+    const tableInternalData = $xeTable
 
-    const { _e, $parent: $xetable, fixedColumn, fixedType } = this
+    const { tId, $scopedSlots } = $xeTable
+    const { fixedColumn, fixedType, tableColumn } = props
 
+    const { showOverflow: allColumnOverflow, spanMethod, footerSpanMethod, mouseConfig } = tableProps
+    const { tableData, scrollXLoad, scrollYLoad, isAllOverflow, isDragRowMove, expandColumn } = tableReactData
+    const { visibleColumn } = tableInternalData
     const rowOpts = $xeTable.computeRowOpts
+    const sYOpts = $xeTable.computeSYOpts
+    const emptyOpts = $xeTable.computeEmptyOpts
+    const mouseOpts = $xeTable.computeMouseOpts
     const rowDragOpts = $xeTable.computeRowDragOpts
-    let { $scopedSlots, tId, tableData, tableColumn, visibleColumn, expandColumn, showOverflow: allColumnOverflow, keyboardConfig, keyboardOpts, mergeList, spanMethod, scrollXLoad, scrollYLoad, isAllOverflow, emptyOpts, mouseConfig, mouseOpts, sYOpts, isDragRowMove } = $xetable
-    // 如果是使用优化模式
+
+    let renderColumnList = tableColumn
+
     if (fixedType) {
-      // 如果存在展开行使用全量渲染
-      if (!expandColumn && (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
-        if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
-          tableColumn = fixedColumn
+      // 如果是使用优化模式
+      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
+        renderColumnList = visibleColumn
       }
     }
+
     let emptyContent
     if ($scopedSlots.empty) {
-      emptyContent = $scopedSlots.empty.call(this, { $table: $xetable }, h)
+      emptyContent = $scopedSlots.empty.call(this, { $table: $xeTable, $grid: $xeTable.xegrid }, h)
     } else {
       const compConf = emptyOpts.name ? renderer.get(emptyOpts.name) : null
       const rtEmptyView = compConf ? (compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty) : null
       if (rtEmptyView) {
-        emptyContent = getSlotVNs(rtEmptyView.call(this, h, emptyOpts, { $table: $xetable }))
+        emptyContent = getSlotVNs(rtEmptyView.call(this, h, emptyOpts, { $table: $xeTable }))
       } else {
-        emptyContent = $xetable.emptyText || getI18n('vxe.table.emptyText')
+        emptyContent = tableProps.emptyText || getI18n('vxe.table.emptyText')
       }
     }
 
@@ -636,7 +642,7 @@ export default {
       on: ons
     }, [
       fixedType
-        ? _e()
+        ? renderEmptyElement($xeTable)
         : h('div', {
           class: 'vxe-body--x-space',
           ref: 'xSpace'
@@ -660,7 +666,7 @@ export default {
          */
         h('colgroup', {
           ref: 'colgroup'
-        }, tableColumn.map((column: any, $columnIndex: any) => {
+        }, renderColumnList.map((column: any, $columnIndex: any) => {
           return h('col', {
             attrs: {
               name: column.id
@@ -677,10 +683,10 @@ export default {
               tag: 'tbody',
               name: `vxe-body--row-list${isDragRowMove ? '' : '-disabled'}`
             }
-          }, renderRows(h, this, $xetable, fixedType, tableData, tableColumn))
+          }, renderRows(h, this, $xeTable, fixedType, tableData, renderColumnList))
           : h('tbody', {
             ref: 'tbody'
-          }, renderRows(h, this, $xetable, fixedType, tableData, tableColumn))
+          }, renderRows(h, this, $xeTable, fixedType, tableData, renderColumnList))
       ]),
       h('div', {
         class: 'vxe-table--checkbox-range'
@@ -697,8 +703,8 @@ export default {
                   class: 'vxe-table--cell-main-area-btn',
                   on: {
                     mousedown (evnt: any) {
-                      if ($xetable.triggerCellAreaExtendMousedownEvent) {
-                        $xetable.triggerCellAreaExtendMousedownEvent(evnt, { $table: $xetable, fixed: fixedType, type: renderType })
+                      if ($xeTable.triggerCellAreaExtendMousedownEvent) {
+                        $xeTable.triggerCellAreaExtendMousedownEvent(evnt, { $table: $xeTable, fixed: fixedType, type: renderType })
                       }
                     }
                   }

package/packages/table/src/footer.ts

@@ -8,7 +8,7 @@ import type { VxeTableDefines } from '../../../types'
 
 const renderType = 'footer'
 
-const { renderer } = VxeUI
+const { renderer, renderEmptyElement } = VxeUI
 
 function mergeFooterMethod (mergeFooterList: any, _rowIndex: any, _columnIndex: any) {
   for (let mIndex = 0; mIndex < mergeFooterList.length; mIndex++) {
@@ -155,18 +155,19 @@ function renderRows (h: CreateElement, _vm: any, tableColumn: VxeTableDefines.Co
     : [])
 }
 
-function renderHeads (h: CreateElement, _vm: any, footerTableData: any[]) {
+function renderHeads (h: CreateElement, _vm: any, renderColumnList: VxeTableDefines.ColumnInfo[]) {
   const $xeTable = _vm.$parent
+  const props = _vm
 
   const columnOpts = $xeTable.computeColumnOpts
   const columnDragOpts = $xeTable.computeColumnDragOpts
 
-  const { $parent: $xetable, fixedType, tableColumn } = _vm
-  const { footerRowClassName, footerRowStyle, isDragColMove } = $xetable
+  const { fixedType, footerTableData } = props
+  const { footerRowClassName, footerRowStyle, isDragColMove } = $xeTable
 
   return footerTableData.map((row: any, $rowIndex: any) => {
     const _rowIndex = $rowIndex
-    const rowParams = { $table: $xetable, row, _rowIndex, $rowIndex, fixed: fixedType, type: renderType }
+    const rowParams = { $table: $xeTable, row, _rowIndex, $rowIndex, fixed: fixedType, type: renderType }
 
     if (columnOpts.drag && columnDragOpts.animation) {
       return h('transition-group', {
@@ -180,7 +181,7 @@ function renderHeads (h: CreateElement, _vm: any, footerTableData: any[]) {
           ],
           style: footerRowStyle ? (XEUtils.isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle) : null
         }
-      }, renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIndex))
+      }, renderRows(h, _vm, renderColumnList, footerTableData, row, $rowIndex, _rowIndex))
     }
     return h('tr', {
       key: $rowIndex,
@@ -189,7 +190,7 @@ function renderHeads (h: CreateElement, _vm: any, footerTableData: any[]) {
         footerRowClassName ? XEUtils.isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ''
       ],
       style: footerRowStyle ? (XEUtils.isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle) : null
-    }, renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIndex))
+    }, renderRows(h, _vm, renderColumnList, footerTableData, row, $rowIndex, _rowIndex))
   })
 }
 
@@ -223,19 +224,33 @@ export default {
     elemStore[`${prefix}xSpace`] = null
   },
   render (h: CreateElement) {
-    let { _e, $parent: $xetable, fixedType, fixedColumn, tableColumn, footerTableData } = this
-    const { tId, mergeFooterList, footerSpanMethod, scrollXLoad, showFooterOverflow: allColumnFooterOverflow, scrollbarWidth, visibleColumn, expandColumn } = $xetable
+    const props = this
+    const $xeTable = this.$parent
+    const tableProps = $xeTable
+    const tableReactData = $xeTable
+    const tableInternalData = $xeTable
+
+    const { tId } = $xeTable
+    const { fixedType, fixedColumn, tableColumn } = props
+
+    const { spanMethod, footerSpanMethod, showFooterOverflow: allColumnFooterOverflow } = tableProps
+    const { visibleColumn } = tableInternalData
+    const { scrollbarWidth } = tableReactData
+
+    let renderColumnList = tableColumn
+
     // 如果是使用优化模式
     if (fixedType) {
-      // 如果存在展开行使用全量渲染
-      if (!expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
-        if (!mergeFooterList.length || !footerSpanMethod) {
-          tableColumn = fixedColumn
+      // 如果是使用优化模式
+      if (allColumnFooterOverflow) {
+        // 如果不支持优化模式
+        if (spanMethod || footerSpanMethod) {
+          renderColumnList = visibleColumn
         } else {
-          tableColumn = visibleColumn
+          renderColumnList = fixedColumn || []
         }
       } else {
-        tableColumn = visibleColumn
+        renderColumnList = visibleColumn
       }
     }
 
@@ -252,7 +267,7 @@ export default {
       on: ons
     }, [
       fixedType
-        ? _e()
+        ? renderEmptyElement($xeTable)
         : h('div', {
           class: 'vxe-body--x-space',
           ref: 'xSpace'
@@ -272,7 +287,7 @@ export default {
          */
         h('colgroup', {
           ref: 'colgroup'
-        }, tableColumn.map((column: any, $columnIndex: any) => {
+        }, renderColumnList.map((column: any, $columnIndex: any) => {
           return h('col', {
             attrs: {
               name: column.id
@@ -293,7 +308,7 @@ export default {
          */
         h('tfoot', {
           ref: 'tfoot'
-        }, renderHeads(h, this, footerTableData))
+        }, renderHeads(h, this, renderColumnList))
       ])
     ])
   },

package/packages/table/src/header.ts

@@ -7,7 +7,7 @@ import { convertHeaderColumnToRows, getColReMinWidth } from './util'
 
 import type { VxeTableDefines } from '../../../types'
 
-const { renderer } = VxeUI
+const { renderer, renderEmptyElement } = VxeUI
 
 const cellType = 'header'
 
@@ -209,17 +209,35 @@ export default {
     elemStore[`${prefix}repair`] = null
   },
   render (h: CreateElement) {
-    const { _e, $parent: $xetable, fixedType, headerColumn, tableColumn, fixedColumn } = this
-    const { tId, isGroup, visibleColumn, showHeaderOverflow: allColumnHeaderOverflow, scrollXLoad, scrollbarWidth } = $xetable
+    const props = this
+    const $xeTable = this.$parent
+    const tableProps = $xeTable
+    const tableReactData = $xeTable
+    const tableInternalData = $xeTable
+
+    const { tId } = $xeTable
+    const { fixedType, fixedColumn, tableColumn } = props
+    const { headerColumn } = this
+
+    const { showHeaderOverflow: allColumnHeaderOverflow, spanMethod, footerSpanMethod } = tableProps
+    const { isGroup, scrollbarWidth } = tableReactData
+    const { visibleColumn } = tableInternalData
     let headerGroups = headerColumn
     let renderColumnList = tableColumn
     if (isGroup) {
       renderColumnList = visibleColumn
     } else {
-      // 如果是使用优化模式
       if (fixedType) {
-        if (scrollXLoad || allColumnHeaderOverflow) {
-          renderColumnList = fixedColumn
+        // 如果是使用优化模式
+        if (allColumnHeaderOverflow) {
+          // 如果不支持优化模式
+          if (spanMethod || footerSpanMethod) {
+            renderColumnList = visibleColumn
+          } else {
+            renderColumnList = fixedColumn || []
+          }
+        } else {
+          renderColumnList = visibleColumn
         }
       }
       headerGroups = [renderColumnList]
@@ -231,7 +249,7 @@ export default {
       }
     }, [
       fixedType
-        ? _e()
+        ? renderEmptyElement($xeTable)
         : h('div', {
           class: 'vxe-body--x-space',
           ref: 'xSpace'

package/packages/table/src/methods.ts

@@ -2969,11 +2969,8 @@ const Methods = {
       editStore,
       currentRow,
       mouseConfig,
-      keyboardConfig,
-      keyboardOpts,
       spanMethod,
-      mergeList,
-      mergeFooterList,
+      expandColumn,
       footerSpanMethod,
       isAllOverflow,
       visibleColumn
@@ -3034,10 +3031,17 @@ const Methods = {
           if (isGroup) {
             renderColumnList = visibleColumn
           } else {
-            // 如果是使用优化模式
             if (fixedType) {
-              if (scrollXLoad || allColumnHeaderOverflow) {
-                renderColumnList = fixedColumn
+              // 如果是使用优化模式
+              if (allColumnHeaderOverflow) {
+                // 如果不支持优化模式
+                if (spanMethod || footerSpanMethod) {
+                  renderColumnList = visibleColumn
+                } else {
+                  renderColumnList = fixedColumn || []
+                }
+              } else {
+                renderColumnList = visibleColumn
               }
             }
           }
@@ -3129,19 +3133,20 @@ const Methods = {
           let tWidth = tableWidth
           let renderColumnList = tableColumn
 
-          // 如果是使用优化模式
           if (fixedType) {
-            // 如果存在展开行使用全量渲染
-            if (!this.expandColumn && (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
-              if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
-                renderColumnList = fixedColumn
-              } else {
+            // 如果是使用优化模式
+            if (scrollXLoad || scrollYLoad || (allColumnOverflow && isAllOverflow)) {
+              // 如果不支持优化模式
+              if (expandColumn || spanMethod || footerSpanMethod) {
                 renderColumnList = visibleColumn
+              } else {
+                renderColumnList = fixedColumn || []
               }
             } else {
               renderColumnList = visibleColumn
             }
           }
+
           tWidth = renderColumnList.reduce((previous: any, column: any) => previous + column.renderWidth, 0)
 
           if (tableElem) {
@@ -3156,19 +3161,20 @@ const Methods = {
           let tWidth = tableWidth
           let renderColumnList = tableColumn
 
-          // 如果是使用优化模式
           if (fixedType) {
-            // 如果存在展开行使用全量渲染
-            if (!this.expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
-              if (!mergeFooterList.length || !footerSpanMethod) {
-                renderColumnList = fixedColumn
-              } else {
+            // 如果是使用优化模式
+            if (allColumnFooterOverflow) {
+              // 如果不支持优化模式
+              if (spanMethod || footerSpanMethod) {
                 renderColumnList = visibleColumn
+              } else {
+                renderColumnList = fixedColumn || []
               }
             } else {
               renderColumnList = visibleColumn
             }
           }
+
           tWidth = renderColumnList.reduce((previous: any, column: any) => previous + column.renderWidth, 0)
 
           if (isNodeElement(wrapperElem)) {