vxe-table 4.14.0-beta.7 → 4.14.0-beta.9

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.14.0-beta.7";
+const version = exports.version = "4.14.0-beta.9";
 _core.VxeUI.version = version;
 _core.VxeUI.tableVersion = version;
 _core.VxeUI.setConfig({

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.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");let version=exports.version="4.14.0-beta.7",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{autoOptions:{isCalcHeader:!0,isCalcBody:!0,isCalcFooter:!0},maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",storeOptions:{visible:!0,resizable:!0,sort:!0,fixed:!0},modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},aggregateConfig:{padding:!0,rowField:"id",parentField:"_X_ROW_PARENT_KEY",childrenField:"_X_ROW_CHILDREN",mapChildrenField:"_X_ROW_CHILD_LIST",indent:20,showIcon:!0,maxGroupSize:4,showAggFuncTitle:!0},treeConfig:{padding:!0,rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0,mode:"fixed"},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:{isAll:!0,isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{gt:24,preSize:1,oSize:0},virtualYConfig:{gt:100,preSize:1,oSize:0},scrollbarConfig:{}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActiveMsg:!0,response:{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_CHECKBOX_DISABLED_UNCHECKED:iconPrefix+"checkbox-unchecked-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_RADIO_DISABLED_UNCHECKED:iconPrefix+"radio-unchecked-fill",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_AGG_GROUP:iconPrefix+"grouping",TABLE_DRAG_STATUS_AGG_VALUES:iconPrefix+"values",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TABLE_ROW_GROUP_OPEN:iconPrefix+"arrow-right rotate90",TABLE_ROW_GROUP_CLOSE:iconPrefix+"arrow-right",TABLE_AGGREGATE_GROUPING:iconPrefix+"grouping",TABLE_AGGREGATE_VALUES:iconPrefix+"values",TABLE_AGGREGATE_SORT:iconPrefix+"drag-handle",TABLE_AGGREGATE_DELETE:iconPrefix+"close",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;
+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");let version=exports.version="4.14.0-beta.9",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{autoOptions:{isCalcHeader:!0,isCalcBody:!0,isCalcFooter:!0},maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",storeOptions:{visible:!0,resizable:!0,sort:!0,fixed:!0},modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},aggregateConfig:{padding:!0,rowField:"id",parentField:"_X_ROW_PARENT_KEY",childrenField:"_X_ROW_CHILDREN",mapChildrenField:"_X_ROW_CHILD_LIST",indent:20,showIcon:!0,maxGroupSize:4,showAggFuncTitle:!0},treeConfig:{padding:!0,rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0,mode:"fixed"},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:{isAll:!0,isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{gt:24,preSize:1,oSize:0},virtualYConfig:{gt:100,preSize:1,oSize:0},scrollbarConfig:{}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActiveMsg:!0,response:{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_CHECKBOX_DISABLED_UNCHECKED:iconPrefix+"checkbox-unchecked-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_RADIO_DISABLED_UNCHECKED:iconPrefix+"radio-unchecked-fill",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_AGG_GROUP:iconPrefix+"grouping",TABLE_DRAG_STATUS_AGG_VALUES:iconPrefix+"values",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TABLE_ROW_GROUP_OPEN:iconPrefix+"arrow-right rotate90",TABLE_ROW_GROUP_CLOSE:iconPrefix+"arrow-right",TABLE_AGGREGATE_GROUPING:iconPrefix+"grouping",TABLE_AGGREGATE_VALUES:iconPrefix+"values",TABLE_AGGREGATE_SORT:iconPrefix+"drag-handle",TABLE_AGGREGATE_DELETE:iconPrefix+"close",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.14.0-beta.7"}`;
+const version = `table v${"4.14.0-beta.9"}`;
 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 v4.14.0-beta.7",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 v4.14.0-beta.9",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.14.0-beta.7",
+  "version": "4.14.0-beta.9",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、拖拽排序，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/locale/lang/ar-EG.ts

@@ -337,6 +337,7 @@ export default {
       overCountErr: 'يمكن تحديد ملفات {0} فقط على الأكثر!',
       overCountExtraErr: 'تم تجاوز الحد الأقصى لعدد {0} ، وسيتم تجاهل الملفات الزائدة {1}!',
       overSizeErr: 'لا يمكن أن يتجاوز حجم الملف الأقصى {0}!',
+      manualUpload: '点击上传',
       reUpload: 'إعادة التحميل',
       uploadProgress: 'تحميل {0} ٪',
       uploadErr: 'فشل التحميل',

package/packages/locale/lang/de-DE.ts

@@ -337,6 +337,7 @@ export default {
       overCountErr: 'Nur {0} -Dateien können höchstens ausgewählt werden!',
       overCountExtraErr: 'Die maximale Anzahl von {0} wurde überschritten, und die überschüssigen {1} -Dateien werden ignoriert!',
       overSizeErr: 'Die maximale Dateigröße darf {0} nicht überschreiten!',
+      manualUpload: '点击上传',
       reUpload: 'Wiederbelastung',
       uploadProgress: 'Hochladen {0}%',
       uploadErr: 'Upload fehlgeschlagen',

package/packages/locale/lang/en-US.ts

@@ -337,6 +337,7 @@ export default {
       overCountErr: 'Only {0} files can be selected at most!',
       overCountExtraErr: 'The maximum number of {0} has been exceeded, and the excess {1} files will be ignored!',
       overSizeErr: 'The maximum file size cannot exceed {0}!',
+      manualUpload: '点击上传',
       reUpload: 'Re-upload',
       uploadProgress: 'Uploading {0}%',
       uploadErr: 'Upload failed',

package/packages/locale/lang/es-ES.ts

@@ -337,6 +337,7 @@ export default {
       overCountErr: '¡Solo los archivos {0} se pueden seleccionar como máximo!',
       overCountExtraErr: 'Se ha excedido el número máximo de {0}, ¡y los archivos de exceso {1} se ignorarán!',
       overSizeErr: '¡El tamaño máximo del archivo no puede exceder {0}!',
+      manualUpload: '点击上传',
       reUpload: 'Volver a cargar',
       uploadProgress: 'Cargando {0}%',
       uploadErr: 'Carga falló',

package/packages/locale/lang/fr-FR.ts

@@ -337,6 +337,7 @@ export default {
       overCountErr: 'Seuls les fichiers {0} peuvent être sélectionnés au maximum!',
       overCountExtraErr: 'Le nombre maximum de {0} a été dépassé et les fichiers excédentaires {1} seront ignorés!',
       overSizeErr: 'La taille maximale du fichier ne peut pas dépasser {0}!',
+      manualUpload: '点击上传',
       reUpload: 'Télécharger à nouveau',
       uploadProgress: 'Téléchargement {0}%',
       uploadErr: 'Le téléchargement a échoué',

package/packages/locale/lang/hu-HU.ts

@@ -337,6 +337,7 @@ export default {
       overCountErr: 'Csak a {0} fájlok választhatók legfeljebb!',
       overCountExtraErr: 'A {0} maximális számát túllépték, és a {1} felesleges fájlokat figyelmen kívül hagyják!',
       overSizeErr: 'A maximális fájlméret nem haladhatja meg a {0}!',
+      manualUpload: '点击上传',
       reUpload: 'Újból feltölt',
       uploadProgress: 'Feltöltés {0}%',
       uploadErr: 'A feltöltés sikertelen',

package/packages/locale/lang/hy-AM.ts

@@ -337,6 +337,7 @@ export default {
       overCountErr: '最多只能选择{0}个文件！',
       overCountExtraErr: '已超出最大数量{0}个，超出的{1}个文件将被忽略！',
       overSizeErr: '文件大小最大不能超过{0}！',
+      manualUpload: '点击上传',
       reUpload: '重新上传',
       uploadProgress: '上传中 {0}%',
       uploadErr: '上传失败',

package/packages/locale/lang/id-ID.ts

@@ -337,6 +337,7 @@ export default {
       overCountErr: 'Hanya {0} file yang paling banyak dapat dipilih!',
       overCountExtraErr: 'Jumlah maksimum {0} telah terlampaui, dan file kelebihan {1} akan diabaikan!',
       overSizeErr: 'Ukuran file maksimum tidak dapat melebihi {0}!',
+      manualUpload: '点击上传',
       reUpload: 'Mengunggah ulang',
       uploadProgress: 'Mengunggah {0}%',
       uploadErr: 'Unggah gagal',

package/packages/locale/lang/it-IT.ts

@@ -337,6 +337,7 @@ export default {
       overCountErr: 'Solo i file {0} possono essere selezionati al massimo!',
       overCountExtraErr: 'Il numero massimo di {0} è stato superato e i file in eccesso {1} verranno ignorati!',
       overSizeErr: 'La dimensione massima del file non può superare {0}!',
+      manualUpload: '点击上传',
       reUpload: 'Ri-caricamento',
       uploadProgress: 'Caricamento {0}%',
       uploadErr: 'Caricamento non riuscito',

package/packages/locale/lang/ja-JP.ts

@@ -337,6 +337,7 @@ export default {
       overCountErr: 'せいぜい{0}ファイルのみを選択できます！',
       overCountExtraErr: '{0}の最大数は超えており、過剰な{1}ファイルは無視されます！',
       overSizeErr: '最大ファイルサイズは{0}を超えることはできません！',
+      manualUpload: '点击上传',
       reUpload: '再アップロード',
       uploadProgress: '{0}％のアップロード',
       uploadErr: 'アップロードに失敗しました',

package/packages/locale/lang/ko-KR.ts

@@ -337,6 +337,7 @@ export default {
       overCountErr: '{0} 파일 만 최대 선택할 수 있습니다!',
       overCountExtraErr: '{0}의 최대 수가 초과되었고 초과 {1} 파일은 무시됩니다!',
       overSizeErr: '최대 파일 크기는 {0}을 초과 할 수 없습니다!',
+      manualUpload: '点击上传',
       reUpload: '재 포장',
       uploadProgress: '업로드 {0}%',
       uploadErr: '업로드 실패',

package/packages/locale/lang/ms-MY.ts

@@ -337,6 +337,7 @@ export default {
       overCountErr: 'Hanya {0} fail boleh dipilih paling banyak!',
       overCountExtraErr: 'Jumlah maksimum {0} telah melebihi, dan lebihan fail {1} ​​akan diabaikan!',
       overSizeErr: 'Saiz fail maksimum tidak boleh melebihi {0}!',
+      manualUpload: '点击上传',
       reUpload: 'Muat naik semula',
       uploadProgress: 'Memuat naik {0}%',
       uploadErr: 'Muat naik gagal',

package/packages/locale/lang/nb-NO.ts

@@ -337,6 +337,7 @@ export default {
       overCountErr: 'Bare {0} filer kan velges på det meste!',
       overCountExtraErr: 'Det maksimale antallet {0} er overskredet, og overskuddet {1} filer vil bli ignorert!',
       overSizeErr: 'Maksimal filstørrelse kan ikke overstige {0}!',
+      manualUpload: '点击上传',
       reUpload: 'Last opp på nytt',
       uploadProgress: 'Last opp {0}%',
       uploadErr: 'Opplasting mislyktes',

package/packages/locale/lang/pt-BR.ts

@@ -337,6 +337,7 @@ export default {
       overCountErr: 'Somente os arquivos {0} podem ser selecionados no máximo!',
       overCountExtraErr: 'O número máximo de {0} foi excedido e os arquivos excedentes {1} serão ignorados!',
       overSizeErr: 'O tamanho máximo do arquivo não pode exceder {0}!',
+      manualUpload: '点击上传',
       reUpload: 'Re-applar',
       uploadProgress: 'Upload {0}%',
       uploadErr: 'Falha no upload',

package/packages/locale/lang/ru-RU.ts

@@ -337,6 +337,7 @@ export default {
       overCountErr: 'Только файлы {0} могут быть выбраны наибольшим количеством!',
       overCountExtraErr: 'Максимальное количество {0} было превышено, и избыточные файлы {1} будут игнорированы!',
       overSizeErr: 'Максимальный размер файла не может превышать {0}!',
+      manualUpload: '点击上传',
       reUpload: 'Повторная загрузка',
       uploadProgress: 'Загрузка {0}%',
       uploadErr: 'Загрузка не удалась',

package/packages/locale/lang/th-TH.ts

@@ -337,6 +337,7 @@ export default {
       overCountErr: 'สามารถเลือกไฟล์ {0} ได้อย่างมากเท่านั้น!',
       overCountExtraErr: 'เกินจำนวนสูงสุดของ {0} และไฟล์ {1} ส่วนเกินจะถูกละเว้น!',
       overSizeErr: 'ขนาดไฟล์สูงสุดไม่เกิน {0}!',
+      manualUpload: '点击上传',
       reUpload: 'อัปเดตใหม่',
       uploadProgress: 'การอัปโหลด {0}%',
       uploadErr: 'การอัปโหลดล้มเหลว',

package/packages/locale/lang/ug-CN.ts

@@ -337,6 +337,7 @@ export default {
       overCountErr: 'ئەڭ كۆپ تاللاشقا بولىدىغان ھۆججەت سانى{0} پارچە',
       overCountExtraErr: 'ئەڭ كۆپ چەك {0}دانە ，ئارتىپ كەتكەن {1} دانە ھۆججەت قالدۇرۇلدى ',
       overSizeErr: 'ھۆججەت چوڭ-كىچىكلىكى {0}！',
+      manualUpload: '点击上传',
       reUpload: 'قايتا چىقىرىڭ',
       uploadProgress: 'يوللىنىۋاتىدۇ {0}%',
       uploadErr: 'چىقىرىش مەغلۇپ بولدى',

package/packages/locale/lang/uk-UA.ts

@@ -337,6 +337,7 @@ export default {
       overCountErr: 'Лише {0} файли можна вибрати щонайбільше!',
       overCountExtraErr: 'Максимальна кількість {0} була перевищена, а надлишки {1} файлів будуть ігноровані!',
       overSizeErr: 'Максимальний розмір файлу не може перевищувати {0}!',
+      manualUpload: '点击上传',
       reUpload: 'Переробляти',
       uploadProgress: 'Завантаження {0}%',
       uploadErr: 'Завантаження не вдалося',

package/packages/locale/lang/uz-UZ.ts

@@ -337,6 +337,7 @@ export default {
       overCountErr: "Faqat {0} fayllari ko'pini tanlab olish mumkin!",
       overCountExtraErr: "{0} maksimal soni oshib ketdi va ortiqcha {1} fayllari e'tiborga olinmaydi!",
       overSizeErr: 'Fayl hajmi {0} dan oshmasligi kerak!',
+      manualUpload: '点击上传',
       reUpload: 'Qayta yuklamoq',
       uploadProgress: 'Yuklash {0}%',
       uploadErr: 'Yuklash muvaffaqiyatsiz tugadi',

package/packages/locale/lang/vi-VN.ts

@@ -337,6 +337,7 @@ export default {
       overCountErr: 'Chỉ các tệp {0} có thể được chọn nhiều nhất!',
       overCountExtraErr: 'Số lượng tối đa của {0} đã bị vượt quá và các tệp dư thừa {1} sẽ bị bỏ qua!',
       overSizeErr: 'Kích thước tệp tối đa không thể vượt quá {0}!',
+      manualUpload: '点击上传',
       reUpload: 'Tải lại lại',
       uploadProgress: 'Tải lên {0}%',
       uploadErr: 'Tải lên không thành công',

package/packages/locale/lang/zh-CHT.ts

@@ -337,6 +337,7 @@ export default {
       overCountErr: '最多只能選擇{0}個文件！',
       overCountExtraErr: '已超出最大數量{0}個，超出的{1}個文件將被忽略！',
       overSizeErr: '文件大小最大不能超過{0}！',
+      manualUpload: '点击上传',
       reUpload: '重新上傳',
       uploadProgress: '上傳中 {0}%',
       uploadErr: '上傳失敗',

package/packages/locale/lang/zh-CN.ts

@@ -337,6 +337,7 @@ export default {
       overCountErr: '最多只能选择{0}个文件！',
       overCountExtraErr: '已超出最大数量{0}个，超出的{1}个文件将被忽略！',
       overSizeErr: '文件大小最大不能超过{0}！',
+      manualUpload: '点击上传',
       reUpload: '重新上传',
       uploadProgress: '上传中 {0}%',
       uploadErr: '上传失败',

package/packages/table/src/footer.ts

@@ -49,7 +49,7 @@ export default defineVxeComponent({
 
       const { fixedType } = props
       const { resizable: allResizable, border, footerCellClassName, footerCellStyle, footerAlign: allFooterAlign, footerSpanMethod, align: allAlign, columnKey, showFooterOverflow: allColumnFooterOverflow } = tableProps
-      const { scrollXLoad, scrollYLoad, overflowX, currentColumn } = tableReactData
+      const { scrollXLoad, scrollYLoad, overflowX, currentColumn, mergeFootFlag } = tableReactData
       const { fullColumnIdData, mergeFooterList, mergeFooterCellMaps, scrollXStore } = tableInternalData
       const virtualXOpts = computeVirtualXOpts.value
       const tooltipOpts = computeTooltipOpts.value
@@ -126,7 +126,7 @@ export default defineVxeComponent({
         }
         let isMergeCell = false
         // 合并行或列
-        if (mergeFooterList.length) {
+        if (mergeFootFlag && mergeFooterList.length) {
           const spanRest = mergeFooterCellMaps[`${_rowIndex}:${_columnIndex}`]
           if (spanRest) {
             const { rowspan, colspan } = spanRest

package/packages/table/src/table.ts

@@ -1226,6 +1226,13 @@ export default defineVxeComponent({
       return mergeMaps
     }
 
+    const handleUpdateMergeBodyCells = (merges: VxeTableDefines.MergeOptions | VxeTableDefines.MergeOptions[]) => {
+      internalData.mergeBodyList = []
+      internalData.mergeBodyMaps = {}
+      internalData.mergeBodyCellMaps = {}
+      $xeTable.setMergeCells(merges)
+    }
+
     const handleBodyMerge = (merges: VxeTableDefines.MergeOptions | VxeTableDefines.MergeOptions[]) => {
       const { fullAllDataRowIdData, fullColumnIdData, visibleColumn, afterFullData, mergeBodyList, mergeBodyMaps } = internalData
       if (merges) {
@@ -1287,6 +1294,13 @@ export default defineVxeComponent({
       }
     }
 
+    const handleUpdateMergeFooterCells = (merges: VxeTableDefines.MergeOptions | VxeTableDefines.MergeOptions[]) => {
+      internalData.mergeFooterList = []
+      internalData.mergeFooterMaps = {}
+      internalData.mergeFooterCellMaps = {}
+      $xeTable.setMergeFooterItems(merges)
+    }
+
     const handleFooterMerge = (merges: VxeTableDefines.MergeOptions | VxeTableDefines.MergeOptions[]) => {
       const { footerTableData } = reactData
       const { mergeFooterList, mergeFooterMaps, fullColumnIdData } = internalData
@@ -6703,8 +6717,7 @@ export default defineVxeComponent({
         })
       },
       /**
-       * 设置合并单元格
-       * @param {TableMergeConfig[]} merges { row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }
+       * 设置合并单元格 [{ row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }]
        */
       setMergeCells (merges) {
         if (props.spanMethod) {
@@ -6713,13 +6726,17 @@ export default defineVxeComponent({
         handleBodyMerge(merges)
         $xeTable.handleUpdateBodyMerge()
         return nextTick().then(() => {
+          const { expandColumn } = reactData
+          const { mergeBodyList } = internalData
+          if (expandColumn && mergeBodyList.length) {
+            warnLog('vxe.error.errConflicts', ['type=expand', 'merge-cells | span-method'])
+          }
           $xeTable.updateCellAreas()
           return updateStyle()
         })
       },
       /**
-       * 移除单元格合并
-       * @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
+       * 移除单元格合并 [{row:Row|number, col:ColumnInfo|number}]
        */
       removeMergeCells (merges) {
         if (props.spanMethod) {
@@ -6758,7 +6775,7 @@ export default defineVxeComponent({
         handleFooterMerge(merges)
         $xeTable.handleUpdateFooterMerge()
         return nextTick().then(() => {
-          tableMethods.updateCellAreas()
+          $xeTable.updateCellAreas()
           return updateStyle()
         })
       },
@@ -6769,7 +6786,7 @@ export default defineVxeComponent({
         const rest = removeFooterMerges(merges)
         $xeTable.handleUpdateFooterMerge()
         return nextTick().then(() => {
-          tableMethods.updateCellAreas()
+          $xeTable.updateCellAreas()
           updateStyle()
           return rest
         })
@@ -11704,12 +11721,7 @@ export default defineVxeComponent({
       mergeCellFlag.value++
     })
     watch(mergeCellFlag, () => {
-      tableMethods.clearMergeCells()
-      nextTick(() => {
-        if (props.mergeCells) {
-          tableMethods.setMergeCells(props.mergeCells)
-        }
-      })
+      handleUpdateMergeBodyCells(props.mergeCells || [])
     })
 
     const mergeFooterItemFlag = ref(0)
@@ -11720,12 +11732,7 @@ export default defineVxeComponent({
       mergeFooterItemFlag.value++
     })
     watch(mergeFooterItemFlag, () => {
-      tableMethods.clearMergeFooterItems()
-      nextTick(() => {
-        if (props.mergeFooterItems) {
-          tableMethods.setMergeFooterItems(props.mergeFooterItems)
-        }
-      })
+      handleUpdateMergeFooterCells(props.mergeFooterItems || [])
     })
 
     watch(computeRowGroupFields, (val) => {