vxe-table 4.2.4-beta.2 → 4.2.4

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

@@ -0,0 +1,212 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _vue = require("vue");
+
+var _xeUtils = _interopRequireDefault(require("xe-utils"));
+
+var _conf = _interopRequireDefault(require("../../v-x-e-table/src/conf"));
+
+var _vXETable = require("../../v-x-e-table");
+
+var _utils = require("../../tools/utils");
+
+var _render = require("./render");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var __assign = void 0 && (void 0).__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
+var VxeFormConfigItem = (0, _vue.defineComponent)({
+  name: 'VxeFormConfigItem',
+  props: {
+    itemConfig2: Object,
+    itemConfig: Object
+  },
+  setup: function setup(props) {
+    var $xeform = (0, _vue.inject)('$xeform', {});
+    var xeformiteminfo = {
+      itemConfig: props.itemConfig
+    };
+    (0, _vue.provide)('$xeformiteminfo', xeformiteminfo);
+    (0, _vue.provide)('$xeformgather', null);
+
+    var renderVN = function renderVN() {
+      var reactData = $xeform.reactData;
+      var _a = $xeform.props,
+          data = _a.data,
+          rules = _a.rules,
+          allSpan = _a.span,
+          allAlign = _a.align,
+          allTitleAlign = _a.titleAlign,
+          allTitleWidth = _a.titleWidth,
+          allTitleColon = _a.titleColon,
+          allTitleAsterisk = _a.titleAsterisk,
+          allTitleOverflow = _a.titleOverflow;
+      var computeValidOpts = $xeform.getComputeMaps().computeValidOpts;
+      var item = props.itemConfig;
+      var collapseAll = reactData.collapseAll;
+      var validOpts = computeValidOpts.value;
+      var slots = item.slots,
+          title = item.title,
+          visible = item.visible,
+          folding = item.folding,
+          visibleMethod = item.visibleMethod,
+          field = item.field,
+          collapseNode = item.collapseNode,
+          itemRender = item.itemRender,
+          showError = item.showError,
+          errRule = item.errRule,
+          className = item.className,
+          titleOverflow = item.titleOverflow,
+          children = item.children;
+      var compConf = (0, _utils.isEnableConf)(itemRender) ? _vXETable.VXETable.renderer.get(itemRender.name) : null;
+      var defaultSlot = slots ? slots.default : null;
+      var titleSlot = slots ? slots.title : null;
+      var span = item.span || allSpan;
+      var align = item.align || allAlign;
+      var titleAlign = item.titleAlign || allTitleAlign;
+      var titleWidth = item.titleWidth || allTitleWidth;
+      var titleColon = item.titleColon === null ? allTitleColon : item.titleColon;
+      var titleAsterisk = item.titleAsterisk === null ? allTitleAsterisk : item.titleAsterisk;
+      var itemOverflow = _xeUtils.default.isUndefined(titleOverflow) || _xeUtils.default.isNull(titleOverflow) ? allTitleOverflow : titleOverflow;
+      var showEllipsis = itemOverflow === 'ellipsis';
+      var showTitle = itemOverflow === 'title';
+      var showTooltip = itemOverflow === true || itemOverflow === 'tooltip';
+      var hasEllipsis = showTitle || showTooltip || showEllipsis;
+      var itemVisibleMethod = visibleMethod;
+      var params = {
+        data: data,
+        field: field,
+        property: field,
+        item: item,
+        $form: $xeform
+      };
+
+      if (visible === false) {
+        return (0, _vue.createCommentVNode)();
+      }
+
+      var isRequired = false;
+
+      if (rules) {
+        var itemRules = rules[field];
+
+        if (itemRules) {
+          isRequired = itemRules.some(function (rule) {
+            return rule.required;
+          });
+        }
+      } // 如果为项集合
+
+
+      var isGather = children && children.length > 0;
+
+      if (isGather) {
+        var childVNs = children.map(function (childItem, index) {
+          return (0, _vue.h)(VxeFormConfigItem, {
+            key: index,
+            itemConfig: childItem
+          });
+        });
+        return childVNs.length ? (0, _vue.h)('div', {
+          class: ['vxe-form--gather vxe-row', item.id, span ? "vxe-col--" + span + " is--span" : '', className ? _xeUtils.default.isFunction(className) ? className(params) : className : '']
+        }, childVNs) : (0, _vue.createCommentVNode)();
+      }
+
+      if (!itemVisibleMethod && compConf && compConf.itemVisibleMethod) {
+        itemVisibleMethod = compConf.itemVisibleMethod;
+      }
+
+      var contentVNs = [];
+
+      if (defaultSlot) {
+        contentVNs = $xeform.callSlot(defaultSlot, params);
+      } else if (compConf && compConf.renderItemContent) {
+        contentVNs = compConf.renderItemContent(itemRender, params);
+      } else if (field) {
+        contentVNs = ["" + _xeUtils.default.get(data, field)];
+      }
+
+      if (collapseNode) {
+        contentVNs.push((0, _vue.h)('div', {
+          class: 'vxe-form--item-trigger-node',
+          onClick: $xeform.toggleCollapseEvent
+        }, [(0, _vue.h)('span', {
+          class: 'vxe-form--item-trigger-text'
+        }, collapseAll ? _conf.default.i18n('vxe.form.unfolding') : _conf.default.i18n('vxe.form.folding')), (0, _vue.h)('i', {
+          class: ['vxe-form--item-trigger-icon', collapseAll ? _conf.default.icon.FORM_FOLDING : _conf.default.icon.FORM_UNFOLDING]
+        })]));
+      }
+
+      if (errRule && validOpts.showMessage) {
+        contentVNs.push((0, _vue.h)('div', {
+          class: 'vxe-form--item-valid',
+          style: errRule.maxWidth ? {
+            width: errRule.maxWidth + "px"
+          } : null
+        }, errRule.content));
+      }
+
+      var ons = showTooltip ? {
+        onMouseenter: function onMouseenter(evnt) {
+          $xeform.triggerTitleTipEvent(evnt, params);
+        },
+        onMouseleave: $xeform.handleTitleTipLeaveEvent
+      } : {};
+      return (0, _vue.h)('div', {
+        class: ['vxe-form--item', item.id, span ? "vxe-col--" + span + " is--span" : '', className ? _xeUtils.default.isFunction(className) ? className(params) : className : '', {
+          'is--title': title,
+          'is--colon': titleColon,
+          'is--asterisk': titleAsterisk,
+          'is--required': isRequired,
+          'is--hidden': folding && collapseAll,
+          'is--active': !itemVisibleMethod || itemVisibleMethod(params),
+          'is--error': showError
+        }],
+        itemConfig: item,
+        key: item.id
+      }, [(0, _vue.h)('div', {
+        class: 'vxe-form--item-inner'
+      }, [title || titleSlot ? (0, _vue.h)('div', __assign({
+        class: ['vxe-form--item-title', titleAlign ? "align--" + titleAlign : null, {
+          'is--ellipsis': hasEllipsis
+        }],
+        style: titleWidth ? {
+          width: isNaN(titleWidth) ? titleWidth : titleWidth + "px"
+        } : null,
+        title: showTitle ? (0, _utils.getFuncText)(title) : null
+      }, ons), (0, _render.renderTitle)($xeform, item)) : null, (0, _vue.h)('div', {
+        class: ['vxe-form--item-content', align ? "align--" + align : null]
+      }, contentVNs)])]);
+    };
+
+    var $xeformconfigitem = {
+      renderVN: renderVN
+    };
+    return $xeformconfigitem;
+  },
+  render: function render() {
+    return this.renderVN();
+  }
+});
+var _default = VxeFormConfigItem;
+exports.default = _default;

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

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

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

@@ -20,14 +20,19 @@ var _default = (0, _vue.defineComponent)({
     var slots = _a.slots;
     var refElem = (0, _vue.ref)();
     var $xeform = (0, _vue.inject)('$xeform', {});
-    var formGather = (0, _vue.inject)('xeformgather', null);
+    var formGather = (0, _vue.inject)('$xeformgather', null);
     var defaultSlot = slots.default;
     var formItem = (0, _vue.reactive)((0, _util.createItem)($xeform, props));
     var xeformitem = {
       formItem: formItem
     };
+    var xeformiteminfo = {
+      itemConfig: formItem
+    };
     formItem.children = [];
-    (0, _vue.provide)('xeformgather', xeformitem);
+    (0, _vue.provide)('$xeformiteminfo', xeformiteminfo);
+    (0, _vue.provide)('$xeformgather', xeformitem);
+    (0, _vue.provide)('$xeformitem', null);
     (0, _util.watchItem)(props, formItem);
     (0, _vue.onMounted)(function () {
       (0, _util.assemItem)($xeform, refElem.value, formItem, formGather);
@@ -50,7 +55,13 @@ var _default = (0, _vue.defineComponent)({
       }, defaultSlot ? defaultSlot() : []);
     };
 
-    return renderVN;
+    var $xeformgather = {
+      renderVN: renderVN
+    };
+    return $xeformgather;
+  },
+  render: function render() {
+    return this.renderVN();
   }
 });
 

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_log=require("../../tools/log"),_util=require("./util"),_formItem=require("./form-item"),_default=(0,_vue.defineComponent)({name:"VxeFormGather",props:_formItem.formItemProps,setup:function(e,t){var t=t.slots,r=(0,_vue.ref)(),o=(0,_vue.inject)("$xeform",{}),u=(0,_vue.inject)("xeformgather",null),n=t.default,i=(0,_vue.reactive)((0,_util.createItem)(o,e)),t={formItem:i};i.children=[],(0,_vue.provide)("xeformgather",t),(0,_util.watchItem)(e,i),(0,_vue.onMounted)(function(){(0,_util.assemItem)(o,r.value,i,u)}),(0,_vue.onUnmounted)(function(){(0,_util.destroyItem)(o,i)}),"development"===process.env.NODE_ENV&&(0,_vue.nextTick)(function(){o&&o.props.customLayout&&(0,_log.errLog)("vxe.error.errConflicts",["custom-layout","<form-gather ...>"])});return function(){return(0,_vue.h)("div",{ref:r},n?n():[])}}});exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_log=require("../../tools/log"),_util=require("./util"),_formItem=require("./form-item"),_default=(0,_vue.defineComponent)({name:"VxeFormGather",props:_formItem.formItemProps,setup:function(e,r){var t=r.slots,o=(0,_vue.ref)(),u=(0,_vue.inject)("$xeform",{}),n=(0,_vue.inject)("$xeformgather",null),i=t.default,m=(0,_vue.reactive)((0,_util.createItem)(u,e)),r={formItem:m},t={itemConfig:m};m.children=[],(0,_vue.provide)("$xeformiteminfo",t),(0,_vue.provide)("$xeformgather",r),(0,_vue.provide)("$xeformitem",null),(0,_util.watchItem)(e,m),(0,_vue.onMounted)(function(){(0,_util.assemItem)(u,o.value,m,n)}),(0,_vue.onUnmounted)(function(){(0,_util.destroyItem)(u,m)}),"development"===process.env.NODE_ENV&&(0,_vue.nextTick)(function(){u&&u.props.customLayout&&(0,_log.errLog)("vxe.error.errConflicts",["custom-layout","<form-gather ...>"])});return{renderVN:function(){return(0,_vue.h)("div",{ref:o},i?i():[])}}},render:function(){return this.renderVN()}});exports.default=_default;

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

@@ -44,6 +44,14 @@ var formItemProps = {
   align: String,
   titleAlign: String,
   titleWidth: [String, Number],
+  titleColon: {
+    type: Boolean,
+    default: null
+  },
+  titleAsterisk: {
+    type: Boolean,
+    default: null
+  },
   className: [String, Function],
   titleOverflow: {
     type: [Boolean, String],
@@ -72,9 +80,18 @@ var _default = (0, _vue.defineComponent)({
     var slots = _a.slots;
     var refElem = (0, _vue.ref)();
     var $xeform = (0, _vue.inject)('$xeform', {});
-    var formGather = (0, _vue.inject)('xeformgather', null);
+    var formGather = (0, _vue.inject)('$xeformgather', null);
     var formItem = (0, _util.createItem)($xeform, props);
+    var xeformitem = {
+      formItem: formItem
+    };
+    var xeformiteminfo = {
+      itemConfig: formItem
+    };
     formItem.slots = slots;
+    (0, _vue.provide)('$xeformiteminfo', xeformiteminfo);
+    (0, _vue.provide)('$xeformitem', xeformitem);
+    (0, _vue.provide)('$xeformgather', null);
     (0, _util.watchItem)(props, formItem);
     (0, _vue.onMounted)(function () {
       (0, _util.assemItem)($xeform, refElem.value, formItem, formGather);
@@ -206,7 +223,13 @@ var _default = (0, _vue.defineComponent)({
       });
     };
 
-    return renderVN;
+    var $xeformitem = {
+      renderVN: renderVN
+    };
+    return $xeformitem;
+  },
+  render: function render() {
+    return this.renderVN();
   }
 });
 

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

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

package/lib/form/src/form.js

@@ -21,10 +21,10 @@ var _dom = require("../../tools/dom");
 
 var _util = require("./util");
 
-var _render = require("./render");
-
 var _size = require("../../hooks/size");
 
+var _formConfigItem = _interopRequireDefault(require("./form-config-item"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var __assign = void 0 && (void 0).__assign || function () {
@@ -481,7 +481,7 @@ var _default2 = (0, _vue.defineComponent)({
                 }
               } else {
                 var isArrType = type === 'array';
-                var hasEmpty = isArrType ? !_xeUtils.default.isArray(itemValue_1) || !itemValue_1.length : (0, _utils.eqEmptyValue)(itemValue_1);
+                var hasEmpty = isArrType || _xeUtils.default.isArray(itemValue_1) ? !_xeUtils.default.isArray(itemValue_1) || !itemValue_1.length : (0, _utils.eqEmptyValue)(itemValue_1);
 
                 if (required ? hasEmpty || validErrorRuleValue(rule, itemValue_1) : !hasEmpty && validErrorRuleValue(rule, itemValue_1)) {
                   errorRules.push(new Rule(rule));
@@ -674,22 +674,14 @@ var _default2 = (0, _vue.defineComponent)({
         closeTooltip();
       }
     };
-    /**
-     * 更新项状态
-     * 如果组件值 v-model 发生 change 时，调用改函数用于更新某一项编辑状态
-     * 如果单元格配置了校验规则，则会进行校验
-     */
-
 
-    var updateStatus = function updateStatus(scope, itemValue) {
-      var property = scope.property;
-
-      if (property) {
-        validItemRules('change', property, itemValue).then(function () {
-          clearValidate(property);
+    var triggerItemEvent = function triggerItemEvent(evnt, field, itemValue) {
+      if (field) {
+        return validItemRules(evnt ? evnt.type : 'all', field, itemValue).then(function () {
+          clearValidate(field);
         }).catch(function (_a) {
           var rule = _a.rule;
-          var item = getItemByField(property);
+          var item = getItemByField(field);
 
           if (item) {
             item.showError = true;
@@ -697,138 +689,19 @@ var _default2 = (0, _vue.defineComponent)({
           }
         });
       }
-    };
-
-    var renderItems = function renderItems(itemList) {
-      var data = props.data,
-          rules = props.rules,
-          allTitleOverflow = props.titleOverflow;
-      var collapseAll = reactData.collapseAll;
-      var validOpts = computeValidOpts.value;
-      return itemList.map(function (item) {
-        var slots = item.slots,
-            title = item.title,
-            visible = item.visible,
-            folding = item.folding,
-            visibleMethod = item.visibleMethod,
-            field = item.field,
-            collapseNode = item.collapseNode,
-            itemRender = item.itemRender,
-            showError = item.showError,
-            errRule = item.errRule,
-            className = item.className,
-            titleOverflow = item.titleOverflow,
-            children = item.children;
-        var compConf = (0, _utils.isEnableConf)(itemRender) ? _vXETable.VXETable.renderer.get(itemRender.name) : null;
-        var defaultSlot = slots ? slots.default : null;
-        var titleSlot = slots ? slots.title : null;
-        var span = item.span || props.span;
-        var align = item.align || props.align;
-        var titleAlign = item.titleAlign || props.titleAlign;
-        var titleWidth = item.titleWidth || props.titleWidth;
-        var itemOverflow = _xeUtils.default.isUndefined(titleOverflow) || _xeUtils.default.isNull(titleOverflow) ? allTitleOverflow : titleOverflow;
-        var showEllipsis = itemOverflow === 'ellipsis';
-        var showTitle = itemOverflow === 'title';
-        var showTooltip = itemOverflow === true || itemOverflow === 'tooltip';
-        var hasEllipsis = showTitle || showTooltip || showEllipsis;
-        var itemVisibleMethod = visibleMethod;
-        var params = {
-          data: data,
-          field: field,
-          property: field,
-          item: item,
-          $form: $xeform
-        };
-
-        if (visible === false) {
-          return (0, _vue.createCommentVNode)();
-        }
-
-        var isRequired = false;
-
-        if (rules) {
-          var itemRules = rules[field];
-
-          if (itemRules) {
-            isRequired = itemRules.some(function (rule) {
-              return rule.required;
-            });
-          }
-        } // 如果为项集合
-
-
-        var isGather = children && children.length > 0;
 
-        if (isGather) {
-          var childVNs = renderItems(item.children);
-          return childVNs.length ? (0, _vue.h)('div', {
-            class: ['vxe-form--gather vxe-row', item.id, span ? "vxe-col--" + span + " is--span" : '', className ? _xeUtils.default.isFunction(className) ? className(params) : className : '']
-          }, childVNs) : (0, _vue.createCommentVNode)();
-        }
-
-        if (!itemVisibleMethod && compConf && compConf.itemVisibleMethod) {
-          itemVisibleMethod = compConf.itemVisibleMethod;
-        }
-
-        var contentVNs = [];
-
-        if (defaultSlot) {
-          contentVNs = callSlot(defaultSlot, params);
-        } else if (compConf && compConf.renderItemContent) {
-          contentVNs = compConf.renderItemContent(itemRender, params);
-        } else if (field) {
-          contentVNs = ["" + _xeUtils.default.get(data, field)];
-        }
-
-        if (collapseNode) {
-          contentVNs.push((0, _vue.h)('div', {
-            class: 'vxe-form--item-trigger-node',
-            onClick: toggleCollapseEvent
-          }, [(0, _vue.h)('span', {
-            class: 'vxe-form--item-trigger-text'
-          }, collapseAll ? _conf.default.i18n('vxe.form.unfolding') : _conf.default.i18n('vxe.form.folding')), (0, _vue.h)('i', {
-            class: ['vxe-form--item-trigger-icon', collapseAll ? _conf.default.icon.FORM_FOLDING : _conf.default.icon.FORM_UNFOLDING]
-          })]));
-        }
+      return (0, _vue.nextTick)();
+    };
+    /**
+     * 更新项状态
+     * 如果组件值 v-model 发生 change 时，调用改函数用于更新某一项编辑状态
+     * 如果单元格配置了校验规则，则会进行校验
+     */
 
-        if (errRule && validOpts.showMessage) {
-          contentVNs.push((0, _vue.h)('div', {
-            class: 'vxe-form--item-valid',
-            style: errRule.maxWidth ? {
-              width: errRule.maxWidth + "px"
-            } : null
-          }, errRule.content));
-        }
 
-        var ons = showTooltip ? {
-          onMouseenter: function onMouseenter(evnt) {
-            triggerTitleTipEvent(evnt, params);
-          },
-          onMouseleave: handleTitleTipLeaveEvent
-        } : {};
-        return (0, _vue.h)('div', {
-          class: ['vxe-form--item', item.id, span ? "vxe-col--" + span + " is--span" : '', className ? _xeUtils.default.isFunction(className) ? className(params) : className : '', {
-            'is--title': title,
-            'is--required': isRequired,
-            'is--hidden': folding && collapseAll,
-            'is--active': !itemVisibleMethod || itemVisibleMethod(params),
-            'is--error': showError
-          }],
-          key: item.id
-        }, [(0, _vue.h)('div', {
-          class: 'vxe-form--item-inner'
-        }, [title || titleSlot ? (0, _vue.h)('div', __assign({
-          class: ['vxe-form--item-title', titleAlign ? "align--" + titleAlign : null, {
-            'is--ellipsis': hasEllipsis
-          }],
-          style: titleWidth ? {
-            width: isNaN(titleWidth) ? titleWidth : titleWidth + "px"
-          } : null,
-          title: showTitle ? (0, _utils.getFuncText)(title) : null
-        }, ons), (0, _render.renderTitle)($xeform, item)) : null, (0, _vue.h)('div', {
-          class: ['vxe-form--item-content', align ? "align--" + align : null]
-        }, contentVNs)])]);
-      });
+    var updateStatus = function updateStatus(scope, itemValue) {
+      var field = scope.field;
+      return triggerItemEvent(new Event('change'), field, itemValue);
     };
 
     formMethods = {
@@ -850,6 +723,7 @@ var _default2 = (0, _vue.defineComponent)({
     };
     var formPrivateMethods = {
       callSlot: callSlot,
+      triggerItemEvent: triggerItemEvent,
       toggleCollapseEvent: toggleCollapseEvent,
       triggerTitleTipEvent: triggerTitleTipEvent,
       handleTitleTipLeaveEvent: handleTitleTipLeaveEvent
@@ -888,8 +762,6 @@ var _default2 = (0, _vue.defineComponent)({
       var loading = props.loading,
           className = props.className,
           data = props.data,
-          titleColon = props.titleColon,
-          titleAsterisk = props.titleAsterisk,
           customLayout = props.customLayout;
       var formItems = reactData.formItems; // const formItems: any[] = []
 
@@ -902,12 +774,18 @@ var _default2 = (0, _vue.defineComponent)({
           items: formItems,
           data: data,
           $form: $xeform
-        }) : className : '', (_a = {}, _a["size--" + vSize] = vSize, _a['is--colon'] = titleColon, _a['is--asterisk'] = titleAsterisk, _a['is--loading'] = loading, _a)],
+        }) : className : '', (_a = {}, _a["size--" + vSize] = vSize, _a['is--loading'] = loading, _a)],
         onSubmit: submitEvent,
         onReset: resetEvent
       }, [(0, _vue.h)('div', {
         class: 'vxe-form--wrapper vxe-row'
-      }, customLayout ? defaultSlot ? defaultSlot({}) : [] : renderItems(formItems)), (0, _vue.h)('div', {
+      }, customLayout ? defaultSlot ? defaultSlot({}) : [] : formItems.map(function (item, index) {
+        return (0, _vue.h)(_formConfigItem.default, {
+          key: index,
+          itemConfig2: item,
+          itemConfig: item
+        });
+      })), (0, _vue.h)('div', {
         class: 'vxe-form-slots',
         ref: 'hideItem'
       }, customLayout ? [] : defaultSlot ? defaultSlot({}) : []), (0, _vue.h)('div', {
@@ -927,6 +805,9 @@ var _default2 = (0, _vue.defineComponent)({
 
     $xeform.renderVN = renderVN;
     (0, _vue.provide)('$xeform', $xeform);
+    (0, _vue.provide)('$xeformgather', null);
+    (0, _vue.provide)('$xeformitem', null);
+    (0, _vue.provide)('$xeformiteminfo', null);
     return $xeform;
   },
   render: function render() {

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

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

package/lib/form/src/itemInfo.js

@@ -21,6 +21,8 @@ function () {
       align: item.align,
       titleAlign: item.titleAlign,
       titleWidth: item.titleWidth,
+      titleColon: item.titleColon,
+      titleAsterisk: item.titleAsterisk,
       titlePrefix: item.titlePrefix,
       titleSuffix: item.titleSuffix,
       titleOverflow: item.titleOverflow,

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.ItemInfo=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var ItemInfo=function(){function e(e,t){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,titlePrefix:t.titlePrefix,titleSuffix:t.titleSuffix,titleOverflow:t.titleOverflow,resetValue:t.resetValue,visibleMethod:t.visibleMethod,visible:t.visible,folding:t.folding,collapseNode:t.collapseNode,className:t.className,itemRender:t.itemRender,showError:!1,errRule:null,slots:t.slots,children:[]})}return e.prototype.update=function(e,t){this[e]=t},e}();exports.ItemInfo=ItemInfo;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.ItemInfo=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var ItemInfo=function(){function e(e,t){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,visibleMethod:t.visibleMethod,visible:t.visible,folding:t.folding,collapseNode:t.collapseNode,className:t.className,itemRender:t.itemRender,showError:!1,errRule:null,slots:t.slots,children:[]})}return e.prototype.update=function(e,t){this[e]=t},e}();exports.ItemInfo=ItemInfo;