vxe-table 4.19.15 → 4.19.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.
- package/dist/all.esm.js +308 -218
- package/dist/style.css +1 -1
- package/es/grid/src/grid.js +12 -11
- package/es/style.css +1 -1
- package/es/table/module/custom/panel.js +2 -1
- package/es/table/module/edit/hook.js +2 -1
- package/es/table/module/export/export-panel.js +2 -1
- package/es/table/module/export/hook.js +24 -4
- package/es/table/module/export/import-panel.js +2 -1
- package/es/table/module/filter/panel.js +2 -1
- package/es/table/module/validator/hook.js +2 -1
- package/es/table/render/index.js +2 -1
- package/es/table/src/columnInfo.js +2 -1
- package/es/table/src/header.js +6 -3
- package/es/table/src/table.js +58 -10
- package/es/toolbar/src/toolbar.js +16 -15
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +12 -3
- package/lib/grid/src/grid.js +16 -12
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/index.umd.js +215 -135
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/module/custom/panel.js +8 -5
- package/lib/table/module/custom/panel.min.js +1 -1
- package/lib/table/module/edit/hook.js +19 -15
- package/lib/table/module/edit/hook.min.js +1 -1
- package/lib/table/module/export/export-panel.js +8 -5
- package/lib/table/module/export/export-panel.min.js +1 -1
- package/lib/table/module/export/hook.js +41 -14
- package/lib/table/module/export/hook.min.js +1 -1
- package/lib/table/module/export/import-panel.js +6 -3
- package/lib/table/module/export/import-panel.min.js +1 -1
- package/lib/table/module/filter/panel.js +4 -1
- package/lib/table/module/filter/panel.min.js +1 -1
- package/lib/table/module/validator/hook.js +7 -3
- package/lib/table/module/validator/hook.min.js +1 -1
- package/lib/table/render/index.js +4 -1
- package/lib/table/render/index.min.js +1 -1
- package/lib/table/src/columnInfo.js +13 -9
- package/lib/table/src/columnInfo.min.js +1 -1
- package/lib/table/src/header.js +7 -3
- package/lib/table/src/header.min.js +1 -1
- package/lib/table/src/table.js +49 -44
- package/lib/table/src/table.min.js +1 -1
- package/lib/toolbar/src/toolbar.js +20 -16
- package/lib/toolbar/src/toolbar.min.js +1 -1
- package/lib/ui/index.js +1 -1
- package/lib/ui/index.min.js +1 -1
- package/lib/ui/src/log.js +13 -3
- package/lib/ui/src/log.min.js +1 -1
- package/package.json +2 -2
- package/packages/grid/src/grid.ts +13 -11
- package/packages/table/module/custom/panel.ts +3 -1
- package/packages/table/module/edit/hook.ts +3 -1
- package/packages/table/module/export/export-panel.ts +3 -1
- package/packages/table/module/export/hook.ts +26 -5
- package/packages/table/module/export/import-panel.ts +3 -1
- package/packages/table/module/filter/panel.ts +3 -1
- package/packages/table/module/validator/hook.ts +3 -1
- package/packages/table/render/index.ts +3 -1
- package/packages/table/src/columnInfo.ts +3 -1
- package/packages/table/src/header.ts +6 -3
- package/packages/table/src/table.ts +60 -11
- package/packages/toolbar/src/toolbar.ts +17 -15
- package/packages/ui/src/log.ts +13 -3
- /package/es/{iconfont.1781675408206.ttf → iconfont.1781876895482.ttf} +0 -0
- /package/es/{iconfont.1781675408206.woff → iconfont.1781876895482.woff} +0 -0
- /package/es/{iconfont.1781675408206.woff2 → iconfont.1781876895482.woff2} +0 -0
- /package/lib/{iconfont.1781675408206.ttf → iconfont.1781876895482.ttf} +0 -0
- /package/lib/{iconfont.1781675408206.woff → iconfont.1781876895482.woff} +0 -0
- /package/lib/{iconfont.1781675408206.woff2 → iconfont.1781876895482.woff2} +0 -0
|
@@ -11,6 +11,10 @@ var _ui = require("../../ui");
|
|
|
11
11
|
var _vn = require("../../ui/src/vn");
|
|
12
12
|
var _log = require("../../ui/src/log");
|
|
13
13
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
14
|
+
const {
|
|
15
|
+
warnLog,
|
|
16
|
+
errLog
|
|
17
|
+
} = (0, _log.createComponentLog)('toolbar');
|
|
14
18
|
const {
|
|
15
19
|
getConfig,
|
|
16
20
|
getIcon,
|
|
@@ -143,7 +147,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
|
|
|
143
147
|
if ($table) {
|
|
144
148
|
return true;
|
|
145
149
|
}
|
|
146
|
-
|
|
150
|
+
errLog('vxe.error.barUnableLink');
|
|
147
151
|
};
|
|
148
152
|
const handleClickSettingEvent = ({
|
|
149
153
|
$event
|
|
@@ -222,7 +226,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
|
|
|
222
226
|
if ($xeGGWrapper) {
|
|
223
227
|
$xeGGWrapper.triggerZoomEvent($event);
|
|
224
228
|
} else {
|
|
225
|
-
|
|
229
|
+
warnLog('vxe.error.notProp', ['zoom']);
|
|
226
230
|
}
|
|
227
231
|
};
|
|
228
232
|
const importEvent = () => {
|
|
@@ -355,7 +359,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
|
|
|
355
359
|
if (tCommandMethod) {
|
|
356
360
|
tCommandMethod(params);
|
|
357
361
|
} else {
|
|
358
|
-
|
|
362
|
+
errLog('vxe.error.notCommands', [code]);
|
|
359
363
|
}
|
|
360
364
|
}
|
|
361
365
|
$xeToolbar.dispatchEvent('button-click', params, $event);
|
|
@@ -394,7 +398,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
|
|
|
394
398
|
if (tCommandMethod) {
|
|
395
399
|
tCommandMethod(params);
|
|
396
400
|
} else {
|
|
397
|
-
|
|
401
|
+
errLog('vxe.error.notCommands', [code]);
|
|
398
402
|
}
|
|
399
403
|
}
|
|
400
404
|
$xeToolbar.dispatchEvent('tool-click', params, $event);
|
|
@@ -693,42 +697,42 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
|
|
|
693
697
|
const refreshOpts = computeRefreshOpts.value;
|
|
694
698
|
const queryMethod = refreshOpts.queryMethod || refreshOpts.query;
|
|
695
699
|
if (props.refresh && !$xeGGWrapper && !queryMethod) {
|
|
696
|
-
|
|
700
|
+
warnLog('vxe.error.notFunc', ['queryMethod']);
|
|
697
701
|
}
|
|
698
702
|
if (_xeUtils.default.isPlainObject(props.custom)) {
|
|
699
|
-
|
|
703
|
+
warnLog('vxe.error.delProp', ['custom={...}', 'custom=boolean & custom-options={...}']);
|
|
700
704
|
}
|
|
701
705
|
if (_xeUtils.default.isPlainObject(props.print)) {
|
|
702
|
-
|
|
706
|
+
warnLog('vxe.error.delProp', ['print={...}', 'print=boolean & print-options={...}']);
|
|
703
707
|
}
|
|
704
708
|
if (_xeUtils.default.isPlainObject(props.export)) {
|
|
705
|
-
|
|
709
|
+
warnLog('vxe.error.delProp', ['export={...}', 'export=boolean & export-options={...}']);
|
|
706
710
|
}
|
|
707
711
|
if (_xeUtils.default.isPlainObject(props.import)) {
|
|
708
|
-
|
|
712
|
+
warnLog('vxe.error.delProp', ['import={...}', 'import=boolean & import-options={...}']);
|
|
709
713
|
}
|
|
710
714
|
if (_xeUtils.default.isPlainObject(props.refresh)) {
|
|
711
|
-
|
|
715
|
+
warnLog('vxe.error.delProp', ['refresh={...}', 'refresh=boolean & refresh-options={...}']);
|
|
712
716
|
}
|
|
713
717
|
if (_xeUtils.default.isPlainObject(props.refresh)) {
|
|
714
|
-
|
|
718
|
+
warnLog('vxe.error.delProp', ['zoom={...}', 'zoom=boolean & zoom-options={...}']);
|
|
715
719
|
}
|
|
716
720
|
const customOpts = computeCustomOpts.value;
|
|
717
721
|
if (customOpts.isFooter) {
|
|
718
|
-
|
|
722
|
+
warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
|
|
719
723
|
}
|
|
720
724
|
if (customOpts.showFooter) {
|
|
721
|
-
|
|
725
|
+
warnLog('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
|
|
722
726
|
}
|
|
723
727
|
if (customOpts.immediate) {
|
|
724
|
-
|
|
728
|
+
warnLog('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
|
|
725
729
|
}
|
|
726
730
|
if (customOpts.trigger) {
|
|
727
|
-
|
|
731
|
+
warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
|
|
728
732
|
}
|
|
729
733
|
if (props.refresh || props.import || props.export || props.print || props.zoom) {
|
|
730
734
|
if (!VxeUIButtonComponent) {
|
|
731
|
-
|
|
735
|
+
errLog('vxe.error.reqComp', ['vxe-button']);
|
|
732
736
|
}
|
|
733
737
|
}
|
|
734
738
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_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,useFns}=_ui.VxeUI;function createReactData(){return{isRefresh:!1,connectFlag:0,columns:[]}}function createInternalData(){return{connectTable:null}}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeToolbar",props:{loading:Boolean,refresh:[Boolean,Object],refreshOptions:Object,import:[Boolean,Object],importOptions:Object,export:[Boolean,Object],exportOptions:Object,print:[Boolean,Object],printOptions:Object,zoom:[Boolean,Object],zoomOptions:Object,custom:[Boolean,Object],customOptions: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:v,emit:r}=e;var t=_xeUtils.default.uniqueId();let p=_ui.VxeUI.getComponent("VxeButton"),g=(0,_vue.inject)("$xeGrid",null),b=(0,_vue.inject)("$xeGantt",null),i=g||b,s=useFns.useSize(u).computeSize,c=(0,_vue.reactive)(createReactData()),m=createInternalData(),d=(0,_vue.ref)(),o={refElem:d},_={xID:t,props:u,context:e,reactData:c,internalData:m,getRefMaps:()=>o};let f=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.refresh,!0),u.refreshOptions,u.refresh)),x=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.import,!0),u.importOptions,u.import)),O=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.export,!0),u.exportOptions,u.export)),h=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.print,!0),u.printOptions,u.print)),T=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.zoom,!0),u.zoomOptions,u.zoom)),C=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.custom,!0),u.customOptions,u.custom)),n=(0,_vue.computed)(()=>{var e=m.connectTable;if((c.connectFlag||e)&&e)return e=e.getComputeMaps().computeCustomOpts,e.value;return{trigger:""}}),$=(0,_vue.computed)(()=>n.value.trigger),a=()=>{var e=m.connectTable;if(e)return!0;(0,_log.errLog)("vxe.error.barUnableLink")},j=({$event:e})=>{var t=m.connectTable;t&&t.triggerCustomEvent&&t.triggerCustomEvent(e)},L=({$event:e})=>{var t=m.connectTable;t&&t.customOpenEvent(e)},k=({$event:t})=>{var e=m.connectTable;let o=e;if(o){let e=o.reactData.customStore;e.activeBtn=!1,setTimeout(()=>{e.activeBtn||e.activeWrapper||o.customCloseEvent(t)},350)}},I=({$event:e})=>{var t=c.isRefresh,o=f.value;if(!t){t=o.queryMethod||o.query;if(t){c.isRefresh=!0;try{Promise.resolve(t({})).catch(e=>e).then(()=>{c.isRefresh=!1})}catch(e){c.isRefresh=!1}}else i&&(c.isRefresh=!0,i.triggerToolbarCommitEvent({code:o.code||"reload"},e).catch(()=>{}).then(()=>{c.isRefresh=!1}))}},R=({$event:e})=>{i?i.triggerZoomEvent(e):(0,_log.warnLog)("vxe.error.notProp",["[toolbar] zoom"])},P=()=>{var e;a()&&(e=m.connectTable,e)&&e.importData()},w=()=>{var e;a()&&(e=m.connectTable,e)&&e.openImport()},B=()=>{var e;a()&&(e=m.connectTable,e)&&e.exportData()},S=()=>{var e;a()&&(e=m.connectTable,e)&&e.openExport()},z=()=>{var e;a()&&(e=m.connectTable,e)&&e.print()},N=()=>{var e;a()&&(e=m.connectTable,e)&&e.openPrint()},l=(e,t,o)=>{switch(t.code){case"print":z();break;case"open_print":N();break;case"custom":j(e);break;case"export":B();break;case"open_export":S();break;case"import":P();break;case"open_import":w();break;case"zoom":R(e);break;case"refresh":I(e);break;default:o()}},U=(e,o)=>{let r=e.$event;var t=m.connectTable;let n=t,a=o.code;a&&l(e,o,()=>{var e,t;i?i.triggerToolbarBtnEvent(o,r):(t=commands.get(a),e={code:a,button:o,$table:n,$grid:g,$gantt:b,$event:r},t&&((t=t.tableCommandMethod||t.commandMethod)?t(e):(0,_log.errLog)("vxe.error.notCommands",["[toolbar] "+a])),_.dispatchEvent("button-click",e,r))})},y=(e,o)=>{let r=e.$event;var t=m.connectTable;let n=t,a=o.code;a&&l(e,o,()=>{var e,t;i?i.triggerToolbarTolEvent(o,r):(t=commands.get(a),e={code:a,button:null,tool:o,$table:n,$grid:g,$gantt:b,$event:r},t&&((t=t.tableCommandMethod||t.commandMethod)?t(e):(0,_log.errLog)("vxe.error.notCommands",["[toolbar] "+a])),_.dispatchEvent("tool-click",e,r))})};Object.assign(_,{dispatchEvent:(e,t,o)=>{r(e,createEvent(o,{$toolbar:_},t))},syncUpdate(e){m.connectTable=e.$table,c.columns=e.collectColumn,c.connectFlag++}});let E=(e,o)=>{e=e.dropdowns;return e?e.map((t,e)=>!1!==t.visible&&p?(0,_vue.h)(p,Object.assign(Object.assign({key:e},Object.assign({},t,{content:t.content||t.name,options:void 0})),{onClick:e=>(o?U:y)(e,t)})):(0,_vue.createCommentVNode)()):[]};return _.renderVN=()=>{var{perfect:e,loading:t,refresh:o,zoom:r,custom:n,className:a}=u,l=s.value;return(0,_vue.h)("div",{ref:d,class:["vxe-toolbar",a?_xeUtils.default.isFunction(a)?a({$toolbar:_}):a:"",{["size--"+l]:l,"is--perfect":e,"is--loading":t}]},[(0,_vue.h)("div",{class:"vxe-buttons--wrapper"},(()=>{var e=u.buttons,t=m.connectTable;let i=t;var t=v.buttons,o=v.buttonPrefix||v["button-prefix"],r=v.buttonSuffix||v["button-suffix"];let s=[];return e&&e.forEach((t,e)=>{var o,r,n,{dropdowns:a,buttonRender:l}=t;!1!==t.visible&&(o=l?renderer.get(l.name):null,l&&o&&o.renderToolbarButton?(r=o.toolbarButtonClassName,n={$grid:g,$gantt:b,$table:i,button:t},s.push((0,_vue.h)("span",{key:"br"+(t.code||e),class:["vxe-button--item",r?_xeUtils.default.isFunction(r)?r(n):r:""]},(0,_vn.getSlotVNs)(o.renderToolbarButton(l,n))))):p&&s.push((0,_vue.h)(p,Object.assign(Object.assign({key:"bd"+(t.code||e)},Object.assign({},t,{content:t.content||t.name,options:void 0})),{onClick:e=>U(e,t)}),a&&a.length?{dropdowns:()=>E(t,!0)}:{})))}),[(0,_vue.h)("div",{class:"vxe-button--prefix-wrapper"},o?(0,_vn.getSlotVNs)(o({buttons:e||[],$grid:g,$gantt:b,$table:i})):[]),(0,_vue.h)("div",{class:"vxe-button--item-wrapper"},t?(0,_vn.getSlotVNs)(t({buttons:e||[],$grid:g,$gantt:b,$table:i})):s),(0,_vue.h)("div",{class:"vxe-button--suffix-wrapper"},r?(0,_vn.getSlotVNs)(r({buttons:e||[],$grid:g,$gantt:b,$table:i})):[])]})()),(0,_vue.h)("div",{class:"vxe-tools--wrapper"},(()=>{var e=u.tools,t=m.connectTable;let s=t;var t=v.tools,o=v.toolPrefix||v["tool-prefix"],r=v.toolSuffix||v["tool-suffix"];let c=[];return e&&e.forEach((t,e)=>{var o,r,n,a,{dropdowns:l,toolRender:i}=t;!1!==t.visible&&(o=i?i.name:null,r=i?renderer.get(o):null,i&&r&&r.renderToolbarTool?(n=r.toolbarToolClassName,a={$grid:g,$gantt:b,$table:s,tool:t},c.push((0,_vue.h)("span",{key:o,class:["vxe-tool--item",n?_xeUtils.default.isFunction(n)?n(a):n:""]},(0,_vn.getSlotVNs)(r.renderToolbarTool(i,a))))):p&&c.push((0,_vue.h)(p,Object.assign(Object.assign({key:e},Object.assign({},t,{content:t.content||t.name,options:void 0})),{onClick:e=>y(e,t)}),l&&l.length?{dropdowns:()=>E(t,!1)}:{})))}),[(0,_vue.h)("div",{class:"vxe-tool--prefix-wrapper"},o?(0,_vn.getSlotVNs)(o({tools:e||[],$grid:g,$gantt:b,$table:s})):[]),(0,_vue.h)("div",{class:"vxe-tool--item-wrapper"},t?(0,_vn.getSlotVNs)(t({tools:e||[],$grid:g,$gantt:b,$table:s})):c),(0,_vue.h)("div",{class:"vxe-tool--suffix-wrapper"},r?(0,_vn.getSlotVNs)(r({tools:e||[],$grid:g,$gantt:b,$table:s})):[])]})()),(0,_vue.h)("div",{class:"vxe-tools--operate"},[u.import&&(a=x.value,p)?(0,_vue.h)(p,{key:"import",circle:!0,icon:a.icon||getIcon().TOOLBAR_TOOLS_IMPORT,title:getI18n("vxe.toolbar.import"),onClick:w}):(0,_vue.createCommentVNode)(),u.export&&(l=O.value,p)?(0,_vue.h)(p,{key:"export",circle:!0,icon:l.icon||getIcon().TOOLBAR_TOOLS_EXPORT,title:getI18n("vxe.toolbar.export"),onClick:S}):(0,_vue.createCommentVNode)(),u.print&&(e=h.value,p)?(0,_vue.h)(p,{key:"print",circle:!0,icon:e.icon||getIcon().TOOLBAR_TOOLS_PRINT,title:getI18n("vxe.toolbar.print"),onClick:N}):(0,_vue.createCommentVNode)(),o&&(t=f.value,p)?(0,_vue.h)(p,{key:"refresh",circle:!0,icon:c.isRefresh?t.iconLoading||getIcon().TOOLBAR_TOOLS_REFRESH_LOADING:t.icon||getIcon().TOOLBAR_TOOLS_REFRESH,title:getI18n("vxe.toolbar.refresh"),onClick:I}):(0,_vue.createCommentVNode)(),r&&i&&(a=T.value,i)&&p?(0,_vue.h)(p,{key:"zoom",circle:!0,icon:i.isMaximized()?a.iconOut||getIcon().TOOLBAR_TOOLS_MINIMIZE:a.iconIn||getIcon().TOOLBAR_TOOLS_FULLSCREEN,title:getI18n("vxe.toolbar.zoom"+(i.isMaximized()?"Out":"In")),onClick:R}):(0,_vue.createCommentVNode)(),n&&(l=C.value,e=$.value,o={},"manual"!==e&&("hover"===e?(o.onMouseenter=L,o.onMouseleave=k):o.onClick=j),p)?(0,_vue.h)(p,Object.assign({key:"custom",circle:!0,icon:l.icon||getIcon().TOOLBAR_TOOLS_CUSTOM,title:getI18n("vxe.toolbar.custom"),className:"vxe-toolbar-custom-target"},o)):(0,_vue.createCommentVNode)()])])},(0,_vue.nextTick)(()=>{var e=f.value,e=e.queryMethod||e.query,e=(!u.refresh||i||e||(0,_log.warnLog)("vxe.error.notFunc",["[toolbar] queryMethod"]),_xeUtils.default.isPlainObject(u.custom)&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] custom={...}","custom=boolean & custom-options={...}"]),_xeUtils.default.isPlainObject(u.print)&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] print={...}","print=boolean & print-options={...}"]),_xeUtils.default.isPlainObject(u.export)&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] export={...}","export=boolean & export-options={...}"]),_xeUtils.default.isPlainObject(u.import)&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] import={...}","import=boolean & import-options={...}"]),_xeUtils.default.isPlainObject(u.refresh)&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] refresh={...}","refresh=boolean & refresh-options={...}"]),_xeUtils.default.isPlainObject(u.refresh)&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] zoom={...}","zoom=boolean & zoom-options={...}"]),C.value);e.isFooter&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] toolbar.custom.isFooter","table.custom-config.showFooter"]),e.showFooter&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] toolbar.custom.showFooter","table.custom-config.showFooter"]),e.immediate&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] toolbar.custom.immediate","table.custom-config.immediate"]),e.trigger&&(0,_log.warnLog)("vxe.error.delProp",["[toolbar] toolbar.custom.trigger","table.custom-config.trigger"]),(u.refresh||u.import||u.export||u.print||u.zoom)&&!p&&(0,_log.errLog)("vxe.error.reqComp",["vxe-button"])}),(0,_vue.onBeforeUnmount)(()=>{_xeUtils.default.assign(c,createReactData()),_xeUtils.default.assign(m,createInternalData())}),_},render(){return this.renderVN()}});
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_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{warnLog,errLog}=(0,_log.createComponentLog)("toolbar"),{getConfig,getIcon,getI18n,renderer,commands,createEvent,useFns}=_ui.VxeUI;function createReactData(){return{isRefresh:!1,connectFlag:0,columns:[]}}function createInternalData(){return{connectTable:null}}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeToolbar",props:{loading:Boolean,refresh:[Boolean,Object],refreshOptions:Object,import:[Boolean,Object],importOptions:Object,export:[Boolean,Object],exportOptions:Object,print:[Boolean,Object],printOptions:Object,zoom:[Boolean,Object],zoomOptions:Object,custom:[Boolean,Object],customOptions: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:v,emit:r}=e;var t=_xeUtils.default.uniqueId();let p=_ui.VxeUI.getComponent("VxeButton"),g=(0,_vue.inject)("$xeGrid",null),b=(0,_vue.inject)("$xeGantt",null),l=g||b,s=useFns.useSize(u).computeSize,c=(0,_vue.reactive)(createReactData()),m=createInternalData(),d=(0,_vue.ref)(),o={refElem:d},f={xID:t,props:u,context:e,reactData:c,internalData:m,getRefMaps:()=>o};let _=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.refresh,!0),u.refreshOptions,u.refresh)),x=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.import,!0),u.importOptions,u.import)),O=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.export,!0),u.exportOptions,u.export)),h=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.print,!0),u.printOptions,u.print)),T=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.zoom,!0),u.zoomOptions,u.zoom)),C=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.custom,!0),u.customOptions,u.custom)),n=(0,_vue.computed)(()=>{var e=m.connectTable;if((c.connectFlag||e)&&e)return e=e.getComputeMaps().computeCustomOpts,e.value;return{trigger:""}}),$=(0,_vue.computed)(()=>n.value.trigger),a=()=>{var e=m.connectTable;if(e)return!0;errLog("vxe.error.barUnableLink")},L=({$event:e})=>{var t=m.connectTable;t&&t.triggerCustomEvent&&t.triggerCustomEvent(e)},j=({$event:e})=>{var t=m.connectTable;t&&t.customOpenEvent(e)},k=({$event:t})=>{var e=m.connectTable;let o=e;if(o){let e=o.reactData.customStore;e.activeBtn=!1,setTimeout(()=>{e.activeBtn||e.activeWrapper||o.customCloseEvent(t)},350)}},I=({$event:e})=>{var t=c.isRefresh,o=_.value;if(!t){t=o.queryMethod||o.query;if(t){c.isRefresh=!0;try{Promise.resolve(t({})).catch(e=>e).then(()=>{c.isRefresh=!1})}catch(e){c.isRefresh=!1}}else l&&(c.isRefresh=!0,l.triggerToolbarCommitEvent({code:o.code||"reload"},e).catch(()=>{}).then(()=>{c.isRefresh=!1}))}},R=({$event:e})=>{l?l.triggerZoomEvent(e):warnLog("vxe.error.notProp",["zoom"])},P=()=>{var e;a()&&(e=m.connectTable,e)&&e.importData()},w=()=>{var e;a()&&(e=m.connectTable,e)&&e.openImport()},B=()=>{var e;a()&&(e=m.connectTable,e)&&e.exportData()},S=()=>{var e;a()&&(e=m.connectTable,e)&&e.openExport()},z=()=>{var e;a()&&(e=m.connectTable,e)&&e.print()},N=()=>{var e;a()&&(e=m.connectTable,e)&&e.openPrint()},i=(e,t,o)=>{switch(t.code){case"print":z();break;case"open_print":N();break;case"custom":L(e);break;case"export":B();break;case"open_export":S();break;case"import":P();break;case"open_import":w();break;case"zoom":R(e);break;case"refresh":I(e);break;default:o()}},U=(e,o)=>{let r=e.$event;var t=m.connectTable;let n=t,a=o.code;a&&i(e,o,()=>{var e,t;l?l.triggerToolbarBtnEvent(o,r):(t=commands.get(a),e={code:a,button:o,$table:n,$grid:g,$gantt:b,$event:r},t&&((t=t.tableCommandMethod||t.commandMethod)?t(e):errLog("vxe.error.notCommands",[a])),f.dispatchEvent("button-click",e,r))})},y=(e,o)=>{let r=e.$event;var t=m.connectTable;let n=t,a=o.code;a&&i(e,o,()=>{var e,t;l?l.triggerToolbarTolEvent(o,r):(t=commands.get(a),e={code:a,button:null,tool:o,$table:n,$grid:g,$gantt:b,$event:r},t&&((t=t.tableCommandMethod||t.commandMethod)?t(e):errLog("vxe.error.notCommands",[a])),f.dispatchEvent("tool-click",e,r))})};Object.assign(f,{dispatchEvent:(e,t,o)=>{r(e,createEvent(o,{$toolbar:f},t))},syncUpdate(e){m.connectTable=e.$table,c.columns=e.collectColumn,c.connectFlag++}});let E=(e,o)=>{e=e.dropdowns;return e?e.map((t,e)=>!1!==t.visible&&p?(0,_vue.h)(p,Object.assign(Object.assign({key:e},Object.assign({},t,{content:t.content||t.name,options:void 0})),{onClick:e=>(o?U:y)(e,t)})):(0,_vue.createCommentVNode)()):[]};return f.renderVN=()=>{var{perfect:e,loading:t,refresh:o,zoom:r,custom:n,className:a}=u,i=s.value;return(0,_vue.h)("div",{ref:d,class:["vxe-toolbar",a?_xeUtils.default.isFunction(a)?a({$toolbar:f}):a:"",{["size--"+i]:i,"is--perfect":e,"is--loading":t}]},[(0,_vue.h)("div",{class:"vxe-buttons--wrapper"},(()=>{var e=u.buttons,t=m.connectTable;let l=t;var t=v.buttons,o=v.buttonPrefix||v["button-prefix"],r=v.buttonSuffix||v["button-suffix"];let s=[];return e&&e.forEach((t,e)=>{var o,r,n,{dropdowns:a,buttonRender:i}=t;!1!==t.visible&&(o=i?renderer.get(i.name):null,i&&o&&o.renderToolbarButton?(r=o.toolbarButtonClassName,n={$grid:g,$gantt:b,$table:l,button:t},s.push((0,_vue.h)("span",{key:"br"+(t.code||e),class:["vxe-button--item",r?_xeUtils.default.isFunction(r)?r(n):r:""]},(0,_vn.getSlotVNs)(o.renderToolbarButton(i,n))))):p&&s.push((0,_vue.h)(p,Object.assign(Object.assign({key:"bd"+(t.code||e)},Object.assign({},t,{content:t.content||t.name,options:void 0})),{onClick:e=>U(e,t)}),a&&a.length?{dropdowns:()=>E(t,!0)}:{})))}),[(0,_vue.h)("div",{class:"vxe-button--prefix-wrapper"},o?(0,_vn.getSlotVNs)(o({buttons:e||[],$grid:g,$gantt:b,$table:l})):[]),(0,_vue.h)("div",{class:"vxe-button--item-wrapper"},t?(0,_vn.getSlotVNs)(t({buttons:e||[],$grid:g,$gantt:b,$table:l})):s),(0,_vue.h)("div",{class:"vxe-button--suffix-wrapper"},r?(0,_vn.getSlotVNs)(r({buttons:e||[],$grid:g,$gantt:b,$table:l})):[])]})()),(0,_vue.h)("div",{class:"vxe-tools--wrapper"},(()=>{var e=u.tools,t=m.connectTable;let s=t;var t=v.tools,o=v.toolPrefix||v["tool-prefix"],r=v.toolSuffix||v["tool-suffix"];let c=[];return e&&e.forEach((t,e)=>{var o,r,n,a,{dropdowns:i,toolRender:l}=t;!1!==t.visible&&(o=l?l.name:null,r=l?renderer.get(o):null,l&&r&&r.renderToolbarTool?(n=r.toolbarToolClassName,a={$grid:g,$gantt:b,$table:s,tool:t},c.push((0,_vue.h)("span",{key:o,class:["vxe-tool--item",n?_xeUtils.default.isFunction(n)?n(a):n:""]},(0,_vn.getSlotVNs)(r.renderToolbarTool(l,a))))):p&&c.push((0,_vue.h)(p,Object.assign(Object.assign({key:e},Object.assign({},t,{content:t.content||t.name,options:void 0})),{onClick:e=>y(e,t)}),i&&i.length?{dropdowns:()=>E(t,!1)}:{})))}),[(0,_vue.h)("div",{class:"vxe-tool--prefix-wrapper"},o?(0,_vn.getSlotVNs)(o({tools:e||[],$grid:g,$gantt:b,$table:s})):[]),(0,_vue.h)("div",{class:"vxe-tool--item-wrapper"},t?(0,_vn.getSlotVNs)(t({tools:e||[],$grid:g,$gantt:b,$table:s})):c),(0,_vue.h)("div",{class:"vxe-tool--suffix-wrapper"},r?(0,_vn.getSlotVNs)(r({tools:e||[],$grid:g,$gantt:b,$table:s})):[])]})()),(0,_vue.h)("div",{class:"vxe-tools--operate"},[u.import&&(a=x.value,p)?(0,_vue.h)(p,{key:"import",circle:!0,icon:a.icon||getIcon().TOOLBAR_TOOLS_IMPORT,title:getI18n("vxe.toolbar.import"),onClick:w}):(0,_vue.createCommentVNode)(),u.export&&(i=O.value,p)?(0,_vue.h)(p,{key:"export",circle:!0,icon:i.icon||getIcon().TOOLBAR_TOOLS_EXPORT,title:getI18n("vxe.toolbar.export"),onClick:S}):(0,_vue.createCommentVNode)(),u.print&&(e=h.value,p)?(0,_vue.h)(p,{key:"print",circle:!0,icon:e.icon||getIcon().TOOLBAR_TOOLS_PRINT,title:getI18n("vxe.toolbar.print"),onClick:N}):(0,_vue.createCommentVNode)(),o&&(t=_.value,p)?(0,_vue.h)(p,{key:"refresh",circle:!0,icon:c.isRefresh?t.iconLoading||getIcon().TOOLBAR_TOOLS_REFRESH_LOADING:t.icon||getIcon().TOOLBAR_TOOLS_REFRESH,title:getI18n("vxe.toolbar.refresh"),onClick:I}):(0,_vue.createCommentVNode)(),r&&l&&(a=T.value,l)&&p?(0,_vue.h)(p,{key:"zoom",circle:!0,icon:l.isMaximized()?a.iconOut||getIcon().TOOLBAR_TOOLS_MINIMIZE:a.iconIn||getIcon().TOOLBAR_TOOLS_FULLSCREEN,title:getI18n("vxe.toolbar.zoom"+(l.isMaximized()?"Out":"In")),onClick:R}):(0,_vue.createCommentVNode)(),n&&(i=C.value,e=$.value,o={},"manual"!==e&&("hover"===e?(o.onMouseenter=j,o.onMouseleave=k):o.onClick=L),p)?(0,_vue.h)(p,Object.assign({key:"custom",circle:!0,icon:i.icon||getIcon().TOOLBAR_TOOLS_CUSTOM,title:getI18n("vxe.toolbar.custom"),className:"vxe-toolbar-custom-target"},o)):(0,_vue.createCommentVNode)()])])},(0,_vue.nextTick)(()=>{var e=_.value,e=e.queryMethod||e.query,e=(!u.refresh||l||e||warnLog("vxe.error.notFunc",["queryMethod"]),_xeUtils.default.isPlainObject(u.custom)&&warnLog("vxe.error.delProp",["custom={...}","custom=boolean & custom-options={...}"]),_xeUtils.default.isPlainObject(u.print)&&warnLog("vxe.error.delProp",["print={...}","print=boolean & print-options={...}"]),_xeUtils.default.isPlainObject(u.export)&&warnLog("vxe.error.delProp",["export={...}","export=boolean & export-options={...}"]),_xeUtils.default.isPlainObject(u.import)&&warnLog("vxe.error.delProp",["import={...}","import=boolean & import-options={...}"]),_xeUtils.default.isPlainObject(u.refresh)&&warnLog("vxe.error.delProp",["refresh={...}","refresh=boolean & refresh-options={...}"]),_xeUtils.default.isPlainObject(u.refresh)&&warnLog("vxe.error.delProp",["zoom={...}","zoom=boolean & zoom-options={...}"]),C.value);e.isFooter&&warnLog("vxe.error.delProp",["toolbar.custom.isFooter","table.custom-config.showFooter"]),e.showFooter&&warnLog("vxe.error.delProp",["toolbar.custom.showFooter","table.custom-config.showFooter"]),e.immediate&&warnLog("vxe.error.delProp",["toolbar.custom.immediate","table.custom-config.immediate"]),e.trigger&&warnLog("vxe.error.delProp",["toolbar.custom.trigger","table.custom-config.trigger"]),(u.refresh||u.import||u.export||u.print||u.zoom)&&!p&&errLog("vxe.error.reqComp",["vxe-button"])}),(0,_vue.onBeforeUnmount)(()=>{_xeUtils.default.assign(c,createReactData()),_xeUtils.default.assign(m,createInternalData())}),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.19.
|
|
16
|
+
const version = exports.version = "4.19.17";
|
|
17
17
|
_core.VxeUI.version = version;
|
|
18
18
|
_core.VxeUI.tableVersion = version;
|
|
19
19
|
_core.VxeUI.setConfig({
|
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.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.19.
|
|
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.19.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,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},currentRowConfig:{strict:!0},currentColumnConfig:{strict:!0},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,defaultPlacement:"top"},headerTooltipConfig:{enterable:!0},footerTooltipConfig:{enterable:!0},validConfig:{showErrorMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{autoOptions:{isCalcHeader:!0,isCalcBody:!0,isCalcFooter:!0},maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},menuConfig:{destroyOnClose:!0},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showSortDragButton:!0,showFooter:!0,placement:"top-right",storeOptions:{visible:!0,resizable:!0,sort:!0,fixed:!0},modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!0,iconLayout:"vertical"},filterConfig:{destroyOnClose:!0,multiple:!0,showIcon:!0,maxHeight:280},floatingFilterConfig:{},aggregateConfig:{padding:!0,placement:"left",rowField:"id",parentField:"_X_ROW_PARENT_KEY",childrenField:"_X_ROW_CHILDREN",mapChildrenField:"_X_ROW_CHILD_LIST",indent:20,showIcon:!0,maxGroupSize:4,showAggFuncTitle:!0},treeConfig:{padding:!0,rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0,showRootLine:!0},expandConfig:{showIcon:!0,mode:"fixed"},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isAll:!0,isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{gt:24,preSize:1,oSize:0},virtualYConfig:{gt:100,preSize:1,oSize:0},scrollbarConfig:{x:{visible:!0},y:{visible:!0}},undoRedoHistoryConfig:{stackSize:50}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:"list",result:"result",total:"page.total",footerData:"footerData",message:"message"}}},toolbar:{},gantt:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_CHECKBOX_DISABLED_UNCHECKED:iconPrefix+"checkbox-unchecked-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_RADIO_DISABLED_UNCHECKED:iconPrefix+"radio-unchecked-fill",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_MENU_OPTION_LOADING:iconPrefix+"repeat roll",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_AGG_GROUP:iconPrefix+"grouping",TABLE_DRAG_STATUS_AGG_VALUES:iconPrefix+"values",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TABLE_ROW_GROUP_OPEN:iconPrefix+"arrow-right rotate90",TABLE_ROW_GROUP_CLOSE:iconPrefix+"arrow-right",TABLE_AGGREGATE_GROUPING:iconPrefix+"grouping",TABLE_AGGREGATE_VALUES:iconPrefix+"values",TABLE_AGGREGATE_SORT:iconPrefix+"drag-handle",TABLE_AGGREGATE_DELETE:iconPrefix+"close",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,hooks=exports.hooks=_core.VxeUI.hooks,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;
|
package/lib/ui/src/log.js
CHANGED
|
@@ -3,11 +3,21 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
+
exports.createComponentLog = createComponentLog;
|
|
6
7
|
exports.warnLog = exports.errLog = void 0;
|
|
7
8
|
var _core = require("@vxe-ui/core");
|
|
8
9
|
const {
|
|
9
10
|
log
|
|
10
11
|
} = _core.VxeUI;
|
|
11
|
-
const
|
|
12
|
-
|
|
13
|
-
const
|
|
12
|
+
const tableVersion = `table v${"4.19.17"}`;
|
|
13
|
+
function createComponentLog(name) {
|
|
14
|
+
const uiVersion = _core.VxeUI.uiVersion ? `ui v${_core.VxeUI.uiVersion}` : '';
|
|
15
|
+
const ganttVersion = _core.VxeUI.ganttVersion ? `gantt v${_core.VxeUI.ganttVersion}` : '';
|
|
16
|
+
const designVersion = _core.VxeUI.designVersion ? `design v${_core.VxeUI.designVersion}` : '';
|
|
17
|
+
return {
|
|
18
|
+
warnLog: log.create('warn', uiVersion + tableVersion + ganttVersion + designVersion + '] [' + name),
|
|
19
|
+
errLog: log.create('error', uiVersion + tableVersion + ganttVersion + designVersion + '] [' + name)
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
const warnLog = exports.warnLog = log.create('warn', tableVersion);
|
|
23
|
+
const errLog = exports.errLog = log.create('error', tableVersion);
|
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,
|
|
1
|
+
Object.defineProperty(exports,"__esModule",{value:!0}),exports.createComponentLog=createComponentLog,exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,tableVersion="table v4.19.17";function createComponentLog(e){var r=_core.VxeUI.uiVersion?"ui v"+_core.VxeUI.uiVersion:"",o=_core.VxeUI.ganttVersion?"gantt v"+_core.VxeUI.ganttVersion:"",t=_core.VxeUI.designVersion?"design v"+_core.VxeUI.designVersion:"";return{warnLog:log.create("warn",r+tableVersion+o+t+"] ["+e),errLog:log.create("error",r+tableVersion+o+t+"] ["+e)}}let warnLog=exports.warnLog=log.create("warn",tableVersion),errLog=exports.errLog=log.create("error",tableVersion);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vxe-table",
|
|
3
|
-
"version": "4.19.
|
|
3
|
+
"version": "4.19.17",
|
|
4
4
|
"description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"update": "npm install --legacy-peer-deps",
|
|
@@ -69,7 +69,7 @@
|
|
|
69
69
|
"typescript": "~4.7.4",
|
|
70
70
|
"vue": "3.4.27",
|
|
71
71
|
"vue-router": "~4.5.1",
|
|
72
|
-
"vxe-pc-ui": "4.15.
|
|
72
|
+
"vxe-pc-ui": "4.15.4"
|
|
73
73
|
},
|
|
74
74
|
"vetur": {
|
|
75
75
|
"tags": "helper/vetur/tags.json",
|
|
@@ -7,7 +7,7 @@ import { VxeUI } from '../../ui'
|
|
|
7
7
|
import { gridProps } from './props'
|
|
8
8
|
import { gridEmits } from './emits'
|
|
9
9
|
import { getSlotVNs } from '../../ui/src/vn'
|
|
10
|
-
import {
|
|
10
|
+
import { createComponentLog } from '../../ui/src/log'
|
|
11
11
|
import { tableEmits } from '../../table/src/emits'
|
|
12
12
|
import { tableProps } from '../../table/src/props'
|
|
13
13
|
import VxeTableComponent from '../../table/src/table'
|
|
@@ -16,6 +16,8 @@ import VxeToolbarComponent from '../../toolbar/src/toolbar'
|
|
|
16
16
|
import type { ValueOf, VxeFormEvents, VxeFormInstance, VxePagerEvents, VxeFormItemProps, VxePagerInstance, VxeComponentStyleType } from 'vxe-pc-ui'
|
|
17
17
|
import type { VxeTableMethods, VxeGridConstructor, VxeGridEmits, GridReactData, GridInternalData, VxeGridPropTypes, VxeToolbarPropTypes, GridMethods, GridPrivateMethods, VxeGridPrivateComputed, VxeGridPrivateMethods, VxeToolbarInstance, GridPrivateRef, VxeTableProps, VxeTableConstructor, VxeTablePrivateMethods, VxeTableEvents, VxeTableDefines, VxeTableEventProps, VxeGridProps, VxeGridDefines } from '../../../types'
|
|
18
18
|
|
|
19
|
+
const { warnLog, errLog } = createComponentLog('grid')
|
|
20
|
+
|
|
19
21
|
const { getConfig, getI18n, commands, hooks, useFns, createEvent, globalEvents, GLOBAL_EVENT_KEYS, renderEmptyElement } = VxeUI
|
|
20
22
|
|
|
21
23
|
const tableComponentPropKeys = Object.keys(tableProps) as (keyof VxeTableProps)[]
|
|
@@ -531,7 +533,7 @@ export default defineVxeComponent({
|
|
|
531
533
|
if (slots[funcSlot]) {
|
|
532
534
|
return slots[funcSlot]
|
|
533
535
|
} else {
|
|
534
|
-
errLog('vxe.error.notSlot', [
|
|
536
|
+
errLog('vxe.error.notSlot', [funcSlot])
|
|
535
537
|
}
|
|
536
538
|
} else {
|
|
537
539
|
return funcSlot
|
|
@@ -548,7 +550,7 @@ export default defineVxeComponent({
|
|
|
548
550
|
if (slots[slotFunc]) {
|
|
549
551
|
slotConf[slotKey] = slots[slotFunc]
|
|
550
552
|
} else {
|
|
551
|
-
errLog('vxe.error.notSlot', [
|
|
553
|
+
errLog('vxe.error.notSlot', [slotFunc])
|
|
552
554
|
}
|
|
553
555
|
} else {
|
|
554
556
|
slotConf[slotKey] = slotFunc
|
|
@@ -857,7 +859,7 @@ export default defineVxeComponent({
|
|
|
857
859
|
childVNs.push(renderPager())
|
|
858
860
|
break
|
|
859
861
|
default:
|
|
860
|
-
errLog('vxe.error.notProp', [`
|
|
862
|
+
errLog('vxe.error.notProp', [`layouts -> ${key}`])
|
|
861
863
|
break
|
|
862
864
|
}
|
|
863
865
|
})
|
|
@@ -1196,7 +1198,7 @@ export default defineVxeComponent({
|
|
|
1196
1198
|
return { status: false }
|
|
1197
1199
|
})
|
|
1198
1200
|
} else {
|
|
1199
|
-
errLog('vxe.error.notFunc', ['
|
|
1201
|
+
errLog('vxe.error.notFunc', ['proxy-config.ajax.query'])
|
|
1200
1202
|
}
|
|
1201
1203
|
break
|
|
1202
1204
|
}
|
|
@@ -1235,7 +1237,7 @@ export default defineVxeComponent({
|
|
|
1235
1237
|
return { status: false }
|
|
1236
1238
|
})
|
|
1237
1239
|
} else {
|
|
1238
|
-
errLog('vxe.error.notFunc', ['
|
|
1240
|
+
errLog('vxe.error.notFunc', ['proxy-config.ajax.queryFooter'])
|
|
1239
1241
|
}
|
|
1240
1242
|
break
|
|
1241
1243
|
}
|
|
@@ -1306,7 +1308,7 @@ export default defineVxeComponent({
|
|
|
1306
1308
|
}
|
|
1307
1309
|
}
|
|
1308
1310
|
} else {
|
|
1309
|
-
errLog('vxe.error.notFunc', ['
|
|
1311
|
+
errLog('vxe.error.notFunc', ['proxy-config.ajax.delete'])
|
|
1310
1312
|
}
|
|
1311
1313
|
break
|
|
1312
1314
|
}
|
|
@@ -1390,7 +1392,7 @@ export default defineVxeComponent({
|
|
|
1390
1392
|
}
|
|
1391
1393
|
})
|
|
1392
1394
|
} else {
|
|
1393
|
-
errLog('vxe.error.notFunc', ['
|
|
1395
|
+
errLog('vxe.error.notFunc', ['proxy-config.ajax.save'])
|
|
1394
1396
|
}
|
|
1395
1397
|
break
|
|
1396
1398
|
}
|
|
@@ -1401,7 +1403,7 @@ export default defineVxeComponent({
|
|
|
1401
1403
|
if (tCommandMethod) {
|
|
1402
1404
|
tCommandMethod({ code, button, $grid: $xeGrid, $table: $xeTable, $gantt: null }, ...args)
|
|
1403
1405
|
} else {
|
|
1404
|
-
errLog('vxe.error.notCommands', [
|
|
1406
|
+
errLog('vxe.error.notCommands', [code])
|
|
1405
1407
|
}
|
|
1406
1408
|
}
|
|
1407
1409
|
}
|
|
@@ -1641,7 +1643,7 @@ export default defineVxeComponent({
|
|
|
1641
1643
|
XEUtils.each(column.slots, (func) => {
|
|
1642
1644
|
if (!XEUtils.isFunction(func)) {
|
|
1643
1645
|
if (!slots[func]) {
|
|
1644
|
-
errLog('vxe.error.notSlot', [
|
|
1646
|
+
errLog('vxe.error.notSlot', [func])
|
|
1645
1647
|
}
|
|
1646
1648
|
}
|
|
1647
1649
|
})
|
|
@@ -1741,7 +1743,7 @@ export default defineVxeComponent({
|
|
|
1741
1743
|
// }
|
|
1742
1744
|
|
|
1743
1745
|
if (proxyOpts.props) {
|
|
1744
|
-
warnLog('vxe.error.delProp', ['
|
|
1746
|
+
warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
|
|
1745
1747
|
}
|
|
1746
1748
|
|
|
1747
1749
|
if (columns && columns.length) {
|
|
@@ -3,12 +3,14 @@ import { defineVxeComponent } from '../../../ui/src/comp'
|
|
|
3
3
|
import { VxeUI } from '../../../ui'
|
|
4
4
|
import { formatText } from '../../../ui/src/utils'
|
|
5
5
|
import { getTpImg, addClass, removeClass, hasControlKey } from '../../../ui/src/dom'
|
|
6
|
-
import {
|
|
6
|
+
import { createComponentLog } from '../../../ui/src/log'
|
|
7
7
|
import XEUtils from 'xe-utils'
|
|
8
8
|
|
|
9
9
|
import type { VxeButtonEvents, VxeButtonDefines } from 'vxe-pc-ui'
|
|
10
10
|
import type { VxeTableDefines, VxeTablePrivateMethods, VxeTableConstructor, VxeTableMethods, VxeColumnPropTypes, VxeTableCustomPanelConstructor, TableCustomPanelReactData, TableCustomPanelInternalData, TableCustomPanelPrivateRef, TableCustomPanelPrivateComputed } from '../../../../types'
|
|
11
11
|
|
|
12
|
+
const { errLog } = createComponentLog('table')
|
|
13
|
+
|
|
12
14
|
const { getI18n, getIcon, renderEmptyElement } = VxeUI
|
|
13
15
|
|
|
14
16
|
export function createInternalData (): TableCustomPanelInternalData {
|
|
@@ -4,10 +4,12 @@ import { VxeUI } from '../../../ui'
|
|
|
4
4
|
import { isEnableConf } from '../../../ui/src/utils'
|
|
5
5
|
import { getCellValue, setCellValue, getRowid } from '../../src/util'
|
|
6
6
|
import { removeClass, addClass } from '../../../ui/src/dom'
|
|
7
|
-
import {
|
|
7
|
+
import { createComponentLog } from '../../../ui/src/log'
|
|
8
8
|
|
|
9
9
|
import type { TableEditMethods, TableEditPrivateMethods, VxeTableDefines } from '../../../../types'
|
|
10
10
|
|
|
11
|
+
const { warnLog, errLog } = createComponentLog('table')
|
|
12
|
+
|
|
11
13
|
const { getConfig, renderer, hooks, getI18n } = VxeUI
|
|
12
14
|
|
|
13
15
|
const tableEditMethodKeys: (keyof TableEditMethods)[] = ['insert', 'insertAt', 'insertNextAt', 'insertChild', 'insertChildAt', 'insertChildNextAt', 'remove', 'removeCheckboxRow', 'removeRadioRow', 'removeCurrentRow', 'getRecordset', 'getInsertRecords', 'getRemoveRecords', 'getUpdateRecords', 'getEditRecord', 'getActiveRecord', 'getEditCell', 'getSelectedCell', 'clearEdit', 'clearActived', 'clearSelected', 'isEditByRow', 'isActiveByRow', 'setEditRow', 'setActiveRow', 'setEditCell', 'setActiveCell', 'setSelectCell']
|
|
@@ -3,10 +3,12 @@ import { defineVxeComponent } from '../../../ui/src/comp'
|
|
|
3
3
|
import { VxeUI } from '../../../ui'
|
|
4
4
|
import XEUtils from 'xe-utils'
|
|
5
5
|
import { formatText } from '../../../ui/src/utils'
|
|
6
|
-
import {
|
|
6
|
+
import { createComponentLog } from '../../../ui/src/log'
|
|
7
7
|
|
|
8
8
|
import type { VxeTablePrivateMethods, VxeTableConstructor, VxeTableMethods, VxeTableDefines } from '../../../../types'
|
|
9
9
|
|
|
10
|
+
const { errLog } = createComponentLog('table')
|
|
11
|
+
|
|
10
12
|
const { getI18n, getIcon, renderEmptyElement } = VxeUI
|
|
11
13
|
|
|
12
14
|
export default defineVxeComponent({
|
|
@@ -5,10 +5,12 @@ import { isColumnInfo, getCellValue, createHandleGetRowId } from '../../src/util
|
|
|
5
5
|
import { parseFile, formatText, eqEmptyValue } from '../../../ui/src/utils'
|
|
6
6
|
import { hasClass } from '../../../ui/src/dom'
|
|
7
7
|
import { createHtmlPage, getExportBlobByContent } from './util'
|
|
8
|
-
import {
|
|
8
|
+
import { createComponentLog } from '../../../ui/src/log'
|
|
9
9
|
|
|
10
10
|
import type { VxeTablePropTypes, VxeColumnPropTypes, TableExportMethods, VxeGridPropTypes, VxeTableDefines, VxeTableConstructor, VxeTablePrivateMethods } from '../../../../types'
|
|
11
11
|
|
|
12
|
+
const { warnLog, errLog } = createComponentLog('table')
|
|
13
|
+
|
|
12
14
|
const { getI18n, hooks, renderer } = VxeUI
|
|
13
15
|
|
|
14
16
|
let htmlCellElem: any
|
|
@@ -715,7 +717,7 @@ hooks.add('tableExportModule', {
|
|
|
715
717
|
const toHtml = (opts: VxeTablePropTypes.ExportHandleOptions, columns: VxeTableDefines.ColumnInfo[], datas: any[]) => {
|
|
716
718
|
const { id, border, treeConfig, headerAlign: allHeaderAlign, align: allAlign, footerAlign: allFooterAlign, showOverflow: allColumnOverflow, showHeaderOverflow: allColumnHeaderOverflow } = props
|
|
717
719
|
const { isAllSelected, isIndeterminate } = reactData
|
|
718
|
-
const { mergeBodyCellMaps } = internalData
|
|
720
|
+
const { mergeBodyCellMaps, mergeFooterCellMaps } = internalData
|
|
719
721
|
const treeOpts = computeTreeOpts.value
|
|
720
722
|
const { print: isPrint, isHeader, isFooter, isColgroup, isMerge, colgroups, original } = opts
|
|
721
723
|
const allCls = 'check-all'
|
|
@@ -856,16 +858,35 @@ hooks.add('tableExportModule', {
|
|
|
856
858
|
const footers = getFooterData($xeTable, opts, footerTableData)
|
|
857
859
|
if (footers.length) {
|
|
858
860
|
tables.push('<tfoot>')
|
|
859
|
-
footers.forEach((row
|
|
861
|
+
footers.forEach((row, rIndex) => {
|
|
860
862
|
tables.push(
|
|
861
|
-
`<tr>${columns.map((column
|
|
863
|
+
`<tr>${columns.map((column) => {
|
|
862
864
|
const footAlign = column.footerAlign || column.align || allFooterAlign || allAlign
|
|
863
865
|
const classNames = hasEllipsis(column, 'showOverflow', allColumnOverflow) ? ['col--ellipsis'] : []
|
|
864
866
|
const cellValue = getFooterCellValue(opts, row, column)
|
|
867
|
+
let rowSpan = 1
|
|
868
|
+
let colSpan = 1
|
|
869
|
+
if (isMerge) {
|
|
870
|
+
const _rowIndex = rIndex
|
|
871
|
+
const _columnIndex = $xeTable.getVTColumnIndex(column)
|
|
872
|
+
const spanRest = mergeFooterCellMaps[`${_rowIndex}:${_columnIndex}`]
|
|
873
|
+
if (spanRest) {
|
|
874
|
+
const { rowspan, colspan } = spanRest
|
|
875
|
+
if (!rowspan || !colspan) {
|
|
876
|
+
return ''
|
|
877
|
+
}
|
|
878
|
+
if (rowspan > 1) {
|
|
879
|
+
rowSpan = rowspan
|
|
880
|
+
}
|
|
881
|
+
if (colspan > 1) {
|
|
882
|
+
colSpan = colspan
|
|
883
|
+
}
|
|
884
|
+
}
|
|
885
|
+
}
|
|
865
886
|
if (footAlign) {
|
|
866
887
|
classNames.push(`col--${footAlign}`)
|
|
867
888
|
}
|
|
868
|
-
return `<td class="${classNames.join(' ')}" title="${cellValue}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}>${formatText(cellValue, true)}</div></td>`
|
|
889
|
+
return `<td class="${classNames.join(' ')}" rowspan="${rowSpan}" colspan="${colSpan}" title="${cellValue}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}>${formatText(cellValue, true)}</div></td>`
|
|
869
890
|
}).join('')}</tr>`
|
|
870
891
|
)
|
|
871
892
|
})
|
|
@@ -3,10 +3,12 @@ import { defineVxeComponent } from '../../../ui/src/comp'
|
|
|
3
3
|
import { VxeUI } from '../../../ui'
|
|
4
4
|
import XEUtils from 'xe-utils'
|
|
5
5
|
import { parseFile } from '../../../ui/src/utils'
|
|
6
|
-
import {
|
|
6
|
+
import { createComponentLog } from '../../../ui/src/log'
|
|
7
7
|
|
|
8
8
|
import type { VxeTablePrivateMethods, VxeTableConstructor, VxeTableMethods, VxeTableDefines } from '../../../../types'
|
|
9
9
|
|
|
10
|
+
const { errLog } = createComponentLog('table')
|
|
11
|
+
|
|
10
12
|
const { getI18n, getIcon, renderEmptyElement } = VxeUI
|
|
11
13
|
|
|
12
14
|
export default defineVxeComponent({
|
|
@@ -4,12 +4,14 @@ import { VxeUI } from '../../../ui'
|
|
|
4
4
|
import { formatText, isEnableConf } from '../../../ui/src/utils'
|
|
5
5
|
import { getPropClass, toCssUnit } from '../../../ui/src/dom'
|
|
6
6
|
import { getSlotVNs } from '../../../ui/src/vn'
|
|
7
|
-
import {
|
|
7
|
+
import { createComponentLog } from '../../../ui/src/log'
|
|
8
8
|
import XEUtils from 'xe-utils'
|
|
9
9
|
|
|
10
10
|
import type { VxeGlobalRendererOptions } from 'vxe-pc-ui'
|
|
11
11
|
import type { VxeTableConstructor, VxeTableMethods, VxeTablePrivateMethods, VxeColumnPropTypes, VxeTableDefines } from '../../../../types'
|
|
12
12
|
|
|
13
|
+
const { warnLog } = createComponentLog('table')
|
|
14
|
+
|
|
13
15
|
const { getI18n, getIcon, renderer, renderEmptyElement } = VxeUI
|
|
14
16
|
|
|
15
17
|
export default defineVxeComponent({
|
|
@@ -4,10 +4,12 @@ import { VxeUI } from '../../../ui'
|
|
|
4
4
|
import { eqEmptyValue, getFuncText } from '../../../ui/src/utils'
|
|
5
5
|
import { scrollToView } from '../../../ui/src/dom'
|
|
6
6
|
import { handleFieldOrColumn, getRowid } from '../../src/util'
|
|
7
|
-
import {
|
|
7
|
+
import { createComponentLog } from '../../../ui/src/log'
|
|
8
8
|
|
|
9
9
|
import type { TableValidatorMethods, TableValidatorPrivateMethods, VxeTableDefines } from '../../../../types'
|
|
10
10
|
|
|
11
|
+
const { warnLog, errLog } = createComponentLog('table')
|
|
12
|
+
|
|
11
13
|
const { getConfig, validators, hooks } = VxeUI
|
|
12
14
|
|
|
13
15
|
/**
|
|
@@ -4,10 +4,12 @@ import { VxeUI } from '../../ui'
|
|
|
4
4
|
import { getCellValue, setCellValue } from '../../table/src/util'
|
|
5
5
|
import { getFuncText, formatText, isEmptyValue } from '../../ui/src/utils'
|
|
6
6
|
import { getOnName, getModelEvent, getChangeEvent, hasInputType } from '../../ui/src/vn'
|
|
7
|
-
import {
|
|
7
|
+
import { createComponentLog } from '../../ui/src/log'
|
|
8
8
|
|
|
9
9
|
import type { VxeGlobalRendererHandles, VxeColumnPropTypes, VxeTableConstructor, VxeTablePrivateMethods, VxeTableDefines } from '../../../types'
|
|
10
10
|
|
|
11
|
+
const { errLog } = createComponentLog('table')
|
|
12
|
+
|
|
11
13
|
const { getConfig, renderer, getI18n, getComponent } = VxeUI
|
|
12
14
|
|
|
13
15
|
const componentDefaultModelProp = 'modelValue'
|
|
@@ -3,10 +3,12 @@ import { VxeUI } from '../../ui'
|
|
|
3
3
|
import { toFilters } from './util'
|
|
4
4
|
import { isEnableConf, getFuncText } from '../../ui/src/utils'
|
|
5
5
|
import { isPx } from '../../ui/src/dom'
|
|
6
|
-
import {
|
|
6
|
+
import { createComponentLog } from '../../ui/src/log'
|
|
7
7
|
|
|
8
8
|
import type { VxeTableConstructor, VxeTablePrivateMethods, VxeTableDefines, VxeColumnProps } from '../../../types'
|
|
9
9
|
|
|
10
|
+
const { warnLog, errLog } = createComponentLog('table')
|
|
11
|
+
|
|
10
12
|
const { getI18n, formats, renderer } = VxeUI
|
|
11
13
|
|
|
12
14
|
export class ColumnInfo {
|
|
@@ -263,6 +263,8 @@ export default defineVxeComponent({
|
|
|
263
263
|
const cellOpts = computeCellOpts.value
|
|
264
264
|
const defaultRowHeight = computeDefaultRowHeight.value
|
|
265
265
|
const headerCellOpts = computeHeaderCellOpts.value
|
|
266
|
+
const floatingFilterOpts = computeFloatingFilterOpts.value
|
|
267
|
+
const { cellClassName } = floatingFilterOpts
|
|
266
268
|
const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight
|
|
267
269
|
|
|
268
270
|
return cols.map((column, $columnIndex) => {
|
|
@@ -322,7 +324,7 @@ export default defineVxeComponent({
|
|
|
322
324
|
}
|
|
323
325
|
|
|
324
326
|
return h('th', {
|
|
325
|
-
class: ['vxe-table--column vxe-header--column', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
|
|
327
|
+
class: ['vxe-table--column vxe-header--column is--floating-filters', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
|
|
326
328
|
[`col--${headAlign}`]: headAlign,
|
|
327
329
|
[`col--${type}`]: type,
|
|
328
330
|
'col--last': isLastColumn,
|
|
@@ -338,7 +340,7 @@ export default defineVxeComponent({
|
|
|
338
340
|
...thAttrs
|
|
339
341
|
}, [
|
|
340
342
|
h('div', {
|
|
341
|
-
class: ['vxe-cell', {
|
|
343
|
+
class: ['vxe-cell', '' + (cellClassName || ''), {
|
|
342
344
|
'c--title': showTitle,
|
|
343
345
|
'c--tooltip': showTooltip,
|
|
344
346
|
'c--ellipsis': showEllipsis
|
|
@@ -382,7 +384,8 @@ export default defineVxeComponent({
|
|
|
382
384
|
h('tr', {
|
|
383
385
|
key: 'ff',
|
|
384
386
|
class: [
|
|
385
|
-
'vxe-header--row'
|
|
387
|
+
'vxe-header--row is--floating-filters',
|
|
388
|
+
'' + (floatingFilterOpts.rowClassName || '')
|
|
386
389
|
]
|
|
387
390
|
}, renderFilterRows(isOptimizeMode, renderColumnList))
|
|
388
391
|
)
|