vxe-pc-ui 3.14.21 → 3.14.22

package/es/form/src/form.js

@@ -530,7 +530,8 @@ export default {
                 const errorRules = [];
                 const syncVailds = [];
                 if (property && formRules) {
-                    const rules = XEUtils.get(formRules, property);
+                    const item = $xeForm.getItemByField(property);
+                    const rules = item && item.rules ? item.rules : XEUtils.get(formRules, property);
                     if (rules) {
                         const itemValue = XEUtils.isUndefined(val) ? XEUtils.get(data, property) : val;
                         rules.forEach((rule) => {

package/es/form/src/render.js

@@ -54,7 +54,7 @@ export function getItemClass($xeForm, item, isGroup) {
     let isRequired = false;
     let isValid = false;
     if (!readonly && rules) {
-        const itemRules = rules[field];
+        const itemRules = item.rules ? item.rules : rules[field];
         if (itemRules && itemRules.length) {
             isValid = true;
             isRequired = itemRules.some((rule) => rule.required);

package/es/tabs/src/tabs.js

@@ -134,7 +134,7 @@ export default {
                 stys.width = toCssUnit(width);
             }
             if (height) {
-                stys.height = toCssUnit(height);
+                stys.height = height === 'auto' ? '100%' : toCssUnit(height);
             }
             return stys;
         },

package/es/ui/index.js

@@ -1,7 +1,7 @@
 import { VxeUI, setConfig, setIcon } from '@vxe-ui/core';
 import { dynamicApp } from '../dynamics';
 import { warnLog } from './src/log';
-export const version = "3.14.21";
+export const version = "3.14.22";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 export function config(options) {

package/es/ui/src/log.js

@@ -1,4 +1,4 @@
 import { log } from '@vxe-ui/core';
-const version = `ui v${"3.14.21"}`;
+const version = `ui v${"3.14.22"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/form/src/form.js

@@ -626,7 +626,8 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
         var errorRules = [];
         var syncVailds = [];
         if (property && formRules) {
-          var rules = _xeUtils.default.get(formRules, property);
+          var item = $xeForm.getItemByField(property);
+          var rules = item && item.rules ? item.rules : _xeUtils.default.get(formRules, property);
           if (rules) {
             var itemValue = _xeUtils.default.isUndefined(val) ? _xeUtils.default.get(data, property) : val;
             rules.forEach(function (rule) {

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_util=require("./util"),_tooltip=_interopRequireDefault(require("../../tooltip")),_formConfigItem=_interopRequireDefault(require("./form-config-item")),_loading=_interopRequireDefault(require("../../loading")),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log");function _interopRequireDefault(t){return t&&t.__esModule?t:{default:t}}function _defineProperty(t,e,i){return(e=_toPropertyKey(e))in t?Object.defineProperty(t,e,{value:i,enumerable:!0,configurable:!0,writable:!0}):t[e]=i,t}function _typeof(t){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function _classCallCheck(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function _defineProperties(t,e){for(var i=0;i<e.length;i++){var r=e[i];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,_toPropertyKey(r.key),r)}}function _createClass(t,e,i){return e&&_defineProperties(t.prototype,e),i&&_defineProperties(t,i),Object.defineProperty(t,"prototype",{writable:!1}),t}function _toPropertyKey(t){t=_toPrimitive(t,"string");return"symbol"==_typeof(t)?t:t+""}function _toPrimitive(t,e){if("object"!=_typeof(t)||!t)return t;var i=t[Symbol.toPrimitive];if(void 0===i)return("string"===e?String:Number)(t);i=i.call(t,e||"default");if("object"!=_typeof(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}require("../render");var Rule=(()=>_createClass(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})},[{key:"content",get:function(){return(0,_utils.getFuncText)(this.$options.content||this.$options.message)}},{key:"message",get:function(){return this.content}}]))();function validREValue(t,e){return!(t&&!(_xeUtils.default.isRegExp(t)?t:new RegExp(t)).test(e))}function validMaxValue(t,e){return!(!_xeUtils.default.eqNull(t)&&e>_xeUtils.default.toNumber(t))}function validMinValue(t,e){return!(!_xeUtils.default.eqNull(t)&&e<_xeUtils.default.toNumber(t))}function validRuleValue(t,e,i){var r=t.type,n=t.min,l=t.max,t=t.pattern,a="array"===r,o="number"===r,r="string"===r,u="".concat(e);if(!validREValue(t,u))return!1;if(a){if(!_xeUtils.default.isArray(e))return!1;if(i&&!e.length)return!1;if(!validMinValue(n,e.length))return!1;if(!validMaxValue(l,e.length))return!1}else if(o){t=Number(e);if(isNaN(t))return!1;if(!validMinValue(n,t))return!1;if(!validMaxValue(l,t))return!1}else{if(r&&!_xeUtils.default.isString(e))return!1;if(i&&!u)return!1;if(!validMinValue(n,u.length))return!1;if(!validMaxValue(l,u.length))return!1}return!0}function checkRuleStatus(t,e,i){var r=t.required,n=t.field,e=n?_xeUtils.default.get(e,n):i,n=_xeUtils.default.isArray(e)?!e.length:(0,_utils.eqEmptyValue)(e);if(r){if(n)return!1;if(!validRuleValue(t,e,r))return!1}else if(!n&&!validRuleValue(t,e,r))return!1;return!0}function createInternalData(){return{meTimeout:void 0,stTimeout:void 0,tooltipStore:{item:null,visible:!1},itemFormatCache:{}}}var _default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeForm",mixins:[_ui.globalMixins.sizeMixin],props:{collapseStatus:{type:Boolean,default:!0},loading:Boolean,data:Object,size:{type:String,default:function(){return(0,_ui.getConfig)().form.size||(0,_ui.getConfig)().size}},span:{type:[String,Number],default:function(){return(0,_ui.getConfig)().form.span}},align:{type:String,default:function(){return(0,_ui.getConfig)().form.align}},verticalAlign:{type:String,default:function(){return(0,_ui.getConfig)().form.verticalAlign}},border:{type:Boolean,default:function(){return(0,_ui.getConfig)().form.border}},titleBackground:{type:Boolean,default:function(){return(0,_ui.getConfig)().form.titleBackground}},titleBold:{type:Boolean,default:function(){return(0,_ui.getConfig)().form.titleBold}},titleAlign:{type:String,default:function(){return(0,_ui.getConfig)().form.titleAlign}},titleWidth:{type:[String,Number],default:function(){return(0,_ui.getConfig)().form.titleWidth}},titleColon:{type:Boolean,default:function(){return(0,_ui.getConfig)().form.titleColon}},titleAsterisk:{type:Boolean,default:function(){return(0,_ui.getConfig)().form.titleAsterisk}},titleOverflow:{type:[Boolean,String],default:function(){return(0,_ui.getConfig)().form.titleOverflow}},vertical:{type:Boolean,default:function(){return(0,_ui.getConfig)().form.vertical}},padding:{type:Boolean,default:function(){return(0,_ui.getConfig)().form.padding}},className:[String,Function],readonly:Boolean,disabled:Boolean,items:Array,rules:Object,preventSubmit:{type:Boolean,default:function(){return(0,_ui.getConfig)().form.preventSubmit}},validConfig:Object,tooltipConfig:Object,collapseConfig:Object,customLayout:{type:Boolean,default:function(){return(0,_ui.getConfig)().form.customLayout}},params:Object},inject:{$xeGrid:{default:null}},provide:function(){return{$xeForm:this,xeFormItemInfo:null,$xeFormGroup:null,$xeFormItem:null}},data:function(){return{xID:_xeUtils.default.uniqueId(),reactData:{collapseAll:!1,staticItems:[],formItems:[],itemWidth:0},internalData:createInternalData(),recalcFlag:0}},computed:Object.assign(Object.assign({},{}),{computeValidOpts:function(){return Object.assign({},(0,_ui.getConfig)().form.validConfig,this.validConfig)},computeTooltipOpts:function(){return Object.assign({},(0,_ui.getConfig)().tooltip,(0,_ui.getConfig)().form.tooltipConfig,this.tooltipConfig)},computeCollapseOpts:function(){return Object.assign({},(0,_ui.getConfig)().form.collapseConfig,this.collapseConfig)},computeAutoItemWidthList:function(){var t=this.reactData,r=this.titleWidth,n=this.vertical,t=t.formItems,l=[];return _xeUtils.default.eachTree(t,function(t){var e=t.titleWidth,i=t.vertical;"auto"!==e&&("auto"!==((_xeUtils.default.eqNull(i)?n:i)?null:_xeUtils.default.eqNull(e)?r:e)||t.children&&t.children.length)||l.push(t)},{children:"children"}),l}}),methods:{dispatchEvent:function(t,e,i){this.$emit(t,(0,_ui.createEvent)(i,{$form:this},e))},callSlot:function(t,e,i){var r=this.$scopedSlots;return t&&(_xeUtils.default.isString(t)&&(t=r[t]||null),_xeUtils.default.isFunction(t))?(0,_vn.getSlotVNs)(t.call(this,e,i)):[]},loadItem:function(t){var e=this,i=e.$scopedSlots,r=e.reactData,n=e.internalData;return t.length&&t.forEach(function(t){t.slots&&_xeUtils.default.each(t.slots,function(t){_xeUtils.default.isFunction(t)||i[t]||(0,_log.errLog)("vxe.error.notSlot",["[form] ".concat(t)])})}),r.staticItems=_xeUtils.default.mapTree(t,function(t){return(0,_util.createItem)(e,t)},{children:"children"}),n.itemFormatCache={},e.$nextTick().then(function(){return e.recalculate()})},getItems:function(){var t=this.reactData,e=[];return _xeUtils.default.eachTree(t.formItems,function(t){e.push(t)},{children:"children"}),e},getItemByField:function(e){var t=this.reactData,t=_xeUtils.default.findTree(t.formItems,function(t){return t.field===e},{children:"children"});return t?t.item:null},getCollapseStatus:function(){return this.reactData.collapseAll},toggleCollapse:function(){var t=this.reactData,e=!this.getCollapseStatus();return t.collapseAll=e,this.$emit("update:collapseStatus",e),this.$nextTick()},toggleCollapseEvent:function(t){var e=this,i=e,r=e.$xeGrid,n=e.toggleCollapse(),l=e.getCollapseStatus();e.dispatchEvent("toggle-collapse",{status:l,collapse:l,data:i.data},t),e.dispatchEvent("collapse",{status:l,collapse:l,data:i.data},t),n.then(function(){e.recalculate().then(function(){r&&r.recalculate(!0)}),r&&r.recalculate()})},clearValidate:function(t){var e,i=this;return t?(e=_xeUtils.default.isArray(e=t)?e:[t]).forEach(function(t){t&&(t=(0,_util.handleFieldOrItem)(i,t))&&(t.showError=!1,t.showIconMsg=!1)}):i.getItems().forEach(function(t){t.showError=!1,t.showIconMsg=!1}),i.$nextTick()},getResetValue:function(t,e,i){var r=this.$xeGrid,n=t.field,l=t.resetValue;return _xeUtils.default.isFunction(l)?l({field:n,item:t,data:e,$form:this,$grid:r}):null===l&&_xeUtils.default.isArray(i)?[]:l},reset:function(){var a=this,o=a.$xeGrid,t=a.internalData,u=a.data,e=a.getItems();return u&&e.forEach(function(t){var e,i,r,n=t.field,l=t.itemRender;(0,_utils.isEnableConf)(l)&&(r=l.name,e=l.startField,l=l.endField,i=(r=_ui.renderer.get(r))?r.formItemResetMethod||r.itemResetMethod:null,r&&i?i({data:u,field:n,property:n,item:t,$form:a,$grid:o}):n&&(r=_xeUtils.default.get(u,n),_xeUtils.default.set(u,n,a.getResetValue(t,u,r))),e)&&l&&(_xeUtils.default.set(u,e,a.getResetValue(t,u,_xeUtils.default.get(u,e))),_xeUtils.default.set(u,l,a.getResetValue(t,u,_xeUtils.default.get(u,l))))}),t.itemFormatCache={},a.clearValidate(),a.recalculate()},resetEvent:function(t){t.preventDefault(),this.reset(),this.dispatchEvent("reset",{data:this.data},t)},handleFocus:function(t){var e=this,i=e,r=e.$xeGrid,n=e.$refs.refElem;if(n)for(var l=0;l<t.length;l++){var a=t[l],o=e.getItemByField(a);if(o&&(0,_utils.isEnableConf)(o.itemRender)){var u=o.itemRender,s=_ui.renderer.get(u.name),c=(l||(0,_dom.scrollToView)(n.querySelector(".".concat(o.id))),null),u=u.autoFocus||u.autofocus||(s?s.formItemAutoFocus:null);if(_xeUtils.default.isFunction(u)?c=u({$form:e,$grid:r,item:o,data:i.data,field:a}):!0===u?c=n.querySelector(".".concat(o.id," input,textarea")):u&&(c=n.querySelector(".".concat(o.id," ").concat(u))),c){c.focus();break}}}},validItemRules:function(f,t,e){var d=this,m=d.data,i=d.rules,r={};return _xeUtils.default.isArray(t)||(t=[t]),Promise.all(t.map(function(a){var o,u,s=[],c=[];return a&&i&&(o=_xeUtils.default.get(i,a))&&(u=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(m,a):e,o.forEach(function(e){var t,i,r,n=e.trigger,l=e.validator;"all"!==f&&n&&f!==n||(l?(t={itemValue:u,rule:e,rules:o,data:m,field:a,property:a,$form:d},_xeUtils.default.isString(l)?(r=_ui.validators.get(l))?(r=r.formItemValidatorMethod||r.itemValidatorMethod)?i=r(t):(0,_log.warnLog)("vxe.error.notValidators",["[form] ".concat(l)]):(0,_log.errLog)("vxe.error.notValidators",["[form] ".concat(l)]):i=l(t),i&&(_xeUtils.default.isError(i)?s.push(new Rule({type:"custom",trigger:n,content:i.message,rule:new Rule(e)})):i.catch&&c.push(i.catch(function(t){s.push(new Rule({type:"custom",trigger:n,content:t?t.message:e.content||e.message,rule:new Rule(e)}))})))):checkRuleStatus(e,m,u)||s.push(new Rule(e)))})),Promise.all(c).then(function(){s.length&&(r[a]=s.map(function(t){return{$form:d,rule:t,data:m,field:a,property:a}}))})})).then(function(){if(!_xeUtils.default.isEmpty(r))return Promise.reject(r)})},beginValidate:function(e,t,i){var r=this,n=r.internalData,l=r.data,a=r.rules,o=r.computeValidOpts,u={},s=[],c=[];return clearTimeout(n.meTimeout),l&&a?(e.forEach(function(e){var i=e.field;i&&!(0,_util.isHiddenItem)(r,e)&&(0,_util.isActiveItem)(r,e)&&c.push(r.validItemRules(t||"all",i).then(function(){e.errRule=null}).catch(function(t){t=t[i];return u[i]||(u[i]=[]),u[i].push(t),s.push(i),e.errRule=t[0].rule,Promise.reject(t)}))}),Promise.all(c).then(function(){i&&i()}).catch(function(){return new Promise(function(t){n.meTimeout=setTimeout(function(){e.forEach(function(t){t.errRule&&(t.showError=!0)})},20),!1!==o.autoPos&&r.$nextTick(function(){r.handleFocus(s)}),i?(i(u),t()):t(u)})})):(i&&i(),Promise.resolve())},validate:function(t){var e=this,i=e.readonly;return e.clearValidate(),i?e.$nextTick():e.beginValidate(e.getItems(),"",t).then(function(t){return e.recalculate(),t})},validateField:function(t,e){var i,r=this;return r.readonly?r.$nextTick():(i=[],t=(i=t?_xeUtils.default.isArray(t)?t:[t]:i).map(function(t){return(0,_util.handleFieldOrItem)(r,t)}),r.beginValidate(t,"",e).then(function(t){return r.recalculate(),t}))},handleSubmitEvent:function(e){var i=this,r=i,t=r.readonly;i.clearValidate(),t?(i.dispatchEvent("submit",{data:r.data},e),i.recalculate()):i.beginValidate(i.getItems()).then(function(t){t?i.dispatchEvent("submit-invalid",{data:r.data,errMap:t},e):i.dispatchEvent("submit",{data:r.data},e),i.recalculate()})},submitEvent:function(t){t.preventDefault(),this.preventSubmit||this.handleSubmitEvent(t)},closeTooltip:function(){var t=this.internalData.tooltipStore,e=this.$refs.refTooltip;return t.visible&&(Object.assign(t,{item:null,visible:!1}),e)&&e.close(),this.$nextTick()},triggerTitleTipEvent:function(t,e){var i=this.internalData,e=e.item,r=i.tooltipStore,n=this.$refs.refTooltip,t=t.currentTarget.children[0],l=(t.textContent||"").trim(),a=t.scrollWidth>t.clientWidth;clearTimeout(i.stTimeout),r.item!==e&&this.closeTooltip(),l&&a&&(Object.assign(r,{item:e,visible:!0}),n)&&n.open(t,l)},handleTitleTipLeaveEvent:function(){var t=this,e=t.internalData,i=t.computeTooltipOpts,r=t.$refs.refTooltip;r&&r.setActived(!1),i.enterable?e.stTimeout=setTimeout(function(){(r=t.$refs.refTooltip)&&!r.isActived()&&t.closeTooltip()},i.leaveDelay):t.closeTooltip()},handleValidIconEvent:function(t,e){e=e.item;e.showIconMsg=!e.showIconMsg},triggerItemEvent:function(t,i,e){var r=this;return i?r.validItemRules(t?["blur"].includes(t.type)?"blur":"change":"all",i,e).then(function(){r.clearValidate(i)}).catch(function(t){var t=t[i],e=r.getItemByField(i);t&&e&&(e.showError=!0,e.errRule=t[0].rule)}):r.$nextTick()},updateStatus:function(t,e){t=t.field;return this.triggerItemEvent(new Event("change"),t,e)},recalculate:function(){var e,t=this.computeAutoItemWidthList,i=this.$refs.refElem;return i&&t.length&&(i=i.querySelectorAll(t.map(function(t){return'.vxe-form--item-title[itemid="'.concat(t.id,'"]')}).join(",")),e=0,_xeUtils.default.arrayEach(i,function(t){t.style.width="",e=Math.max(e,Math.ceil(t.clientWidth+2))}),_xeUtils.default.arrayEach(i,function(t){t.style.width="".concat(e,"px")})),this.$nextTick()},handleGlobalResizeEvent:function(){this.recalculate()},renderVN:function(i){var t=this,e=t.$scopedSlots,r=t.loading,n=t.border,l=t.className,a=t.data,o=t.customLayout,u=t.reactData.formItems,s=t.computeSize,c=t.computeTooltipOpts,e=e.default;return i("form",{ref:"refElem",class:["vxe-form",l?_xeUtils.default.isFunction(l)?l({items:u,data:a,$form:t}):l:"",_defineProperty(_defineProperty(_defineProperty(_defineProperty({},"size--".concat(s),s),"is--border",n),"custom--layout",o),"is--loading",r)],on:{submit:t.submitEvent,reset:t.resetEvent}},[i("div",{class:"vxe-form--wrapper vxe-form--item-row"},o?e?e({}):[]:u.map(function(t,e){return i(_formConfigItem.default,{key:e,props:{itemConfig:t}})})),i("div",{class:"vxe-form-slots",ref:"hideItem"},!o&&e?e({}):[]),i(_loading.default,{class:"vxe-form--loading",props:{value:r}}),i(_tooltip.default,Object.assign({ref:"refTooltip"},c))])}},watch:{vertical:function(){this.recalcFlag++},titleWidth:function(){this.recalcFlag++},recalcFlag:function(){var t=this;t.$nextTick().then(function(){t.recalculate()})},"reactData.staticItems":function(){var t=this.reactData;t.formItems=t.staticItems,this.recalcFlag++},items:function(){this.loadItem(this.items||[])},collapseStatus:function(t){this.reactData.collapseAll=!!t},readonly:function(){this.clearValidate()},disabled:function(){this.clearValidate()}},created:function(){this.reactData.collapseAll=!!this.collapseStatus},mounted:function(){var t=this,e=t;e.items&&t.loadItem(e.items),t.$nextTick(function(){e.customLayout&&e.items&&(0,_log.errLog)("vxe.error.errConflicts",["[form] custom-layout","items"])}),_ui.globalEvents.on(t,"resize",t.handleGlobalResizeEvent)},destroyed:function(){var t=this.internalData;_ui.globalEvents.off(this,"resize"),_xeUtils.default.assign(t,createInternalData())},render:function(t){return this.renderVN(t)}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_util=require("./util"),_tooltip=_interopRequireDefault(require("../../tooltip")),_formConfigItem=_interopRequireDefault(require("./form-config-item")),_loading=_interopRequireDefault(require("../../loading")),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log");function _interopRequireDefault(t){return t&&t.__esModule?t:{default:t}}function _defineProperty(t,e,i){return(e=_toPropertyKey(e))in t?Object.defineProperty(t,e,{value:i,enumerable:!0,configurable:!0,writable:!0}):t[e]=i,t}function _typeof(t){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function _classCallCheck(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function _defineProperties(t,e){for(var i=0;i<e.length;i++){var r=e[i];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,_toPropertyKey(r.key),r)}}function _createClass(t,e,i){return e&&_defineProperties(t.prototype,e),i&&_defineProperties(t,i),Object.defineProperty(t,"prototype",{writable:!1}),t}function _toPropertyKey(t){t=_toPrimitive(t,"string");return"symbol"==_typeof(t)?t:t+""}function _toPrimitive(t,e){if("object"!=_typeof(t)||!t)return t;var i=t[Symbol.toPrimitive];if(void 0===i)return("string"===e?String:Number)(t);i=i.call(t,e||"default");if("object"!=_typeof(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}require("../render");var Rule=(()=>_createClass(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})},[{key:"content",get:function(){return(0,_utils.getFuncText)(this.$options.content||this.$options.message)}},{key:"message",get:function(){return this.content}}]))();function validREValue(t,e){return!(t&&!(_xeUtils.default.isRegExp(t)?t:new RegExp(t)).test(e))}function validMaxValue(t,e){return!(!_xeUtils.default.eqNull(t)&&e>_xeUtils.default.toNumber(t))}function validMinValue(t,e){return!(!_xeUtils.default.eqNull(t)&&e<_xeUtils.default.toNumber(t))}function validRuleValue(t,e,i){var r=t.type,n=t.min,l=t.max,t=t.pattern,a="array"===r,o="number"===r,r="string"===r,u="".concat(e);if(!validREValue(t,u))return!1;if(a){if(!_xeUtils.default.isArray(e))return!1;if(i&&!e.length)return!1;if(!validMinValue(n,e.length))return!1;if(!validMaxValue(l,e.length))return!1}else if(o){t=Number(e);if(isNaN(t))return!1;if(!validMinValue(n,t))return!1;if(!validMaxValue(l,t))return!1}else{if(r&&!_xeUtils.default.isString(e))return!1;if(i&&!u)return!1;if(!validMinValue(n,u.length))return!1;if(!validMaxValue(l,u.length))return!1}return!0}function checkRuleStatus(t,e,i){var r=t.required,n=t.field,e=n?_xeUtils.default.get(e,n):i,n=_xeUtils.default.isArray(e)?!e.length:(0,_utils.eqEmptyValue)(e);if(r){if(n)return!1;if(!validRuleValue(t,e,r))return!1}else if(!n&&!validRuleValue(t,e,r))return!1;return!0}function createInternalData(){return{meTimeout:void 0,stTimeout:void 0,tooltipStore:{item:null,visible:!1},itemFormatCache:{}}}var _default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeForm",mixins:[_ui.globalMixins.sizeMixin],props:{collapseStatus:{type:Boolean,default:!0},loading:Boolean,data:Object,size:{type:String,default:function(){return(0,_ui.getConfig)().form.size||(0,_ui.getConfig)().size}},span:{type:[String,Number],default:function(){return(0,_ui.getConfig)().form.span}},align:{type:String,default:function(){return(0,_ui.getConfig)().form.align}},verticalAlign:{type:String,default:function(){return(0,_ui.getConfig)().form.verticalAlign}},border:{type:Boolean,default:function(){return(0,_ui.getConfig)().form.border}},titleBackground:{type:Boolean,default:function(){return(0,_ui.getConfig)().form.titleBackground}},titleBold:{type:Boolean,default:function(){return(0,_ui.getConfig)().form.titleBold}},titleAlign:{type:String,default:function(){return(0,_ui.getConfig)().form.titleAlign}},titleWidth:{type:[String,Number],default:function(){return(0,_ui.getConfig)().form.titleWidth}},titleColon:{type:Boolean,default:function(){return(0,_ui.getConfig)().form.titleColon}},titleAsterisk:{type:Boolean,default:function(){return(0,_ui.getConfig)().form.titleAsterisk}},titleOverflow:{type:[Boolean,String],default:function(){return(0,_ui.getConfig)().form.titleOverflow}},vertical:{type:Boolean,default:function(){return(0,_ui.getConfig)().form.vertical}},padding:{type:Boolean,default:function(){return(0,_ui.getConfig)().form.padding}},className:[String,Function],readonly:Boolean,disabled:Boolean,items:Array,rules:Object,preventSubmit:{type:Boolean,default:function(){return(0,_ui.getConfig)().form.preventSubmit}},validConfig:Object,tooltipConfig:Object,collapseConfig:Object,customLayout:{type:Boolean,default:function(){return(0,_ui.getConfig)().form.customLayout}},params:Object},inject:{$xeGrid:{default:null}},provide:function(){return{$xeForm:this,xeFormItemInfo:null,$xeFormGroup:null,$xeFormItem:null}},data:function(){return{xID:_xeUtils.default.uniqueId(),reactData:{collapseAll:!1,staticItems:[],formItems:[],itemWidth:0},internalData:createInternalData(),recalcFlag:0}},computed:Object.assign(Object.assign({},{}),{computeValidOpts:function(){return Object.assign({},(0,_ui.getConfig)().form.validConfig,this.validConfig)},computeTooltipOpts:function(){return Object.assign({},(0,_ui.getConfig)().tooltip,(0,_ui.getConfig)().form.tooltipConfig,this.tooltipConfig)},computeCollapseOpts:function(){return Object.assign({},(0,_ui.getConfig)().form.collapseConfig,this.collapseConfig)},computeAutoItemWidthList:function(){var t=this.reactData,r=this.titleWidth,n=this.vertical,t=t.formItems,l=[];return _xeUtils.default.eachTree(t,function(t){var e=t.titleWidth,i=t.vertical;"auto"!==e&&("auto"!==((_xeUtils.default.eqNull(i)?n:i)?null:_xeUtils.default.eqNull(e)?r:e)||t.children&&t.children.length)||l.push(t)},{children:"children"}),l}}),methods:{dispatchEvent:function(t,e,i){this.$emit(t,(0,_ui.createEvent)(i,{$form:this},e))},callSlot:function(t,e,i){var r=this.$scopedSlots;return t&&(_xeUtils.default.isString(t)&&(t=r[t]||null),_xeUtils.default.isFunction(t))?(0,_vn.getSlotVNs)(t.call(this,e,i)):[]},loadItem:function(t){var e=this,i=e.$scopedSlots,r=e.reactData,n=e.internalData;return t.length&&t.forEach(function(t){t.slots&&_xeUtils.default.each(t.slots,function(t){_xeUtils.default.isFunction(t)||i[t]||(0,_log.errLog)("vxe.error.notSlot",["[form] ".concat(t)])})}),r.staticItems=_xeUtils.default.mapTree(t,function(t){return(0,_util.createItem)(e,t)},{children:"children"}),n.itemFormatCache={},e.$nextTick().then(function(){return e.recalculate()})},getItems:function(){var t=this.reactData,e=[];return _xeUtils.default.eachTree(t.formItems,function(t){e.push(t)},{children:"children"}),e},getItemByField:function(e){var t=this.reactData,t=_xeUtils.default.findTree(t.formItems,function(t){return t.field===e},{children:"children"});return t?t.item:null},getCollapseStatus:function(){return this.reactData.collapseAll},toggleCollapse:function(){var t=this.reactData,e=!this.getCollapseStatus();return t.collapseAll=e,this.$emit("update:collapseStatus",e),this.$nextTick()},toggleCollapseEvent:function(t){var e=this,i=e,r=e.$xeGrid,n=e.toggleCollapse(),l=e.getCollapseStatus();e.dispatchEvent("toggle-collapse",{status:l,collapse:l,data:i.data},t),e.dispatchEvent("collapse",{status:l,collapse:l,data:i.data},t),n.then(function(){e.recalculate().then(function(){r&&r.recalculate(!0)}),r&&r.recalculate()})},clearValidate:function(t){var e,i=this;return t?(e=_xeUtils.default.isArray(e=t)?e:[t]).forEach(function(t){t&&(t=(0,_util.handleFieldOrItem)(i,t))&&(t.showError=!1,t.showIconMsg=!1)}):i.getItems().forEach(function(t){t.showError=!1,t.showIconMsg=!1}),i.$nextTick()},getResetValue:function(t,e,i){var r=this.$xeGrid,n=t.field,l=t.resetValue;return _xeUtils.default.isFunction(l)?l({field:n,item:t,data:e,$form:this,$grid:r}):null===l&&_xeUtils.default.isArray(i)?[]:l},reset:function(){var a=this,o=a.$xeGrid,t=a.internalData,u=a.data,e=a.getItems();return u&&e.forEach(function(t){var e,i,r,n=t.field,l=t.itemRender;(0,_utils.isEnableConf)(l)&&(r=l.name,e=l.startField,l=l.endField,i=(r=_ui.renderer.get(r))?r.formItemResetMethod||r.itemResetMethod:null,r&&i?i({data:u,field:n,property:n,item:t,$form:a,$grid:o}):n&&(r=_xeUtils.default.get(u,n),_xeUtils.default.set(u,n,a.getResetValue(t,u,r))),e)&&l&&(_xeUtils.default.set(u,e,a.getResetValue(t,u,_xeUtils.default.get(u,e))),_xeUtils.default.set(u,l,a.getResetValue(t,u,_xeUtils.default.get(u,l))))}),t.itemFormatCache={},a.clearValidate(),a.recalculate()},resetEvent:function(t){t.preventDefault(),this.reset(),this.dispatchEvent("reset",{data:this.data},t)},handleFocus:function(t){var e=this,i=e,r=e.$xeGrid,n=e.$refs.refElem;if(n)for(var l=0;l<t.length;l++){var a=t[l],o=e.getItemByField(a);if(o&&(0,_utils.isEnableConf)(o.itemRender)){var u=o.itemRender,s=_ui.renderer.get(u.name),c=(l||(0,_dom.scrollToView)(n.querySelector(".".concat(o.id))),null),u=u.autoFocus||u.autofocus||(s?s.formItemAutoFocus:null);if(_xeUtils.default.isFunction(u)?c=u({$form:e,$grid:r,item:o,data:i.data,field:a}):!0===u?c=n.querySelector(".".concat(o.id," input,textarea")):u&&(c=n.querySelector(".".concat(o.id," ").concat(u))),c){c.focus();break}}}},validItemRules:function(f,t,e){var d=this,m=d.data,i=d.rules,r={};return _xeUtils.default.isArray(t)||(t=[t]),Promise.all(t.map(function(a){var t,o,u,s=[],c=[];return a&&i&&(t=d.getItemByField(a),o=t&&t.rules?t.rules:_xeUtils.default.get(i,a))&&(u=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(m,a):e,o.forEach(function(e){var t,i,r,n=e.trigger,l=e.validator;"all"!==f&&n&&f!==n||(l?(t={itemValue:u,rule:e,rules:o,data:m,field:a,property:a,$form:d},_xeUtils.default.isString(l)?(r=_ui.validators.get(l))?(r=r.formItemValidatorMethod||r.itemValidatorMethod)?i=r(t):(0,_log.warnLog)("vxe.error.notValidators",["[form] ".concat(l)]):(0,_log.errLog)("vxe.error.notValidators",["[form] ".concat(l)]):i=l(t),i&&(_xeUtils.default.isError(i)?s.push(new Rule({type:"custom",trigger:n,content:i.message,rule:new Rule(e)})):i.catch&&c.push(i.catch(function(t){s.push(new Rule({type:"custom",trigger:n,content:t?t.message:e.content||e.message,rule:new Rule(e)}))})))):checkRuleStatus(e,m,u)||s.push(new Rule(e)))})),Promise.all(c).then(function(){s.length&&(r[a]=s.map(function(t){return{$form:d,rule:t,data:m,field:a,property:a}}))})})).then(function(){if(!_xeUtils.default.isEmpty(r))return Promise.reject(r)})},beginValidate:function(e,t,i){var r=this,n=r.internalData,l=r.data,a=r.rules,o=r.computeValidOpts,u={},s=[],c=[];return clearTimeout(n.meTimeout),l&&a?(e.forEach(function(e){var i=e.field;i&&!(0,_util.isHiddenItem)(r,e)&&(0,_util.isActiveItem)(r,e)&&c.push(r.validItemRules(t||"all",i).then(function(){e.errRule=null}).catch(function(t){t=t[i];return u[i]||(u[i]=[]),u[i].push(t),s.push(i),e.errRule=t[0].rule,Promise.reject(t)}))}),Promise.all(c).then(function(){i&&i()}).catch(function(){return new Promise(function(t){n.meTimeout=setTimeout(function(){e.forEach(function(t){t.errRule&&(t.showError=!0)})},20),!1!==o.autoPos&&r.$nextTick(function(){r.handleFocus(s)}),i?(i(u),t()):t(u)})})):(i&&i(),Promise.resolve())},validate:function(t){var e=this,i=e.readonly;return e.clearValidate(),i?e.$nextTick():e.beginValidate(e.getItems(),"",t).then(function(t){return e.recalculate(),t})},validateField:function(t,e){var i,r=this;return r.readonly?r.$nextTick():(i=[],t=(i=t?_xeUtils.default.isArray(t)?t:[t]:i).map(function(t){return(0,_util.handleFieldOrItem)(r,t)}),r.beginValidate(t,"",e).then(function(t){return r.recalculate(),t}))},handleSubmitEvent:function(e){var i=this,r=i,t=r.readonly;i.clearValidate(),t?(i.dispatchEvent("submit",{data:r.data},e),i.recalculate()):i.beginValidate(i.getItems()).then(function(t){t?i.dispatchEvent("submit-invalid",{data:r.data,errMap:t},e):i.dispatchEvent("submit",{data:r.data},e),i.recalculate()})},submitEvent:function(t){t.preventDefault(),this.preventSubmit||this.handleSubmitEvent(t)},closeTooltip:function(){var t=this.internalData.tooltipStore,e=this.$refs.refTooltip;return t.visible&&(Object.assign(t,{item:null,visible:!1}),e)&&e.close(),this.$nextTick()},triggerTitleTipEvent:function(t,e){var i=this.internalData,e=e.item,r=i.tooltipStore,n=this.$refs.refTooltip,t=t.currentTarget.children[0],l=(t.textContent||"").trim(),a=t.scrollWidth>t.clientWidth;clearTimeout(i.stTimeout),r.item!==e&&this.closeTooltip(),l&&a&&(Object.assign(r,{item:e,visible:!0}),n)&&n.open(t,l)},handleTitleTipLeaveEvent:function(){var t=this,e=t.internalData,i=t.computeTooltipOpts,r=t.$refs.refTooltip;r&&r.setActived(!1),i.enterable?e.stTimeout=setTimeout(function(){(r=t.$refs.refTooltip)&&!r.isActived()&&t.closeTooltip()},i.leaveDelay):t.closeTooltip()},handleValidIconEvent:function(t,e){e=e.item;e.showIconMsg=!e.showIconMsg},triggerItemEvent:function(t,i,e){var r=this;return i?r.validItemRules(t?["blur"].includes(t.type)?"blur":"change":"all",i,e).then(function(){r.clearValidate(i)}).catch(function(t){var t=t[i],e=r.getItemByField(i);t&&e&&(e.showError=!0,e.errRule=t[0].rule)}):r.$nextTick()},updateStatus:function(t,e){t=t.field;return this.triggerItemEvent(new Event("change"),t,e)},recalculate:function(){var e,t=this.computeAutoItemWidthList,i=this.$refs.refElem;return i&&t.length&&(i=i.querySelectorAll(t.map(function(t){return'.vxe-form--item-title[itemid="'.concat(t.id,'"]')}).join(",")),e=0,_xeUtils.default.arrayEach(i,function(t){t.style.width="",e=Math.max(e,Math.ceil(t.clientWidth+2))}),_xeUtils.default.arrayEach(i,function(t){t.style.width="".concat(e,"px")})),this.$nextTick()},handleGlobalResizeEvent:function(){this.recalculate()},renderVN:function(i){var t=this,e=t.$scopedSlots,r=t.loading,n=t.border,l=t.className,a=t.data,o=t.customLayout,u=t.reactData.formItems,s=t.computeSize,c=t.computeTooltipOpts,e=e.default;return i("form",{ref:"refElem",class:["vxe-form",l?_xeUtils.default.isFunction(l)?l({items:u,data:a,$form:t}):l:"",_defineProperty(_defineProperty(_defineProperty(_defineProperty({},"size--".concat(s),s),"is--border",n),"custom--layout",o),"is--loading",r)],on:{submit:t.submitEvent,reset:t.resetEvent}},[i("div",{class:"vxe-form--wrapper vxe-form--item-row"},o?e?e({}):[]:u.map(function(t,e){return i(_formConfigItem.default,{key:e,props:{itemConfig:t}})})),i("div",{class:"vxe-form-slots",ref:"hideItem"},!o&&e?e({}):[]),i(_loading.default,{class:"vxe-form--loading",props:{value:r}}),i(_tooltip.default,Object.assign({ref:"refTooltip"},c))])}},watch:{vertical:function(){this.recalcFlag++},titleWidth:function(){this.recalcFlag++},recalcFlag:function(){var t=this;t.$nextTick().then(function(){t.recalculate()})},"reactData.staticItems":function(){var t=this.reactData;t.formItems=t.staticItems,this.recalcFlag++},items:function(){this.loadItem(this.items||[])},collapseStatus:function(t){this.reactData.collapseAll=!!t},readonly:function(){this.clearValidate()},disabled:function(){this.clearValidate()}},created:function(){this.reactData.collapseAll=!!this.collapseStatus},mounted:function(){var t=this,e=t;e.items&&t.loadItem(e.items),t.$nextTick(function(){e.customLayout&&e.items&&(0,_log.errLog)("vxe.error.errConflicts",["[form] custom-layout","items"])}),_ui.globalEvents.on(t,"resize",t.handleGlobalResizeEvent)},destroyed:function(){var t=this.internalData;_ui.globalEvents.off(this,"resize"),_xeUtils.default.assign(t,createInternalData())},render:function(t){return this.renderVN(t)}});

package/lib/form/src/render.js

@@ -102,7 +102,7 @@ function getItemClass($xeForm, item, isGroup) {
   var isRequired = false;
   var isValid = false;
   if (!readonly && rules) {
-    var itemRules = rules[field];
+    var itemRules = item.rules ? item.rules : rules[field];
     if (itemRules && itemRules.length) {
       isValid = true;
       isRequired = itemRules.some(function (rule) {

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.getItemClass=getItemClass,exports.getItemContentClass=getItemContentClass,exports.renderItemContent=renderItemContent,exports.renderItemErrorIcon=renderItemErrorIcon,exports.renderTitle=renderTitle;var _ui=require("../../ui"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_vn=require("../../ui/src/vn"),_util=require("./util"),_tooltip=_interopRequireDefault(require("../../tooltip/src/tooltip")),_icon=_interopRequireDefault(require("../../icon/src/icon")),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}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)}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){var r;if(e)return"string"==typeof e?_arrayLikeToArray(e,t):"Map"===(r="Object"===(r={}.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:r)||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?_arrayLikeToArray(e,t):void 0}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,i=Array(t);r<t;r++)i[r]=e[r];return i}function _defineProperty(e,t,r){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var r=e[Symbol.toPrimitive];if(void 0===r)return("string"===t?String:Number)(e);r=r.call(e,t||"default");if("object"!=_typeof(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}function renderPrefixIcon(e,t){return e("span",{class:"vxe-form--item-title-tip-prefix"},[e(_icon.default,{class:t.icon||(0,_ui.getIcon)().FORM_PREFIX,props:{status:t.iconStatus}})])}function renderSuffixIcon(e,t){return e("span",{class:"vxe-form--item-title-tip-suffix"},[e(_icon.default,{class:t.icon||(0,_ui.getIcon)().FORM_SUFFIX,props:{status:t.iconStatus}})])}function getItemClass(e,t,r){var i=e.reactData,l=e.$xeGrid,o=e.data,n=e.rules,a=e.readonly,s=e.disabled,u=e.span,d=e.titleBackground,c=e.titleBold,f=e.titleColon,m=e.titleAsterisk,p=e.vertical,_=e.padding,i=i.collapseAll,g=t.folding,y=t.field,v=t.itemRender,x=t.showError,b=t.className,I=t.vertical,h=t.padding,C=t.children,S=t.showContent,A=e.computeSize,T=e.computeValidOpts,U=T.showErrorMessage,N=T.showMessage,P=T.showErrorBackground,T=T.showErrorIcon,v=(0,_utils.isEnableConf)(v)?_ui.renderer.get(v.name):null,v=v?v.formItemClassName||v.itemClassName:"",u=t.span||u,_=_xeUtils.default.eqNull(h)?_:h,h=_xeUtils.default.eqNull(I)?p:I,p=_xeUtils.default.eqNull(t.titleBackground)?d:t.titleBackground,I=_xeUtils.default.eqNull(t.titleBold)?c:t.titleBold,d=_xeUtils.default.eqNull(t.titleColon)?f:t.titleColon,c=_xeUtils.default.eqNull(t.titleAsterisk)?m:t.titleAsterisk,f={data:o,disabled:s,readonly:a,field:y,property:y,item:t,$form:e,$grid:l},m=C&&0<C.length,o=!1,s=!1;return!a&&n&&(l=n[y])&&l.length&&(s=!0,o=l.some(function(e){return e.required})),[r||m?"vxe-form--group":"","vxe-form--item",t.id,u?"vxe-form--item-col_".concat(u," is--span"):"","".concat((_xeUtils.default.isBoolean(U)?U:N)?"show":"hide","--err-msg"),b?_xeUtils.default.isFunction(b)?b(f):b:"",v?_xeUtils.default.isFunction(v)?v(f):v:"",(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(C={},"size--".concat(A),A),"is--colon",d),"is--tbg",p),"is--bold",I),"is--padding",_),"is--vertical",h),"is--asterisk",c),"hide--content",!1===S),"is--valid",s),"is--required",o),_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(C,"is--hidden",g&&i),"is--active",(0,_util.isActiveItem)(e,t)),"err--icon",T),"err--bg",P),"is--error",x))]}function getItemContentClass(e,t,r){var i=e.$xeGrid,l=e.data,o=e.readonly,n=e.disabled,a=e.align,s=e.verticalAlign,u=t.field,d=t.itemRender,c=t.contentClassName,f=t.children,f=f&&0<f.length,d=(0,_utils.isEnableConf)(d)?_ui.renderer.get(d.name):null,d=d?d.formItemContentClassName||d.itemContentClassName:"",a=!f&&_xeUtils.default.eqNull(t.align)?a:t.align,s=!f&&_xeUtils.default.eqNull(t.verticalAlign)?s:t.verticalAlign,l={data:l,disabled:n,readonly:o,field:u,property:u,item:t,$form:e,$grid:i};return[r||f?"vxe-form--group-content vxe-form--item-row":"","vxe-form--item-content",a?"align--".concat(a):"",s?"vertical-align--".concat(s):"",d?_xeUtils.default.isFunction(d)?d(l):d:"",c?_xeUtils.default.isFunction(c)?c(l):c:""]}function renderTitle(e,t,r,i){var l=t.$xeGrid,o=t.data,n=t.readonly,a=t.disabled,s=t.titleAlign,u=t.titleWidth,d=t.titleOverflow,c=t.vertical,f=r.slots,m=r.title,p=r.field,_=r.itemRender,g=r.titleOverflow,y=r.vertical,v=r.showTitle,x=r.titleClassName,b=r.titleStyle,I=r.titlePrefix,h=r.titleSuffix,C=r.children,S=r.showContent,A=t.computeTooltipOpts,T=(0,_utils.isEnableConf)(_)?_ui.renderer.get(_.name):null,U=T?T.formItemTitleClassName||T.itemTitleClassName:"",N=T?T.formItemTitleStyle||T.itemTitleStyle:null,c=_xeUtils.default.eqNull(y)?c:y,y=_xeUtils.default.eqNull(r.titleAlign)?s:r.titleAlign,s=c?null:_xeUtils.default.eqNull(r.titleWidth)?u:r.titleWidth,c=_xeUtils.default.eqNull(g)?d:g,u="title"===c,d=!0===c||"tooltip"===c,g=u||d||"ellipsis"===c,P={data:o,disabled:a,readonly:n,field:p,property:p,item:r,$form:t,$grid:l},c=f?f.title:null,o=f?f.prefix:null,a=f?f.suffix||f.extra:null,n=!1!==v&&(m||c),p=C&&0<C.length,l=[],f=(o&&l.push(e("span",{key:"pt",class:"vxe-form--item-title-prefix"},t.callSlot(o,P,e))),I&&l.push(I.content||I.message?e(_tooltip.default,{key:"pm",props:Object.assign(Object.assign(Object.assign({},A),I),{content:(0,_utils.getFuncText)(I.content||I.message)}),scopedSlots:{default:function(){return renderPrefixIcon(e,I)}}}):renderPrefixIcon(e,I)),T?T.renderFormItemTitle||T.renderItemTitle:null),v=(l.push(e("span",{key:"pl",class:"vxe-form--item-title-label"},c?t.callSlot(c,P,e):f?(0,_vn.getSlotVNs)(f.call(t,e,_,P)):(0,_utils.getFuncText)(r.title))),[]),C=(h&&v.push(h.content||h.message?e(_tooltip.default,{key:"sm",props:Object.assign(Object.assign(Object.assign({},A),h),{content:(0,_utils.getFuncText)(h.content||h.message)}),scopedSlots:{default:function(){return renderSuffixIcon(e,h)}}}):renderSuffixIcon(e,h)),a&&v.push(e("span",{key:"st",class:"vxe-form--item-title-suffix"},t.callSlot(a,P,e))),d?{onMouseenter:function(e){t.triggerTitleTipEvent(e,P)},onMouseleave:t.handleTitleTipLeaveEvent}:{}),o=Object.assign({},_xeUtils.default.isFunction(N)?N(P):N,_xeUtils.default.isFunction(b)?b(P):b);return s&&"auto"!==s&&!1!==S&&(o.width=(0,_dom.toCssUnit)(s)),n?e("div",{class:[i||p?"vxe-form--group-title":"","vxe-form--item-title",y?"align--".concat(y):"",g?"is--ellipsis":"",U?_xeUtils.default.isFunction(U)?U(P):U:"",x?_xeUtils.default.isFunction(x)?x(P):x:""],style:o,attrs:{itemid:r.id,title:u?(0,_utils.getFuncText)(m):null},on:C},[e("div",{class:"vxe-form--item-title-content"},l),e("div",{class:"vxe-form--item-title-postfix"},v)]):(0,_ui.renderEmptyElement)(t)}function renderItemErrorIcon(e,t,r){var i=t.computeValidOpts,l=i.showErrorIcon,o=r.errRule,n=r.showIconMsg;return l?e("div",{key:"emi",class:["vxe-form-item--valid-error-icon-wrapper",{"is--show":n,"is--hide":!n}]},[e("span",{class:"vxe-form-item--valid-error-icon-btn",on:{click:function(e){t.handleValidIconEvent(e,{item:r})}}},[e("i",{class:i.errorIcon||(0,_ui.getIcon)().FORM_VALID_ERROR_ICON})]),e("div",{class:"vxe-form-item--valid-error-icon-msg-tip"},o?[e("div",{class:"vxe-form-item--valid-error-icon-msg vxe-form-item--valid-error-icon-theme-".concat(i.theme||"normal")},o.content||o.message)]:[])]):(0,_ui.renderEmptyElement)(t)}function renderItemContent(e,t,r){var i=t.reactData,l=t.$xeGrid,o=t.data,n=t.readonly,a=t.disabled,s=t.internalData.itemFormatCache,i=i.collapseAll,u=r.slots,d=r.field,c=r.itemRender,f=r.collapseNode,m=r.errRule,p=r.formatter,_=u?u.default:null,u=u?u.valid:null,g=t.computeCollapseOpts,y=t.computeValidOpts,v=y.showErrorMessage,x=y.showMessage,b=(0,_utils.isEnableConf)(c)?_ui.renderer.get(c.name):null,I=_xeUtils.default.get(o,d),o={data:o,disabled:a,readonly:n,field:d,property:d,item:r,itemValue:I,$form:t,$grid:l},a=[],n=b?b.renderFormItemContent||b.renderItemContent:null;if(_)a=t.callSlot(_,o,e);else if(n)a=(0,_vn.getSlotVNs)(n.call(t,e,c,o));else if(d){var h,r=I;if(p){if(d){var l=s[d];if(l)if(h=l.formatData){if(h.value===I)return h.label}else h=l.formatData={};else s[d]={field:d}}r=_xeUtils.default.isString(p)?(_=(b=_ui.formats.get(p))?b.formItemFormatMethod:null)?_(o):"":_xeUtils.default.isArray(p)?(c=(n=_ui.formats.get(p[0]))?n.formItemFormatMethod:null)?c.apply(void 0,[o].concat(_toConsumableArray(p.slice(1)))):"":p(o),h&&(h.value=I,h.label=r)}a=[(0,_utils.eqEmptyValue)(r)?"":"".concat(r)]}return f&&a.push(e("div",{class:"vxe-form--item-trigger-node",on:{click:t.toggleCollapseEvent}},[e("span",{class:"vxe-form--item-trigger-text"},i?g.unfoldButtonText||(0,_ui.getI18n)("vxe.form.unfolding"):g.foldButtonText||(0,_ui.getI18n)("vxe.form.folding")),e("i",{class:["vxe-form--item-trigger-icon",i?g.foldIcon||(0,_ui.getIcon)().FORM_FOLDING:g.unfoldIcon||(0,_ui.getIcon)().FORM_UNFOLDING]})])),m&&(_xeUtils.default.isBoolean(v)?v:x)&&(l=Object.assign(Object.assign({},o),{rule:m}),a.push(e("div",{class:"vxe-form-item--valid-error-tip",style:m.maxWidth?{width:(0,_dom.toCssUnit)(m.maxWidth)}:{}},[e("div",{class:"vxe-form-item--valid-error-wrapper vxe-form-item--valid-error-theme-".concat(y.theme||"normal")},[u?t.callSlot(u,l,e):[e("span",{class:"vxe-form--item--valid-error-msg"},m.content||m.message)]])]))),e("div",{key:"ct",class:"vxe-form--item-inner"},a)}
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.getItemClass=getItemClass,exports.getItemContentClass=getItemContentClass,exports.renderItemContent=renderItemContent,exports.renderItemErrorIcon=renderItemErrorIcon,exports.renderTitle=renderTitle;var _ui=require("../../ui"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_vn=require("../../ui/src/vn"),_util=require("./util"),_tooltip=_interopRequireDefault(require("../../tooltip/src/tooltip")),_icon=_interopRequireDefault(require("../../icon/src/icon")),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}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)}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){var r;if(e)return"string"==typeof e?_arrayLikeToArray(e,t):"Map"===(r="Object"===(r={}.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:r)||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?_arrayLikeToArray(e,t):void 0}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,i=Array(t);r<t;r++)i[r]=e[r];return i}function _defineProperty(e,t,r){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var r=e[Symbol.toPrimitive];if(void 0===r)return("string"===t?String:Number)(e);r=r.call(e,t||"default");if("object"!=_typeof(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}function renderPrefixIcon(e,t){return e("span",{class:"vxe-form--item-title-tip-prefix"},[e(_icon.default,{class:t.icon||(0,_ui.getIcon)().FORM_PREFIX,props:{status:t.iconStatus}})])}function renderSuffixIcon(e,t){return e("span",{class:"vxe-form--item-title-tip-suffix"},[e(_icon.default,{class:t.icon||(0,_ui.getIcon)().FORM_SUFFIX,props:{status:t.iconStatus}})])}function getItemClass(e,t,r){var i=e.reactData,l=e.$xeGrid,o=e.data,n=e.rules,a=e.readonly,s=e.disabled,u=e.span,d=e.titleBackground,c=e.titleBold,f=e.titleColon,m=e.titleAsterisk,p=e.vertical,_=e.padding,i=i.collapseAll,g=t.folding,y=t.field,v=t.itemRender,x=t.showError,b=t.className,I=t.vertical,h=t.padding,C=t.children,S=t.showContent,A=e.computeSize,T=e.computeValidOpts,U=T.showErrorMessage,N=T.showMessage,P=T.showErrorBackground,T=T.showErrorIcon,v=(0,_utils.isEnableConf)(v)?_ui.renderer.get(v.name):null,v=v?v.formItemClassName||v.itemClassName:"",u=t.span||u,_=_xeUtils.default.eqNull(h)?_:h,h=_xeUtils.default.eqNull(I)?p:I,p=_xeUtils.default.eqNull(t.titleBackground)?d:t.titleBackground,I=_xeUtils.default.eqNull(t.titleBold)?c:t.titleBold,d=_xeUtils.default.eqNull(t.titleColon)?f:t.titleColon,c=_xeUtils.default.eqNull(t.titleAsterisk)?m:t.titleAsterisk,f={data:o,disabled:s,readonly:a,field:y,property:y,item:t,$form:e,$grid:l},m=C&&0<C.length,o=!1,s=!1;return!a&&n&&(l=t.rules||n[y])&&l.length&&(s=!0,o=l.some(function(e){return e.required})),[r||m?"vxe-form--group":"","vxe-form--item",t.id,u?"vxe-form--item-col_".concat(u," is--span"):"","".concat((_xeUtils.default.isBoolean(U)?U:N)?"show":"hide","--err-msg"),b?_xeUtils.default.isFunction(b)?b(f):b:"",v?_xeUtils.default.isFunction(v)?v(f):v:"",(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(C={},"size--".concat(A),A),"is--colon",d),"is--tbg",p),"is--bold",I),"is--padding",_),"is--vertical",h),"is--asterisk",c),"hide--content",!1===S),"is--valid",s),"is--required",o),_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(C,"is--hidden",g&&i),"is--active",(0,_util.isActiveItem)(e,t)),"err--icon",T),"err--bg",P),"is--error",x))]}function getItemContentClass(e,t,r){var i=e.$xeGrid,l=e.data,o=e.readonly,n=e.disabled,a=e.align,s=e.verticalAlign,u=t.field,d=t.itemRender,c=t.contentClassName,f=t.children,f=f&&0<f.length,d=(0,_utils.isEnableConf)(d)?_ui.renderer.get(d.name):null,d=d?d.formItemContentClassName||d.itemContentClassName:"",a=!f&&_xeUtils.default.eqNull(t.align)?a:t.align,s=!f&&_xeUtils.default.eqNull(t.verticalAlign)?s:t.verticalAlign,l={data:l,disabled:n,readonly:o,field:u,property:u,item:t,$form:e,$grid:i};return[r||f?"vxe-form--group-content vxe-form--item-row":"","vxe-form--item-content",a?"align--".concat(a):"",s?"vertical-align--".concat(s):"",d?_xeUtils.default.isFunction(d)?d(l):d:"",c?_xeUtils.default.isFunction(c)?c(l):c:""]}function renderTitle(e,t,r,i){var l=t.$xeGrid,o=t.data,n=t.readonly,a=t.disabled,s=t.titleAlign,u=t.titleWidth,d=t.titleOverflow,c=t.vertical,f=r.slots,m=r.title,p=r.field,_=r.itemRender,g=r.titleOverflow,y=r.vertical,v=r.showTitle,x=r.titleClassName,b=r.titleStyle,I=r.titlePrefix,h=r.titleSuffix,C=r.children,S=r.showContent,A=t.computeTooltipOpts,T=(0,_utils.isEnableConf)(_)?_ui.renderer.get(_.name):null,U=T?T.formItemTitleClassName||T.itemTitleClassName:"",N=T?T.formItemTitleStyle||T.itemTitleStyle:null,c=_xeUtils.default.eqNull(y)?c:y,y=_xeUtils.default.eqNull(r.titleAlign)?s:r.titleAlign,s=c?null:_xeUtils.default.eqNull(r.titleWidth)?u:r.titleWidth,c=_xeUtils.default.eqNull(g)?d:g,u="title"===c,d=!0===c||"tooltip"===c,g=u||d||"ellipsis"===c,P={data:o,disabled:a,readonly:n,field:p,property:p,item:r,$form:t,$grid:l},c=f?f.title:null,o=f?f.prefix:null,a=f?f.suffix||f.extra:null,n=!1!==v&&(m||c),p=C&&0<C.length,l=[],f=(o&&l.push(e("span",{key:"pt",class:"vxe-form--item-title-prefix"},t.callSlot(o,P,e))),I&&l.push(I.content||I.message?e(_tooltip.default,{key:"pm",props:Object.assign(Object.assign(Object.assign({},A),I),{content:(0,_utils.getFuncText)(I.content||I.message)}),scopedSlots:{default:function(){return renderPrefixIcon(e,I)}}}):renderPrefixIcon(e,I)),T?T.renderFormItemTitle||T.renderItemTitle:null),v=(l.push(e("span",{key:"pl",class:"vxe-form--item-title-label"},c?t.callSlot(c,P,e):f?(0,_vn.getSlotVNs)(f.call(t,e,_,P)):(0,_utils.getFuncText)(r.title))),[]),C=(h&&v.push(h.content||h.message?e(_tooltip.default,{key:"sm",props:Object.assign(Object.assign(Object.assign({},A),h),{content:(0,_utils.getFuncText)(h.content||h.message)}),scopedSlots:{default:function(){return renderSuffixIcon(e,h)}}}):renderSuffixIcon(e,h)),a&&v.push(e("span",{key:"st",class:"vxe-form--item-title-suffix"},t.callSlot(a,P,e))),d?{onMouseenter:function(e){t.triggerTitleTipEvent(e,P)},onMouseleave:t.handleTitleTipLeaveEvent}:{}),o=Object.assign({},_xeUtils.default.isFunction(N)?N(P):N,_xeUtils.default.isFunction(b)?b(P):b);return s&&"auto"!==s&&!1!==S&&(o.width=(0,_dom.toCssUnit)(s)),n?e("div",{class:[i||p?"vxe-form--group-title":"","vxe-form--item-title",y?"align--".concat(y):"",g?"is--ellipsis":"",U?_xeUtils.default.isFunction(U)?U(P):U:"",x?_xeUtils.default.isFunction(x)?x(P):x:""],style:o,attrs:{itemid:r.id,title:u?(0,_utils.getFuncText)(m):null},on:C},[e("div",{class:"vxe-form--item-title-content"},l),e("div",{class:"vxe-form--item-title-postfix"},v)]):(0,_ui.renderEmptyElement)(t)}function renderItemErrorIcon(e,t,r){var i=t.computeValidOpts,l=i.showErrorIcon,o=r.errRule,n=r.showIconMsg;return l?e("div",{key:"emi",class:["vxe-form-item--valid-error-icon-wrapper",{"is--show":n,"is--hide":!n}]},[e("span",{class:"vxe-form-item--valid-error-icon-btn",on:{click:function(e){t.handleValidIconEvent(e,{item:r})}}},[e("i",{class:i.errorIcon||(0,_ui.getIcon)().FORM_VALID_ERROR_ICON})]),e("div",{class:"vxe-form-item--valid-error-icon-msg-tip"},o?[e("div",{class:"vxe-form-item--valid-error-icon-msg vxe-form-item--valid-error-icon-theme-".concat(i.theme||"normal")},o.content||o.message)]:[])]):(0,_ui.renderEmptyElement)(t)}function renderItemContent(e,t,r){var i=t.reactData,l=t.$xeGrid,o=t.data,n=t.readonly,a=t.disabled,s=t.internalData.itemFormatCache,i=i.collapseAll,u=r.slots,d=r.field,c=r.itemRender,f=r.collapseNode,m=r.errRule,p=r.formatter,_=u?u.default:null,u=u?u.valid:null,g=t.computeCollapseOpts,y=t.computeValidOpts,v=y.showErrorMessage,x=y.showMessage,b=(0,_utils.isEnableConf)(c)?_ui.renderer.get(c.name):null,I=_xeUtils.default.get(o,d),o={data:o,disabled:a,readonly:n,field:d,property:d,item:r,itemValue:I,$form:t,$grid:l},a=[],n=b?b.renderFormItemContent||b.renderItemContent:null;if(_)a=t.callSlot(_,o,e);else if(n)a=(0,_vn.getSlotVNs)(n.call(t,e,c,o));else if(d){var h,r=I;if(p){if(d){var l=s[d];if(l)if(h=l.formatData){if(h.value===I)return h.label}else h=l.formatData={};else s[d]={field:d}}r=_xeUtils.default.isString(p)?(_=(b=_ui.formats.get(p))?b.formItemFormatMethod:null)?_(o):"":_xeUtils.default.isArray(p)?(c=(n=_ui.formats.get(p[0]))?n.formItemFormatMethod:null)?c.apply(void 0,[o].concat(_toConsumableArray(p.slice(1)))):"":p(o),h&&(h.value=I,h.label=r)}a=[(0,_utils.eqEmptyValue)(r)?"":"".concat(r)]}return f&&a.push(e("div",{class:"vxe-form--item-trigger-node",on:{click:t.toggleCollapseEvent}},[e("span",{class:"vxe-form--item-trigger-text"},i?g.unfoldButtonText||(0,_ui.getI18n)("vxe.form.unfolding"):g.foldButtonText||(0,_ui.getI18n)("vxe.form.folding")),e("i",{class:["vxe-form--item-trigger-icon",i?g.foldIcon||(0,_ui.getIcon)().FORM_FOLDING:g.unfoldIcon||(0,_ui.getIcon)().FORM_UNFOLDING]})])),m&&(_xeUtils.default.isBoolean(v)?v:x)&&(l=Object.assign(Object.assign({},o),{rule:m}),a.push(e("div",{class:"vxe-form-item--valid-error-tip",style:m.maxWidth?{width:(0,_dom.toCssUnit)(m.maxWidth)}:{}},[e("div",{class:"vxe-form-item--valid-error-wrapper vxe-form-item--valid-error-theme-".concat(y.theme||"normal")},[u?t.callSlot(u,l,e):[e("span",{class:"vxe-form--item--valid-error-msg"},m.content||m.message)]])]))),e("div",{key:"ct",class:"vxe-form--item-inner"},a)}

package/lib/index.umd.js

@@ -13214,7 +13214,7 @@ function checkDynamic() {
 }
 ;// ./packages/ui/src/log.ts
 
-var log_version = "ui v".concat("3.14.21");
+var log_version = "ui v".concat("3.14.22");
 var warnLog = log.create('warn', log_version);
 var errLog = log.create('error', log_version);
 ;// ./packages/ui/index.ts
@@ -13222,7 +13222,7 @@ var errLog = log.create('error', log_version);
 
 
 
-var ui_version = "3.14.21";
+var ui_version = "3.14.22";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -36310,7 +36310,7 @@ function getItemClass($xeForm, item, isGroup) {
   var isRequired = false;
   var isValid = false;
   if (!readonly && rules) {
-    var itemRules = rules[field];
+    var itemRules = item.rules ? item.rules : rules[field];
     if (itemRules && itemRules.length) {
       isValid = true;
       isRequired = itemRules.some(function (rule) {
@@ -37978,7 +37978,8 @@ function form_createInternalData() {
         var errorRules = [];
         var syncVailds = [];
         if (property && formRules) {
-          var rules = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(formRules, property);
+          var item = $xeForm.getItemByField(property);
+          var rules = item && item.rules ? item.rules : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(formRules, property);
           if (rules) {
             var itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(val) ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, property) : val;
             rules.forEach(function (rule) {
@@ -54222,7 +54223,7 @@ var scrollbarOffsetSize = 20;
         stys.width = toCssUnit(width);
       }
       if (height) {
-        stys.height = toCssUnit(height);
+        stys.height = height === 'auto' ? '100%' : toCssUnit(height);
       }
       return stys;
     },