vxe-table 4.2.7-beta.2 → 4.2.8

package/es/button/src/button.js

@@ -279,6 +279,11 @@ export default defineComponent({
                     class: ['vxe-button--loading-icon', GlobalConfig.icon.BUTTON_LOADING]
                 }));
             }
+            else if (slots.icon) {
+                contVNs.push(h('span', {
+                    class: 'vxe-button--custom-icon'
+                }, slots.icon({})));
+            }
             else if (icon) {
                 contVNs.push(h('i', {
                     class: ['vxe-button--icon', icon]

package/es/edit/src/hook.js

@@ -692,19 +692,21 @@ var editHook = {
                 if (isEnableConf(editRender)) {
                     var compRender = renderer.get(editRender.name);
                     var autofocus = editRender.autofocus, autoselect = editRender.autoselect;
-                    var inputElem 
-                    // 如果指定了聚焦 class
-                    = void 0;
+                    var inputElem = void 0;
+                    if (!autofocus && compRender) {
+                        autofocus = compRender.autofocus;
+                    }
                     // 如果指定了聚焦 class
-                    if (autofocus) {
-                        inputElem = cell.querySelector(autofocus);
+                    if (XEUtils.isFunction(autofocus)) {
+                        inputElem = autofocus.call(this, params);
                     }
-                    // 渲染器的聚焦处理
-                    if (!inputElem && compRender && compRender.autofocus) {
-                        inputElem = cell.querySelector(compRender.autofocus);
+                    else if (autofocus) {
+                        inputElem = cell.querySelector(autofocus);
+                        if (inputElem) {
+                            inputElem.focus();
+                        }
                     }
                     if (inputElem) {
-                        inputElem.focus();
                         if (autoselect) {
                             inputElem.select();
                         }

package/es/filter/src/panel.js

@@ -208,7 +208,6 @@ export default defineComponent({
                 class: [
                     'vxe-table--filter-wrapper',
                     'filter--prevent-default',
-                    compConf && compConf.className ? compConf.className : '',
                     getPropClass(filterClassName, params),
                     {
                         'is--animat': $xetable.props.animat,

package/es/form/src/form-config-item.js

@@ -15,6 +15,7 @@ import GlobalConfig from '../../v-x-e-table/src/conf';
 import { VXETable } from '../../v-x-e-table';
 import { getFuncText, isEnableConf } from '../../tools/utils';
 import { renderTitle } from './render';
+import { isActivetem } from './util';
 var VxeFormConfigItem = defineComponent({
     name: 'VxeFormConfigItem',
     props: {
@@ -33,7 +34,7 @@ var VxeFormConfigItem = defineComponent({
             var item = props.itemConfig;
             var collapseAll = reactData.collapseAll;
             var validOpts = computeValidOpts.value;
-            var slots = item.slots, title = item.title, visible = item.visible, folding = item.folding, visibleMethod = item.visibleMethod, field = item.field, collapseNode = item.collapseNode, itemRender = item.itemRender, showError = item.showError, errRule = item.errRule, className = item.className, titleOverflow = item.titleOverflow, children = item.children;
+            var slots = item.slots, title = item.title, visible = item.visible, folding = item.folding, field = item.field, collapseNode = item.collapseNode, itemRender = item.itemRender, showError = item.showError, errRule = item.errRule, className = item.className, titleOverflow = item.titleOverflow, children = item.children;
             var compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null;
             var itemClassName = compConf ? compConf.itemClassName : '';
             var defaultSlot = slots ? slots.default : null;
@@ -49,7 +50,6 @@ var VxeFormConfigItem = defineComponent({
             var showTitle = itemOverflow === 'title';
             var showTooltip = itemOverflow === true || itemOverflow === 'tooltip';
             var hasEllipsis = showTitle || showTooltip || showEllipsis;
-            var itemVisibleMethod = visibleMethod;
             var params = { data: data, field: field, property: field, item: item, $form: $xeform };
             if (visible === false) {
                 return createCommentVNode();
@@ -74,9 +74,6 @@ var VxeFormConfigItem = defineComponent({
                     class: ['vxe-form--gather vxe-row', item.id, span ? "vxe-col--" + span + " is--span" : '', className ? (XEUtils.isFunction(className) ? className(params) : className) : '']
                 }, childVNs) : createCommentVNode();
             }
-            if (!itemVisibleMethod && compConf && compConf.itemVisibleMethod) {
-                itemVisibleMethod = compConf.itemVisibleMethod;
-            }
             var contentVNs = [];
             if (defaultSlot) {
                 contentVNs = $xeform.callSlot(defaultSlot, params);
@@ -127,7 +124,7 @@ var VxeFormConfigItem = defineComponent({
                         'is--asterisk': titleAsterisk,
                         'is--required': isRequired,
                         'is--hidden': folding && collapseAll,
-                        'is--active': !itemVisibleMethod || itemVisibleMethod(params),
+                        'is--active': isActivetem($xeform, item),
                         'is--error': showError
                     }
                 ],

package/es/form/src/form-item.js

@@ -9,12 +9,12 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { defineComponent, h, onUnmounted, inject, ref, provide, onMounted } from 'vue';
+import { defineComponent, h, onUnmounted, inject, ref, provide, onMounted, createCommentVNode, reactive } from 'vue';
 import XEUtils from 'xe-utils';
 import GlobalConfig from '../../v-x-e-table/src/conf';
 import { VXETable } from '../../v-x-e-table';
 import { getFuncText, isEnableConf } from '../../tools/utils';
-import { createItem, watchItem, destroyItem, assemItem } from './util';
+import { createItem, watchItem, destroyItem, assemItem, isActivetem } from './util';
 import { renderTitle } from './render';
 export var formItemProps = {
     title: String,
@@ -50,7 +50,7 @@ export default defineComponent({
         var refElem = ref();
         var $xeform = inject('$xeform', {});
         var formGather = inject('$xeformgather', null);
-        var formItem = createItem($xeform, props);
+        var formItem = reactive(createItem($xeform, props));
         var xeformitem = { formItem: formItem };
         var xeformiteminfo = { itemConfig: formItem };
         formItem.slots = slots;
@@ -70,7 +70,7 @@ export default defineComponent({
             var collapseAll = reactData.collapseAll;
             var computeValidOpts = $xeform.getComputeMaps().computeValidOpts;
             var validOpts = computeValidOpts.value;
-            var slots = item.slots, title = item.title, visible = item.visible, folding = item.folding, visibleMethod = item.visibleMethod, field = item.field, collapseNode = item.collapseNode, itemRender = item.itemRender, showError = item.showError, errRule = item.errRule, className = item.className, titleOverflow = item.titleOverflow;
+            var slots = item.slots, title = item.title, visible = item.visible, folding = item.folding, field = item.field, collapseNode = item.collapseNode, itemRender = item.itemRender, showError = item.showError, errRule = item.errRule, className = item.className, titleOverflow = item.titleOverflow;
             var compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null;
             var itemClassName = compConf ? compConf.itemClassName : '';
             var defaultSlot = slots ? slots.default : null;
@@ -84,18 +84,17 @@ export default defineComponent({
             var showTitle = itemOverflow === 'title';
             var showTooltip = itemOverflow === true || itemOverflow === 'tooltip';
             var hasEllipsis = showTitle || showTooltip || showEllipsis;
-            var itemVisibleMethod = visibleMethod;
             var params = { data: data, field: field, property: field, item: item, $form: $xeform };
             var isRequired = false;
+            if (visible === false) {
+                return createCommentVNode();
+            }
             if (rules) {
                 var itemRules = rules[field];
                 if (itemRules) {
                     isRequired = itemRules.some(function (rule) { return rule.required; });
                 }
             }
-            if (!itemVisibleMethod && compConf && compConf.itemVisibleMethod) {
-                itemVisibleMethod = compConf.itemVisibleMethod;
-            }
             var contentVNs = [];
             if (defaultSlot) {
                 contentVNs = $xeform.callSlot(defaultSlot, params);
@@ -144,8 +143,8 @@ export default defineComponent({
                     {
                         'is--title': title,
                         'is--required': isRequired,
-                        'is--hidden': visible === false || (folding && collapseAll),
-                        'is--active': !itemVisibleMethod || itemVisibleMethod(params),
+                        'is--hidden': folding && collapseAll,
+                        'is--active': isActivetem($xeform, item),
                         'is--error': showError
                     }
                 ]

package/es/form/src/form.js

@@ -16,7 +16,7 @@ import { VXETable } from '../../v-x-e-table';
 import { getFuncText, isEnableConf, eqEmptyValue } from '../../tools/utils';
 import { errLog } from '../../tools/log';
 import { scrollToView } from '../../tools/dom';
-import { createItem, handleFieldOrItem } from './util';
+import { createItem, handleFieldOrItem, isHiddenItem, isActivetem } from './util';
 import { useSize } from '../../hooks/size';
 import VxeFormConfigItem from './form-config-item';
 import VxeLoading from '../../loading/index';
@@ -347,7 +347,7 @@ export default defineComponent({
             if (data && formRules) {
                 itemList.forEach(function (item) {
                     var field = item.field;
-                    if (field) {
+                    if (field && !isHiddenItem($xeform, item) && isActivetem($xeform, item)) {
                         itemValids.push(validItemRules(type || 'all', field).then(function () {
                             item.errRule = null;
                         }).catch(function (_a) {
@@ -473,7 +473,7 @@ export default defineComponent({
         };
         var triggerItemEvent = function (evnt, field, itemValue) {
             if (field) {
-                return validItemRules(evnt ? evnt.type : 'all', field, itemValue)
+                return validItemRules(evnt ? (['blur'].includes(evnt.type) ? 'blur' : 'change') : 'all', field, itemValue)
                     .then(function () {
                     clearValidate(field);
                 })

package/es/form/src/util.js

@@ -1,18 +1,41 @@
 import { watch } from 'vue';
+import { VXETable } from '../../v-x-e-table';
 import XEUtils from 'xe-utils';
 import { ItemInfo } from './itemInfo';
+import { isEnableConf } from '../../tools/utils';
 export function isFormItem(item) {
     return item instanceof ItemInfo;
 }
 export function createItem($xeform, _vm) {
     return isFormItem(_vm) ? _vm : new ItemInfo($xeform, _vm);
 }
-export var handleFieldOrItem = function ($xeform, fieldOrItem) {
+export function handleFieldOrItem($xeform, fieldOrItem) {
     if (fieldOrItem) {
         return XEUtils.isString(fieldOrItem) ? $xeform.getItemByField(fieldOrItem) : fieldOrItem;
     }
     return null;
-};
+}
+export function isHiddenItem($xeform, formItem) {
+    var reactData = $xeform.reactData;
+    var collapseAll = reactData.collapseAll;
+    var folding = formItem.folding, visible = formItem.visible;
+    return visible === false || (folding && collapseAll);
+}
+export function isActivetem($xeform, formItem) {
+    var visibleMethod = formItem.visibleMethod, itemRender = formItem.itemRender, visible = formItem.visible, field = formItem.field;
+    if (visible === false) {
+        return visible;
+    }
+    var compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null;
+    if (!visibleMethod && compConf && compConf.itemVisibleMethod) {
+        visibleMethod = compConf.itemVisibleMethod;
+    }
+    if (!visibleMethod) {
+        return true;
+    }
+    var data = $xeform.props.data;
+    return visibleMethod({ data: data, field: field, property: field, item: formItem, $form: $xeform });
+}
 export function watchItem(props, formItem) {
     Object.keys(props).forEach(function (name) {
         watch(function () { return props[name]; }, function (value) {

package/es/header/src/header.js

@@ -112,7 +112,8 @@ export default defineComponent({
             document.onmouseup = function (evnt) {
                 document.onmousemove = domMousemove;
                 document.onmouseup = domMouseup;
-                column.resizeWidth = column.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft);
+                var resizeWidth = column.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft);
+                column.resizeWidth = resizeWidth;
                 resizeBarElem.style.display = 'none';
                 tableInternalData._isResize = false;
                 tableInternalData._lastResizeTime = Date.now();
@@ -120,7 +121,7 @@ export default defineComponent({
                 $xetable.recalculate(true).then(function () {
                     $xetable.saveCustomResizable();
                     $xetable.updateCellAreas();
-                    $xetable.dispatchEvent('resizable-change', params, evnt);
+                    $xetable.dispatchEvent('resizable-change', __assign(__assign({}, params), { resizeWidth: resizeWidth }), evnt);
                 });
                 removeClass(tableEl, 'drag--resize');
             };

package/es/tools/log.js

@@ -1,6 +1,6 @@
 import GlobalConfig from '../v-x-e-table/src/conf';
 export function getLog(message, params) {
-    return "[vxe-table v" + "4.2.7-beta.2" + "] " + GlobalConfig.i18n(message, params);
+    return "[vxe-table v" + "4.2.8" + "] " + GlobalConfig.i18n(message, params);
 }
 function outLog(type) {
     return function (message, params) {

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

@@ -83,7 +83,7 @@ export var config = new VXETableConfig();
 export var v = 'v4';
 export var VXETable = {
     v: v,
-    version: "4.2.7-beta.2",
+    version: "4.2.8",
     setup: setup,
     interceptor: interceptor,
     renderer: renderer,

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

@@ -18,13 +18,17 @@ var Store = /** @class */ (function () {
         return this.store[name];
     };
     Store.prototype.add = function (name, render) {
+        var conf = this.store[name];
         // 检测是否覆盖
         if (process.env.NODE_ENV === 'development') {
-            if (!XEUtils.eqNull(this.store[name]) && this.store[name] !== render) {
-                warnLog('vxe.error.coverProp', [this._name, name]);
-            }
+            var confKeys_1 = XEUtils.keys(conf);
+            XEUtils.each(render, function (item, key) {
+                if (confKeys_1.includes(key)) {
+                    warnLog('vxe.error.coverProp', [name, key]);
+                }
+            });
         }
-        this.store[name] = render;
+        this.store[name] = conf ? XEUtils.merge(conf, render) : render;
         return this;
     };
     Store.prototype.delete = function (name) {

package/lib/button/src/button.js

@@ -360,6 +360,10 @@ var _default2 = (0, _vue.defineComponent)({
         contVNs.push((0, _vue.h)('i', {
           class: ['vxe-button--loading-icon', _conf.default.icon.BUTTON_LOADING]
         }));
+      } else if (slots.icon) {
+        contVNs.push((0, _vue.h)('span', {
+          class: 'vxe-button--custom-icon'
+        }, slots.icon({})));
       } else if (icon) {
         contVNs.push((0, _vue.h)('i', {
           class: ['vxe-button--icon', icon]

package/lib/button/src/button.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_size=require("../../hooks/size"),_dom=require("../../tools/dom"),_utils=require("../../tools/utils"),_event=require("../../tools/event");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default2=(0,_vue.defineComponent)({name:"VxeButton",props:{type:String,className:String,size:{type:String,default:function(){return _conf.default.button.size||_conf.default.size}},name:[String,Number],content:String,placement:String,status:String,icon:String,round:Boolean,circle:Boolean,disabled:Boolean,loading:Boolean,destroyOnClose:Boolean,transfer:{type:Boolean,default:function(){return _conf.default.button.transfer}}},emits:["click","dropdown-click"],setup:function(m,e){function _(e){u.dispatchEvent("click",{$event:e},e)}function b(e){0===e.button&&e.stopPropagation()}function h(e){var t=e.currentTarget,n=z.value,t=(o=(0,_dom.getEventTargetNode)(e,t,"vxe-button")).flag,o=o.targetElem;t&&(n&&(n.dataset.active="N"),P.showPanel=!1,setTimeout(function(){n&&"Y"===n.dataset.active||(P.animatVisible=!1)},350),u.dispatchEvent("dropdown-click",{name:o.getAttribute("name"),$event:e},e))}function x(){var e=z.value;e&&(e.dataset.active="Y",P.inited||(P.inited=!0),n.showTime=setTimeout(function(){"Y"===e.dataset.active?q():P.animatVisible=!1},250))}function g(){r()}function w(){var e=m.content,t=m.icon,n=[];return m.loading?n.push((0,_vue.h)("i",{class:["vxe-button--loading-icon",_conf.default.icon.BUTTON_LOADING]})):t&&n.push((0,_vue.h)("i",{class:["vxe-button--icon",t]})),T.default?n.push((0,_vue.h)("span",{class:"vxe-button--content"},T.default({}))):e&&n.push((0,_vue.h)("span",{class:"vxe-button--content"},(0,_utils.getFuncText)(e))),n}var T=e.slots,o=e.emit,t=_xeUtils.default.uniqueId(),y=(0,_size.useSize)(m),P=(0,_vue.reactive)({inited:!1,showPanel:!1,animatVisible:!1,panelIndex:0,panelStyle:{},panelPlacement:""}),n={showTime:null},N=(0,_vue.ref)(),k=(0,_vue.ref)(),z=(0,_vue.ref)(),i={refElem:N},a={xID:t,props:m,context:e,reactData:P,internalData:n,getRefMaps:function(){return i}},u={},O=(0,_vue.computed)(function(){var e=m.type;return!!e&&-1<["submit","reset","button"].indexOf(e)}),S=(0,_vue.computed)(function(){var e=m.type;return e&&"text"===e?e:"button"}),s=function(){P.panelIndex<(0,_utils.getLastZIndex)()&&(P.panelIndex=(0,_utils.nextZIndex)())},l=function(){return(0,_vue.nextTick)().then(function(){var e=m.transfer,t=m.placement,n=P.panelIndex,o=k.value,i=z.value;if(i&&o){var a=o.offsetHeight,u=o.offsetWidth,s=i.offsetHeight,l=i.offsetWidth,r={zIndex:n},c=(0,_dom.getAbsolutePos)(o),d=c.top,v=c.left,i=c.boundingTop,n=c.visibleHeight,o=c.visibleWidth,c="bottom";return e?(e=d+a,"top"===t?(c="top",e=d-s):t||(n<i+a+s+5&&(c="top",e=d-s),e<5&&(c="bottom",e=d+a)),o<(v=v+u-l)+l+5&&(v-=v+l+5-o),v<5&&(v=5),Object.assign(r,{left:v+"px",right:"auto",top:e+"px",minWidth:u+"px"})):"top"===t?(c="top",r.bottom=a+"px"):t||n<i+a+s&&5<i-a-s&&(c="top",r.bottom=a+"px"),P.panelStyle=r,P.panelPlacement=c,(0,_vue.nextTick)()}})},q=function(){var e=z.value;e&&(e.dataset.active="Y",P.animatVisible=!0,setTimeout(function(){"Y"===e.dataset.active&&(P.showPanel=!0,s(),l(),setTimeout(function(){P.showPanel&&l()},50))},20))},r=function(){var e=z.value;clearTimeout(n.showTime),e?(e.dataset.active="N",setTimeout(function(){"Y"!==e.dataset.active&&(P.showPanel=!1,setTimeout(function(){"Y"!==e.dataset.active&&(P.animatVisible=!1)},350))},100)):(P.animatVisible=!1,P.showPanel=!1)},u={dispatchEvent:function(e,t,n){o(e,Object.assign({$button:a,$event:n},t))},focus:function(){return k.value.focus(),(0,_vue.nextTick)()},blur:function(){return k.value.blur(),(0,_vue.nextTick)()}};Object.assign(a,u),(0,_vue.onMounted)(function(){_event.GlobalEvent.on(a,"mousewheel",function(e){var t=z.value;P.showPanel&&!(0,_dom.getEventTargetNode)(e,t).flag&&r()})}),(0,_vue.onUnmounted)(function(){_event.GlobalEvent.off(a,"mousewheel")});return a.renderVN=function(){var e=m.className,t=m.transfer,n=m.type,o=m.round,i=m.circle,a=m.destroyOnClose,u=m.status,s=m.name,l=m.disabled,r=m.loading,c=P.inited,d=P.showPanel,v=O.value,f=S.value,p=y.value;return T.dropdowns?(0,_vue.h)("div",{ref:N,class:["vxe-button--dropdown",e,((e={})["size--"+p]=p,e["is--active"]=d,e)]},[(0,_vue.h)("button",{ref:k,class:["vxe-button","type--"+f,((e={})["size--"+p]=p,e["theme--"+u]=u,e["is--round"]=o,e["is--circle"]=i,e["is--disabled"]=l||r,e["is--loading"]=r,e)],name:s,type:v?n:"button",disabled:l||r,onMouseenter:x,onMouseleave:g,onClick:_},w().concat([(0,_vue.h)("i",{class:"vxe-button--dropdown-arrow "+_conf.default.icon.BUTTON_DROPDOWN})])),(0,_vue.h)(_vue.Teleport,{to:"body",disabled:!t||!c},[(0,_vue.h)("div",{ref:z,class:["vxe-button--dropdown-panel",((t={})["size--"+p]=p,t["animat--leave"]=P.animatVisible,t["animat--enter"]=d,t)],placement:P.panelPlacement,style:P.panelStyle},c?[(0,_vue.h)("div",{class:"vxe-button--dropdown-wrapper",onMousedown:b,onClick:h,onMouseenter:q,onMouseleave:g},a&&!d?[]:T.dropdowns({}))]:[])])]):(0,_vue.h)("button",{ref:k,class:["vxe-button","type--"+f,((f={})["size--"+p]=p,f["theme--"+u]=u,f["is--round"]=o,f["is--circle"]=i,f["is--disabled"]=l||r,f["is--loading"]=r,f)],name:s,type:v?n:"button",disabled:l||r,onClick:_},w())},a},render:function(){return this.renderVN()}});exports.default=_default2;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_size=require("../../hooks/size"),_dom=require("../../tools/dom"),_utils=require("../../tools/utils"),_event=require("../../tools/event");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default2=(0,_vue.defineComponent)({name:"VxeButton",props:{type:String,className:String,size:{type:String,default:function(){return _conf.default.button.size||_conf.default.size}},name:[String,Number],content:String,placement:String,status:String,icon:String,round:Boolean,circle:Boolean,disabled:Boolean,loading:Boolean,destroyOnClose:Boolean,transfer:{type:Boolean,default:function(){return _conf.default.button.transfer}}},emits:["click","dropdown-click"],setup:function(m,e){function _(e){u.dispatchEvent("click",{$event:e},e)}function b(e){0===e.button&&e.stopPropagation()}function h(e){var t=e.currentTarget,n=z.value,t=(o=(0,_dom.getEventTargetNode)(e,t,"vxe-button")).flag,o=o.targetElem;t&&(n&&(n.dataset.active="N"),P.showPanel=!1,setTimeout(function(){n&&"Y"===n.dataset.active||(P.animatVisible=!1)},350),u.dispatchEvent("dropdown-click",{name:o.getAttribute("name"),$event:e},e))}function x(){var e=z.value;e&&(e.dataset.active="Y",P.inited||(P.inited=!0),n.showTime=setTimeout(function(){"Y"===e.dataset.active?q():P.animatVisible=!1},250))}function g(){r()}function w(){var e=m.content,t=m.icon,n=[];return m.loading?n.push((0,_vue.h)("i",{class:["vxe-button--loading-icon",_conf.default.icon.BUTTON_LOADING]})):T.icon?n.push((0,_vue.h)("span",{class:"vxe-button--custom-icon"},T.icon({}))):t&&n.push((0,_vue.h)("i",{class:["vxe-button--icon",t]})),T.default?n.push((0,_vue.h)("span",{class:"vxe-button--content"},T.default({}))):e&&n.push((0,_vue.h)("span",{class:"vxe-button--content"},(0,_utils.getFuncText)(e))),n}var T=e.slots,o=e.emit,t=_xeUtils.default.uniqueId(),y=(0,_size.useSize)(m),P=(0,_vue.reactive)({inited:!1,showPanel:!1,animatVisible:!1,panelIndex:0,panelStyle:{},panelPlacement:""}),n={showTime:null},N=(0,_vue.ref)(),k=(0,_vue.ref)(),z=(0,_vue.ref)(),i={refElem:N},a={xID:t,props:m,context:e,reactData:P,internalData:n,getRefMaps:function(){return i}},u={},O=(0,_vue.computed)(function(){var e=m.type;return!!e&&-1<["submit","reset","button"].indexOf(e)}),S=(0,_vue.computed)(function(){var e=m.type;return e&&"text"===e?e:"button"}),s=function(){P.panelIndex<(0,_utils.getLastZIndex)()&&(P.panelIndex=(0,_utils.nextZIndex)())},l=function(){return(0,_vue.nextTick)().then(function(){var e=m.transfer,t=m.placement,n=P.panelIndex,o=k.value,i=z.value;if(i&&o){var a=o.offsetHeight,u=o.offsetWidth,s=i.offsetHeight,l=i.offsetWidth,r={zIndex:n},c=(0,_dom.getAbsolutePos)(o),d=c.top,v=c.left,i=c.boundingTop,n=c.visibleHeight,o=c.visibleWidth,c="bottom";return e?(e=d+a,"top"===t?(c="top",e=d-s):t||(n<i+a+s+5&&(c="top",e=d-s),e<5&&(c="bottom",e=d+a)),o<(v=v+u-l)+l+5&&(v-=v+l+5-o),v<5&&(v=5),Object.assign(r,{left:v+"px",right:"auto",top:e+"px",minWidth:u+"px"})):"top"===t?(c="top",r.bottom=a+"px"):t||n<i+a+s&&5<i-a-s&&(c="top",r.bottom=a+"px"),P.panelStyle=r,P.panelPlacement=c,(0,_vue.nextTick)()}})},q=function(){var e=z.value;e&&(e.dataset.active="Y",P.animatVisible=!0,setTimeout(function(){"Y"===e.dataset.active&&(P.showPanel=!0,s(),l(),setTimeout(function(){P.showPanel&&l()},50))},20))},r=function(){var e=z.value;clearTimeout(n.showTime),e?(e.dataset.active="N",setTimeout(function(){"Y"!==e.dataset.active&&(P.showPanel=!1,setTimeout(function(){"Y"!==e.dataset.active&&(P.animatVisible=!1)},350))},100)):(P.animatVisible=!1,P.showPanel=!1)},u={dispatchEvent:function(e,t,n){o(e,Object.assign({$button:a,$event:n},t))},focus:function(){return k.value.focus(),(0,_vue.nextTick)()},blur:function(){return k.value.blur(),(0,_vue.nextTick)()}};Object.assign(a,u),(0,_vue.onMounted)(function(){_event.GlobalEvent.on(a,"mousewheel",function(e){var t=z.value;P.showPanel&&!(0,_dom.getEventTargetNode)(e,t).flag&&r()})}),(0,_vue.onUnmounted)(function(){_event.GlobalEvent.off(a,"mousewheel")});return a.renderVN=function(){var e=m.className,t=m.transfer,n=m.type,o=m.round,i=m.circle,a=m.destroyOnClose,u=m.status,s=m.name,l=m.disabled,r=m.loading,c=P.inited,d=P.showPanel,v=O.value,f=S.value,p=y.value;return T.dropdowns?(0,_vue.h)("div",{ref:N,class:["vxe-button--dropdown",e,((e={})["size--"+p]=p,e["is--active"]=d,e)]},[(0,_vue.h)("button",{ref:k,class:["vxe-button","type--"+f,((e={})["size--"+p]=p,e["theme--"+u]=u,e["is--round"]=o,e["is--circle"]=i,e["is--disabled"]=l||r,e["is--loading"]=r,e)],name:s,type:v?n:"button",disabled:l||r,onMouseenter:x,onMouseleave:g,onClick:_},w().concat([(0,_vue.h)("i",{class:"vxe-button--dropdown-arrow "+_conf.default.icon.BUTTON_DROPDOWN})])),(0,_vue.h)(_vue.Teleport,{to:"body",disabled:!t||!c},[(0,_vue.h)("div",{ref:z,class:["vxe-button--dropdown-panel",((t={})["size--"+p]=p,t["animat--leave"]=P.animatVisible,t["animat--enter"]=d,t)],placement:P.panelPlacement,style:P.panelStyle},c?[(0,_vue.h)("div",{class:"vxe-button--dropdown-wrapper",onMousedown:b,onClick:h,onMouseenter:q,onMouseleave:g},a&&!d?[]:T.dropdowns({}))]:[])])]):(0,_vue.h)("button",{ref:k,class:["vxe-button","type--"+f,((f={})["size--"+p]=p,f["theme--"+u]=u,f["is--round"]=o,f["is--circle"]=i,f["is--disabled"]=l||r,f["is--loading"]=r,f)],name:s,type:v?n:"button",disabled:l||r,onClick:_},w())},a},render:function(){return this.renderVN()}});exports.default=_default2;

package/lib/edit/src/hook.js

@@ -930,21 +930,24 @@ var editHook = {
 
           var autofocus = editRender.autofocus,
               autoselect = editRender.autoselect;
-          var inputElem // 如果指定了聚焦 class
-          = void 0; // 如果指定了聚焦 class
+          var inputElem = void 0;
+
+          if (!autofocus && compRender) {
+            autofocus = compRender.autofocus;
+          } // 如果指定了聚焦 class
 
-          if (autofocus) {
-            inputElem = cell.querySelector(autofocus);
-          } // 渲染器的聚焦处理
 
+          if (_xeUtils.default.isFunction(autofocus)) {
+            inputElem = autofocus.call(this, params);
+          } else if (autofocus) {
+            inputElem = cell.querySelector(autofocus);
 
-          if (!inputElem && compRender && compRender.autofocus) {
-            inputElem = cell.querySelector(compRender.autofocus);
+            if (inputElem) {
+              inputElem.focus();
+            }
           }
 
           if (inputElem) {
-            inputElem.focus();
-
             if (autoselect) {
               inputElem.select();
             } else {

package/lib/edit/src/hook.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")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_util=require("../../table/src/util"),_dom=require("../../tools/dom"),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,r=1,l=arguments.length;r<l;r++)for(var n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)},__spreadArray=function(e,t){for(var r=0,l=t.length,n=e.length;r<l;r++,n++)e[n]=t[r];return e},tableEditMethodKeys=["insert","insertAt","remove","removeCheckboxRow","removeRadioRow","removeCurrentRow","getRecordset","getInsertRecords","getRemoveRecords","getUpdateRecords","getEditRecord","getActiveRecord","getSelectedCell","clearEdit","clearActived","clearSelected","isEditByRow","isActiveByRow","setEditRow","setActiveRow","setEditCell","setActiveCell","setSelectCell"],editHook={setupTable:function(x){function v(e,t){var r=t.model;t.editRender&&(r.value=(0,_util.getCellValue)(e,t),r.update=!1)}function n(e,t){var r=t.model;t.editRender&&r.update&&((0,_util.setCellValue)(e,t,r.value),r.update=!1,r.value=null)}function r(){var e=o.value;!e||(e=e.querySelector(".col--selected"))&&(0,_dom.removeClass)(e,"col--selected")}var _=x.props,C=x.reactData,E=x.internalData,o=x.getRefMaps().refElem,e=x.getComputeMaps(),s=e.computeMouseOpts,p=e.computeEditOpts,w=e.computeCheckboxOpts,b=e.computeTreeOpts,g={},m={};function a(){var e=C.editStore,t=C.tableColumn,r=p.value,e=e.actived,l=e.row,e=e.column;(l||e)&&("row"===r.mode?t.forEach(function(e){return n(l,e)}):n(l,e))}function I(e,t){var a=E.tableFullTreeData,i=E.afterFullData,u=E.fullDataRowIdData,c=E.fullAllDataRowIdData,r=b.value,d=r.rowField,s=r.parentField,f=r.children,v=r.mapChildren,p=t?"push":"unshift";e.forEach(function(e){var t,r,l=e[s],n=(0,_util.getRowid)(x,e),o=l?_xeUtils.default.findTree(a,function(e){return l===e[d]},{children:v}):null;e=o?(t=o.item,o=(r=c[(0,_util.getRowid)(x,t)])?r.level:0,r=t[f],(r=!_xeUtils.default.isArray(r)?t[f]=[]:r)[p](e),{row:e,rowid:n,seq:-1,index:-1,_index:-1,$index:-1,items:r,parent:parent,level:o+1}):("development"===process.env.NODE_ENV&&l&&(0,_log.warnLog)("vxe.error.unableInsert"),i[p](e),a[p](e),{row:e,rowid:n,seq:-1,index:-1,_index:-1,$index:-1,items:a,parent:null,level:0}),u[n]=e,c[n]=e})}return g={insert:function(e){return g.insertAt(e,null)},insertAt:function(e,t){var r=_.treeConfig,l=C.mergeList,n=C.editStore,o=E.tableFullTreeData,a=E.afterFullData,i=E.tableFullData,u=E.fullDataRowIdData,c=E.fullAllDataRowIdData,d=b.value,s=d.transform,f=d.rowField,v=d.mapChildren,p=(e=!_xeUtils.default.isArray(e)?[e]:e).map(function(e){return x.defineField(Object.assign({},e))});if(t)if(-1===t)r&&s?I(p,!0):(a.push.apply(a,p),i.push.apply(i,p),l.forEach(function(e){var t=e.row,r=e.rowspan;t+r>a.length&&(e.rowspan=r+p.length)}));else if(r&&s){var w,g,m,h=_xeUtils.default.findTree(o,function(e){return t[f]===e[f]},{children:v});h?(w=h.parent,g=h.items,v=c[(0,_util.getRowid)(x,w)],m=v?v.level:0,p.forEach(function(e,t){var r=(0,_util.getRowid)(x,e);"development"===process.env.NODE_ENV&&e[d.parentField]&&w&&e[d.parentField]!==w[f]&&(0,_log.errLog)("vxe.error.errProp",[d.parentField+"="+e[d.parentField],d.parentField+"="+w[f]]),w&&(e[d.parentField]=w[f]),g.splice(h.index+t,0,e);e={row:e,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,items:g,parent:w,level:m+1};u[r]=e,c[r]=e})):("development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.unableInsert"),I(p,!0))}else{if(r)throw new Error((0,_log.getLog)("vxe.error.noTree",["insert"]));var R=-1;if(_xeUtils.default.isNumber(t)?t<a.length&&(R=t):R=x.findRowIndexOf(a,t),-1===R)throw new Error((0,_log.errLog)("vxe.error.unableInsert"));a.splice.apply(a,__spreadArray([R,0],p)),i.splice.apply(i,__spreadArray([x.findRowIndexOf(i,t),0],p)),l.forEach(function(e){var t=e.row,r=e.rowspan;R<t?e.row=t+p.length:R<t+r&&(e.rowspan=r+p.length)})}else r&&s?I(p,!1):(a.unshift.apply(a,p),i.unshift.apply(i,p),l.forEach(function(e){var t=e.row;0<t&&(e.row=t+p.length)}));return(n=n.insertList).unshift.apply(n,p),x.updateFooter(),x.cacheRowMap(),x.handleTableData(r&&s),r&&s||x.updateAfterDataIndex(),x.checkSelectionStatus(),C.scrollYLoad&&x.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return x.updateCellAreas(),x.recalculate()}).then(function(){return{row:p.length?p[p.length-1]:null,rows:p}})},remove:function(e){var t=_.treeConfig,r=C.mergeList,l=C.editStore,n=C.selection,o=E.tableFullTreeData,a=E.afterFullData,i=E.tableFullData,u=w.value,c=b.value,d=c.transform,s=l.actived,f=l.removeList,v=l.insertList,u=u.checkField,p=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=i,e.forEach(function(e){x.isInsertByRow(e)||f.push(e)}),u||e.forEach(function(e){e=x.findRowIndexOf(n,e);-1<e&&n.splice(e,1)}),i===e?(e=p=i.slice(0),E.tableFullData=[],E.afterFullData=[],x.clearMergeCells()):t&&d?e.forEach(function(e){var t=(0,_util.getRowid)(x,e),r=_xeUtils.default.findTree(o,function(e){return t===(0,_util.getRowid)(x,e)},c);r&&(r=r.items.splice(r.index,1),p.push(r[0]));e=x.findRowIndexOf(a,e);-1<e&&a.splice(e,1)}):e.forEach(function(e){var t=x.findRowIndexOf(i,e);-1<t&&(t=i.splice(t,1),p.push(t[0]));var l=x.findRowIndexOf(a,e);-1<l&&(r.forEach(function(e){var t=e.row,r=e.rowspan;l<t?e.row=t-1:l<t+r&&(e.rowspan=r-1)}),a.splice(l,1))}),s.row&&-1<x.findRowIndexOf(e,s.row)&&g.clearActived(),e.forEach(function(e){e=x.findRowIndexOf(v,e);-1<e&&v.splice(e,1)}),x.updateFooter(),x.cacheRowMap(),x.handleTableData(t&&d),t&&d||x.updateAfterDataIndex(),x.checkSelectionStatus(),C.scrollYLoad&&x.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return x.updateCellAreas(),x.recalculate()}).then(function(){return{row:p.length?p[p.length-1]:null,rows:p}})},removeCheckboxRow:function(){return g.remove(x.getCheckboxRecords()).then(function(e){return x.clearCheckboxRow(),e})},removeRadioRow:function(){var e=x.getRadioRecord();return g.remove(e||[]).then(function(e){return x.clearRadioRow(),e})},removeCurrentRow:function(){var e=x.getCurrentRecord();return g.remove(e||[]).then(function(e){return x.clearCurrentRow(),e})},getRecordset:function(){return{insertRecords:g.getInsertRecords(),removeRecords:g.getRemoveRecords(),updateRecords:g.getUpdateRecords()}},getInsertRecords:function(){var e=_.treeConfig,t=C.editStore,r=E.tableFullTreeData,l=E.tableFullData,n=b.value,t=t.insertList,o=[];return t.length&&(e&&n.transform?t.forEach(function(e){var t=(0,_util.getRowid)(x,e);_xeUtils.default.findTree(r,function(e){return t===(0,_util.getRowid)(x,e)},n)&&o.push(e)}):t.forEach(function(e){-1<x.findRowIndexOf(l,e)&&o.push(e)})),o},getRemoveRecords:function(){return C.editStore.removeList},getUpdateRecords:function(){var e=_.keepSource,t=_.treeConfig,r=E.tableFullData,l=b.value;return e?(a(),t?_xeUtils.default.filterTree(r,function(e){return x.isUpdateByRow(e)},l):r.filter(function(e){return x.isUpdateByRow(e)})):[]},getActiveRecord:function(){return this.getEditRecord()},getEditRecord:function(){var e=C.editStore,t=E.afterFullData,r=o.value,l=e.actived,e=l.args,l=l.row;return e&&-1<x.findRowIndexOf(t,l)&&r.querySelectorAll(".vxe-body--column.col--actived").length?Object.assign({},e):null},getSelectedCell:function(){var e=C.editStore.selected,t=e.args,e=e.column;return t&&e?Object.assign({},t):null},clearActived:function(e){return this.clearEdit(e)},clearEdit:function(e){var t=C.editStore.actived,r=t.row,l=t.column;return(r||l)&&(a(),t.args=null,t.row=null,t.column=null,x.updateFooter(),x.dispatchEvent("edit-closed",{row:r,rowIndex:x.getRowIndex(r),$rowIndex:x.getVMRowIndex(r),column:l,columnIndex:x.getColumnIndex(l),$columnIndex:x.getVMColumnIndex(l)},e||null)),x.clearValidate?x.clearValidate():(0,_vue.nextTick)()},clearSelected:function(){var e=C.editStore.selected;return e.row=null,e.column=null,r(),(0,_vue.nextTick)()},isActiveByRow:function(e){return this.isEditByRow(e)},isEditByRow:function(e){return C.editStore.actived.row===e},setActiveRow:function(e){return g.setEditRow(e)},setEditRow:function(e){var t=E.visibleColumn;return x.setEditCell(e,_xeUtils.default.find(t,function(e){return(0,_utils.isEnableConf)(e.editRender)}))},setActiveCell:function(e,t){return g.setEditCell(e,t)},setEditCell:function(t,e){var r=_.editConfig,l=_xeUtils.default.isString(e)?x.getColumnByField(e):e;return t&&l&&(0,_utils.isEnableConf)(r)&&(0,_utils.isEnableConf)(l.editRender)?x.scrollToRow(t,l).then(function(){var e=x.getCell(t,l);return e&&(m.handleActived({row:t,rowIndex:x.getRowIndex(t),column:l,columnIndex:x.getColumnIndex(l),cell:e,$table:x}),E._lastCallTime=Date.now()),(0,_vue.nextTick)()}):(0,_vue.nextTick)()},setSelectCell:function(e,t){var r=C.tableData,l=E.visibleColumn,n=p.value,t=_xeUtils.default.isString(t)?x.getColumnByField(t):t;return e&&t&&"manual"!==n.trigger&&(-1<(n=x.findRowIndexOf(r,e))&&t&&(r=x.getCell(e,t),r={row:e,rowIndex:n,column:t,columnIndex:l.indexOf(t),cell:r},x.handleSelected(r,{}))),(0,_vue.nextTick)()}},m={handleActived:function(e,t){var r,l=_.editConfig,n=_.mouseConfig,o=C.editStore,a=C.tableColumn,i=p.value,u=i.mode,c=o.actived,d=e.row,s=e.column,f=s.editRender,o=e.cell||x.getCell(d,s),i=i.beforeEditMethod||i.activeMethod;return e.cell=o,(0,_utils.isEnableConf)(l)&&(0,_utils.isEnableConf)(f)&&o&&(c.row!==d||"cell"===u&&c.column!==s?(r="edit-disabled",i&&!i(__assign(__assign({},e),{$table:x}))||(n&&(g.clearSelected(),x.clearCellAreas&&(x.clearCellAreas(),x.clearCopyCellArea())),x.closeTooltip(),c.column&&g.clearActived(t),r="edit-actived",s.renderHeight=o.offsetHeight,c.args=e,c.row=d,c.column=s,"row"===u?a.forEach(function(e){return v(d,e)}):v(d,s),(0,_vue.nextTick)(function(){m.handleFocus(e,t)})),x.dispatchEvent(r,{row:d,rowIndex:x.getRowIndex(d),$rowIndex:x.getVMRowIndex(d),column:s,columnIndex:x.getColumnIndex(s),$columnIndex:x.getVMColumnIndex(s)},t)):(r=c.column,n&&(g.clearSelected(),x.clearCellAreas&&(x.clearCellAreas(),x.clearCopyCellArea())),r!==s&&((n=r.model).update&&(0,_util.setCellValue)(d,r,n.value),x.clearValidate&&x.clearValidate()),s.renderHeight=o.offsetHeight,c.args=e,c.column=s,setTimeout(function(){m.handleFocus(e,t)})),x.focus()),(0,_vue.nextTick)()},handleFocus:function(e){var t,r,l=e.row,n=e.column,o=e.cell,a=n.editRender;(0,_utils.isEnableConf)(a)&&(t=_vXETable.renderer.get(a.name),r=a.autofocus,e=a.autoselect,a=void 0,(a=!(a=r?o.querySelector(r):a)&&t&&t.autofocus?o.querySelector(t.autofocus):a)?(a.focus(),e?a.select():_dom.browse.msie&&((a=a.createTextRange()).collapse(!1),a.select())):x.scrollToRow(l,n))},handleSelected:function(e,t){var r=_.mouseConfig,l=C.editStore,n=s.value,o=p.value,a=l.actived,i=l.selected,u=e.row,c=e.column,d=r&&n.selected;return!d||i.row===u&&i.column===c||(a.row!==u||"cell"===o.mode&&a.column!==c)&&(g.clearActived(t),g.clearSelected(),x.clearCellAreas&&(x.clearCellAreas(),x.clearCopyCellArea()),i.args=e,i.row=u,i.column=c,d&&m.addCellSelectedClass(),x.focus(),t&&x.dispatchEvent("cell-selected",e,t)),(0,_vue.nextTick)()},addCellSelectedClass:function(){var e=C.editStore.selected,t=e.row,e=e.column;r(),t&&e&&((e=x.getCell(t,e))&&(0,_dom.addClass)(e,"col--selected"))}},__assign(__assign({},g),m)},setupGrid:function(e){return e.extendTableMethods(tableEditMethodKeys)}},_default=editHook;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_util=require("../../table/src/util"),_dom=require("../../tools/dom"),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,r=1,l=arguments.length;r<l;r++)for(var n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)},__spreadArray=function(e,t){for(var r=0,l=t.length,n=e.length;r<l;r++,n++)e[n]=t[r];return e},tableEditMethodKeys=["insert","insertAt","remove","removeCheckboxRow","removeRadioRow","removeCurrentRow","getRecordset","getInsertRecords","getRemoveRecords","getUpdateRecords","getEditRecord","getActiveRecord","getSelectedCell","clearEdit","clearActived","clearSelected","isEditByRow","isActiveByRow","setEditRow","setActiveRow","setEditCell","setActiveCell","setSelectCell"],editHook={setupTable:function(x){function v(e,t){var r=t.model;t.editRender&&(r.value=(0,_util.getCellValue)(e,t),r.update=!1)}function n(e,t){var r=t.model;t.editRender&&r.update&&((0,_util.setCellValue)(e,t,r.value),r.update=!1,r.value=null)}function r(){var e=o.value;!e||(e=e.querySelector(".col--selected"))&&(0,_dom.removeClass)(e,"col--selected")}var _=x.props,C=x.reactData,E=x.internalData,o=x.getRefMaps().refElem,e=x.getComputeMaps(),s=e.computeMouseOpts,p=e.computeEditOpts,w=e.computeCheckboxOpts,b=e.computeTreeOpts,g={},m={};function a(){var e=C.editStore,t=C.tableColumn,r=p.value,e=e.actived,l=e.row,e=e.column;(l||e)&&("row"===r.mode?t.forEach(function(e){return n(l,e)}):n(l,e))}function I(e,t){var a=E.tableFullTreeData,i=E.afterFullData,u=E.fullDataRowIdData,c=E.fullAllDataRowIdData,r=b.value,d=r.rowField,s=r.parentField,f=r.children,v=r.mapChildren,p=t?"push":"unshift";e.forEach(function(e){var t,r,l=e[s],n=(0,_util.getRowid)(x,e),o=l?_xeUtils.default.findTree(a,function(e){return l===e[d]},{children:v}):null;e=o?(t=o.item,o=(r=c[(0,_util.getRowid)(x,t)])?r.level:0,r=t[f],(r=!_xeUtils.default.isArray(r)?t[f]=[]:r)[p](e),{row:e,rowid:n,seq:-1,index:-1,_index:-1,$index:-1,items:r,parent:parent,level:o+1}):("development"===process.env.NODE_ENV&&l&&(0,_log.warnLog)("vxe.error.unableInsert"),i[p](e),a[p](e),{row:e,rowid:n,seq:-1,index:-1,_index:-1,$index:-1,items:a,parent:null,level:0}),u[n]=e,c[n]=e})}return g={insert:function(e){return g.insertAt(e,null)},insertAt:function(e,t){var r=_.treeConfig,l=C.mergeList,n=C.editStore,o=E.tableFullTreeData,a=E.afterFullData,i=E.tableFullData,u=E.fullDataRowIdData,c=E.fullAllDataRowIdData,d=b.value,s=d.transform,f=d.rowField,v=d.mapChildren,p=(e=!_xeUtils.default.isArray(e)?[e]:e).map(function(e){return x.defineField(Object.assign({},e))});if(t)if(-1===t)r&&s?I(p,!0):(a.push.apply(a,p),i.push.apply(i,p),l.forEach(function(e){var t=e.row,r=e.rowspan;t+r>a.length&&(e.rowspan=r+p.length)}));else if(r&&s){var w,g,m,h=_xeUtils.default.findTree(o,function(e){return t[f]===e[f]},{children:v});h?(w=h.parent,g=h.items,v=c[(0,_util.getRowid)(x,w)],m=v?v.level:0,p.forEach(function(e,t){var r=(0,_util.getRowid)(x,e);"development"===process.env.NODE_ENV&&e[d.parentField]&&w&&e[d.parentField]!==w[f]&&(0,_log.errLog)("vxe.error.errProp",[d.parentField+"="+e[d.parentField],d.parentField+"="+w[f]]),w&&(e[d.parentField]=w[f]),g.splice(h.index+t,0,e);e={row:e,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,items:g,parent:w,level:m+1};u[r]=e,c[r]=e})):("development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.unableInsert"),I(p,!0))}else{if(r)throw new Error((0,_log.getLog)("vxe.error.noTree",["insert"]));var R=-1;if(_xeUtils.default.isNumber(t)?t<a.length&&(R=t):R=x.findRowIndexOf(a,t),-1===R)throw new Error((0,_log.errLog)("vxe.error.unableInsert"));a.splice.apply(a,__spreadArray([R,0],p)),i.splice.apply(i,__spreadArray([x.findRowIndexOf(i,t),0],p)),l.forEach(function(e){var t=e.row,r=e.rowspan;R<t?e.row=t+p.length:R<t+r&&(e.rowspan=r+p.length)})}else r&&s?I(p,!1):(a.unshift.apply(a,p),i.unshift.apply(i,p),l.forEach(function(e){var t=e.row;0<t&&(e.row=t+p.length)}));return(n=n.insertList).unshift.apply(n,p),x.updateFooter(),x.cacheRowMap(),x.handleTableData(r&&s),r&&s||x.updateAfterDataIndex(),x.checkSelectionStatus(),C.scrollYLoad&&x.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return x.updateCellAreas(),x.recalculate()}).then(function(){return{row:p.length?p[p.length-1]:null,rows:p}})},remove:function(e){var t=_.treeConfig,r=C.mergeList,l=C.editStore,n=C.selection,o=E.tableFullTreeData,a=E.afterFullData,i=E.tableFullData,u=w.value,c=b.value,d=c.transform,s=l.actived,f=l.removeList,v=l.insertList,u=u.checkField,p=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=i,e.forEach(function(e){x.isInsertByRow(e)||f.push(e)}),u||e.forEach(function(e){e=x.findRowIndexOf(n,e);-1<e&&n.splice(e,1)}),i===e?(e=p=i.slice(0),E.tableFullData=[],E.afterFullData=[],x.clearMergeCells()):t&&d?e.forEach(function(e){var t=(0,_util.getRowid)(x,e),r=_xeUtils.default.findTree(o,function(e){return t===(0,_util.getRowid)(x,e)},c);r&&(r=r.items.splice(r.index,1),p.push(r[0]));e=x.findRowIndexOf(a,e);-1<e&&a.splice(e,1)}):e.forEach(function(e){var t=x.findRowIndexOf(i,e);-1<t&&(t=i.splice(t,1),p.push(t[0]));var l=x.findRowIndexOf(a,e);-1<l&&(r.forEach(function(e){var t=e.row,r=e.rowspan;l<t?e.row=t-1:l<t+r&&(e.rowspan=r-1)}),a.splice(l,1))}),s.row&&-1<x.findRowIndexOf(e,s.row)&&g.clearActived(),e.forEach(function(e){e=x.findRowIndexOf(v,e);-1<e&&v.splice(e,1)}),x.updateFooter(),x.cacheRowMap(),x.handleTableData(t&&d),t&&d||x.updateAfterDataIndex(),x.checkSelectionStatus(),C.scrollYLoad&&x.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return x.updateCellAreas(),x.recalculate()}).then(function(){return{row:p.length?p[p.length-1]:null,rows:p}})},removeCheckboxRow:function(){return g.remove(x.getCheckboxRecords()).then(function(e){return x.clearCheckboxRow(),e})},removeRadioRow:function(){var e=x.getRadioRecord();return g.remove(e||[]).then(function(e){return x.clearRadioRow(),e})},removeCurrentRow:function(){var e=x.getCurrentRecord();return g.remove(e||[]).then(function(e){return x.clearCurrentRow(),e})},getRecordset:function(){return{insertRecords:g.getInsertRecords(),removeRecords:g.getRemoveRecords(),updateRecords:g.getUpdateRecords()}},getInsertRecords:function(){var e=_.treeConfig,t=C.editStore,r=E.tableFullTreeData,l=E.tableFullData,n=b.value,t=t.insertList,o=[];return t.length&&(e&&n.transform?t.forEach(function(e){var t=(0,_util.getRowid)(x,e);_xeUtils.default.findTree(r,function(e){return t===(0,_util.getRowid)(x,e)},n)&&o.push(e)}):t.forEach(function(e){-1<x.findRowIndexOf(l,e)&&o.push(e)})),o},getRemoveRecords:function(){return C.editStore.removeList},getUpdateRecords:function(){var e=_.keepSource,t=_.treeConfig,r=E.tableFullData,l=b.value;return e?(a(),t?_xeUtils.default.filterTree(r,function(e){return x.isUpdateByRow(e)},l):r.filter(function(e){return x.isUpdateByRow(e)})):[]},getActiveRecord:function(){return this.getEditRecord()},getEditRecord:function(){var e=C.editStore,t=E.afterFullData,r=o.value,l=e.actived,e=l.args,l=l.row;return e&&-1<x.findRowIndexOf(t,l)&&r.querySelectorAll(".vxe-body--column.col--actived").length?Object.assign({},e):null},getSelectedCell:function(){var e=C.editStore.selected,t=e.args,e=e.column;return t&&e?Object.assign({},t):null},clearActived:function(e){return this.clearEdit(e)},clearEdit:function(e){var t=C.editStore.actived,r=t.row,l=t.column;return(r||l)&&(a(),t.args=null,t.row=null,t.column=null,x.updateFooter(),x.dispatchEvent("edit-closed",{row:r,rowIndex:x.getRowIndex(r),$rowIndex:x.getVMRowIndex(r),column:l,columnIndex:x.getColumnIndex(l),$columnIndex:x.getVMColumnIndex(l)},e||null)),x.clearValidate?x.clearValidate():(0,_vue.nextTick)()},clearSelected:function(){var e=C.editStore.selected;return e.row=null,e.column=null,r(),(0,_vue.nextTick)()},isActiveByRow:function(e){return this.isEditByRow(e)},isEditByRow:function(e){return C.editStore.actived.row===e},setActiveRow:function(e){return g.setEditRow(e)},setEditRow:function(e){var t=E.visibleColumn;return x.setEditCell(e,_xeUtils.default.find(t,function(e){return(0,_utils.isEnableConf)(e.editRender)}))},setActiveCell:function(e,t){return g.setEditCell(e,t)},setEditCell:function(t,e){var r=_.editConfig,l=_xeUtils.default.isString(e)?x.getColumnByField(e):e;return t&&l&&(0,_utils.isEnableConf)(r)&&(0,_utils.isEnableConf)(l.editRender)?x.scrollToRow(t,l).then(function(){var e=x.getCell(t,l);return e&&(m.handleActived({row:t,rowIndex:x.getRowIndex(t),column:l,columnIndex:x.getColumnIndex(l),cell:e,$table:x}),E._lastCallTime=Date.now()),(0,_vue.nextTick)()}):(0,_vue.nextTick)()},setSelectCell:function(e,t){var r=C.tableData,l=E.visibleColumn,n=p.value,t=_xeUtils.default.isString(t)?x.getColumnByField(t):t;return e&&t&&"manual"!==n.trigger&&(-1<(n=x.findRowIndexOf(r,e))&&t&&(r=x.getCell(e,t),r={row:e,rowIndex:n,column:t,columnIndex:l.indexOf(t),cell:r},x.handleSelected(r,{}))),(0,_vue.nextTick)()}},m={handleActived:function(e,t){var r,l=_.editConfig,n=_.mouseConfig,o=C.editStore,a=C.tableColumn,i=p.value,u=i.mode,c=o.actived,d=e.row,s=e.column,f=s.editRender,o=e.cell||x.getCell(d,s),i=i.beforeEditMethod||i.activeMethod;return e.cell=o,(0,_utils.isEnableConf)(l)&&(0,_utils.isEnableConf)(f)&&o&&(c.row!==d||"cell"===u&&c.column!==s?(r="edit-disabled",i&&!i(__assign(__assign({},e),{$table:x}))||(n&&(g.clearSelected(),x.clearCellAreas&&(x.clearCellAreas(),x.clearCopyCellArea())),x.closeTooltip(),c.column&&g.clearActived(t),r="edit-actived",s.renderHeight=o.offsetHeight,c.args=e,c.row=d,c.column=s,"row"===u?a.forEach(function(e){return v(d,e)}):v(d,s),(0,_vue.nextTick)(function(){m.handleFocus(e,t)})),x.dispatchEvent(r,{row:d,rowIndex:x.getRowIndex(d),$rowIndex:x.getVMRowIndex(d),column:s,columnIndex:x.getColumnIndex(s),$columnIndex:x.getVMColumnIndex(s)},t)):(r=c.column,n&&(g.clearSelected(),x.clearCellAreas&&(x.clearCellAreas(),x.clearCopyCellArea())),r!==s&&((n=r.model).update&&(0,_util.setCellValue)(d,r,n.value),x.clearValidate&&x.clearValidate()),s.renderHeight=o.offsetHeight,c.args=e,c.column=s,setTimeout(function(){m.handleFocus(e,t)})),x.focus()),(0,_vue.nextTick)()},handleFocus:function(e){var t,r,l,n=e.row,o=e.column,a=e.cell,i=o.editRender;(0,_utils.isEnableConf)(i)&&(t=_vXETable.renderer.get(i.name),r=i.autofocus,l=i.autoselect,i=void 0,!r&&t&&(r=t.autofocus),_xeUtils.default.isFunction(r)?i=r.call(this,e):r&&(i=a.querySelector(r))&&i.focus(),i?l?i.select():_dom.browse.msie&&((i=i.createTextRange()).collapse(!1),i.select()):x.scrollToRow(n,o))},handleSelected:function(e,t){var r=_.mouseConfig,l=C.editStore,n=s.value,o=p.value,a=l.actived,i=l.selected,u=e.row,c=e.column,d=r&&n.selected;return!d||i.row===u&&i.column===c||(a.row!==u||"cell"===o.mode&&a.column!==c)&&(g.clearActived(t),g.clearSelected(),x.clearCellAreas&&(x.clearCellAreas(),x.clearCopyCellArea()),i.args=e,i.row=u,i.column=c,d&&m.addCellSelectedClass(),x.focus(),t&&x.dispatchEvent("cell-selected",e,t)),(0,_vue.nextTick)()},addCellSelectedClass:function(){var e=C.editStore.selected,t=e.row,e=e.column;r(),t&&e&&((e=x.getCell(t,e))&&(0,_dom.addClass)(e,"col--selected"))}},__assign(__assign({},g),m)},setupGrid:function(e){return e.extendTableMethods(tableEditMethodKeys)}},_default=editHook;exports.default=_default;

package/lib/filter/src/panel.js

@@ -221,7 +221,7 @@ var _default = (0, _vue.defineComponent)({
         $table: $xetable
       });
       return (0, _vue.h)('div', {
-        class: ['vxe-table--filter-wrapper', 'filter--prevent-default', compConf && compConf.className ? compConf.className : '', (0, _dom.getPropClass)(filterClassName, params), {
+        class: ['vxe-table--filter-wrapper', 'filter--prevent-default', (0, _dom.getPropClass)(filterClassName, params), {
           'is--animat': $xetable.props.animat,
           'is--multiple': filterStore.multiple,
           'is--active': filterStore.visible

package/lib/filter/src/panel.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default=(0,_vue.defineComponent)({name:"VxeTableFilter",props:{filterStore:Object},setup:function(a){function i(e,t,l){a.filterStore.options.forEach(function(e){e._checked=!1}),l._checked=t,s.checkFilterOptions(),d(e)}function c(e,t,l){l._checked=t,s.checkFilterOptions()}var s=(0,_vue.inject)("$xetable",{}),u=s.reactData,v=s.internalData,f=(0,_vue.computed)(function(){var e=a.filterStore;return e&&e.options.some(function(e){return e.checked})}),d=function(e){a.filterStore.options.forEach(function(e){e.checked=e._checked}),s.confirmFilterEvent(e)},h=function(e){var t=a.filterStore;s.handleClearFilter(t.column),s.confirmFilterEvent(e)},b=function(e,t,l){a.filterStore.multiple?c(0,t,l):i(e,t,l)},p=function(e,t){var l;a.filterStore.multiple?(l=t,(t=a.filterStore).options.forEach(function(e){e._checked=l,e.checked=l}),t.isAllSelected=l,t.isIndeterminate=!1):h(e)},x={changeRadioOption:i,changeMultipleOption:c,changeAllOption:p,changeOption:b,confirmFilter:d,resetFilter:h};return function(){var t,e,l=a.filterStore,i=u.initStore,c=l.column,n=c?c.filterRender:null,r=n?_vXETable.VXETable.renderer.get(n.name):null,o=r?r.filterClassName:"",c=Object.assign({},v._currFilterParams,{$panel:x,$table:s});return(0,_vue.h)("div",{class:["vxe-table--filter-wrapper","filter--prevent-default",r&&r.className?r.className:"",(0,_dom.getPropClass)(o,c),{"is--animat":s.props.animat,"is--multiple":l.multiple,"is--active":l.visible}],style:l.style},i.filter&&l.visible?(c=n,i=r,t=a.filterStore,l=t.column,e=t.multiple,n=t.maxHeight,r=l.slots,l=r?r.filter:null,r=Object.assign({},v._currFilterParams,{$panel:x,$table:s}),(l?[(0,_vue.h)("div",{class:"vxe-table--filter-template"},s.callSlot(l,r))]:i&&i.renderFilter?[(0,_vue.h)("div",{class:"vxe-table--filter-template"},i.renderFilter(c,r))]:[(0,_vue.h)("ul",{class:"vxe-table--filter-header"},[(0,_vue.h)("li",{class:["vxe-table--filter-option",{"is--checked":e?t.isAllSelected:!t.options.some(function(e){return e._checked}),"is--indeterminate":e&&t.isIndeterminate}],title:_conf.default.i18n(e?"vxe.table.allTitle":"vxe.table.allFilter"),onClick:function(e){p(e,!t.isAllSelected)}},(e?[(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--checked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--unchecked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--indeterminate-icon"})]:[]).concat([(0,_vue.h)("span",{class:"vxe-checkbox--label"},_conf.default.i18n("vxe.table.allFilter"))]))]),(0,_vue.h)("ul",{class:"vxe-table--filter-body",style:n?{maxHeight:n+"px"}:{}},t.options.map(function(t){return(0,_vue.h)("li",{class:["vxe-table--filter-option",{"is--checked":t._checked}],title:t.label,onClick:function(e){b(e,!t._checked,t)}},(e?[(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--checked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--unchecked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--indeterminate-icon"})]:[]).concat([(0,_vue.h)("span",{class:"vxe-checkbox--label"},(0,_utils.formatText)(t.label,1))]))}))]).concat((i=a.filterStore,c=i.column,r=i.multiple,n=f.value,c=(c=c.filterRender)?_vXETable.VXETable.renderer.get(c.name):null,i=!n&&!i.isAllSelected&&!i.isIndeterminate,!r||c&&!1===c.showFilterFooter?[]:[(0,_vue.h)("div",{class:"vxe-table--filter-footer"},[(0,_vue.h)("button",{class:{"is--disabled":i},disabled:i,onClick:d},_conf.default.i18n("vxe.table.confirmFilter")),(0,_vue.h)("button",{onClick:h},_conf.default.i18n("vxe.table.resetFilter"))])]))):[])}}});exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default=(0,_vue.defineComponent)({name:"VxeTableFilter",props:{filterStore:Object},setup:function(a){function i(e,t,l){a.filterStore.options.forEach(function(e){e._checked=!1}),l._checked=t,s.checkFilterOptions(),d(e)}function c(e,t,l){l._checked=t,s.checkFilterOptions()}var s=(0,_vue.inject)("$xetable",{}),u=s.reactData,v=s.internalData,f=(0,_vue.computed)(function(){var e=a.filterStore;return e&&e.options.some(function(e){return e.checked})}),d=function(e){a.filterStore.options.forEach(function(e){e.checked=e._checked}),s.confirmFilterEvent(e)},h=function(e){var t=a.filterStore;s.handleClearFilter(t.column),s.confirmFilterEvent(e)},b=function(e,t,l){a.filterStore.multiple?c(0,t,l):i(e,t,l)},p=function(e,t){var l;a.filterStore.multiple?(l=t,(t=a.filterStore).options.forEach(function(e){e._checked=l,e.checked=l}),t.isAllSelected=l,t.isIndeterminate=!1):h(e)},x={changeRadioOption:i,changeMultipleOption:c,changeAllOption:p,changeOption:b,confirmFilter:d,resetFilter:h};return function(){var t,e,l=a.filterStore,i=u.initStore,c=l.column,n=c?c.filterRender:null,r=n?_vXETable.VXETable.renderer.get(n.name):null,o=r?r.filterClassName:"",c=Object.assign({},v._currFilterParams,{$panel:x,$table:s});return(0,_vue.h)("div",{class:["vxe-table--filter-wrapper","filter--prevent-default",(0,_dom.getPropClass)(o,c),{"is--animat":s.props.animat,"is--multiple":l.multiple,"is--active":l.visible}],style:l.style},i.filter&&l.visible?(c=n,i=r,t=a.filterStore,l=t.column,e=t.multiple,n=t.maxHeight,r=l.slots,l=r?r.filter:null,r=Object.assign({},v._currFilterParams,{$panel:x,$table:s}),(l?[(0,_vue.h)("div",{class:"vxe-table--filter-template"},s.callSlot(l,r))]:i&&i.renderFilter?[(0,_vue.h)("div",{class:"vxe-table--filter-template"},i.renderFilter(c,r))]:[(0,_vue.h)("ul",{class:"vxe-table--filter-header"},[(0,_vue.h)("li",{class:["vxe-table--filter-option",{"is--checked":e?t.isAllSelected:!t.options.some(function(e){return e._checked}),"is--indeterminate":e&&t.isIndeterminate}],title:_conf.default.i18n(e?"vxe.table.allTitle":"vxe.table.allFilter"),onClick:function(e){p(e,!t.isAllSelected)}},(e?[(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--checked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--unchecked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--indeterminate-icon"})]:[]).concat([(0,_vue.h)("span",{class:"vxe-checkbox--label"},_conf.default.i18n("vxe.table.allFilter"))]))]),(0,_vue.h)("ul",{class:"vxe-table--filter-body",style:n?{maxHeight:n+"px"}:{}},t.options.map(function(t){return(0,_vue.h)("li",{class:["vxe-table--filter-option",{"is--checked":t._checked}],title:t.label,onClick:function(e){b(e,!t._checked,t)}},(e?[(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--checked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--unchecked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--indeterminate-icon"})]:[]).concat([(0,_vue.h)("span",{class:"vxe-checkbox--label"},(0,_utils.formatText)(t.label,1))]))}))]).concat((i=a.filterStore,c=i.column,r=i.multiple,n=f.value,c=(c=c.filterRender)?_vXETable.VXETable.renderer.get(c.name):null,i=!n&&!i.isAllSelected&&!i.isIndeterminate,!r||c&&!1===c.showFilterFooter?[]:[(0,_vue.h)("div",{class:"vxe-table--filter-footer"},[(0,_vue.h)("button",{class:{"is--disabled":i},disabled:i,onClick:d},_conf.default.i18n("vxe.table.confirmFilter")),(0,_vue.h)("button",{onClick:h},_conf.default.i18n("vxe.table.resetFilter"))])]))):[])}}});exports.default=_default;

package/lib/form/src/form-config-item.js

@@ -17,6 +17,8 @@ var _utils = require("../../tools/utils");
 
 var _render = require("./render");
 
+var _util = require("./util");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var __assign = void 0 && (void 0).__assign || function () {
@@ -69,7 +71,6 @@ var VxeFormConfigItem = (0, _vue.defineComponent)({
           title = item.title,
           visible = item.visible,
           folding = item.folding,
-          visibleMethod = item.visibleMethod,
           field = item.field,
           collapseNode = item.collapseNode,
           itemRender = item.itemRender,
@@ -93,7 +94,6 @@ var VxeFormConfigItem = (0, _vue.defineComponent)({
       var showTitle = itemOverflow === 'title';
       var showTooltip = itemOverflow === true || itemOverflow === 'tooltip';
       var hasEllipsis = showTitle || showTooltip || showEllipsis;
-      var itemVisibleMethod = visibleMethod;
       var params = {
         data: data,
         field: field,
@@ -133,10 +133,6 @@ var VxeFormConfigItem = (0, _vue.defineComponent)({
         }, childVNs) : (0, _vue.createCommentVNode)();
       }
 
-      if (!itemVisibleMethod && compConf && compConf.itemVisibleMethod) {
-        itemVisibleMethod = compConf.itemVisibleMethod;
-      }
-
       var contentVNs = [];
 
       if (defaultSlot) {
@@ -180,7 +176,7 @@ var VxeFormConfigItem = (0, _vue.defineComponent)({
           'is--asterisk': titleAsterisk,
           'is--required': isRequired,
           'is--hidden': folding && collapseAll,
-          'is--active': !itemVisibleMethod || itemVisibleMethod(params),
+          'is--active': (0, _util.isActivetem)($xeform, item),
           'is--error': showError
         }],
         itemConfig: item,

package/lib/form/src/form-config-item.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_render=require("./render");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,i=1,l=arguments.length;i<l;i++)for(var n in t=arguments[i])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)},VxeFormConfigItem=(0,_vue.defineComponent)({name:"VxeFormConfigItem",props:{itemConfig2:Object,itemConfig:Object},setup:function(w){var E=(0,_vue.inject)("$xeform",{}),e={itemConfig:w.itemConfig};(0,_vue.provide)("$xeformiteminfo",e),(0,_vue.provide)("$xeformgather",null);return{renderVN:function(){var e=E.reactData,t=E.props,i=t.data,l=t.rules,n=t.span,r=t.align,o=t.titleAlign,s=t.titleWidth,u=t.titleColon,a=t.titleAsterisk,f=t.titleOverflow,d=E.getComputeMaps().computeValidOpts,v=w.itemConfig,m=e.collapseAll,_=d.value,c=v.slots,g=v.title,x=v.visible,p=v.folding,h=v.visibleMethod,C=v.field,N=v.collapseNode,b=v.itemRender,q=v.showError,U=v.errRule,O=v.className,V=v.titleOverflow,F=v.children,M=(0,_utils.isEnableConf)(b)?_vXETable.VXETable.renderer.get(b.name):null,t=M?M.itemClassName:"",e=c?c.default:null,d=c?c.title:null,c=v.span||n,n=v.align||r,r=_xeUtils.default.eqNull(v.titleAlign)?o:v.titleAlign,o=_xeUtils.default.eqNull(v.titleWidth)?s:v.titleWidth,s=_xeUtils.default.eqNull(v.titleColon)?u:v.titleColon,u=_xeUtils.default.eqNull(v.titleAsterisk)?a:v.titleAsterisk,a=_xeUtils.default.isUndefined(V)||_xeUtils.default.isNull(V)?f:V,f="title"===a,V=!0===a||"tooltip"===a,a=f||V||"ellipsis"===a,h=h,y={data:i,field:C,property:C,item:v,$form:E};if(!1===x)return(0,_vue.createCommentVNode)();x=!1;if(!l||(l=l[C])&&(x=l.some(function(e){return e.required})),F&&0<F.length){var T=F.map(function(e,t){return(0,_vue.h)(VxeFormConfigItem,{key:t,itemConfig:e})});return T.length?(0,_vue.h)("div",{class:["vxe-form--gather vxe-row",v.id,c?"vxe-col--"+c+" is--span":"",O?_xeUtils.default.isFunction(O)?O(y):O:""]},T):(0,_vue.createCommentVNode)()}!h&&M&&M.itemVisibleMethod&&(h=M.itemVisibleMethod);T=[];e?T=E.callSlot(e,y):M&&M.renderItemContent?T=M.renderItemContent(b,y):C&&(T=[_xeUtils.default.toValueString(_xeUtils.default.get(i,C))]),N&&T.push((0,_vue.h)("div",{class:"vxe-form--item-trigger-node",onClick:E.toggleCollapseEvent},[(0,_vue.h)("span",{class:"vxe-form--item-trigger-text"},m?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),(0,_vue.h)("i",{class:["vxe-form--item-trigger-icon",m?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})])),U&&_.showMessage&&T.push((0,_vue.h)("div",{class:"vxe-form--item-valid",style:U.maxWidth?{width:U.maxWidth+"px"}:null},U.content));V=V?{onMouseenter:function(e){E.triggerTitleTipEvent(e,y)},onMouseleave:E.handleTitleTipLeaveEvent}:{};return(0,_vue.h)("div",{class:["vxe-form--item",v.id,c?"vxe-col--"+c+" is--span":"",O?_xeUtils.default.isFunction(O)?O(y):O:"",t?_xeUtils.default.isFunction(t)?t(y):t:"",{"is--title":g,"is--colon":s,"is--asterisk":u,"is--required":x,"is--hidden":p&&m,"is--active":!h||h(y),"is--error":q}],itemConfig:v,key:v.id},[(0,_vue.h)("div",{class:"vxe-form--item-inner"},[g||d?(0,_vue.h)("div",__assign({class:["vxe-form--item-title",r?"align--"+r:null,{"is--ellipsis":a}],style:o?{width:isNaN(o)?o:o+"px"}:null,title:f?(0,_utils.getFuncText)(g):null},V),(0,_render.renderTitle)(E,v)):null,(0,_vue.h)("div",{class:["vxe-form--item-content",n?"align--"+n:null]},T)])])}}},render:function(){return this.renderVN()}}),_default=VxeFormConfigItem;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_render=require("./render"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,i=1,l=arguments.length;i<l;i++)for(var n in t=arguments[i])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)},VxeFormConfigItem=(0,_vue.defineComponent)({name:"VxeFormConfigItem",props:{itemConfig2:Object,itemConfig:Object},setup:function(w){var A=(0,_vue.inject)("$xeform",{}),e={itemConfig:w.itemConfig};(0,_vue.provide)("$xeformiteminfo",e),(0,_vue.provide)("$xeformgather",null);return{renderVN:function(){var e=A.reactData,t=A.props,i=t.data,l=t.rules,n=t.span,r=t.align,o=t.titleAlign,s=t.titleWidth,u=t.titleColon,a=t.titleAsterisk,f=t.titleOverflow,d=A.getComputeMaps().computeValidOpts,v=w.itemConfig,m=e.collapseAll,_=d.value,c=v.slots,g=v.title,x=v.visible,p=v.folding,h=v.field,C=v.collapseNode,N=v.itemRender,q=v.showError,U=v.errRule,O=v.className,b=v.titleOverflow,F=v.children,V=(0,_utils.isEnableConf)(N)?_vXETable.VXETable.renderer.get(N.name):null,t=V?V.itemClassName:"",e=c?c.default:null,d=c?c.title:null,c=v.span||n,n=v.align||r,r=_xeUtils.default.eqNull(v.titleAlign)?o:v.titleAlign,o=_xeUtils.default.eqNull(v.titleWidth)?s:v.titleWidth,s=_xeUtils.default.eqNull(v.titleColon)?u:v.titleColon,u=_xeUtils.default.eqNull(v.titleAsterisk)?a:v.titleAsterisk,a=_xeUtils.default.isUndefined(b)||_xeUtils.default.isNull(b)?f:b,f="title"===a,b=!0===a||"tooltip"===a,a=f||b||"ellipsis"===a,y={data:i,field:h,property:h,item:v,$form:A};if(!1===x)return(0,_vue.createCommentVNode)();x=!1;if(!l||(l=l[h])&&(x=l.some(function(e){return e.required})),F&&0<F.length){var T=F.map(function(e,t){return(0,_vue.h)(VxeFormConfigItem,{key:t,itemConfig:e})});return T.length?(0,_vue.h)("div",{class:["vxe-form--gather vxe-row",v.id,c?"vxe-col--"+c+" is--span":"",O?_xeUtils.default.isFunction(O)?O(y):O:""]},T):(0,_vue.createCommentVNode)()}T=[];e?T=A.callSlot(e,y):V&&V.renderItemContent?T=V.renderItemContent(N,y):h&&(T=[_xeUtils.default.toValueString(_xeUtils.default.get(i,h))]),C&&T.push((0,_vue.h)("div",{class:"vxe-form--item-trigger-node",onClick:A.toggleCollapseEvent},[(0,_vue.h)("span",{class:"vxe-form--item-trigger-text"},m?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),(0,_vue.h)("i",{class:["vxe-form--item-trigger-icon",m?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})])),U&&_.showMessage&&T.push((0,_vue.h)("div",{class:"vxe-form--item-valid",style:U.maxWidth?{width:U.maxWidth+"px"}:null},U.content));b=b?{onMouseenter:function(e){A.triggerTitleTipEvent(e,y)},onMouseleave:A.handleTitleTipLeaveEvent}:{};return(0,_vue.h)("div",{class:["vxe-form--item",v.id,c?"vxe-col--"+c+" is--span":"",O?_xeUtils.default.isFunction(O)?O(y):O:"",t?_xeUtils.default.isFunction(t)?t(y):t:"",{"is--title":g,"is--colon":s,"is--asterisk":u,"is--required":x,"is--hidden":p&&m,"is--active":(0,_util.isActivetem)(A,v),"is--error":q}],itemConfig:v,key:v.id},[(0,_vue.h)("div",{class:"vxe-form--item-inner"},[g||d?(0,_vue.h)("div",__assign({class:["vxe-form--item-title",r?"align--"+r:null,{"is--ellipsis":a}],style:o?{width:isNaN(o)?o:o+"px"}:null,title:f?(0,_utils.getFuncText)(g):null},b),(0,_render.renderTitle)(A,v)):null,(0,_vue.h)("div",{class:["vxe-form--item-content",n?"align--"+n:null]},T)])])}}},render:function(){return this.renderVN()}}),_default=VxeFormConfigItem;exports.default=_default;

package/lib/form/src/form-item.js

@@ -81,7 +81,7 @@ var _default = (0, _vue.defineComponent)({
     var refElem = (0, _vue.ref)();
     var $xeform = (0, _vue.inject)('$xeform', {});
     var formGather = (0, _vue.inject)('$xeformgather', null);
-    var formItem = (0, _util.createItem)($xeform, props);
+    var formItem = (0, _vue.reactive)((0, _util.createItem)($xeform, props));
     var xeformitem = {
       formItem: formItem
     };
@@ -113,7 +113,6 @@ var _default = (0, _vue.defineComponent)({
           title = item.title,
           visible = item.visible,
           folding = item.folding,
-          visibleMethod = item.visibleMethod,
           field = item.field,
           collapseNode = item.collapseNode,
           itemRender = item.itemRender,
@@ -134,7 +133,6 @@ var _default = (0, _vue.defineComponent)({
       var showTitle = itemOverflow === 'title';
       var showTooltip = itemOverflow === true || itemOverflow === 'tooltip';
       var hasEllipsis = showTitle || showTooltip || showEllipsis;
-      var itemVisibleMethod = visibleMethod;
       var params = {
         data: data,
         field: field,
@@ -144,6 +142,10 @@ var _default = (0, _vue.defineComponent)({
       };
       var isRequired = false;
 
+      if (visible === false) {
+        return (0, _vue.createCommentVNode)();
+      }
+
       if (rules) {
         var itemRules = rules[field];
 
@@ -154,10 +156,6 @@ var _default = (0, _vue.defineComponent)({
         }
       }
 
-      if (!itemVisibleMethod && compConf && compConf.itemVisibleMethod) {
-        itemVisibleMethod = compConf.itemVisibleMethod;
-      }
-
       var contentVNs = [];
 
       if (defaultSlot) {
@@ -199,8 +197,8 @@ var _default = (0, _vue.defineComponent)({
         class: ['vxe-form--item', item.id, span ? "vxe-col--" + span + " is--span" : '', className ? _xeUtils.default.isFunction(className) ? className(params) : className : '', itemClassName ? _xeUtils.default.isFunction(itemClassName) ? itemClassName(params) : itemClassName : '', {
           'is--title': title,
           'is--required': isRequired,
-          'is--hidden': visible === false || folding && collapseAll,
-          'is--active': !itemVisibleMethod || itemVisibleMethod(params),
+          'is--hidden': folding && collapseAll,
+          'is--active': (0, _util.isActivetem)($xeform, item),
           'is--error': showError
         }]
       }, [(0, _vue.h)('div', {