vxe-table 4.16.3 → 4.16.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/ui/index.js CHANGED
@@ -13,7 +13,7 @@ Object.defineProperty(exports, "VxeUI", {
13
13
  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;
14
14
  var _core = require("@vxe-ui/core");
15
15
  var _utils = require("./src/utils");
16
- const version = exports.version = "4.16.3";
16
+ const version = exports.version = "4.16.4";
17
17
  _core.VxeUI.version = version;
18
18
  _core.VxeUI.tableVersion = version;
19
19
  _core.VxeUI.setConfig({
@@ -1 +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.16.3",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:" ",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,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:{multiple:!0,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:{x:{visible:!0},y:{visible:!0}}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{},gantt:{}}),"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;
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.16.4",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:" ",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,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:{multiple:!0,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:{x:{visible:!0},y:{visible:!0}}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{},gantt:{}}),"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 CHANGED
@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
8
8
  const {
9
9
  log
10
10
  } = _core.VxeUI;
11
- const version = `table v${"4.16.3"}`;
11
+ const version = `table v${"4.16.4"}`;
12
12
  const warnLog = exports.warnLog = log.create('warn', version);
13
13
  const errLog = exports.errLog = log.create('error', version);
@@ -1 +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.16.3",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
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.16.4",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vxe-table",
3
- "version": "4.16.3",
3
+ "version": "4.16.4",
4
4
  "description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
5
5
  "scripts": {
6
6
  "update": "npm install --legacy-peer-deps",
@@ -56,7 +56,7 @@ function handleConfirmFilter (params: any, checked: any, option: any) {
56
56
  $panel.changeOption({}, checked, option)
57
57
  }
58
58
 
59
- function getNativeAttrs (renderOpts: any) {
59
+ function getNativeAttrs (renderOpts: VxeGlobalRendererHandles.RenderTableCellOptions) {
60
60
  let { name, attrs } = renderOpts
61
61
  if (name === 'input') {
62
62
  attrs = Object.assign({ type: 'text' }, attrs)
@@ -83,7 +83,7 @@ function getCellEditProps (renderOpts: VxeColumnPropTypes.EditRender, params: Vx
83
83
  return XEUtils.assign({ immediate: getInputImmediateModel(renderOpts) }, defaultCompProps, defaultProps, renderOpts.props, { [componentDefaultModelProp]: value })
84
84
  }
85
85
 
86
- function getCellEditFilterProps (renderOpts: any, params: any, value: any, defaultProps?: any) {
86
+ function getCellEditFilterProps (renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, params: any, value: any, defaultProps?: any) {
87
87
  return XEUtils.assign({}, defaultCompProps, defaultProps, renderOpts.props, { [componentDefaultModelProp]: value })
88
88
  }
89
89
 
@@ -91,7 +91,7 @@ function isImmediateCell (renderOpts: VxeColumnPropTypes.EditRender, params: any
91
91
  return params.$type === 'cell' || getInputImmediateModel(renderOpts)
92
92
  }
93
93
 
94
- function getCellLabelVNs (renderOpts: any, params: any, cellLabel: any, opts?: {
94
+ function getCellLabelVNs (renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, params: any, cellLabel: any, opts?: {
95
95
  class?: string
96
96
  }) {
97
97
  const { placeholder } = renderOpts
@@ -115,7 +115,7 @@ function getCellLabelVNs (renderOpts: any, params: any, cellLabel: any, opts?: {
115
115
  * @param modelFunc
116
116
  * @param changeFunc
117
117
  */
118
- function getNativeElementOns (renderOpts: any, params: any, eFns?: {
118
+ function getNativeElementOns (renderOpts: VxeGlobalRendererHandles.RenderTableCellOptions | VxeGlobalRendererHandles.RenderTableFilterOptions, params: any, eFns?: {
119
119
  model: (evnt: Event) => void
120
120
  change?: (evnt: Event) => void
121
121
  blur?: (evnt: Event) => void
@@ -172,7 +172,7 @@ const blurEvent = 'blur'
172
172
  * @param modelFunc
173
173
  * @param changeFunc
174
174
  */
175
- function getComponentOns (renderOpts: any, params: any, eFns?: {
175
+ function getComponentOns (renderOpts: VxeGlobalRendererHandles.RenderTableCellOptions | VxeGlobalRendererHandles.RenderTableFilterOptions, params: any, eFns?: {
176
176
  model: (cellValue: any) => void
177
177
  change?: (...args: any[]) => void
178
178
  blur?: (...args: any[]) => void
@@ -252,7 +252,7 @@ function getEditOns (renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions
252
252
  })
253
253
  }
254
254
 
255
- function getFilterOns (renderOpts: any, params: any, option: any) {
255
+ function getFilterOns (renderOpts: VxeGlobalRendererHandles.RenderTableFilterOptions, params: any, option: any) {
256
256
  return getComponentOns(renderOpts, params, {
257
257
  model (value: any) {
258
258
  // 处理 model 值双向绑定
@@ -267,7 +267,7 @@ function getFilterOns (renderOpts: any, params: any, option: any) {
267
267
  })
268
268
  }
269
269
 
270
- function getNativeEditOns (renderOpts: any, params: any) {
270
+ function getNativeEditOns (renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, params: any) {
271
271
  const { $table, row, column } = params
272
272
  const { model } = column
273
273
  return getNativeElementOns(renderOpts, params, {
@@ -302,7 +302,7 @@ function getNativeEditOns (renderOpts: any, params: any) {
302
302
  })
303
303
  }
304
304
 
305
- function getNativeFilterOns (renderOpts: any, params: any, option: any) {
305
+ function getNativeFilterOns (renderOpts: VxeGlobalRendererHandles.RenderTableFilterOptions, params: any, option: any) {
306
306
  return getNativeElementOns(renderOpts, params, {
307
307
  model (evnt) {
308
308
  // 处理 model 值双向绑定
@@ -324,12 +324,12 @@ function getNativeFilterOns (renderOpts: any, params: any, option: any) {
324
324
  * 单元格可编辑渲染-原生的标签
325
325
  * input、textarea、select
326
326
  */
327
- function nativeEditRender (renderOpts: any, params: any) {
327
+ function nativeEditRender (renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, params: any) {
328
328
  const { row, column } = params
329
329
  const { name } = renderOpts
330
330
  const cellValue = isImmediateCell(renderOpts, params) ? getCellValue(row, column) : column.model.value
331
331
  return [
332
- h(name, {
332
+ h(`${name}`, {
333
333
  class: `vxe-default-${name}`,
334
334
  ...getNativeAttrs(renderOpts),
335
335
  value: cellValue,
@@ -338,7 +338,7 @@ function nativeEditRender (renderOpts: any, params: any) {
338
338
  ]
339
339
  }
340
340
 
341
- function buttonCellRender (renderOpts: any, params: any) {
341
+ function buttonCellRender (renderOpts: VxeGlobalRendererHandles.RenderTableCellOptions, params: any) {
342
342
  return [
343
343
  h(getDefaultComponent(renderOpts), {
344
344
  ...getCellEditProps(renderOpts, params, null),
@@ -401,7 +401,7 @@ function oldEditRender (renderOpts: VxeGlobalRendererHandles.RenderTableEditOpti
401
401
  * 已废弃
402
402
  * @deprecated
403
403
  */
404
- function oldButtonEditRender (renderOpts: any, params: any) {
404
+ function oldButtonEditRender (renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, params: any) {
405
405
  return [
406
406
  h(getComponent('vxe-button'), {
407
407
  ...getCellEditProps(renderOpts, params, null),
@@ -414,11 +414,12 @@ function oldButtonEditRender (renderOpts: any, params: any) {
414
414
  * 已废弃
415
415
  * @deprecated
416
416
  */
417
- function oldButtonsEditRender (renderOpts: any, params: any) {
418
- return renderOpts.children.map((childRenderOpts: any) => oldButtonEditRender(childRenderOpts, params)[0])
417
+ function oldButtonsEditRender (renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, params: any) {
418
+ const { children } = renderOpts
419
+ return children ? children.map((childRenderOpts: any) => oldButtonEditRender(childRenderOpts, params)[0]) : []
419
420
  }
420
421
 
421
- function renderNativeOptgroups (renderOpts: any, params: any, renderOptionsMethods: any) {
422
+ function renderNativeOptgroups (renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, params: any, renderOptionsMethods: any) {
422
423
  const { optionGroups, optionGroupProps = {} } = renderOpts
423
424
  const groupOptions = optionGroupProps.options || 'options'
424
425
  const groupLabel = optionGroupProps.label || 'label'
@@ -436,7 +437,7 @@ function renderNativeOptgroups (renderOpts: any, params: any, renderOptionsMetho
436
437
  /**
437
438
  * 渲染原生的 option 标签
438
439
  */
439
- function renderNativeOptions (options: any, renderOpts: any, params: any) {
440
+ function renderNativeOptions (options: any, renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, params: any) {
440
441
  const { optionProps = {} } = renderOpts
441
442
  const { row, column } = params
442
443
  const labelProp = optionProps.label || 'label'
@@ -457,12 +458,12 @@ function renderNativeOptions (options: any, renderOpts: any, params: any) {
457
458
  return []
458
459
  }
459
460
 
460
- function nativeFilterRender (renderOpts: any, params: any) {
461
+ function nativeFilterRender (renderOpts: VxeGlobalRendererHandles.RenderTableFilterOptions, params: any) {
461
462
  const { column } = params
462
463
  const { name } = renderOpts
463
464
  const attrs = getNativeAttrs(renderOpts)
464
465
  return column.filters.map((option: any, oIndex: any) => {
465
- return h(name, {
466
+ return h(`${name}`, {
466
467
  key: oIndex,
467
468
  class: `vxe-default-${name}`,
468
469
  ...attrs,
@@ -472,7 +473,7 @@ function nativeFilterRender (renderOpts: any, params: any) {
472
473
  })
473
474
  }
474
475
 
475
- function defaultFilterRender (renderOpts: any, params: any) {
476
+ function defaultFilterRender (renderOpts: VxeGlobalRendererHandles.RenderTableFilterOptions, params: any) {
476
477
  const { column } = params
477
478
  return column.filters.map((option: any, oIndex: any) => {
478
479
  const optionValue = option.data
@@ -488,7 +489,7 @@ function defaultFilterRender (renderOpts: any, params: any) {
488
489
  * 已废弃
489
490
  * @deprecated
490
491
  */
491
- function oldFilterRender (renderOpts: any, params: any) {
492
+ function oldFilterRender (renderOpts: VxeGlobalRendererHandles.RenderTableFilterOptions, params: any) {
492
493
  const { column } = params
493
494
  return column.filters.map((option: any, oIndex: any) => {
494
495
  const optionValue = option.data
@@ -514,7 +515,7 @@ function handleInputFilterMethod ({ option, row, column }: any) {
514
515
  return XEUtils.toValueString(cellValue).indexOf(data) > -1
515
516
  }
516
517
 
517
- function nativeSelectEditRender (renderOpts: any, params: any) {
518
+ function nativeSelectEditRender (renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, params: any) {
518
519
  return [
519
520
  h('select', {
520
521
  class: 'vxe-default-select',
@@ -525,7 +526,7 @@ function nativeSelectEditRender (renderOpts: any, params: any) {
525
526
  ]
526
527
  }
527
528
 
528
- function defaultSelectEditRender (renderOpts: any, params: any) {
529
+ function defaultSelectEditRender (renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, params: any) {
529
530
  const { row, column } = params
530
531
  const { options, optionProps, optionGroups, optionGroupProps } = renderOpts
531
532
  const cellValue = getCellValue(row, column)
@@ -537,7 +538,7 @@ function defaultSelectEditRender (renderOpts: any, params: any) {
537
538
  ]
538
539
  }
539
540
 
540
- function defaultTableOrTreeSelectEditRender (renderOpts: any, params: any) {
541
+ function defaultTableOrTreeSelectEditRender (renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, params: any) {
541
542
  const { row, column } = params
542
543
  const { options, optionProps } = renderOpts
543
544
  const cellValue = getCellValue(row, column)
@@ -553,7 +554,7 @@ function defaultTableOrTreeSelectEditRender (renderOpts: any, params: any) {
553
554
  * 已废弃
554
555
  * @deprecated
555
556
  */
556
- function oldSelectEditRender (renderOpts: any, params: any) {
557
+ function oldSelectEditRender (renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, params: any) {
557
558
  const { row, column } = params
558
559
  const { options, optionProps, optionGroups, optionGroupProps } = renderOpts
559
560
  const cellValue = getCellValue(row, column)
@@ -565,7 +566,7 @@ function oldSelectEditRender (renderOpts: any, params: any) {
565
566
  ]
566
567
  }
567
568
 
568
- function getSelectCellValue (renderOpts: any, { row, column }: any) {
569
+ function getSelectCellValue (renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, { row, column }: any) {
569
570
  const { options, optionGroups, optionProps = {}, optionGroupProps = {} } = renderOpts
570
571
  const cellValue = XEUtils.get(row, column.field)
571
572
  let selectItem: any
@@ -600,7 +601,7 @@ function handleExportSelectMethod (params: any) {
600
601
  return options.original ? getCellValue(row, column) : getSelectCellValue(column.editRender || column.cellRender, params)
601
602
  }
602
603
 
603
- function getTreeSelectCellValue (renderOpts: any, { row, column }: any) {
604
+ function getTreeSelectCellValue (renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, { row, column }: any) {
604
605
  const { options, optionProps = {} } = renderOpts
605
606
  const cellValue = XEUtils.get(row, column.field)
606
607
  const labelProp = optionProps.label || 'label'
@@ -10306,11 +10306,20 @@ export default defineVxeComponent({
10306
10306
  const rowDragOpts = computeRowDragOpts.value
10307
10307
  const { isCrossTableDrag } = rowDragOpts
10308
10308
  if (isCrossTableDrag && crossTableDragRowObj && !tableData.length) {
10309
- const { $oldTable } = crossTableDragRowObj
10310
- if ($oldTable && $oldTable.xID !== $xeTable.xID) {
10311
- evnt.preventDefault()
10312
- crossTableDragRowObj.$newTable = $xeTable
10313
- internalData.prevDragRow = null
10309
+ const { $oldTable, $newTable } = crossTableDragRowObj
10310
+ if ($oldTable) {
10311
+ const oldTableReactData = $oldTable.reactData
10312
+ if ($oldTable.xID !== $xeTable.xID) {
10313
+ if ($newTable && $newTable.xID !== $xeTable.xID) {
10314
+ $newTable.hideCrossTableRowDropClearStatus()
10315
+ }
10316
+ evnt.preventDefault()
10317
+ $oldTable.hideCrossTableRowDropClearStatus()
10318
+ crossTableDragRowObj.$newTable = $xeTable
10319
+ internalData.prevDragRow = null
10320
+ reactData.dragTipText = oldTableReactData.dragTipText
10321
+ showDropTip(evnt, evnt.currentTarget as HTMLDivElement, null, true, '')
10322
+ }
10314
10323
  }
10315
10324
  }
10316
10325
  },
@@ -10521,6 +10530,9 @@ export default defineVxeComponent({
10521
10530
  oldTableReactData.isCrossDragRow = false
10522
10531
  crossTableDragRowObj.$newTable = null
10523
10532
  } else {
10533
+ if ($newTable && $newTable.xID !== $xeTable.xID) {
10534
+ $newTable.hideCrossTableRowDropClearStatus()
10535
+ }
10524
10536
  $oldTable.hideCrossTableRowDropClearStatus()
10525
10537
  oldTableReactData.isCrossDragRow = true
10526
10538
  reactData.dragTipText = oldTableReactData.dragTipText
@@ -12223,9 +12235,14 @@ export default defineVxeComponent({
12223
12235
  const scrollbarXToTop = computeScrollbarXToTop.value
12224
12236
  const scrollbarYToLeft = computeScrollbarYToLeft.value
12225
12237
  const { isCrossTableDrag } = rowDragOpts
12226
- const rwOns: Record<string, any> = {}
12238
+ const tbOns: {
12239
+ onKeydown: (...args: any[]) => void
12240
+ onDragover?: (...args: any[]) => void
12241
+ } = {
12242
+ onKeydown: keydownEvent
12243
+ }
12227
12244
  if (isCrossTableDrag && !tableData.length) {
12228
- rwOns.onDragover = $xeTable.handleCrossTableRowDragoverEmptyEvent
12245
+ tbOns.onDragover = $xeTable.handleCrossTableRowDragoverEmptyEvent
12229
12246
  }
12230
12247
  return h('div', {
12231
12248
  ref: refElem,
@@ -12261,7 +12278,7 @@ export default defineVxeComponent({
12261
12278
  'is--virtual-y': scrollYLoad
12262
12279
  }],
12263
12280
  spellcheck: false,
12264
- onKeydown: keydownEvent
12281
+ ...tbOns
12265
12282
  }, [
12266
12283
  /**
12267
12284
  * 隐藏列
@@ -12288,8 +12305,7 @@ export default defineVxeComponent({
12288
12305
  ]),
12289
12306
  h('div', {
12290
12307
  key: 'tw',
12291
- class: 'vxe-table--render-wrapper',
12292
- ...rwOns
12308
+ class: 'vxe-table--render-wrapper'
12293
12309
  }, scrollbarXToTop
12294
12310
  ? [
12295
12311
  renderScrollX(),
@@ -1,12 +1,13 @@
1
1
  import XEUtils from 'xe-utils'
2
2
 
3
+ import type { VxeGlobalRendererHandles } from 'vxe-pc-ui'
3
4
  import type { VxeComponentSlotType } from '../../../types'
4
5
 
5
6
  export function getOnName (type: string) {
6
7
  return 'on' + type.substring(0, 1).toLocaleUpperCase() + type.substring(1)
7
8
  }
8
9
 
9
- export function getModelEvent (renderOpts: any) {
10
+ export function getModelEvent (renderOpts: VxeGlobalRendererHandles.RenderOptions) {
10
11
  switch (renderOpts.name) {
11
12
  case 'input':
12
13
  case 'textarea':
@@ -17,7 +18,7 @@ export function getModelEvent (renderOpts: any) {
17
18
  return 'update:modelValue'
18
19
  }
19
20
 
20
- export function getChangeEvent (renderOpts: any) {
21
+ export function getChangeEvent (renderOpts: VxeGlobalRendererHandles.RenderOptions) {
21
22
  switch (renderOpts.name) {
22
23
  case 'input':
23
24
  case 'textarea':