vxe-table 3.15.36 → 3.15.38
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/es/style.css +1 -1
- package/es/table/module/edit/mixin.js +2 -2
- package/es/table/module/keyboard/mixin.js +4 -1
- package/es/table/src/methods.js +41 -16
- package/es/toolbar/src/toolbar.js +0 -6
- package/es/ui/index.js +2 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +51 -26
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/module/edit/mixin.js +2 -2
- package/lib/table/module/edit/mixin.min.js +1 -1
- package/lib/table/module/keyboard/mixin.js +2 -2
- package/lib/table/module/keyboard/mixin.min.js +1 -1
- package/lib/table/src/methods.js +44 -16
- package/lib/table/src/methods.min.js +1 -1
- package/lib/toolbar/src/toolbar.js +0 -4
- package/lib/toolbar/src/toolbar.min.js +1 -1
- package/lib/ui/index.js +2 -1
- package/lib/ui/index.min.js +1 -1
- package/lib/ui/src/log.js +1 -1
- package/lib/ui/src/log.min.js +1 -1
- package/package.json +1 -1
- package/packages/table/module/edit/mixin.ts +2 -2
- package/packages/table/module/keyboard/mixin.ts +4 -1
- package/packages/table/src/methods.ts +42 -15
- package/packages/toolbar/src/toolbar.ts +0 -4
- package/packages/ui/index.ts +1 -0
- /package/es/{iconfont.1749440099787.ttf → iconfont.1749796837661.ttf} +0 -0
- /package/es/{iconfont.1749440099787.woff → iconfont.1749796837661.woff} +0 -0
- /package/es/{iconfont.1749440099787.woff2 → iconfont.1749796837661.woff2} +0 -0
- /package/lib/{iconfont.1749440099787.ttf → iconfont.1749796837661.ttf} +0 -0
- /package/lib/{iconfont.1749440099787.woff → iconfont.1749796837661.woff} +0 -0
- /package/lib/{iconfont.1749440099787.woff2 → iconfont.1749796837661.woff2} +0 -0
|
@@ -173,8 +173,6 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
|
|
|
173
173
|
if ($table) {
|
|
174
174
|
if ($table.triggerCustomEvent) {
|
|
175
175
|
$table.triggerCustomEvent($event);
|
|
176
|
-
} else {
|
|
177
|
-
(0, _log.errLog)('vxe.error.reqModule', ['VxeTableCustomModule']);
|
|
178
176
|
}
|
|
179
177
|
}
|
|
180
178
|
},
|
|
@@ -189,8 +187,6 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
|
|
|
189
187
|
const $table = connectTable;
|
|
190
188
|
if ($table) {
|
|
191
189
|
$table.customOpenEvent($event);
|
|
192
|
-
} else {
|
|
193
|
-
(0, _log.errLog)('vxe.error.reqModule', ['VxeTableCustomModule']);
|
|
194
190
|
}
|
|
195
191
|
},
|
|
196
192
|
handleMouseleaveSettingEvent({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_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,globalMixins,renderEmptyElement}=_ui.VxeUI;var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeToolbar",mixins:[globalMixins.sizeMixin],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]},inject:{$xeGrid:{default:null}},data(){return{xID:_xeUtils.default.uniqueId(),reactData:{isRefresh:!1,connectFlag:0,columns:[]},internalData:{connectTable:null}}},computed:Object.assign(Object.assign({},{}),{computeRefreshOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.refresh,!0),this.refresh)},computeImportOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.import,!0),this.import)},computeExportOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.export,!0),this.export)},computePrintOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.print,!0),this.print)},computeZoomOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.zoom,!0),this.zoom)},computeCustomOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.custom,!0),this.custom)},computeTableCustomOpts(){var e=this.reactData,t=this.internalData.connectTable;return(e.connectFlag||t)&&t?t.computeCustomOpts:{trigger:""}},computeTrigger(){return this.computeTableCustomOpts.trigger}}),methods:{dispatchEvent(e,t,o){this.$emit(e,createEvent(o,{$toolbar:this},t))},fintTable(){var e=this.$parent.$children;let o=e.indexOf(this);return _xeUtils.default.find(e,(e,t)=>e&&e.loadData&&t>o&&"vxe-table"===e.$vnode.componentOptions.tag)},syncUpdate(e){var t=this.reactData;this.internalData.connectTable=e.$table,t.columns=e.collectColumn,t.connectFlag++},checkTable(){var e=this.internalData.connectTable;if(e)return!0;(0,_log.errLog)("vxe.error.barUnableLink")},handleClickSettingEvent({$event:e}){var t=this.internalData.connectTable;t&&(t.triggerCustomEvent?t.triggerCustomEvent(e):(0,_log.errLog)("vxe.error.reqModule",["VxeTableCustomModule"]))},handleMouseenterSettingEvent({$event:e}){var t=this.internalData.connectTable;t?t.customOpenEvent(e):(0,_log.errLog)("vxe.error.reqModule",["VxeTableCustomModule"])},handleMouseleaveSettingEvent({$event:t}){var e=this.internalData.connectTable;let o=e;if(o){let e=o.reactData.customStore;e.activeBtn=!1,setTimeout(()=>{e.activeBtn||e.activeWrapper||o.customCloseEvent(t)},350)}},refreshEvent({$event:e}){let t=this.reactData;var o=this.$xeGrid,r=t.isRefresh,n=this.computeRefreshOpts;if(!r){r=n.queryMethod||n.query;if(r){t.isRefresh=!0;try{Promise.resolve(r({})).catch(e=>e).then(()=>{t.isRefresh=!1})}catch(e){t.isRefresh=!1}}else o&&(t.isRefresh=!0,o.triggerToolbarCommitEvent({code:n.code||"reload"},e).catch(e=>e).then(()=>{t.isRefresh=!1}))}},zoomEvent({$event:e}){var t=this.$xeGrid;t&&t.triggerZoomEvent(e)},btnEvent(e,t){var o=this.internalData,r=this.$xeGrid,o=o.connectTable,n=t.code;n&&(r?r.triggerToolbarBtnEvent(t,e):(t={code:n,button:t,$table:o,$grid:r,$event:e},(o=commands.get(n))&&((r=o.tableCommandMethod||o.commandMethod)?r(t):(0,_log.errLog)("vxe.error.notCommands",[n])),this.dispatchEvent("button-click",t,e)))},tolEvent(e,t){var o=this.internalData,r=this.$xeGrid,o=o.connectTable,n=t.code;n&&(r?r.triggerToolbarTolEvent(t,e):(t={code:n,button:null,tool:t,$table:o,$grid:r,$event:e},(o=commands.get(n))&&((r=o.tableCommandMethod||o.commandMethod)?r(t):(0,_log.errLog)("vxe.error.notCommands",[n])),this.dispatchEvent("tool-click",t,e)))},importEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.openImport()},exportEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.openExport()},printEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.openPrint()},renderDropdowns(o,e,r){let n=_ui.VxeUI.getComponent("VxeButton"),i=this;e=e.dropdowns;return e?e.map((t,e)=>!1!==t.visible&&n?o(n,{key:e,props:{disabled:t.disabled,loading:t.loading,type:t.type,mode:t.mode,icon:t.icon,circle:t.circle,round:t.round,status:t.status,content:t.name,title:t.title,routerLink:t.routerLink,permissionCode:t.permissionCode,prefixTooltip:t.prefixTooltip,suffixTooltip:t.suffixTooltip},on:{click:({$event:e})=>r?i.btnEvent(e,t):i.tolEvent(e,t)}}):renderEmptyElement(i)):[]},renderLeftBtns(l){let s=_ui.VxeUI.getComponent("VxeButton");var e=this,t=e.$scopedSlots;let a=e.$xeGrid;var o=e.buttons,r=e.internalData.connectTable;let c=r;r=t.buttonPrefix||t["button-prefix"],t=t.buttonSuffix||t["button-suffix"];let u=[];return r&&u.push(...(0,_vn.getSlotVNs)(r.call(e,{buttons:o||[],$grid:a,$table:c}))),o&&o.forEach(t=>{var e,o,r,{dropdowns:n,buttonRender:i}=t;!1!==t.visible&&(e=i?renderer.get(i.name):null,i&&e&&e.renderToolbarButton?(o=e.toolbarButtonClassName,r={$grid:a,$table:c,button:t},u.push(l("span",{class:["vxe-button--item",o?_xeUtils.default.isFunction(o)?o(r):o:""]},(0,_vn.getSlotVNs)(e.renderToolbarButton(l,i,r))))):s&&u.push(l(s,{props:{disabled:t.disabled,loading:t.loading,type:t.type,mode:t.mode,icon:t.icon,circle:t.circle,round:t.round,status:t.status,content:t.name,title:t.title,routerLink:t.routerLink,permissionCode:t.permissionCode,prefixTooltip:t.prefixTooltip,suffixTooltip:t.suffixTooltip,destroyOnClose:t.destroyOnClose,placement:t.placement,transfer:t.transfer},on:{click:({$event:e})=>this.btnEvent(e,t)},scopedSlots:n&&n.length?{dropdowns:()=>this.renderDropdowns(l,t,!0)}:{}})))}),t&&u.push(...(0,_vn.getSlotVNs)(t.call(e,{buttons:o||[],$grid:a,$table:c}))),u},renderRightTools(a){let c=_ui.VxeUI.getComponent("VxeButton"),u=this;var e=u,t=u.$scopedSlots,o=u.internalData;let p=u.$xeGrid;e=e.tools,o=o.connectTable;let d=o;o=t.toolPrefix||t["tool-prefix"],t=t.toolSuffix||t["tool-suffix"];let m=[];return o&&m.push(...(0,_vn.getSlotVNs)(o.call(u,{tools:e||[],$grid:p,$table:d}))),e&&e.forEach((t,e)=>{var o,r,n,i,{dropdowns:l,toolRender:s}=t;!1!==t.visible&&(o=s?s.name:null,r=s?renderer.get(o):null,s&&r&&r.renderToolbarTool?(n=r.toolbarToolClassName,i={$grid:p,$table:d,tool:t},m.push(a("span",{key:o,class:["vxe-tool--item",n?_xeUtils.default.isFunction(n)?n(i):n:""]},(0,_vn.getSlotVNs)(r.renderToolbarTool(a,s,i))))):c&&m.push(a(c,{key:e,props:{disabled:t.disabled,loading:t.loading,type:t.type,mode:t.mode,icon:t.icon,circle:t.circle,round:t.round,status:t.status,content:t.name,title:t.title,routerLink:t.routerLink,permissionCode:t.permissionCode,prefixTooltip:t.prefixTooltip,suffixTooltip:t.suffixTooltip,destroyOnClose:t.destroyOnClose,placement:t.placement,transfer:t.transfer},on:{click:({$event:e})=>u.tolEvent(e,t)},scopedSlots:l&&l.length?{dropdowns:()=>u.renderDropdowns(a,t,!1)}:{}})))}),t&&m.push(...(0,_vn.getSlotVNs)(t.call(u,{tools:e||[],$grid:p,$table:d}))),m},renderToolImport(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.computeImportOpts;return t?e(t,{key:"import",props:{circle:!0,icon:o.icon||getIcon().TOOLBAR_TOOLS_IMPORT,title:getI18n("vxe.toolbar.import")},on:{click:this.importEvent}}):renderEmptyElement(this)},renderToolExport(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.computeExportOpts;return t?e(t,{key:"export",props:{circle:!0,icon:o.icon||getIcon().TOOLBAR_TOOLS_EXPORT,title:getI18n("vxe.toolbar.export")},on:{click:this.exportEvent}}):renderEmptyElement(this)},renderToolPrint(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.computePrintOpts;return t?e(t,{key:"print",props:{circle:!0,icon:o.icon||getIcon().TOOLBAR_TOOLS_PRINT,title:getI18n("vxe.toolbar.print")},on:{click:this.printEvent}}):renderEmptyElement(this)},renderToolRefresh(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.reactData,r=this.computeRefreshOpts;return t?e(t,{key:"refresh",props:{circle:!0,icon:o.isRefresh?r.iconLoading||getIcon().TOOLBAR_TOOLS_REFRESH_LOADING:r.icon||getIcon().TOOLBAR_TOOLS_REFRESH,title:getI18n("vxe.toolbar.refresh")},on:{click:this.refreshEvent}}):renderEmptyElement(this)},renderToolZoom(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.$xeGrid,r=this.computeZoomOpts;return o&&t?e(t,{key:"zoom",props:{circle:!0,icon:o.isMaximized()?r.iconOut||getIcon().TOOLBAR_TOOLS_MINIMIZE:r.iconIn||getIcon().TOOLBAR_TOOLS_FULLSCREEN,title:getI18n("vxe.toolbar.zoom"+(o.isMaximized()?"Out":"In"))},on:{click:this.zoomEvent}}):renderEmptyElement(this)},renderToolCustom(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this,r=o.computeCustomOpts,n=o.computeTrigger,i={};return"manual"!==n&&("hover"===n?(i.mouseenter=o.handleMouseenterSettingEvent,i.mouseleave=o.handleMouseleaveSettingEvent):i.click=o.handleClickSettingEvent),t?e(t,{key:"custom",props:{circle:!0,icon:r.icon||getIcon().TOOLBAR_TOOLS_CUSTOM,title:getI18n("vxe.toolbar.custom"),className:"vxe-toolbar-custom-target"},on:i}):renderEmptyElement(o)},renderVN(e){var t=this,o=t,r=t.$scopedSlots,n=t.$xeGrid,{perfect:i,loading:l,refresh:s,zoom:a,custom:c,className:u}=o,p=t.internalData.connectTable,d=r.tools,r=r.buttons,m=t.computeSize;return e("div",{ref:"refElem",class:["vxe-toolbar",u?_xeUtils.default.isFunction(u)?u({$toolbar:t}):u:"",{["size--"+m]:m,"is--perfect":i,"is--loading":l}]},[e("div",{class:"vxe-buttons--wrapper"},r?r({$grid:n,$table:p}):t.renderLeftBtns(e)),e("div",{class:"vxe-tools--wrapper"},d?d({$grid:n,$table:p}):t.renderRightTools(e)),e("div",{class:"vxe-tools--operate"},[o.import?t.renderToolImport(e):renderEmptyElement(t),o.export?t.renderToolExport(e):renderEmptyElement(t),o.print?t.renderToolPrint(e):renderEmptyElement(t),s?t.renderToolRefresh(e):renderEmptyElement(t),a&&n?t.renderToolZoom(e):renderEmptyElement(t),c?t.renderToolCustom(e):renderEmptyElement(t)])])}},created(){let r=this,n=r,i=r.$xeGrid;r.$nextTick(()=>{var e=n.refresh,t=r.computeRefreshOpts,o=this.fintTable(),t=t.queryMethod||t.query,e=(!e||i||t||(0,_log.warnLog)("vxe.error.notFunc",["queryMethod"]),o&&o.connect(this),r.computeCustomOpts);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"])});var e=_ui.VxeUI.getComponent("VxeButton");(n.refresh||n.import||n.export||n.print||n.zoom)&&!e&&(0,_log.errLog)("vxe.error.reqComp",["vxe-button"])},render(e){return this.renderVN(e)}});
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_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,globalMixins,renderEmptyElement}=_ui.VxeUI;var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeToolbar",mixins:[globalMixins.sizeMixin],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]},inject:{$xeGrid:{default:null}},data(){return{xID:_xeUtils.default.uniqueId(),reactData:{isRefresh:!1,connectFlag:0,columns:[]},internalData:{connectTable:null}}},computed:Object.assign(Object.assign({},{}),{computeRefreshOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.refresh,!0),this.refresh)},computeImportOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.import,!0),this.import)},computeExportOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.export,!0),this.export)},computePrintOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.print,!0),this.print)},computeZoomOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.zoom,!0),this.zoom)},computeCustomOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.custom,!0),this.custom)},computeTableCustomOpts(){var e=this.reactData,t=this.internalData.connectTable;return(e.connectFlag||t)&&t?t.computeCustomOpts:{trigger:""}},computeTrigger(){return this.computeTableCustomOpts.trigger}}),methods:{dispatchEvent(e,t,o){this.$emit(e,createEvent(o,{$toolbar:this},t))},fintTable(){var e=this.$parent.$children;let o=e.indexOf(this);return _xeUtils.default.find(e,(e,t)=>e&&e.loadData&&t>o&&"vxe-table"===e.$vnode.componentOptions.tag)},syncUpdate(e){var t=this.reactData;this.internalData.connectTable=e.$table,t.columns=e.collectColumn,t.connectFlag++},checkTable(){var e=this.internalData.connectTable;if(e)return!0;(0,_log.errLog)("vxe.error.barUnableLink")},handleClickSettingEvent({$event:e}){var t=this.internalData.connectTable;t&&t.triggerCustomEvent&&t.triggerCustomEvent(e)},handleMouseenterSettingEvent({$event:e}){var t=this.internalData.connectTable;t&&t.customOpenEvent(e)},handleMouseleaveSettingEvent({$event:t}){var e=this.internalData.connectTable;let o=e;if(o){let e=o.reactData.customStore;e.activeBtn=!1,setTimeout(()=>{e.activeBtn||e.activeWrapper||o.customCloseEvent(t)},350)}},refreshEvent({$event:e}){let t=this.reactData;var o=this.$xeGrid,r=t.isRefresh,n=this.computeRefreshOpts;if(!r){r=n.queryMethod||n.query;if(r){t.isRefresh=!0;try{Promise.resolve(r({})).catch(e=>e).then(()=>{t.isRefresh=!1})}catch(e){t.isRefresh=!1}}else o&&(t.isRefresh=!0,o.triggerToolbarCommitEvent({code:n.code||"reload"},e).catch(e=>e).then(()=>{t.isRefresh=!1}))}},zoomEvent({$event:e}){var t=this.$xeGrid;t&&t.triggerZoomEvent(e)},btnEvent(e,t){var o=this.internalData,r=this.$xeGrid,o=o.connectTable,n=t.code;n&&(r?r.triggerToolbarBtnEvent(t,e):(t={code:n,button:t,$table:o,$grid:r,$event:e},(o=commands.get(n))&&((r=o.tableCommandMethod||o.commandMethod)?r(t):(0,_log.errLog)("vxe.error.notCommands",[n])),this.dispatchEvent("button-click",t,e)))},tolEvent(e,t){var o=this.internalData,r=this.$xeGrid,o=o.connectTable,n=t.code;n&&(r?r.triggerToolbarTolEvent(t,e):(t={code:n,button:null,tool:t,$table:o,$grid:r,$event:e},(o=commands.get(n))&&((r=o.tableCommandMethod||o.commandMethod)?r(t):(0,_log.errLog)("vxe.error.notCommands",[n])),this.dispatchEvent("tool-click",t,e)))},importEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.openImport()},exportEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.openExport()},printEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.openPrint()},renderDropdowns(o,e,r){let n=_ui.VxeUI.getComponent("VxeButton"),i=this;e=e.dropdowns;return e?e.map((t,e)=>!1!==t.visible&&n?o(n,{key:e,props:{disabled:t.disabled,loading:t.loading,type:t.type,mode:t.mode,icon:t.icon,circle:t.circle,round:t.round,status:t.status,content:t.name,title:t.title,routerLink:t.routerLink,permissionCode:t.permissionCode,prefixTooltip:t.prefixTooltip,suffixTooltip:t.suffixTooltip},on:{click:({$event:e})=>r?i.btnEvent(e,t):i.tolEvent(e,t)}}):renderEmptyElement(i)):[]},renderLeftBtns(l){let s=_ui.VxeUI.getComponent("VxeButton");var e=this,t=e.$scopedSlots;let a=e.$xeGrid;var o=e.buttons,r=e.internalData.connectTable;let c=r;r=t.buttonPrefix||t["button-prefix"],t=t.buttonSuffix||t["button-suffix"];let p=[];return r&&p.push(...(0,_vn.getSlotVNs)(r.call(e,{buttons:o||[],$grid:a,$table:c}))),o&&o.forEach(t=>{var e,o,r,{dropdowns:n,buttonRender:i}=t;!1!==t.visible&&(e=i?renderer.get(i.name):null,i&&e&&e.renderToolbarButton?(o=e.toolbarButtonClassName,r={$grid:a,$table:c,button:t},p.push(l("span",{class:["vxe-button--item",o?_xeUtils.default.isFunction(o)?o(r):o:""]},(0,_vn.getSlotVNs)(e.renderToolbarButton(l,i,r))))):s&&p.push(l(s,{props:{disabled:t.disabled,loading:t.loading,type:t.type,mode:t.mode,icon:t.icon,circle:t.circle,round:t.round,status:t.status,content:t.name,title:t.title,routerLink:t.routerLink,permissionCode:t.permissionCode,prefixTooltip:t.prefixTooltip,suffixTooltip:t.suffixTooltip,destroyOnClose:t.destroyOnClose,placement:t.placement,transfer:t.transfer},on:{click:({$event:e})=>this.btnEvent(e,t)},scopedSlots:n&&n.length?{dropdowns:()=>this.renderDropdowns(l,t,!0)}:{}})))}),t&&p.push(...(0,_vn.getSlotVNs)(t.call(e,{buttons:o||[],$grid:a,$table:c}))),p},renderRightTools(a){let c=_ui.VxeUI.getComponent("VxeButton"),p=this;var e=p,t=p.$scopedSlots,o=p.internalData;let u=p.$xeGrid;e=e.tools,o=o.connectTable;let d=o;o=t.toolPrefix||t["tool-prefix"],t=t.toolSuffix||t["tool-suffix"];let m=[];return o&&m.push(...(0,_vn.getSlotVNs)(o.call(p,{tools:e||[],$grid:u,$table:d}))),e&&e.forEach((t,e)=>{var o,r,n,i,{dropdowns:l,toolRender:s}=t;!1!==t.visible&&(o=s?s.name:null,r=s?renderer.get(o):null,s&&r&&r.renderToolbarTool?(n=r.toolbarToolClassName,i={$grid:u,$table:d,tool:t},m.push(a("span",{key:o,class:["vxe-tool--item",n?_xeUtils.default.isFunction(n)?n(i):n:""]},(0,_vn.getSlotVNs)(r.renderToolbarTool(a,s,i))))):c&&m.push(a(c,{key:e,props:{disabled:t.disabled,loading:t.loading,type:t.type,mode:t.mode,icon:t.icon,circle:t.circle,round:t.round,status:t.status,content:t.name,title:t.title,routerLink:t.routerLink,permissionCode:t.permissionCode,prefixTooltip:t.prefixTooltip,suffixTooltip:t.suffixTooltip,destroyOnClose:t.destroyOnClose,placement:t.placement,transfer:t.transfer},on:{click:({$event:e})=>p.tolEvent(e,t)},scopedSlots:l&&l.length?{dropdowns:()=>p.renderDropdowns(a,t,!1)}:{}})))}),t&&m.push(...(0,_vn.getSlotVNs)(t.call(p,{tools:e||[],$grid:u,$table:d}))),m},renderToolImport(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.computeImportOpts;return t?e(t,{key:"import",props:{circle:!0,icon:o.icon||getIcon().TOOLBAR_TOOLS_IMPORT,title:getI18n("vxe.toolbar.import")},on:{click:this.importEvent}}):renderEmptyElement(this)},renderToolExport(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.computeExportOpts;return t?e(t,{key:"export",props:{circle:!0,icon:o.icon||getIcon().TOOLBAR_TOOLS_EXPORT,title:getI18n("vxe.toolbar.export")},on:{click:this.exportEvent}}):renderEmptyElement(this)},renderToolPrint(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.computePrintOpts;return t?e(t,{key:"print",props:{circle:!0,icon:o.icon||getIcon().TOOLBAR_TOOLS_PRINT,title:getI18n("vxe.toolbar.print")},on:{click:this.printEvent}}):renderEmptyElement(this)},renderToolRefresh(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.reactData,r=this.computeRefreshOpts;return t?e(t,{key:"refresh",props:{circle:!0,icon:o.isRefresh?r.iconLoading||getIcon().TOOLBAR_TOOLS_REFRESH_LOADING:r.icon||getIcon().TOOLBAR_TOOLS_REFRESH,title:getI18n("vxe.toolbar.refresh")},on:{click:this.refreshEvent}}):renderEmptyElement(this)},renderToolZoom(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.$xeGrid,r=this.computeZoomOpts;return o&&t?e(t,{key:"zoom",props:{circle:!0,icon:o.isMaximized()?r.iconOut||getIcon().TOOLBAR_TOOLS_MINIMIZE:r.iconIn||getIcon().TOOLBAR_TOOLS_FULLSCREEN,title:getI18n("vxe.toolbar.zoom"+(o.isMaximized()?"Out":"In"))},on:{click:this.zoomEvent}}):renderEmptyElement(this)},renderToolCustom(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this,r=o.computeCustomOpts,n=o.computeTrigger,i={};return"manual"!==n&&("hover"===n?(i.mouseenter=o.handleMouseenterSettingEvent,i.mouseleave=o.handleMouseleaveSettingEvent):i.click=o.handleClickSettingEvent),t?e(t,{key:"custom",props:{circle:!0,icon:r.icon||getIcon().TOOLBAR_TOOLS_CUSTOM,title:getI18n("vxe.toolbar.custom"),className:"vxe-toolbar-custom-target"},on:i}):renderEmptyElement(o)},renderVN(e){var t=this,o=t,r=t.$scopedSlots,n=t.$xeGrid,{perfect:i,loading:l,refresh:s,zoom:a,custom:c,className:p}=o,u=t.internalData.connectTable,d=r.tools,r=r.buttons,m=t.computeSize;return e("div",{ref:"refElem",class:["vxe-toolbar",p?_xeUtils.default.isFunction(p)?p({$toolbar:t}):p:"",{["size--"+m]:m,"is--perfect":i,"is--loading":l}]},[e("div",{class:"vxe-buttons--wrapper"},r?r({$grid:n,$table:u}):t.renderLeftBtns(e)),e("div",{class:"vxe-tools--wrapper"},d?d({$grid:n,$table:u}):t.renderRightTools(e)),e("div",{class:"vxe-tools--operate"},[o.import?t.renderToolImport(e):renderEmptyElement(t),o.export?t.renderToolExport(e):renderEmptyElement(t),o.print?t.renderToolPrint(e):renderEmptyElement(t),s?t.renderToolRefresh(e):renderEmptyElement(t),a&&n?t.renderToolZoom(e):renderEmptyElement(t),c?t.renderToolCustom(e):renderEmptyElement(t)])])}},created(){let r=this,n=r,i=r.$xeGrid;r.$nextTick(()=>{var e=n.refresh,t=r.computeRefreshOpts,o=this.fintTable(),t=t.queryMethod||t.query,e=(!e||i||t||(0,_log.warnLog)("vxe.error.notFunc",["queryMethod"]),o&&o.connect(this),r.computeCustomOpts);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"])});var e=_ui.VxeUI.getComponent("VxeButton");(n.refresh||n.import||n.export||n.print||n.zoom)&&!e&&(0,_log.errLog)("vxe.error.reqComp",["vxe-button"])},render(e){return this.renderVN(e)}});
|
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.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 = "3.15.
|
|
16
|
+
const version = exports.version = "3.15.38";
|
|
17
17
|
_core.VxeUI.version = version;
|
|
18
18
|
_core.VxeUI.tableVersion = version;
|
|
19
19
|
_core.VxeUI.setConfig({
|
|
@@ -191,6 +191,7 @@ _core.VxeUI.setConfig({
|
|
|
191
191
|
extension: true
|
|
192
192
|
},
|
|
193
193
|
keyboardConfig: {
|
|
194
|
+
isAll: true,
|
|
194
195
|
isEsc: true
|
|
195
196
|
},
|
|
196
197
|
areaConfig: {
|
package/lib/ui/index.min.js
CHANGED
|
@@ -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.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="3.15.
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="3.15.38",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:" ",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,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},aggregateConfig:{padding:!0,rowField:"id",parentField:"_X_ROW_PARENT_KEY",childrenField:"_X_ROW_CHILDREN",mapChildrenField:"_X_ROW_CHILD_LIST",indent:20,showIcon:!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:0,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,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",TABLE_ROW_GROUP_OPEN:iconPrefix+"arrow-right rotate90",TABLE_ROW_GROUP_CLOSE:iconPrefix+"arrow-right",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;
|
package/lib/ui/src/log.js
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${"3.15.
|
|
11
|
+
const version = `table v${"3.15.38"}`;
|
|
12
12
|
const warnLog = exports.warnLog = log.create('warn', version);
|
|
13
13
|
const errLog = exports.errLog = log.create('error', version);
|
package/lib/ui/src/log.min.js
CHANGED
|
@@ -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 v3.15.
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v3.15.38",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
|
package/package.json
CHANGED
|
@@ -256,7 +256,7 @@ function handleInsertRowAt ($xeTable: VxeTableConstructor & VxeTablePrivateMetho
|
|
|
256
256
|
}
|
|
257
257
|
return $xeTable.$nextTick().then(() => {
|
|
258
258
|
$xeTable.updateCellAreas()
|
|
259
|
-
return $xeTable.recalculate()
|
|
259
|
+
return $xeTable.recalculate(true)
|
|
260
260
|
}).then(() => {
|
|
261
261
|
return {
|
|
262
262
|
row: newRecords.length ? newRecords[newRecords.length - 1] : null,
|
|
@@ -609,7 +609,7 @@ export default {
|
|
|
609
609
|
}
|
|
610
610
|
return this.$nextTick().then(() => {
|
|
611
611
|
this.updateCellAreas()
|
|
612
|
-
return this.recalculate()
|
|
612
|
+
return this.recalculate(true)
|
|
613
613
|
}).then(() => {
|
|
614
614
|
return { row: delList.length ? delList[delList.length - 1] : null, rows: delList }
|
|
615
615
|
})
|
|
@@ -397,7 +397,10 @@ export default {
|
|
|
397
397
|
let isMouseScrollDown: any = false
|
|
398
398
|
let mouseScrollSpaceSize = 1
|
|
399
399
|
const triggerEvent = (type: any, evnt: any) => {
|
|
400
|
-
this.emitEvent(`checkbox-range-${type}`, {
|
|
400
|
+
this.emitEvent(`checkbox-range-${type}`, {
|
|
401
|
+
records: () => this.getCheckboxRecords(),
|
|
402
|
+
reserves: () => this.getCheckboxReserveRecords()
|
|
403
|
+
}, evnt)
|
|
401
404
|
}
|
|
402
405
|
const handleChecked = (evnt: any) => {
|
|
403
406
|
const { clientX, clientY } = evnt
|
|
@@ -327,7 +327,19 @@ function cacheColumnMap ($xeTable: VxeTableConstructor & VxeTablePrivateMethods)
|
|
|
327
327
|
reactData.isAllOverflow = isAllOverflow
|
|
328
328
|
}
|
|
329
329
|
|
|
330
|
-
|
|
330
|
+
function updateScrollXStatus ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, fullColumn?: any[]) {
|
|
331
|
+
const reactData = $xeTable as unknown as TableReactData
|
|
332
|
+
const internalData = $xeTable as unknown as TableInternalData
|
|
333
|
+
|
|
334
|
+
const virtualXOpts = $xeTable.computeVirtualXOpts
|
|
335
|
+
const allCols = fullColumn || internalData.tableFullColumn
|
|
336
|
+
// 如果gt为0,则总是启用
|
|
337
|
+
const scrollXLoad = !!virtualXOpts.enabled && virtualXOpts.gt > -1 && (virtualXOpts.gt === 0 || virtualXOpts.gt < allCols.length)
|
|
338
|
+
reactData.scrollXLoad = scrollXLoad
|
|
339
|
+
return scrollXLoad
|
|
340
|
+
}
|
|
341
|
+
|
|
342
|
+
function updateScrollYStatus ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, fullData?: any[]) {
|
|
331
343
|
const props = $xeTable
|
|
332
344
|
const reactData = $xeTable as unknown as TableReactData
|
|
333
345
|
const internalData = $xeTable as unknown as TableInternalData
|
|
@@ -3110,7 +3122,6 @@ function parseColumns ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, i
|
|
|
3110
3122
|
const centerList: VxeTableDefines.ColumnInfo[] = []
|
|
3111
3123
|
const rightList: VxeTableDefines.ColumnInfo[] = []
|
|
3112
3124
|
const { isGroup, columnStore } = reactData
|
|
3113
|
-
const virtualXOpts = $xeTable.computeVirtualXOpts
|
|
3114
3125
|
const { collectColumn, tableFullColumn, scrollXStore, fullColumnIdData } = internalData
|
|
3115
3126
|
// 如果是分组表头,如果子列全部被隐藏,则根列也隐藏
|
|
3116
3127
|
if (isGroup) {
|
|
@@ -3165,11 +3176,12 @@ function parseColumns ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, i
|
|
|
3165
3176
|
})
|
|
3166
3177
|
}
|
|
3167
3178
|
const visibleColumn = leftList.concat(centerList).concat(rightList)
|
|
3168
|
-
|
|
3169
|
-
|
|
3179
|
+
internalData.visibleColumn = visibleColumn
|
|
3180
|
+
updateColumnOffsetLeft($xeTable)
|
|
3181
|
+
const sXLoad = updateScrollXStatus($xeTable)
|
|
3170
3182
|
reactData.hasFixedColumn = leftList.length > 0 || rightList.length > 0
|
|
3171
3183
|
Object.assign(columnStore, { leftList, centerList, rightList })
|
|
3172
|
-
if (
|
|
3184
|
+
if (sXLoad) {
|
|
3173
3185
|
// if (showOverflow) {
|
|
3174
3186
|
// if (!rowOpts.height) {
|
|
3175
3187
|
// const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
|
|
@@ -3205,7 +3217,6 @@ function parseColumns ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, i
|
|
|
3205
3217
|
$xeTable.clearMergeCells()
|
|
3206
3218
|
$xeTable.clearMergeFooterItems()
|
|
3207
3219
|
}
|
|
3208
|
-
reactData.scrollXLoad = scrollXLoad
|
|
3209
3220
|
visibleColumn.forEach((column, index) => {
|
|
3210
3221
|
const colid = column.id
|
|
3211
3222
|
const colRest = fullColumnIdData[colid]
|
|
@@ -3213,7 +3224,6 @@ function parseColumns ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, i
|
|
|
3213
3224
|
colRest._index = index
|
|
3214
3225
|
}
|
|
3215
3226
|
})
|
|
3216
|
-
internalData.visibleColumn = visibleColumn
|
|
3217
3227
|
handleTableColumn($xeTable)
|
|
3218
3228
|
if (isReset) {
|
|
3219
3229
|
return $xeTable.updateFooter().then(() => {
|
|
@@ -3913,9 +3923,24 @@ const Methods = {
|
|
|
3913
3923
|
*/
|
|
3914
3924
|
loadColumn (columns: any) {
|
|
3915
3925
|
const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
|
|
3926
|
+
const internalData = $xeTable as unknown as TableInternalData
|
|
3916
3927
|
|
|
3928
|
+
const { lastScrollLeft, lastScrollTop } = internalData
|
|
3917
3929
|
const collectColumn = XEUtils.mapTree(columns, column => Cell.createColumn($xeTable, column), { children: 'children' })
|
|
3918
|
-
return handleColumn($xeTable, collectColumn)
|
|
3930
|
+
return handleColumn($xeTable, collectColumn).then(() => {
|
|
3931
|
+
let targetScrollLeft = lastScrollLeft
|
|
3932
|
+
let targetScrollTop = lastScrollTop
|
|
3933
|
+
const virtualXOpts = $xeTable.computeVirtualXOpts
|
|
3934
|
+
const virtualYOpts = $xeTable.computeVirtualYOpts
|
|
3935
|
+
// 是否在更新数据之后自动滚动重置滚动条
|
|
3936
|
+
if (virtualXOpts.scrollToLeftOnChange) {
|
|
3937
|
+
targetScrollLeft = 0
|
|
3938
|
+
}
|
|
3939
|
+
if (virtualYOpts.scrollToTopOnChange) {
|
|
3940
|
+
targetScrollTop = 0
|
|
3941
|
+
}
|
|
3942
|
+
restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop)
|
|
3943
|
+
})
|
|
3919
3944
|
},
|
|
3920
3945
|
/**
|
|
3921
3946
|
* 加载列配置并恢复到初始状态
|
|
@@ -5766,7 +5791,7 @@ const Methods = {
|
|
|
5766
5791
|
return new Promise<void>(resolve => {
|
|
5767
5792
|
// 还原滚动条位置
|
|
5768
5793
|
if (lastScrollLeft || lastScrollTop) {
|
|
5769
|
-
return restoreScrollLocation($xeTable, lastScrollLeft, lastScrollTop).then(
|
|
5794
|
+
return restoreScrollLocation($xeTable, lastScrollLeft, lastScrollTop).then(() => {
|
|
5770
5795
|
// 存在滚动行为未结束情况
|
|
5771
5796
|
setTimeout(resolve, 10)
|
|
5772
5797
|
})
|
|
@@ -10247,7 +10272,9 @@ const Methods = {
|
|
|
10247
10272
|
}, 30)
|
|
10248
10273
|
})
|
|
10249
10274
|
}
|
|
10250
|
-
return $xeTable.$nextTick()
|
|
10275
|
+
return $xeTable.$nextTick().then(() => {
|
|
10276
|
+
internalData.intoRunScroll = false
|
|
10277
|
+
})
|
|
10251
10278
|
},
|
|
10252
10279
|
/**
|
|
10253
10280
|
* 如果有滚动条,则滚动到对应的行
|
|
@@ -10603,15 +10630,15 @@ funcs.forEach(name => {
|
|
|
10603
10630
|
Methods[name] = function (...args: any[]) {
|
|
10604
10631
|
if (!this[`_${name}`]) {
|
|
10605
10632
|
if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
|
|
10606
|
-
errLog('vxe.error.reqModule', ['
|
|
10633
|
+
errLog('vxe.error.reqModule', ['Export'])
|
|
10607
10634
|
} else if ('fullValidate,validate'.split(',').includes(name)) {
|
|
10608
|
-
errLog('vxe.error.reqModule', ['
|
|
10635
|
+
errLog('vxe.error.reqModule', ['Validator'])
|
|
10609
10636
|
} else if ('setFilter,openFilter,clearFilter,getCheckedFilters'.split(',').includes(name)) {
|
|
10610
|
-
errLog('vxe.error.reqModule', ['
|
|
10637
|
+
errLog('vxe.error.reqModule', ['Filter'])
|
|
10611
10638
|
} else if ('insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell'.split(',').includes(name)) {
|
|
10612
|
-
errLog('vxe.error.reqModule', ['
|
|
10639
|
+
errLog('vxe.error.reqModule', ['Edit'])
|
|
10613
10640
|
} else if ('openCustom'.split(',').includes(name)) {
|
|
10614
|
-
errLog('vxe.error.reqModule', ['
|
|
10641
|
+
errLog('vxe.error.reqModule', ['Custom'])
|
|
10615
10642
|
}
|
|
10616
10643
|
}
|
|
10617
10644
|
return this[`_${name}`] ? this[`_${name}`](...args) : null
|
|
@@ -169,8 +169,6 @@ export default /* define-vxe-component start */ defineVxeComponent({
|
|
|
169
169
|
if ($table) {
|
|
170
170
|
if ($table.triggerCustomEvent) {
|
|
171
171
|
$table.triggerCustomEvent($event)
|
|
172
|
-
} else {
|
|
173
|
-
errLog('vxe.error.reqModule', ['VxeTableCustomModule'])
|
|
174
172
|
}
|
|
175
173
|
}
|
|
176
174
|
},
|
|
@@ -182,8 +180,6 @@ export default /* define-vxe-component start */ defineVxeComponent({
|
|
|
182
180
|
const $table: any = connectTable
|
|
183
181
|
if ($table) {
|
|
184
182
|
$table.customOpenEvent($event)
|
|
185
|
-
} else {
|
|
186
|
-
errLog('vxe.error.reqModule', ['VxeTableCustomModule'])
|
|
187
183
|
}
|
|
188
184
|
},
|
|
189
185
|
handleMouseleaveSettingEvent ({ $event }: any) {
|
package/packages/ui/index.ts
CHANGED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|