vxe-table 4.1.20 → 4.2.0-beta.2

package/lib/footer/src/footer.js

@@ -97,7 +97,10 @@ var _default2 = (0, _vue.defineComponent)({
         refTableBody = _a.refTableBody,
         refValidTooltip = _a.refValidTooltip;
 
-    var computeTooltipOpts = $xetable.getComputeMaps().computeTooltipOpts;
+    var _b = $xetable.getComputeMaps(),
+        computeTooltipOpts = _b.computeTooltipOpts,
+        computeColumnOpts = _b.computeColumnOpts;
+
     var refElem = (0, _vue.ref)();
     var refFooterTable = (0, _vue.ref)();
     var refFooterColgroup = (0, _vue.ref)();
@@ -193,7 +196,8 @@ var _default2 = (0, _vue.defineComponent)({
           scrollbarWidth = tableReactData.scrollbarWidth,
           currentColumn = tableReactData.currentColumn,
           mergeFooterList = tableReactData.mergeFooterList;
-      var tooltipOpts = computeTooltipOpts.value; // 如果是使用优化模式
+      var tooltipOpts = computeTooltipOpts.value;
+      var columnOpts = computeColumnOpts.value; // 如果是使用优化模式
 
       if (fixedType) {
         if (scrollYLoad || allColumnFooterOverflow) {
@@ -379,7 +383,7 @@ var _default2 = (0, _vue.defineComponent)({
           }, attrs), {
             style: footerCellStyle ? _xeUtils.default.isFunction(footerCellStyle) ? footerCellStyle(params) : footerCellStyle : null
           }), tfOns), {
-            key: columnKey ? column.id : $columnIndex
+            key: columnKey || columnOpts.useKey ? column.id : $columnIndex
           }), [(0, _vue.h)('div', {
             class: ['vxe-cell', {
               'c--title': showTitle,

package/lib/footer/src/footer.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")),_util=require("../../table/src/util"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var l,t=1,o=arguments.length;t<o;t++)for(var r in l=arguments[t])Object.prototype.hasOwnProperty.call(l,r)&&(e[r]=l[r]);return e}).apply(this,arguments)},renderType="footer";function mergeFooterMethod(e,l,t){for(var o=0;o<e.length;o++){var r=e[o],n=r.row,a=r.col,i=r.rowspan,r=r.colspan;if(-1<a&&-1<n&&i&&r){if(n===l&&a===t)return{rowspan:i,colspan:r};if(n<=l&&l<n+i&&a<=t&&t<a+r)return{rowspan:0,colspan:0}}}}var _default2=(0,_vue.defineComponent)({name:"VxeTableFooter",props:{footerTableData:{type:Array,default:function(){return[]}},tableColumn:{type:Array,default:function(){return[]}},fixedColumn:{type:Array,default:function(){return[]}},fixedType:{type:String,default:null}},setup:function(u){function n(e){var l=u.fixedType,t=s.scrollXLoad,o=c.lastScrollLeft,r=p.value,n=f.value,a=d.value,i=n?n.$el:null,n=_.value,a=a.$el,o=(n=n.scrollLeft)!==o;c.lastScrollLeft=n,c.lastScrollTime=Date.now(),i&&(i.scrollLeft=n),a&&(a.scrollLeft=n),t&&o&&A.triggerScrollXEvent(e),o&&r&&r.reactData.visible&&r.updatePlacement(),A.dispatchEvent("scroll",{type:renderType,fixed:l,scrollTop:a.scrollTop,scrollLeft:n,isX:o,isY:!1},e)}var A=(0,_vue.inject)("$xetable",{}),a=A.xID,i=A.props,s=A.reactData,c=A.internalData,e=A.getRefMaps(),f=e.refTableHeader,d=e.refTableBody,p=e.refValidTooltip,v=A.getComputeMaps().computeTooltipOpts,_=(0,_vue.ref)(),x=(0,_vue.ref)(),g=(0,_vue.ref)(),m=(0,_vue.ref)(),y=(0,_vue.ref)();(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=u.fixedType,l=c.elemStore,e=(e||"main")+"-footer-";l[e+"wrapper"]=_.value,l[e+"table"]=x.value,l[e+"colgroup"]=g.value,l[e+"list"]=m.value,l[e+"xSpace"]=y.value})}),(0,_vue.onUnmounted)(function(){var e=u.fixedType,l=c.elemStore,e=(e||"main")+"-footer-";l[e+"wrapper"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null});return function(){var w=u.fixedType,e=u.fixedColumn,T=u.tableColumn,C=u.footerTableData,l=i.footerRowClassName,I=i.footerCellClassName,t=i.footerRowStyle,S=i.footerCellStyle,F=i.footerAlign,D=i.footerSpanMethod,L=i.align,M=i.columnKey,$=i.showFooterOverflow,o=c.visibleColumn,O=s.scrollYLoad,U=s.overflowX,r=s.scrollbarWidth,k=s.currentColumn,j=s.mergeFooterList,q=v.value;return w&&(T=!O&&!$||j.length&&D?o:e),(0,_vue.h)("div",{ref:_,class:["vxe-table--footer-wrapper",w?"fixed-"+w+"--wrapper":"body--wrapper"],xid:a,onScroll:n},[w?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:y,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:x,class:"vxe-table--footer",xid:a,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:g},T.map(function(e,l){return(0,_vue.h)("col",{name:e.id,key:l})}).concat(r?[(0,_vue.h)("col",{name:"col_gutter"})]:[])),(0,_vue.h)("tfoot",{ref:m},C.map(function(y,h){var b=h;return(0,_vue.h)("tr",{class:["vxe-footer--row",l?_xeUtils.default.isFunction(l)?l({$table:A,_rowIndex:h,$rowIndex:b,fixed:w,type:renderType}):l:""],style:t?_xeUtils.default.isFunction(t)?t({$table:A,_rowIndex:h,$rowIndex:b,fixed:w,type:renderType}):t:null},T.map(function(l,e){var t=l.type,o=l.showFooterOverflow,r=l.footerAlign,n=l.align,a=l.footerClassName,i=q.showAll,u=l.children&&l.children.length,s=w?l.fixed!==w&&!u:l.fixed&&U,c=_xeUtils.default.isUndefined(o)||_xeUtils.default.isNull(o)?$:o,f=r||n||F||L,d="ellipsis"===c,p="title"===c,v=!0===c||"tooltip"===c,u=p||v||d,o={colid:l.id},r={},n=A.getColumnIndex(l),c=A.getVTColumnIndex(l),_={$table:A,_rowIndex:h,$rowIndex:b,column:l,columnIndex:n,$columnIndex:e,_columnIndex:c,itemIndex:c,items:y,fixed:w,type:renderType,data:C};if(O&&!u&&(d=u=!0),(p||v||i)&&(r.onMouseenter=function(e){p?(0,_dom.updateCellTitle)(e.currentTarget,l):(v||i)&&A.triggerFooterTooltipEvent(e,_)}),(v||i)&&(r.onMouseleave=function(e){(v||i)&&A.handleTargetLeaveEvent(e)}),r.onClick=function(e){A.dispatchEvent("footer-cell-click",Object.assign({cell:e.currentTarget},_),e)},r.onDblclick=function(e){A.dispatchEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},_),e)},j.length){var x=mergeFooterMethod(j,h,c);if(x){var g=x.rowspan,m=x.colspan;if(!g||!m)return null;1<g&&(o.rowspan=g),1<m&&(o.colspan=m)}}else if(D){var c=D(_)||{},x=c.rowspan,g=void 0===x?1:x,c=c.colspan,m=void 0===c?1:c;if(!g||!m)return null;1<g&&(o.rowspan=g),1<m&&(o.colspan=m)}return(0,_vue.h)("td",__assign(__assign(__assign(__assign({class:["vxe-footer--column",l.id,((m={})["col--"+f]=f,m["col--"+t]=t,m["col--last"]=e===T.length-1,m["fixed--hidden"]=s,m["col--ellipsis"]=u,m["col--current"]=k===l,m),(0,_util.getPropClass)(a,_),(0,_util.getPropClass)(I,_)]},o),{style:S?_xeUtils.default.isFunction(S)?S(_):S:null}),r),{key:M?l.id:e}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":p,"c--tooltip":v,"c--ellipsis":d}]},l.renderFooter(_))])}).concat(r?[(0,_vue.h)("td",{class:"vxe-footer--gutter col--gutter"})]:[]))}))])])}}});exports.default=_default2;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("../../table/src/util"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var l,t=1,o=arguments.length;t<o;t++)for(var r in l=arguments[t])Object.prototype.hasOwnProperty.call(l,r)&&(e[r]=l[r]);return e}).apply(this,arguments)},renderType="footer";function mergeFooterMethod(e,l,t){for(var o=0;o<e.length;o++){var r=e[o],n=r.row,a=r.col,u=r.rowspan,r=r.colspan;if(-1<a&&-1<n&&u&&r){if(n===l&&a===t)return{rowspan:u,colspan:r};if(n<=l&&l<n+u&&a<=t&&t<a+r)return{rowspan:0,colspan:0}}}}var _default2=(0,_vue.defineComponent)({name:"VxeTableFooter",props:{footerTableData:{type:Array,default:function(){return[]}},tableColumn:{type:Array,default:function(){return[]}},fixedColumn:{type:Array,default:function(){return[]}},fixedType:{type:String,default:null}},setup:function(i){function n(e){var l=i.fixedType,t=s.scrollXLoad,o=c.lastScrollLeft,r=p.value,n=f.value,a=d.value,u=n?n.$el:null,n=x.value,a=a.$el,o=(n=n.scrollLeft)!==o;c.lastScrollLeft=n,c.lastScrollTime=Date.now(),u&&(u.scrollLeft=n),a&&(a.scrollLeft=n),t&&o&&E.triggerScrollXEvent(e),o&&r&&r.reactData.visible&&r.updatePlacement(),E.dispatchEvent("scroll",{type:renderType,fixed:l,scrollTop:a.scrollTop,scrollLeft:n,isX:o,isY:!1},e)}var E=(0,_vue.inject)("$xetable",{}),a=E.xID,u=E.props,s=E.reactData,c=E.internalData,e=E.getRefMaps(),f=e.refTableHeader,d=e.refTableBody,p=e.refValidTooltip,e=E.getComputeMaps(),v=e.computeTooltipOpts,_=e.computeColumnOpts,x=(0,_vue.ref)(),g=(0,_vue.ref)(),m=(0,_vue.ref)(),y=(0,_vue.ref)(),h=(0,_vue.ref)();(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=i.fixedType,l=c.elemStore,e=(e||"main")+"-footer-";l[e+"wrapper"]=x.value,l[e+"table"]=g.value,l[e+"colgroup"]=m.value,l[e+"list"]=y.value,l[e+"xSpace"]=h.value})}),(0,_vue.onUnmounted)(function(){var e=i.fixedType,l=c.elemStore,e=(e||"main")+"-footer-";l[e+"wrapper"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null});return function(){var w=i.fixedType,e=i.fixedColumn,T=i.tableColumn,C=i.footerTableData,l=u.footerRowClassName,I=u.footerCellClassName,t=u.footerRowStyle,S=u.footerCellStyle,F=u.footerAlign,D=u.footerSpanMethod,L=u.align,M=u.columnKey,O=u.showFooterOverflow,o=c.visibleColumn,$=s.scrollYLoad,U=s.overflowX,r=s.scrollbarWidth,k=s.currentColumn,j=s.mergeFooterList,q=v.value,A=_.value;return w&&(T=!$&&!O||j.length&&D?o:e),(0,_vue.h)("div",{ref:x,class:["vxe-table--footer-wrapper",w?"fixed-"+w+"--wrapper":"body--wrapper"],xid:a,onScroll:n},[w?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:h,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:g,class:"vxe-table--footer",xid:a,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:m},T.map(function(e,l){return(0,_vue.h)("col",{name:e.id,key:l})}).concat(r?[(0,_vue.h)("col",{name:"col_gutter"})]:[])),(0,_vue.h)("tfoot",{ref:y},C.map(function(y,h){var b=h;return(0,_vue.h)("tr",{class:["vxe-footer--row",l?_xeUtils.default.isFunction(l)?l({$table:E,_rowIndex:h,$rowIndex:b,fixed:w,type:renderType}):l:""],style:t?_xeUtils.default.isFunction(t)?t({$table:E,_rowIndex:h,$rowIndex:b,fixed:w,type:renderType}):t:null},T.map(function(l,e){var t=l.type,o=l.showFooterOverflow,r=l.footerAlign,n=l.align,a=l.footerClassName,u=q.showAll,i=l.children&&l.children.length,s=w?l.fixed!==w&&!i:l.fixed&&U,c=_xeUtils.default.isUndefined(o)||_xeUtils.default.isNull(o)?O:o,f=r||n||F||L,d="ellipsis"===c,p="title"===c,v=!0===c||"tooltip"===c,i=p||v||d,o={colid:l.id},r={},n=E.getColumnIndex(l),c=E.getVTColumnIndex(l),_={$table:E,_rowIndex:h,$rowIndex:b,column:l,columnIndex:n,$columnIndex:e,_columnIndex:c,itemIndex:c,items:y,fixed:w,type:renderType,data:C};if($&&!i&&(d=i=!0),(p||v||u)&&(r.onMouseenter=function(e){p?(0,_dom.updateCellTitle)(e.currentTarget,l):(v||u)&&E.triggerFooterTooltipEvent(e,_)}),(v||u)&&(r.onMouseleave=function(e){(v||u)&&E.handleTargetLeaveEvent(e)}),r.onClick=function(e){E.dispatchEvent("footer-cell-click",Object.assign({cell:e.currentTarget},_),e)},r.onDblclick=function(e){E.dispatchEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},_),e)},j.length){var x=mergeFooterMethod(j,h,c);if(x){var g=x.rowspan,m=x.colspan;if(!g||!m)return null;1<g&&(o.rowspan=g),1<m&&(o.colspan=m)}}else if(D){var c=D(_)||{},x=c.rowspan,g=void 0===x?1:x,c=c.colspan,m=void 0===c?1:c;if(!g||!m)return null;1<g&&(o.rowspan=g),1<m&&(o.colspan=m)}return(0,_vue.h)("td",__assign(__assign(__assign(__assign({class:["vxe-footer--column",l.id,((m={})["col--"+f]=f,m["col--"+t]=t,m["col--last"]=e===T.length-1,m["fixed--hidden"]=s,m["col--ellipsis"]=i,m["col--current"]=k===l,m),(0,_util.getPropClass)(a,_),(0,_util.getPropClass)(I,_)]},o),{style:S?_xeUtils.default.isFunction(S)?S(_):S:null}),r),{key:M||A.useKey?l.id:e}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":p,"c--tooltip":v,"c--ellipsis":d}]},l.renderFooter(_))])}).concat(r?[(0,_vue.h)("td",{class:"vxe-footer--gutter col--gutter"})]:[]))}))])])}}});exports.default=_default2;

package/lib/form/index.js

@@ -13,11 +13,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 var Form = Object.assign(_form.default, {
   install: function install(app) {
-    _dynamics.dynamicApp.component(_form.default.name, _form.default);
-
     app.component(_form.default.name, _form.default);
   }
 });
 exports.Form = Form;
+
+_dynamics.dynamicApp.component(_form.default.name, _form.default);
+
 var _default = Form;
 exports.default = _default;

package/lib/form/index.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Form=void 0;var _form=_interopRequireDefault(require("./src/form")),_dynamics=require("../dynamics");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var Form=Object.assign(_form.default,{install:function(e){_dynamics.dynamicApp.component(_form.default.name,_form.default),e.component(_form.default.name,_form.default)}}),_default=exports.Form=Form;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Form=void 0;var _form=_interopRequireDefault(require("./src/form")),_dynamics=require("../dynamics");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var Form=Object.assign(_form.default,{install:function(e){e.component(_form.default.name,_form.default)}});exports.Form=Form,_dynamics.dynamicApp.component(_form.default.name,_form.default);var _default=Form;exports.default=_default;

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

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _vue = require("vue");
 
-var _utils = require("../../tools/utils");
+var _log = require("../../tools/log");
 
 var _util = require("./util");
 
@@ -22,7 +22,7 @@ var _default = (0, _vue.defineComponent)({
     var $xeform = (0, _vue.inject)('$xeform', {});
     var formGather = (0, _vue.inject)('xeformgather', null);
     var defaultSlot = slots.default;
-    var formItem = (0, _util.createItem)($xeform, props);
+    var formItem = (0, _vue.reactive)((0, _util.createItem)($xeform, props));
     var xeformitem = {
       formItem: formItem
     };
@@ -39,7 +39,7 @@ var _default = (0, _vue.defineComponent)({
     if (process.env.NODE_ENV === 'development') {
       (0, _vue.nextTick)(function () {
         if ($xeform && $xeform.props.customLayout) {
-          (0, _utils.errLog)('vxe.error.errConflicts', ['custom-layout', '<form-gather ...>']);
+          (0, _log.errLog)('vxe.error.errConflicts', ['custom-layout', '<form-gather ...>']);
         }
       });
     }

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"),_utils=require("../../tools/utils"),_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)(),u=(0,_vue.inject)("$xeform",{}),o=(0,_vue.inject)("xeformgather",null),i=t.default,n=(0,_util.createItem)(u,e),t={formItem:n};n.children=[],(0,_vue.provide)("xeformgather",t),(0,_util.watchItem)(e,n),(0,_vue.onMounted)(function(){(0,_util.assemItem)(u,r.value,n,o)}),(0,_vue.onUnmounted)(function(){(0,_util.destroyItem)(u,n)}),"development"===process.env.NODE_ENV&&(0,_vue.nextTick)(function(){u&&u.props.customLayout&&(0,_utils.errLog)("vxe.error.errConflicts",["custom-layout","<form-gather ...>"])});return function(){return(0,_vue.h)("div",{ref:r},i?i():[])}}});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,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;

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

@@ -73,7 +73,7 @@ var _default = (0, _vue.defineComponent)({
     var refElem = (0, _vue.ref)();
     var $xeform = (0, _vue.inject)('$xeform', {});
     var formGather = (0, _vue.inject)('xeformgather', null);
-    var formItem = (0, _util.createItem)($xeform, props);
+    var formItem = (0, _vue.reactive)((0, _util.createItem)($xeform, props));
     formItem.slots = slots;
     (0, _util.watchItem)(props, formItem);
     (0, _vue.onMounted)(function () {
@@ -171,9 +171,9 @@ var _default = (0, _vue.defineComponent)({
 
       var ons = showTooltip ? {
         onMouseenter: function onMouseenter(evnt) {
-          $xeform.triggerHeaderHelpEvent(evnt, params);
+          $xeform.triggerTitleTipEvent(evnt, params);
         },
-        onMouseleave: $xeform.handleTargetLeaveEvent
+        onMouseleave: $xeform.handleTitleTipLeaveEvent
       } : {};
       return (0, _vue.h)('div', {
         ref: refElem,

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.triggerHeaderHelpEvent(e,S)},onMouseleave:t.handleTargetLeaveEvent}:{};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],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,_vue.reactive)((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;

package/lib/form/src/form.js

@@ -15,6 +15,8 @@ var _vXETable = require("../../v-x-e-table");
 
 var _utils = require("../../tools/utils");
 
+var _log = require("../../tools/log");
+
 var _dom = require("../../tools/dom");
 
 var _util = require("./util");
@@ -202,7 +204,6 @@ var _default2 = (0, _vue.defineComponent)({
     });
     var internalData = (0, _vue.reactive)({
       tooltipTimeout: null,
-      tooltipActive: false,
       tooltipStore: {
         item: null,
         visible: false
@@ -214,28 +215,8 @@ var _default2 = (0, _vue.defineComponent)({
     var computeValidOpts = (0, _vue.computed)(function () {
       return Object.assign({}, _conf.default.form.validConfig, props.validConfig);
     });
-    var computeTooltipOpts = (0, _vue.ref)();
-
-    var handleTooltipLeaveMethod = function handleTooltipLeaveMethod() {
-      var tooltipOpts = computeTooltipOpts.value;
-      setTimeout(function () {
-        if (!internalData.tooltipActive) {
-          formMethods.closeTooltip();
-        }
-      }, tooltipOpts.leaveDelay);
-      return false;
-    };
-
-    computeTooltipOpts = (0, _vue.computed)(function () {
-      var opts = Object.assign({
-        leaveDelay: 300
-      }, _conf.default.form.tooltipConfig, props.tooltipConfig);
-
-      if (opts.enterable) {
-        opts.leaveMethod = handleTooltipLeaveMethod;
-      }
-
-      return opts;
+    var computeTooltipOpts = (0, _vue.computed)(function () {
+      return Object.assign({}, _conf.default.tooltip, _conf.default.form.tooltipConfig, props.tooltipConfig);
     });
     var refMaps = {
       refElem: refElem
@@ -280,7 +261,7 @@ var _default2 = (0, _vue.defineComponent)({
               _xeUtils.default.each(item.slots, function (func) {
                 if (!_xeUtils.default.isFunction(func)) {
                   if (!slots[func]) {
-                    (0, _utils.errLog)('vxe.error.notSlot', [func]);
+                    (0, _log.errLog)('vxe.error.notSlot', [func]);
                   }
                 }
               });
@@ -310,6 +291,16 @@ var _default2 = (0, _vue.defineComponent)({
       return itemList;
     };
 
+    var getItemByField = function getItemByField(field) {
+      var rest = _xeUtils.default.findTree(reactData.formItems, function (item) {
+        return item.field === field;
+      }, {
+        children: 'children'
+      });
+
+      return rest ? rest.item : null;
+    };
+
     var getCollapseStatus = function getCollapseStatus() {
       return reactData.collapseAll;
     };
@@ -336,19 +327,15 @@ var _default2 = (0, _vue.defineComponent)({
       }, evnt);
     };
 
-    var clearValidate = function clearValidate(field) {
-      var itemList = getItems();
-
-      if (field) {
-        var item = itemList.find(function (item) {
-          return item.field === field;
-        });
+    var clearValidate = function clearValidate(fieldOrItem) {
+      if (fieldOrItem) {
+        var item = (0, _util.handleFieldOrItem)($xeform, fieldOrItem);
 
         if (item) {
           item.showError = false;
         }
       } else {
-        itemList.forEach(function (item) {
+        getItems().forEach(function (item) {
           item.showError = false;
         });
       }
@@ -396,12 +383,9 @@ var _default2 = (0, _vue.defineComponent)({
     };
 
     var handleFocus = function handleFocus(fields) {
-      var itemList = getItems();
       var el = refElem.value;
       fields.some(function (property, index) {
-        var item = itemList.find(function (item) {
-          return item.field === property;
-        });
+        var item = getItemByField(property);
 
         if (item && (0, _utils.isEnableConf)(item.itemRender)) {
           var itemRender = item.itemRender;
@@ -602,10 +586,9 @@ var _default2 = (0, _vue.defineComponent)({
       return beginValidate(getItems(), '', callback);
     };
 
-    var validateField = function validateField(field, callback) {
-      return beginValidate(getItems().filter(function (item) {
-        return item.field === field;
-      }), '', callback);
+    var validateField = function validateField(fieldOrItem, callback) {
+      var item = (0, _util.handleFieldOrItem)($xeform, fieldOrItem);
+      return beginValidate(item ? [item] : [], '', callback);
     };
 
     var submitEvent = function submitEvent(evnt) {
@@ -644,7 +627,7 @@ var _default2 = (0, _vue.defineComponent)({
       return (0, _vue.nextTick)();
     };
 
-    var triggerHeaderHelpEvent = function triggerHeaderHelpEvent(evnt, params) {
+    var triggerTitleTipEvent = function triggerTitleTipEvent(evnt, params) {
       var item = params.item;
       var tooltipStore = internalData.tooltipStore;
       var $tooltip = refTooltip.value;
@@ -652,8 +635,10 @@ var _default2 = (0, _vue.defineComponent)({
       var content = (overflowElem.textContent || '').trim();
       var isCellOverflow = overflowElem.scrollWidth > overflowElem.clientWidth;
       clearTimeout(internalData.tooltipTimeout);
-      internalData.tooltipActive = true;
-      closeTooltip();
+
+      if (tooltipStore.item !== item) {
+        closeTooltip();
+      }
 
       if (content && isCellOverflow) {
         Object.assign(tooltipStore, {
@@ -667,15 +652,19 @@ var _default2 = (0, _vue.defineComponent)({
       }
     };
 
-    var handleTargetLeaveEvent = function handleTargetLeaveEvent() {
+    var handleTitleTipLeaveEvent = function handleTitleTipLeaveEvent() {
       var tooltipOpts = computeTooltipOpts.value;
-      internalData.tooltipActive = false;
+      var $tooltip = refTooltip.value;
+
+      if ($tooltip) {
+        $tooltip.setActived(false);
+      }
 
       if (tooltipOpts.enterable) {
         internalData.tooltipTimeout = setTimeout(function () {
-          var $tooltip = refTooltip.value;
+          $tooltip = refTooltip.value;
 
-          if ($tooltip && !$tooltip.reactData.isHover) {
+          if ($tooltip && !$tooltip.isActived()) {
             closeTooltip();
           }
         }, tooltipOpts.leaveDelay);
@@ -698,10 +687,7 @@ var _default2 = (0, _vue.defineComponent)({
           clearValidate(property);
         }).catch(function (_a) {
           var rule = _a.rule;
-          var itemList = getItems();
-          var item = itemList.find(function (item) {
-            return item.field === property;
-          });
+          var item = getItemByField(property);
 
           if (item) {
             item.showError = true;
@@ -717,7 +703,7 @@ var _default2 = (0, _vue.defineComponent)({
           allTitleOverflow = props.titleOverflow;
       var collapseAll = reactData.collapseAll;
       var validOpts = computeValidOpts.value;
-      return itemList.map(function (item, index) {
+      return itemList.map(function (item) {
         var slots = item.slots,
             title = item.title,
             visible = item.visible,
@@ -814,9 +800,9 @@ var _default2 = (0, _vue.defineComponent)({
 
         var ons = showTooltip ? {
           onMouseenter: function onMouseenter(evnt) {
-            triggerHeaderHelpEvent(evnt, params);
+            triggerTitleTipEvent(evnt, params);
           },
-          onMouseleave: handleTargetLeaveEvent
+          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 : '', {
@@ -826,7 +812,7 @@ var _default2 = (0, _vue.defineComponent)({
             'is--active': !itemVisibleMethod || itemVisibleMethod(params),
             'is--error': showError
           }],
-          key: index
+          key: item.id
         }, [(0, _vue.h)('div', {
           class: 'vxe-form--item-inner'
         }, [title || titleSlot ? (0, _vue.h)('div', __assign({
@@ -857,13 +843,14 @@ var _default2 = (0, _vue.defineComponent)({
       updateStatus: updateStatus,
       toggleCollapse: toggleCollapse,
       getItems: getItems,
+      getItemByField: getItemByField,
       closeTooltip: closeTooltip
     };
     var formPrivateMethods = {
       callSlot: callSlot,
       toggleCollapseEvent: toggleCollapseEvent,
-      triggerHeaderHelpEvent: triggerHeaderHelpEvent,
-      handleTargetLeaveEvent: handleTargetLeaveEvent
+      triggerTitleTipEvent: triggerTitleTipEvent,
+      handleTitleTipLeaveEvent: handleTitleTipLeaveEvent
     };
     Object.assign($xeform, formMethods, formPrivateMethods);
     (0, _vue.watch)(function () {
@@ -885,7 +872,7 @@ var _default2 = (0, _vue.defineComponent)({
       (0, _vue.nextTick)(function () {
         if (process.env.NODE_ENV === 'development') {
           if (props.customLayout && props.items) {
-            (0, _utils.errLog)('vxe.error.errConflicts', ['custom-layout', 'items']);
+            (0, _log.errLog)('vxe.error.errConflicts', ['custom-layout', 'items']);
           }
         }
 

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"),_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 r in t=arguments[i])Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r]);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,r=e.max,l=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(r)&&i>_xeUtils.default.toNumber(r)||!(!l||(_xeUtils.default.isRegExp(l)?l:new RegExp(l)).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(V,e){function t(){var e=b.value;return setTimeout(function(){a.tooltipActive||h.closeTooltip()},e.leaveDelay),!1}function i(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,_utils.errLog)("vxe.error.notSlot",[e])})}),p.staticItems=_xeUtils.default.mapTree(e,function(e){return(0,_util.createItem)(A,e)},{children:"children"})),(0,_vue.nextTick)()}function n(){return p.collapseAll}function r(){var e=!n();return p.collapseAll=e,l("update:collapseStatus",e),(0,_vue.nextTick)()}function c(e){e.preventDefault(),R(),h.dispatchEvent("reset",{data:V.data},e)}function f(t){t.preventDefault(),V.preventSubmit||(U(),N(T()).then(function(){h.dispatchEvent("submit",{data:V.data},t)}).catch(function(e){h.dispatchEvent("submit-invalid",{data:V.data,errMap:e},t)}))}function o(){var e=a.tooltipStore,t=g.value;return e.visible&&(Object.assign(e,{item:null,visible:!1}),t&&t.close()),(0,_vue.nextTick)()}function q(e){var S=V.data,w=V.rules,N=V.titleOverflow,O=p.collapseAll,C=x.value;return e.map(function(e,t){var i=e.slots,n=e.title,r=e.visible,l=e.folding,o=e.visibleMethod,u=e.field,a=e.collapseNode,s=e.itemRender,c=e.showError,f=e.errRule,d=e.className,v=e.titleOverflow,m=e.children,p=(0,_utils.isEnableConf)(s)?_vXETable.VXETable.renderer.get(s.name):null,_=i?i.default:null,g=i?i.title:null,h=e.span||V.span,x=e.align||V.align,b=e.titleAlign||V.titleAlign,y=e.titleWidth||V.titleWidth,E=_xeUtils.default.isUndefined(v)||_xeUtils.default.isNull(v)?N:v,T="title"===E,i=!0===E||"tooltip"===E,v=T||i||"ellipsis"===E,E=o,U={data:S,field:u,property:u,item:e,$form:A};if(!1===r)return(0,_vue.createCommentVNode)();o=!1;if(!w||(r=w[u])&&(o=r.some(function(e){return e.required})),m&&0<m.length){var R=q(e.children);return R.length?(0,_vue.h)("div",{class:["vxe-form--gather vxe-row",e.id,h?"vxe-col--"+h+" is--span":"",d?_xeUtils.default.isFunction(d)?d(U):d:""]},R):(0,_vue.createCommentVNode)()}!E&&p&&p.itemVisibleMethod&&(E=p.itemVisibleMethod);R=[];_?R=j(_,U):p&&p.renderItemContent?R=p.renderItemContent(s,U):u&&(R=[""+_xeUtils.default.get(S,u)]),a&&R.push((0,_vue.h)("div",{class:"vxe-form--item-trigger-node",onClick:M},[(0,_vue.h)("span",{class:"vxe-form--item-trigger-text"},O?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),(0,_vue.h)("i",{class:["vxe-form--item-trigger-icon",O?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})])),f&&C.showMessage&&R.push((0,_vue.h)("div",{class:"vxe-form--item-valid",style:f.maxWidth?{width:f.maxWidth+"px"}:null},f.content));i=i?{onMouseenter:function(e){I(e,U)},onMouseleave:D}:{};return(0,_vue.h)("div",{class:["vxe-form--item",e.id,h?"vxe-col--"+h+" is--span":"",d?_xeUtils.default.isFunction(d)?d(U):d:"",{"is--title":n,"is--required":o,"is--hidden":l&&O,"is--active":!E||E(U),"is--error":c}],key:t},[(0,_vue.h)("div",{class:"vxe-form--item-inner"},[n||g?(0,_vue.h)("div",__assign({class:["vxe-form--item-title",b?"align--"+b:null,{"is--ellipsis":v}],style:y?{width:isNaN(y)?y:y+"px"}:null,title:T?(0,_utils.getFuncText)(n):null},i),(0,_render.renderTitle)(A,e)):null,(0,_vue.h)("div",{class:["vxe-form--item-content",x?"align--"+x:null]},R)])])})}var s,d=_vXETable.VXETable.tooltip,v=e.slots,l=e.emit,u=_xeUtils.default.uniqueId(),m=(0,_size.useSize)(V),p=(0,_vue.reactive)({collapseAll:V.collapseStatus,staticItems:[],formItems:[]}),a=(0,_vue.reactive)({tooltipTimeout:null,tooltipActive:!1,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,V.validConfig)}),b=(0,_vue.ref)(),b=(0,_vue.computed)(function(){var e=Object.assign({leaveDelay:300},_conf.default.form.tooltipConfig,V.tooltipConfig);return e.enterable&&(e.leaveMethod=t),e}),y={refElem:_},E={computeSize:m,computeValidOpts:x,computeTooltipOpts:b},A={xID:u,props:V,context:e,reactData:p,getRefMaps:function(){return y},getComputeMaps:function(){return E}},j=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},M=function(e){r();var t=n();h.dispatchEvent("toggle-collapse",{status:t,collapse:t,data:V.data},e),h.dispatchEvent("collapse",{status:t,collapse:t,data:V.data},e)},U=function(t){var e,i=T();return t?(e=i.find(function(e){return e.field===t}))&&(e.showError=!1):i.forEach(function(e){e.showError=!1}),(0,_vue.nextTick)()},R=function(){var r=V.data,e=T();return r&&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:r,field:t,property:t,item:e,$form:A}):t&&_xeUtils.default.set(r,t,null===i?getResetValue(_xeUtils.default.get(r,t),void 0):i))}),U()},S=function(e){var o=T(),u=_.value;e.some(function(t,e){var i=o.find(function(e){return e.field===t});if(i&&(0,_utils.isEnableConf)(i.itemRender)){var n=i.itemRender,r=_vXETable.VXETable.renderer.get(n.name),l=null;if(e||(0,_dom.scrollToView)(u.querySelector("."+i.id)),l=!(l=n.autofocus?u.querySelector("."+i.id+" "+n.autofocus):l)&&r&&r.autofocus?u.querySelector("."+i.id+" "+r.autofocus):l)return l.focus(),!0}})},w=function(l,o,e){var u,a,s=V.data,t=V.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,r=t.required;"all"!==l&&n&&l!==n||(_xeUtils.default.isFunction(t.validator)?(e=t.validator({itemValue:a,rule:t,rules:u,data:s,field:o,property:o,$form:A}))&&(_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),(r?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)}})},N=function(t,e,i){var r=V.data,n=V.rules,l=x.value,o={},u=[],a=[];return clearTimeout(s),r&&n?(t.forEach(function(i){var n=i.field;n&&a.push(w(e||"all",n).then(function(){i.errRule=null}).catch(function(e){var t=e.rule,e={rule:t,rules:e.rules,data:r,field:n,property:n,$form:A};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!==l.autoPos&&(0,_vue.nextTick)(function(){S(u)}),i?(i(o),e()):e(o)})})):(i&&i(),Promise.resolve())},I=function(e,t){var i=t.item,n=a.tooltipStore,r=g.value,l=e.currentTarget.children[0],t=(l.textContent||"").trim(),e=l.scrollWidth>l.clientWidth;clearTimeout(a.tooltipTimeout),a.tooltipActive=!0,o(),t&&e&&(Object.assign(n,{item:i,visible:!0}),r&&r.open(l,t))},D=function(){var e=b.value;a.tooltipActive=!1,e.enterable?a.tooltipTimeout=setTimeout(function(){var e=g.value;e&&!e.reactData.isHover&&o()},e.leaveDelay):o()},h={dispatchEvent:function(e,t,i){l(e,Object.assign({$form:A,$event:i},t))},reset:R,validate:function(e){return U(),N(T(),"",e)},validateField:function(t,e){return N(T().filter(function(e){return e.field===t}),"",e)},clearValidate:U,updateStatus:function(e,t){var i=e.property;i&&w("change",i,t).then(function(){U(i)}).catch(function(e){var t=e.rule,e=T().find(function(e){return e.field===i});e&&(e.showError=!0,e.errRule=t)})},toggleCollapse:r,getItems:T,closeTooltip:o};Object.assign(A,h,{callSlot:j,toggleCollapseEvent:M,triggerHeaderHelpEvent:I,handleTargetLeaveEvent:D}),(0,_vue.watch)(function(){return p.staticItems},function(e){p.formItems=e}),(0,_vue.watch)(function(){return V.items},function(e){i(e||[])}),(0,_vue.watch)(function(){return V.collapseStatus},function(e){p.collapseAll=!!e}),(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){"development"===process.env.NODE_ENV&&V.customLayout&&V.items&&(0,_utils.errLog)("vxe.error.errConflicts",["custom-layout","items"]),i(V.items||[])})});return A.renderVN=function(){var e=V.loading,t=V.className,i=V.data,n=V.titleColon,r=V.titleAsterisk,l=V.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:A}):t:"",((t={})["size--"+u]=u,t["is--colon"]=n,t["is--asterisk"]=r,t["is--loading"]=e,t)],onSubmit:f,onReset:c},[(0,_vue.h)("div",{class:"vxe-form--wrapper vxe-row"},l?s?s({}):[]:q(o)),(0,_vue.h)("div",{class:"vxe-form-slots",ref:"hideItem"},!l&&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",A),A},render:function(){return this.renderVN()}});exports.default=_default2;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_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(){h.dispatchEvent("submit",{data:q.data},t)}).catch(function(e){h.dispatchEvent("submit-invalid",{data:q.data,errMap:e},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;

package/lib/form/src/render.js

@@ -15,6 +15,22 @@ var _utils = require("../../tools/utils");
 
 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);
+};
+
 function renderPrefixIcon(titlePrefix) {
   return (0, _vue.h)('span', {
     class: 'vxe-form--item-title-prefix'
@@ -33,11 +49,13 @@ function renderSuffixIcon(titleSuffix) {
 
 function renderTitle($xeform, item) {
   var data = $xeform.props.data;
+  var computeTooltipOpts = $xeform.getComputeMaps().computeTooltipOpts;
   var slots = item.slots,
       field = item.field,
       itemRender = item.itemRender,
       titlePrefix = item.titlePrefix,
       titleSuffix = item.titleSuffix;
+  var tooltipOpts = computeTooltipOpts.value;
   var compConf = (0, _utils.isEnableConf)(itemRender) ? _vXETable.VXETable.renderer.get(itemRender.name) : null;
   var params = {
     data: data,
@@ -50,11 +68,9 @@ function renderTitle($xeform, item) {
   var titVNs = [];
 
   if (titlePrefix) {
-    titVNs.push(titlePrefix.content || titlePrefix.message ? (0, _vue.h)((0, _vue.resolveComponent)('vxe-tooltip'), {
-      content: (0, _utils.getFuncText)(titlePrefix.content || titlePrefix.message),
-      enterable: titlePrefix.enterable,
-      theme: titlePrefix.theme
-    }, {
+    titVNs.push(titlePrefix.content || titlePrefix.message ? (0, _vue.h)((0, _vue.resolveComponent)('vxe-tooltip'), __assign(__assign(__assign({}, tooltipOpts), titlePrefix), {
+      content: (0, _utils.getFuncText)(titlePrefix.content || titlePrefix.message)
+    }), {
       default: function _default() {
         return renderPrefixIcon(titlePrefix);
       }
@@ -70,11 +86,9 @@ function renderTitle($xeform, item) {
   var fixVNs = [];
 
   if (titleSuffix) {
-    fixVNs.push(titleSuffix.content || titleSuffix.message ? (0, _vue.h)((0, _vue.resolveComponent)('vxe-tooltip'), {
-      content: (0, _utils.getFuncText)(titleSuffix.content || titleSuffix.message),
-      enterable: titleSuffix.enterable,
-      theme: titleSuffix.theme
-    }, {
+    fixVNs.push(titleSuffix.content || titleSuffix.message ? (0, _vue.h)((0, _vue.resolveComponent)('vxe-tooltip'), __assign(__assign(__assign({}, tooltipOpts), titleSuffix), {
+      content: (0, _utils.getFuncText)(titleSuffix.content || titleSuffix.message)
+    }), {
       default: function _default() {
         return renderSuffixIcon(titleSuffix);
       }

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.renderTitle=renderTitle;var _vue=require("vue"),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function renderPrefixIcon(e){return(0,_vue.h)("span",{class:"vxe-form--item-title-prefix"},[(0,_vue.h)("i",{class:e.icon||_conf.default.icon.FORM_PREFIX})])}function renderSuffixIcon(e){return(0,_vue.h)("span",{class:"vxe-form--item-title-suffix"},[(0,_vue.h)("i",{class:e.icon||_conf.default.icon.FORM_SUFFIX})])}function renderTitle(e,t){var n=e.props.data,r=t.slots,i=t.field,l=t.itemRender,u=t.titlePrefix,o=t.titleSuffix,s=(0,_utils.isEnableConf)(l)?_vXETable.VXETable.renderer.get(l.name):null,f={data:n,property:i,item:t,$form:e},n=r?r.title:null,i=[],r=[];u&&r.push(u.content||u.message?(0,_vue.h)((0,_vue.resolveComponent)("vxe-tooltip"),{content:(0,_utils.getFuncText)(u.content||u.message),enterable:u.enterable,theme:u.theme},{default:function(){return renderPrefixIcon(u)}}):renderPrefixIcon(u)),r.push((0,_vue.h)("span",{class:"vxe-form--item-title-label"},s&&s.renderItemTitle?s.renderItemTitle(l,f):n?e.callSlot(n,f):(0,_utils.getFuncText)(t.title))),i.push((0,_vue.h)("div",{class:"vxe-form--item-title-content"},r));r=[];return o&&r.push(o.content||o.message?(0,_vue.h)((0,_vue.resolveComponent)("vxe-tooltip"),{content:(0,_utils.getFuncText)(o.content||o.message),enterable:o.enterable,theme:o.theme},{default:function(){return renderSuffixIcon(o)}}):renderSuffixIcon(o)),i.push((0,_vue.h)("div",{class:"vxe-form--item-title-postfix"},r)),i}
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.renderTitle=renderTitle;var _vue=require("vue"),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils");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)};function renderPrefixIcon(e){return(0,_vue.h)("span",{class:"vxe-form--item-title-prefix"},[(0,_vue.h)("i",{class:e.icon||_conf.default.icon.FORM_PREFIX})])}function renderSuffixIcon(e){return(0,_vue.h)("span",{class:"vxe-form--item-title-suffix"},[(0,_vue.h)("i",{class:e.icon||_conf.default.icon.FORM_SUFFIX})])}function renderTitle(e,t){var n=e.props.data,r=e.getComputeMaps().computeTooltipOpts,i=t.slots,s=t.field,u=t.itemRender,o=t.titlePrefix,l=t.titleSuffix,a=r.value,c=(0,_utils.isEnableConf)(u)?_vXETable.VXETable.renderer.get(u.name):null,r={data:n,property:s,item:t,$form:e},n=i?i.title:null,s=[],i=[];o&&i.push(o.content||o.message?(0,_vue.h)((0,_vue.resolveComponent)("vxe-tooltip"),__assign(__assign(__assign({},a),o),{content:(0,_utils.getFuncText)(o.content||o.message)}),{default:function(){return renderPrefixIcon(o)}}):renderPrefixIcon(o)),i.push((0,_vue.h)("span",{class:"vxe-form--item-title-label"},c&&c.renderItemTitle?c.renderItemTitle(u,r):n?e.callSlot(n,r):(0,_utils.getFuncText)(t.title))),s.push((0,_vue.h)("div",{class:"vxe-form--item-title-content"},i));i=[];return l&&i.push(l.content||l.message?(0,_vue.h)((0,_vue.resolveComponent)("vxe-tooltip"),__assign(__assign(__assign({},a),l),{content:(0,_utils.getFuncText)(l.content||l.message)}),{default:function(){return renderSuffixIcon(l)}}):renderSuffixIcon(l)),s.push((0,_vue.h)("div",{class:"vxe-form--item-title-postfix"},i)),s}

package/lib/form/src/util.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.assemItem = assemItem;
 exports.createItem = createItem;
 exports.destroyItem = destroyItem;
+exports.handleFieldOrItem = void 0;
 exports.isFormItem = isFormItem;
 exports.watchItem = watchItem;
 
@@ -25,6 +26,16 @@ function createItem($xeform, _vm) {
   return isFormItem(_vm) ? _vm : new _itemInfo.ItemInfo($xeform, _vm);
 }
 
+var handleFieldOrItem = function handleFieldOrItem($xeform, fieldOrItem) {
+  if (fieldOrItem) {
+    return _xeUtils.default.isString(fieldOrItem) ? $xeform.getItemByField(fieldOrItem) : fieldOrItem;
+  }
+
+  return null;
+};
+
+exports.handleFieldOrItem = handleFieldOrItem;
+
 function watchItem(props, formItem) {
   Object.keys(props).forEach(function (name) {
     (0, _vue.watch)(function () {

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.assemItem=assemItem,exports.createItem=createItem,exports.destroyItem=destroyItem,exports.isFormItem=isFormItem,exports.watchItem=watchItem;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_itemInfo=require("./itemInfo");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function isFormItem(e){return e instanceof _itemInfo.ItemInfo}function createItem(e,t){return isFormItem(t)?t:new _itemInfo.ItemInfo(e,t)}function watchItem(e,r){Object.keys(e).forEach(function(t){(0,_vue.watch)(function(){return e[t]},function(e){r.update(t,e)})})}function assemItem(e,t,r,i){var n=e.reactData,s=n.staticItems,e=t.parentNode,i=i?i.formItem:null,i=i?i.children:s;e&&(i.splice(_xeUtils.default.arrayIndexOf(e.children,t),0,r),n.staticItems=s.slice(0))}function destroyItem(e,t){var r=e.reactData,i=r.staticItems,e=_xeUtils.default.findIndexOf(i,function(e){return e.id===t.id});-1<e&&i.splice(e,1),r.staticItems=i.slice(0)}
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.assemItem=assemItem,exports.createItem=createItem,exports.destroyItem=destroyItem,exports.handleFieldOrItem=void 0,exports.isFormItem=isFormItem,exports.watchItem=watchItem;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_itemInfo=require("./itemInfo");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function isFormItem(e){return e instanceof _itemInfo.ItemInfo}function createItem(e,t){return isFormItem(t)?t:new _itemInfo.ItemInfo(e,t)}var handleFieldOrItem=function(e,t){return t?_xeUtils.default.isString(t)?e.getItemByField(t):t:null};function watchItem(e,r){Object.keys(e).forEach(function(t){(0,_vue.watch)(function(){return e[t]},function(e){r.update(t,e)})})}function assemItem(e,t,r,i){var n=e.reactData,s=n.staticItems,e=t.parentNode,i=i?i.formItem:null,i=i?i.children:s;e&&(i.splice(_xeUtils.default.arrayIndexOf(e.children,t),0,r),n.staticItems=s.slice(0))}function destroyItem(e,t){var r=e.reactData,i=r.staticItems,e=_xeUtils.default.findIndexOf(i,function(e){return e.id===t.id});-1<e&&i.splice(e,1),r.staticItems=i.slice(0)}exports.handleFieldOrItem=handleFieldOrItem;

package/lib/form-gather/index.js

@@ -13,11 +13,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 var FormGather = Object.assign(_formGather.default, {
   install: function install(app) {
-    _dynamics.dynamicApp.component(_formGather.default.name, _formGather.default);
-
     app.component(_formGather.default.name, _formGather.default);
   }
 });
 exports.FormGather = FormGather;
+
+_dynamics.dynamicApp.component(_formGather.default.name, _formGather.default);
+
 var _default = FormGather;
 exports.default = _default;

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.FormGather=void 0;var _formGather=_interopRequireDefault(require("../form/src/form-gather")),_dynamics=require("../dynamics");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var FormGather=Object.assign(_formGather.default,{install:function(e){_dynamics.dynamicApp.component(_formGather.default.name,_formGather.default),e.component(_formGather.default.name,_formGather.default)}}),_default=exports.FormGather=FormGather;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.FormGather=void 0;var _formGather=_interopRequireDefault(require("../form/src/form-gather")),_dynamics=require("../dynamics");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var FormGather=Object.assign(_formGather.default,{install:function(e){e.component(_formGather.default.name,_formGather.default)}});exports.FormGather=FormGather,_dynamics.dynamicApp.component(_formGather.default.name,_formGather.default);var _default=FormGather;exports.default=_default;

package/lib/form-item/index.js

@@ -13,11 +13,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 var FormItem = Object.assign(_formItem.default, {
   install: function install(app) {
-    _dynamics.dynamicApp.component(_formItem.default.name, _formItem.default);
-
     app.component(_formItem.default.name, _formItem.default);
   }
 });
 exports.FormItem = FormItem;
+
+_dynamics.dynamicApp.component(_formItem.default.name, _formItem.default);
+
 var _default = FormItem;
 exports.default = _default;

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.FormItem=void 0;var _formItem=_interopRequireDefault(require("../form/src/form-item")),_dynamics=require("../dynamics");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var FormItem=Object.assign(_formItem.default,{install:function(e){_dynamics.dynamicApp.component(_formItem.default.name,_formItem.default),e.component(_formItem.default.name,_formItem.default)}}),_default=exports.FormItem=FormItem;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.FormItem=void 0;var _formItem=_interopRequireDefault(require("../form/src/form-item")),_dynamics=require("../dynamics");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var FormItem=Object.assign(_formItem.default,{install:function(e){e.component(_formItem.default.name,_formItem.default)}});exports.FormItem=FormItem,_dynamics.dynamicApp.component(_formItem.default.name,_formItem.default);var _default=FormItem;exports.default=_default;