vxe-table 4.7.59 → 4.7.61

package/lib/table/render/index.js

@@ -542,7 +542,7 @@ function getSelectCellValue(renderOpts, {
   let selectItem;
   const labelProp = optionProps.label || 'label';
   const valueProp = optionProps.value || 'value';
-  if (!(0, _utils.isEmptyValue)(cellValue)) {
+  if (!(cellValue === null || cellValue === undefined)) {
     return _xeUtils.default.map(_xeUtils.default.isArray(cellValue) ? cellValue : [cellValue], optionGroups ? value => {
       const groupOptions = optionGroupProps.options || 'options';
       for (let index = 0; index < optionGroups.length; index++) {
@@ -581,7 +581,7 @@ function getTreeSelectCellValue(renderOpts, {
   const labelProp = optionProps.label || 'label';
   const valueProp = optionProps.value || 'value';
   const childrenProp = optionProps.children || 'children';
-  if (!(0, _utils.isEmptyValue)(cellValue)) {
+  if (!(cellValue === null || cellValue === undefined)) {
     const keyMaps = {};
     _xeUtils.default.eachTree(options, item => {
       keyMaps[_xeUtils.default.get(item, valueProp)] = item;
@@ -639,7 +639,7 @@ renderer.mixin({
     exportMethod: handleExportSelectMethod
   },
   VxeInput: {
-    autofocus: '.vxe-input--inner',
+    autofocus: 'input',
     renderEdit: defaultEditRender,
     renderCell(renderOpts, params) {
       var _a;
@@ -673,7 +673,7 @@ renderer.mixin({
     defaultFilterMethod: handleInputFilterMethod
   },
   VxeNumberInput: {
-    autofocus: '.vxe-number-input--inner',
+    autofocus: 'input',
     renderEdit: defaultEditRender,
     renderCell(renderOpts, params) {
       var _a;
@@ -700,7 +700,7 @@ renderer.mixin({
     defaultFilterMethod: handleInputFilterMethod
   },
   VxeDatePicker: {
-    autofocus: '.vxe-date-picker--inner',
+    autofocus: 'input',
     renderEdit: defaultEditRender,
     renderCell(renderOpts, params) {
       const {
@@ -729,7 +729,7 @@ renderer.mixin({
     defaultFilterMethod: handleFilterMethod
   },
   VxeTextarea: {
-    autofocus: '.vxe-textarea--inner'
+    autofocus: 'VxeTextarea'
   },
   VxeButton: {
     renderDefault: buttonCellRender
@@ -745,7 +745,7 @@ renderer.mixin({
     }
   },
   VxeSelect: {
-    autofocus: '.vxe-input--inner',
+    autofocus: 'input',
     renderEdit: defaultSelectEditRender,
     renderDefault: defaultSelectEditRender,
     renderCell(renderOpts, params) {
@@ -777,7 +777,7 @@ renderer.mixin({
     exportMethod: handleExportSelectMethod
   },
   VxeTreeSelect: {
-    autofocus: '.vxe-input--inner',
+    autofocus: 'input',
     renderEdit: defaultTreeSelectEditRender,
     renderCell(renderOpts, params) {
       return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
@@ -791,7 +791,7 @@ renderer.mixin({
     renderDefault: radioAndCheckboxEditRender
   },
   VxeSwitch: {
-    autofocus: '.vxe-switch--button',
+    autofocus: 'button',
     renderEdit: defaultEditRender,
     renderDefault: defaultEditRender
   },

package/lib/table/render/index.min.js

@@ -1 +1 @@
-"use strict";var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("../../table/src/util"),_utils=require("../../ui/src/utils"),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const{getConfig,renderer,getI18n}=_ui.VxeUI,componentDefaultModelProp="modelValue",defaultCompProps={transfer:!0};function getModelEvent(e){switch(e.name){case"input":case"textarea":return"input"}return"update:modelValue"}function getChangeEvent(e){switch(e.name){case"input":case"textarea":case"VxeInput":case"VxeTextarea":case"$input":case"$textarea":return"input"}return"change"}function parseDate(e,t){return e&&t.valueFormat?_xeUtils.default.toStringDate(e,t.valueFormat):e}function getFormatDate(e,t,n){var{dateConfig:r={}}=t;return _xeUtils.default.toDateString(parseDate(e,t),r.labelFormat||n)}function getLabelFormatDate(e,t){return getFormatDate(e,t,getI18n("vxe.input.date.labelFormat."+t.type))}function getOldComponentName(e){return"vxe-"+e.replace("$","")}function getDefaultComponent({name:e}){return(0,_vue.resolveComponent)(e)}function getOldComponent({name:e}){return(0,_vue.resolveComponent)(getOldComponentName(e))}function handleConfirmFilter(e,t,n){e=e.$panel;e.changeOption({},t,n)}function getNativeAttrs(e){let{name:t,attrs:n}=e;return n="input"===t?Object.assign({type:"text"},n):n}function getInputImmediateModel(e){var{name:e,immediate:t,props:n}=e;return t||("VxeInput"===e||"$input"===e?(t=(n||{})["type"],!(!t||"text"===t||"number"===t||"integer"===t||"float"===t)):"input"!==e&&"textarea"!==e&&"$textarea"!==e)}function getCellEditProps(e,t,n,r){return _xeUtils.default.assign({immediate:getInputImmediateModel(e)},defaultCompProps,r,e.props,{[componentDefaultModelProp]:n})}function getCellEditFilterProps(e,t,n,r){return _xeUtils.default.assign({},defaultCompProps,r,e.props,{[componentDefaultModelProp]:n})}function isImmediateCell(e,t){return"cell"===t.$type||getInputImmediateModel(e)}function getCellLabelVNs(e,t,n){e=e.placeholder;return[(0,_vue.h)("span",{class:"vxe-cell--label"},e&&(0,_utils.isEmptyValue)(n)?[(0,_vue.h)("span",{class:"vxe-cell--placeholder"},(0,_utils.formatText)((0,_utils.getFuncText)(e),1))]:(0,_utils.formatText)(n,1))]}function getElementOns(e,n,t,r){const l=e["events"],o=getModelEvent(e),i=getChangeEvent(e),a=i===o,u={};return l&&_xeUtils.default.objectEach(l,(t,e)=>{u[(0,_vn.getOnName)(e)]=function(...e){t(n,...e)}}),t&&(u[(0,_vn.getOnName)(o)]=function(e){t(e),a&&r&&r(e),l&&l[o]&&l[o](n,e)}),!a&&r&&(u[(0,_vn.getOnName)(i)]=function(...e){r(...e),l&&l[i]&&l[i](n,...e)}),u}function getComponentOns(e,n,t,r){const l=e["events"],o=getModelEvent(e),i=getChangeEvent(e),a={};return _xeUtils.default.objectEach(l,(t,e)=>{a[(0,_vn.getOnName)(e)]=function(...e){"development"!==process.env.NODE_ENV||_xeUtils.default.isFunction(t)||(0,_log.errLog)("vxe.error.errFunc",[t]),t(n,...e)}}),t&&(a[(0,_vn.getOnName)(o)]=function(e){t(e),l&&l[o]&&l[o](n,e)}),r&&(a[(0,_vn.getOnName)(i)]=function(...e){r(...e),l&&l[i]&&l[i](n,...e)}),a}function getEditOns(e,t){const{$table:n,row:r,column:l}=t,o=e["name"],i=l["model"],a=isImmediateCell(e,t);return getComponentOns(e,t,e=>{a?(0,_util.setCellValue)(r,l,e):(i.update=!0,i.value=e)},e=>{!a&&["VxeInput","VxeTextarea","$input","$textarea"].includes(o)?(e=e.value,i.update=!0,i.value=e,n.updateStatus(t,e)):n.updateStatus(t)})}function getFilterOns(e,t,n){return getComponentOns(e,t,e=>{n.data=e},()=>{handleConfirmFilter(t,!_xeUtils.default.eqNull(n.data),n)})}function getNativeEditOns(t,n){const{$table:r,row:l,column:o}=n,i=o["model"];return getElementOns(t,n,e=>{e=e.target.value;isImmediateCell(t,n)?(0,_util.setCellValue)(l,o,e):(i.update=!0,i.value=e)},e=>{e=e.target.value;r.updateStatus(n,e)})}function getNativeFilterOns(e,t,n){return getElementOns(e,t,e=>{n.data=e.target.value},()=>{handleConfirmFilter(t,!_xeUtils.default.eqNull(n.data),n)})}function nativeEditRender(e,t){var{row:n,column:r}=t,l=e["name"],n=isImmediateCell(e,t)?(0,_util.getCellValue)(n,r):r.model.value;return[(0,_vue.h)(l,Object.assign(Object.assign(Object.assign({class:"vxe-default-"+l},getNativeAttrs(e)),{value:n}),getNativeEditOns(e,t)))]}function buttonCellRender(e,t){return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign({},getCellEditProps(e,t,null)),getComponentOns(e,t)))]}function defaultEditRender(e,t){var{row:n,column:r}=t,n=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign({},getCellEditProps(e,t,n)),getEditOns(e,t)))]}function radioAndCheckboxEditRender(e,t){var n=e["options"],{row:r,column:l}=t,r=(0,_util.getCellValue)(r,l);return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign({options:n},getCellEditProps(e,t,r)),getEditOns(e,t)))]}function oldEditRender(e,t){var{row:n,column:r}=t,n=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getOldComponent(e),Object.assign(Object.assign({},getCellEditProps(e,t,n)),getEditOns(e,t)))]}function oldButtonEditRender(e,t){return[(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),Object.assign(Object.assign({},getCellEditProps(e,t,null)),getComponentOns(e,t)))]}function oldButtonsEditRender(e,t){return e.children.map(e=>oldButtonEditRender(e,t)[0])}function renderNativeOptgroups(n,r,l){var{optionGroups:e,optionGroupProps:t={}}=n;const o=t.options||"options",i=t.label||"label";return e.map((e,t)=>(0,_vue.h)("optgroup",{key:t,label:e[i]},l(e[o],n,r)))}function renderNativeOptions(e,t,n){var{optionProps:r={}}=t,{row:l,column:o}=n;const i=r.label||"label",a=r.value||"value",u=r.disabled||"disabled",d=isImmediateCell(t,n)?(0,_util.getCellValue)(l,o):o.model.value;return e.map((e,t)=>(0,_vue.h)("option",{key:t,value:e[a],disabled:e[u],selected:e[a]==d},e[i]))}function nativeFilterRender(n,r){var e=r["column"];const l=n["name"],o=getNativeAttrs(n);return e.filters.map((e,t)=>(0,_vue.h)(l,Object.assign(Object.assign(Object.assign({key:t,class:"vxe-default-"+l},o),{value:e.data}),getNativeFilterOns(n,r,e))))}function defaultFilterRender(r,l){var e=l["column"];return e.filters.map((e,t)=>{var n=e.data;return(0,_vue.h)(getDefaultComponent(r),Object.assign(Object.assign({key:t},getCellEditFilterProps(r,r,n)),getFilterOns(r,l,e)))})}function oldFilterRender(r,l){var e=l["column"];return e.filters.map((e,t)=>{var n=e.data;return(0,_vue.h)(getOldComponent(r),Object.assign(Object.assign({key:t},getCellEditFilterProps(r,r,n)),getFilterOns(r,l,e)))})}function handleFilterMethod({option:e,row:t,column:n}){e=e.data;return _xeUtils.default.get(t,n.property)==e}function handleInputFilterMethod({option:e,row:t,column:n}){e=e.data,t=_xeUtils.default.get(t,n.property);return-1<_xeUtils.default.toValueString(t).indexOf(e)}function nativeSelectEditRender(e,t){return[(0,_vue.h)("select",Object.assign(Object.assign({class:"vxe-default-select"},getNativeAttrs(e)),getNativeEditOns(e,t)),e.optionGroups?renderNativeOptgroups(e,t,renderNativeOptions):renderNativeOptions(e.options,e,t))]}function defaultSelectEditRender(e,t){var{row:n,column:r}=t,{options:l,optionProps:o,optionGroups:i,optionGroupProps:a}=e,n=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign({},getCellEditProps(e,t,n,{options:l,optionProps:o,optionGroups:i,optionGroupProps:a})),getEditOns(e,t)))]}function defaultTreeSelectEditRender(e,t){var{row:n,column:r}=t,{options:l,optionProps:o}=e,n=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign({},getCellEditProps(e,t,n,{options:l,optionProps:o})),getEditOns(e,t)))]}function oldSelectEditRender(e,t){var{row:n,column:r}=t,{options:l,optionProps:o,optionGroups:i,optionGroupProps:a}=e,n=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getOldComponent(e),Object.assign(Object.assign({},getCellEditProps(e,t,n,{options:l,optionProps:o,optionGroups:i,optionGroupProps:a})),getEditOns(e,t)))]}function getSelectCellValue(e,{row:t,column:n}){const{options:r,optionGroups:l,optionProps:o={},optionGroupProps:i={}}=e;e=_xeUtils.default.get(t,n.property);let a;const u=o.label||"label",d=o.value||"value";return(0,_utils.isEmptyValue)(e)?"":_xeUtils.default.map(_xeUtils.default.isArray(e)?e:[e],l?t=>{var n=i.options||"options";for(let e=0;e<l.length&&!(a=_xeUtils.default.find(l[e][n],e=>e[d]==t));e++);return a?a[u]:t}:t=>(a=_xeUtils.default.find(r,e=>e[d]==t))?a[u]:t).join(", ")}function handleExportSelectMethod(e){var{row:t,column:n,options:r}=e;return r.original?(0,_util.getCellValue)(t,n):getSelectCellValue(n.editRender||n.cellRender,e)}function getTreeSelectCellValue(e,{row:t,column:n}){var{options:e,optionProps:r={}}=e,t=_xeUtils.default.get(t,n.property);const l=r.label||"label",o=r.value||"value";n=r.children||"children";if((0,_utils.isEmptyValue)(t))return"";{const i={};return _xeUtils.default.eachTree(e,e=>{i[_xeUtils.default.get(e,o)]=e},{children:n}),_xeUtils.default.map(_xeUtils.default.isArray(t)?t:[t],e=>{e=i[e];return e&&_xeUtils.default.get(e,l)}).join(", ")}}function handleExportTreeSelectMethod(e){var{row:t,column:n,options:r}=e;return r.original?(0,_util.getCellValue)(t,n):getTreeSelectCellValue(n.editRender||n.cellRender,e)}renderer.mixin({input:{autofocus:"input",renderEdit:nativeEditRender,renderDefault:nativeEditRender,renderFilter:nativeFilterRender,defaultFilterMethod:handleInputFilterMethod},textarea:{autofocus:"textarea",renderEdit:nativeEditRender},select:{renderEdit:nativeSelectEditRender,renderDefault:nativeSelectEditRender,renderCell(e,t){return getCellLabelVNs(e,t,getSelectCellValue(e,t))},renderFilter(n,r){var e=r["column"];return e.filters.map((e,t)=>(0,_vue.h)("select",Object.assign(Object.assign({key:t,class:"vxe-default-select"},getNativeAttrs(n)),getNativeFilterOns(n,r,e)),n.optionGroups?renderNativeOptgroups(n,r,renderNativeOptions):renderNativeOptions(n.options,n,r)))},defaultFilterMethod:handleFilterMethod,exportMethod:handleExportSelectMethod},VxeInput:{autofocus:".vxe-input--inner",renderEdit:defaultEditRender,renderCell(e,t){var n,{props:r={}}=e,{row:l,column:o}=t,i=r.digits||(null==(n=getConfig().input)?void 0:n.digits)||2;let a=_xeUtils.default.get(l,o.property);if(a)switch(r.type){case"date":case"week":case"month":case"quarter":case"year":a=getLabelFormatDate(a,r);break;case"float":a=_xeUtils.default.toFixed(_xeUtils.default.floor(a,i),i)}return getCellLabelVNs(e,t,a)},renderDefault:defaultEditRender,renderFilter:defaultFilterRender,defaultFilterMethod:handleInputFilterMethod},VxeNumberInput:{autofocus:".vxe-number-input--inner",renderEdit:defaultEditRender,renderCell(e,t){var{props:n={}}=e,{row:r,column:l}=t,o=n.digits||(null==(o=getConfig().numberInput)?void 0:o.digits)||2;let i=_xeUtils.default.get(r,l.property);return getCellLabelVNs(e,t,i=i&&"float"===n.type?_xeUtils.default.toFixed(_xeUtils.default.floor(i,o),o):i)},renderDefault:defaultEditRender,renderFilter:defaultFilterRender,defaultFilterMethod:handleInputFilterMethod},VxeDatePicker:{autofocus:".vxe-date-picker--inner",renderEdit:defaultEditRender,renderCell(e,t){var{props:n={}}=e,{row:r,column:l}=t;let o=_xeUtils.default.get(r,l.property);if(o)switch(n.type){case"date":case"week":case"month":case"quarter":case"year":o=getLabelFormatDate(o,n)}return getCellLabelVNs(e,t,o)},renderDefault:defaultEditRender,renderFilter:defaultFilterRender,defaultFilterMethod:handleFilterMethod},VxeTextarea:{autofocus:".vxe-textarea--inner"},VxeButton:{renderDefault:buttonCellRender},VxeButtonGroup:{renderDefault(e,t){var n=e["options"];return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign({options:n},getCellEditProps(e,t,null)),getComponentOns(e,t)))]}},VxeSelect:{autofocus:".vxe-input--inner",renderEdit:defaultSelectEditRender,renderDefault:defaultSelectEditRender,renderCell(e,t){return getCellLabelVNs(e,t,getSelectCellValue(e,t))},renderFilter(r,l){var e=l["column"];const{options:o,optionProps:i,optionGroups:a,optionGroupProps:u}=r;return e.filters.map((e,t)=>{var n=e.data;return(0,_vue.h)(getDefaultComponent(r),Object.assign(Object.assign({key:t},getCellEditFilterProps(r,l,n,{options:o,optionProps:i,optionGroups:a,optionGroupProps:u})),getFilterOns(r,l,e)))})},defaultFilterMethod:handleFilterMethod,exportMethod:handleExportSelectMethod},VxeTreeSelect:{autofocus:".vxe-input--inner",renderEdit:defaultTreeSelectEditRender,renderCell(e,t){return getCellLabelVNs(e,t,getTreeSelectCellValue(e,t))},exportMethod:handleExportTreeSelectMethod},VxeRadioGroup:{renderDefault:radioAndCheckboxEditRender},VxeCheckboxGroup:{renderDefault:radioAndCheckboxEditRender},VxeSwitch:{autofocus:".vxe-switch--button",renderEdit:defaultEditRender,renderDefault:defaultEditRender},VxeUpload:{renderEdit:defaultEditRender,renderCell:defaultEditRender,renderDefault:defaultEditRender},VxeImage:{renderDefault(e,t){var{row:n,column:r}=t,l=e["props"],n=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign(Object.assign({},l),{src:n}),getEditOns(e,t)))]}},VxeImageGroup:{renderDefault(e,t){var{row:n,column:r}=t,l=e["props"],n=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign(Object.assign({},l),{urlList:n}),getEditOns(e,t)))]}},$input:{autofocus:".vxe-input--inner",renderEdit:oldEditRender,renderCell(e,t){var n,{props:r={}}=e,{row:l,column:o}=t,i=r.digits||(null==(n=getConfig().input)?void 0:n.digits)||2;let a=_xeUtils.default.get(l,o.property);if(a)switch(r.type){case"date":case"week":case"month":case"year":a=getLabelFormatDate(a,r);break;case"float":a=_xeUtils.default.toFixed(_xeUtils.default.floor(a,i),i)}return getCellLabelVNs(e,t,a)},renderDefault:oldEditRender,renderFilter:oldFilterRender,defaultFilterMethod:handleInputFilterMethod},$textarea:{autofocus:".vxe-textarea--inner"},$button:{renderDefault:oldButtonEditRender},$buttons:{renderDefault:oldButtonsEditRender},$select:{autofocus:".vxe-input--inner",renderEdit:oldSelectEditRender,renderDefault:oldSelectEditRender,renderCell(e,t){return getCellLabelVNs(e,t,getSelectCellValue(e,t))},renderFilter(r,l){var e=l["column"];const{options:o,optionProps:i,optionGroups:a,optionGroupProps:u}=r;return e.filters.map((e,t)=>{var n=e.data;return(0,_vue.h)(getOldComponent(r),Object.assign(Object.assign({key:t},getCellEditFilterProps(r,l,n,{options:o,optionProps:i,optionGroups:a,optionGroupProps:u})),getFilterOns(r,l,e)))})},defaultFilterMethod:handleFilterMethod,exportMethod:handleExportSelectMethod},$radio:{autofocus:".vxe-radio--input"},$checkbox:{autofocus:".vxe-checkbox--input"},$switch:{autofocus:".vxe-switch--button",renderEdit:oldEditRender,renderDefault:oldEditRender}});
+"use strict";var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("../../table/src/util"),_utils=require("../../ui/src/utils"),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const{getConfig,renderer,getI18n}=_ui.VxeUI,componentDefaultModelProp="modelValue",defaultCompProps={transfer:!0};function getModelEvent(e){switch(e.name){case"input":case"textarea":return"input"}return"update:modelValue"}function getChangeEvent(e){switch(e.name){case"input":case"textarea":case"VxeInput":case"VxeTextarea":case"$input":case"$textarea":return"input"}return"change"}function parseDate(e,t){return e&&t.valueFormat?_xeUtils.default.toStringDate(e,t.valueFormat):e}function getFormatDate(e,t,n){var{dateConfig:r={}}=t;return _xeUtils.default.toDateString(parseDate(e,t),r.labelFormat||n)}function getLabelFormatDate(e,t){return getFormatDate(e,t,getI18n("vxe.input.date.labelFormat."+t.type))}function getOldComponentName(e){return"vxe-"+e.replace("$","")}function getDefaultComponent({name:e}){return(0,_vue.resolveComponent)(e)}function getOldComponent({name:e}){return(0,_vue.resolveComponent)(getOldComponentName(e))}function handleConfirmFilter(e,t,n){e=e.$panel;e.changeOption({},t,n)}function getNativeAttrs(e){let{name:t,attrs:n}=e;return n="input"===t?Object.assign({type:"text"},n):n}function getInputImmediateModel(e){var{name:e,immediate:t,props:n}=e;return t||("VxeInput"===e||"$input"===e?(t=(n||{})["type"],!(!t||"text"===t||"number"===t||"integer"===t||"float"===t)):"input"!==e&&"textarea"!==e&&"$textarea"!==e)}function getCellEditProps(e,t,n,r){return _xeUtils.default.assign({immediate:getInputImmediateModel(e)},defaultCompProps,r,e.props,{[componentDefaultModelProp]:n})}function getCellEditFilterProps(e,t,n,r){return _xeUtils.default.assign({},defaultCompProps,r,e.props,{[componentDefaultModelProp]:n})}function isImmediateCell(e,t){return"cell"===t.$type||getInputImmediateModel(e)}function getCellLabelVNs(e,t,n){e=e.placeholder;return[(0,_vue.h)("span",{class:"vxe-cell--label"},e&&(0,_utils.isEmptyValue)(n)?[(0,_vue.h)("span",{class:"vxe-cell--placeholder"},(0,_utils.formatText)((0,_utils.getFuncText)(e),1))]:(0,_utils.formatText)(n,1))]}function getElementOns(e,n,t,r){const l=e["events"],o=getModelEvent(e),a=getChangeEvent(e),i=a===o,u={};return l&&_xeUtils.default.objectEach(l,(t,e)=>{u[(0,_vn.getOnName)(e)]=function(...e){t(n,...e)}}),t&&(u[(0,_vn.getOnName)(o)]=function(e){t(e),i&&r&&r(e),l&&l[o]&&l[o](n,e)}),!i&&r&&(u[(0,_vn.getOnName)(a)]=function(...e){r(...e),l&&l[a]&&l[a](n,...e)}),u}function getComponentOns(e,n,t,r){const l=e["events"],o=getModelEvent(e),a=getChangeEvent(e),i={};return _xeUtils.default.objectEach(l,(t,e)=>{i[(0,_vn.getOnName)(e)]=function(...e){"development"!==process.env.NODE_ENV||_xeUtils.default.isFunction(t)||(0,_log.errLog)("vxe.error.errFunc",[t]),t(n,...e)}}),t&&(i[(0,_vn.getOnName)(o)]=function(e){t(e),l&&l[o]&&l[o](n,e)}),r&&(i[(0,_vn.getOnName)(a)]=function(...e){r(...e),l&&l[a]&&l[a](n,...e)}),i}function getEditOns(e,t){const{$table:n,row:r,column:l}=t,o=e["name"],a=l["model"],i=isImmediateCell(e,t);return getComponentOns(e,t,e=>{i?(0,_util.setCellValue)(r,l,e):(a.update=!0,a.value=e)},e=>{!i&&["VxeInput","VxeTextarea","$input","$textarea"].includes(o)?(e=e.value,a.update=!0,a.value=e,n.updateStatus(t,e)):n.updateStatus(t)})}function getFilterOns(e,t,n){return getComponentOns(e,t,e=>{n.data=e},()=>{handleConfirmFilter(t,!_xeUtils.default.eqNull(n.data),n)})}function getNativeEditOns(t,n){const{$table:r,row:l,column:o}=n,a=o["model"];return getElementOns(t,n,e=>{e=e.target.value;isImmediateCell(t,n)?(0,_util.setCellValue)(l,o,e):(a.update=!0,a.value=e)},e=>{e=e.target.value;r.updateStatus(n,e)})}function getNativeFilterOns(e,t,n){return getElementOns(e,t,e=>{n.data=e.target.value},()=>{handleConfirmFilter(t,!_xeUtils.default.eqNull(n.data),n)})}function nativeEditRender(e,t){var{row:n,column:r}=t,l=e["name"],n=isImmediateCell(e,t)?(0,_util.getCellValue)(n,r):r.model.value;return[(0,_vue.h)(l,Object.assign(Object.assign(Object.assign({class:"vxe-default-"+l},getNativeAttrs(e)),{value:n}),getNativeEditOns(e,t)))]}function buttonCellRender(e,t){return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign({},getCellEditProps(e,t,null)),getComponentOns(e,t)))]}function defaultEditRender(e,t){var{row:n,column:r}=t,n=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign({},getCellEditProps(e,t,n)),getEditOns(e,t)))]}function radioAndCheckboxEditRender(e,t){var n=e["options"],{row:r,column:l}=t,r=(0,_util.getCellValue)(r,l);return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign({options:n},getCellEditProps(e,t,r)),getEditOns(e,t)))]}function oldEditRender(e,t){var{row:n,column:r}=t,n=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getOldComponent(e),Object.assign(Object.assign({},getCellEditProps(e,t,n)),getEditOns(e,t)))]}function oldButtonEditRender(e,t){return[(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),Object.assign(Object.assign({},getCellEditProps(e,t,null)),getComponentOns(e,t)))]}function oldButtonsEditRender(e,t){return e.children.map(e=>oldButtonEditRender(e,t)[0])}function renderNativeOptgroups(n,r,l){var{optionGroups:e,optionGroupProps:t={}}=n;const o=t.options||"options",a=t.label||"label";return e.map((e,t)=>(0,_vue.h)("optgroup",{key:t,label:e[a]},l(e[o],n,r)))}function renderNativeOptions(e,t,n){var{optionProps:r={}}=t,{row:l,column:o}=n;const a=r.label||"label",i=r.value||"value",u=r.disabled||"disabled",d=isImmediateCell(t,n)?(0,_util.getCellValue)(l,o):o.model.value;return e.map((e,t)=>(0,_vue.h)("option",{key:t,value:e[i],disabled:e[u],selected:e[i]==d},e[a]))}function nativeFilterRender(n,r){var e=r["column"];const l=n["name"],o=getNativeAttrs(n);return e.filters.map((e,t)=>(0,_vue.h)(l,Object.assign(Object.assign(Object.assign({key:t,class:"vxe-default-"+l},o),{value:e.data}),getNativeFilterOns(n,r,e))))}function defaultFilterRender(r,l){var e=l["column"];return e.filters.map((e,t)=>{var n=e.data;return(0,_vue.h)(getDefaultComponent(r),Object.assign(Object.assign({key:t},getCellEditFilterProps(r,r,n)),getFilterOns(r,l,e)))})}function oldFilterRender(r,l){var e=l["column"];return e.filters.map((e,t)=>{var n=e.data;return(0,_vue.h)(getOldComponent(r),Object.assign(Object.assign({key:t},getCellEditFilterProps(r,r,n)),getFilterOns(r,l,e)))})}function handleFilterMethod({option:e,row:t,column:n}){e=e.data;return _xeUtils.default.get(t,n.property)==e}function handleInputFilterMethod({option:e,row:t,column:n}){e=e.data,t=_xeUtils.default.get(t,n.property);return-1<_xeUtils.default.toValueString(t).indexOf(e)}function nativeSelectEditRender(e,t){return[(0,_vue.h)("select",Object.assign(Object.assign({class:"vxe-default-select"},getNativeAttrs(e)),getNativeEditOns(e,t)),e.optionGroups?renderNativeOptgroups(e,t,renderNativeOptions):renderNativeOptions(e.options,e,t))]}function defaultSelectEditRender(e,t){var{row:n,column:r}=t,{options:l,optionProps:o,optionGroups:a,optionGroupProps:i}=e,n=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign({},getCellEditProps(e,t,n,{options:l,optionProps:o,optionGroups:a,optionGroupProps:i})),getEditOns(e,t)))]}function defaultTreeSelectEditRender(e,t){var{row:n,column:r}=t,{options:l,optionProps:o}=e,n=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign({},getCellEditProps(e,t,n,{options:l,optionProps:o})),getEditOns(e,t)))]}function oldSelectEditRender(e,t){var{row:n,column:r}=t,{options:l,optionProps:o,optionGroups:a,optionGroupProps:i}=e,n=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getOldComponent(e),Object.assign(Object.assign({},getCellEditProps(e,t,n,{options:l,optionProps:o,optionGroups:a,optionGroupProps:i})),getEditOns(e,t)))]}function getSelectCellValue(e,{row:t,column:n}){const{options:r,optionGroups:l,optionProps:o={},optionGroupProps:a={}}=e;e=_xeUtils.default.get(t,n.property);let i;const u=o.label||"label",d=o.value||"value";return null!=e?_xeUtils.default.map(_xeUtils.default.isArray(e)?e:[e],l?t=>{var n=a.options||"options";for(let e=0;e<l.length&&!(i=_xeUtils.default.find(l[e][n],e=>e[d]==t));e++);return i?i[u]:t}:t=>(i=_xeUtils.default.find(r,e=>e[d]==t))?i[u]:t).join(", "):""}function handleExportSelectMethod(e){var{row:t,column:n,options:r}=e;return r.original?(0,_util.getCellValue)(t,n):getSelectCellValue(n.editRender||n.cellRender,e)}function getTreeSelectCellValue(e,{row:t,column:n}){var{options:e,optionProps:r={}}=e,t=_xeUtils.default.get(t,n.property);const l=r.label||"label",o=r.value||"value";n=r.children||"children";if(null==t)return"";{const a={};return _xeUtils.default.eachTree(e,e=>{a[_xeUtils.default.get(e,o)]=e},{children:n}),_xeUtils.default.map(_xeUtils.default.isArray(t)?t:[t],e=>{e=a[e];return e&&_xeUtils.default.get(e,l)}).join(", ")}}function handleExportTreeSelectMethod(e){var{row:t,column:n,options:r}=e;return r.original?(0,_util.getCellValue)(t,n):getTreeSelectCellValue(n.editRender||n.cellRender,e)}renderer.mixin({input:{autofocus:"input",renderEdit:nativeEditRender,renderDefault:nativeEditRender,renderFilter:nativeFilterRender,defaultFilterMethod:handleInputFilterMethod},textarea:{autofocus:"textarea",renderEdit:nativeEditRender},select:{renderEdit:nativeSelectEditRender,renderDefault:nativeSelectEditRender,renderCell(e,t){return getCellLabelVNs(e,t,getSelectCellValue(e,t))},renderFilter(n,r){var e=r["column"];return e.filters.map((e,t)=>(0,_vue.h)("select",Object.assign(Object.assign({key:t,class:"vxe-default-select"},getNativeAttrs(n)),getNativeFilterOns(n,r,e)),n.optionGroups?renderNativeOptgroups(n,r,renderNativeOptions):renderNativeOptions(n.options,n,r)))},defaultFilterMethod:handleFilterMethod,exportMethod:handleExportSelectMethod},VxeInput:{autofocus:"input",renderEdit:defaultEditRender,renderCell(e,t){var n,{props:r={}}=e,{row:l,column:o}=t,a=r.digits||(null==(n=getConfig().input)?void 0:n.digits)||2;let i=_xeUtils.default.get(l,o.property);if(i)switch(r.type){case"date":case"week":case"month":case"quarter":case"year":i=getLabelFormatDate(i,r);break;case"float":i=_xeUtils.default.toFixed(_xeUtils.default.floor(i,a),a)}return getCellLabelVNs(e,t,i)},renderDefault:defaultEditRender,renderFilter:defaultFilterRender,defaultFilterMethod:handleInputFilterMethod},VxeNumberInput:{autofocus:"input",renderEdit:defaultEditRender,renderCell(e,t){var{props:n={}}=e,{row:r,column:l}=t,o=n.digits||(null==(o=getConfig().numberInput)?void 0:o.digits)||2;let a=_xeUtils.default.get(r,l.property);return getCellLabelVNs(e,t,a=a&&"float"===n.type?_xeUtils.default.toFixed(_xeUtils.default.floor(a,o),o):a)},renderDefault:defaultEditRender,renderFilter:defaultFilterRender,defaultFilterMethod:handleInputFilterMethod},VxeDatePicker:{autofocus:"input",renderEdit:defaultEditRender,renderCell(e,t){var{props:n={}}=e,{row:r,column:l}=t;let o=_xeUtils.default.get(r,l.property);if(o)switch(n.type){case"date":case"week":case"month":case"quarter":case"year":o=getLabelFormatDate(o,n)}return getCellLabelVNs(e,t,o)},renderDefault:defaultEditRender,renderFilter:defaultFilterRender,defaultFilterMethod:handleFilterMethod},VxeTextarea:{autofocus:"VxeTextarea"},VxeButton:{renderDefault:buttonCellRender},VxeButtonGroup:{renderDefault(e,t){var n=e["options"];return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign({options:n},getCellEditProps(e,t,null)),getComponentOns(e,t)))]}},VxeSelect:{autofocus:"input",renderEdit:defaultSelectEditRender,renderDefault:defaultSelectEditRender,renderCell(e,t){return getCellLabelVNs(e,t,getSelectCellValue(e,t))},renderFilter(r,l){var e=l["column"];const{options:o,optionProps:a,optionGroups:i,optionGroupProps:u}=r;return e.filters.map((e,t)=>{var n=e.data;return(0,_vue.h)(getDefaultComponent(r),Object.assign(Object.assign({key:t},getCellEditFilterProps(r,l,n,{options:o,optionProps:a,optionGroups:i,optionGroupProps:u})),getFilterOns(r,l,e)))})},defaultFilterMethod:handleFilterMethod,exportMethod:handleExportSelectMethod},VxeTreeSelect:{autofocus:"input",renderEdit:defaultTreeSelectEditRender,renderCell(e,t){return getCellLabelVNs(e,t,getTreeSelectCellValue(e,t))},exportMethod:handleExportTreeSelectMethod},VxeRadioGroup:{renderDefault:radioAndCheckboxEditRender},VxeCheckboxGroup:{renderDefault:radioAndCheckboxEditRender},VxeSwitch:{autofocus:"button",renderEdit:defaultEditRender,renderDefault:defaultEditRender},VxeUpload:{renderEdit:defaultEditRender,renderCell:defaultEditRender,renderDefault:defaultEditRender},VxeImage:{renderDefault(e,t){var{row:n,column:r}=t,l=e["props"],n=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign(Object.assign({},l),{src:n}),getEditOns(e,t)))]}},VxeImageGroup:{renderDefault(e,t){var{row:n,column:r}=t,l=e["props"],n=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getDefaultComponent(e),Object.assign(Object.assign(Object.assign({},l),{urlList:n}),getEditOns(e,t)))]}},$input:{autofocus:".vxe-input--inner",renderEdit:oldEditRender,renderCell(e,t){var n,{props:r={}}=e,{row:l,column:o}=t,a=r.digits||(null==(n=getConfig().input)?void 0:n.digits)||2;let i=_xeUtils.default.get(l,o.property);if(i)switch(r.type){case"date":case"week":case"month":case"year":i=getLabelFormatDate(i,r);break;case"float":i=_xeUtils.default.toFixed(_xeUtils.default.floor(i,a),a)}return getCellLabelVNs(e,t,i)},renderDefault:oldEditRender,renderFilter:oldFilterRender,defaultFilterMethod:handleInputFilterMethod},$textarea:{autofocus:".vxe-textarea--inner"},$button:{renderDefault:oldButtonEditRender},$buttons:{renderDefault:oldButtonsEditRender},$select:{autofocus:".vxe-input--inner",renderEdit:oldSelectEditRender,renderDefault:oldSelectEditRender,renderCell(e,t){return getCellLabelVNs(e,t,getSelectCellValue(e,t))},renderFilter(r,l){var e=l["column"];const{options:o,optionProps:a,optionGroups:i,optionGroupProps:u}=r;return e.filters.map((e,t)=>{var n=e.data;return(0,_vue.h)(getOldComponent(r),Object.assign(Object.assign({key:t},getCellEditFilterProps(r,l,n,{options:o,optionProps:a,optionGroups:i,optionGroupProps:u})),getFilterOns(r,l,e)))})},defaultFilterMethod:handleFilterMethod,exportMethod:handleExportSelectMethod},$radio:{autofocus:".vxe-radio--input"},$checkbox:{autofocus:".vxe-checkbox--input"},$switch:{autofocus:".vxe-switch--button",renderEdit:oldEditRender,renderDefault:oldEditRender}});

package/lib/table/src/footer.js

@@ -252,7 +252,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           const showAllTip = tooltipOpts.showAll;
           const isColGroup = column.children && column.children.length;
           const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : column.fixed && overflowX;
-          const footOverflow = _xeUtils.default.isUndefined(showFooterOverflow) || _xeUtils.default.isNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
+          const footOverflow = _xeUtils.default.eqNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
           const footAlign = footerAlign || align || allFooterAlign || allAlign;
           let showEllipsis = footOverflow === 'ellipsis';
           const showTitle = footOverflow === 'title';

package/lib/table/src/footer.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")),_dom=require("../../ui/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const renderType="footer";function mergeFooterMethod(l,t,o){for(let e=0;e<l.length;e++){var{row:r,col:a,rowspan:n,colspan:s}=l[e];if(-1<a&&-1<r&&n&&s){if(r===t&&a===o)return{rowspan:n,colspan:s};if(r<=t&&t<r+n&&a<=o&&o<a+s)return{rowspan:0,colspan:0}}}}var _default=exports.default=(0,_vue.defineComponent)({name:"VxeTableFooter",props:{footerTableData:{type:Array,default:()=>[]},tableColumn:{type:Array,default:()=>[]},fixedColumn:{type:Array,default:()=>[]},fixedType:{type:String,default:null}},setup(i){const A=(0,_vue.inject)("$xeTable",{}),{xID:a,props:n,reactData:u,internalData:c}=A,{refTableHeader:d,refTableBody:p,refValidTooltip:f}=A.getRefMaps(),{computeTooltipOpts:s,computeColumnOpts:v}=A.getComputeMaps(),x=(0,_vue.ref)(),m=(0,_vue.ref)(),_=(0,_vue.ref)(),g=(0,_vue.ref)(),y=(0,_vue.ref)(),E=e=>{var l=i["fixedType"],t=u["scrollXLoad"],o=c["lastScrollLeft"],r=f.value,a=d.value,n=p.value,a=a?a.$el:null,s=x.value,n=n.$el,s=s.scrollLeft,o=s!==o;c.lastScrollLeft=s,u.lastScrollTime=Date.now(),a&&(a.scrollLeft=s),n&&(n.scrollLeft=s),t&&o&&A.triggerScrollXEvent(e),o&&r&&r.reactData.visible&&r.updatePlacement(),A.dispatchEvent("scroll",{type:renderType,fixed:l,scrollTop:n.scrollTop,scrollLeft:s,isX:o,isY:!1},e)};(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{var e=i["fixedType"],l=c["elemStore"],e=`${e||"main"}-footer-`;l[e+"wrapper"]=x,l[e+"table"]=m,l[e+"colgroup"]=_,l[e+"list"]=g,l[e+"xSpace"]=y})}),(0,_vue.onUnmounted)(()=>{var e=i["fixedType"],l=c["elemStore"],e=`${e||"main"}-footer-`;l[e+"wrapper"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null});return()=>{let{fixedType:b,fixedColumn:e,tableColumn:h,footerTableData:w}=i;const{footerRowClassName:l,footerCellClassName:T,footerRowStyle:t,footerCellStyle:C,footerAlign:S,footerSpanMethod:I,align:$,columnKey:F,showFooterOverflow:O}=n;var o=c["visibleColumn"];const{scrollXLoad:D,overflowX:L,scrollbarWidth:r,currentColumn:M,mergeFooterList:j}=u,U=s.value,k=v.value;return b&&(h=u.expandColumn||!D&&!O||j.length&&I?o:e),(0,_vue.h)("div",{ref:x,class:["vxe-table--footer-wrapper",b?`fixed-${b}--wrapper`:"body--wrapper"],xid:a,onScroll:E},[b?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:y,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:m,class:"vxe-table--footer",xid:a,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:_},h.map((e,l)=>(0,_vue.h)("col",{name:e.id,key:l})).concat(r?[(0,_vue.h)("col",{name:"col_gutter"})]:[])),(0,_vue.h)("tfoot",{ref:g},w.map((_,g)=>{const y=g;var e={$table:A,row:_,_rowIndex:g,$rowIndex:y,fixed:b,type:renderType};return(0,_vue.h)("tr",{class:["vxe-footer--row",l?_xeUtils.default.isFunction(l)?l(e):l:""],style:t?_xeUtils.default.isFunction(t)?t(e):t:null},h.map((l,e)=>{var{type:t,showFooterOverflow:o,footerAlign:r,align:a,footerClassName:n}=l;const s=U.showAll;var i=l.children&&l.children.length,i=b?l.fixed!==b&&!i:l.fixed&&L,o=_xeUtils.default.isUndefined(o)||_xeUtils.default.isNull(o)?O:o,r=r||a||S||$;let u="ellipsis"===o;const c="title"===o,d=!0===o||"tooltip"===o;let p=c||d||u;var a={colid:l.id},o={},f=A.getColumnIndex(l),v=A.getVTColumnIndex(l),x=v;const m={$table:A,$grid:A.xegrid,row:_,rowIndex:g,_rowIndex:g,$rowIndex:y,column:l,columnIndex:f,$columnIndex:e,_columnIndex:v,itemIndex:x,items:_,fixed:b,type:renderType,data:w};if(D&&!p&&(u=p=!0),(c||d||s)&&(o.onMouseenter=e=>{c?(0,_dom.updateCellTitle)(e.currentTarget,l):(d||s)&&A.triggerFooterTooltipEvent(e,m)}),(d||s)&&(o.onMouseleave=e=>{(d||s)&&A.handleTargetLeaveEvent(e)}),o.onClick=e=>{A.dispatchEvent("footer-cell-click",Object.assign({cell:e.currentTarget},m),e)},o.onDblclick=e=>{A.dispatchEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},m),e)},j.length){f=mergeFooterMethod(j,g,v);if(f){var{rowspan:x,colspan:v}=f;if(!x||!v)return null;1<x&&(a.rowspan=x),1<v&&(a.colspan=v)}}else if(I){var{rowspan:f=1,colspan:x=1}=I(m)||{};if(!f||!x)return null;1<f&&(a.rowspan=f),1<x&&(a.colspan=x)}return(0,_vue.h)("td",Object.assign(Object.assign(Object.assign(Object.assign({class:["vxe-footer--column",l.id,{["col--"+r]:r,["col--"+t]:t,"col--last":e===h.length-1,"fixed--hidden":i,"col--ellipsis":p,"col--current":M===l},(0,_dom.getPropClass)(n,m),(0,_dom.getPropClass)(T,m)]},a),{style:C?_xeUtils.default.isFunction(C)?C(m):C:null}),o),{key:F||k.useKey?l.id:e}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":c,"c--tooltip":d,"c--ellipsis":u}]},l.renderFooter(m))])}).concat(r?[(0,_vue.h)("td",{class:"vxe-footer--gutter col--gutter"})]:[]))}))])])}}});
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_dom=require("../../ui/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const renderType="footer";function mergeFooterMethod(l,t,o){for(let e=0;e<l.length;e++){var{row:r,col:a,rowspan:n,colspan:s}=l[e];if(-1<a&&-1<r&&n&&s){if(r===t&&a===o)return{rowspan:n,colspan:s};if(r<=t&&t<r+n&&a<=o&&o<a+s)return{rowspan:0,colspan:0}}}}var _default=exports.default=(0,_vue.defineComponent)({name:"VxeTableFooter",props:{footerTableData:{type:Array,default:()=>[]},tableColumn:{type:Array,default:()=>[]},fixedColumn:{type:Array,default:()=>[]},fixedType:{type:String,default:null}},setup(u){const A=(0,_vue.inject)("$xeTable",{}),{xID:a,props:n,reactData:i,internalData:c}=A,{refTableHeader:d,refTableBody:p,refValidTooltip:f}=A.getRefMaps(),{computeTooltipOpts:s,computeColumnOpts:v}=A.getComputeMaps(),x=(0,_vue.ref)(),m=(0,_vue.ref)(),g=(0,_vue.ref)(),_=(0,_vue.ref)(),y=(0,_vue.ref)(),E=e=>{var l=u["fixedType"],t=i["scrollXLoad"],o=c["lastScrollLeft"],r=f.value,a=d.value,n=p.value,a=a?a.$el:null,s=x.value,n=n.$el,s=s.scrollLeft,o=s!==o;c.lastScrollLeft=s,i.lastScrollTime=Date.now(),a&&(a.scrollLeft=s),n&&(n.scrollLeft=s),t&&o&&A.triggerScrollXEvent(e),o&&r&&r.reactData.visible&&r.updatePlacement(),A.dispatchEvent("scroll",{type:renderType,fixed:l,scrollTop:n.scrollTop,scrollLeft:s,isX:o,isY:!1},e)};(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{var e=u["fixedType"],l=c["elemStore"],e=`${e||"main"}-footer-`;l[e+"wrapper"]=x,l[e+"table"]=m,l[e+"colgroup"]=g,l[e+"list"]=_,l[e+"xSpace"]=y})}),(0,_vue.onUnmounted)(()=>{var e=u["fixedType"],l=c["elemStore"],e=`${e||"main"}-footer-`;l[e+"wrapper"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null});return()=>{let{fixedType:b,fixedColumn:e,tableColumn:h,footerTableData:w}=u;const{footerRowClassName:l,footerCellClassName:T,footerRowStyle:t,footerCellStyle:C,footerAlign:S,footerSpanMethod:I,align:$,columnKey:F,showFooterOverflow:O}=n;var o=c["visibleColumn"];const{scrollXLoad:D,overflowX:L,scrollbarWidth:r,currentColumn:M,mergeFooterList:j}=i,k=s.value,q=v.value;return b&&(h=i.expandColumn||!D&&!O||j.length&&I?o:e),(0,_vue.h)("div",{ref:x,class:["vxe-table--footer-wrapper",b?`fixed-${b}--wrapper`:"body--wrapper"],xid:a,onScroll:E},[b?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:y,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:m,class:"vxe-table--footer",xid:a,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:g},h.map((e,l)=>(0,_vue.h)("col",{name:e.id,key:l})).concat(r?[(0,_vue.h)("col",{name:"col_gutter"})]:[])),(0,_vue.h)("tfoot",{ref:_},w.map((g,_)=>{const y=_;var e={$table:A,row:g,_rowIndex:_,$rowIndex:y,fixed:b,type:renderType};return(0,_vue.h)("tr",{class:["vxe-footer--row",l?_xeUtils.default.isFunction(l)?l(e):l:""],style:t?_xeUtils.default.isFunction(t)?t(e):t:null},h.map((l,e)=>{var{type:t,showFooterOverflow:o,footerAlign:r,align:a,footerClassName:n}=l;const s=k.showAll;var u=l.children&&l.children.length,u=b?l.fixed!==b&&!u:l.fixed&&L,o=_xeUtils.default.eqNull(o)?O:o,r=r||a||S||$;let i="ellipsis"===o;const c="title"===o,d=!0===o||"tooltip"===o;let p=c||d||i;var a={colid:l.id},o={},f=A.getColumnIndex(l),v=A.getVTColumnIndex(l),x=v;const m={$table:A,$grid:A.xegrid,row:g,rowIndex:_,_rowIndex:_,$rowIndex:y,column:l,columnIndex:f,$columnIndex:e,_columnIndex:v,itemIndex:x,items:g,fixed:b,type:renderType,data:w};if(D&&!p&&(i=p=!0),(c||d||s)&&(o.onMouseenter=e=>{c?(0,_dom.updateCellTitle)(e.currentTarget,l):(d||s)&&A.triggerFooterTooltipEvent(e,m)}),(d||s)&&(o.onMouseleave=e=>{(d||s)&&A.handleTargetLeaveEvent(e)}),o.onClick=e=>{A.dispatchEvent("footer-cell-click",Object.assign({cell:e.currentTarget},m),e)},o.onDblclick=e=>{A.dispatchEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},m),e)},j.length){f=mergeFooterMethod(j,_,v);if(f){var{rowspan:x,colspan:v}=f;if(!x||!v)return null;1<x&&(a.rowspan=x),1<v&&(a.colspan=v)}}else if(I){var{rowspan:f=1,colspan:x=1}=I(m)||{};if(!f||!x)return null;1<f&&(a.rowspan=f),1<x&&(a.colspan=x)}return(0,_vue.h)("td",Object.assign(Object.assign(Object.assign(Object.assign({class:["vxe-footer--column",l.id,{["col--"+r]:r,["col--"+t]:t,"col--last":e===h.length-1,"fixed--hidden":u,"col--ellipsis":p,"col--current":M===l},(0,_dom.getPropClass)(n,m),(0,_dom.getPropClass)(T,m)]},a),{style:C?_xeUtils.default.isFunction(C)?C(m):C:null}),o),{key:F||q.useKey?l.id:e}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":c,"c--tooltip":d,"c--ellipsis":i}]},l.renderFooter(m))])}).concat(r?[(0,_vue.h)("td",{class:"vxe-footer--gutter col--gutter"})]:[]))}))])])}}});

package/lib/table/src/header.js

@@ -289,7 +289,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           } = column;
           const isColGroup = column.children && column.children.length;
           const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : !!column.fixed && overflowX;
-          const headOverflow = _xeUtils.default.isUndefined(showHeaderOverflow) || _xeUtils.default.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
+          const headOverflow = _xeUtils.default.eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
           const headAlign = headerAlign || align || allHeaderAlign || allAlign;
           let showEllipsis = headOverflow === 'ellipsis';
           const showTitle = headOverflow === 'title';

package/lib/table/src/header.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")),_util=require("./util"),_dom=require("../../ui/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const renderType="header";var _default=exports.default=(0,_vue.defineComponent)({name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},setup(W){const U=(0,_vue.inject)("$xeTable",{}),{xID:u,props:d,reactData:k,internalData:H}=U,{refElem:M,refTableBody:z,refLeftContainer:S,refRightContainer:$,refCellResizeBar:D}=U.getRefMaps(),c=U.getComputeMaps()["computeColumnOpts"],f=(0,_vue.ref)([]),I=(0,_vue.ref)(),p=(0,_vue.ref)(),v=(0,_vue.ref)(),m=(0,_vue.ref)(),h=(0,_vue.ref)(),O=(0,_vue.ref)(),t=()=>{var e=k["isGroup"];f.value=e?(0,_util.convertHeaderColumnToRows)(W.tableGroupColumn):[]},A=(e,t)=>{const r=t["column"],a=W["fixedType"];var l=z.value;const o=S.value,n=$.value,i=D.value,s=e["clientX"];var u=I.value,d=e.target;const c=t.cell=d.parentNode;let f=0;const p=l.$el;l=(0,_dom.getOffsetPos)(d,u),u=d.clientWidth,d=Math.floor(u/2);const v=(0,_util.getColReMinWidth)(t)-d;let m=l.left-c.clientWidth+u+v,h=l.left+d;const x=document.onmousemove,_=document.onmouseup,g="left"===a,b="right"===a,C=M.value;let y=0;if(g||b){var w=g?"nextElementSibling":"previousElementSibling";let e=c[w];for(;e&&!(0,_dom.hasClass)(e,"fixed--hidden");)(0,_dom.hasClass)(e,"col--group")||(y+=e.offsetWidth),e=e[w];b&&n&&(h=n.offsetLeft+y)}function T(e){e.stopPropagation(),e.preventDefault(),e=e.clientX-s;let l=h+e;e=a?0:p.scrollLeft,g?l=Math.min(l,(n?n.offsetLeft:p.clientWidth)-y-v):b?(m=(o?o.clientWidth:0)+y+v,l=Math.min(l,h+c.clientWidth-v)):m=Math.max(p.scrollLeft,m),f=Math.max(l,m),i.style.left=f-e+"px"}k._isResize=!0,(0,_dom.addClass)(C,"drag--resize"),i.style.display="block",document.onmousemove=T,document.onmouseup=function(e){document.onmousemove=x,document.onmouseup=_;const l=r.renderWidth+(b?h-f:f-h);r.resizeWidth=l,i.style.display="none",k._isResize=!1,H._lastResizeTime=Date.now(),U.analyColumnWidth(),U.recalculate(!0).then(()=>{U.saveCustomStore("update:visible"),U.updateCellAreas(),U.dispatchEvent("resizable-change",Object.assign(Object.assign({},t),{resizeWidth:l}),e),setTimeout(()=>U.recalculate(!0),300)}),(0,_dom.removeClass)(C,"drag--resize")},T(e),U.closeMenu&&U.closeMenu()};(0,_vue.watch)(()=>W.tableColumn,t),(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{var e=W["fixedType"],l=U["internalData"],l=l["elemStore"],e=`${e||"main"}-header-`;l[e+"wrapper"]=I,l[e+"table"]=p,l[e+"colgroup"]=v,l[e+"list"]=m,l[e+"xSpace"]=h,l[e+"repair"]=O,t()})}),(0,_vue.onUnmounted)(()=>{var e=W["fixedType"],l=U["internalData"],l=l["elemStore"],e=`${e||"main"}-header-`;l[e+"wrapper"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"repair"]=null});return()=>{const{fixedType:x,fixedColumn:e,tableColumn:l}=W,{resizable:_,border:g,columnKey:b,headerRowClassName:t,headerCellClassName:C,headerRowStyle:r,headerCellStyle:y,showHeaderOverflow:w,headerAlign:T,align:M,mouseConfig:z}=d,{isGroup:a,currentColumn:S,scrollXLoad:$,overflowX:D,scrollbarWidth:o}=k;var n=H["visibleColumn"];const R=c.value;let i=f.value,s=l;return a?s=n:(x&&($||w)&&(s=e),i=[s]),(0,_vue.h)("div",{ref:I,class:["vxe-table--header-wrapper",x?`fixed-${x}--wrapper`:"body--wrapper"],xid:u},[x?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:h,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:p,class:"vxe-table--header",xid:u,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:v},s.map((e,l)=>(0,_vue.h)("col",{name:e.id,key:l})).concat(o?[(0,_vue.h)("col",{name:"col_gutter"})]:[])),(0,_vue.h)("thead",{ref:m},i.map((m,h)=>(0,_vue.h)("tr",{class:["vxe-header--row",t?_xeUtils.default.isFunction(t)?t({$table:U,$rowIndex:h,fixed:x,type:renderType}):t:""],style:r?_xeUtils.default.isFunction(r)?r({$table:U,$rowIndex:h,fixed:x,type:renderType}):r:null},m.map((e,l)=>{var{type:t,showHeaderOverflow:r,headerAlign:a,align:o,headerClassName:n}=e,i=e.children&&e.children.length,s=x?e.fixed!==x&&!i:!!e.fixed&&D,r=_xeUtils.default.isUndefined(r)||_xeUtils.default.isNull(r)?w:r,a=a||o||T||M;let u="ellipsis"===r;o="title"===r,r=!0===r||"tooltip"===r;let d=o||r||u;var c=e.filters&&e.filters.some(e=>e.checked),f=U.getColumnIndex(e),p=U.getVTColumnIndex(e);const v={$table:U,$grid:U.xegrid,$rowIndex:h,column:e,columnIndex:f,$columnIndex:l,_columnIndex:p,fixed:x,type:renderType,isHidden:s,hasFilter:c};f={onClick:e=>U.triggerHeaderCellClickEvent(e,v),onDblclick:e=>U.triggerHeaderCellDblclickEvent(e,v)};return $&&!d&&(u=d=!0),z&&(f.onMousedown=e=>U.triggerHeaderCellMousedownEvent(e,v)),(0,_vue.h)("th",Object.assign(Object.assign({class:["vxe-header--column",e.id,{["col--"+a]:a,["col--"+t]:t,"col--last":l===m.length-1,"col--fixed":e.fixed,"col--group":i,"col--ellipsis":d,"fixed--hidden":s,"is--sortable":e.sortable,"col--filter":!!e.filters,"is--filter-active":c,"col--current":S===e},n?_xeUtils.default.isFunction(n)?n(v):n:"",C?_xeUtils.default.isFunction(C)?C(v):C:""],colid:e.id,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null,style:y?_xeUtils.default.isFunction(y)?y(v):y:null},f),{key:b||R.useKey||i?e.id:l}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":o,"c--tooltip":r,"c--ellipsis":u}]},e.renderHeader(v)),s||i||!(_xeUtils.default.isBoolean(e.resizable)?e.resizable:R.resizable||_)?null:(0,_vue.h)("div",{class:["vxe-resizable",{"is--line":!g||"none"===g}],onMousedown:e=>A(e,v)})])}).concat(o?[(0,_vue.h)("th",{class:"vxe-header--gutter col--gutter"})]:[]))))]),(0,_vue.h)("div",{ref:O,class:"vxe-table--header-border-line"})])}}});
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("./util"),_dom=require("../../ui/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const renderType="header";var _default=exports.default=(0,_vue.defineComponent)({name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},setup(W){const k=(0,_vue.inject)("$xeTable",{}),{xID:u,props:d,reactData:H,internalData:I}=k,{refElem:M,refTableBody:z,refLeftContainer:S,refRightContainer:$,refCellResizeBar:D}=k.getRefMaps(),c=k.getComputeMaps()["computeColumnOpts"],f=(0,_vue.ref)([]),O=(0,_vue.ref)(),p=(0,_vue.ref)(),v=(0,_vue.ref)(),m=(0,_vue.ref)(),h=(0,_vue.ref)(),U=(0,_vue.ref)(),t=()=>{var e=H["isGroup"];f.value=e?(0,_util.convertHeaderColumnToRows)(W.tableGroupColumn):[]},q=(e,t)=>{const r=t["column"],a=W["fixedType"];var l=z.value;const o=S.value,n=$.value,i=D.value,s=e["clientX"];var u=O.value,d=e.target;const c=t.cell=d.parentNode;let f=0;const p=l.$el;l=(0,_dom.getOffsetPos)(d,u),u=d.clientWidth,d=Math.floor(u/2);const v=(0,_util.getColReMinWidth)(t)-d;let m=l.left-c.clientWidth+u+v,h=l.left+d;const x=document.onmousemove,_=document.onmouseup,g="left"===a,b="right"===a,C=M.value;let y=0;if(g||b){var w=g?"nextElementSibling":"previousElementSibling";let e=c[w];for(;e&&!(0,_dom.hasClass)(e,"fixed--hidden");)(0,_dom.hasClass)(e,"col--group")||(y+=e.offsetWidth),e=e[w];b&&n&&(h=n.offsetLeft+y)}function T(e){e.stopPropagation(),e.preventDefault(),e=e.clientX-s;let l=h+e;e=a?0:p.scrollLeft,g?l=Math.min(l,(n?n.offsetLeft:p.clientWidth)-y-v):b?(m=(o?o.clientWidth:0)+y+v,l=Math.min(l,h+c.clientWidth-v)):m=Math.max(p.scrollLeft,m),f=Math.max(l,m),i.style.left=f-e+"px"}H._isResize=!0,(0,_dom.addClass)(C,"drag--resize"),i.style.display="block",document.onmousemove=T,document.onmouseup=function(e){document.onmousemove=x,document.onmouseup=_;const l=r.renderWidth+(b?h-f:f-h);r.resizeWidth=l,i.style.display="none",H._isResize=!1,I._lastResizeTime=Date.now(),k.analyColumnWidth(),k.recalculate(!0).then(()=>{k.saveCustomStore("update:visible"),k.updateCellAreas(),k.dispatchEvent("resizable-change",Object.assign(Object.assign({},t),{resizeWidth:l}),e),setTimeout(()=>k.recalculate(!0),300)}),(0,_dom.removeClass)(C,"drag--resize")},T(e),k.closeMenu&&k.closeMenu()};(0,_vue.watch)(()=>W.tableColumn,t),(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{var e=W["fixedType"],l=k["internalData"],l=l["elemStore"],e=`${e||"main"}-header-`;l[e+"wrapper"]=O,l[e+"table"]=p,l[e+"colgroup"]=v,l[e+"list"]=m,l[e+"xSpace"]=h,l[e+"repair"]=U,t()})}),(0,_vue.onUnmounted)(()=>{var e=W["fixedType"],l=k["internalData"],l=l["elemStore"],e=`${e||"main"}-header-`;l[e+"wrapper"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"repair"]=null});return()=>{const{fixedType:x,fixedColumn:e,tableColumn:l}=W,{resizable:_,border:g,columnKey:b,headerRowClassName:t,headerCellClassName:C,headerRowStyle:r,headerCellStyle:y,showHeaderOverflow:w,headerAlign:T,align:M,mouseConfig:z}=d,{isGroup:a,currentColumn:S,scrollXLoad:$,overflowX:D,scrollbarWidth:o}=H;var n=I["visibleColumn"];const R=c.value;let i=f.value,s=l;return a?s=n:(x&&($||w)&&(s=e),i=[s]),(0,_vue.h)("div",{ref:O,class:["vxe-table--header-wrapper",x?`fixed-${x}--wrapper`:"body--wrapper"],xid:u},[x?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:h,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:p,class:"vxe-table--header",xid:u,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:v},s.map((e,l)=>(0,_vue.h)("col",{name:e.id,key:l})).concat(o?[(0,_vue.h)("col",{name:"col_gutter"})]:[])),(0,_vue.h)("thead",{ref:m},i.map((m,h)=>(0,_vue.h)("tr",{class:["vxe-header--row",t?_xeUtils.default.isFunction(t)?t({$table:k,$rowIndex:h,fixed:x,type:renderType}):t:""],style:r?_xeUtils.default.isFunction(r)?r({$table:k,$rowIndex:h,fixed:x,type:renderType}):r:null},m.map((e,l)=>{var{type:t,showHeaderOverflow:r,headerAlign:a,align:o,headerClassName:n}=e,i=e.children&&e.children.length,s=x?e.fixed!==x&&!i:!!e.fixed&&D,r=_xeUtils.default.eqNull(r)?w:r,a=a||o||T||M;let u="ellipsis"===r;o="title"===r,r=!0===r||"tooltip"===r;let d=o||r||u;var c=e.filters&&e.filters.some(e=>e.checked),f=k.getColumnIndex(e),p=k.getVTColumnIndex(e);const v={$table:k,$grid:k.xegrid,$rowIndex:h,column:e,columnIndex:f,$columnIndex:l,_columnIndex:p,fixed:x,type:renderType,isHidden:s,hasFilter:c};f={onClick:e=>k.triggerHeaderCellClickEvent(e,v),onDblclick:e=>k.triggerHeaderCellDblclickEvent(e,v)};return $&&!d&&(u=d=!0),z&&(f.onMousedown=e=>k.triggerHeaderCellMousedownEvent(e,v)),(0,_vue.h)("th",Object.assign(Object.assign({class:["vxe-header--column",e.id,{["col--"+a]:a,["col--"+t]:t,"col--last":l===m.length-1,"col--fixed":e.fixed,"col--group":i,"col--ellipsis":d,"fixed--hidden":s,"is--sortable":e.sortable,"col--filter":!!e.filters,"is--filter-active":c,"col--current":S===e},n?_xeUtils.default.isFunction(n)?n(v):n:"",C?_xeUtils.default.isFunction(C)?C(v):C:""],colid:e.id,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null,style:y?_xeUtils.default.isFunction(y)?y(v):y:null},f),{key:b||R.useKey||i?e.id:l}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":o,"c--tooltip":r,"c--ellipsis":u}]},e.renderHeader(v)),s||i||!(_xeUtils.default.isBoolean(e.resizable)?e.resizable:R.resizable||_)?null:(0,_vue.h)("div",{class:["vxe-resizable",{"is--line":!g||"none"===g}],onMousedown:e=>q(e,v)})])}).concat(o?[(0,_vue.h)("th",{class:"vxe-header--gutter col--gutter"})]:[]))))]),(0,_vue.h)("div",{ref:U,class:"vxe-table--header-border-line"})])}}});

package/lib/toolbar/src/toolbar.js

@@ -349,6 +349,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                   round: item.round,
                   status: item.status,
                   content: item.name,
+                  permissionCode: item.permissionCode,
                   destroyOnClose: item.destroyOnClose,
                   placement: item.placement,
                   transfer: item.transfer,

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

package/lib/ui/index.js

@@ -13,9 +13,9 @@ Object.defineProperty(exports, "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");
 var _utils = require("./src/utils");
-const version = exports.version = "4.7.59";
+const version = exports.version = "4.7.61";
 _core.VxeUI.version = version;
-_core.VxeUI.tableVersion = "4.7.59";
+_core.VxeUI.tableVersion = "4.7.61";
 _core.VxeUI.setConfig({
   emptyCell: '　',
   table: {

package/lib/ui/index.min.js

@@ -1 +1 @@
-"use strict";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");const version=exports.version="4.7.59",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion="4.7.59",_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{refreshDelay:250},radioConfig:{strict:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single"},columnConfig:{maxFixedSize:4},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0}},sortConfig:{showIcon:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",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,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,exports.VXETable=_core.VxeUI),saveFile=(VXETable.setup=config,VXETable.config=config,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;
+"use strict";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");const version=exports.version="4.7.61",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion="4.7.61",_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{refreshDelay:250},radioConfig:{strict:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single"},columnConfig:{maxFixedSize:4},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0}},sortConfig:{showIcon:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",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,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,exports.VXETable=_core.VxeUI),saveFile=(VXETable.setup=config,VXETable.config=config,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

@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
 const {
   log
 } = _core.VxeUI;
-const version = `table v${"4.7.59"}`;
+const version = `table v${"4.7.61"}`;
 const warnLog = exports.warnLog = log.create('warn', version);
 const errLog = exports.errLog = log.create('error', version);

package/lib/ui/src/log.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");const log=_core.VxeUI["log"],version="table v4.7.59",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");const log=_core.VxeUI["log"],version="table v4.7.61",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.7.59",
+  "version": "4.7.61",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "dependencies": {
-    "vxe-pc-ui": "^4.0.82"
+    "vxe-pc-ui": "^4.0.88"
   },
   "devDependencies": {
     "@types/resize-observer-browser": "^0.1.11",

package/packages/grid/src/grid.ts

@@ -113,7 +113,7 @@ export default defineComponent({
     })
 
     const computeProxyOpts = computed(() => {
-      return Object.assign({}, getConfig().grid.proxyConfig, props.proxyConfig) as VxeGridPropTypes.ProxyConfig
+      return XEUtils.merge({}, getConfig().grid.proxyConfig, props.proxyConfig) as VxeGridPropTypes.ProxyConfig
     })
 
     const computeIsRespMsg = computed(() => {
@@ -788,12 +788,14 @@ export default defineComponent({
           case 'reload':
           case 'query': {
             const ajaxMethods = ajax.query
+            const querySuccessMethods = ajax.querySuccess
+            const queryErrorMethods = ajax.queryError
             if (ajaxMethods) {
               const isInited = code === '_init'
               const isReload = code === 'reload'
               let sortList: any[] = []
               let filterList: VxeTableDefines.FilterCheckedParams[] = []
-              let pageParams = {}
+              let pageParams: any = {}
               if (pagerConfig) {
                 if (isInited || isReload) {
                   tablePage.currentPage = 1
@@ -844,8 +846,7 @@ export default defineComponent({
               reactData.sortData = sortList
               reactData.filterData = filterList
               reactData.tableLoading = true
-              const applyArgs = [commitParams].concat(args)
-              return Promise.resolve((beforeQuery || ajaxMethods)(...applyArgs))
+              return Promise.resolve((beforeQuery || ajaxMethods)(commitParams, ...args))
                 .then(rest => {
                   reactData.tableLoading = false
                   if (rest) {
@@ -868,11 +869,17 @@ export default defineComponent({
                     reactData.tableData = []
                   }
                   if (afterQuery) {
-                    afterQuery(...applyArgs)
+                    afterQuery(commitParams, ...args)
+                  }
+                  if (querySuccessMethods) {
+                    querySuccessMethods({ ...commitParams, response: rest })
                   }
                   return { status: true }
-                }).catch(() => {
+                }).catch((rest) => {
                   reactData.tableLoading = false
+                  if (queryErrorMethods) {
+                    queryErrorMethods({ ...commitParams, response: rest })
+                  }
                   return { status: false }
                 })
             } else {
@@ -884,19 +891,20 @@ export default defineComponent({
           }
           case 'delete': {
             const ajaxMethods = ajax.delete
+            const deleteSuccessMethods = ajax.deleteSuccess
+            const deleteErrorMethods = ajax.deleteError
             if (ajaxMethods) {
               const selectRecords = gridExtendTableMethods.getCheckboxRecords()
               const removeRecords = selectRecords.filter(row => !$xeTable.isInsertByRow(row))
               const body = { removeRecords }
               const commitParams = { $grid: $xeGrid, code, button, body, form: formData, options: ajaxMethods }
-              const applyArgs = [commitParams].concat(args)
               if (selectRecords.length) {
                 return handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', () => {
                   if (!removeRecords.length) {
                     return $xeTable.remove(selectRecords)
                   }
                   reactData.tableLoading = true
-                  return Promise.resolve((beforeDelete || ajaxMethods)(...applyArgs))
+                  return Promise.resolve((beforeDelete || ajaxMethods)(commitParams, ...args))
                     .then(rest => {
                       reactData.tableLoading = false
                       $xeTable.setPendingRow(removeRecords, false)
@@ -906,10 +914,13 @@ export default defineComponent({
                         }
                       }
                       if (afterDelete) {
-                        afterDelete(...applyArgs)
+                        afterDelete(commitParams, ...args)
                       } else {
                         gridMethods.commitProxy('query')
                       }
+                      if (deleteSuccessMethods) {
+                        deleteSuccessMethods({ ...commitParams, response: rest })
+                      }
                       return { status: true }
                     })
                     .catch(rest => {
@@ -919,6 +930,9 @@ export default defineComponent({
                           VxeUI.modal.message({ id: code, content: getRespMsg(rest, 'vxe.grid.operError'), status: 'error' })
                         }
                       }
+                      if (deleteErrorMethods) {
+                        deleteErrorMethods({ ...commitParams, response: rest })
+                      }
                       return { status: false }
                     })
                 })
@@ -938,11 +952,12 @@ export default defineComponent({
           }
           case 'save': {
             const ajaxMethods = ajax.save
+            const saveSuccessMethods = ajax.saveSuccess
+            const saveErrorMethods = ajax.saveError
             if (ajaxMethods) {
               const body = $xeTable.getRecordset()
               const { insertRecords, removeRecords, updateRecords, pendingRecords } = body
               const commitParams = { $grid: $xeGrid, code, button, body, form: formData, options: ajaxMethods }
-              const applyArgs = [commitParams].concat(args)
               // 排除掉新增且标记为删除的数据
               if (insertRecords.length) {
                 body.pendingRecords = pendingRecords.filter((row) => $xeTable.findRowIndexOf(insertRecords, row) === -1)
@@ -963,7 +978,7 @@ export default defineComponent({
                 }
                 if (body.insertRecords.length || removeRecords.length || updateRecords.length || body.pendingRecords.length) {
                   reactData.tableLoading = true
-                  return Promise.resolve((beforeSave || ajaxMethods)(...applyArgs))
+                  return Promise.resolve((beforeSave || ajaxMethods)(commitParams, ...args))
                     .then(rest => {
                       reactData.tableLoading = false
                       $xeTable.clearPendingRow()
@@ -973,10 +988,13 @@ export default defineComponent({
                         }
                       }
                       if (afterSave) {
-                        afterSave(...applyArgs)
+                        afterSave(commitParams, ...args)
                       } else {
                         gridMethods.commitProxy('query')
                       }
+                      if (saveSuccessMethods) {
+                        saveSuccessMethods({ ...commitParams, response: rest })
+                      }
                       return { status: true }
                     })
                     .catch(rest => {
@@ -986,6 +1004,9 @@ export default defineComponent({
                           VxeUI.modal.message({ id: code, content: getRespMsg(rest, 'vxe.grid.operError'), status: 'error' })
                         }
                       }
+                      if (saveErrorMethods) {
+                        saveErrorMethods({ ...commitParams, response: rest })
+                      }
                       return { status: false }
                     })
                 } else {

package/packages/locale/lang/ja-JP.ts

@@ -5,8 +5,8 @@
 export default {
   vxe: {
     base: {
-      pleaseInput: 'Please input',
-      pleaseSelect: 'Select',
+      pleaseInput: '入力してください',
+      pleaseSelect: '選択してください',
       comma: ',',
       fullStop: '.'
     },
@@ -14,9 +14,9 @@ export default {
       text: 'Loading...'
     },
     error: {
-      groupFixed: 'グループ化ヘッダーを使用する場合、固定列はグループで設定しなければなりません',
-      groupMouseRange: 'グループ化ヘッダーと「{0}」は同時に使用できません。これによりエラーが発生する可能性があります',
-      groupTag: 'グループ化ヘッダーは "{0}" を使ってください。 "{1}" はエラーが発生する可能性があります',
+      groupFixed: 'ヘッダー結合を使用する場合、固定列はグループで設定しなければなりません',
+      groupMouseRange: 'ヘッダー結合と「{0}」は同時に使用できません。これによりエラーが発生する可能性があります',
+      groupTag: 'ヘッダー結合は "{0}" を使ってください。 "{1}" はエラーが発生する可能性があります',
       scrollErrProp: '仮想スクロールはこのパラメータを使えません： "{0}"',
       errConflicts: 'パラメータ "{0}" と "{1}" は同時に使えません',
       unableInsert: '指定された位置に挿入できない',
@@ -66,13 +66,13 @@ export default {
       expSrcFilename: 'エクスポート_ソース_{0}',
       customTitle: '列設定',
       customAll: '全部',
-      customConfirm: 'Confirm',
+      customConfirm: 'OK',
       customCancel: 'Cancel',
-      customRestore: 'Restore',
+      customRestore: 'リセット',
       maxFixedCol: '最大固定列数が {0} です。'
     },
     grid: {
-      selectOneRecord: '1つ以上ののレコードを選択してください',
+      selectOneRecord: '1つ以上のレコードを選択してください',
       deleteSelectRecord: 'レコードを削除してもよろしいですか？',
       removeSelectRecord: 'レコードを削除してもよろしいですか？',
       dataUnchanged: 'データが変更されませんでした',
@@ -104,7 +104,7 @@ export default {
       endPageTitle: '最後ページ'
     },
     alert: {
-      title: 'System messages'
+      title: '確認'
     },
     button: {
       confirm: 'OK',
@@ -122,12 +122,12 @@ export default {
       cstmDragTarget: '移動ターゲット: {0}',
       setting: {
         colSort: 'ソート',
-        sortHelpTip: 'Click and drag the icon to adjust the order of the columns.',
+        sortHelpTip: 'ドラッグして列を並べ替えます',
         colTitle: 'タイトル',
-        colResizable: 'Column width (px)',
-        colVisible: 'Display',
-        colFixed: '冻结列',
-        colFixedMax: '冻结列（最多 {0} 列）',
+        colResizable: '列の幅 (px)',
+        colVisible: '表示する',
+        colFixed: '列固定',
+        colFixedMax: '列固定（最大 {0} 列）',
         fixedLeft: '左側',
         fixedUnset: '指定しない',
         fixedRight: '右側'
@@ -135,17 +135,17 @@ export default {
     },
     import: {
       modes: {
-        covering: 'Overwrite mode (directly overwrite table data)',
-        insert: 'Bottom append (appends new data to the bottom of the table)',
-        insertTop: 'Top append (appends new data to the top of the table)',
-        insertBottom: 'Bottom append (appends new data to the bottom of the table)'
+        covering: '上書きモード',
+        insert: '追加モード（最後行に追加）',
+        insertTop: '追加モード（先頭行に追加）',
+        insertBottom: '追加モード（最後行に追加）'
       },
       impTitle: 'データインポート',
       impFile: 'ファイル名',
       impSelect: 'ファイル選択',
       impType: 'ファイルの種類',
       impOpts: 'パラメータ指定',
-      impMode: 'Import mode',
+      impMode: 'インポートモード',
       impConfirm: 'インポート',
       impCancel: 'キャンセル'
     },
@@ -194,9 +194,9 @@ export default {
       expCancel: 'キャンセル'
     },
     modal: {
-      errTitle: 'Error',
-      zoomMin: 'Minimize',
-      zoomIn: 'Maximize',
+      errTitle: 'エラー',
+      zoomMin: '最小化',
+      zoomIn: '最大化',
       zoomOut: '縮小',
       close: '閉じる',
       miniMaxSize: 'The number of minimized Windows cannot exceed {0}.'