vxe-table 4.11.15 → 4.11.17

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.
Files changed (66) hide show
  1. package/es/grid/src/grid.js +16 -31
  2. package/es/style.css +1 -1
  3. package/es/table/module/custom/panel.js +19 -21
  4. package/es/table/module/edit/hook.js +7 -7
  5. package/es/table/module/export/export-panel.js +17 -19
  6. package/es/table/module/export/hook.js +5 -11
  7. package/es/table/module/export/import-panel.js +11 -13
  8. package/es/table/module/validator/hook.js +1 -3
  9. package/es/table/render/index.js +2 -4
  10. package/es/table/src/body.js +2 -2
  11. package/es/table/src/columnInfo.js +26 -28
  12. package/es/table/src/table.js +112 -78
  13. package/es/toolbar/src/toolbar.js +16 -24
  14. package/es/ui/index.js +1 -1
  15. package/es/ui/src/log.js +1 -1
  16. package/lib/grid/src/grid.js +16 -33
  17. package/lib/grid/src/grid.min.js +1 -1
  18. package/lib/index.umd.js +253 -247
  19. package/lib/index.umd.min.js +1 -1
  20. package/lib/style.css +1 -1
  21. package/lib/table/module/custom/panel.js +21 -23
  22. package/lib/table/module/custom/panel.min.js +1 -1
  23. package/lib/table/module/edit/hook.js +7 -7
  24. package/lib/table/module/edit/hook.min.js +1 -1
  25. package/lib/table/module/export/export-panel.js +17 -19
  26. package/lib/table/module/export/export-panel.min.js +1 -1
  27. package/lib/table/module/export/hook.js +5 -11
  28. package/lib/table/module/export/hook.min.js +1 -1
  29. package/lib/table/module/export/import-panel.js +11 -13
  30. package/lib/table/module/export/import-panel.min.js +1 -1
  31. package/lib/table/module/validator/hook.js +1 -3
  32. package/lib/table/module/validator/hook.min.js +1 -1
  33. package/lib/table/render/index.js +2 -4
  34. package/lib/table/render/index.min.js +1 -1
  35. package/lib/table/src/body.js +2 -1
  36. package/lib/table/src/body.min.js +1 -1
  37. package/lib/table/src/columnInfo.js +30 -32
  38. package/lib/table/src/columnInfo.min.js +1 -1
  39. package/lib/table/src/table.js +119 -75
  40. package/lib/table/src/table.min.js +1 -1
  41. package/lib/toolbar/src/toolbar.js +16 -24
  42. package/lib/toolbar/src/toolbar.min.js +1 -1
  43. package/lib/ui/index.js +1 -1
  44. package/lib/ui/index.min.js +1 -1
  45. package/lib/ui/src/log.js +1 -1
  46. package/lib/ui/src/log.min.js +1 -1
  47. package/package.json +2 -2
  48. package/packages/grid/src/grid.ts +17 -31
  49. package/packages/table/module/custom/panel.ts +19 -21
  50. package/packages/table/module/edit/hook.ts +7 -7
  51. package/packages/table/module/export/export-panel.ts +17 -19
  52. package/packages/table/module/export/hook.ts +5 -11
  53. package/packages/table/module/export/import-panel.ts +11 -13
  54. package/packages/table/module/keyboard/hook.ts +2 -2
  55. package/packages/table/module/validator/hook.ts +1 -3
  56. package/packages/table/render/index.ts +2 -4
  57. package/packages/table/src/body.ts +2 -2
  58. package/packages/table/src/columnInfo.ts +26 -28
  59. package/packages/table/src/table.ts +111 -76
  60. package/packages/toolbar/src/toolbar.ts +16 -24
  61. /package/es/{iconfont.1740723830079.ttf → iconfont.1741140593243.ttf} +0 -0
  62. /package/es/{iconfont.1740723830079.woff → iconfont.1741140593243.woff} +0 -0
  63. /package/es/{iconfont.1740723830079.woff2 → iconfont.1741140593243.woff2} +0 -0
  64. /package/lib/{iconfont.1740723830079.ttf → iconfont.1741140593243.ttf} +0 -0
  65. /package/lib/{iconfont.1740723830079.woff → iconfont.1741140593243.woff} +0 -0
  66. /package/lib/{iconfont.1740723830079.woff2 → iconfont.1741140593243.woff2} +0 -0
@@ -237,9 +237,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
237
237
  if (tCommandMethod) {
238
238
  tCommandMethod(params);
239
239
  } else {
240
- if (process.env.NODE_ENV === 'development') {
241
- (0, _log.errLog)('vxe.error.notCommands', [code]);
242
- }
240
+ (0, _log.errLog)('vxe.error.notCommands', [code]);
243
241
  }
244
242
  }
245
243
  $xeToolbar.dispatchEvent('button-click', params, evnt);
@@ -271,9 +269,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
271
269
  if (tCommandMethod) {
272
270
  tCommandMethod(params);
273
271
  } else {
274
- if (process.env.NODE_ENV === 'development') {
275
- (0, _log.errLog)('vxe.error.notCommands', [code]);
276
- }
272
+ (0, _log.errLog)('vxe.error.notCommands', [code]);
277
273
  }
278
274
  }
279
275
  $xeToolbar.dispatchEvent('tool-click', params, evnt);
@@ -646,25 +642,21 @@ var _default = exports.default = (0, _vue.defineComponent)({
646
642
  (0, _log.warnLog)('vxe.error.notFunc', ['queryMethod']);
647
643
  }
648
644
  const customOpts = computeCustomOpts.value;
649
- if (process.env.NODE_ENV === 'development') {
650
- if (customOpts.isFooter) {
651
- (0, _log.warnLog)('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
652
- }
653
- if (customOpts.showFooter) {
654
- (0, _log.warnLog)('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
655
- }
656
- if (customOpts.immediate) {
657
- (0, _log.warnLog)('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
658
- }
659
- if (customOpts.trigger) {
660
- (0, _log.warnLog)('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
661
- }
645
+ if (customOpts.isFooter) {
646
+ (0, _log.warnLog)('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
662
647
  }
663
- if (process.env.NODE_ENV === 'development') {
664
- if (props.refresh || props.import || props.export || props.print || props.zoom) {
665
- if (!VxeUIButtonComponent) {
666
- (0, _log.errLog)('vxe.error.reqComp', ['vxe-button']);
667
- }
648
+ if (customOpts.showFooter) {
649
+ (0, _log.warnLog)('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
650
+ }
651
+ if (customOpts.immediate) {
652
+ (0, _log.warnLog)('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
653
+ }
654
+ if (customOpts.trigger) {
655
+ (0, _log.warnLog)('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
656
+ }
657
+ if (props.refresh || props.import || props.export || props.print || props.zoom) {
658
+ if (!VxeUIButtonComponent) {
659
+ (0, _log.errLog)('vxe.error.reqComp', ['vxe-button']);
668
660
  }
669
661
  }
670
662
  });
@@ -1 +1 @@
1
- Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getConfig,getIcon,getI18n,renderer,commands,createEvent,useFns}=_ui.VxeUI;var _default=exports.default=(0,_vue.defineComponent)({name:"VxeToolbar",props:{loading:Boolean,refresh:[Boolean,Object],import:[Boolean,Object],export:[Boolean,Object],print:[Boolean,Object],zoom:[Boolean,Object],custom:[Boolean,Object],buttons:{type:Array,default:()=>getConfig().toolbar.buttons},tools:{type:Array,default:()=>getConfig().toolbar.tools},perfect:{type:Boolean,default:()=>getConfig().toolbar.perfect},size:{type:String,default:()=>getConfig().toolbar.size||getConfig().size},className:[String,Function]},emits:["button-click","tool-click"],setup(u,e){let{slots:d,emit:r}=e;var o=_xeUtils.default.uniqueId();let v=_ui.VxeUI.getComponent("VxeButton"),g=useFns.useSize(u).computeSize,m=(0,_vue.reactive)({isRefresh:!1,connectFlag:0,columns:[]}),p={connectTable:null},b=(0,_vue.ref)(),t={refElem:b},f={xID:o,props:u,context:e,reactData:m,internalData:p,getRefMaps:()=>t};let _=(0,_vue.inject)("$xeGrid",null),x=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.refresh,!0),u.refresh)),h=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.import,!0),u.import)),O=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.export,!0),u.export)),T=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.print,!0),u.print)),C=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.zoom,!0),u.zoom)),L=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.custom,!0),u.custom)),n=(0,_vue.computed)(()=>{var e=p.connectTable;if((m.connectFlag||e)&&e)return e=e.getComputeMaps().computeCustomOpts,e.value;return{trigger:""}}),y=(0,_vue.computed)(()=>n.value.trigger),l=()=>{var e=p.connectTable;if(e)return!0;(0,_log.errLog)("vxe.error.barUnableLink")},$=({$event:e})=>{var o=p.connectTable;o&&(o.triggerCustomEvent?o.triggerCustomEvent(e):(0,_log.errLog)("vxe.error.reqModule",["VxeTableCustomModule"]))},E=({$event:e})=>{var o=p.connectTable;o?o.customOpenEvent(e):(0,_log.errLog)("vxe.error.reqModule",["VxeTableCustomModule"])},k=({$event:o})=>{var e=p.connectTable;let t=e;if(t){let e=t.reactData.customStore;e.activeBtn=!1,setTimeout(()=>{e.activeBtn||e.activeWrapper||t.customCloseEvent(o)},350)}},N=({$event:e})=>{var o=m.isRefresh,t=x.value;if(!o){o=t.queryMethod||t.query;if(o){m.isRefresh=!0;try{Promise.resolve(o({})).catch(e=>e).then(()=>{m.isRefresh=!1})}catch(e){m.isRefresh=!1}}else _&&(m.isRefresh=!0,_.triggerToolbarCommitEvent({code:t.code||"reload"},e).catch(e=>e).then(()=>{m.isRefresh=!1}))}},I=({$event:e})=>{_&&_.triggerZoomEvent(e)},R=(e,o)=>{var t,r=p.connectTable,n=o.code;n&&(_?_.triggerToolbarBtnEvent(o,e):(t=commands.get(n),o={code:n,button:o,$table:r,$grid:_,$event:e},t&&((r=t.tableCommandMethod||t.commandMethod)?r(o):"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notCommands",[n])),f.dispatchEvent("button-click",o,e)))},S=(e,o)=>{var t,r=p.connectTable,n=o.code;n&&(_?_.triggerToolbarTolEvent(o,e):(t=commands.get(n),o={code:n,tool:o,$table:r,$grid:_,$event:e},t&&((r=t.tableCommandMethod||t.commandMethod)?r(o):"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notCommands",[n])),f.dispatchEvent("tool-click",o,e)))},V=()=>{var e;l()&&(e=p.connectTable,e)&&e.openImport()},B=()=>{var e;l()&&(e=p.connectTable,e)&&e.openExport()},M=()=>{var e;l()&&(e=p.connectTable,e)&&e.openPrint()};Object.assign(f,{dispatchEvent:(e,o,t)=>{r(e,createEvent(t,{$toolbar:f},o))},syncUpdate(e){p.connectTable=e.$table,m.columns=e.collectColumn,m.connectFlag++}});let F=(e,t)=>{e=e.dropdowns;return e?e.map((o,e)=>!1!==o.visible&&v?(0,_vue.h)(v,{key:e,disabled:o.disabled,loading:o.loading,type:o.type,mode:o.mode,icon:o.icon,circle:o.circle,round:o.round,status:o.status,content:o.name,title:o.title,routerLink:o.routerLink,permissionCode:o.permissionCode,prefixTooltip:o.prefixTooltip,suffixTooltip:o.suffixTooltip,onClick:({$event:e})=>(t?R:S)(e,o)}):(0,_vue.createCommentVNode)()):[]};return f.renderVN=()=>{var{perfect:e,loading:o,refresh:t,zoom:r,custom:n,className:l}=u,i=p.connectTable,a=g.value,s=d.tools,c=d.buttons;return(0,_vue.h)("div",{ref:b,class:["vxe-toolbar",l?_xeUtils.default.isFunction(l)?l({$toolbar:f}):l:"",{["size--"+a]:a,"is--perfect":e,"is--loading":o}]},[(0,_vue.h)("div",{class:"vxe-buttons--wrapper"},c?c({$grid:_,$table:i}):(()=>{var e=u.buttons,o=p.connectTable;let a=o;var o=d.buttonPrefix||d["button-prefix"],t=d.buttonSuffix||d["button-suffix"];let s=[];return o&&s.push(...(0,_vn.getSlotVNs)(o({buttons:e||[],$grid:_,$table:a}))),e&&e.forEach((o,e)=>{var t,r,n,{dropdowns:l,buttonRender:i}=o;!1!==o.visible&&(t=i?renderer.get(i.name):null,i&&t&&t.renderToolbarButton?(r=t.toolbarButtonClassName,n={$grid:_,$table:a,button:o},s.push((0,_vue.h)("span",{key:"br"+(o.code||e),class:["vxe-button--item",r?_xeUtils.default.isFunction(r)?r(n):r:""]},(0,_vn.getSlotVNs)(t.renderToolbarButton(i,n))))):v&&s.push((0,_vue.h)(v,{key:"bd"+(o.code||e),disabled:o.disabled,loading:o.loading,type:o.type,mode:o.mode,icon:o.icon,circle:o.circle,round:o.round,status:o.status,content:o.name,title:o.title,routerLink:o.routerLink,permissionCode:o.permissionCode,prefixTooltip:o.prefixTooltip,suffixTooltip:o.suffixTooltip,destroyOnClose:o.destroyOnClose,placement:o.placement,transfer:o.transfer,onClick:({$event:e})=>R(e,o)},l&&l.length?{dropdowns:()=>F(o,!0)}:{})))}),t&&s.push(...(0,_vn.getSlotVNs)(t({buttons:e||[],$grid:_,$table:a}))),s})()),(0,_vue.h)("div",{class:"vxe-tools--wrapper"},s?s({$grid:_,$table:i}):(()=>{var e=u.tools,o=p.connectTable;let s=o;var o=d.toolPrefix||d["tool-prefix"],t=d.toolSuffix||d["tool-suffix"];let c=[];return o&&c.push(...(0,_vn.getSlotVNs)(o({tools:e||[],$grid:_,$table:s}))),e&&e.forEach((o,e)=>{var t,r,n,l,{dropdowns:i,toolRender:a}=o;!1!==o.visible&&(t=a?a.name:null,r=a?renderer.get(t):null,a&&r&&r.renderToolbarTool?(n=r.toolbarToolClassName,l={$grid:_,$table:s,tool:o},c.push((0,_vue.h)("span",{key:t,class:["vxe-tool--item",n?_xeUtils.default.isFunction(n)?n(l):n:""]},(0,_vn.getSlotVNs)(r.renderToolbarTool(a,l))))):v&&c.push((0,_vue.h)(v,{key:e,disabled:o.disabled,loading:o.loading,type:o.type,mode:o.mode,icon:o.icon,circle:o.circle,round:o.round,status:o.status,content:o.name,title:o.title,routerLink:o.routerLink,permissionCode:o.permissionCode,prefixTooltip:o.prefixTooltip,suffixTooltip:o.suffixTooltip,destroyOnClose:o.destroyOnClose,placement:o.placement,transfer:o.transfer,onClick:({$event:e})=>S(e,o)},i&&i.length?{dropdowns:()=>F(o,!1)}:{})))}),t&&c.push(...(0,_vn.getSlotVNs)(t({tools:e||[],$grid:_,$table:s}))),c})()),(0,_vue.h)("div",{class:"vxe-tools--operate"},[u.import&&(l=h.value,v)?(0,_vue.h)(v,{key:"import",circle:!0,icon:l.icon||getIcon().TOOLBAR_TOOLS_IMPORT,title:getI18n("vxe.toolbar.import"),onClick:V}):(0,_vue.createCommentVNode)(),u.export&&(a=O.value,v)?(0,_vue.h)(v,{key:"export",circle:!0,icon:a.icon||getIcon().TOOLBAR_TOOLS_EXPORT,title:getI18n("vxe.toolbar.export"),onClick:B}):(0,_vue.createCommentVNode)(),u.print&&(e=T.value,v)?(0,_vue.h)(v,{key:"print",circle:!0,icon:e.icon||getIcon().TOOLBAR_TOOLS_PRINT,title:getI18n("vxe.toolbar.print"),onClick:M}):(0,_vue.createCommentVNode)(),t&&(o=x.value,v)?(0,_vue.h)(v,{key:"refresh",circle:!0,icon:m.isRefresh?o.iconLoading||getIcon().TOOLBAR_TOOLS_REFRESH_LOADING:o.icon||getIcon().TOOLBAR_TOOLS_REFRESH,title:getI18n("vxe.toolbar.refresh"),onClick:N}):(0,_vue.createCommentVNode)(),r&&_&&(c=C.value,_)&&v?(0,_vue.h)(v,{key:"zoom",circle:!0,icon:_.isMaximized()?c.iconOut||getIcon().TOOLBAR_TOOLS_MINIMIZE:c.iconIn||getIcon().TOOLBAR_TOOLS_FULLSCREEN,title:getI18n("vxe.toolbar.zoom"+(_.isMaximized()?"Out":"In")),onClick:I}):(0,_vue.createCommentVNode)(),n&&(s=L.value,i=y.value,l={},"manual"!==i&&("hover"===i?(l.onMouseenter=E,l.onMouseleave=k):l.onClick=$),v)?(0,_vue.h)(v,Object.assign({key:"custom",circle:!0,icon:s.icon||getIcon().TOOLBAR_TOOLS_CUSTOM,title:getI18n("vxe.toolbar.custom"),className:"vxe-toolbar-custom-target"},l)):(0,_vue.createCommentVNode)()])])},(0,_vue.nextTick)(()=>{var e=u.refresh,o=x.value,o=o.queryMethod||o.query,e=(!e||_||o||(0,_log.warnLog)("vxe.error.notFunc",["queryMethod"]),L.value);"development"===process.env.NODE_ENV&&(e.isFooter&&(0,_log.warnLog)("vxe.error.delProp",["toolbar.custom.isFooter","table.custom-config.showFooter"]),e.showFooter&&(0,_log.warnLog)("vxe.error.delProp",["toolbar.custom.showFooter","table.custom-config.showFooter"]),e.immediate&&(0,_log.warnLog)("vxe.error.delProp",["toolbar.custom.immediate","table.custom-config.immediate"]),e.trigger)&&(0,_log.warnLog)("vxe.error.delProp",["toolbar.custom.trigger","table.custom-config.trigger"]),"development"===process.env.NODE_ENV&&(u.refresh||u.import||u.export||u.print||u.zoom)&&!v&&(0,_log.errLog)("vxe.error.reqComp",["vxe-button"])}),f},render(){return this.renderVN()}});
1
+ Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getConfig,getIcon,getI18n,renderer,commands,createEvent,useFns}=_ui.VxeUI;var _default=exports.default=(0,_vue.defineComponent)({name:"VxeToolbar",props:{loading:Boolean,refresh:[Boolean,Object],import:[Boolean,Object],export:[Boolean,Object],print:[Boolean,Object],zoom:[Boolean,Object],custom:[Boolean,Object],buttons:{type:Array,default:()=>getConfig().toolbar.buttons},tools:{type:Array,default:()=>getConfig().toolbar.tools},perfect:{type:Boolean,default:()=>getConfig().toolbar.perfect},size:{type:String,default:()=>getConfig().toolbar.size||getConfig().size},className:[String,Function]},emits:["button-click","tool-click"],setup(u,e){let{slots:d,emit:r}=e;var o=_xeUtils.default.uniqueId();let v=_ui.VxeUI.getComponent("VxeButton"),g=useFns.useSize(u).computeSize,m=(0,_vue.reactive)({isRefresh:!1,connectFlag:0,columns:[]}),p={connectTable:null},b=(0,_vue.ref)(),t={refElem:b},f={xID:o,props:u,context:e,reactData:m,internalData:p,getRefMaps:()=>t};let _=(0,_vue.inject)("$xeGrid",null),x=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.refresh,!0),u.refresh)),h=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.import,!0),u.import)),T=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.export,!0),u.export)),O=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.print,!0),u.print)),C=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.zoom,!0),u.zoom)),L=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.custom,!0),u.custom)),n=(0,_vue.computed)(()=>{var e=p.connectTable;if((m.connectFlag||e)&&e)return e=e.getComputeMaps().computeCustomOpts,e.value;return{trigger:""}}),y=(0,_vue.computed)(()=>n.value.trigger),l=()=>{var e=p.connectTable;if(e)return!0;(0,_log.errLog)("vxe.error.barUnableLink")},$=({$event:e})=>{var o=p.connectTable;o&&(o.triggerCustomEvent?o.triggerCustomEvent(e):(0,_log.errLog)("vxe.error.reqModule",["VxeTableCustomModule"]))},k=({$event:e})=>{var o=p.connectTable;o?o.customOpenEvent(e):(0,_log.errLog)("vxe.error.reqModule",["VxeTableCustomModule"])},I=({$event:o})=>{var e=p.connectTable;let t=e;if(t){let e=t.reactData.customStore;e.activeBtn=!1,setTimeout(()=>{e.activeBtn||e.activeWrapper||t.customCloseEvent(o)},350)}},R=({$event:e})=>{var o=m.isRefresh,t=x.value;if(!o){o=t.queryMethod||t.query;if(o){m.isRefresh=!0;try{Promise.resolve(o({})).catch(e=>e).then(()=>{m.isRefresh=!1})}catch(e){m.isRefresh=!1}}else _&&(m.isRefresh=!0,_.triggerToolbarCommitEvent({code:t.code||"reload"},e).catch(e=>e).then(()=>{m.isRefresh=!1}))}},E=({$event:e})=>{_&&_.triggerZoomEvent(e)},S=(e,o)=>{var t,r=p.connectTable,n=o.code;n&&(_?_.triggerToolbarBtnEvent(o,e):(t=commands.get(n),o={code:n,button:o,$table:r,$grid:_,$event:e},t&&((r=t.tableCommandMethod||t.commandMethod)?r(o):(0,_log.errLog)("vxe.error.notCommands",[n])),f.dispatchEvent("button-click",o,e)))},N=(e,o)=>{var t,r=p.connectTable,n=o.code;n&&(_?_.triggerToolbarTolEvent(o,e):(t=commands.get(n),o={code:n,tool:o,$table:r,$grid:_,$event:e},t&&((r=t.tableCommandMethod||t.commandMethod)?r(o):(0,_log.errLog)("vxe.error.notCommands",[n])),f.dispatchEvent("tool-click",o,e)))},B=()=>{var e;l()&&(e=p.connectTable,e)&&e.openImport()},M=()=>{var e;l()&&(e=p.connectTable,e)&&e.openExport()},V=()=>{var e;l()&&(e=p.connectTable,e)&&e.openPrint()};Object.assign(f,{dispatchEvent:(e,o,t)=>{r(e,createEvent(t,{$toolbar:f},o))},syncUpdate(e){p.connectTable=e.$table,m.columns=e.collectColumn,m.connectFlag++}});let F=(e,t)=>{e=e.dropdowns;return e?e.map((o,e)=>!1!==o.visible&&v?(0,_vue.h)(v,{key:e,disabled:o.disabled,loading:o.loading,type:o.type,mode:o.mode,icon:o.icon,circle:o.circle,round:o.round,status:o.status,content:o.name,title:o.title,routerLink:o.routerLink,permissionCode:o.permissionCode,prefixTooltip:o.prefixTooltip,suffixTooltip:o.suffixTooltip,onClick:({$event:e})=>(t?S:N)(e,o)}):(0,_vue.createCommentVNode)()):[]};return f.renderVN=()=>{var{perfect:e,loading:o,refresh:t,zoom:r,custom:n,className:l}=u,i=p.connectTable,a=g.value,s=d.tools,c=d.buttons;return(0,_vue.h)("div",{ref:b,class:["vxe-toolbar",l?_xeUtils.default.isFunction(l)?l({$toolbar:f}):l:"",{["size--"+a]:a,"is--perfect":e,"is--loading":o}]},[(0,_vue.h)("div",{class:"vxe-buttons--wrapper"},c?c({$grid:_,$table:i}):(()=>{var e=u.buttons,o=p.connectTable;let a=o;var o=d.buttonPrefix||d["button-prefix"],t=d.buttonSuffix||d["button-suffix"];let s=[];return o&&s.push(...(0,_vn.getSlotVNs)(o({buttons:e||[],$grid:_,$table:a}))),e&&e.forEach((o,e)=>{var t,r,n,{dropdowns:l,buttonRender:i}=o;!1!==o.visible&&(t=i?renderer.get(i.name):null,i&&t&&t.renderToolbarButton?(r=t.toolbarButtonClassName,n={$grid:_,$table:a,button:o},s.push((0,_vue.h)("span",{key:"br"+(o.code||e),class:["vxe-button--item",r?_xeUtils.default.isFunction(r)?r(n):r:""]},(0,_vn.getSlotVNs)(t.renderToolbarButton(i,n))))):v&&s.push((0,_vue.h)(v,{key:"bd"+(o.code||e),disabled:o.disabled,loading:o.loading,type:o.type,mode:o.mode,icon:o.icon,circle:o.circle,round:o.round,status:o.status,content:o.name,title:o.title,routerLink:o.routerLink,permissionCode:o.permissionCode,prefixTooltip:o.prefixTooltip,suffixTooltip:o.suffixTooltip,destroyOnClose:o.destroyOnClose,placement:o.placement,transfer:o.transfer,onClick:({$event:e})=>S(e,o)},l&&l.length?{dropdowns:()=>F(o,!0)}:{})))}),t&&s.push(...(0,_vn.getSlotVNs)(t({buttons:e||[],$grid:_,$table:a}))),s})()),(0,_vue.h)("div",{class:"vxe-tools--wrapper"},s?s({$grid:_,$table:i}):(()=>{var e=u.tools,o=p.connectTable;let s=o;var o=d.toolPrefix||d["tool-prefix"],t=d.toolSuffix||d["tool-suffix"];let c=[];return o&&c.push(...(0,_vn.getSlotVNs)(o({tools:e||[],$grid:_,$table:s}))),e&&e.forEach((o,e)=>{var t,r,n,l,{dropdowns:i,toolRender:a}=o;!1!==o.visible&&(t=a?a.name:null,r=a?renderer.get(t):null,a&&r&&r.renderToolbarTool?(n=r.toolbarToolClassName,l={$grid:_,$table:s,tool:o},c.push((0,_vue.h)("span",{key:t,class:["vxe-tool--item",n?_xeUtils.default.isFunction(n)?n(l):n:""]},(0,_vn.getSlotVNs)(r.renderToolbarTool(a,l))))):v&&c.push((0,_vue.h)(v,{key:e,disabled:o.disabled,loading:o.loading,type:o.type,mode:o.mode,icon:o.icon,circle:o.circle,round:o.round,status:o.status,content:o.name,title:o.title,routerLink:o.routerLink,permissionCode:o.permissionCode,prefixTooltip:o.prefixTooltip,suffixTooltip:o.suffixTooltip,destroyOnClose:o.destroyOnClose,placement:o.placement,transfer:o.transfer,onClick:({$event:e})=>N(e,o)},i&&i.length?{dropdowns:()=>F(o,!1)}:{})))}),t&&c.push(...(0,_vn.getSlotVNs)(t({tools:e||[],$grid:_,$table:s}))),c})()),(0,_vue.h)("div",{class:"vxe-tools--operate"},[u.import&&(l=h.value,v)?(0,_vue.h)(v,{key:"import",circle:!0,icon:l.icon||getIcon().TOOLBAR_TOOLS_IMPORT,title:getI18n("vxe.toolbar.import"),onClick:B}):(0,_vue.createCommentVNode)(),u.export&&(a=T.value,v)?(0,_vue.h)(v,{key:"export",circle:!0,icon:a.icon||getIcon().TOOLBAR_TOOLS_EXPORT,title:getI18n("vxe.toolbar.export"),onClick:M}):(0,_vue.createCommentVNode)(),u.print&&(e=O.value,v)?(0,_vue.h)(v,{key:"print",circle:!0,icon:e.icon||getIcon().TOOLBAR_TOOLS_PRINT,title:getI18n("vxe.toolbar.print"),onClick:V}):(0,_vue.createCommentVNode)(),t&&(o=x.value,v)?(0,_vue.h)(v,{key:"refresh",circle:!0,icon:m.isRefresh?o.iconLoading||getIcon().TOOLBAR_TOOLS_REFRESH_LOADING:o.icon||getIcon().TOOLBAR_TOOLS_REFRESH,title:getI18n("vxe.toolbar.refresh"),onClick:R}):(0,_vue.createCommentVNode)(),r&&_&&(c=C.value,_)&&v?(0,_vue.h)(v,{key:"zoom",circle:!0,icon:_.isMaximized()?c.iconOut||getIcon().TOOLBAR_TOOLS_MINIMIZE:c.iconIn||getIcon().TOOLBAR_TOOLS_FULLSCREEN,title:getI18n("vxe.toolbar.zoom"+(_.isMaximized()?"Out":"In")),onClick:E}):(0,_vue.createCommentVNode)(),n&&(s=L.value,i=y.value,l={},"manual"!==i&&("hover"===i?(l.onMouseenter=k,l.onMouseleave=I):l.onClick=$),v)?(0,_vue.h)(v,Object.assign({key:"custom",circle:!0,icon:s.icon||getIcon().TOOLBAR_TOOLS_CUSTOM,title:getI18n("vxe.toolbar.custom"),className:"vxe-toolbar-custom-target"},l)):(0,_vue.createCommentVNode)()])])},(0,_vue.nextTick)(()=>{var e=u.refresh,o=x.value,o=o.queryMethod||o.query,e=(!e||_||o||(0,_log.warnLog)("vxe.error.notFunc",["queryMethod"]),L.value);e.isFooter&&(0,_log.warnLog)("vxe.error.delProp",["toolbar.custom.isFooter","table.custom-config.showFooter"]),e.showFooter&&(0,_log.warnLog)("vxe.error.delProp",["toolbar.custom.showFooter","table.custom-config.showFooter"]),e.immediate&&(0,_log.warnLog)("vxe.error.delProp",["toolbar.custom.immediate","table.custom-config.immediate"]),e.trigger&&(0,_log.warnLog)("vxe.error.delProp",["toolbar.custom.trigger","table.custom-config.trigger"]),(u.refresh||u.import||u.export||u.print||u.zoom)&&!v&&(0,_log.errLog)("vxe.error.reqComp",["vxe-button"])}),f},render(){return this.renderVN()}});
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.11.15";
16
+ const version = exports.version = "4.11.17";
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.11.15",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:{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",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},treeConfig:{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:{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:{enabled:!0,gt:60,preSize:0,oSize:1},virtualYConfig:{enabled:!0,gt:100,preSize:0,oSize:1},scrollbarConfig:{}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,hooks=exports.hooks=_core.VxeUI.hooks,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;
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.11.17",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:{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",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},treeConfig:{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:{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:{enabled:!0,gt:60,preSize:0,oSize:1},virtualYConfig:{enabled:!0,gt:100,preSize:0,oSize:1},scrollbarConfig:{}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,hooks=exports.hooks=_core.VxeUI.hooks,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;
package/lib/ui/src/log.js 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.11.15"}`;
11
+ const version = `table v${"4.11.17"}`;
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.11.15",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.11.17",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.11.15",
3
+ "version": "4.11.17",
4
4
  "description": "一个基于 vue 的 PC 端表格组件,支持增删改查、虚拟树、拖拽排序,懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
5
5
  "scripts": {
6
6
  "update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
28
28
  "style": "lib/style.css",
29
29
  "typings": "types/index.d.ts",
30
30
  "dependencies": {
31
- "vxe-pc-ui": "^4.3.99"
31
+ "vxe-pc-ui": "^4.4.1"
32
32
  },
33
33
  "devDependencies": {
34
34
  "@types/resize-observer-browser": "^0.1.11",
@@ -457,9 +457,7 @@ export default defineComponent({
457
457
  if (slots[funcSlot]) {
458
458
  return slots[funcSlot]
459
459
  } else {
460
- if (process.env.VUE_APP_VXE_ENV === 'development') {
461
- errLog('vxe.error.notSlot', [funcSlot])
462
- }
460
+ errLog('vxe.error.notSlot', [funcSlot])
463
461
  }
464
462
  } else {
465
463
  return funcSlot
@@ -1002,9 +1000,7 @@ export default defineComponent({
1002
1000
  return { status: false }
1003
1001
  })
1004
1002
  } else {
1005
- if (process.env.VUE_APP_VXE_ENV === 'development') {
1006
- errLog('vxe.error.notFunc', ['proxy-config.ajax.query'])
1007
- }
1003
+ errLog('vxe.error.notFunc', ['proxy-config.ajax.query'])
1008
1004
  }
1009
1005
  break
1010
1006
  }
@@ -1063,9 +1059,7 @@ export default defineComponent({
1063
1059
  }
1064
1060
  }
1065
1061
  } else {
1066
- if (process.env.VUE_APP_VXE_ENV === 'development') {
1067
- errLog('vxe.error.notFunc', ['proxy-config.ajax.delete'])
1068
- }
1062
+ errLog('vxe.error.notFunc', ['proxy-config.ajax.delete'])
1069
1063
  }
1070
1064
  break
1071
1065
  }
@@ -1137,9 +1131,7 @@ export default defineComponent({
1137
1131
  }
1138
1132
  })
1139
1133
  } else {
1140
- if (process.env.VUE_APP_VXE_ENV === 'development') {
1141
- errLog('vxe.error.notFunc', ['proxy-config.ajax.save'])
1142
- }
1134
+ errLog('vxe.error.notFunc', ['proxy-config.ajax.save'])
1143
1135
  }
1144
1136
  break
1145
1137
  }
@@ -1150,9 +1142,7 @@ export default defineComponent({
1150
1142
  if (tCommandMethod) {
1151
1143
  tCommandMethod({ code, button, $grid: $xeGrid, $table: $xeTable }, ...args)
1152
1144
  } else {
1153
- if (process.env.VUE_APP_VXE_ENV === 'development') {
1154
- errLog('vxe.error.notCommands', [code])
1155
- }
1145
+ errLog('vxe.error.notCommands', [code])
1156
1146
  }
1157
1147
  }
1158
1148
  }
@@ -1264,7 +1254,6 @@ export default defineComponent({
1264
1254
  * 获取需要排除的高度
1265
1255
  */
1266
1256
  getExcludeHeight () {
1267
- const { height } = props
1268
1257
  const { isZMax } = reactData
1269
1258
  const el = refElem.value
1270
1259
  const formWrapper = refFormWrapper.value
@@ -1272,7 +1261,7 @@ export default defineComponent({
1272
1261
  const topWrapper = refTopWrapper.value
1273
1262
  const bottomWrapper = refBottomWrapper.value
1274
1263
  const pagerWrapper = refPagerWrapper.value
1275
- const parentPaddingSize = isZMax || !(height === 'auto' || height === '100%') ? 0 : getPaddingTopBottomSize(el.parentNode as HTMLElement)
1264
+ const parentPaddingSize = isZMax ? 0 : getPaddingTopBottomSize(el.parentNode as HTMLElement)
1276
1265
  return parentPaddingSize + getPaddingTopBottomSize(el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper)
1277
1266
  },
1278
1267
  getParentHeight () {
@@ -1342,23 +1331,20 @@ export default defineComponent({
1342
1331
  initPages()
1343
1332
 
1344
1333
  onMounted(() => {
1345
- if (process.env.VUE_APP_VXE_ENV === 'development') {
1346
- nextTick(() => {
1347
- if (props.formConfig) {
1348
- if (!VxeUIFormComponent) {
1349
- errLog('vxe.error.reqComp', ['vxe-form'])
1350
- }
1334
+ nextTick(() => {
1335
+ const { columns } = props
1336
+
1337
+ if (props.formConfig) {
1338
+ if (!VxeUIFormComponent) {
1339
+ errLog('vxe.error.reqComp', ['vxe-form'])
1351
1340
  }
1352
- if (props.pagerConfig) {
1353
- if (!VxeUIPagerComponent) {
1354
- errLog('vxe.error.reqComp', ['vxe-pager'])
1355
- }
1341
+ }
1342
+ if (props.pagerConfig) {
1343
+ if (!VxeUIPagerComponent) {
1344
+ errLog('vxe.error.reqComp', ['vxe-pager'])
1356
1345
  }
1357
- })
1358
- }
1346
+ }
1359
1347
 
1360
- nextTick(() => {
1361
- const { columns } = props
1362
1348
  // const { data, columns, proxyConfig } = props
1363
1349
  // const proxyOpts = computeProxyOpts.value
1364
1350
  // const formOpts = computeFormOpts.value
@@ -1151,27 +1151,25 @@ export default defineComponent({
1151
1151
  return renderSimplePanel()
1152
1152
  }
1153
1153
 
1154
- if (process.env.VUE_APP_VXE_ENV === 'development') {
1155
- nextTick(() => {
1156
- const customOpts = computeCustomOpts.value
1157
- const { mode } = customOpts
1158
- if (!VxeUIModalComponent) {
1159
- errLog('vxe.error.reqComp', ['vxe-modal'])
1160
- }
1161
- if (!VxeUIDrawerComponent && (mode === 'drawer')) {
1162
- errLog('vxe.error.reqComp', ['vxe-drawer'])
1163
- }
1164
- if (!VxeUIButtonComponent) {
1165
- errLog('vxe.error.reqComp', ['vxe-button'])
1166
- }
1167
- if (!VxeUINumberInputComponent) {
1168
- errLog('vxe.error.reqComp', ['vxe-number-input'])
1169
- }
1170
- if (!VxeUIRadioGroupComponent) {
1171
- errLog('vxe.error.reqComp', ['vxe-radio-group'])
1172
- }
1173
- })
1174
- }
1154
+ nextTick(() => {
1155
+ const customOpts = computeCustomOpts.value
1156
+ const { mode } = customOpts
1157
+ if (!VxeUIModalComponent) {
1158
+ errLog('vxe.error.reqComp', ['vxe-modal'])
1159
+ }
1160
+ if (!VxeUIDrawerComponent && (mode === 'drawer')) {
1161
+ errLog('vxe.error.reqComp', ['vxe-drawer'])
1162
+ }
1163
+ if (!VxeUIButtonComponent) {
1164
+ errLog('vxe.error.reqComp', ['vxe-button'])
1165
+ }
1166
+ if (!VxeUINumberInputComponent) {
1167
+ errLog('vxe.error.reqComp', ['vxe-number-input'])
1168
+ }
1169
+ if (!VxeUIRadioGroupComponent) {
1170
+ errLog('vxe.error.reqComp', ['vxe-radio-group'])
1171
+ }
1172
+ })
1175
1173
 
1176
1174
  return renderVN
1177
1175
  }
@@ -169,11 +169,9 @@ hooks.add('tableEditModule', {
169
169
  const parentLevel = parentRest ? parentRest.level : 0
170
170
  newRecords.forEach((item, i) => {
171
171
  const rowid = getRowid($xeTable, item)
172
- if (process.env.VUE_APP_VXE_ENV === 'development') {
173
- if (item[treeOpts.parentField]) {
174
- if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
175
- errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`])
176
- }
172
+ if (item[treeOpts.parentField]) {
173
+ if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
174
+ errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`])
177
175
  }
178
176
  }
179
177
  if (parentRow) {
@@ -283,7 +281,7 @@ hooks.add('tableEditModule', {
283
281
  }
284
282
  return handleInsertRowAt(records.map((item: any) => Object.assign({}, item, { [parentField]: parentRow[rowField] })), targetRow, isInsertNextRow)
285
283
  } else {
286
- errLog('vxe.error.errProp', ['tree-config.treeConfig=false', 'tree-config.treeConfig=true'])
284
+ errLog('vxe.error.errProp', ['tree-config.transform=false', 'tree-config.transform=true'])
287
285
  }
288
286
  return Promise.resolve({ row: null, rows: [] })
289
287
  }
@@ -779,7 +777,9 @@ hooks.add('tableEditModule', {
779
777
  let isPos = false
780
778
  if (fieldOrColumn) {
781
779
  isPos = true
782
- column = XEUtils.isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn
780
+ if (fieldOrColumn !== true) {
781
+ column = XEUtils.isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn
782
+ }
783
783
  }
784
784
  return handleEditCell(row, column, isPos)
785
785
  },
@@ -521,25 +521,23 @@ export default defineComponent({
521
521
  : createCommentVNode()
522
522
  }
523
523
 
524
- if (process.env.VUE_APP_VXE_ENV === 'development') {
525
- nextTick(() => {
526
- if (!VxeUIModalComponent) {
527
- errLog('vxe.error.reqComp', ['vxe-modal'])
528
- }
529
- if (!VxeUIButtonComponent) {
530
- errLog('vxe.error.reqComp', ['vxe-button'])
531
- }
532
- if (!VxeUISelectComponent) {
533
- errLog('vxe.error.reqComp', ['vxe-select'])
534
- }
535
- if (!VxeUIInputComponent) {
536
- errLog('vxe.error.reqComp', ['vxe-input'])
537
- }
538
- if (!VxeUICheckboxComponent) {
539
- errLog('vxe.error.reqComp', ['vxe-checkbox'])
540
- }
541
- })
542
- }
524
+ nextTick(() => {
525
+ if (!VxeUIModalComponent) {
526
+ errLog('vxe.error.reqComp', ['vxe-modal'])
527
+ }
528
+ if (!VxeUIButtonComponent) {
529
+ errLog('vxe.error.reqComp', ['vxe-button'])
530
+ }
531
+ if (!VxeUISelectComponent) {
532
+ errLog('vxe.error.reqComp', ['vxe-select'])
533
+ }
534
+ if (!VxeUIInputComponent) {
535
+ errLog('vxe.error.reqComp', ['vxe-input'])
536
+ }
537
+ if (!VxeUICheckboxComponent) {
538
+ errLog('vxe.error.reqComp', ['vxe-checkbox'])
539
+ }
540
+ })
543
541
 
544
542
  return renderVN
545
543
  }
@@ -956,9 +956,7 @@ hooks.add('tableExportModule', {
956
956
  }
957
957
  } else {
958
958
  // 不支持的浏览器
959
- if (process.env.VUE_APP_VXE_ENV === 'development') {
960
- errLog('vxe.error.notExp')
961
- }
959
+ errLog('vxe.error.notExp')
962
960
  _importResolve({ status: true })
963
961
  }
964
962
  })
@@ -1572,10 +1570,8 @@ hooks.add('tableExportModule', {
1572
1570
  message: true,
1573
1571
  types: XEUtils.keys(exportOpts._typeMaps)
1574
1572
  }, exportOpts, options)
1575
- if (process.env.VUE_APP_VXE_ENV === 'development') {
1576
- if (!props.exportConfig) {
1577
- errLog('vxe.error.reqProp', ['export-config'])
1578
- }
1573
+ if (!props.exportConfig) {
1574
+ errLog('vxe.error.reqProp', ['export-config'])
1579
1575
  }
1580
1576
  handleExportAndPrint(defOpts)
1581
1577
  },
@@ -1585,10 +1581,8 @@ hooks.add('tableExportModule', {
1585
1581
  const defOpts = Object.assign({
1586
1582
  message: true
1587
1583
  }, printOpts, options)
1588
- if (process.env.VUE_APP_VXE_ENV === 'development') {
1589
- if (!props.printConfig) {
1590
- errLog('vxe.error.reqProp', ['print-config'])
1591
- }
1584
+ if (!props.printConfig) {
1585
+ errLog('vxe.error.reqProp', ['print-config'])
1592
1586
  }
1593
1587
  handleExportAndPrint(defOpts, true)
1594
1588
  }
@@ -238,19 +238,17 @@ export default defineComponent({
238
238
  : createCommentVNode()
239
239
  }
240
240
 
241
- if (process.env.VUE_APP_VXE_ENV === 'development') {
242
- nextTick(() => {
243
- if (!VxeUIModalComponent) {
244
- errLog('vxe.error.reqComp', ['vxe-modal'])
245
- }
246
- if (!VxeUIButtonComponent) {
247
- errLog('vxe.error.reqComp', ['vxe-button'])
248
- }
249
- if (!VxeUISelectComponent) {
250
- errLog('vxe.error.reqComp', ['vxe-select'])
251
- }
252
- })
253
- }
241
+ nextTick(() => {
242
+ if (!VxeUIModalComponent) {
243
+ errLog('vxe.error.reqComp', ['vxe-modal'])
244
+ }
245
+ if (!VxeUIButtonComponent) {
246
+ errLog('vxe.error.reqComp', ['vxe-button'])
247
+ }
248
+ if (!VxeUISelectComponent) {
249
+ errLog('vxe.error.reqComp', ['vxe-select'])
250
+ }
251
+ })
254
252
 
255
253
  return renderVN
256
254
  }
@@ -262,8 +262,8 @@ hooks.add('tableKeyboardModule', {
262
262
  const checkboxOpts = computeCheckboxOpts.value
263
263
  const mouseOpts = computeMouseOpts.value
264
264
  const editOpts = computeEditOpts.value
265
- if (mouseConfig && mouseOpts.area && $xeTable.handleMousedownCellAreaEvent) {
266
- return $xeTable.handleMousedownCellAreaEvent(evnt, params)
265
+ if (mouseConfig && mouseOpts.area && ($xeTable as any).handleMousedownCellAreaEvent) {
266
+ return ($xeTable as any).handleMousedownCellAreaEvent(evnt, params)
267
267
  } else {
268
268
  if (checkboxConfig && checkboxOpts.range) {
269
269
  handleCheckboxRangeEvent(evnt, params)
@@ -419,9 +419,7 @@ hooks.add('tableValidatorModule', {
419
419
  }
420
420
  }
421
421
  } else {
422
- if (process.env.VUE_APP_VXE_ENV === 'development') {
423
- errLog('vxe.error.notValidators', [validator])
424
- }
422
+ errLog('vxe.error.notValidators', [validator])
425
423
  }
426
424
  } else {
427
425
  customValid = validator(validParams)
@@ -185,10 +185,8 @@ function getComponentOns (renderOpts: any, params: any, eFns?: {
185
185
  const ons: any = {}
186
186
  XEUtils.objectEach(events, (func, key: any) => {
187
187
  ons[getOnName(key)] = function (...args: any[]) {
188
- if (process.env.VUE_APP_VXE_ENV === 'development') {
189
- if (!XEUtils.isFunction(func)) {
190
- errLog('vxe.error.errFunc', [func])
191
- }
188
+ if (!XEUtils.isFunction(func)) {
189
+ errLog('vxe.error.errFunc', [func])
192
190
  }
193
191
  func(params, ...args)
194
192
  }
@@ -103,7 +103,7 @@ export default defineComponent({
103
103
  items: any[]
104
104
  ) => {
105
105
  const { fullAllDataRowIdData } = tableInternalData
106
- const { columnKey, resizable: allResizable, border, height, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps
106
+ const { columnKey, resizable: allResizable, showOverflow: allShowOverflow, border, height, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps
107
107
  const { tableData, dragRow, overflowX, currentColumn, scrollXLoad, scrollYLoad, calcCellHeightFlag, resizeHeightFlag, mergeList, editStore, isAllOverflow, validErrorMaps } = tableReactData
108
108
  const { afterFullData, scrollXStore, scrollYStore } = tableInternalData
109
109
  const cellOpts = computeCellOpts.value
@@ -138,7 +138,7 @@ export default defineComponent({
138
138
  const resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0
139
139
  let fixedHiddenColumn = fixedType ? column.fixed !== fixedType : column.fixed && overflowX
140
140
  const isCellPadding = XEUtils.eqNull(padding) ? (allPadding === null ? cellOpts.padding : allPadding) : padding
141
- const cellOverflow = XEUtils.eqNull(showOverflow) ? isAllOverflow : showOverflow
141
+ const cellOverflow = XEUtils.eqNull(showOverflow) ? allShowOverflow : showOverflow
142
142
  const showEllipsis = cellOverflow === 'ellipsis'
143
143
  const showTitle = cellOverflow === 'title'
144
144
  const showTooltip = cellOverflow === true || cellOverflow === 'tooltip'
@@ -15,36 +15,34 @@ export class ColumnInfo {
15
15
  const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true
16
16
  const { props: tableProps } = $xeTable
17
17
 
18
- if (process.env.VUE_APP_VXE_ENV === 'development') {
19
- const types = ['seq', 'checkbox', 'radio', 'expand', 'html']
20
- if (_vm.type && types.indexOf(_vm.type) === -1) {
21
- warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')])
22
- }
23
- if (XEUtils.isBoolean(_vm.cellRender) || (_vm.cellRender && !XEUtils.isObject(_vm.cellRender))) {
24
- warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}'])
25
- }
26
- if (XEUtils.isBoolean(_vm.editRender) || (_vm.editRender && !XEUtils.isObject(_vm.editRender))) {
27
- warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}'])
18
+ const types = ['seq', 'checkbox', 'radio', 'expand', 'html']
19
+ if (_vm.type && types.indexOf(_vm.type) === -1) {
20
+ warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')])
21
+ }
22
+ if (XEUtils.isBoolean(_vm.cellRender) || (_vm.cellRender && !XEUtils.isObject(_vm.cellRender))) {
23
+ warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}'])
24
+ }
25
+ if (XEUtils.isBoolean(_vm.editRender) || (_vm.editRender && !XEUtils.isObject(_vm.editRender))) {
26
+ warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}'])
27
+ }
28
+ if (_vm.type === 'expand') {
29
+ const { treeConfig } = tableProps
30
+ const { computeTreeOpts } = $xeTable.getComputeMaps()
31
+ const treeOpts = computeTreeOpts.value
32
+ if (treeConfig && (treeOpts.showLine || treeOpts.line)) {
33
+ errLog('vxe.error.errConflicts', ['tree-config.showLine', 'column.type=expand'])
28
34
  }
29
- if (_vm.type === 'expand') {
30
- const { treeConfig } = tableProps
31
- const { computeTreeOpts } = $xeTable.getComputeMaps()
32
- const treeOpts = computeTreeOpts.value
33
- if (treeConfig && (treeOpts.showLine || treeOpts.line)) {
34
- errLog('vxe.error.errConflicts', ['tree-config.showLine', 'column.type=expand'])
35
+ }
36
+ if (formatter) {
37
+ if (XEUtils.isString(formatter)) {
38
+ const gFormatOpts = formats.get(formatter) || XEUtils[formatter]
39
+ if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
40
+ errLog('vxe.error.notFormats', [formatter])
35
41
  }
36
- }
37
- if (formatter) {
38
- if (XEUtils.isString(formatter)) {
39
- const gFormatOpts = formats.get(formatter) || XEUtils[formatter]
40
- if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
41
- errLog('vxe.error.notFormats', [formatter])
42
- }
43
- } else if (XEUtils.isArray(formatter)) {
44
- const gFormatOpts = formats.get(formatter[0]) || XEUtils[formatter[0]]
45
- if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
46
- errLog('vxe.error.notFormats', [formatter[0]])
47
- }
42
+ } else if (XEUtils.isArray(formatter)) {
43
+ const gFormatOpts = formats.get(formatter[0]) || XEUtils[formatter[0]]
44
+ if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
45
+ errLog('vxe.error.notFormats', [formatter[0]])
48
46
  }
49
47
  }
50
48
  }