vxe-table 3.5.9-beta.12 → 3.5.9-beta.13

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

@@ -15,6 +15,8 @@ var _utils = require("../../tools/utils");
 
 var _render = require("./render");
 
+var _util = require("./util");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**
@@ -33,9 +35,7 @@ var VxeFormConfigItem = {
   provide: function provide() {
     return {
       $xeformgather: null,
-      $xeformiteminfo: {
-        itemConfig: this.itemConfig
-      }
+      $xeformiteminfo: this
     };
   },
   render: function render(h) {
@@ -55,7 +55,6 @@ var VxeFormConfigItem = {
         title = item.title,
         folding = item.folding,
         visible = item.visible,
-        visibleMethod = item.visibleMethod,
         field = item.field,
         collapseNode = item.collapseNode,
         itemRender = item.itemRender,
@@ -72,7 +71,6 @@ var VxeFormConfigItem = {
     var titleWidth = _xeUtils.default.eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
     var titleColon = _xeUtils.default.eqNull(item.titleColon) ? allTitleColon : item.titleColon;
     var titleAsterisk = _xeUtils.default.eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk;
-    var itemVisibleMethod = visibleMethod;
     var itemOverflow = _xeUtils.default.isUndefined(titleOverflow) || _xeUtils.default.isNull(titleOverflow) ? allTitleOverflow : titleOverflow;
     var showEllipsis = itemOverflow === 'ellipsis';
     var showTitle = itemOverflow === 'title';
@@ -108,10 +106,6 @@ var VxeFormConfigItem = {
       }, childVNs) : _e();
     }
 
-    if (!itemVisibleMethod && compConf && compConf.itemVisibleMethod) {
-      itemVisibleMethod = compConf.itemVisibleMethod;
-    }
-
     if (rules) {
       var itemRules = rules[field];
 
@@ -141,13 +135,13 @@ var VxeFormConfigItem = {
       mouseleave: $xeform.handleTitleTipLeaveEvent
     } : {};
     return h('div', {
-      class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : null, className ? _xeUtils.default.isFunction(className) ? className(params) : className : '', itemClassName ? _xeUtils.default.isFunction(itemClassName) ? itemClassName(params) : className : '', {
+      class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : null, className ? _xeUtils.default.isFunction(className) ? className(params) : className : '', itemClassName ? _xeUtils.default.isFunction(itemClassName) ? itemClassName(params) : itemClassName : '', {
         'is--title': title,
         'is--colon': titleColon,
         'is--asterisk': titleAsterisk,
         'is--required': isRequired,
         'is--hidden': folding && collapseAll,
-        'is--active': !itemVisibleMethod || itemVisibleMethod(params),
+        'is--active': (0, _util.isActivetem)(this, item),
         'is--error': showError
       }],
       props: {

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

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

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

@@ -18,9 +18,7 @@ var _default = {
     return {
       $xeformgather: this,
       xeformitem: null,
-      $xeformiteminfo: {
-        itemConfig: this.itemConfig
-      }
+      $xeformiteminfo: this
     };
   },
   created: function created() {

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _formItem=_interopRequireDefault(require("./form-item")),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default={name:"VxeFormGather",extends:_formItem.default,provide:function(){return{$xeformgather:this,xeformitem:null,$xeformiteminfo:{itemConfig:this.itemConfig}}},created:function(){var e=this;"development"===process.env.NODE_ENV&&this.$nextTick(function(){e.$xeform&&e.$xeform.customLayout&&(0,_log.errLog)("vxe.error.errConflicts",["custom-layout","<form-gather ...>"])})},render:function(e){return e("div",this.$slots.default)}};exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _formItem=_interopRequireDefault(require("./form-item")),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default={name:"VxeFormGather",extends:_formItem.default,provide:function(){return{$xeformgather:this,xeformitem:null,$xeformiteminfo:this}},created:function(){var e=this;"development"===process.env.NODE_ENV&&this.$nextTick(function(){e.$xeform&&e.$xeform.customLayout&&(0,_log.errLog)("vxe.error.errConflicts",["custom-layout","<form-gather ...>"])})},render:function(e){return e("div",this.$slots.default)}};exports.default=_default;

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

@@ -62,7 +62,8 @@ Object.keys(props).forEach(function (name) {
 });
 
 var renderItem = function renderItem(h, _vm, item, slots) {
-  var rules = _vm.rules,
+  var _e = _vm._e,
+      rules = _vm.rules,
       data = _vm.data,
       collapseAll = _vm.collapseAll,
       validOpts = _vm.validOpts,
@@ -70,7 +71,6 @@ var renderItem = function renderItem(h, _vm, item, slots) {
   var title = item.title,
       folding = item.folding,
       visible = item.visible,
-      visibleMethod = item.visibleMethod,
       field = item.field,
       collapseNode = item.collapseNode,
       itemRender = item.itemRender,
@@ -84,7 +84,6 @@ var renderItem = function renderItem(h, _vm, item, slots) {
   var align = item.align || _vm.align;
   var titleAlign = item.titleAlign || _vm.titleAlign;
   var titleWidth = item.titleWidth || _vm.titleWidth;
-  var itemVisibleMethod = visibleMethod;
   var itemOverflow = _xeUtils.default.isUndefined(titleOverflow) || _xeUtils.default.isNull(titleOverflow) ? allTitleOverflow : titleOverflow;
   var showEllipsis = itemOverflow === 'ellipsis';
   var showTitle = itemOverflow === 'title';
@@ -99,8 +98,8 @@ var renderItem = function renderItem(h, _vm, item, slots) {
   };
   var isRequired;
 
-  if (!itemVisibleMethod && compConf && compConf.itemVisibleMethod) {
-    itemVisibleMethod = compConf.itemVisibleMethod;
+  if (visible === false) {
+    return _e();
   }
 
   if (rules) {
@@ -135,8 +134,8 @@ var renderItem = function renderItem(h, _vm, item, slots) {
     class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(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)(_vm, item),
       'is--error': showError
     }]
   }, [h('div', {
@@ -185,9 +184,7 @@ var _default = {
   provide: function provide() {
     return {
       $xeformitem: this,
-      $xeformiteminfo: {
-        itemConfig: this.itemConfig
-      }
+      $xeformiteminfo: this
     };
   },
   data: function data() {

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=_interopRequireDefault(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 props={title:String,field:String,size: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},visible:{type:Boolean,default:null},visibleMethod:Function,folding:Boolean,collapseNode:Boolean,itemRender:Object},watch={};Object.keys(props).forEach(function(t){watch[t]=function(e){this.itemConfig.update(t,e)}});var renderItem=function(e,t,i,l){var n,r=t.rules,o=t.data,a=t.collapseAll,s=t.validOpts,u=t.titleOverflow,d=i.title,f=i.folding,c=i.visible,m=i.visibleMethod,v=i.field,g=i.collapseNode,p=i.itemRender,x=i.showError,_=i.errRule,h=i.className,b=i.titleOverflow,N=(0,_utils.isEnableConf)(p)?_vXETable.default.renderer.get(p.name):null,O=N?N.itemClassName:"",q=i.span||t.span,y=i.align||t.align,C=i.titleAlign||t.titleAlign,I=i.titleWidth||t.titleWidth,S=m,m=_xeUtils.default.isUndefined(b)||_xeUtils.default.isNull(b)?u:b,u="title"===m,b=!0===m||"tooltip"===m,m=u||b||"ellipsis"===m,w={data:o,field:v,property:v,item:i,$form:t};!S&&N&&N.itemVisibleMethod&&(S=N.itemVisibleMethod),!r||(F=r[v])&&(n=F.some(function(e){return e.required}));var F=[];l&&l.default?F=t.callSlot(l.default,w,e):N&&N.renderItemContent?F=N.renderItemContent.call(t,e,p,w):N&&N.renderItem?F=N.renderItem.call(t,e,p,w):v&&(F=["".concat(_xeUtils.default.get(o,v))]);b=b?{mouseenter:function(e){t.triggerTitleTipEvent(e,w)},mouseleave:t.handleTitleTipLeaveEvent}:{};return e("div",{class:["vxe-form--item",i.id,q?"vxe-col--".concat(q," is--span"):"",h?_xeUtils.default.isFunction(h)?h(w):h:"",O?_xeUtils.default.isFunction(O)?O(w):O:"",{"is--title":d,"is--required":n,"is--hidden":!1===c||f&&a,"is--active":!S||S(w),"is--error":x}]},[e("div",{class:"vxe-form--item-inner"},[d||l&&l.title?e("div",{class:["vxe-form--item-title",C?"align--".concat(C):null,{"is--ellipsis":m}],style:I?{width:isNaN(I)?I:"".concat(I,"px")}:null,attrs:{title:u?(0,_utils.getFuncText)(d):null},on:b},(0,_render.renderTitle)(e,t,i)):null,e("div",{class:["vxe-form--item-content",y?"align--".concat(y):null]},F.concat([g?e("div",{class:"vxe-form--item-trigger-node",on:{click:t.toggleCollapseEvent}},[e("span",{class:"vxe-form--item-trigger-text"},a?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),e("i",{class:["vxe-form--item-trigger-icon",a?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})]):null,_&&s.showMessage?e("div",{class:"vxe-form--item-valid",style:_.maxWidth?{width:"".concat(_.maxWidth,"px")}:null},_.message):null]))])])},_default={name:"VxeFormItem",props:props,inject:{$xeform:{default:null},$xeformgather:{default:null}},provide:function(){return{$xeformitem:this,$xeformiteminfo:{itemConfig:this.itemConfig}}},data:function(){return{itemConfig:null}},watch:watch,mounted:function(){(0,_util.assemItem)(this)},created:function(){this.itemConfig=(0,_util.createItem)(this.$xeform,this)},destroyed:function(){(0,_util.destroyItem)(this)},render:function(e){var t=this.$xeform;return t&&t.customLayout?renderItem(e,t,this.itemConfig,this.$scopedSlots):e("div")}};exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=_interopRequireDefault(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 props={title:String,field:String,size: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},visible:{type:Boolean,default:null},visibleMethod:Function,folding:Boolean,collapseNode:Boolean,itemRender:Object},watch={};Object.keys(props).forEach(function(t){watch[t]=function(e){this.itemConfig.update(t,e)}});var renderItem=function(e,t,i,l){var n,r=t._e,o=t.rules,a=t.data,s=t.collapseAll,u=t.validOpts,d=t.titleOverflow,f=i.title,c=i.folding,m=i.visible,v=i.field,p=i.collapseNode,g=i.itemRender,x=i.showError,_=i.errRule,h=i.className,b=i.titleOverflow,N=(0,_utils.isEnableConf)(g)?_vXETable.default.renderer.get(g.name):null,O=N?N.itemClassName:"",q=i.span||t.span,y=i.align||t.align,I=i.titleAlign||t.titleAlign,S=i.titleWidth||t.titleWidth,w=_xeUtils.default.isUndefined(b)||_xeUtils.default.isNull(b)?d:b,d="title"===w,b=!0===w||"tooltip"===w,w=d||b||"ellipsis"===w,C={data:a,field:v,property:v,item:i,$form:t};if(!1===m)return r();!o||(F=o[v])&&(n=F.some(function(e){return e.required}));var F=[];l&&l.default?F=t.callSlot(l.default,C,e):N&&N.renderItemContent?F=N.renderItemContent.call(t,e,g,C):N&&N.renderItem?F=N.renderItem.call(t,e,g,C):v&&(F=["".concat(_xeUtils.default.get(a,v))]);b=b?{mouseenter:function(e){t.triggerTitleTipEvent(e,C)},mouseleave:t.handleTitleTipLeaveEvent}:{};return e("div",{class:["vxe-form--item",i.id,q?"vxe-col--".concat(q," is--span"):"",h?_xeUtils.default.isFunction(h)?h(C):h:"",O?_xeUtils.default.isFunction(O)?O(C):O:"",{"is--title":f,"is--required":n,"is--hidden":c&&s,"is--active":(0,_util.isActivetem)(t,i),"is--error":x}]},[e("div",{class:"vxe-form--item-inner"},[f||l&&l.title?e("div",{class:["vxe-form--item-title",I?"align--".concat(I):null,{"is--ellipsis":w}],style:S?{width:isNaN(S)?S:"".concat(S,"px")}:null,attrs:{title:d?(0,_utils.getFuncText)(f):null},on:b},(0,_render.renderTitle)(e,t,i)):null,e("div",{class:["vxe-form--item-content",y?"align--".concat(y):null]},F.concat([p?e("div",{class:"vxe-form--item-trigger-node",on:{click:t.toggleCollapseEvent}},[e("span",{class:"vxe-form--item-trigger-text"},s?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),e("i",{class:["vxe-form--item-trigger-icon",s?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})]):null,_&&u.showMessage?e("div",{class:"vxe-form--item-valid",style:_.maxWidth?{width:"".concat(_.maxWidth,"px")}:null},_.message):null]))])])},_default={name:"VxeFormItem",props:props,inject:{$xeform:{default:null},$xeformgather:{default:null}},provide:function(){return{$xeformitem:this,$xeformiteminfo:this}},data:function(){return{itemConfig:null}},watch:watch,mounted:function(){(0,_util.assemItem)(this)},created:function(){this.itemConfig=(0,_util.createItem)(this.$xeform,this)},destroyed:function(){(0,_util.destroyItem)(this)},render:function(e){var t=this.$xeform;return t&&t.customLayout?renderItem(e,t,this.itemConfig,this.$scopedSlots):e("div")}};exports.default=_default;

package/lib/form/src/form.js

@@ -545,7 +545,7 @@ var _default2 = {
         itemList.forEach(function (item) {
           var field = item.field;
 
-          if (field) {
+          if (field && !(0, _util.isHiddenItem)(_this6, item) && (0, _util.isActivetem)(_this6, item)) {
             itemValids.push(_this6.validItemRules(type || 'all', field).then(function () {
               item.errRule = null;
             }).catch(function (_ref2) {
@@ -741,7 +741,7 @@ var _default2 = {
       var _this9 = this;
 
       if (field) {
-        return this.validItemRules(evnt ? evnt.type : 'all', field, itemValue).then(function () {
+        return this.validItemRules(evnt ? ['blur'].includes(evnt.type) ? 'blur' : 'change' : 'all', field, itemValue).then(function () {
           _this9.clearValidate(field);
         }).catch(function (_ref3) {
           var rule = _ref3.rule;

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

@@ -1 +1 @@
-"use strict";function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_size=_interopRequireDefault(require("../../mixins/size")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_utils=require("../../tools/utils"),_dom=_interopRequireWildcard(require("../../tools/dom")),_util=require("./util"),_log=require("../../tools/log"),_formConfigItem=_interopRequireDefault(require("./form-config-item")),_index=_interopRequireDefault(require("../../loading/index"));function _getRequireWildcardCache(e){if("function"!=typeof WeakMap)return null;var t=new WeakMap,i=new WeakMap;return(_getRequireWildcardCache=function(e){return e?i:t})(e)}function _interopRequireWildcard(e,t){if(!t&&e&&e.__esModule)return e;if(null===e||"object"!==_typeof(e)&&"function"!=typeof e)return{default:e};t=_getRequireWildcardCache(t);if(t&&t.has(e))return t.get(e);var i,r,n={},o=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(i in e)"default"!==i&&Object.prototype.hasOwnProperty.call(e,i)&&((r=o?Object.getOwnPropertyDescriptor(e,i):null)&&(r.get||r.set)?Object.defineProperty(n,i,r):n[i]=e[i]);return n.default=e,t&&t.set(e,n),n}function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,t,i){return t in e?Object.defineProperty(e,t,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[t]=i,e}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var i=0;i<t.length;i++){var r=t[i];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function _createClass(e,t,i){return t&&_defineProperties(e.prototype,t),i&&_defineProperties(e,i),e}var Rule=function(){function t(e){_classCallCheck(this,t),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 _createClass(t,[{key:"content",get:function(){return(0,_utils.getFuncText)(this.$options.content||this.$options.message)}},{key:"message",get:function(){return this.content}}]),t}();function validErrorRuleValue(e,t){var i=e.type,r=e.min,n=e.max,o=e.pattern,e="number"===i,i=e?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!e||!isNaN(t))||(!_xeUtils.default.eqNull(r)&&i<_xeUtils.default.toNumber(r)||(!_xeUtils.default.eqNull(n)&&i>_xeUtils.default.toNumber(n)||!(!o||(_xeUtils.default.isRegExp(o)?o:new RegExp(o)).test(t))))}function getResetValue(e,t){return t=_xeUtils.default.isArray(e)?[]:t}var _default2={name:"VxeForm",mixins:[_size.default],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}}},data:function(){return{collapseAll:this.collapseStatus,staticItems:[],formItems:[],tooltipTimeout:null,tooltipStore:{item:null,visible:!1}}},provide:function(){return{$xeform:this,$xeformgather:null,$xeformitem:null,$xeformiteminfo:null}},computed:{validOpts:function(){return Object.assign({},_conf.default.form.validConfig,this.validConfig)},tooltipOpts:function(){return Object.assign({},_conf.default.tooltip,_conf.default.form.tooltipConfig,this.tooltipConfig)}},watch:{staticItems:function(e){this.formItems=e},items:function(e){this.loadItem(e)},collapseStatus:function(e){this.collapseAll=!!e}},created:function(){var t=this;this.$nextTick(function(){var e=t.items;"development"===process.env.NODE_ENV&&t.customLayout&&t.items&&(0,_log.errLog)("vxe.error.errConflicts",["custom-layout","items"]),e&&t.loadItem(e)})},render:function(i){var e=this._e,t=this.loading,r=this.className,n=this.data,o=this.vSize,l=this.tooltipOpts,a=this.formItems,s=this.customLayout,u=_vXETable.default._tooltip,f=this.$scopedSlots.default;return i("form",{class:["vxe-form",r?_xeUtils.default.isFunction(r)?r({items:a,data:n,$form:this}):r:"",(_defineProperty(r={},"size--".concat(o),o),_defineProperty(r,"is--loading",t),r)],on:{submit:this.submitEvent,reset:this.resetEvent}},[i("div",{class:"vxe-form--wrapper vxe-row"},s?f?f.call(this,i,{}):[]:a.map(function(e,t){return i(_formConfigItem.default,{key:t,props:{itemConfig:e}})})),i("div",{class:"vxe-form-slots",ref:"hideItem"},!s&&f?f.call(this,i,{}):[]),i(_index.default,{class:"vxe-form--loading",props:{loading:t}}),u?i("vxe-tooltip",{ref:"tooltip",props:l}):e()])},methods:{callSlot:function(e,t,i){if(e){var r=this.$scopedSlots;if(_xeUtils.default.isString(e)&&(e=r[e]||null),_xeUtils.default.isFunction(e))return e.call(this,t,i)}return[]},loadItem:function(e){var t,i=this;return"development"===process.env.NODE_ENV&&(t=this.$scopedSlots,e.forEach(function(e){e.slots&&_xeUtils.default.each(e.slots,function(e){_xeUtils.default.isFunction(e)||t[e]||(0,_log.errLog)("vxe.error.notSlot",[e])})})),this.staticItems=_xeUtils.default.mapTree(e,function(e){return(0,_util.createItem)(i,e)},{children:"children"}),this.$nextTick()},getItems:function(){var t=[];return _xeUtils.default.eachTree(this.formItems,function(e){t.push(e)},{children:"children"}),t},getItemByField:function(t){var e=_xeUtils.default.findTree(this.formItems,function(e){return e.field===t},{children:"children"});return e?e.item:null},toggleCollapse:function(){var e=!this.collapseAll;return this.collapseAll=e,this.$emit("update:collapseStatus",e),this.$nextTick()},toggleCollapseEvent:function(e){this.toggleCollapse();var t=this.collapseAll;this.$emit("toggle-collapse",{status:t,collapse:t,data:this.data,$form:this,$event:e},e),this.$emit("collapse",{status:t,collapse:t,data:this.data,$form:this,$event:e},e)},submitEvent:function(t){var i=this;t.preventDefault(),this.preventSubmit||(this.clearValidate(),this.beginValidate(this.getItems()).then(function(e){e?i.$emit("submit-invalid",{data:i.data,errMap:e,$form:i,$event:t}):i.$emit("submit",{data:i.data,$event:t})}))},reset:function(){var n=this,o=this.data;return o&&this.getItems().forEach(function(e){var t=e.field,i=e.resetValue,r=e.itemRender;(0,_utils.isEnableConf)(r)&&((r=_vXETable.default.renderer.get(r.name))&&r.itemResetMethod?r.itemResetMethod({data:o,field:t,property:t,item:e,$form:n}):t&&_xeUtils.default.set(o,t,null===i?getResetValue(_xeUtils.default.get(o,t),void 0):i))}),this.clearValidate()},resetEvent:function(e){e.preventDefault(),this.reset(),this.$emit("reset",{data:this.data,$form:this,$event:e})},closeTooltip:function(){var e=this.tooltipStore,t=this.$refs.tooltip;return e.visible&&(Object.assign(e,{item:null,visible:!1}),t&&t.close()),this.$nextTick()},triggerTitleTipEvent:function(e,t){var i=t.item,r=this.tooltipStore,n=this.$refs.tooltip,o=e.currentTarget.children[0],t=(o.textContent||"").trim(),e=o.scrollWidth>o.clientWidth;clearTimeout(this.tooltipTimeout),r.item!==i&&this.closeTooltip(),t&&e&&(Object.assign(r,{item:i,visible:!0}),n&&n.open(o,t))},handleTitleTipLeaveEvent:function(){var e=this,t=this.tooltipOpts,i=this.$refs.tooltip;i&&i.setActived(!1),t.enterable?this.tooltipTimeout=setTimeout(function(){(i=e.$refs.tooltip)&&!i.isActived()&&e.closeTooltip()},t.leaveDelay):this.closeTooltip()},clearValidate:function(e){return e?(e=(0,_util.handleFieldOrItem)(this,e))&&(e.showError=!1):this.getItems().forEach(function(e){e.showError=!1}),this.$nextTick()},validate:function(e){return this.clearValidate(),this.beginValidate(this.getItems(),"",e)},validateField:function(e,t){e=(0,_util.handleFieldOrItem)(this,e);return this.beginValidate(e?[e]:[],"",t)},beginValidate:function(t,e,i){var n=this,o=this.data,r=this.rules,l=this.validOpts,a={},s=[],u=[];return clearTimeout(this.showErrTime),o&&r?(t.forEach(function(i){var r=i.field;r&&u.push(n.validItemRules(e||"all",r).then(function(){i.errRule=null}).catch(function(e){var t=e.rule,e={rule:t,rules:e.rules,data:o,field:r,property:r,$form:n};return a[r]||(a[r]=[]),a[r].push(e),s.push(r),i.errRule=t,Promise.reject(e)}))}),Promise.all(u).then(function(){i&&i()}).catch(function(){return new Promise(function(e){n.showErrTime=setTimeout(function(){t.forEach(function(e){e.errRule&&(e.showError=!0)})},20),l.autoPos&&n.$nextTick(function(){n.handleFocus(s)}),i?(i(a),e()):e(a)})})):(i&&i(),Promise.resolve())},validItemRules:function(o,l,e){var a,s,u=this,f=this.data,t=this.rules,c=[],d=[];return l&&t&&((a=_xeUtils.default.get(t,l))&&(s=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(f,l):e,a.forEach(function(t){var e,i=t.type,r=t.trigger,n=t.required;"all"!==o&&r&&o!==t.trigger||(_xeUtils.default.isFunction(t.validator)?(e=t.validator({itemValue:s,rule:t,rules:a,data:f,field:l,property:l,$form:u}))&&(_xeUtils.default.isError(e)?c.push(new Rule({type:"custom",trigger:r,content:e.message,rule:new Rule(t)})):e.catch&&d.push(e.catch(function(e){c.push(new Rule({type:"custom",trigger:r,content:e?e.message:t.content||t.message,rule:new Rule(t)}))}))):(i="array"===i||_xeUtils.default.isArray(s)?!_xeUtils.default.isArray(s)||!s.length:(0,_utils.eqEmptyValue)(s),(n?i||validErrorRuleValue(t,s):!i&&validErrorRuleValue(t,s))&&c.push(new Rule(t))))}))),Promise.all(d).then(function(){if(c.length){var e={rules:c,rule:c[0]};return Promise.reject(e)}})},handleFocus:function(e){var o=this,l=this.$el;e.some(function(e,t){var i=o.getItemByField(e);if(i&&(0,_utils.isEnableConf)(i.itemRender)){var r,n=i.itemRender,e=_vXETable.default.renderer.get(n.name);if(t||_dom.default.scrollToView(l.querySelector(".".concat(i.id))),r=!(r=n.autofocus?l.querySelector(".".concat(i.id," ").concat(n.autofocus)):r)&&e&&e.autofocus?l.querySelector(".".concat(i.id," ").concat(e.autofocus)):r)return r.focus(),_dom.browse.msie&&((r=r.createTextRange()).collapse(!1),r.select()),!0}})},triggerItemEvent:function(e,i,t){var r=this;return i?this.validItemRules(e?e.type:"all",i,t).then(function(){r.clearValidate(i)}).catch(function(e){var t=e.rule,e=r.getItemByField(i);e&&(e.showError=!0,e.errRule=t)}):this.$nextTick()},updateStatus:function(e,t){e=e.field;return this.triggerItemEvent(new Event("change"),e,t)}}};exports.default=_default2;
+"use strict";function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_size=_interopRequireDefault(require("../../mixins/size")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_utils=require("../../tools/utils"),_dom=_interopRequireWildcard(require("../../tools/dom")),_util=require("./util"),_log=require("../../tools/log"),_formConfigItem=_interopRequireDefault(require("./form-config-item")),_index=_interopRequireDefault(require("../../loading/index"));function _getRequireWildcardCache(e){if("function"!=typeof WeakMap)return null;var t=new WeakMap,i=new WeakMap;return(_getRequireWildcardCache=function(e){return e?i:t})(e)}function _interopRequireWildcard(e,t){if(!t&&e&&e.__esModule)return e;if(null===e||"object"!==_typeof(e)&&"function"!=typeof e)return{default:e};t=_getRequireWildcardCache(t);if(t&&t.has(e))return t.get(e);var i,r,n={},o=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(i in e)"default"!==i&&Object.prototype.hasOwnProperty.call(e,i)&&((r=o?Object.getOwnPropertyDescriptor(e,i):null)&&(r.get||r.set)?Object.defineProperty(n,i,r):n[i]=e[i]);return n.default=e,t&&t.set(e,n),n}function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,t,i){return t in e?Object.defineProperty(e,t,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[t]=i,e}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var i=0;i<t.length;i++){var r=t[i];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function _createClass(e,t,i){return t&&_defineProperties(e.prototype,t),i&&_defineProperties(e,i),e}var Rule=function(){function t(e){_classCallCheck(this,t),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 _createClass(t,[{key:"content",get:function(){return(0,_utils.getFuncText)(this.$options.content||this.$options.message)}},{key:"message",get:function(){return this.content}}]),t}();function validErrorRuleValue(e,t){var i=e.type,r=e.min,n=e.max,o=e.pattern,e="number"===i,i=e?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!e||!isNaN(t))||(!_xeUtils.default.eqNull(r)&&i<_xeUtils.default.toNumber(r)||(!_xeUtils.default.eqNull(n)&&i>_xeUtils.default.toNumber(n)||!(!o||(_xeUtils.default.isRegExp(o)?o:new RegExp(o)).test(t))))}function getResetValue(e,t){return t=_xeUtils.default.isArray(e)?[]:t}var _default2={name:"VxeForm",mixins:[_size.default],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}}},data:function(){return{collapseAll:this.collapseStatus,staticItems:[],formItems:[],tooltipTimeout:null,tooltipStore:{item:null,visible:!1}}},provide:function(){return{$xeform:this,$xeformgather:null,$xeformitem:null,$xeformiteminfo:null}},computed:{validOpts:function(){return Object.assign({},_conf.default.form.validConfig,this.validConfig)},tooltipOpts:function(){return Object.assign({},_conf.default.tooltip,_conf.default.form.tooltipConfig,this.tooltipConfig)}},watch:{staticItems:function(e){this.formItems=e},items:function(e){this.loadItem(e)},collapseStatus:function(e){this.collapseAll=!!e}},created:function(){var t=this;this.$nextTick(function(){var e=t.items;"development"===process.env.NODE_ENV&&t.customLayout&&t.items&&(0,_log.errLog)("vxe.error.errConflicts",["custom-layout","items"]),e&&t.loadItem(e)})},render:function(i){var e=this._e,t=this.loading,r=this.className,n=this.data,o=this.vSize,l=this.tooltipOpts,a=this.formItems,u=this.customLayout,s=_vXETable.default._tooltip,f=this.$scopedSlots.default;return i("form",{class:["vxe-form",r?_xeUtils.default.isFunction(r)?r({items:a,data:n,$form:this}):r:"",(_defineProperty(r={},"size--".concat(o),o),_defineProperty(r,"is--loading",t),r)],on:{submit:this.submitEvent,reset:this.resetEvent}},[i("div",{class:"vxe-form--wrapper vxe-row"},u?f?f.call(this,i,{}):[]:a.map(function(e,t){return i(_formConfigItem.default,{key:t,props:{itemConfig:e}})})),i("div",{class:"vxe-form-slots",ref:"hideItem"},!u&&f?f.call(this,i,{}):[]),i(_index.default,{class:"vxe-form--loading",props:{loading:t}}),s?i("vxe-tooltip",{ref:"tooltip",props:l}):e()])},methods:{callSlot:function(e,t,i){if(e){var r=this.$scopedSlots;if(_xeUtils.default.isString(e)&&(e=r[e]||null),_xeUtils.default.isFunction(e))return e.call(this,t,i)}return[]},loadItem:function(e){var t,i=this;return"development"===process.env.NODE_ENV&&(t=this.$scopedSlots,e.forEach(function(e){e.slots&&_xeUtils.default.each(e.slots,function(e){_xeUtils.default.isFunction(e)||t[e]||(0,_log.errLog)("vxe.error.notSlot",[e])})})),this.staticItems=_xeUtils.default.mapTree(e,function(e){return(0,_util.createItem)(i,e)},{children:"children"}),this.$nextTick()},getItems:function(){var t=[];return _xeUtils.default.eachTree(this.formItems,function(e){t.push(e)},{children:"children"}),t},getItemByField:function(t){var e=_xeUtils.default.findTree(this.formItems,function(e){return e.field===t},{children:"children"});return e?e.item:null},toggleCollapse:function(){var e=!this.collapseAll;return this.collapseAll=e,this.$emit("update:collapseStatus",e),this.$nextTick()},toggleCollapseEvent:function(e){this.toggleCollapse();var t=this.collapseAll;this.$emit("toggle-collapse",{status:t,collapse:t,data:this.data,$form:this,$event:e},e),this.$emit("collapse",{status:t,collapse:t,data:this.data,$form:this,$event:e},e)},submitEvent:function(t){var i=this;t.preventDefault(),this.preventSubmit||(this.clearValidate(),this.beginValidate(this.getItems()).then(function(e){e?i.$emit("submit-invalid",{data:i.data,errMap:e,$form:i,$event:t}):i.$emit("submit",{data:i.data,$event:t})}))},reset:function(){var n=this,o=this.data;return o&&this.getItems().forEach(function(e){var t=e.field,i=e.resetValue,r=e.itemRender;(0,_utils.isEnableConf)(r)&&((r=_vXETable.default.renderer.get(r.name))&&r.itemResetMethod?r.itemResetMethod({data:o,field:t,property:t,item:e,$form:n}):t&&_xeUtils.default.set(o,t,null===i?getResetValue(_xeUtils.default.get(o,t),void 0):i))}),this.clearValidate()},resetEvent:function(e){e.preventDefault(),this.reset(),this.$emit("reset",{data:this.data,$form:this,$event:e})},closeTooltip:function(){var e=this.tooltipStore,t=this.$refs.tooltip;return e.visible&&(Object.assign(e,{item:null,visible:!1}),t&&t.close()),this.$nextTick()},triggerTitleTipEvent:function(e,t){var i=t.item,r=this.tooltipStore,n=this.$refs.tooltip,o=e.currentTarget.children[0],t=(o.textContent||"").trim(),e=o.scrollWidth>o.clientWidth;clearTimeout(this.tooltipTimeout),r.item!==i&&this.closeTooltip(),t&&e&&(Object.assign(r,{item:i,visible:!0}),n&&n.open(o,t))},handleTitleTipLeaveEvent:function(){var e=this,t=this.tooltipOpts,i=this.$refs.tooltip;i&&i.setActived(!1),t.enterable?this.tooltipTimeout=setTimeout(function(){(i=e.$refs.tooltip)&&!i.isActived()&&e.closeTooltip()},t.leaveDelay):this.closeTooltip()},clearValidate:function(e){return e?(e=(0,_util.handleFieldOrItem)(this,e))&&(e.showError=!1):this.getItems().forEach(function(e){e.showError=!1}),this.$nextTick()},validate:function(e){return this.clearValidate(),this.beginValidate(this.getItems(),"",e)},validateField:function(e,t){e=(0,_util.handleFieldOrItem)(this,e);return this.beginValidate(e?[e]:[],"",t)},beginValidate:function(t,e,i){var n=this,o=this.data,r=this.rules,l=this.validOpts,a={},u=[],s=[];return clearTimeout(this.showErrTime),o&&r?(t.forEach(function(i){var r=i.field;r&&!(0,_util.isHiddenItem)(n,i)&&(0,_util.isActivetem)(n,i)&&s.push(n.validItemRules(e||"all",r).then(function(){i.errRule=null}).catch(function(e){var t=e.rule,e={rule:t,rules:e.rules,data:o,field:r,property:r,$form:n};return a[r]||(a[r]=[]),a[r].push(e),u.push(r),i.errRule=t,Promise.reject(e)}))}),Promise.all(s).then(function(){i&&i()}).catch(function(){return new Promise(function(e){n.showErrTime=setTimeout(function(){t.forEach(function(e){e.errRule&&(e.showError=!0)})},20),l.autoPos&&n.$nextTick(function(){n.handleFocus(u)}),i?(i(a),e()):e(a)})})):(i&&i(),Promise.resolve())},validItemRules:function(o,l,e){var a,u,s=this,f=this.data,t=this.rules,c=[],d=[];return l&&t&&((a=_xeUtils.default.get(t,l))&&(u=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(f,l):e,a.forEach(function(t){var e,i=t.type,r=t.trigger,n=t.required;"all"!==o&&r&&o!==t.trigger||(_xeUtils.default.isFunction(t.validator)?(e=t.validator({itemValue:u,rule:t,rules:a,data:f,field:l,property:l,$form:s}))&&(_xeUtils.default.isError(e)?c.push(new Rule({type:"custom",trigger:r,content:e.message,rule:new Rule(t)})):e.catch&&d.push(e.catch(function(e){c.push(new Rule({type:"custom",trigger:r,content:e?e.message:t.content||t.message,rule:new Rule(t)}))}))):(i="array"===i||_xeUtils.default.isArray(u)?!_xeUtils.default.isArray(u)||!u.length:(0,_utils.eqEmptyValue)(u),(n?i||validErrorRuleValue(t,u):!i&&validErrorRuleValue(t,u))&&c.push(new Rule(t))))}))),Promise.all(d).then(function(){if(c.length){var e={rules:c,rule:c[0]};return Promise.reject(e)}})},handleFocus:function(e){var o=this,l=this.$el;e.some(function(e,t){var i=o.getItemByField(e);if(i&&(0,_utils.isEnableConf)(i.itemRender)){var r,n=i.itemRender,e=_vXETable.default.renderer.get(n.name);if(t||_dom.default.scrollToView(l.querySelector(".".concat(i.id))),r=!(r=n.autofocus?l.querySelector(".".concat(i.id," ").concat(n.autofocus)):r)&&e&&e.autofocus?l.querySelector(".".concat(i.id," ").concat(e.autofocus)):r)return r.focus(),_dom.browse.msie&&((r=r.createTextRange()).collapse(!1),r.select()),!0}})},triggerItemEvent:function(e,i,t){var r=this;return i?this.validItemRules(e?["blur"].includes(e.type)?"blur":"change":"all",i,t).then(function(){r.clearValidate(i)}).catch(function(e){var t=e.rule,e=r.getItemByField(i);e&&(e.showError=!0,e.errRule=t)}):this.$nextTick()},updateStatus:function(e,t){e=e.field;return this.triggerItemEvent(new Event("change"),e,t)}}};exports.default=_default2;

package/lib/form/src/util.js

@@ -8,6 +8,8 @@ exports.createItem = createItem;
 exports.destroyItem = destroyItem;
 exports.getItemConfig = getItemConfig;
 exports.handleFieldOrItem = void 0;
+exports.isActivetem = isActivetem;
+exports.isHiddenItem = isHiddenItem;
 exports.isItem = isItem;
 
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
@@ -16,6 +18,8 @@ var _vXETable = _interopRequireDefault(require("../../v-x-e-table"));
 
 var _log = require("../../tools/log");
 
+var _utils = require("../../tools/utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -92,6 +96,43 @@ var handleFieldOrItem = function handleFieldOrItem($xeform, fieldOrItem) {
 
 exports.handleFieldOrItem = handleFieldOrItem;
 
+function isHiddenItem($xeform, formItem) {
+  var collapseAll = $xeform.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.default.renderer.get(itemRender.name) : null;
+
+  if (!visibleMethod && compConf && compConf.itemVisibleMethod) {
+    visibleMethod = compConf.itemVisibleMethod;
+  }
+
+  if (!visibleMethod) {
+    return true;
+  }
+
+  var data = $xeform.data;
+  return visibleMethod({
+    data: data,
+    field: field,
+    property: field,
+    item: formItem,
+    $form: $xeform
+  });
+}
+
 function createItem($xeform, _vm) {
   return getItemConfig($xeform, _vm);
 }

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.getItemConfig=getItemConfig,exports.handleFieldOrItem=void 0,exports.isItem=isItem;var _xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var i=0;i<t.length;i++){var r=t[i];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function _createClass(e,t,i){return t&&_defineProperties(e.prototype,t),i&&_defineProperties(e,i),e}var ItemConfig=function(){function i(e,t){_classCallCheck(this,i),Object.assign(this,{id:_xeUtils.default.uniqueId("item_"),title:t.title,field:t.field,span:t.span,align:t.align,titleAlign:t.titleAlign,titleWidth:t.titleWidth,titleColon:t.titleColon,titleAsterisk:t.titleAsterisk,titlePrefix:t.titlePrefix,titleSuffix:t.titleSuffix,titleOverflow:t.titleOverflow,resetValue:t.resetValue,visible:t.visible,visibleMethod:t.visibleMethod,folding:t.folding,collapseNode:t.collapseNode,className:t.className,itemRender:t.itemRender,showError:!1,errRule:null,slots:t.slots,children:[]}),"development"!==process.env.NODE_ENV||(t=t.itemRender?_vXETable.default.renderer.get(t.itemRender.name):null)&&!t.renderItemContent&&t.renderItem&&(0,_log.warnLog)("vxe.error.delProp",["item-render.renderItem","item-render.renderItemContent"])}return _createClass(i,[{key:"update",value:function(e,t){this[e]=t}}]),i}();function isItem(e){return e instanceof ItemConfig}function getItemConfig(e,t,i){return isItem(t)?t:new ItemConfig(e,t,i)}var handleFieldOrItem=function(e,t){return t?_xeUtils.default.isString(t)?e.getItemByField(t):t:null};function createItem(e,t){return getItemConfig(e,t)}function destroyItem(e){var t=e.$xeform,i=e.itemConfig,t=_xeUtils.default.findTree(t.staticItems,function(e){return e===i});t&&t.items.splice(t.index,1)}function assemItem(e){var t=e.$el,i=e.$xeform,r=e.$xeformgather,l=e.itemConfig,n=r?r.itemConfig:null;l.slots=e.$scopedSlots,n?(n.children||(n.children=[]),n.children.splice([].indexOf.call(r.$el.children,t),0,l)):i.staticItems.splice([].indexOf.call(i.$refs.hideItem.children,t),0,l)}exports.handleFieldOrItem=handleFieldOrItem;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.assemItem=assemItem,exports.createItem=createItem,exports.destroyItem=destroyItem,exports.getItemConfig=getItemConfig,exports.handleFieldOrItem=void 0,exports.isActivetem=isActivetem,exports.isHiddenItem=isHiddenItem,exports.isItem=isItem;var _xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_log=require("../../tools/log"),_utils=require("../../tools/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var i=0;i<t.length;i++){var r=t[i];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function _createClass(e,t,i){return t&&_defineProperties(e.prototype,t),i&&_defineProperties(e,i),e}var ItemConfig=function(){function i(e,t){_classCallCheck(this,i),Object.assign(this,{id:_xeUtils.default.uniqueId("item_"),title:t.title,field:t.field,span:t.span,align:t.align,titleAlign:t.titleAlign,titleWidth:t.titleWidth,titleColon:t.titleColon,titleAsterisk:t.titleAsterisk,titlePrefix:t.titlePrefix,titleSuffix:t.titleSuffix,titleOverflow:t.titleOverflow,resetValue:t.resetValue,visible:t.visible,visibleMethod:t.visibleMethod,folding:t.folding,collapseNode:t.collapseNode,className:t.className,itemRender:t.itemRender,showError:!1,errRule:null,slots:t.slots,children:[]}),"development"!==process.env.NODE_ENV||(t=t.itemRender?_vXETable.default.renderer.get(t.itemRender.name):null)&&!t.renderItemContent&&t.renderItem&&(0,_log.warnLog)("vxe.error.delProp",["item-render.renderItem","item-render.renderItemContent"])}return _createClass(i,[{key:"update",value:function(e,t){this[e]=t}}]),i}();function isItem(e){return e instanceof ItemConfig}function getItemConfig(e,t,i){return isItem(t)?t:new ItemConfig(e,t,i)}var handleFieldOrItem=function(e,t){return t?_xeUtils.default.isString(t)?e.getItemByField(t):t:null};function isHiddenItem(e,t){var i=e.collapseAll,e=t.folding;return!1===t.visible||e&&i}function isActivetem(e,t){var i=t.visibleMethod,r=t.itemRender,l=t.visible,n=t.field;if(!1===l)return l;r=(0,_utils.isEnableConf)(r)?_vXETable.default.renderer.get(r.name):null;return!(i=!i&&r&&r.itemVisibleMethod?r.itemVisibleMethod:i)||i({data:e.data,field:n,property:n,item:t,$form:e})}function createItem(e,t){return getItemConfig(e,t)}function destroyItem(e){var t=e.$xeform,i=e.itemConfig,t=_xeUtils.default.findTree(t.staticItems,function(e){return e===i});t&&t.items.splice(t.index,1)}function assemItem(e){var t=e.$el,i=e.$xeform,r=e.$xeformgather,l=e.itemConfig,n=r?r.itemConfig:null;l.slots=e.$scopedSlots,n?(n.children||(n.children=[]),n.children.splice([].indexOf.call(r.$el.children,t),0,l)):i.staticItems.splice([].indexOf.call(i.$refs.hideItem.children,t),0,l)}exports.handleFieldOrItem=handleFieldOrItem;

package/lib/index.umd.js

@@ -8808,7 +8808,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.5.9-beta.11", "] ").concat(src_conf.i18n(message, params));
+  return "[vxe-table v".concat("3.5.9-beta.13", "] ").concat(src_conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10089,7 +10089,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.5.9-beta.11",
+  version: "3.5.9-beta.13",
   reg: reg,
   use: use,
   setup: setup,
@@ -36821,6 +36821,7 @@ var Tooltip = Object.assign(tooltip, {
 
 
 
+
 var util_ItemConfig = /*#__PURE__*/function () {
   function ItemConfig($xeform, item) {
     _classCallCheck(this, ItemConfig);
@@ -36878,6 +36879,41 @@ var util_handleFieldOrItem = function handleFieldOrItem($xeform, fieldOrItem) {
 
   return null;
 };
+function isHiddenItem($xeform, formItem) {
+  var collapseAll = $xeform.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 = isEnableConf(itemRender) ? v_x_e_table.renderer.get(itemRender.name) : null;
+
+  if (!visibleMethod && compConf && compConf.itemVisibleMethod) {
+    visibleMethod = compConf.itemVisibleMethod;
+  }
+
+  if (!visibleMethod) {
+    return true;
+  }
+
+  var data = $xeform.data;
+  return visibleMethod({
+    data: data,
+    field: field,
+    property: field,
+    item: formItem,
+    $form: $xeform
+  });
+}
 function createItem($xeform, _vm) {
   return getItemConfig($xeform, _vm);
 }
@@ -36990,6 +37026,7 @@ function renderTitle(h, _vm, item) {
 
 
 
+
 /**
  * 配置式项
  */
@@ -37007,9 +37044,7 @@ var VxeFormConfigItem = {
   provide: function provide() {
     return {
       $xeformgather: null,
-      $xeformiteminfo: {
-        itemConfig: this.itemConfig
-      }
+      $xeformiteminfo: this
     };
   },
   render: function render(h) {
@@ -37029,7 +37064,6 @@ var VxeFormConfigItem = {
         title = item.title,
         folding = item.folding,
         visible = item.visible,
-        visibleMethod = item.visibleMethod,
         field = item.field,
         collapseNode = item.collapseNode,
         itemRender = item.itemRender,
@@ -37046,7 +37080,6 @@ var VxeFormConfigItem = {
     var titleWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
     var titleColon = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleColon) ? allTitleColon : item.titleColon;
     var titleAsterisk = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk;
-    var itemVisibleMethod = visibleMethod;
     var itemOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isUndefined(titleOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isNull(titleOverflow) ? allTitleOverflow : titleOverflow;
     var showEllipsis = itemOverflow === 'ellipsis';
     var showTitle = itemOverflow === 'title';
@@ -37082,10 +37115,6 @@ var VxeFormConfigItem = {
       }, childVNs) : _e();
     }
 
-    if (!itemVisibleMethod && compConf && compConf.itemVisibleMethod) {
-      itemVisibleMethod = compConf.itemVisibleMethod;
-    }
-
     if (rules) {
       var itemRules = rules[field];
 
@@ -37115,13 +37144,13 @@ var VxeFormConfigItem = {
       mouseleave: $xeform.handleTitleTipLeaveEvent
     } : {};
     return h('div', {
-      class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : null, className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(className) ? className(params) : className : '', itemClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(itemClassName) ? itemClassName(params) : className : '', {
+      class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : null, className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(className) ? className(params) : className : '', itemClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(itemClassName) ? itemClassName(params) : itemClassName : '', {
         'is--title': title,
         'is--colon': titleColon,
         'is--asterisk': titleAsterisk,
         'is--required': isRequired,
         'is--hidden': folding && collapseAll,
-        'is--active': !itemVisibleMethod || itemVisibleMethod(params),
+        'is--active': isActivetem(this, item),
         'is--error': showError
       }],
       props: {
@@ -37189,6 +37218,7 @@ var VxeFormConfigItem = {
 
 
 
+
 
 
 var form_Rule = /*#__PURE__*/function () {
@@ -37675,7 +37705,7 @@ function getResetValue(value, resetValue) {
         itemList.forEach(function (item) {
           var field = item.field;
 
-          if (field) {
+          if (field && !isHiddenItem(_this6, item) && isActivetem(_this6, item)) {
             itemValids.push(_this6.validItemRules(type || 'all', field).then(function () {
               item.errRule = null;
             }).catch(function (_ref2) {
@@ -37869,7 +37899,7 @@ function getResetValue(value, resetValue) {
       var _this9 = this;
 
       if (field) {
-        return this.validItemRules(evnt ? evnt.type : 'all', field, itemValue).then(function () {
+        return this.validItemRules(evnt ? ['blur'].includes(evnt.type) ? 'blur' : 'change' : 'all', field, itemValue).then(function () {
           _this9.clearValidate(field);
         }).catch(function (_ref3) {
           var rule = _ref3.rule;
@@ -37962,7 +37992,8 @@ Object.keys(form_item_props).forEach(function (name) {
 });
 
 var form_item_renderItem = function renderItem(h, _vm, item, slots) {
-  var rules = _vm.rules,
+  var _e = _vm._e,
+      rules = _vm.rules,
       data = _vm.data,
       collapseAll = _vm.collapseAll,
       validOpts = _vm.validOpts,
@@ -37970,7 +38001,6 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
   var title = item.title,
       folding = item.folding,
       visible = item.visible,
-      visibleMethod = item.visibleMethod,
       field = item.field,
       collapseNode = item.collapseNode,
       itemRender = item.itemRender,
@@ -37984,7 +38014,6 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
   var align = item.align || _vm.align;
   var titleAlign = item.titleAlign || _vm.titleAlign;
   var titleWidth = item.titleWidth || _vm.titleWidth;
-  var itemVisibleMethod = visibleMethod;
   var itemOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isUndefined(titleOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isNull(titleOverflow) ? allTitleOverflow : titleOverflow;
   var showEllipsis = itemOverflow === 'ellipsis';
   var showTitle = itemOverflow === 'title';
@@ -37999,8 +38028,8 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
   };
   var isRequired;
 
-  if (!itemVisibleMethod && compConf && compConf.itemVisibleMethod) {
-    itemVisibleMethod = compConf.itemVisibleMethod;
+  if (visible === false) {
+    return _e();
   }
 
   if (rules) {
@@ -38035,8 +38064,8 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
     class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(className) ? className(params) : className : '', itemClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.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': isActivetem(_vm, item),
       'is--error': showError
     }]
   }, [h('div', {
@@ -38085,9 +38114,7 @@ var form_item_renderItem = function renderItem(h, _vm, item, slots) {
   provide: function provide() {
     return {
       $xeformitem: this,
-      $xeformiteminfo: {
-        itemConfig: this.itemConfig
-      }
+      $xeformiteminfo: this
     };
   },
   data: function data() {
@@ -38130,9 +38157,7 @@ var FormItem = Object.assign(form_item, {
     return {
       $xeformgather: this,
       xeformitem: null,
-      $xeformiteminfo: {
-        itemConfig: this.itemConfig
-      }
+      $xeformiteminfo: this
     };
   },
   created: function created() {