vxe-table 4.6.2 → 4.6.4

package/lib/toolbar/src/toolbar.js

@@ -480,16 +480,16 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const customOpts = computeCustomOpts.value;
       if (process.env.NODE_ENV === 'development') {
         if (customOpts.isFooter) {
-          (0, _log.warnLog)('vxe.error.delProp', ['custom.isFooter', 'custom-config.showFooter']);
+          (0, _log.warnLog)('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
         }
         if (customOpts.showFooter) {
-          (0, _log.warnLog)('vxe.error.delProp', ['custom.showFooter', 'custom-config.showFooter']);
+          (0, _log.warnLog)('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
         }
         if (customOpts.immediate) {
-          (0, _log.warnLog)('vxe.error.delProp', ['custom.immediate', 'custom-config.immediate']);
+          (0, _log.warnLog)('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
         }
         if (customOpts.trigger) {
-          (0, _log.warnLog)('vxe.error.delProp', ['custom.trigger', 'custom-config.trigger']);
+          (0, _log.warnLog)('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
         }
       }
     });

package/lib/toolbar/src/toolbar.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_size=require("../../hooks/size"),_log=require("../../tools/log"),_vn=require("../../tools/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default=exports.default=(0,_vue.defineComponent)({name:"VxeToolbar",props:{loading:Boolean,refresh:[Boolean,Object],import:[Boolean,Object],export:[Boolean,Object],print:[Boolean,Object],zoom:[Boolean,Object],custom:[Boolean,Object],buttons:{type:Array,default:()=>_conf.default.toolbar.buttons},tools:{type:Array,default:()=>_conf.default.toolbar.tools},perfect:{type:Boolean,default:()=>_conf.default.toolbar.perfect},size:{type:String,default:()=>_conf.default.toolbar.size||_conf.default.size},className:[String,Function]},emits:["button-click","tool-click"],setup(s,e){const{slots:c,emit:r}=e;var o=_xeUtils.default.uniqueId();const u=(0,_size.useSize)(s),i=(0,_vue.reactive)({isRefresh:!1,columns:[]}),v=(0,_vue.ref)(),t={refElem:v},d={xID:o,props:s,context:e,reactData:i,getRefMaps:()=>t};const _=(0,_vue.inject)("$xegrid",null);let m;const n=(0,_vue.ref)(0),f=(0,_vue.computed)(()=>Object.assign({},_conf.default.toolbar.refresh,s.refresh)),p=(0,_vue.computed)(()=>Object.assign({},_conf.default.toolbar.import,s.import)),b=(0,_vue.computed)(()=>Object.assign({},_conf.default.toolbar.export,s.export)),g=(0,_vue.computed)(()=>Object.assign({},_conf.default.toolbar.print,s.print)),O=(0,_vue.computed)(()=>Object.assign({},_conf.default.toolbar.zoom,s.zoom)),h=(0,_vue.computed)(()=>Object.assign({},_conf.default.toolbar.custom,s.custom)),l=(0,_vue.computed)(()=>{var e;if((n.value||m)&&m)return e=m.getComputeMaps()["computeCustomOpts"],e.value;return{}}),x=(0,_vue.computed)(()=>{return l.value.trigger}),a=()=>{if(m)return!0;(0,_log.errLog)("vxe.error.barUnableLink")},T=({$event:e})=>{m&&m.triggerCustomEvent(e)},C=({$event:e})=>{m&&m.customOpenEvent(e)},E=({$event:e})=>{const o=m.reactData["customStore"];o.activeBtn=!1,setTimeout(()=>{o.activeBtn||o.activeWrapper||m.customColseEvent(e)},350)},y=e=>{var o=i["isRefresh"],t=f.value;if(!o){o=t.queryMethod||t.query;if(o){i.isRefresh=!0;try{Promise.resolve(o({})).catch(e=>e).then(()=>{i.isRefresh=!1})}catch(e){i.isRefresh=!1}}else _&&(i.isRefresh=!0,_.triggerToolbarCommitEvent({code:t.code||"reload"},e).catch(e=>e).then(()=>{i.isRefresh=!1}))}},R=e=>{_&&_.triggerZoomEvent(e)},L=(e,o)=>{var t,r=o["code"];r&&(_?_.triggerToolbarBtnEvent(o,e):(t=_vXETable.VXETable.commands.get(r),o={code:r,button:o,$table:m,$grid:_,$event:e},t&&(t.commandMethod?t.commandMethod(o):"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notCommands",[r])),d.dispatchEvent("button-click",o,e)))},N=(e,o)=>{var t,r=o["code"];r&&(_?_.triggerToolbarTolEvent(o,e):(t=_vXETable.VXETable.commands.get(r),o={code:r,tool:o,$table:m,$grid:_,$event:e},t&&(t.commandMethod?t.commandMethod(o):"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notCommands",[r])),d.dispatchEvent("tool-click",o,e)))},k=()=>{a()&&m.openImport()},B=()=>{a()&&m.openExport()},$=()=>{a()&&m.openPrint()},V=(e,t)=>{e=e.dropdowns;return e?e.map((o,e)=>!1===o.visible?(0,_vue.createCommentVNode)():(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{key:e,disabled:o.disabled,loading:o.loading,type:o.type,icon:o.icon,circle:o.circle,round:o.round,status:o.status,content:o.name,onClick:e=>(t?L:N)(e,o)})):[]};Object.assign(d,{dispatchEvent(e,o,t){r(e,Object.assign({$toolbar:d,$event:t},o))},syncUpdate(e){var o=e["collectColumn"];m=e.$table,i.columns=o,n.value++}}),(0,_vue.nextTick)(()=>{var e=s["refresh"],o=f.value,o=o.queryMethod||o.query,e=(!e||_||o||(0,_log.warnLog)("vxe.error.notFunc",["queryMethod"]),h.value);"development"===process.env.NODE_ENV&&(e.isFooter&&(0,_log.warnLog)("vxe.error.delProp",["custom.isFooter","custom-config.showFooter"]),e.showFooter&&(0,_log.warnLog)("vxe.error.delProp",["custom.showFooter","custom-config.showFooter"]),e.immediate&&(0,_log.warnLog)("vxe.error.delProp",["custom.immediate","custom-config.immediate"]),e.trigger)&&(0,_log.warnLog)("vxe.error.delProp",["custom.trigger","custom-config.trigger"])});return d.renderVN=()=>{var{perfect:e,loading:o,refresh:t,zoom:r,custom:n,className:l}=s,a=u.value;return(0,_vue.h)("div",{ref:v,class:["vxe-toolbar",l?_xeUtils.default.isFunction(l)?l({$toolbar:d}):l:"",{["size--"+a]:a,"is--perfect":e,"is--loading":o}]},[(0,_vue.h)("div",{class:"vxe-buttons--wrapper"},(()=>{var e=s["buttons"],o=c.buttons;if(o)return(0,_vn.getSlotVNs)(o({$grid:_,$table:m}));const a=[];return e&&e.forEach(o=>{var e,t,r,{dropdowns:n,buttonRender:l}=o;!1!==o.visible&&(e=l?_vXETable.VXETable.renderer.get(l.name):null,l&&e&&e.renderToolbarButton?(t=e.toolbarButtonClassName,r={$grid:_,$table:m,button:o},a.push((0,_vue.h)("span",{class:["vxe-button--item",t?_xeUtils.default.isFunction(t)?t(r):t:""]},(0,_vn.getSlotVNs)(e.renderToolbarButton(l,r))))):a.push((0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{disabled:o.disabled,loading:o.loading,type:o.type,icon:o.icon,circle:o.circle,round:o.round,status:o.status,content:o.name,destroyOnClose:o.destroyOnClose,placement:o.placement,transfer:o.transfer,onClick:e=>L(e,o)},n&&n.length?{dropdowns:()=>V(o,!0)}:{})))}),a})()),(0,_vue.h)("div",{class:"vxe-tools--wrapper"},(()=>{var e=s["tools"],o=c.tools;if(o)return(0,_vn.getSlotVNs)(o({$grid:_,$table:m}));const u=[];return e&&e.forEach((o,e)=>{var t,r,n,l,{dropdowns:a,toolRender:s}=o;!1!==o.visible&&(t=s?s.name:null,r=s?_vXETable.VXETable.renderer.get(t):null,s&&r&&r.renderToolbarTool?(n=r.toolbarToolClassName,l={$grid:_,$table:m,tool:o},u.push((0,_vue.h)("span",{key:t,class:["vxe-tool--item",n?_xeUtils.default.isFunction(n)?n(l):n:""]},(0,_vn.getSlotVNs)(r.renderToolbarTool(s,l))))):u.push((0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{key:e,disabled:o.disabled,loading:o.loading,type:o.type,icon:o.icon,circle:o.circle,round:o.round,status:o.status,content:o.name,destroyOnClose:o.destroyOnClose,placement:o.placement,transfer:o.transfer,onClick:e=>N(e,o)},a&&a.length?{dropdowns:()=>V(o,!1)}:{})))}),u})()),(0,_vue.h)("div",{class:"vxe-tools--operate"},[s.import?(l=p.value,(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{key:"import",circle:!0,icon:l.icon||_conf.default.icon.TOOLBAR_TOOLS_IMPORT,title:_conf.default.i18n("vxe.toolbar.import"),onClick:k})):(0,_vue.createCommentVNode)(),s.export?(a=b.value,(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{key:"export",circle:!0,icon:a.icon||_conf.default.icon.TOOLBAR_TOOLS_EXPORT,title:_conf.default.i18n("vxe.toolbar.export"),onClick:B})):(0,_vue.createCommentVNode)(),s.print?(e=g.value,(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{key:"print",circle:!0,icon:e.icon||_conf.default.icon.TOOLBAR_TOOLS_PRINT,title:_conf.default.i18n("vxe.toolbar.print"),onClick:$})):(0,_vue.createCommentVNode)(),t?(o=f.value,(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{key:"refresh",circle:!0,icon:i.isRefresh?o.iconLoading||_conf.default.icon.TOOLBAR_TOOLS_REFRESH_LOADING:o.icon||_conf.default.icon.TOOLBAR_TOOLS_REFRESH,title:_conf.default.i18n("vxe.toolbar.refresh"),onClick:y})):(0,_vue.createCommentVNode)(),r&&_&&(l=O.value,_)?(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{key:"zoom",circle:!0,icon:_.isMaximized()?l.iconOut||_conf.default.icon.TOOLBAR_TOOLS_MINIMIZE:l.iconIn||_conf.default.icon.TOOLBAR_TOOLS_FULLSCREEN,title:_conf.default.i18n("vxe.toolbar.zoom"+(_.isMaximized()?"Out":"In")),onClick:R}):(0,_vue.createCommentVNode)(),n?(a=h.value,e=x.value,t={},"manual"!==e&&("hover"===e?(t.onMouseenter=C,t.onMouseleave=E):t.onClick=T),(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{key:"custom",circle:!0,icon:a.icon||_conf.default.icon.TOOLBAR_TOOLS_CUSTOM,title:_conf.default.i18n("vxe.toolbar.custom"),className:"vxe-toolbar-custom-target",...t})):(0,_vue.createCommentVNode)()])])},d},render(){return this.renderVN()}});
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_size=require("../../hooks/size"),_log=require("../../tools/log"),_vn=require("../../tools/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default=exports.default=(0,_vue.defineComponent)({name:"VxeToolbar",props:{loading:Boolean,refresh:[Boolean,Object],import:[Boolean,Object],export:[Boolean,Object],print:[Boolean,Object],zoom:[Boolean,Object],custom:[Boolean,Object],buttons:{type:Array,default:()=>_conf.default.toolbar.buttons},tools:{type:Array,default:()=>_conf.default.toolbar.tools},perfect:{type:Boolean,default:()=>_conf.default.toolbar.perfect},size:{type:String,default:()=>_conf.default.toolbar.size||_conf.default.size},className:[String,Function]},emits:["button-click","tool-click"],setup(s,e){const{slots:c,emit:r}=e;var o=_xeUtils.default.uniqueId();const u=(0,_size.useSize)(s),i=(0,_vue.reactive)({isRefresh:!1,columns:[]}),v=(0,_vue.ref)(),t={refElem:v},d={xID:o,props:s,context:e,reactData:i,getRefMaps:()=>t};const _=(0,_vue.inject)("$xegrid",null);let m;const n=(0,_vue.ref)(0),f=(0,_vue.computed)(()=>Object.assign({},_conf.default.toolbar.refresh,s.refresh)),p=(0,_vue.computed)(()=>Object.assign({},_conf.default.toolbar.import,s.import)),b=(0,_vue.computed)(()=>Object.assign({},_conf.default.toolbar.export,s.export)),g=(0,_vue.computed)(()=>Object.assign({},_conf.default.toolbar.print,s.print)),O=(0,_vue.computed)(()=>Object.assign({},_conf.default.toolbar.zoom,s.zoom)),h=(0,_vue.computed)(()=>Object.assign({},_conf.default.toolbar.custom,s.custom)),l=(0,_vue.computed)(()=>{var e;if((n.value||m)&&m)return e=m.getComputeMaps()["computeCustomOpts"],e.value;return{}}),x=(0,_vue.computed)(()=>{return l.value.trigger}),a=()=>{if(m)return!0;(0,_log.errLog)("vxe.error.barUnableLink")},T=({$event:e})=>{m&&m.triggerCustomEvent(e)},C=({$event:e})=>{m&&m.customOpenEvent(e)},E=({$event:e})=>{const o=m.reactData["customStore"];o.activeBtn=!1,setTimeout(()=>{o.activeBtn||o.activeWrapper||m.customColseEvent(e)},350)},y=e=>{var o=i["isRefresh"],t=f.value;if(!o){o=t.queryMethod||t.query;if(o){i.isRefresh=!0;try{Promise.resolve(o({})).catch(e=>e).then(()=>{i.isRefresh=!1})}catch(e){i.isRefresh=!1}}else _&&(i.isRefresh=!0,_.triggerToolbarCommitEvent({code:t.code||"reload"},e).catch(e=>e).then(()=>{i.isRefresh=!1}))}},R=e=>{_&&_.triggerZoomEvent(e)},L=(e,o)=>{var t,r=o["code"];r&&(_?_.triggerToolbarBtnEvent(o,e):(t=_vXETable.VXETable.commands.get(r),o={code:r,button:o,$table:m,$grid:_,$event:e},t&&(t.commandMethod?t.commandMethod(o):"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notCommands",[r])),d.dispatchEvent("button-click",o,e)))},N=(e,o)=>{var t,r=o["code"];r&&(_?_.triggerToolbarTolEvent(o,e):(t=_vXETable.VXETable.commands.get(r),o={code:r,tool:o,$table:m,$grid:_,$event:e},t&&(t.commandMethod?t.commandMethod(o):"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notCommands",[r])),d.dispatchEvent("tool-click",o,e)))},k=()=>{a()&&m.openImport()},B=()=>{a()&&m.openExport()},$=()=>{a()&&m.openPrint()},V=(e,t)=>{e=e.dropdowns;return e?e.map((o,e)=>!1===o.visible?(0,_vue.createCommentVNode)():(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{key:e,disabled:o.disabled,loading:o.loading,type:o.type,icon:o.icon,circle:o.circle,round:o.round,status:o.status,content:o.name,onClick:e=>(t?L:N)(e,o)})):[]};Object.assign(d,{dispatchEvent(e,o,t){r(e,Object.assign({$toolbar:d,$event:t},o))},syncUpdate(e){var o=e["collectColumn"];m=e.$table,i.columns=o,n.value++}}),(0,_vue.nextTick)(()=>{var e=s["refresh"],o=f.value,o=o.queryMethod||o.query,e=(!e||_||o||(0,_log.warnLog)("vxe.error.notFunc",["queryMethod"]),h.value);"development"===process.env.NODE_ENV&&(e.isFooter&&(0,_log.warnLog)("vxe.error.delProp",["toolbar.custom.isFooter","table.custom-config.showFooter"]),e.showFooter&&(0,_log.warnLog)("vxe.error.delProp",["toolbar.custom.showFooter","table.custom-config.showFooter"]),e.immediate&&(0,_log.warnLog)("vxe.error.delProp",["toolbar.custom.immediate","table.custom-config.immediate"]),e.trigger)&&(0,_log.warnLog)("vxe.error.delProp",["toolbar.custom.trigger","table.custom-config.trigger"])});return d.renderVN=()=>{var{perfect:e,loading:o,refresh:t,zoom:r,custom:n,className:l}=s,a=u.value;return(0,_vue.h)("div",{ref:v,class:["vxe-toolbar",l?_xeUtils.default.isFunction(l)?l({$toolbar:d}):l:"",{["size--"+a]:a,"is--perfect":e,"is--loading":o}]},[(0,_vue.h)("div",{class:"vxe-buttons--wrapper"},(()=>{var e=s["buttons"],o=c.buttons;if(o)return(0,_vn.getSlotVNs)(o({$grid:_,$table:m}));const a=[];return e&&e.forEach(o=>{var e,t,r,{dropdowns:n,buttonRender:l}=o;!1!==o.visible&&(e=l?_vXETable.VXETable.renderer.get(l.name):null,l&&e&&e.renderToolbarButton?(t=e.toolbarButtonClassName,r={$grid:_,$table:m,button:o},a.push((0,_vue.h)("span",{class:["vxe-button--item",t?_xeUtils.default.isFunction(t)?t(r):t:""]},(0,_vn.getSlotVNs)(e.renderToolbarButton(l,r))))):a.push((0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{disabled:o.disabled,loading:o.loading,type:o.type,icon:o.icon,circle:o.circle,round:o.round,status:o.status,content:o.name,destroyOnClose:o.destroyOnClose,placement:o.placement,transfer:o.transfer,onClick:e=>L(e,o)},n&&n.length?{dropdowns:()=>V(o,!0)}:{})))}),a})()),(0,_vue.h)("div",{class:"vxe-tools--wrapper"},(()=>{var e=s["tools"],o=c.tools;if(o)return(0,_vn.getSlotVNs)(o({$grid:_,$table:m}));const u=[];return e&&e.forEach((o,e)=>{var t,r,n,l,{dropdowns:a,toolRender:s}=o;!1!==o.visible&&(t=s?s.name:null,r=s?_vXETable.VXETable.renderer.get(t):null,s&&r&&r.renderToolbarTool?(n=r.toolbarToolClassName,l={$grid:_,$table:m,tool:o},u.push((0,_vue.h)("span",{key:t,class:["vxe-tool--item",n?_xeUtils.default.isFunction(n)?n(l):n:""]},(0,_vn.getSlotVNs)(r.renderToolbarTool(s,l))))):u.push((0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{key:e,disabled:o.disabled,loading:o.loading,type:o.type,icon:o.icon,circle:o.circle,round:o.round,status:o.status,content:o.name,destroyOnClose:o.destroyOnClose,placement:o.placement,transfer:o.transfer,onClick:e=>N(e,o)},a&&a.length?{dropdowns:()=>V(o,!1)}:{})))}),u})()),(0,_vue.h)("div",{class:"vxe-tools--operate"},[s.import?(l=p.value,(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{key:"import",circle:!0,icon:l.icon||_conf.default.icon.TOOLBAR_TOOLS_IMPORT,title:_conf.default.i18n("vxe.toolbar.import"),onClick:k})):(0,_vue.createCommentVNode)(),s.export?(a=b.value,(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{key:"export",circle:!0,icon:a.icon||_conf.default.icon.TOOLBAR_TOOLS_EXPORT,title:_conf.default.i18n("vxe.toolbar.export"),onClick:B})):(0,_vue.createCommentVNode)(),s.print?(e=g.value,(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{key:"print",circle:!0,icon:e.icon||_conf.default.icon.TOOLBAR_TOOLS_PRINT,title:_conf.default.i18n("vxe.toolbar.print"),onClick:$})):(0,_vue.createCommentVNode)(),t?(o=f.value,(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{key:"refresh",circle:!0,icon:i.isRefresh?o.iconLoading||_conf.default.icon.TOOLBAR_TOOLS_REFRESH_LOADING:o.icon||_conf.default.icon.TOOLBAR_TOOLS_REFRESH,title:_conf.default.i18n("vxe.toolbar.refresh"),onClick:y})):(0,_vue.createCommentVNode)(),r&&_&&(l=O.value,_)?(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{key:"zoom",circle:!0,icon:_.isMaximized()?l.iconOut||_conf.default.icon.TOOLBAR_TOOLS_MINIMIZE:l.iconIn||_conf.default.icon.TOOLBAR_TOOLS_FULLSCREEN,title:_conf.default.i18n("vxe.toolbar.zoom"+(_.isMaximized()?"Out":"In")),onClick:R}):(0,_vue.createCommentVNode)(),n?(a=h.value,e=x.value,t={},"manual"!==e&&("hover"===e?(t.onMouseenter=C,t.onMouseleave=E):t.onClick=T),(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),{key:"custom",circle:!0,icon:a.icon||_conf.default.icon.TOOLBAR_TOOLS_CUSTOM,title:_conf.default.i18n("vxe.toolbar.custom"),className:"vxe-toolbar-custom-target",...t})):(0,_vue.createCommentVNode)()])])},d},render(){return this.renderVN()}});

package/lib/tools/log.js

@@ -9,7 +9,7 @@ exports.warnLog = void 0;
 var _conf = _interopRequireDefault(require("../v-x-e-table/src/conf"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function getLog(message, params) {
-  return `[vxe-table v${"4.6.2"}] ${_conf.default.i18n(message, params)}`;
+  return `[vxe-table v${"4.6.4"}] ${_conf.default.i18n(message, params)}`;
 }
 function outLog(type) {
   return function (message, params) {

package/lib/tools/log.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.errLog=void 0,exports.getLog=getLog,exports.warnLog=void 0;var _conf=_interopRequireDefault(require("../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getLog(e,o){return"[vxe-table v4.6.2] "+_conf.default.i18n(e,o)}function outLog(r){return function(e,o){e=getLog(e,o);return console[r](e),e}}const warnLog=exports.warnLog=outLog("warn"),errLog=exports.errLog=outLog("error");
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.errLog=void 0,exports.getLog=getLog,exports.warnLog=void 0;var _conf=_interopRequireDefault(require("../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getLog(e,o){return"[vxe-table v4.6.4] "+_conf.default.i18n(e,o)}function outLog(r){return function(e,o){e=getLog(e,o);return console[r](e),e}}const warnLog=exports.warnLog=outLog("warn"),errLog=exports.errLog=outLog("error");

package/lib/v-x-e-table/index.js

@@ -181,7 +181,7 @@ const setup = exports.setup = _config.config;
 const globalStore = exports.globalStore = {};
 const VXETable = exports.VXETable = {
   v,
-  version: "4.6.2",
+  version: "4.6.4",
   config: _config.config,
   globalStore,
   interceptor: _interceptor.interceptor,

package/lib/v-x-e-table/index.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,t:!0,_t:!0,globalConfs:!0,v:!0,setup:!0,globalStore:!0,VXETable:!0},_xeUtils=(exports.VXETable=void 0,exports._t=_t,exports.setup=exports.globalStore=exports.globalConfs=exports.default=void 0,exports.t=t,exports.use=use,exports.v=void 0,_interopRequireDefault(require("xe-utils"))),_conf=_interopRequireDefault(require("./src/conf")),_interceptor=require("./src/interceptor"),_renderer=(Object.keys(_interceptor).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}})}),require("./src/renderer")),_commands=(Object.keys(_renderer).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}})}),require("./src/commands")),_menus=(Object.keys(_commands).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}})}),require("./src/menus")),_formats=(Object.keys(_menus).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}})}),require("./src/formats")),_validators=(Object.keys(_formats).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}})}),require("./src/validators")),_hooks=(Object.keys(_validators).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_validators[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _validators[e]}})}),require("./src/hooks")),_config=(Object.keys(_hooks).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_hooks[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _hooks[e]}})}),require("./src/config")),_utils=(Object.keys(_config).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_config[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _config[e]}})}),require("../tools/utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getExportOrImpotType(e,r){const o=[];return _xeUtils.default.objectEach(e,(e,t)=>{0!==e&&e!==r||o.push(t)}),o}const installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}function t(e,t){return _conf.default.i18n(e,t)}function _t(e,t){return e?_xeUtils.default.toValueString(_conf.default.translate?_conf.default.translate(e,t):e):""}class VXETableConfig{get zIndex(){return(0,_utils.getLastZIndex)()}get nextZIndex(){return(0,_utils.nextZIndex)()}get exportTypes(){return getExportOrImpotType(_conf.default.export.types,1)}get importTypes(){return getExportOrImpotType(_conf.default.export.types,2)}}const globalConfs=exports.globalConfs=new VXETableConfig,v=exports.v="v4",setup=exports.setup=_config.config,globalStore=exports.globalStore={},VXETable=exports.VXETable={v:v,version:"4.6.2",config:_config.config,globalStore:globalStore,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,validators:_validators.validators,menus:_menus.menus,hooks:_hooks.hooks,use:use,t:t,_t:_t,setup:setup,globalConfs:globalConfs};var _default=exports.default=VXETable;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,t:!0,_t:!0,globalConfs:!0,v:!0,setup:!0,globalStore:!0,VXETable:!0},_xeUtils=(exports.VXETable=void 0,exports._t=_t,exports.setup=exports.globalStore=exports.globalConfs=exports.default=void 0,exports.t=t,exports.use=use,exports.v=void 0,_interopRequireDefault(require("xe-utils"))),_conf=_interopRequireDefault(require("./src/conf")),_interceptor=require("./src/interceptor"),_renderer=(Object.keys(_interceptor).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}})}),require("./src/renderer")),_commands=(Object.keys(_renderer).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}})}),require("./src/commands")),_menus=(Object.keys(_commands).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}})}),require("./src/menus")),_formats=(Object.keys(_menus).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}})}),require("./src/formats")),_validators=(Object.keys(_formats).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}})}),require("./src/validators")),_hooks=(Object.keys(_validators).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_validators[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _validators[e]}})}),require("./src/hooks")),_config=(Object.keys(_hooks).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_hooks[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _hooks[e]}})}),require("./src/config")),_utils=(Object.keys(_config).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_config[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _config[e]}})}),require("../tools/utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getExportOrImpotType(e,r){const o=[];return _xeUtils.default.objectEach(e,(e,t)=>{0!==e&&e!==r||o.push(t)}),o}const installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}function t(e,t){return _conf.default.i18n(e,t)}function _t(e,t){return e?_xeUtils.default.toValueString(_conf.default.translate?_conf.default.translate(e,t):e):""}class VXETableConfig{get zIndex(){return(0,_utils.getLastZIndex)()}get nextZIndex(){return(0,_utils.nextZIndex)()}get exportTypes(){return getExportOrImpotType(_conf.default.export.types,1)}get importTypes(){return getExportOrImpotType(_conf.default.export.types,2)}}const globalConfs=exports.globalConfs=new VXETableConfig,v=exports.v="v4",setup=exports.setup=_config.config,globalStore=exports.globalStore={},VXETable=exports.VXETable={v:v,version:"4.6.4",config:_config.config,globalStore:globalStore,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,validators:_validators.validators,menus:_menus.menus,hooks:_hooks.hooks,use:use,t:t,_t:_t,setup:setup,globalConfs:globalConfs};var _default=exports.default=VXETable;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.6.2",
+  "version": "4.6.4",
   "description": "一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/custom/src/hook.ts

@@ -32,8 +32,9 @@ const customHook: VxeGlobalHooksHandles.HookOptions = {
     }
 
     const openCustom = () => {
-      const { customStore } = reactData
+      const { initStore, customStore } = reactData
       customStore.visible = true
+      initStore.custom = true
       checkCustomStatus()
       calcMaxHeight()
       return nextTick().then(() => calcMaxHeight())

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

@@ -42,92 +42,6 @@ export default {
       impFields: 'Import failed, please check that the field name and data format are correct.',
       treeNotImp: 'Tree table does not support import.'
     },
-    renderer: {
-      search: 'Search',
-      cases: {
-        equal: 'Equal',
-        unequal: 'Not equal',
-        gt: 'Greater than',
-        ge: 'Greater than or equal',
-        lt: 'Less than',
-        le: 'Less than or equal',
-        begin: 'Beginning is',
-        notbegin: 'Beginning is not',
-        endin: 'End is',
-        notendin: 'End is not',
-        include: 'Include',
-        exclude: 'Exclusive',
-        between: 'Betweenness',
-        custom: 'Custom filter',
-        insensitive: 'Case insensitive',
-        isSensitive: 'Case sensitive'
-      },
-      combination: {
-        menus: {
-          clearSort: 'Clear sort',
-          sortAsc: 'Ascending order',
-          sortDesc: 'Descending order',
-          fixedColumn: 'Fixed column',
-          fixedGroup: 'Fixed group',
-          cancelFixed: 'Clear fixed',
-          fixedLeft: 'Fixed the left',
-          fixedRight: 'Fixed the right',
-          clearFilter: 'Clear filter',
-          textOption: 'Text filter',
-          numberOption: 'Number filter'
-        },
-        popup: {
-          title: 'Custom filtering',
-          currColumnTitle: 'Current column:',
-          and: 'And',
-          or: 'Or',
-          describeHtml: 'Use ? To represent a single character <br/> use * to represent any number of characters'
-        },
-        empty: '(Empty)',
-        notData: 'No data'
-      }
-    },
-    pro: {
-      area: {
-        mergeErr: 'The operation cannot be performed on merged cells',
-        multiErr: 'The operation cannot be performed on multiple selection areas',
-        extendErr: 'If the extended area contains merged cells, all merged cells need to be the same size',
-        pasteMultiErr: 'Cannot paste, copied area and pasted area of the same size are required to perform this operation'
-      },
-      fnr: {
-        title: 'Find and replace',
-        findLabel: 'Find',
-        replaceLabel: 'Replace',
-        findTitle: 'What to find:',
-        replaceTitle: 'Replace with:',
-        tabs: {
-          find: 'Find',
-          replace: 'Replace'
-        },
-        filter: {
-          re: 'Regular Expression',
-          whole: 'Whole word',
-          sensitive: 'Case sensitive'
-        },
-        btns: {
-          findNext: 'Find next',
-          findAll: 'Find all',
-          replace: 'Replace',
-          replaceAll: 'Replace all',
-          cancel: 'Cancel'
-        },
-        header: {
-          seq: '#',
-          cell: 'Cell',
-          value: 'Value'
-        },
-        empty: '(Empty)',
-        reError: 'Invalid regular expression',
-        recordCount: 'Found {0} cells',
-        notCell: 'No matching cells were found',
-        replaceSuccess: 'Successfully replaced {0} cells'
-      }
-    },
     table: {
       emptyText: 'No Data',
       allTitle: 'Select all / cancel',
@@ -188,6 +102,9 @@ export default {
       confirm: 'Confirm',
       cancel: 'Cancel'
     },
+    filter: {
+      search: '搜索'
+    },
     custom: {
       cstmTitle: 'Column Settings',
       cstmRestore: 'Restore default',
@@ -332,6 +249,205 @@ export default {
           q4: 'Fourth quarter'
         }
       }
+    },
+
+    /**
+     * 扩展插件
+     */
+    plugins: {
+      extendCellArea: {
+        area: {
+          mergeErr: '无法对合并单元格进行该操作',
+          multiErr: '无法对多重选择区域进行该操作',
+          extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同',
+          pasteMultiErr: '无法粘贴，需要相同大小的复制的区域和粘贴的区域才能执行此操作',
+          cpInvalidErr: '该操作无法进行，您选择的区域中存在被禁止的列（{0}）'
+        },
+        fnr: {
+          title: '查找和替换',
+          findLabel: '查找',
+          replaceLabel: '替换',
+          findTitle: '查找内容：',
+          replaceTitle: '替换为：',
+          tabs: {
+            find: '查找',
+            replace: '替换'
+          },
+          filter: {
+            re: '正则表达式',
+            whole: '全词匹配',
+            sensitive: '区分大小写'
+          },
+          btns: {
+            findNext: '查找下一个',
+            findAll: '查找全部',
+            replace: '替换',
+            replaceAll: '替换全部',
+            cancel: '取消'
+          },
+          header: {
+            seq: '#',
+            cell: '单元格',
+            value: '值'
+          },
+          empty: '(空值)',
+          reError: '无效的正则表达式',
+          recordCount: '已找到 {0} 个单元格',
+          notCell: '找不到匹配的单元格',
+          replaceSuccess: '成功替换 {0} 个单元格'
+        }
+      },
+      filterComplexInput: {
+        menus: {
+          fixedColumn: '锁定列',
+          fixedGroup: '锁定组',
+          cancelFixed: '取消锁定',
+          fixedLeft: '锁定左侧',
+          fixedRight: '锁定右侧'
+        },
+        cases: {
+          equal: '等于',
+          gt: '大于',
+          lt: '小于',
+          begin: '开头是',
+          endin: '结尾是',
+          include: '包含',
+          isSensitive: '区分大小写'
+        }
+      },
+      filterCombination: {
+        menus: {
+          clearSort: '清除排序',
+          sortAsc: '升序',
+          sortDesc: '降序',
+          fixedColumn: '锁定列',
+          fixedGroup: '锁定组',
+          cancelFixed: '取消锁定',
+          fixedLeft: '锁定左侧',
+          fixedRight: '锁定右侧',
+          clearFilter: '清除筛选',
+          textOption: '文本筛选',
+          numberOption: '数值筛选'
+        },
+        popup: {
+          title: '自定义筛选的方式',
+          currColumnTitle: '当前列：',
+          and: '与',
+          or: '或',
+          describeHtml: '可用 ? 代表单个字符<br/>用 * 代表任意多个字符'
+        },
+        cases: {
+          equal: '等于',
+          unequal: '不等于',
+          gt: '大于',
+          ge: '大于或等于',
+          lt: '小于',
+          le: '小于或等于',
+          begin: '开头是',
+          notbegin: '开头不是',
+          endin: '结尾是',
+          notendin: '结尾不是',
+          include: '包含',
+          exclude: '不包含',
+          between: '介于',
+          custom: '自定义筛选',
+          insensitive: '不区分大小写',
+          isSensitive: '区分大小写'
+        },
+        empty: '(空白)',
+        notData: '无匹配项'
+      }
+    },
+
+    /**
+     * 以下废弃
+     * @deprecated
+     */
+    renderer: {
+      search: 'Search',
+      cases: {
+        equal: 'Equal',
+        unequal: 'Not equal',
+        gt: 'Greater than',
+        ge: 'Greater than or equal',
+        lt: 'Less than',
+        le: 'Less than or equal',
+        begin: 'Beginning is',
+        notbegin: 'Beginning is not',
+        endin: 'End is',
+        notendin: 'End is not',
+        include: 'Include',
+        exclude: 'Exclusive',
+        between: 'Betweenness',
+        custom: 'Custom filter',
+        insensitive: 'Case insensitive',
+        isSensitive: 'Case sensitive'
+      },
+      combination: {
+        menus: {
+          clearSort: 'Clear sort',
+          sortAsc: 'Ascending order',
+          sortDesc: 'Descending order',
+          fixedColumn: 'Fixed column',
+          fixedGroup: 'Fixed group',
+          cancelFixed: 'Clear fixed',
+          fixedLeft: 'Fixed the left',
+          fixedRight: 'Fixed the right',
+          clearFilter: 'Clear filter',
+          textOption: 'Text filter',
+          numberOption: 'Number filter'
+        },
+        popup: {
+          title: 'Custom filtering',
+          currColumnTitle: 'Current column:',
+          and: 'And',
+          or: 'Or',
+          describeHtml: 'Use ? To represent a single character <br/> use * to represent any number of characters'
+        },
+        empty: '(Empty)',
+        notData: 'No data'
+      }
+    },
+    pro: {
+      area: {
+        mergeErr: 'The operation cannot be performed on merged cells',
+        multiErr: 'The operation cannot be performed on multiple selection areas',
+        extendErr: 'If the extended area contains merged cells, all merged cells need to be the same size',
+        pasteMultiErr: 'Cannot paste, copied area and pasted area of the same size are required to perform this operation'
+      },
+      fnr: {
+        title: 'Find and replace',
+        findLabel: 'Find',
+        replaceLabel: 'Replace',
+        findTitle: 'What to find:',
+        replaceTitle: 'Replace with:',
+        tabs: {
+          find: 'Find',
+          replace: 'Replace'
+        },
+        filter: {
+          re: 'Regular Expression',
+          whole: 'Whole word',
+          sensitive: 'Case sensitive'
+        },
+        btns: {
+          findNext: 'Find next',
+          findAll: 'Find all',
+          replace: 'Replace',
+          replaceAll: 'Replace all',
+          cancel: 'Cancel'
+        },
+        header: {
+          seq: '#',
+          cell: 'Cell',
+          value: 'Value'
+        },
+        empty: '(Empty)',
+        reError: 'Invalid regular expression',
+        recordCount: 'Found {0} cells',
+        notCell: 'No matching cells were found',
+        replaceSuccess: 'Successfully replaced {0} cells'
+      }
     }
   }
 }