vxe-table 4.2.7-beta.5 → 4.2.8

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/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.4" + "] " + 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.4",
+    version: "4.2.8",
     setup: setup,
     interceptor: interceptor,
     renderer: renderer,

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', {

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.formItemProps=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"),_util=require("./util"),_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 r in t=arguments[i])Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r]);return e}).apply(this,arguments)},formItemProps={title:String,field:String,span:[String,Number],align:String,titleAlign:String,titleWidth:[String,Number],titleColon:{type:Boolean,default:null},titleAsterisk:{type:Boolean,default:null},className:[String,Function],titleOverflow:{type:[Boolean,String],default:null},titlePrefix:Object,titleSuffix:Object,resetValue:{default:null},visibleMethod:Function,visible:{type:Boolean,default:null},folding:Boolean,collapseNode:Boolean,itemRender:Object};exports.formItemProps=formItemProps;var _default=(0,_vue.defineComponent)({name:"VxeFormItem",props:formItemProps,setup:function(e,t){var i=t.slots,w=(0,_vue.ref)(),l=(0,_vue.inject)("$xeform",{}),r=(0,_vue.inject)("$xeformgather",null),n=(0,_util.createItem)(l,e),o={formItem:n},t={itemConfig:n};n.slots=i,(0,_vue.provide)("$xeformiteminfo",t),(0,_vue.provide)("$xeformitem",o),(0,_vue.provide)("$xeformgather",null),(0,_util.watchItem)(e,n),(0,_vue.onMounted)(function(){(0,_util.assemItem)(l,w.value,n,r)}),(0,_vue.onUnmounted)(function(){(0,_util.destroyItem)(l,n)});return{renderVN:function(){var e=l?l.props:null;return e&&e.customLayout?function(t,e){var i=t.props,l=t.reactData,r=i.data,n=i.rules,o=i.titleOverflow,u=l.collapseAll,s=t.getComputeMaps().computeValidOpts.value,a=e.slots,f=e.title,d=e.visible,v=e.folding,m=e.visibleMethod,c=e.field,_=e.collapseNode,p=e.itemRender,g=e.showError,x=e.errRule,h=e.className,b=e.titleOverflow,I=(0,_utils.isEnableConf)(p)?_vXETable.VXETable.renderer.get(p.name):null,N=I?I.itemClassName:"",O=a?a.default:null,y=a?a.title:null,M=e.span||i.span,q=e.align||i.align,C=e.titleAlign||i.titleAlign,l=e.titleWidth||i.titleWidth,a=_xeUtils.default.isUndefined(b)||_xeUtils.default.isNull(b)?o:b,i="title"===a,o=!0===a||"tooltip"===a,b=i||o||"ellipsis"===a,a=m,F={data:r,field:c,property:c,item:e,$form:t},m=!1;!n||(S=n[c])&&(m=S.some(function(e){return e.required})),!a&&I&&I.itemVisibleMethod&&(a=I.itemVisibleMethod);var S=[];O?S=t.callSlot(O,F):I&&I.renderItemContent?S=I.renderItemContent(p,F):c&&(S=[""+_xeUtils.default.get(r,c)]),_&&S.push((0,_vue.h)("div",{class:"vxe-form--item-trigger-node",onClick:t.toggleCollapseEvent},[(0,_vue.h)("span",{class:"vxe-form--item-trigger-text"},u?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),(0,_vue.h)("i",{class:["vxe-form--item-trigger-icon",u?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})])),x&&s.showMessage&&S.push((0,_vue.h)("div",{class:"vxe-form--item-valid",style:x.maxWidth?{width:x.maxWidth+"px"}:null},x.message));o=o?{onMouseenter:function(e){t.triggerTitleTipEvent(e,F)},onMouseleave:t.handleTitleTipLeaveEvent}:{};return(0,_vue.h)("div",{ref:w,class:["vxe-form--item",e.id,M?"vxe-col--"+M+" is--span":"",h?_xeUtils.default.isFunction(h)?h(F):h:"",N?_xeUtils.default.isFunction(N)?N(F):N:"",{"is--title":f,"is--required":m,"is--hidden":!1===d||v&&u,"is--active":!a||a(F),"is--error":g}]},[(0,_vue.h)("div",{class:"vxe-form--item-inner"},[f||y?(0,_vue.h)("div",__assign({class:["vxe-form--item-title",C?"align--"+C:null,{"is--ellipsis":b}],style:l?{width:isNaN(l)?l:l+"px"}:null,title:i?(0,_utils.getFuncText)(f):null},o),(0,_render.renderTitle)(t,e)):null,(0,_vue.h)("div",{class:["vxe-form--item-content",q?"align--"+q:null]},S)])])}(l,n):(0,_vue.h)("div",{ref:w})}}},render:function(){return this.renderVN()}});exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.formItemProps=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"),_util=require("./util"),_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 r in t=arguments[i])Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r]);return e}).apply(this,arguments)},formItemProps={title:String,field:String,span:[String,Number],align:String,titleAlign:String,titleWidth:[String,Number],titleColon:{type:Boolean,default:null},titleAsterisk:{type:Boolean,default:null},className:[String,Function],titleOverflow:{type:[Boolean,String],default:null},titlePrefix:Object,titleSuffix:Object,resetValue:{default:null},visibleMethod:Function,visible:{type:Boolean,default:null},folding:Boolean,collapseNode:Boolean,itemRender:Object};exports.formItemProps=formItemProps;var _default=(0,_vue.defineComponent)({name:"VxeFormItem",props:formItemProps,setup:function(e,t){var i=t.slots,S=(0,_vue.ref)(),l=(0,_vue.inject)("$xeform",{}),r=(0,_vue.inject)("$xeformgather",null),n=(0,_vue.reactive)((0,_util.createItem)(l,e)),o={formItem:n},t={itemConfig:n};n.slots=i,(0,_vue.provide)("$xeformiteminfo",t),(0,_vue.provide)("$xeformitem",o),(0,_vue.provide)("$xeformgather",null),(0,_util.watchItem)(e,n),(0,_vue.onMounted)(function(){(0,_util.assemItem)(l,S.value,n,r)}),(0,_vue.onUnmounted)(function(){(0,_util.destroyItem)(l,n)});return{renderVN:function(){var e=l?l.props:null;return e&&e.customLayout?function(t,e){var i=t.props,l=t.reactData,r=i.data,n=i.rules,o=i.titleOverflow,u=l.collapseAll,s=t.getComputeMaps().computeValidOpts.value,a=e.slots,f=e.title,d=e.visible,v=e.folding,m=e.field,c=e.collapseNode,_=e.itemRender,p=e.showError,g=e.errRule,x=e.className,h=e.titleOverflow,b=(0,_utils.isEnableConf)(_)?_vXETable.VXETable.renderer.get(_.name):null,N=b?b.itemClassName:"",I=a?a.default:null,O=a?a.title:null,y=e.span||i.span,q=e.align||i.align,C=e.titleAlign||i.titleAlign,l=e.titleWidth||i.titleWidth,a=_xeUtils.default.isUndefined(h)||_xeUtils.default.isNull(h)?o:h,i="title"===a,o=!0===a||"tooltip"===a,h=i||o||"ellipsis"===a,F={data:r,field:m,property:m,item:e,$form:t},a=!1;if(!1===d)return(0,_vue.createCommentVNode)();!n||(M=n[m])&&(a=M.some(function(e){return e.required}));var M=[];I?M=t.callSlot(I,F):b&&b.renderItemContent?M=b.renderItemContent(_,F):m&&(M=[""+_xeUtils.default.get(r,m)]),c&&M.push((0,_vue.h)("div",{class:"vxe-form--item-trigger-node",onClick:t.toggleCollapseEvent},[(0,_vue.h)("span",{class:"vxe-form--item-trigger-text"},u?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),(0,_vue.h)("i",{class:["vxe-form--item-trigger-icon",u?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})])),g&&s.showMessage&&M.push((0,_vue.h)("div",{class:"vxe-form--item-valid",style:g.maxWidth?{width:g.maxWidth+"px"}:null},g.message));o=o?{onMouseenter:function(e){t.triggerTitleTipEvent(e,F)},onMouseleave:t.handleTitleTipLeaveEvent}:{};return(0,_vue.h)("div",{ref:S,class:["vxe-form--item",e.id,y?"vxe-col--"+y+" is--span":"",x?_xeUtils.default.isFunction(x)?x(F):x:"",N?_xeUtils.default.isFunction(N)?N(F):N:"",{"is--title":f,"is--required":a,"is--hidden":v&&u,"is--active":(0,_util.isActivetem)(t,e),"is--error":p}]},[(0,_vue.h)("div",{class:"vxe-form--item-inner"},[f||O?(0,_vue.h)("div",__assign({class:["vxe-form--item-title",C?"align--"+C:null,{"is--ellipsis":h}],style:l?{width:isNaN(l)?l:l+"px"}:null,title:i?(0,_utils.getFuncText)(f):null},o),(0,_render.renderTitle)(t,e)):null,(0,_vue.h)("div",{class:["vxe-form--item-content",q?"align--"+q:null]},M)])])}(l,n):(0,_vue.h)("div",{ref:S})}}},render:function(){return this.renderVN()}});exports.default=_default;

package/lib/form/src/form.js

@@ -520,7 +520,7 @@ var _default2 = (0, _vue.defineComponent)({
         itemList.forEach(function (item) {
           var field = item.field;
 
-          if (field) {
+          if (field && !(0, _util.isHiddenItem)($xeform, item) && (0, _util.isActivetem)($xeform, item)) {
             itemValids.push(validItemRules(type || 'all', field).then(function () {
               item.errRule = null;
             }).catch(function (_a) {
@@ -679,7 +679,7 @@ var _default2 = (0, _vue.defineComponent)({
 
     var triggerItemEvent = function triggerItemEvent(evnt, field, itemValue) {
       if (field) {
-        return validItemRules(evnt ? evnt.type : 'all', field, itemValue).then(function () {
+        return validItemRules(evnt ? ['blur'].includes(evnt.type) ? 'blur' : 'change' : 'all', field, itemValue).then(function () {
           clearValidate(field);
         }).catch(function (_a) {
           var rule = _a.rule;

package/lib/form/src/form.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"),_log=require("../../tools/log"),_dom=require("../../tools/dom"),_util=require("./util"),_size=require("../../hooks/size"),_formConfigItem=_interopRequireDefault(require("./form-config-item")),_index=_interopRequireDefault(require("../../loading/index"));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 i in t=arguments[n])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)},Rule=function(){function e(e){Object.assign(this,{$options:e,required:e.required,min:e.min,max:e.min,type:e.type,pattern:e.pattern,validator:e.validator,trigger:e.trigger,maxWidth:e.maxWidth})}return Object.defineProperty(e.prototype,"content",{get:function(){return(0,_utils.getFuncText)(this.$options.content||this.$options.message)},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"message",{get:function(){return this.content},enumerable:!1,configurable:!0}),e}(),validErrorRuleValue=function(e,t){var n=e.type,r=e.min,i=e.max,u=e.pattern,e="number"===n,n=e?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!e||!isNaN(t))||(!_xeUtils.default.eqNull(r)&&n<_xeUtils.default.toNumber(r)||(!_xeUtils.default.eqNull(i)&&n>_xeUtils.default.toNumber(i)||!(!u||(_xeUtils.default.isRegExp(u)?u:new RegExp(u)).test(t))))};function getResetValue(e,t){return t=_xeUtils.default.isArray(e)?[]:t}var _default2=(0,_vue.defineComponent)({name:"VxeForm",props:{collapseStatus:{type:Boolean,default:!0},loading:Boolean,data:Object,size:{type:String,default:function(){return _conf.default.form.size||_conf.default.size}},span:{type:[String,Number],default:function(){return _conf.default.form.span}},align:{type:String,default:function(){return _conf.default.form.align}},titleAlign:{type:String,default:function(){return _conf.default.form.titleAlign}},titleWidth:{type:[String,Number],default:function(){return _conf.default.form.titleWidth}},titleColon:{type:Boolean,default:function(){return _conf.default.form.titleColon}},titleAsterisk:{type:Boolean,default:function(){return _conf.default.form.titleAsterisk}},titleOverflow:{type:[Boolean,String],default:null},className:[String,Function],items:Array,rules:Object,preventSubmit:{type:Boolean,default:function(){return _conf.default.form.preventSubmit}},validConfig:Object,tooltipConfig:Object,customLayout:{type:Boolean,default:function(){return _conf.default.form.customLayout}}},emits:["update:collapseStatus","collapse","toggle-collapse","submit","submit-invalid","reset"],setup:function(d,e){function t(e){return e.length&&("development"===process.env.NODE_ENV&&e.forEach(function(e){e.slots&&_xeUtils.default.each(e.slots,function(e){_xeUtils.default.isFunction(e)||m[e]||(0,_log.errLog)("vxe.error.notSlot",[e])})}),v.staticItems=_xeUtils.default.mapTree(e,function(e){return(0,_util.createItem)(R,e)},{children:"children"})),(0,_vue.nextTick)()}function n(){return v.collapseAll}function r(){var e=!n();return v.collapseAll=e,u("update:collapseStatus",e),(0,_vue.nextTick)()}function a(e){e.preventDefault(),O(),x.dispatchEvent("reset",{data:d.data},e)}function s(t){t.preventDefault(),d.preventSubmit||(q(),V(S()).then(function(e){e?x.dispatchEvent("submit-invalid",{data:d.data,errMap:e},t):x.dispatchEvent("submit",{data:d.data},t)}))}function o(){var e=_.tooltipStore,t=h.value;return e.visible&&(Object.assign(e,{item:null,visible:!1}),t&&t.close()),(0,_vue.nextTick)()}function i(e,n,t){return n?C(e?e.type:"all",n,t).then(function(){q(n)}).catch(function(e){var t=e.rule,e=U(n);e&&(e.showError=!0,e.errRule=t)}):(0,_vue.nextTick)()}var f,c=_vXETable.VXETable.tooltip,m=e.slots,u=e.emit,l=_xeUtils.default.uniqueId(),p=(0,_size.useSize)(d),v=(0,_vue.reactive)({collapseAll:d.collapseStatus,staticItems:[],formItems:[]}),_=(0,_vue.reactive)({tooltipTimeout:null,tooltipStore:{item:null,visible:!1}}),g=(0,_vue.ref)(),h=(0,_vue.ref)(),x={},b=(0,_vue.computed)(function(){return Object.assign({},_conf.default.form.validConfig,d.validConfig)}),y=(0,_vue.computed)(function(){return Object.assign({},_conf.default.tooltip,_conf.default.form.tooltipConfig,d.tooltipConfig)}),E={refElem:g},T={computeSize:p,computeValidOpts:b,computeTooltipOpts:y},R={xID:l,props:d,context:e,reactData:v,getRefMaps:function(){return E},getComputeMaps:function(){return T}},S=function(){var t=[];return _xeUtils.default.eachTree(v.formItems,function(e){t.push(e)},{children:"children"}),t},U=function(t){var e=_xeUtils.default.findTree(v.formItems,function(e){return e.field===t},{children:"children"});return e?e.item:null},q=function(e){return e?(e=(0,_util.handleFieldOrItem)(R,e))&&(e.showError=!1):S().forEach(function(e){e.showError=!1}),(0,_vue.nextTick)()},O=function(){var i=d.data,e=S();return i&&e.forEach(function(e){var t=e.field,n=e.resetValue,r=e.itemRender;(0,_utils.isEnableConf)(r)&&((r=_vXETable.VXETable.renderer.get(r.name))&&r.itemResetMethod?r.itemResetMethod({data:i,field:t,property:t,item:e,$form:R}):t&&_xeUtils.default.set(i,t,null===n?getResetValue(_xeUtils.default.get(i,t),void 0):n))}),q()},w=function(e){var u=g.value;e.some(function(e,t){var n=U(e);if(n&&(0,_utils.isEnableConf)(n.itemRender)){var r=n.itemRender,i=_vXETable.VXETable.renderer.get(r.name),e=null;if(t||(0,_dom.scrollToView)(u.querySelector("."+n.id)),e=!(e=r.autofocus?u.querySelector("."+n.id+" "+r.autofocus):e)&&i&&i.autofocus?u.querySelector("."+n.id+" "+i.autofocus):e)return e.focus(),!0}})},C=function(u,o,e){var l,a,s=d.data,t=d.rules,f=[],c=[];return o&&t&&((l=_xeUtils.default.get(t,o))&&(a=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(s,o):e,l.forEach(function(t){var e,n=t.type,r=t.trigger,i=t.required;"all"!==u&&r&&u!==r||(_xeUtils.default.isFunction(t.validator)?(e=t.validator({itemValue:a,rule:t,rules:l,data:s,field:o,property:o,$form:R}))&&(_xeUtils.default.isError(e)?f.push(new Rule({type:"custom",trigger:r,content:e.message,rule:new Rule(t)})):e.catch&&c.push(e.catch(function(e){f.push(new Rule({type:"custom",trigger:r,content:e?e.message:t.content||t.message,rule:new Rule(t)}))}))):(n="array"===n||_xeUtils.default.isArray(a)?!_xeUtils.default.isArray(a)||!a.length:(0,_utils.eqEmptyValue)(a),(i?n||validErrorRuleValue(t,a):!n&&validErrorRuleValue(t,a))&&f.push(new Rule(t))))}))),Promise.all(c).then(function(){if(f.length){var e={rules:f,rule:f[0]};return Promise.reject(e)}})},V=function(t,e,n){var i=d.data,r=d.rules,u=b.value,o={},l=[],a=[];return clearTimeout(f),i&&r?(t.forEach(function(n){var r=n.field;r&&a.push(C(e||"all",r).then(function(){n.errRule=null}).catch(function(e){var t=e.rule,e={rule:t,rules:e.rules,data:i,field:r,property:r,$form:R};return o[r]||(o[r]=[]),o[r].push(e),l.push(r),n.errRule=t,Promise.reject(e)}))}),Promise.all(a).then(function(){n&&n()}).catch(function(){return new Promise(function(e){f=window.setTimeout(function(){t.forEach(function(e){e.errRule&&(e.showError=!0)})},20),!1!==u.autoPos&&(0,_vue.nextTick)(function(){w(l)}),n?(n(o),e()):e(o)})})):(n&&n(),Promise.resolve())},x={dispatchEvent:function(e,t,n){u(e,Object.assign({$form:R,$event:n},t))},reset:O,validate:function(e){return q(),V(S(),"",e)},validateField:function(e,t){e=(0,_util.handleFieldOrItem)(R,e);return V(e?[e]:[],"",t)},clearValidate:q,updateStatus:function(e,t){e=e.field;return i(new Event("change"),e,t)},toggleCollapse:r,getItems:S,getItemByField:U,closeTooltip:o},e={callSlot:function(e,t){return e&&(_xeUtils.default.isString(e)&&(e=m[e]||null),_xeUtils.default.isFunction(e))?e(t):[]},triggerItemEvent:i,toggleCollapseEvent:function(e){r();var t=n();x.dispatchEvent("toggle-collapse",{status:t,collapse:t,data:d.data},e),x.dispatchEvent("collapse",{status:t,collapse:t,data:d.data},e)},triggerTitleTipEvent:function(e,t){var n=t.item,r=_.tooltipStore,i=h.value,u=e.currentTarget.children[0],t=(u.textContent||"").trim(),e=u.scrollWidth>u.clientWidth;clearTimeout(_.tooltipTimeout),r.item!==n&&o(),t&&e&&(Object.assign(r,{item:n,visible:!0}),i&&i.open(u,t))},handleTitleTipLeaveEvent:function(){var e=y.value,t=h.value;t&&t.setActived(!1),e.enterable?_.tooltipTimeout=setTimeout(function(){(t=h.value)&&!t.isActived()&&o()},e.leaveDelay):o()}};Object.assign(R,x,e),(0,_vue.watch)(function(){return v.staticItems},function(e){v.formItems=e}),(0,_vue.watch)(function(){return d.items},function(e){t(e||[])}),(0,_vue.watch)(function(){return d.collapseStatus},function(e){v.collapseAll=!!e}),(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){"development"===process.env.NODE_ENV&&d.customLayout&&d.items&&(0,_log.errLog)("vxe.error.errConflicts",["custom-layout","items"]),t(d.items||[])})});return R.renderVN=function(){var e=d.loading,t=d.className,n=d.data,r=d.customLayout,i=v.formItems,u=p.value,o=y.value,l=m.default;return(0,_vue.h)("form",{ref:g,class:["vxe-form",t?_xeUtils.default.isFunction(t)?t({items:i,data:n,$form:R}):t:"",((t={})["size--"+u]=u,t["is--loading"]=e,t)],onSubmit:s,onReset:a},[(0,_vue.h)("div",{class:"vxe-form--wrapper vxe-row"},r?l?l({}):[]:i.map(function(e,t){return(0,_vue.h)(_formConfigItem.default,{key:t,itemConfig2:e,itemConfig:e})})),(0,_vue.h)("div",{class:"vxe-form-slots",ref:"hideItem"},!r&&l?l({}):[]),(0,_vue.h)(_index.default,{class:"vxe-form--loading",loading:e}),c?(0,_vue.h)((0,_vue.resolveComponent)("vxe-tooltip"),__assign({ref:h},o)):(0,_vue.createCommentVNode)()])},(0,_vue.provide)("$xeform",R),(0,_vue.provide)("$xeformgather",null),(0,_vue.provide)("$xeformitem",null),(0,_vue.provide)("$xeformiteminfo",null),R},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")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_log=require("../../tools/log"),_dom=require("../../tools/dom"),_util=require("./util"),_size=require("../../hooks/size"),_formConfigItem=_interopRequireDefault(require("./form-config-item")),_index=_interopRequireDefault(require("../../loading/index"));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 i in t=arguments[n])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)},Rule=function(){function e(e){Object.assign(this,{$options:e,required:e.required,min:e.min,max:e.min,type:e.type,pattern:e.pattern,validator:e.validator,trigger:e.trigger,maxWidth:e.maxWidth})}return Object.defineProperty(e.prototype,"content",{get:function(){return(0,_utils.getFuncText)(this.$options.content||this.$options.message)},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"message",{get:function(){return this.content},enumerable:!1,configurable:!0}),e}(),validErrorRuleValue=function(e,t){var n=e.type,r=e.min,i=e.max,u=e.pattern,e="number"===n,n=e?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!e||!isNaN(t))||(!_xeUtils.default.eqNull(r)&&n<_xeUtils.default.toNumber(r)||(!_xeUtils.default.eqNull(i)&&n>_xeUtils.default.toNumber(i)||!(!u||(_xeUtils.default.isRegExp(u)?u:new RegExp(u)).test(t))))};function getResetValue(e,t){return t=_xeUtils.default.isArray(e)?[]:t}var _default2=(0,_vue.defineComponent)({name:"VxeForm",props:{collapseStatus:{type:Boolean,default:!0},loading:Boolean,data:Object,size:{type:String,default:function(){return _conf.default.form.size||_conf.default.size}},span:{type:[String,Number],default:function(){return _conf.default.form.span}},align:{type:String,default:function(){return _conf.default.form.align}},titleAlign:{type:String,default:function(){return _conf.default.form.titleAlign}},titleWidth:{type:[String,Number],default:function(){return _conf.default.form.titleWidth}},titleColon:{type:Boolean,default:function(){return _conf.default.form.titleColon}},titleAsterisk:{type:Boolean,default:function(){return _conf.default.form.titleAsterisk}},titleOverflow:{type:[Boolean,String],default:null},className:[String,Function],items:Array,rules:Object,preventSubmit:{type:Boolean,default:function(){return _conf.default.form.preventSubmit}},validConfig:Object,tooltipConfig:Object,customLayout:{type:Boolean,default:function(){return _conf.default.form.customLayout}}},emits:["update:collapseStatus","collapse","toggle-collapse","submit","submit-invalid","reset"],setup:function(d,e){function t(e){return e.length&&("development"===process.env.NODE_ENV&&e.forEach(function(e){e.slots&&_xeUtils.default.each(e.slots,function(e){_xeUtils.default.isFunction(e)||m[e]||(0,_log.errLog)("vxe.error.notSlot",[e])})}),v.staticItems=_xeUtils.default.mapTree(e,function(e){return(0,_util.createItem)(R,e)},{children:"children"})),(0,_vue.nextTick)()}function n(){return v.collapseAll}function r(){var e=!n();return v.collapseAll=e,u("update:collapseStatus",e),(0,_vue.nextTick)()}function a(e){e.preventDefault(),O(),x.dispatchEvent("reset",{data:d.data},e)}function s(t){t.preventDefault(),d.preventSubmit||(q(),I(S()).then(function(e){e?x.dispatchEvent("submit-invalid",{data:d.data,errMap:e},t):x.dispatchEvent("submit",{data:d.data},t)}))}function o(){var e=_.tooltipStore,t=h.value;return e.visible&&(Object.assign(e,{item:null,visible:!1}),t&&t.close()),(0,_vue.nextTick)()}function i(e,n,t){return n?C(e?["blur"].includes(e.type)?"blur":"change":"all",n,t).then(function(){q(n)}).catch(function(e){var t=e.rule,e=U(n);e&&(e.showError=!0,e.errRule=t)}):(0,_vue.nextTick)()}var f,c=_vXETable.VXETable.tooltip,m=e.slots,u=e.emit,l=_xeUtils.default.uniqueId(),p=(0,_size.useSize)(d),v=(0,_vue.reactive)({collapseAll:d.collapseStatus,staticItems:[],formItems:[]}),_=(0,_vue.reactive)({tooltipTimeout:null,tooltipStore:{item:null,visible:!1}}),g=(0,_vue.ref)(),h=(0,_vue.ref)(),x={},b=(0,_vue.computed)(function(){return Object.assign({},_conf.default.form.validConfig,d.validConfig)}),y=(0,_vue.computed)(function(){return Object.assign({},_conf.default.tooltip,_conf.default.form.tooltipConfig,d.tooltipConfig)}),E={refElem:g},T={computeSize:p,computeValidOpts:b,computeTooltipOpts:y},R={xID:l,props:d,context:e,reactData:v,getRefMaps:function(){return E},getComputeMaps:function(){return T}},S=function(){var t=[];return _xeUtils.default.eachTree(v.formItems,function(e){t.push(e)},{children:"children"}),t},U=function(t){var e=_xeUtils.default.findTree(v.formItems,function(e){return e.field===t},{children:"children"});return e?e.item:null},q=function(e){return e?(e=(0,_util.handleFieldOrItem)(R,e))&&(e.showError=!1):S().forEach(function(e){e.showError=!1}),(0,_vue.nextTick)()},O=function(){var i=d.data,e=S();return i&&e.forEach(function(e){var t=e.field,n=e.resetValue,r=e.itemRender;(0,_utils.isEnableConf)(r)&&((r=_vXETable.VXETable.renderer.get(r.name))&&r.itemResetMethod?r.itemResetMethod({data:i,field:t,property:t,item:e,$form:R}):t&&_xeUtils.default.set(i,t,null===n?getResetValue(_xeUtils.default.get(i,t),void 0):n))}),q()},w=function(e){var u=g.value;e.some(function(e,t){var n=U(e);if(n&&(0,_utils.isEnableConf)(n.itemRender)){var r=n.itemRender,i=_vXETable.VXETable.renderer.get(r.name),e=null;if(t||(0,_dom.scrollToView)(u.querySelector("."+n.id)),e=!(e=r.autofocus?u.querySelector("."+n.id+" "+r.autofocus):e)&&i&&i.autofocus?u.querySelector("."+n.id+" "+i.autofocus):e)return e.focus(),!0}})},C=function(u,o,e){var l,a,s=d.data,t=d.rules,f=[],c=[];return o&&t&&((l=_xeUtils.default.get(t,o))&&(a=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(s,o):e,l.forEach(function(t){var e,n=t.type,r=t.trigger,i=t.required;"all"!==u&&r&&u!==r||(_xeUtils.default.isFunction(t.validator)?(e=t.validator({itemValue:a,rule:t,rules:l,data:s,field:o,property:o,$form:R}))&&(_xeUtils.default.isError(e)?f.push(new Rule({type:"custom",trigger:r,content:e.message,rule:new Rule(t)})):e.catch&&c.push(e.catch(function(e){f.push(new Rule({type:"custom",trigger:r,content:e?e.message:t.content||t.message,rule:new Rule(t)}))}))):(n="array"===n||_xeUtils.default.isArray(a)?!_xeUtils.default.isArray(a)||!a.length:(0,_utils.eqEmptyValue)(a),(i?n||validErrorRuleValue(t,a):!n&&validErrorRuleValue(t,a))&&f.push(new Rule(t))))}))),Promise.all(c).then(function(){if(f.length){var e={rules:f,rule:f[0]};return Promise.reject(e)}})},I=function(t,e,n){var i=d.data,r=d.rules,u=b.value,o={},l=[],a=[];return clearTimeout(f),i&&r?(t.forEach(function(n){var r=n.field;r&&!(0,_util.isHiddenItem)(R,n)&&(0,_util.isActivetem)(R,n)&&a.push(C(e||"all",r).then(function(){n.errRule=null}).catch(function(e){var t=e.rule,e={rule:t,rules:e.rules,data:i,field:r,property:r,$form:R};return o[r]||(o[r]=[]),o[r].push(e),l.push(r),n.errRule=t,Promise.reject(e)}))}),Promise.all(a).then(function(){n&&n()}).catch(function(){return new Promise(function(e){f=window.setTimeout(function(){t.forEach(function(e){e.errRule&&(e.showError=!0)})},20),!1!==u.autoPos&&(0,_vue.nextTick)(function(){w(l)}),n?(n(o),e()):e(o)})})):(n&&n(),Promise.resolve())},x={dispatchEvent:function(e,t,n){u(e,Object.assign({$form:R,$event:n},t))},reset:O,validate:function(e){return q(),I(S(),"",e)},validateField:function(e,t){e=(0,_util.handleFieldOrItem)(R,e);return I(e?[e]:[],"",t)},clearValidate:q,updateStatus:function(e,t){e=e.field;return i(new Event("change"),e,t)},toggleCollapse:r,getItems:S,getItemByField:U,closeTooltip:o},e={callSlot:function(e,t){return e&&(_xeUtils.default.isString(e)&&(e=m[e]||null),_xeUtils.default.isFunction(e))?e(t):[]},triggerItemEvent:i,toggleCollapseEvent:function(e){r();var t=n();x.dispatchEvent("toggle-collapse",{status:t,collapse:t,data:d.data},e),x.dispatchEvent("collapse",{status:t,collapse:t,data:d.data},e)},triggerTitleTipEvent:function(e,t){var n=t.item,r=_.tooltipStore,i=h.value,u=e.currentTarget.children[0],t=(u.textContent||"").trim(),e=u.scrollWidth>u.clientWidth;clearTimeout(_.tooltipTimeout),r.item!==n&&o(),t&&e&&(Object.assign(r,{item:n,visible:!0}),i&&i.open(u,t))},handleTitleTipLeaveEvent:function(){var e=y.value,t=h.value;t&&t.setActived(!1),e.enterable?_.tooltipTimeout=setTimeout(function(){(t=h.value)&&!t.isActived()&&o()},e.leaveDelay):o()}};Object.assign(R,x,e),(0,_vue.watch)(function(){return v.staticItems},function(e){v.formItems=e}),(0,_vue.watch)(function(){return d.items},function(e){t(e||[])}),(0,_vue.watch)(function(){return d.collapseStatus},function(e){v.collapseAll=!!e}),(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){"development"===process.env.NODE_ENV&&d.customLayout&&d.items&&(0,_log.errLog)("vxe.error.errConflicts",["custom-layout","items"]),t(d.items||[])})});return R.renderVN=function(){var e=d.loading,t=d.className,n=d.data,r=d.customLayout,i=v.formItems,u=p.value,o=y.value,l=m.default;return(0,_vue.h)("form",{ref:g,class:["vxe-form",t?_xeUtils.default.isFunction(t)?t({items:i,data:n,$form:R}):t:"",((t={})["size--"+u]=u,t["is--loading"]=e,t)],onSubmit:s,onReset:a},[(0,_vue.h)("div",{class:"vxe-form--wrapper vxe-row"},r?l?l({}):[]:i.map(function(e,t){return(0,_vue.h)(_formConfigItem.default,{key:t,itemConfig2:e,itemConfig:e})})),(0,_vue.h)("div",{class:"vxe-form-slots",ref:"hideItem"},!r&&l?l({}):[]),(0,_vue.h)(_index.default,{class:"vxe-form--loading",loading:e}),c?(0,_vue.h)((0,_vue.resolveComponent)("vxe-tooltip"),__assign({ref:h},o)):(0,_vue.createCommentVNode)()])},(0,_vue.provide)("$xeform",R),(0,_vue.provide)("$xeformgather",null),(0,_vue.provide)("$xeformitem",null),(0,_vue.provide)("$xeformiteminfo",null),R},render:function(){return this.renderVN()}});exports.default=_default2;

package/lib/form/src/util.js

@@ -6,16 +6,22 @@ Object.defineProperty(exports, "__esModule", {
 exports.assemItem = assemItem;
 exports.createItem = createItem;
 exports.destroyItem = destroyItem;
-exports.handleFieldOrItem = void 0;
+exports.handleFieldOrItem = handleFieldOrItem;
+exports.isActivetem = isActivetem;
 exports.isFormItem = isFormItem;
+exports.isHiddenItem = isHiddenItem;
 exports.watchItem = watchItem;
 
 var _vue = require("vue");
 
+var _vXETable = require("../../v-x-e-table");
+
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
 
 var _itemInfo = require("./itemInfo");
 
+var _utils = require("../../tools/utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function isFormItem(item) {
@@ -26,15 +32,51 @@ function createItem($xeform, _vm) {
   return isFormItem(_vm) ? _vm : new _itemInfo.ItemInfo($xeform, _vm);
 }
 
-var handleFieldOrItem = function handleFieldOrItem($xeform, fieldOrItem) {
+function handleFieldOrItem($xeform, fieldOrItem) {
   if (fieldOrItem) {
     return _xeUtils.default.isString(fieldOrItem) ? $xeform.getItemByField(fieldOrItem) : fieldOrItem;
   }
 
   return null;
-};
+}
 
-exports.handleFieldOrItem = handleFieldOrItem;
+function isHiddenItem($xeform, formItem) {
+  var reactData = $xeform.reactData;
+  var collapseAll = reactData.collapseAll;
+  var folding = formItem.folding,
+      visible = formItem.visible;
+  return visible === false || folding && collapseAll;
+}
+
+function isActivetem($xeform, formItem) {
+  var visibleMethod = formItem.visibleMethod,
+      itemRender = formItem.itemRender,
+      visible = formItem.visible,
+      field = formItem.field;
+
+  if (visible === false) {
+    return visible;
+  }
+
+  var compConf = (0, _utils.isEnableConf)(itemRender) ? _vXETable.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
+  });
+}
 
 function watchItem(props, formItem) {
   Object.keys(props).forEach(function (name) {

package/lib/form/src/util.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.assemItem=assemItem,exports.createItem=createItem,exports.destroyItem=destroyItem,exports.handleFieldOrItem=void 0,exports.isFormItem=isFormItem,exports.watchItem=watchItem;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_itemInfo=require("./itemInfo");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function isFormItem(e){return e instanceof _itemInfo.ItemInfo}function createItem(e,t){return isFormItem(t)?t:new _itemInfo.ItemInfo(e,t)}var handleFieldOrItem=function(e,t){return t?_xeUtils.default.isString(t)?e.getItemByField(t):t:null};function watchItem(e,r){Object.keys(e).forEach(function(t){(0,_vue.watch)(function(){return e[t]},function(e){r.update(t,e)})})}function assemItem(e,t,r,i){var n=e.reactData,s=n.staticItems,e=t.parentNode,i=i?i.formItem:null,i=i?i.children:s;e&&(i.splice(_xeUtils.default.arrayIndexOf(e.children,t),0,r),n.staticItems=s.slice(0))}function destroyItem(e,t){var r=e.reactData,i=r.staticItems,e=_xeUtils.default.findIndexOf(i,function(e){return e.id===t.id});-1<e&&i.splice(e,1),r.staticItems=i.slice(0)}exports.handleFieldOrItem=handleFieldOrItem;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.assemItem=assemItem,exports.createItem=createItem,exports.destroyItem=destroyItem,exports.handleFieldOrItem=handleFieldOrItem,exports.isActivetem=isActivetem,exports.isFormItem=isFormItem,exports.isHiddenItem=isHiddenItem,exports.watchItem=watchItem;var _vue=require("vue"),_vXETable=require("../../v-x-e-table"),_xeUtils=_interopRequireDefault(require("xe-utils")),_itemInfo=require("./itemInfo"),_utils=require("../../tools/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function isFormItem(e){return e instanceof _itemInfo.ItemInfo}function createItem(e,t){return isFormItem(t)?t:new _itemInfo.ItemInfo(e,t)}function handleFieldOrItem(e,t){return t?_xeUtils.default.isString(t)?e.getItemByField(t):t:null}function isHiddenItem(e,t){var i=e.reactData.collapseAll,e=t.folding;return!1===t.visible||e&&i}function isActivetem(e,t){var i=t.visibleMethod,r=t.itemRender,n=t.visible,s=t.field;if(!1===n)return n;r=(0,_utils.isEnableConf)(r)?_vXETable.VXETable.renderer.get(r.name):null;return!(i=!i&&r&&r.itemVisibleMethod?r.itemVisibleMethod:i)||i({data:e.props.data,field:s,property:s,item:t,$form:e})}function watchItem(e,i){Object.keys(e).forEach(function(t){(0,_vue.watch)(function(){return e[t]},function(e){i.update(t,e)})})}function assemItem(e,t,i,r){var n=e.reactData,s=n.staticItems,e=t.parentNode,r=r?r.formItem:null,r=r?r.children:s;e&&(r.splice(_xeUtils.default.arrayIndexOf(e.children,t),0,i),n.staticItems=s.slice(0))}function destroyItem(e,t){var i=e.reactData,r=i.staticItems,e=_xeUtils.default.findIndexOf(r,function(e){return e.id===t.id});-1<e&&r.splice(e,1),i.staticItems=r.slice(0)}