vxe-table 4.1.20 → 4.2.0-beta.2

package/lib/v-x-e-table/src/conf.js

@@ -31,6 +31,9 @@ var GlobalConfig = {
     // emptyRender: {
     //   name: ''
     // },
+    // rowConfig: {
+    //   keyField: '_X_ID' // 行数据的唯一主键字段名
+    // },
     radioConfig: {
       // trigger: 'default'
       strict: true
@@ -39,10 +42,9 @@ var GlobalConfig = {
       // trigger: 'default',
       strict: true
     },
-    // tooltipConfig: {
-    //   theme: 'dark',
-    //   enterable: false
-    // },
+    tooltipConfig: {
+      enterable: true
+    },
     validConfig: {
       showMessage: true,
       message: 'default'
@@ -54,7 +56,6 @@ var GlobalConfig = {
     //  storage: false,
     //  checkMethod () {}
     // },
-    // rowId: '_X_ID', // 行数据的唯一主键字段名
     sortConfig: {
       // remote: false,
       // trigger: 'default',
@@ -226,6 +227,7 @@ var GlobalConfig = {
     // size: null,
     trigger: 'hover',
     theme: 'dark',
+    enterDelay: 500,
     leaveDelay: 300
   },
   pager: {// size: null,
@@ -238,12 +240,15 @@ var GlobalConfig = {
   },
   form: {
     // preventSubmit: false,
+    // size: null,
+    // colon: false,
     validConfig: {
       showMessage: true,
       autoPos: true
     },
-    // size: null,
-    // colon: false,
+    tooltipConfig: {
+      enterable: true
+    },
     titleAsterisk: true
   },
   input: {

package/lib/v-x-e-table/src/conf.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var iconPrefix="vxe-icon--",GlobalConfig={size:null,zIndex:999,version:0,emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,radioConfig:{strict:!0},checkboxConfig:{strict:!0},validConfig:{showMessage:!0,message:"default"},sortConfig:{showIcon:!0},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",children:"children",hasChild:"hasChild",mapChildren:"_X_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0},importConfig:{modes:["insert","covering"]},exportConfig:{modes:["current","selected"]},printConfig:{modes:["current","selected"]},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{selectCellByHeader:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{enabled:!0,gt:60},scrollY:{enabled:!0,gt:100}},export:{types:{}},icon:{TABLE_SORT_ASC:iconPrefix+"caret-top",TABLE_SORT_DESC:iconPrefix+"caret-bottom",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit-outline",TABLE_HELP:iconPrefix+"question",TABLE_TREE_LOADED:iconPrefix+"refresh roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"refresh roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",BUTTON_DROPDOWN:iconPrefix+"arrow-bottom",BUTTON_LOADING:iconPrefix+"refresh roll",SELECT_LOADED:iconPrefix+"refresh roll",SELECT_OPEN:iconPrefix+"caret-bottom rotate180",SELECT_CLOSE:iconPrefix+"caret-bottom",PAGER_JUMP_PREV:iconPrefix+"d-arrow-left",PAGER_JUMP_NEXT:iconPrefix+"d-arrow-right",PAGER_PREV_PAGE:iconPrefix+"arrow-left",PAGER_NEXT_PAGE:iconPrefix+"arrow-right",PAGER_JUMP_MORE:iconPrefix+"more",INPUT_CLEAR:iconPrefix+"close",INPUT_PWD:iconPrefix+"eye-slash",INPUT_SHOW_PWD:iconPrefix+"eye",INPUT_PREV_NUM:iconPrefix+"caret-top",INPUT_NEXT_NUM:iconPrefix+"caret-bottom",INPUT_DATE:iconPrefix+"calendar",INPUT_SEARCH:iconPrefix+"search",MODAL_ZOOM_IN:iconPrefix+"square",MODAL_ZOOM_OUT:iconPrefix+"zoomout",MODAL_CLOSE:iconPrefix+"close",MODAL_INFO:iconPrefix+"info",MODAL_SUCCESS:iconPrefix+"success",MODAL_WARNING:iconPrefix+"warning",MODAL_ERROR:iconPrefix+"error",MODAL_QUESTION:iconPrefix+"question",MODAL_LOADING:iconPrefix+"refresh roll",TOOLBAR_TOOLS_REFRESH:iconPrefix+"refresh",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"refresh roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_ZOOM_IN:iconPrefix+"zoomin",TOOLBAR_TOOLS_ZOOM_OUT:iconPrefix+"zoomout",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"menu",FORM_PREFIX:iconPrefix+"question",FORM_SUFFIX:iconPrefix+"question",FORM_FOLDING:iconPrefix+"arrow-top rotate180",FORM_UNFOLDING:iconPrefix+"arrow-top"},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,message:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},tooltip:{trigger:"hover",theme:"dark",leaveDelay:300},pager:{},form:{validConfig:{showMessage:!0,autoPos:!0},titleAsterisk:!0},input:{minDate:new Date(1900,0,1),maxDate:new Date(2100,0,1),startDay:1,selectDay:1,digits:2,controls:!0},textarea:{},select:{multiCharOverflow:8},toolbar:{},button:{},radio:{strict:!0},radioButton:{strict:!0},radioGroup:{strict:!0},checkbox:{},switch:{},modal:{top:15,showHeader:!0,minWidth:340,minHeight:140,lockView:!0,mask:!0,duration:3e3,marginSize:0,dblclickZoom:!0,showTitleOverflow:!0,animat:!0,showClose:!0,draggable:!0,storageKey:"VXE_MODAL_POSITION"},list:{scrollY:{enabled:!0,gt:100}},i18n:function(e){return e}},_default=GlobalConfig;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var iconPrefix="vxe-icon--",GlobalConfig={size:null,zIndex:999,version:0,emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,radioConfig:{strict:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,message:"default"},sortConfig:{showIcon:!0},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",children:"children",hasChild:"hasChild",mapChildren:"_X_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0},importConfig:{modes:["insert","covering"]},exportConfig:{modes:["current","selected"]},printConfig:{modes:["current","selected"]},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{selectCellByHeader:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{enabled:!0,gt:60},scrollY:{enabled:!0,gt:100}},export:{types:{}},icon:{TABLE_SORT_ASC:iconPrefix+"caret-top",TABLE_SORT_DESC:iconPrefix+"caret-bottom",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit-outline",TABLE_HELP:iconPrefix+"question",TABLE_TREE_LOADED:iconPrefix+"refresh roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"refresh roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",BUTTON_DROPDOWN:iconPrefix+"arrow-bottom",BUTTON_LOADING:iconPrefix+"refresh roll",SELECT_LOADED:iconPrefix+"refresh roll",SELECT_OPEN:iconPrefix+"caret-bottom rotate180",SELECT_CLOSE:iconPrefix+"caret-bottom",PAGER_JUMP_PREV:iconPrefix+"d-arrow-left",PAGER_JUMP_NEXT:iconPrefix+"d-arrow-right",PAGER_PREV_PAGE:iconPrefix+"arrow-left",PAGER_NEXT_PAGE:iconPrefix+"arrow-right",PAGER_JUMP_MORE:iconPrefix+"more",INPUT_CLEAR:iconPrefix+"close",INPUT_PWD:iconPrefix+"eye-slash",INPUT_SHOW_PWD:iconPrefix+"eye",INPUT_PREV_NUM:iconPrefix+"caret-top",INPUT_NEXT_NUM:iconPrefix+"caret-bottom",INPUT_DATE:iconPrefix+"calendar",INPUT_SEARCH:iconPrefix+"search",MODAL_ZOOM_IN:iconPrefix+"square",MODAL_ZOOM_OUT:iconPrefix+"zoomout",MODAL_CLOSE:iconPrefix+"close",MODAL_INFO:iconPrefix+"info",MODAL_SUCCESS:iconPrefix+"success",MODAL_WARNING:iconPrefix+"warning",MODAL_ERROR:iconPrefix+"error",MODAL_QUESTION:iconPrefix+"question",MODAL_LOADING:iconPrefix+"refresh roll",TOOLBAR_TOOLS_REFRESH:iconPrefix+"refresh",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"refresh roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_ZOOM_IN:iconPrefix+"zoomin",TOOLBAR_TOOLS_ZOOM_OUT:iconPrefix+"zoomout",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"menu",FORM_PREFIX:iconPrefix+"question",FORM_SUFFIX:iconPrefix+"question",FORM_FOLDING:iconPrefix+"arrow-top rotate180",FORM_UNFOLDING:iconPrefix+"arrow-top"},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,message:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},tooltip:{trigger:"hover",theme:"dark",enterDelay:500,leaveDelay:300},pager:{},form:{validConfig:{showMessage:!0,autoPos:!0},tooltipConfig:{enterable:!0},titleAsterisk:!0},input:{minDate:new Date(1900,0,1),maxDate:new Date(2100,0,1),startDay:1,selectDay:1,digits:2,controls:!0},textarea:{},select:{multiCharOverflow:8},toolbar:{},button:{},radio:{strict:!0},radioButton:{strict:!0},radioGroup:{strict:!0},checkbox:{},switch:{},modal:{top:15,showHeader:!0,minWidth:340,minHeight:140,lockView:!0,mask:!0,duration:3e3,marginSize:0,dblclickZoom:!0,showTitleOverflow:!0,animat:!0,showClose:!0,draggable:!0,storageKey:"VXE_MODAL_POSITION"},list:{scrollY:{enabled:!0,gt:100}},i18n:function(e){return e}},_default=GlobalConfig;exports.default=_default;

package/lib/v-x-e-table/src/interceptor.js

@@ -7,7 +7,7 @@ exports.interceptor = void 0;
 
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
 
-var _utils = require("../../tools/utils");
+var _log = require("../../tools/log");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -29,7 +29,7 @@ var interceptor = {
       var eventTypes = ['created', 'mounted', 'activated', 'beforeUnmount', 'unmounted', 'event.clearActived', 'event.clearFilter', 'event.clearAreas', 'event.showMenu', 'event.keydown', 'event.export', 'event.import'];
 
       if (eventTypes.indexOf(type) === -1) {
-        (0, _utils.warnLog)('vxe.error.errProp', ["Interceptor." + type, eventTypes.join('|')]);
+        (0, _log.warnLog)('vxe.error.errProp', ["Interceptor." + type, eventTypes.join('|')]);
       }
     }
 
@@ -43,7 +43,7 @@ var interceptor = {
 
       if (process.env.NODE_ENV === 'development') {
         if (eList.indexOf(callback) > -1) {
-          (0, _utils.warnLog)('vxe.error.coverProp', ['Interceptor', type]);
+          (0, _log.warnLog)('vxe.error.coverProp', ['Interceptor', type]);
         }
       }
 

package/lib/v-x-e-table/src/interceptor.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.interceptor=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_utils=require("../../tools/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var storeMap={},interceptor={mixin:function(e){return _xeUtils.default.each(e,function(e,t){return interceptor.add(t,e)}),interceptor},get:function(e){return storeMap[e]||[]},add:function(e,t){var r;return"development"!==process.env.NODE_ENV||-1===(r=["created","mounted","activated","beforeUnmount","unmounted","event.clearActived","event.clearFilter","event.clearAreas","event.showMenu","event.keydown","event.export","event.import"]).indexOf(e)&&(0,_utils.warnLog)("vxe.error.errProp",["Interceptor."+e,r.join("|")]),t&&(r=(r=storeMap[e])||(storeMap[e]=[]),"development"===process.env.NODE_ENV&&-1<r.indexOf(t)&&(0,_utils.warnLog)("vxe.error.coverProp",["Interceptor",e]),r.push(t)),interceptor},delete:function(e,t){var r=storeMap[e];r&&(t?_xeUtils.default.remove(r,function(e){return e===t}):delete storeMap[e])}};exports.interceptor=interceptor;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.interceptor=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var storeMap={},interceptor={mixin:function(e){return _xeUtils.default.each(e,function(e,r){return interceptor.add(r,e)}),interceptor},get:function(e){return storeMap[e]||[]},add:function(e,r){var t;return"development"!==process.env.NODE_ENV||-1===(t=["created","mounted","activated","beforeUnmount","unmounted","event.clearActived","event.clearFilter","event.clearAreas","event.showMenu","event.keydown","event.export","event.import"]).indexOf(e)&&(0,_log.warnLog)("vxe.error.errProp",["Interceptor."+e,t.join("|")]),r&&(t=(t=storeMap[e])||(storeMap[e]=[]),"development"===process.env.NODE_ENV&&-1<t.indexOf(r)&&(0,_log.warnLog)("vxe.error.coverProp",["Interceptor",e]),t.push(r)),interceptor},delete:function(e,r){var t=storeMap[e];t&&(r?_xeUtils.default.remove(t,function(e){return e===r}):delete storeMap[e])}};exports.interceptor=interceptor;

package/lib/v-x-e-table/src/renderer.js

@@ -15,6 +15,8 @@ var _util = require("../../table/src/util");
 
 var _utils = require("../../tools/utils");
 
+var _log = require("../../tools/log");
+
 var _vn = require("../../tools/vn");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -838,7 +840,7 @@ var renderer = {
         if (process.env.NODE_ENV === 'development') {
           _xeUtils.default.each(options, function (val, key) {
             if (!_xeUtils.default.eqNull(renders_1[key]) && renders_1[key] !== val) {
-              (0, _utils.warnLog)('vxe.error.coverProp', ["Renderer." + name, key]);
+              (0, _log.warnLog)('vxe.error.coverProp', ["Renderer." + name, key]);
             }
           });
         }

package/lib/v-x-e-table/src/renderer.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.renderer=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("./conf")),_util=require("../../table/src/util"),_utils=require("../../tools/utils"),_vn=require("../../tools/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var o in t=arguments[n])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e}).apply(this,arguments)},__spreadArray=function(e,t){for(var n=0,r=t.length,o=e.length;n<r;n++,o++)e[o]=t[n];return e},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"$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 r=t.dateConfig,r=void 0===r?{}:r;return _xeUtils.default.toDateString(parseDate(e,t),r.labelFormat||n)}function getLabelFormatDate(e,t){return getFormatDate(e,t,_conf.default.i18n("vxe.input.date.labelFormat."+t.type))}function getComponentName(e){return"vxe-"+e.replace("$","")}function getDefaultComponent(e){e=e.name;return(0,_vue.resolveComponent)(getComponentName(e))}function handleConfirmFilter(e,t,n){e.$panel.changeOption({},t,n)}function getNativeAttrs(e){var t=e.name,e=e.attrs;return e="input"===t?Object.assign({type:"text"},e):e}function getInputImmediateModel(e){var t=e.name,n=e.immediate,e=e.props;if(n)return n;if("$input"!==t)return"input"!==t&&"textarea"!==t&&"$textarea"!==t;e=(e||{}).type;return!(!e||"text"===e||"number"===e||"integer"===e||"float"===e)}function getCellEditProps(e,t,n,r){return _xeUtils.default.assign({immediate:getInputImmediateModel(e)},defaultCompProps,r,e.props,((e={})[componentDefaultModelProp]=n,e))}function getCellEditFilterProps(e,t,n,r){return _xeUtils.default.assign({},defaultCompProps,r,e.props,((e={})[componentDefaultModelProp]=n,e))}function getComponentFormItemProps(e,t,n,r){return _xeUtils.default.assign({},defaultCompProps,r,e.props,((e={})[componentDefaultModelProp]=n,e))}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,r,t,n){var o=e.events,a=getModelEvent(e),u=getChangeEvent(e),i=u===a,l={};return o&&_xeUtils.default.objectEach(o,function(n,e){l[(0,_vn.getOnName)(e)]=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];n.apply(void 0,__spreadArray([r],e))}}),t&&(l[(0,_vn.getOnName)(a)]=function(e){t(e),i&&n&&n(e),o&&o[a]&&o[a](r,e)}),!i&&n&&(l[(0,_vn.getOnName)(u)]=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];n.apply(void 0,e),o&&o[u]&&o[u].apply(o,__spreadArray([r],e))}),l}function getComponentOns(e,r,t,n){var o=e.events,a=getModelEvent(e),u=getChangeEvent(e),i={};return _xeUtils.default.objectEach(o,function(n,e){i[(0,_vn.getOnName)(e)]=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];n.apply(void 0,__spreadArray([r],e))}}),t&&(i[(0,_vn.getOnName)(a)]=function(e){t(e),o&&o[a]&&o[a](r,e)}),n&&(i[(0,_vn.getOnName)(u)]=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];n.apply(void 0,e),o&&o[u]&&o[u].apply(o,__spreadArray([r],e))}),i}function getEditOns(e,t){var n=t.$table,r=t.row,o=t.column,a=e.name,u=o.model,i=isImmediateCell(e,t);return getComponentOns(e,t,function(e){i?(0,_util.setCellValue)(r,o,e):(u.update=!0,u.value=e)},function(e){i||"$input"!==a&&"$textarea"!==a?n.updateStatus(t):(e=e.value,u.update=!0,u.value=e,n.updateStatus(t,e))})}function getFilterOns(e,t,n){return getComponentOns(e,t,function(e){n.data=e},function(){handleConfirmFilter(t,!_xeUtils.default.eqNull(n.data),n)})}function getItemOns(e,t){var n=t.$form,r=t.data,o=t.property;return getComponentOns(e,t,function(e){_xeUtils.default.set(r,o,e)},function(){n.updateStatus(t)})}function getNativeEditOns(t,n){var r=n.$table,o=n.row,a=n.column,u=a.model;return getElementOns(t,n,function(e){e=e.target.value;isImmediateCell(t,n)?(0,_util.setCellValue)(o,a,e):(u.update=!0,u.value=e)},function(e){e=e.target.value;r.updateStatus(n,e)})}function getNativeFilterOns(e,t,n){return getElementOns(e,t,function(e){n.data=e.target.value},function(){handleConfirmFilter(t,!_xeUtils.default.eqNull(n.data),n)})}function getNativeItemOns(e,t){var n=t.$form,r=t.data,o=t.property;return getElementOns(e,t,function(e){e=e.target.value;_xeUtils.default.set(r,o,e)},function(){n.updateStatus(t)})}function nativeEditRender(e,t){var n=t.row,r=t.column,o=e.name,r=isImmediateCell(e,t)?(0,_util.getCellValue)(n,r):r.model.value;return[(0,_vue.h)(o,__assign(__assign(__assign({class:"vxe-default-"+o},getNativeAttrs(e)),{value:r}),getNativeEditOns(e,t)))]}function defaultEditRender(e,t){var n=t.row,r=t.column,r=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getDefaultComponent(e),__assign(__assign({},getCellEditProps(e,t,r)),getEditOns(e,t)))]}function defaultButtonEditRender(e,t){return[(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),__assign(__assign({},getCellEditProps(e,t,null)),getComponentOns(e,t)))]}function defaultButtonsEditRender(e,t){return e.children.map(function(e){return defaultButtonEditRender(e,t)[0]})}function renderNativeOptgroups(n,r,o){var e=n.optionGroups,t=n.optionGroupProps,t=void 0===t?{}:t,a=t.options||"options",u=t.label||"label";return e.map(function(e,t){return(0,_vue.h)("optgroup",{key:t,label:e[u]},o(e[a],n,r))})}function renderNativeOptions(e,t,n){var r=t.optionProps,o=void 0===r?{}:r,a=n.row,r=n.column,u=o.label||"label",i=o.value||"value",l=o.disabled||"disabled",s=isImmediateCell(t,n)?(0,_util.getCellValue)(a,r):r.model.value;return e.map(function(e,t){return(0,_vue.h)("option",{key:t,value:e[i],disabled:e[l],selected:e[i]==s},e[u])})}function nativeFilterRender(n,r){var e=r.column,o=n.name,a=getNativeAttrs(n);return e.filters.map(function(e,t){return(0,_vue.h)(o,__assign(__assign(__assign({key:t,class:"vxe-default-"+o},a),{value:e.data}),getNativeFilterOns(n,r,e)))})}function defaultFilterRender(r,o){return o.column.filters.map(function(e,t){var n=e.data;return(0,_vue.h)(getDefaultComponent(r),__assign(__assign({key:t},getCellEditFilterProps(r,r,n)),getFilterOns(r,o,e)))})}function handleFilterMethod(e){var t=e.option,n=e.row,e=e.column,t=t.data;return _xeUtils.default.get(n,e.property)==t}function nativeSelectEditRender(e,t){return[(0,_vue.h)("select",__assign(__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 n=t.row,r=t.column,o=e.options,a=e.optionProps,u=e.optionGroups,i=e.optionGroupProps,r=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getDefaultComponent(e),__assign(__assign({},getCellEditProps(e,t,r,{options:o,optionProps:a,optionGroups:u,optionGroupProps:i})),getEditOns(e,t)))]}function getSelectCellValue(e,t){var r,n=t.row,o=t.column,a=e.props,t=void 0===a?{}:a,u=e.options,i=e.optionGroups,a=e.optionProps,a=void 0===a?{}:a,e=e.optionGroupProps,l=void 0===e?{}:e,o=_xeUtils.default.get(n,o.property),s=a.label||"label",d=a.value||"value";return(0,_utils.isEmptyValue)(o)?"":_xeUtils.default.map(t.multiple?o:[o],i?function(t){for(var e=l.options||"options",n=0;n<i.length&&!(r=_xeUtils.default.find(i[n][e],function(e){return e[d]==t}));n++);return r?r[s]:t}:function(t){return(r=_xeUtils.default.find(u,function(e){return e[d]==t}))?r[s]:t}).join(", ")}function nativeItemRender(e,t){var n=t.data,r=t.property,o=e.name,a=getNativeAttrs(e),r=_xeUtils.default.get(n,r);return[(0,_vue.h)(o,__assign(__assign(__assign({class:"vxe-default-"+o},a),{value:!a||"input"!==o||"submit"!==a.type&&"reset"!==a.type?r:null}),getNativeItemOns(e,t)))]}function defaultItemRender(e,t){var n=t.data,r=t.property,r=_xeUtils.default.get(n,r);return[(0,_vue.h)(getDefaultComponent(e),__assign(__assign({},getComponentFormItemProps(e,t,r)),getItemOns(e,t)))]}function defaultButtonItemRender(e,t){return[(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),__assign(__assign({},getComponentFormItemProps(e,t,null)),getComponentOns(e,t)))]}function defaultButtonsItemRender(e,t){return e.children.map(function(e){return defaultButtonItemRender(e,t)[0]})}function renderNativeFormOptions(e,t,n){var r=n.data,n=n.property,t=t.optionProps,t=void 0===t?{}:t,o=t.label||"label",a=t.value||"value",u=t.disabled||"disabled",i=_xeUtils.default.get(r,n);return e.map(function(e,t){return(0,_vue.h)("option",{key:t,value:e[a],disabled:e[u],selected:e[a]==i},e[o])})}function handleExportSelectMethod(e){var t=e.row,n=e.column;return e.options.original?(0,_util.getCellValue)(t,n):getSelectCellValue(n.editRender||n.cellRender,e)}function defaultFormItemRadioAndCheckboxRender(e,t){var n=e.name,r=e.options,o=e.optionProps,a=void 0===o?{}:o,u=t.data,o=t.property,i=a.label||"label",l=a.value||"value",s=a.disabled||"disabled",o=_xeUtils.default.get(u,o),d=getComponentName(n);return r?[(0,_vue.h)((0,_vue.resolveComponent)(d+"-group"),__assign(__assign({},getComponentFormItemProps(e,t,o)),getItemOns(e,t)),{default:function(){return r.map(function(e,t){return(0,_vue.h)((0,_vue.resolveComponent)(d),{key:t,label:e[l],content:e[i],disabled:e[s]})})}})]:[(0,_vue.h)((0,_vue.resolveComponent)(d),__assign(__assign({},getComponentFormItemProps(e,t,o)),getItemOns(e,t)))]}var renderMap={input:{autofocus:"input",renderEdit:nativeEditRender,renderDefault:nativeEditRender,renderFilter:nativeFilterRender,defaultFilterMethod:handleFilterMethod,renderItemContent:nativeItemRender},textarea:{autofocus:"textarea",renderEdit:nativeEditRender,renderItemContent:nativeItemRender},select:{renderEdit:nativeSelectEditRender,renderDefault:nativeSelectEditRender,renderCell:function(e,t){return getCellLabelVNs(e,t,getSelectCellValue(e,t))},renderFilter:function(n,r){return r.column.filters.map(function(e,t){return(0,_vue.h)("select",__assign(__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,renderItemContent:function(e,t){return[(0,_vue.h)("select",__assign(__assign({class:"vxe-default-select"},getNativeAttrs(e)),getNativeItemOns(e,t)),e.optionGroups?renderNativeOptgroups(e,t,renderNativeFormOptions):renderNativeFormOptions(e.options,e,t))]},cellExportMethod:handleExportSelectMethod},$input:{autofocus:".vxe-input--inner",renderEdit:defaultEditRender,renderCell:function(e,t){var n=e.props,r=void 0===n?{}:n,o=t.row,n=t.column,a=r.digits||_conf.default.input.digits,u=_xeUtils.default.get(o,n.property);if(u)switch(r.type){case"date":case"week":case"month":case"year":u=getLabelFormatDate(u,r);break;case"float":u=_xeUtils.default.toFixed(_xeUtils.default.floor(u,a),a)}return getCellLabelVNs(e,t,u)},renderDefault:defaultEditRender,renderFilter:defaultFilterRender,defaultFilterMethod:handleFilterMethod,renderItemContent:defaultItemRender},$textarea:{autofocus:".vxe-textarea--inner",renderItemContent:defaultItemRender},$button:{renderDefault:defaultButtonEditRender,renderItemContent:defaultButtonItemRender},$buttons:{renderDefault:defaultButtonsEditRender,renderItemContent:defaultButtonsItemRender},$select:{autofocus:".vxe-input--inner",renderEdit:defaultSelectEditRender,renderDefault:defaultSelectEditRender,renderCell:function(e,t){return getCellLabelVNs(e,t,getSelectCellValue(e,t))},renderFilter:function(r,o){var e=o.column,a=r.options,u=r.optionProps,i=r.optionGroups,l=r.optionGroupProps;return e.filters.map(function(e,t){var n=e.data;return(0,_vue.h)(getDefaultComponent(r),__assign(__assign({key:t},getCellEditFilterProps(r,o,n,{options:a,optionProps:u,optionGroups:i,optionGroupProps:l})),getFilterOns(r,o,e)))})},defaultFilterMethod:handleFilterMethod,renderItemContent:function(e,t){var n=t.data,r=t.property,o=e.options,a=e.optionProps,u=e.optionGroups,i=e.optionGroupProps,r=_xeUtils.default.get(n,r);return[(0,_vue.h)(getDefaultComponent(e),__assign(__assign({},getComponentFormItemProps(e,t,r,{options:o,optionProps:a,optionGroups:u,optionGroupProps:i})),getItemOns(e,t)))]},cellExportMethod:handleExportSelectMethod},$radio:{autofocus:".vxe-radio--input",renderItemContent:defaultFormItemRadioAndCheckboxRender},$checkbox:{autofocus:".vxe-checkbox--input",renderItemContent:defaultFormItemRadioAndCheckboxRender},$switch:{autofocus:".vxe-switch--button",renderEdit:defaultEditRender,renderDefault:defaultEditRender,renderItemContent:defaultItemRender}},renderer={mixin:function(e){return _xeUtils.default.each(e,function(e,t){return renderer.add(t,e)}),renderer},get:function(e){return renderMap[e]||null},add:function(n,e){var r;return n&&e&&((r=renderMap[n])?("development"===process.env.NODE_ENV&&_xeUtils.default.each(e,function(e,t){_xeUtils.default.eqNull(r[t])||r[t]===e||(0,_utils.warnLog)("vxe.error.coverProp",["Renderer."+n,t])}),Object.assign(r,e)):renderMap[n]=e),renderer},delete:function(e){return delete renderMap[e],renderer}};exports.renderer=renderer;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.renderer=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("./conf")),_util=require("../../table/src/util"),_utils=require("../../tools/utils"),_log=require("../../tools/log"),_vn=require("../../tools/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var o in t=arguments[n])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e}).apply(this,arguments)},__spreadArray=function(e,t){for(var n=0,r=t.length,o=e.length;n<r;n++,o++)e[o]=t[n];return e},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"$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 r=t.dateConfig,r=void 0===r?{}:r;return _xeUtils.default.toDateString(parseDate(e,t),r.labelFormat||n)}function getLabelFormatDate(e,t){return getFormatDate(e,t,_conf.default.i18n("vxe.input.date.labelFormat."+t.type))}function getComponentName(e){return"vxe-"+e.replace("$","")}function getDefaultComponent(e){e=e.name;return(0,_vue.resolveComponent)(getComponentName(e))}function handleConfirmFilter(e,t,n){e.$panel.changeOption({},t,n)}function getNativeAttrs(e){var t=e.name,e=e.attrs;return e="input"===t?Object.assign({type:"text"},e):e}function getInputImmediateModel(e){var t=e.name,n=e.immediate,e=e.props;if(n)return n;if("$input"!==t)return"input"!==t&&"textarea"!==t&&"$textarea"!==t;e=(e||{}).type;return!(!e||"text"===e||"number"===e||"integer"===e||"float"===e)}function getCellEditProps(e,t,n,r){return _xeUtils.default.assign({immediate:getInputImmediateModel(e)},defaultCompProps,r,e.props,((e={})[componentDefaultModelProp]=n,e))}function getCellEditFilterProps(e,t,n,r){return _xeUtils.default.assign({},defaultCompProps,r,e.props,((e={})[componentDefaultModelProp]=n,e))}function getComponentFormItemProps(e,t,n,r){return _xeUtils.default.assign({},defaultCompProps,r,e.props,((e={})[componentDefaultModelProp]=n,e))}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,r,t,n){var o=e.events,a=getModelEvent(e),u=getChangeEvent(e),i=u===a,l={};return o&&_xeUtils.default.objectEach(o,function(n,e){l[(0,_vn.getOnName)(e)]=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];n.apply(void 0,__spreadArray([r],e))}}),t&&(l[(0,_vn.getOnName)(a)]=function(e){t(e),i&&n&&n(e),o&&o[a]&&o[a](r,e)}),!i&&n&&(l[(0,_vn.getOnName)(u)]=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];n.apply(void 0,e),o&&o[u]&&o[u].apply(o,__spreadArray([r],e))}),l}function getComponentOns(e,r,t,n){var o=e.events,a=getModelEvent(e),u=getChangeEvent(e),i={};return _xeUtils.default.objectEach(o,function(n,e){i[(0,_vn.getOnName)(e)]=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];n.apply(void 0,__spreadArray([r],e))}}),t&&(i[(0,_vn.getOnName)(a)]=function(e){t(e),o&&o[a]&&o[a](r,e)}),n&&(i[(0,_vn.getOnName)(u)]=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];n.apply(void 0,e),o&&o[u]&&o[u].apply(o,__spreadArray([r],e))}),i}function getEditOns(e,t){var n=t.$table,r=t.row,o=t.column,a=e.name,u=o.model,i=isImmediateCell(e,t);return getComponentOns(e,t,function(e){i?(0,_util.setCellValue)(r,o,e):(u.update=!0,u.value=e)},function(e){i||"$input"!==a&&"$textarea"!==a?n.updateStatus(t):(e=e.value,u.update=!0,u.value=e,n.updateStatus(t,e))})}function getFilterOns(e,t,n){return getComponentOns(e,t,function(e){n.data=e},function(){handleConfirmFilter(t,!_xeUtils.default.eqNull(n.data),n)})}function getItemOns(e,t){var n=t.$form,r=t.data,o=t.property;return getComponentOns(e,t,function(e){_xeUtils.default.set(r,o,e)},function(){n.updateStatus(t)})}function getNativeEditOns(t,n){var r=n.$table,o=n.row,a=n.column,u=a.model;return getElementOns(t,n,function(e){e=e.target.value;isImmediateCell(t,n)?(0,_util.setCellValue)(o,a,e):(u.update=!0,u.value=e)},function(e){e=e.target.value;r.updateStatus(n,e)})}function getNativeFilterOns(e,t,n){return getElementOns(e,t,function(e){n.data=e.target.value},function(){handleConfirmFilter(t,!_xeUtils.default.eqNull(n.data),n)})}function getNativeItemOns(e,t){var n=t.$form,r=t.data,o=t.property;return getElementOns(e,t,function(e){e=e.target.value;_xeUtils.default.set(r,o,e)},function(){n.updateStatus(t)})}function nativeEditRender(e,t){var n=t.row,r=t.column,o=e.name,r=isImmediateCell(e,t)?(0,_util.getCellValue)(n,r):r.model.value;return[(0,_vue.h)(o,__assign(__assign(__assign({class:"vxe-default-"+o},getNativeAttrs(e)),{value:r}),getNativeEditOns(e,t)))]}function defaultEditRender(e,t){var n=t.row,r=t.column,r=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getDefaultComponent(e),__assign(__assign({},getCellEditProps(e,t,r)),getEditOns(e,t)))]}function defaultButtonEditRender(e,t){return[(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),__assign(__assign({},getCellEditProps(e,t,null)),getComponentOns(e,t)))]}function defaultButtonsEditRender(e,t){return e.children.map(function(e){return defaultButtonEditRender(e,t)[0]})}function renderNativeOptgroups(n,r,o){var e=n.optionGroups,t=n.optionGroupProps,t=void 0===t?{}:t,a=t.options||"options",u=t.label||"label";return e.map(function(e,t){return(0,_vue.h)("optgroup",{key:t,label:e[u]},o(e[a],n,r))})}function renderNativeOptions(e,t,n){var r=t.optionProps,o=void 0===r?{}:r,a=n.row,r=n.column,u=o.label||"label",i=o.value||"value",l=o.disabled||"disabled",s=isImmediateCell(t,n)?(0,_util.getCellValue)(a,r):r.model.value;return e.map(function(e,t){return(0,_vue.h)("option",{key:t,value:e[i],disabled:e[l],selected:e[i]==s},e[u])})}function nativeFilterRender(n,r){var e=r.column,o=n.name,a=getNativeAttrs(n);return e.filters.map(function(e,t){return(0,_vue.h)(o,__assign(__assign(__assign({key:t,class:"vxe-default-"+o},a),{value:e.data}),getNativeFilterOns(n,r,e)))})}function defaultFilterRender(r,o){return o.column.filters.map(function(e,t){var n=e.data;return(0,_vue.h)(getDefaultComponent(r),__assign(__assign({key:t},getCellEditFilterProps(r,r,n)),getFilterOns(r,o,e)))})}function handleFilterMethod(e){var t=e.option,n=e.row,e=e.column,t=t.data;return _xeUtils.default.get(n,e.property)==t}function nativeSelectEditRender(e,t){return[(0,_vue.h)("select",__assign(__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 n=t.row,r=t.column,o=e.options,a=e.optionProps,u=e.optionGroups,i=e.optionGroupProps,r=(0,_util.getCellValue)(n,r);return[(0,_vue.h)(getDefaultComponent(e),__assign(__assign({},getCellEditProps(e,t,r,{options:o,optionProps:a,optionGroups:u,optionGroupProps:i})),getEditOns(e,t)))]}function getSelectCellValue(e,t){var r,n=t.row,o=t.column,a=e.props,t=void 0===a?{}:a,u=e.options,i=e.optionGroups,a=e.optionProps,a=void 0===a?{}:a,e=e.optionGroupProps,l=void 0===e?{}:e,o=_xeUtils.default.get(n,o.property),s=a.label||"label",d=a.value||"value";return(0,_utils.isEmptyValue)(o)?"":_xeUtils.default.map(t.multiple?o:[o],i?function(t){for(var e=l.options||"options",n=0;n<i.length&&!(r=_xeUtils.default.find(i[n][e],function(e){return e[d]==t}));n++);return r?r[s]:t}:function(t){return(r=_xeUtils.default.find(u,function(e){return e[d]==t}))?r[s]:t}).join(", ")}function nativeItemRender(e,t){var n=t.data,r=t.property,o=e.name,a=getNativeAttrs(e),r=_xeUtils.default.get(n,r);return[(0,_vue.h)(o,__assign(__assign(__assign({class:"vxe-default-"+o},a),{value:!a||"input"!==o||"submit"!==a.type&&"reset"!==a.type?r:null}),getNativeItemOns(e,t)))]}function defaultItemRender(e,t){var n=t.data,r=t.property,r=_xeUtils.default.get(n,r);return[(0,_vue.h)(getDefaultComponent(e),__assign(__assign({},getComponentFormItemProps(e,t,r)),getItemOns(e,t)))]}function defaultButtonItemRender(e,t){return[(0,_vue.h)((0,_vue.resolveComponent)("vxe-button"),__assign(__assign({},getComponentFormItemProps(e,t,null)),getComponentOns(e,t)))]}function defaultButtonsItemRender(e,t){return e.children.map(function(e){return defaultButtonItemRender(e,t)[0]})}function renderNativeFormOptions(e,t,n){var r=n.data,n=n.property,t=t.optionProps,t=void 0===t?{}:t,o=t.label||"label",a=t.value||"value",u=t.disabled||"disabled",i=_xeUtils.default.get(r,n);return e.map(function(e,t){return(0,_vue.h)("option",{key:t,value:e[a],disabled:e[u],selected:e[a]==i},e[o])})}function handleExportSelectMethod(e){var t=e.row,n=e.column;return e.options.original?(0,_util.getCellValue)(t,n):getSelectCellValue(n.editRender||n.cellRender,e)}function defaultFormItemRadioAndCheckboxRender(e,t){var n=e.name,r=e.options,o=e.optionProps,a=void 0===o?{}:o,u=t.data,o=t.property,i=a.label||"label",l=a.value||"value",s=a.disabled||"disabled",o=_xeUtils.default.get(u,o),d=getComponentName(n);return r?[(0,_vue.h)((0,_vue.resolveComponent)(d+"-group"),__assign(__assign({},getComponentFormItemProps(e,t,o)),getItemOns(e,t)),{default:function(){return r.map(function(e,t){return(0,_vue.h)((0,_vue.resolveComponent)(d),{key:t,label:e[l],content:e[i],disabled:e[s]})})}})]:[(0,_vue.h)((0,_vue.resolveComponent)(d),__assign(__assign({},getComponentFormItemProps(e,t,o)),getItemOns(e,t)))]}var renderMap={input:{autofocus:"input",renderEdit:nativeEditRender,renderDefault:nativeEditRender,renderFilter:nativeFilterRender,defaultFilterMethod:handleFilterMethod,renderItemContent:nativeItemRender},textarea:{autofocus:"textarea",renderEdit:nativeEditRender,renderItemContent:nativeItemRender},select:{renderEdit:nativeSelectEditRender,renderDefault:nativeSelectEditRender,renderCell:function(e,t){return getCellLabelVNs(e,t,getSelectCellValue(e,t))},renderFilter:function(n,r){return r.column.filters.map(function(e,t){return(0,_vue.h)("select",__assign(__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,renderItemContent:function(e,t){return[(0,_vue.h)("select",__assign(__assign({class:"vxe-default-select"},getNativeAttrs(e)),getNativeItemOns(e,t)),e.optionGroups?renderNativeOptgroups(e,t,renderNativeFormOptions):renderNativeFormOptions(e.options,e,t))]},cellExportMethod:handleExportSelectMethod},$input:{autofocus:".vxe-input--inner",renderEdit:defaultEditRender,renderCell:function(e,t){var n=e.props,r=void 0===n?{}:n,o=t.row,n=t.column,a=r.digits||_conf.default.input.digits,u=_xeUtils.default.get(o,n.property);if(u)switch(r.type){case"date":case"week":case"month":case"year":u=getLabelFormatDate(u,r);break;case"float":u=_xeUtils.default.toFixed(_xeUtils.default.floor(u,a),a)}return getCellLabelVNs(e,t,u)},renderDefault:defaultEditRender,renderFilter:defaultFilterRender,defaultFilterMethod:handleFilterMethod,renderItemContent:defaultItemRender},$textarea:{autofocus:".vxe-textarea--inner",renderItemContent:defaultItemRender},$button:{renderDefault:defaultButtonEditRender,renderItemContent:defaultButtonItemRender},$buttons:{renderDefault:defaultButtonsEditRender,renderItemContent:defaultButtonsItemRender},$select:{autofocus:".vxe-input--inner",renderEdit:defaultSelectEditRender,renderDefault:defaultSelectEditRender,renderCell:function(e,t){return getCellLabelVNs(e,t,getSelectCellValue(e,t))},renderFilter:function(r,o){var e=o.column,a=r.options,u=r.optionProps,i=r.optionGroups,l=r.optionGroupProps;return e.filters.map(function(e,t){var n=e.data;return(0,_vue.h)(getDefaultComponent(r),__assign(__assign({key:t},getCellEditFilterProps(r,o,n,{options:a,optionProps:u,optionGroups:i,optionGroupProps:l})),getFilterOns(r,o,e)))})},defaultFilterMethod:handleFilterMethod,renderItemContent:function(e,t){var n=t.data,r=t.property,o=e.options,a=e.optionProps,u=e.optionGroups,i=e.optionGroupProps,r=_xeUtils.default.get(n,r);return[(0,_vue.h)(getDefaultComponent(e),__assign(__assign({},getComponentFormItemProps(e,t,r,{options:o,optionProps:a,optionGroups:u,optionGroupProps:i})),getItemOns(e,t)))]},cellExportMethod:handleExportSelectMethod},$radio:{autofocus:".vxe-radio--input",renderItemContent:defaultFormItemRadioAndCheckboxRender},$checkbox:{autofocus:".vxe-checkbox--input",renderItemContent:defaultFormItemRadioAndCheckboxRender},$switch:{autofocus:".vxe-switch--button",renderEdit:defaultEditRender,renderDefault:defaultEditRender,renderItemContent:defaultItemRender}},renderer={mixin:function(e){return _xeUtils.default.each(e,function(e,t){return renderer.add(t,e)}),renderer},get:function(e){return renderMap[e]||null},add:function(n,e){var r;return n&&e&&((r=renderMap[n])?("development"===process.env.NODE_ENV&&_xeUtils.default.each(e,function(e,t){_xeUtils.default.eqNull(r[t])||r[t]===e||(0,_log.warnLog)("vxe.error.coverProp",["Renderer."+n,t])}),Object.assign(r,e)):renderMap[n]=e),renderer},delete:function(e){return delete renderMap[e],renderer}};exports.renderer=renderer;

package/lib/v-x-e-table/src/store.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.Store = void 0;
 
-var _utils = require("../../tools/utils");
+var _log = require("../../tools/log");
 
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
 
@@ -38,7 +38,7 @@ function () {
     // 检测是否覆盖
     if (process.env.NODE_ENV === 'development') {
       if (!_xeUtils.default.eqNull(this.store[name]) && this.store[name] !== render) {
-        (0, _utils.warnLog)('vxe.error.coverProp', [this._name, name]);
+        (0, _log.warnLog)('vxe.error.coverProp', [this._name, name]);
       }
     }
 

package/lib/v-x-e-table/src/store.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Store=void 0;var _utils=require("../../tools/utils"),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(t){return t&&t.__esModule?t:{default:t}}var Store=function(){function t(){this.store={}}return t.prototype.mixin=function(t){return Object.assign(this.store,t),this},t.prototype.has=function(t){return!!this.get(t)},t.prototype.get=function(t){return this.store[t]},t.prototype.add=function(t,e){return"development"===process.env.NODE_ENV&&(_xeUtils.default.eqNull(this.store[t])||this.store[t]===e||(0,_utils.warnLog)("vxe.error.coverProp",[this._name,t])),this.store[t]=e,this},t.prototype.delete=function(t){delete this.store[t]},t.prototype.forEach=function(t){_xeUtils.default.objectEach(this.store,t)},t}(),_default=exports.Store=Store;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Store=void 0;var _log=require("../../tools/log"),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(t){return t&&t.__esModule?t:{default:t}}var Store=function(){function t(){this.store={}}return t.prototype.mixin=function(t){return Object.assign(this.store,t),this},t.prototype.has=function(t){return!!this.get(t)},t.prototype.get=function(t){return this.store[t]},t.prototype.add=function(t,e){return"development"===process.env.NODE_ENV&&(_xeUtils.default.eqNull(this.store[t])||this.store[t]===e||(0,_log.warnLog)("vxe.error.coverProp",[this._name,t])),this.store[t]=e,this},t.prototype.delete=function(t){delete this.store[t]},t.prototype.forEach=function(t){_xeUtils.default.objectEach(this.store,t)},t}(),_default=exports.Store=Store;exports.default=_default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.1.20",
+  "version": "4.2.0-beta.2",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...",
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -36,7 +36,7 @@
     "@vue/cli-plugin-typescript": "~4.5.0",
     "@vue/cli-plugin-vuex": "~4.5.0",
     "@vue/cli-service": "~4.5.0",
-    "@vue/compiler-sfc": "^3.2.18",
+    "@vue/compiler-sfc": "^3.2.31",
     "@vue/eslint-config-standard": "^5.1.2",
     "@vue/eslint-config-typescript": "^7.0.0",
     "core-js": "^3.6.5",
@@ -61,12 +61,12 @@
     "sass": "^1.45.1",
     "sass-loader": "^10.0.5",
     "typescript": "~4.3.5",
-    "vue": "^3.2.26",
+    "vue": "^3.2.31",
     "vue-i18n": "^9.1.7",
     "vue-router": "^4.0.11",
     "vuex": "^4.0.2",
     "xe-ajax": "^4.0.5",
-    "xe-utils": "^3.5.2"
+    "xe-utils": "^3.5.4"
   },
   "peerDependencies": {
     "vue": "^3.2.2",

package/packages/button/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Button = Object.assign(VxeButtonComponent, {
   install (app: App) {
-    dynamicApp.component(VxeButtonComponent.name, VxeButtonComponent)
     app.component(VxeButtonComponent.name, VxeButtonComponent)
   }
 })
 
+dynamicApp.component(VxeButtonComponent.name, VxeButtonComponent)
+
 export default Button

package/packages/checkbox/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Checkbox = Object.assign(VxeCheckboxComponent, {
   install (app: App) {
-    dynamicApp.component(VxeCheckboxComponent.name, VxeCheckboxComponent)
     app.component(VxeCheckboxComponent.name, VxeCheckboxComponent)
   }
 })
 
+dynamicApp.component(VxeCheckboxComponent.name, VxeCheckboxComponent)
+
 export default Checkbox

package/packages/checkbox-group/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const CheckboxGroup = Object.assign(VxeCheckboxGroupComponent, {
   install (app: App) {
-    dynamicApp.component(VxeCheckboxGroupComponent.name, VxeCheckboxGroupComponent)
     app.component(VxeCheckboxGroupComponent.name, VxeCheckboxGroupComponent)
   }
 })
 
+dynamicApp.component(VxeCheckboxGroupComponent.name, VxeCheckboxGroupComponent)
+
 export default CheckboxGroup

package/packages/colgroup/index.ts

@@ -4,12 +4,14 @@ import { dynamicApp } from '../dynamics'
 
 export const Colgroup = Object.assign(VxeTableColgroupComponent, {
   install (app: App) {
-    dynamicApp.component(VxeTableColgroupComponent.name, VxeTableColgroupComponent)
     app.component(VxeTableColgroupComponent.name, VxeTableColgroupComponent)
     // 兼容旧用法
-    dynamicApp.component('VxeTableColgroup', VxeTableColgroupComponent)
     app.component('VxeTableColgroup', VxeTableColgroupComponent)
   }
 })
 
+dynamicApp.component(VxeTableColgroupComponent.name, VxeTableColgroupComponent)
+// 兼容旧用法
+dynamicApp.component('VxeTableColgroup', VxeTableColgroupComponent)
+
 export default Colgroup

package/packages/column/index.ts

@@ -4,12 +4,14 @@ import { dynamicApp } from '../dynamics'
 
 export const Column = Object.assign(VxeTableColumnComponent, {
   install (app: App) {
-    dynamicApp.component(VxeTableColumnComponent.name, VxeTableColumnComponent)
     app.component(VxeTableColumnComponent.name, VxeTableColumnComponent)
     // 兼容旧用法
-    dynamicApp.component('VxeTableColumn', VxeTableColumnComponent)
     app.component('VxeTableColumn', VxeTableColumnComponent)
   }
 })
 
+dynamicApp.component(VxeTableColumnComponent.name, VxeTableColumnComponent)
+// 兼容旧用法
+dynamicApp.component('VxeTableColumn', VxeTableColumnComponent)
+
 export default Column

package/packages/edit/src/hook.ts

@@ -1,9 +1,10 @@
 import { nextTick } from 'vue'
 import XEUtils from 'xe-utils'
 import { renderer } from '../../v-x-e-table'
-import { errLog, getLog, isEnableConf, warnLog } from '../../tools/utils'
+import { isEnableConf } from '../../tools/utils'
 import { getCellValue, setCellValue, getRowid } from '../../table/src/util'
 import { browse, removeClass, addClass } from '../../tools/dom'
+import { warnLog, errLog, getLog } from '../../tools/log'
 
 import { VxeGlobalHooksHandles, TableEditMethods, TableEditPrivateMethods } from '../../../types/all'
 

package/packages/export/index.ts

@@ -35,11 +35,12 @@ export const Export = {
       }
     })
     VXETable.hooks.add('$tableExport', exportHook)
-    dynamicApp.component(ExportPanelComponent.name, ExportPanelComponent)
-    dynamicApp.component(ImportPanelComponent.name, ImportPanelComponent)
     app.component(ExportPanelComponent.name, ExportPanelComponent)
     app.component(ImportPanelComponent.name, ImportPanelComponent)
   }
 }
 
+dynamicApp.component(ExportPanelComponent.name, ExportPanelComponent)
+dynamicApp.component(ImportPanelComponent.name, ImportPanelComponent)
+
 export default Export

package/packages/export/src/hook.ts

@@ -3,7 +3,8 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import { VXETable } from '../../v-x-e-table'
 import { isColumnInfo, mergeBodyMethod, getCellValue } from '../../table/src/util'
-import { errLog, warnLog, parseFile, formatText } from '../../tools/utils'
+import { parseFile, formatText } from '../../tools/utils'
+import { warnLog, errLog } from '../../tools/log'
 import { readLocalFile, handlePrint, saveLocalFile, createHtmlPage, getExportBlobByContent } from './util'
 
 import { VxeGlobalHooksHandles, VxeGridConstructor, VxeGridPrivateMethods, TableExportMethods } from '../../../types/all'

package/packages/export/src/util.ts

@@ -2,7 +2,8 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import { VXETable } from '../../v-x-e-table'
 import { browse } from '../../tools/dom'
-import { getLog, parseFile, errLog } from '../../tools/utils'
+import { parseFile } from '../../tools/utils'
+import { errLog, getLog } from '../../tools/log'
 
 import { VxeTablePropTypes, SaveFileFunction, ReadFileFunction, VxeTableConstructor } from '../../../types/all'
 
@@ -22,11 +23,8 @@ export function createFrame (): HTMLIFrameElement {
   return frame
 }
 
-export function getExportBlobByContent (content: string, options: { type: string }): Blob | null {
-  if (window.Blob) {
-    return new Blob([content], { type: `text/${options.type};charset=utf-8;` })
-  }
-  return null
+export function getExportBlobByContent (content: string, options: { type: string }) {
+  return new Blob([content], { type: `text/${options.type};charset=utf-8;` })
 }
 
 export function createHtmlPage (opts: VxeTablePropTypes.PrintConfig, content: string): string {

package/packages/filter/index.ts

@@ -8,9 +8,10 @@ export const Filter = {
   Panel: PanelComponent,
   install (app: App) {
     VXETable.hooks.add('$tableFilter', filterHook)
-    dynamicApp.component(PanelComponent.name, PanelComponent)
     app.component(PanelComponent.name, PanelComponent)
   }
 }
 
+dynamicApp.component(PanelComponent.name, PanelComponent)
+
 export default Filter

package/packages/filter/src/hook.ts

@@ -137,7 +137,7 @@ const tableFilterHook: VxeGlobalHooksHandles.HookOptions = {
        * @param {Event} evnt 事件
        */
       confirmFilterEvent (evnt: Event) {
-        const { filterStore, scrollXLoad, scrollYLoad } = reactData
+        const { filterStore, scrollXLoad: oldScrollXLoad, scrollYLoad: oldScrollYLoad } = reactData
         const filterOpts = computeFilterOpts.value
         const { column } = filterStore
         const { property } = column
@@ -154,19 +154,26 @@ const tableFilterHook: VxeGlobalHooksHandles.HookOptions = {
         if (!filterOpts.remote) {
           $xetable.handleTableData(true)
           $xetable.checkSelectionStatus()
-          $xetable.updateFooter()
-          if (scrollXLoad || scrollYLoad) {
-            $xetable.clearScroll()
-            if (scrollYLoad) {
-              $xetable.updateScrollYSpace()
-            }
-          }
         }
         $xetable.dispatchEvent('filter-change', { column, property, values, datas, filters: filterList, filterList }, evnt)
         $xetable.closeFilter()
-        nextTick(() => {
-          $xetable.recalculate()
+        $xetable.updateFooter().then(() => {
+          const { scrollXLoad, scrollYLoad } = reactData
+          if ((oldScrollXLoad || scrollXLoad) || (oldScrollYLoad || scrollYLoad)) {
+            if (oldScrollXLoad || scrollXLoad) {
+              $xetable.updateScrollXSpace()
+            }
+            if (oldScrollYLoad || scrollYLoad) {
+              $xetable.updateScrollYSpace()
+            }
+            return $xetable.refreshScroll()
+          }
+        }).then(() => {
           $xetable.updateCellAreas()
+          return $xetable.recalculate(true)
+        }).then(() => {
+          // 存在滚动行为未结束情况
+          setTimeout(() => $xetable.recalculate(), 50)
         })
       }
     }

package/packages/footer/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Footer = Object.assign(VxeTableFooterComponent, {
   install (app: App) {
-    dynamicApp.component(VxeTableFooterComponent.name, VxeTableFooterComponent)
     app.component(VxeTableFooterComponent.name, VxeTableFooterComponent)
   }
 })
 
+dynamicApp.component(VxeTableFooterComponent.name, VxeTableFooterComponent)
+
 export default Footer

package/packages/footer/src/footer.ts

@@ -34,7 +34,7 @@ export default defineComponent({
 
     const { xID, props: tableProps, reactData: tableReactData, internalData: tableInternalData } = $xetable
     const { refTableHeader, refTableBody, refValidTooltip } = $xetable.getRefMaps()
-    const { computeTooltipOpts } = $xetable.getComputeMaps()
+    const { computeTooltipOpts, computeColumnOpts } = $xetable.getComputeMaps()
 
     const refElem = ref() as Ref<HTMLDivElement>
     const refFooterTable = ref() as Ref<HTMLTableElement>
@@ -106,6 +106,7 @@ export default defineComponent({
       const { visibleColumn } = tableInternalData
       const { scrollYLoad, overflowX, scrollbarWidth, currentColumn, mergeFooterList } = tableReactData
       const tooltipOpts = computeTooltipOpts.value
+      const columnOpts = computeColumnOpts.value
       // 如果是使用优化模式
       if (fixedType) {
         if (scrollYLoad || allColumnFooterOverflow) {
@@ -244,7 +245,7 @@ export default defineComponent({
                 ...attrs,
                 style: footerCellStyle ? (XEUtils.isFunction(footerCellStyle) ? footerCellStyle(params) : footerCellStyle) : null,
                 ...tfOns,
-                key: columnKey ? column.id : $columnIndex
+                key: columnKey || columnOpts.useKey ? column.id : $columnIndex
               }, [
                 h('div', {
                   class: ['vxe-cell', {

package/packages/form/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Form = Object.assign(VxeFormComponent, {
   install (app: App) {
-    dynamicApp.component(VxeFormComponent.name, VxeFormComponent)
     app.component(VxeFormComponent.name, VxeFormComponent)
   }
 })
 
+dynamicApp.component(VxeFormComponent.name, VxeFormComponent)
+
 export default Form

package/packages/form/src/form-gather.ts

@@ -1,5 +1,5 @@
-import { defineComponent, h, onUnmounted, inject, ref, Ref, onMounted, provide, nextTick } from 'vue'
-import { errLog } from '../../tools/utils'
+import { defineComponent, h, onUnmounted, inject, ref, Ref, reactive, onMounted, provide, nextTick } from 'vue'
+import { errLog } from '../../tools/log'
 import { createItem, watchItem, destroyItem, assemItem, XEFormItemProvide } from './util'
 import { formItemProps } from './form-item'
 
@@ -13,7 +13,7 @@ export default defineComponent({
     const $xeform = inject('$xeform', {} as VxeFormConstructor & VxeFormPrivateMethods)
     const formGather = inject('xeformgather', null as XEFormItemProvide | null)
     const defaultSlot = slots.default
-    const formItem = createItem($xeform, props)
+    const formItem = reactive(createItem($xeform, props))
     const xeformitem: XEFormItemProvide = { formItem }
     formItem.children = []
 

package/packages/form/src/form-item.ts

@@ -1,4 +1,4 @@
-import { defineComponent, h, onUnmounted, inject, ref, Ref, onMounted, PropType } from 'vue'
+import { defineComponent, h, onUnmounted, inject, ref, Ref, onMounted, PropType, reactive } from 'vue'
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import { VXETable } from '../../v-x-e-table'
@@ -34,7 +34,7 @@ export default defineComponent({
     const refElem = ref() as Ref<HTMLDivElement>
     const $xeform = inject('$xeform', {} as VxeFormConstructor & VxeFormPrivateMethods)
     const formGather = inject('xeformgather', null as XEFormItemProvide | null)
-    const formItem = createItem($xeform, props)
+    const formItem = reactive(createItem($xeform, props))
     formItem.slots = slots
 
     watchItem(props, formItem)
@@ -113,9 +113,9 @@ export default defineComponent({
       }
       const ons = showTooltip ? {
         onMouseenter (evnt: MouseEvent) {
-          $xeform.triggerHeaderHelpEvent(evnt, params)
+          $xeform.triggerTitleTipEvent(evnt, params)
         },
-        onMouseleave: $xeform.handleTargetLeaveEvent
+        onMouseleave: $xeform.handleTitleTipLeaveEvent
       } : {}
       return h('div', {
         ref: refElem,