vxe-table 3.4.14-beta.2 → 3.5.0-beta.0

package/lib/footer/src/footer.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_tools=require("../../tools");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,t,l){return t in e?Object.defineProperty(e,t,{value:l,enumerable:!0,configurable:!0,writable:!0}):e[t]=l,e}var cellType="footer";function mergeFooterMethod(e,t,l){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===t&&a===l)return{rowspan:i,colspan:r};if(n<=t&&t<n+i&&a<=l&&l<a+r)return{rowspan:0,colspan:0}}}}var _default={name:"VxeTableFooter",props:{footerTableData:Array,tableColumn:Array,fixedColumn:Array,fixedType:String,size:String},mounted:function(){var e=this.$parent,t=this.$el,l=this.$refs,o=this.fixedType,e=e.elemStore,o="".concat(o||"main","-footer-");e["".concat(o,"wrapper")]=t,e["".concat(o,"table")]=l.table,e["".concat(o,"colgroup")]=l.colgroup,e["".concat(o,"list")]=l.tfoot,e["".concat(o,"xSpace")]=l.xSpace},destroyed:function(){var e=this.$parent,t=this.fixedType,e=e.elemStore,t="".concat(t||"main","-footer-");e["".concat(t,"wrapper")]=null,e["".concat(t,"table")]=null,e["".concat(t,"colgroup")]=null,e["".concat(t,"list")]=null,e["".concat(t,"xSpace")]=null},render:function(_){var e=this._e,w=this.$parent,T=this.fixedType,t=this.fixedColumn,$=this.tableColumn,C=this.footerTableData,S=w.$listeners,l=w.tId,o=w.footerRowClassName,I=w.footerCellClassName,r=w.footerRowStyle,F=w.footerCellStyle,L=w.footerAlign,P=w.mergeFooterList,U=w.footerSpanMethod,k=w.align,E=w.scrollXLoad,O=w.columnKey,A=w.showFooterOverflow,D=w.currentColumn,M=w.overflowX,n=w.scrollbarWidth,X=w.tooltipOpts,a=w.visibleColumn;return T&&($=!E&&!A||P.length&&U?a:t),_("div",{class:["vxe-table--footer-wrapper",T?"fixed-".concat(T,"--wrapper"):"body--wrapper"],attrs:{xid:l},on:{scroll:this.scrollEvent}},[T?e():_("div",{class:"vxe-body--x-space",ref:"xSpace"}),_("table",{class:"vxe-table--footer",attrs:{xid:l,cellspacing:0,cellpadding:0,border:0},ref:"table"},[_("colgroup",{ref:"colgroup"},$.map(function(e,t){return _("col",{attrs:{name:e.id},key:t})}).concat(n?[_("col",{attrs:{name:"col_gutter"}})]:[])),_("tfoot",{ref:"tfoot"},C.map(function(y,b){var h=b;return _("tr",{class:["vxe-footer--row",o?_xeUtils.default.isFunction(o)?o({$table:w,_rowIndex:b,$rowIndex:h,fixed:T,type:cellType}):o:""],style:r?_xeUtils.default.isFunction(r)?r({$table:w,_rowIndex:b,$rowIndex:h,fixed:T,type:cellType}):r:null},$.map(function(t,e){var l=t.type,o=t.showFooterOverflow,r=t.footerAlign,n=t.align,a=t.footerClassName,i=X.showAll||X.enabled,c=t.children&&t.children.length,s=T?t.fixed!==T&&!c:t.fixed&&M,f=_xeUtils.default.isUndefined(o)||_xeUtils.default.isNull(o)?A:o,d=r||n||L||k,u="ellipsis"===f,p="title"===f,x=!0===f||"tooltip"===f,c=p||x||u,o={colid:t.id},r={},n=w.getColumnIndex(t),f=w.getVTColumnIndex(t),v={$table:w,_rowIndex:b,$rowIndex:h,column:t,columnIndex:n,$columnIndex:e,_columnIndex:f,itemIndex:f,items:y,fixed:T,type:cellType,data:C};if(E&&!c&&(u=c=!0),(p||x||i)&&(r.mouseenter=function(e){p?_tools.DomTools.updateCellTitle(e.currentTarget,t):(x||i)&&w.triggerFooterTooltipEvent(e,v)}),(x||i)&&(r.mouseleave=function(e){(x||i)&&w.handleTargetLeaveEvent(e)}),S["footer-cell-click"]&&(r.click=function(e){w.emitEvent("footer-cell-click",Object.assign({cell:e.currentTarget},v),e)}),S["footer-cell-dblclick"]&&(r.dblclick=function(e){w.emitEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},v),e)}),P.length){n=mergeFooterMethod(P,b,f);if(n){var f=n.rowspan,m=n.colspan;if(!f||!m)return null;1<f&&(o.rowspan=f),1<m&&(o.colspan=m)}}else if(U){var g=U(v)||{},m=g.rowspan,m=void 0===m?1:m,g=g.colspan,g=void 0===g?1:g;if(!m||!g)return null;1<m&&(o.rowspan=m),1<g&&(o.colspan=g)}return _("td",{class:["vxe-footer--column",t.id,(_defineProperty(g={},"col--".concat(d),d),_defineProperty(g,"col--".concat(l),l),_defineProperty(g,"col--last",e===$.length-1),_defineProperty(g,"fixed--hidden",s),_defineProperty(g,"col--ellipsis",c),_defineProperty(g,"col--current",D===t),g),_tools.UtilTools.getClass(a,v),_tools.UtilTools.getClass(I,v)],attrs:o,style:F?_xeUtils.default.isFunction(F)?F(v):F:null,on:r,key:O?t.id:e},[_("div",{class:["vxe-cell",{"c--title":p,"c--tooltip":x,"c--ellipsis":u}]},t.renderFooter(_,v))])}).concat(n?[_("td",{class:"vxe-footer--gutter col--gutter"})]:[]))}))])])},methods:{scrollEvent:function(e){var t=this.$parent,l=this.fixedType,o=t.$refs,r=t.scrollXLoad,n=t.triggerScrollXEvent,a=t.lastScrollLeft,i=o.tableHeader,c=o.tableBody,s=o.tableFooter,o=o.validTip,i=i?i.$el:null,s=s?s.$el:null,c=c.$el,s=s?s.scrollLeft:0,a=s!==a;t.lastScrollLeft=s,t.lastScrollTime=Date.now(),i&&(i.scrollLeft=s),c&&(c.scrollLeft=s),r&&a&&n(e),a&&o&&o.visible&&o.updatePlacement(),t.emitEvent("scroll",{type:cellType,fixed:l,scrollTop:c.scrollTop,scrollLeft:s,isX:a,isY:!1},e)}}};exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_utils=_interopRequireDefault(require("../../tools/utils")),_dom=_interopRequireDefault(require("../../tools/dom"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,t,l){return t in e?Object.defineProperty(e,t,{value:l,enumerable:!0,configurable:!0,writable:!0}):e[t]=l,e}var cellType="footer";function mergeFooterMethod(e,t,l){for(var o=0;o<e.length;o++){var r=e[o],n=r.row,i=r.col,a=r.rowspan,r=r.colspan;if(-1<i&&-1<n&&a&&r){if(n===t&&i===l)return{rowspan:a,colspan:r};if(n<=t&&t<n+a&&i<=l&&l<i+r)return{rowspan:0,colspan:0}}}}var _default={name:"VxeTableFooter",props:{footerTableData:Array,tableColumn:Array,fixedColumn:Array,fixedType:String,size:String},mounted:function(){var e=this.$parent,t=this.$el,l=this.$refs,o=this.fixedType,e=e.elemStore,o="".concat(o||"main","-footer-");e["".concat(o,"wrapper")]=t,e["".concat(o,"table")]=l.table,e["".concat(o,"colgroup")]=l.colgroup,e["".concat(o,"list")]=l.tfoot,e["".concat(o,"xSpace")]=l.xSpace},destroyed:function(){var e=this.$parent,t=this.fixedType,e=e.elemStore,t="".concat(t||"main","-footer-");e["".concat(t,"wrapper")]=null,e["".concat(t,"table")]=null,e["".concat(t,"colgroup")]=null,e["".concat(t,"list")]=null,e["".concat(t,"xSpace")]=null},render:function(h){var e=this._e,w=this.$parent,T=this.fixedType,t=this.fixedColumn,$=this.tableColumn,C=this.footerTableData,S=w.$listeners,l=w.tId,o=w.footerRowClassName,I=w.footerCellClassName,r=w.footerRowStyle,F=w.footerCellStyle,L=w.footerAlign,P=w.mergeFooterList,k=w.footerSpanMethod,E=w.align,O=w.scrollXLoad,q=w.columnKey,D=w.columnOpts,U=w.showFooterOverflow,A=w.currentColumn,R=w.overflowX,n=w.scrollbarWidth,M=w.tooltipOpts,i=w.visibleColumn;return T&&($=!O&&!U||P.length&&k?i:t),h("div",{class:["vxe-table--footer-wrapper",T?"fixed-".concat(T,"--wrapper"):"body--wrapper"],attrs:{xid:l},on:{scroll:this.scrollEvent}},[T?e():h("div",{class:"vxe-body--x-space",ref:"xSpace"}),h("table",{class:"vxe-table--footer",attrs:{xid:l,cellspacing:0,cellpadding:0,border:0},ref:"table"},[h("colgroup",{ref:"colgroup"},$.map(function(e,t){return h("col",{attrs:{name:e.id},key:t})}).concat(n?[h("col",{attrs:{name:"col_gutter"}})]:[])),h("tfoot",{ref:"tfoot"},C.map(function(y,b){var _=b;return h("tr",{class:["vxe-footer--row",o?_xeUtils.default.isFunction(o)?o({$table:w,_rowIndex:b,$rowIndex:_,fixed:T,type:cellType}):o:""],style:r?_xeUtils.default.isFunction(r)?r({$table:w,_rowIndex:b,$rowIndex:_,fixed:T,type:cellType}):r:null},$.map(function(t,e){var l=t.type,o=t.showFooterOverflow,r=t.footerAlign,n=t.align,i=t.footerClassName,a=M.showAll||M.enabled,c=t.children&&t.children.length,s=T?t.fixed!==T&&!c:t.fixed&&R,u=_xeUtils.default.isUndefined(o)||_xeUtils.default.isNull(o)?U:o,f=r||n||L||E,d="ellipsis"===u,p="title"===u,x=!0===u||"tooltip"===u,c=p||x||d,o={colid:t.id},r={},n=w.getColumnIndex(t),u=w.getVTColumnIndex(t),m={$table:w,_rowIndex:b,$rowIndex:_,column:t,columnIndex:n,$columnIndex:e,_columnIndex:u,itemIndex:u,items:y,fixed:T,type:cellType,data:C};if(O&&!c&&(d=c=!0),(p||x||a)&&(r.mouseenter=function(e){p?_dom.default.updateCellTitle(e.currentTarget,t):(x||a)&&w.triggerFooterTooltipEvent(e,m)}),(x||a)&&(r.mouseleave=function(e){(x||a)&&w.handleTargetLeaveEvent(e)}),S["footer-cell-click"]&&(r.click=function(e){w.emitEvent("footer-cell-click",Object.assign({cell:e.currentTarget},m),e)}),S["footer-cell-dblclick"]&&(r.dblclick=function(e){w.emitEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},m),e)}),P.length){n=mergeFooterMethod(P,b,u);if(n){var u=n.rowspan,v=n.colspan;if(!u||!v)return null;1<u&&(o.rowspan=u),1<v&&(o.colspan=v)}}else if(k){var g=k(m)||{},v=g.rowspan,v=void 0===v?1:v,g=g.colspan,g=void 0===g?1:g;if(!v||!g)return null;1<v&&(o.rowspan=v),1<g&&(o.colspan=g)}return h("td",{class:["vxe-footer--column",t.id,(_defineProperty(g={},"col--".concat(f),f),_defineProperty(g,"col--".concat(l),l),_defineProperty(g,"col--last",e===$.length-1),_defineProperty(g,"fixed--hidden",s),_defineProperty(g,"col--ellipsis",c),_defineProperty(g,"col--current",A===t),g),_utils.default.getClass(i,m),_utils.default.getClass(I,m)],attrs:o,style:F?_xeUtils.default.isFunction(F)?F(m):F:null,on:r,key:q||D.useKey?t.id:e},[h("div",{class:["vxe-cell",{"c--title":p,"c--tooltip":x,"c--ellipsis":d}]},t.renderFooter(h,m))])}).concat(n?[h("td",{class:"vxe-footer--gutter col--gutter"})]:[]))}))])])},methods:{scrollEvent:function(e){var t=this.$parent,l=this.fixedType,o=t.$refs,r=t.scrollXLoad,n=t.triggerScrollXEvent,i=t.lastScrollLeft,a=o.tableHeader,c=o.tableBody,s=o.tableFooter,o=o.validTip,a=a?a.$el:null,s=s?s.$el:null,c=c.$el,s=s?s.scrollLeft:0,i=s!==i;t.lastScrollLeft=s,t.lastScrollTime=Date.now(),a&&(a.scrollLeft=s),c&&(c.scrollLeft=s),r&&i&&n(e),i&&o&&o.visible&&o.updatePlacement(),t.emitEvent("scroll",{type:cellType,fixed:l,scrollTop:c.scrollTop,scrollLeft:s,isX:i,isY:!1},e)}}};exports.default=_default;

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

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

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

@@ -11,7 +11,7 @@ var _conf = _interopRequireDefault(require("../../v-x-e-table/src/conf"));
 
 var _vXETable = _interopRequireDefault(require("../../v-x-e-table"));
 
-var _tools = require("../../tools");
+var _utils = require("../../tools/utils");
 
 var _util = require("./util");
 
@@ -70,7 +70,7 @@ var renderItem = function renderItem(h, _vm, item, slots) {
       errRule = item.errRule,
       className = item.className,
       titleOverflow = item.titleOverflow;
-  var compConf = (0, _tools.isEnableConf)(itemRender) ? _vXETable.default.renderer.get(itemRender.name) : null;
+  var compConf = (0, _utils.isEnableConf)(itemRender) ? _vXETable.default.renderer.get(itemRender.name) : null;
   var span = item.span || _vm.span;
   var align = item.align || _vm.align;
   var titleAlign = item.titleAlign || _vm.titleAlign;
@@ -139,7 +139,7 @@ var renderItem = function renderItem(h, _vm, item, slots) {
       width: isNaN(titleWidth) ? titleWidth : "".concat(titleWidth, "px")
     } : null,
     attrs: {
-      title: showTitle ? _tools.UtilTools.getFuncText(title) : null
+      title: showTitle ? (0, _utils.getFuncText)(title) : null
     },
     on: ons
   }, (0, _render.renderTitle)(h, _vm, item)) : null, h('div', {
@@ -172,6 +172,11 @@ var _default = {
       default: null
     }
   },
+  data: function data() {
+    return {
+      itemConfig: null
+    };
+  },
   watch: watch,
   mounted: function mounted() {
     (0, _util.assemItem)(this);

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

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

package/lib/form/src/form.js

@@ -1,5 +1,7 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -13,15 +15,19 @@ var _size = _interopRequireDefault(require("../../mixins/size"));
 
 var _vXETable = _interopRequireDefault(require("../../v-x-e-table"));
 
-var _tools = require("../../tools");
+var _utils = require("../../tools/utils");
+
+var _dom = _interopRequireWildcard(require("../../tools/dom"));
 
 var _util = require("./util");
 
 var _render = require("./render");
 
-var _utils = require("../../tools/src/utils");
+var _log = require("../../tools/log");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-var _dom = require("../../tools/src/dom");
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -57,7 +63,7 @@ var Rule = /*#__PURE__*/function () {
   _createClass(Rule, [{
     key: "content",
     get: function get() {
-      return _tools.UtilTools.getFuncText(this.$options.content || this.$options.message);
+      return (0, _utils.getFuncText)(this.$options.content || this.$options.message);
     }
   }, {
     key: "message",
@@ -128,7 +134,7 @@ function renderItems(h, _vm, itemList) {
         className = item.className,
         titleOverflow = item.titleOverflow,
         children = item.children;
-    var compConf = (0, _tools.isEnableConf)(itemRender) ? _vXETable.default.renderer.get(itemRender.name) : null;
+    var compConf = (0, _utils.isEnableConf)(itemRender) ? _vXETable.default.renderer.get(itemRender.name) : null;
     var span = item.span || _vm.span;
     var align = item.align || _vm.align;
     var titleAlign = item.titleAlign || _vm.titleAlign;
@@ -213,7 +219,7 @@ function renderItems(h, _vm, itemList) {
         width: isNaN(titleWidth) ? titleWidth : "".concat(titleWidth, "px")
       } : null,
       attrs: {
-        title: showTitle ? _tools.UtilTools.getFuncText(title) : null
+        title: showTitle ? (0, _utils.getFuncText)(title) : null
       },
       on: ons
     }, (0, _render.renderTitle)(h, _vm, item)) : null, h('div', {
@@ -362,7 +368,7 @@ var _default2 = {
 
       if (process.env.NODE_ENV === 'development') {
         if (_this.customLayout && _this.items) {
-          _tools.UtilTools.error('vxe.error.errConflicts', ['custom-layout', 'items']);
+          (0, _log.errLog)('vxe.error.errConflicts', ['custom-layout', 'items']);
         }
       }
 
@@ -438,7 +444,7 @@ var _default2 = {
             _xeUtils.default.each(item.slots, function (func) {
               if (!_xeUtils.default.isFunction(func)) {
                 if (!$scopedSlots[func]) {
-                  _tools.UtilTools.error('vxe.error.notSlot', [func]);
+                  (0, _log.errLog)('vxe.error.notSlot', [func]);
                 }
               }
             });
@@ -464,6 +470,15 @@ var _default2 = {
 
       return itemList;
     },
+    getItemByField: function getItemByField(field) {
+      var rest = _xeUtils.default.findTree(this.formItems, function (item) {
+        return item.field === field;
+      }, {
+        children: 'children'
+      });
+
+      return rest ? rest.item : null;
+    },
     toggleCollapse: function toggleCollapse() {
       var status = !this.collapseAll;
       this.collapseAll = status;
@@ -523,7 +538,7 @@ var _default2 = {
               resetValue = item.resetValue,
               itemRender = item.itemRender;
 
-          if ((0, _tools.isEnableConf)(itemRender)) {
+          if ((0, _utils.isEnableConf)(itemRender)) {
             var compConf = _vXETable.default.renderer.get(itemRender.name);
 
             if (compConf && compConf.itemResetMethod) {
@@ -606,13 +621,18 @@ var _default2 = {
       var _this6 = this;
 
       var tooltipOpts = this.tooltipOpts;
+      var $tooltip = this.$refs.tooltip;
       this.tooltipActive = false;
 
+      if ($tooltip) {
+        $tooltip.setActived(false);
+      }
+
       if (tooltipOpts.enterable) {
         this.tooltipTimeout = setTimeout(function () {
-          var $tooltip = _this6.$refs.tooltip;
+          $tooltip = _this6.$refs.tooltip;
 
-          if ($tooltip && !$tooltip.isHover) {
+          if ($tooltip && !$tooltip.isActived()) {
             _this6.closeTooltip();
           }
         }, tooltipOpts.leaveDelay);
@@ -620,19 +640,15 @@ var _default2 = {
         this.closeTooltip();
       }
     },
-    clearValidate: function clearValidate(field) {
-      var itemList = this.getItems();
-
-      if (field) {
-        var item = itemList.find(function (item) {
-          return item.field === field;
-        });
+    clearValidate: function clearValidate(fieldOrItem) {
+      if (fieldOrItem) {
+        var item = (0, _util.handleFieldOrItem)(this, fieldOrItem);
 
         if (item) {
           item.showError = false;
         }
       } else {
-        itemList.forEach(function (item) {
+        this.getItems().forEach(function (item) {
           item.showError = false;
         });
       }
@@ -643,10 +659,9 @@ var _default2 = {
       this.clearValidate();
       return this.beginValidate(this.getItems(), '', callback);
     },
-    validateField: function validateField(field, callback) {
-      return this.beginValidate(this.getItems().filter(function (item) {
-        return item.field === field;
-      }), '', callback);
+    validateField: function validateField(fieldOrItem, callback) {
+      var item = (0, _util.handleFieldOrItem)(this, fieldOrItem);
+      return this.beginValidate(item ? [item] : [], '', callback);
     },
     beginValidate: function beginValidate(itemList, type, callback) {
       var _this7 = this;
@@ -694,7 +709,7 @@ var _default2 = {
             callback();
           }
         }).catch(function () {
-          return new Promise(function (resolve, reject) {
+          return new Promise(function (resolve) {
             _this7.showErrTime = setTimeout(function () {
               itemList.forEach(function (item) {
                 if (item.errRule) {
@@ -713,7 +728,7 @@ var _default2 = {
               callback(validRest);
               resolve();
             } else {
-              reject(validRest);
+              resolve(validRest);
             }
           });
         });
@@ -814,14 +829,13 @@ var _default2 = {
       });
     },
     handleFocus: function handleFocus(fields) {
+      var _this9 = this;
+
       var $el = this.$el;
-      var itemList = this.getItems();
       fields.some(function (property, index) {
-        var item = itemList.find(function (item) {
-          return item.field === property;
-        });
+        var item = _this9.getItemByField(property);
 
-        if (item && (0, _tools.isEnableConf)(item.itemRender)) {
+        if (item && (0, _utils.isEnableConf)(item.itemRender)) {
           var itemRender = item.itemRender;
 
           var compConf = _vXETable.default.renderer.get(itemRender.name);
@@ -829,7 +843,7 @@ var _default2 = {
           var inputElem; // 定位到第一个
 
           if (!index) {
-            _tools.DomTools.scrollToView($el.querySelector(".".concat(item.id)));
+            _dom.default.scrollToView($el.querySelector(".".concat(item.id)));
           } // 如果指定了聚焦 class
 
 
@@ -863,21 +877,17 @@ var _default2 = {
      * 如果单元格配置了校验规则，则会进行校验
      */
     updateStatus: function updateStatus(scope, itemValue) {
-      var _this9 = this;
+      var _this10 = this;
 
       var property = scope.property;
 
       if (property) {
         this.validItemRules('change', property, itemValue).then(function () {
-          _this9.clearValidate(property);
+          _this10.clearValidate(property);
         }).catch(function (_ref3) {
           var rule = _ref3.rule;
 
-          var itemList = _this9.getItems();
-
-          var item = itemList.find(function (item) {
-            return item.field === property;
-          });
+          var item = _this10.getItemByField(property);
 
           if (item) {
             item.showError = true;

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_size=_interopRequireDefault(require("../../mixins/size")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_tools=require("../../tools"),_util=require("./util"),_render=require("./render"),_utils=require("../../tools/src/utils"),_dom=require("../../tools/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function ownKeys(t,e){var i,r=Object.keys(t);return Object.getOwnPropertySymbols&&(i=Object.getOwnPropertySymbols(t),e&&(i=i.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),r.push.apply(r,i)),r}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var i=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(i),!0).forEach(function(e){_defineProperty(t,e,i[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(i)):ownKeys(Object(i)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(i,e))})}return t}function _defineProperty(e,t,i){return t in e?Object.defineProperty(e,t,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[t]=i,e}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var i=0;i<t.length;i++){var r=t[i];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function _createClass(e,t,i){return t&&_defineProperties(e.prototype,t),i&&_defineProperties(e,i),e}var Rule=function(){function t(e){_classCallCheck(this,t),Object.assign(this,{$options:e,required:e.required,min:e.min,max:e.min,type:e.type,pattern:e.pattern,validator:e.validator,trigger:e.trigger,maxWidth:e.maxWidth})}return _createClass(t,[{key:"content",get:function(){return _tools.UtilTools.getFuncText(this.$options.content||this.$options.message)}},{key:"message",get:function(){return this.content}}]),t}();function validErrorRuleValue(e,t){var i=e.type,r=e.min,l=e.max,o=e.pattern,e="number"===i,i=e?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!e||!isNaN(t))||(!_xeUtils.default.eqNull(r)&&i<_xeUtils.default.toNumber(r)||(!_xeUtils.default.eqNull(l)&&i>_xeUtils.default.toNumber(l)||!(!o||(_xeUtils.default.isRegExp(o)?o:new RegExp(o)).test(t))))}function getResetValue(e,t){return t=_xeUtils.default.isArray(e)?[]:t}function renderItems(w,$,e){var U=$._e,R=$.rules,S=$.data,I=$.collapseAll,P=$.validOpts,j=$.titleOverflow;return e.map(function(e,t){var i,r=e.slots,l=e.title,o=e.folding,n=e.visible,s=e.visibleMethod,a=e.field,u=e.collapseNode,c=e.itemRender,f=e.showError,d=e.errRule,m=e.className,h=e.titleOverflow,p=e.children,v=(0,_tools.isEnableConf)(c)?_vXETable.default.renderer.get(c.name):null,g=e.span||$.span,_=e.align||$.align,x=e.titleAlign||$.titleAlign,b=e.titleWidth||$.titleWidth,y=s,E=_xeUtils.default.isUndefined(h)||_xeUtils.default.isNull(h)?j:h,s="title"===E,h=!0===E||"tooltip"===E,E=s||h||"ellipsis"===E,O={data:S,field:a,property:a,item:e,$form:$};if(!1===n)return U();if(p&&0<p.length){p=renderItems(w,$,e.children);return p.length?w("div",{class:["vxe-form--gather vxe-row",e.id,g?"vxe-col--".concat(g," is--span"):"",m?_xeUtils.default.isFunction(m)?m(O):m:""]},p):U()}!y&&v&&v.itemVisibleMethod&&(y=v.itemVisibleMethod),!R||(T=R[a])&&(i=T.some(function(e){return e.required}));var T=[];r&&r.default?T=$.callSlot(r.default,O,w):v&&v.renderItemContent?T=v.renderItemContent.call($,w,c,O):v&&v.renderItem?T=v.renderItem.call($,w,c,O):a&&(T=["".concat(_xeUtils.default.get(S,a))]);h=h?{mouseenter:function(e){$.triggerHeaderHelpEvent(e,O)},mouseleave:$.handleTargetLeaveEvent}:{};return w("div",{class:["vxe-form--item",e.id,g?"vxe-col--".concat(g," is--span"):null,m?_xeUtils.default.isFunction(m)?m(O):m:"",{"is--title":l,"is--required":i,"is--hidden":o&&I,"is--active":!y||y(O),"is--error":f}],key:t},[w("div",{class:"vxe-form--item-inner"},[l||r&&r.title?w("div",{class:["vxe-form--item-title",x?"align--".concat(x):null,{"is--ellipsis":E}],style:b?{width:isNaN(b)?b:"".concat(b,"px")}:null,attrs:{title:s?_tools.UtilTools.getFuncText(l):null},on:h},(0,_render.renderTitle)(w,$,e)):null,w("div",{class:["vxe-form--item-content",_?"align--".concat(_):null]},T.concat([u?w("div",{class:"vxe-form--item-trigger-node",on:{click:$.toggleCollapseEvent}},[w("span",{class:"vxe-form--item-trigger-text"},I?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),w("i",{class:["vxe-form--item-trigger-icon",I?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})]):null,d&&P.showMessage?w("div",{class:"vxe-form--item-valid",style:d.maxWidth?{width:"".concat(d.maxWidth,"px")}:null},d.content):null]))])])})}var _default2={name:"VxeForm",mixins:[_size.default],props:{collapseStatus:{type:Boolean,default:!0},loading:Boolean,data:Object,size:{type:String,default:function(){return _conf.default.form.size||_conf.default.size}},span:{type:[String,Number],default:function(){return _conf.default.form.span}},align:{type:String,default:function(){return _conf.default.form.align}},titleAlign:{type:String,default:function(){return _conf.default.form.titleAlign}},titleWidth:{type:[String,Number],default:function(){return _conf.default.form.titleWidth}},titleColon:{type:Boolean,default:function(){return _conf.default.form.titleColon}},titleAsterisk:{type:Boolean,default:function(){return _conf.default.form.titleAsterisk}},titleOverflow:{type:[Boolean,String],default:null},className:[String,Function],items:Array,rules:Object,preventSubmit:{type:Boolean,default:function(){return _conf.default.form.preventSubmit}},validConfig:Object,customLayout:{type:Boolean,default:function(){return _conf.default.form.customLayout}}},data:function(){return{collapseAll:this.collapseStatus,staticItems:[],formItems:[],tooltipTimeout:null,tooltipActive:!1,tooltipStore:{item:null,visible:!1}}},provide:function(){return{$xeform:this}},computed:{validOpts:function(){return Object.assign({},_conf.default.form.validConfig,this.validConfig)},tooltipOpts:function(){var e=Object.assign({leaveDelay:300},_conf.default.form.tooltipConfig,this.tooltipConfig);return e.enterable&&(e.leaveMethod=this.handleTooltipLeaveMethod),e}},watch:{staticItems:function(e){this.formItems=e},items:function(e){this.loadItem(e)},collapseStatus:function(e){this.collapseAll=!!e}},created:function(){var t=this;this.$nextTick(function(){var e=t.items;"development"===process.env.NODE_ENV&&t.customLayout&&t.items&&_tools.UtilTools.error("vxe.error.errConflicts",["custom-layout","items"]),e&&t.loadItem(e)})},render:function(e){var t=this._e,i=this.loading,r=this.className,l=this.data,o=this.vSize,n=this.tooltipOpts,s=this.formItems,a=this.customLayout,u=_vXETable.default._tooltip;return e("form",{class:["vxe-form",r?_xeUtils.default.isFunction(r)?r({items:s,data:l,$form:this}):r:"",(_defineProperty(r={},"size--".concat(o),o),_defineProperty(r,"is--colon",this.titleColon),_defineProperty(r,"is--asterisk",this.titleAsterisk),_defineProperty(r,"is--loading",i),r)],on:{submit:this.submitEvent,reset:this.resetEvent}},[e("div",{class:"vxe-form--wrapper vxe-row"},a?this.$slots.default:renderItems(e,this,s)),e("div",{class:"vxe-form-slots",ref:"hideItem"},a?[]:this.$slots.default),e("div",{class:["vxe-loading",{"is--visible":i}]},[e("div",{class:"vxe-loading--spinner"})]),u?e("vxe-tooltip",_objectSpread({ref:"tooltip"},n)):t()])},methods:{callSlot:function(e,t,i){if(e){var r=this.$scopedSlots;if(_xeUtils.default.isString(e)&&(e=r[e]||null),_xeUtils.default.isFunction(e))return e.call(this,t,i)}return[]},loadItem:function(e){var t,i=this;return"development"===process.env.NODE_ENV&&(t=this.$scopedSlots,e.forEach(function(e){e.slots&&_xeUtils.default.each(e.slots,function(e){_xeUtils.default.isFunction(e)||t[e]||_tools.UtilTools.error("vxe.error.notSlot",[e])})})),this.staticItems=_xeUtils.default.mapTree(e,function(e){return(0,_util.createItem)(i,e)},{children:"children"}),this.$nextTick()},getItems:function(){var t=[];return _xeUtils.default.eachTree(this.formItems,function(e){t.push(e)},{children:"children"}),t},toggleCollapse:function(){var e=!this.collapseAll;return this.collapseAll=e,this.$emit("update:collapseStatus",e),this.$nextTick()},toggleCollapseEvent:function(e){this.toggleCollapse();var t=this.collapseAll;this.$emit("toggle-collapse",{status:t,collapse:t,data:this.data,$form:this,$event:e},e),this.$emit("collapse",{status:t,collapse:t,data:this.data,$form:this,$event:e},e)},submitEvent:function(t){var i=this;t.preventDefault(),this.preventSubmit||(this.clearValidate(),this.beginValidate(this.getItems()).then(function(){i.$emit("submit",{data:i.data,$form:i,$event:t})}).catch(function(e){i.$emit("submit-invalid",{data:i.data,errMap:e,$form:i,$event:t})}))},reset:function(){var l=this,o=this.data;return o&&this.getItems().forEach(function(e){var t=e.field,i=e.resetValue,r=e.itemRender;(0,_tools.isEnableConf)(r)&&((r=_vXETable.default.renderer.get(r.name))&&r.itemResetMethod?r.itemResetMethod({data:o,field:t,property:t,item:e,$form:l}):t&&_xeUtils.default.set(o,t,null===i?getResetValue(_xeUtils.default.get(o,t),void 0):i))}),this.clearValidate()},resetEvent:function(e){e.preventDefault(),this.reset(),this.$emit("reset",{data:this.data,$form:this,$event:e})},handleTooltipLeaveMethod:function(){var e=this,t=this.tooltipOpts;return setTimeout(function(){e.tooltipActive||e.closeTooltip()},t.leaveDelay),!1},closeTooltip:function(){var e=this.tooltipStore,t=this.$refs.tooltip;return e.visible&&(Object.assign(e,{item:null,visible:!1}),t&&t.close()),this.$nextTick()},triggerHeaderHelpEvent:function(e,t){var i=t.item,r=this.tooltipStore,l=this.$refs.tooltip,o=e.currentTarget.children[0],t=(o.textContent||"").trim(),e=o.scrollWidth>o.clientWidth;clearTimeout(this.tooltipTimeout),this.tooltipActive=!0,this.closeTooltip(),t&&e&&(Object.assign(r,{item:i,visible:!0}),l&&l.open(o,t))},handleTargetLeaveEvent:function(){var t=this,e=this.tooltipOpts;this.tooltipActive=!1,e.enterable?this.tooltipTimeout=setTimeout(function(){var e=t.$refs.tooltip;e&&!e.isHover&&t.closeTooltip()},e.leaveDelay):this.closeTooltip()},clearValidate:function(t){var e,i=this.getItems();return t?(e=i.find(function(e){return e.field===t}))&&(e.showError=!1):i.forEach(function(e){e.showError=!1}),this.$nextTick()},validate:function(e){return this.clearValidate(),this.beginValidate(this.getItems(),"",e)},validateField:function(t,e){return this.beginValidate(this.getItems().filter(function(e){return e.field===t}),"",e)},beginValidate:function(i,e,r){var l=this,o=this.data,t=this.rules,n=this.validOpts,s={},a=[],u=[];return clearTimeout(this.showErrTime),o&&t?(i.forEach(function(i){var r=i.field;r&&u.push(l.validItemRules(e||"all",r).then(function(){i.errRule=null}).catch(function(e){var t=e.rule,e={rule:t,rules:e.rules,data:o,field:r,property:r,$form:l};return s[r]||(s[r]=[]),s[r].push(e),a.push(r),i.errRule=t,Promise.reject(e)}))}),Promise.all(u).then(function(){r&&r()}).catch(function(){return new Promise(function(e,t){l.showErrTime=setTimeout(function(){i.forEach(function(e){e.errRule&&(e.showError=!0)})},20),n.autoPos&&l.$nextTick(function(){l.handleFocus(a)}),r?(r(s),e()):t(s)})})):(r&&r(),Promise.resolve())},validItemRules:function(o,n,e){var s,a,u=this,c=this.data,t=this.rules,f=[],d=[];return n&&t&&((s=_xeUtils.default.get(t,n))&&(a=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(c,n):e,s.forEach(function(t){var e,i=t.type,r=t.trigger,l=t.required;"all"!==o&&r&&o!==t.trigger||(_xeUtils.default.isFunction(t.validator)?(e=t.validator({itemValue:a,rule:t,rules:s,data:c,field:n,property:n,$form:u}))&&(_xeUtils.default.isError(e)?f.push(new Rule({type:"custom",trigger:r,content:e.message,rule:new Rule(t)})):e.catch&&d.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)}))}))):(i="array"===i?!_xeUtils.default.isArray(a)||!a.length:(0,_utils.eqEmptyValue)(a),(l?i||validErrorRuleValue(t,a):!i&&validErrorRuleValue(t,a))&&f.push(new Rule(t))))}))),Promise.all(d).then(function(){if(f.length){var e={rules:f,rule:f[0]};return Promise.reject(e)}})},handleFocus:function(e){var n=this.$el,s=this.getItems();e.some(function(t,e){var i=s.find(function(e){return e.field===t});if(i&&(0,_tools.isEnableConf)(i.itemRender)){var r,l=i.itemRender,o=_vXETable.default.renderer.get(l.name);if(e||_tools.DomTools.scrollToView(n.querySelector(".".concat(i.id))),r=!(r=l.autofocus?n.querySelector(".".concat(i.id," ").concat(l.autofocus)):r)&&o&&o.autofocus?n.querySelector(".".concat(i.id," ").concat(o.autofocus)):r)return r.focus(),_dom.browse.msie&&((r=r.createTextRange()).collapse(!1),r.select()),!0}})},updateStatus:function(e,t){var i=this,r=e.property;r&&this.validItemRules("change",r,t).then(function(){i.clearValidate(r)}).catch(function(e){var t=e.rule,e=i.getItems().find(function(e){return e.field===r});e&&(e.showError=!0,e.errRule=t)})}}};exports.default=_default2;
+"use strict";function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_size=_interopRequireDefault(require("../../mixins/size")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_utils=require("../../tools/utils"),_dom=_interopRequireWildcard(require("../../tools/dom")),_util=require("./util"),_render=require("./render"),_log=require("../../tools/log");function _getRequireWildcardCache(e){if("function"!=typeof WeakMap)return null;var t=new WeakMap,i=new WeakMap;return(_getRequireWildcardCache=function(e){return e?i:t})(e)}function _interopRequireWildcard(e,t){if(!t&&e&&e.__esModule)return e;if(null===e||"object"!==_typeof(e)&&"function"!=typeof e)return{default:e};t=_getRequireWildcardCache(t);if(t&&t.has(e))return t.get(e);var i,r,l={},n=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(i in e)"default"!==i&&Object.prototype.hasOwnProperty.call(e,i)&&((r=n?Object.getOwnPropertyDescriptor(e,i):null)&&(r.get||r.set)?Object.defineProperty(l,i,r):l[i]=e[i]);return l.default=e,t&&t.set(e,l),l}function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function ownKeys(t,e){var i,r=Object.keys(t);return Object.getOwnPropertySymbols&&(i=Object.getOwnPropertySymbols(t),e&&(i=i.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),r.push.apply(r,i)),r}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var i=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(i),!0).forEach(function(e){_defineProperty(t,e,i[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(i)):ownKeys(Object(i)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(i,e))})}return t}function _defineProperty(e,t,i){return t in e?Object.defineProperty(e,t,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[t]=i,e}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var i=0;i<t.length;i++){var r=t[i];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function _createClass(e,t,i){return t&&_defineProperties(e.prototype,t),i&&_defineProperties(e,i),e}var Rule=function(){function t(e){_classCallCheck(this,t),Object.assign(this,{$options:e,required:e.required,min:e.min,max:e.min,type:e.type,pattern:e.pattern,validator:e.validator,trigger:e.trigger,maxWidth:e.maxWidth})}return _createClass(t,[{key:"content",get:function(){return(0,_utils.getFuncText)(this.$options.content||this.$options.message)}},{key:"message",get:function(){return this.content}}]),t}();function validErrorRuleValue(e,t){var i=e.type,r=e.min,l=e.max,n=e.pattern,e="number"===i,i=e?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!e||!isNaN(t))||(!_xeUtils.default.eqNull(r)&&i<_xeUtils.default.toNumber(r)||(!_xeUtils.default.eqNull(l)&&i>_xeUtils.default.toNumber(l)||!(!n||(_xeUtils.default.isRegExp(n)?n:new RegExp(n)).test(t))))}function getResetValue(e,t){return t=_xeUtils.default.isArray(e)?[]:t}function renderItems(R,T,e){var $=T._e,S=T.rules,I=T.data,U=T.collapseAll,j=T.validOpts,P=T.titleOverflow;return e.map(function(e,t){var i,r=e.slots,l=e.title,n=e.folding,o=e.visible,s=e.visibleMethod,a=e.field,u=e.collapseNode,c=e.itemRender,f=e.showError,d=e.errRule,p=e.className,m=e.titleOverflow,h=e.children,v=(0,_utils.isEnableConf)(c)?_vXETable.default.renderer.get(c.name):null,g=e.span||T.span,_=e.align||T.align,y=e.titleAlign||T.titleAlign,b=e.titleWidth||T.titleWidth,x=s,O=_xeUtils.default.isUndefined(m)||_xeUtils.default.isNull(m)?P:m,s="title"===O,m=!0===O||"tooltip"===O,O=s||m||"ellipsis"===O,E={data:I,field:a,property:a,item:e,$form:T};if(!1===o)return $();if(h&&0<h.length){h=renderItems(R,T,e.children);return h.length?R("div",{class:["vxe-form--gather vxe-row",e.id,g?"vxe-col--".concat(g," is--span"):"",p?_xeUtils.default.isFunction(p)?p(E):p:""]},h):$()}!x&&v&&v.itemVisibleMethod&&(x=v.itemVisibleMethod),!S||(w=S[a])&&(i=w.some(function(e){return e.required}));var w=[];r&&r.default?w=T.callSlot(r.default,E,R):v&&v.renderItemContent?w=v.renderItemContent.call(T,R,c,E):v&&v.renderItem?w=v.renderItem.call(T,R,c,E):a&&(w=["".concat(_xeUtils.default.get(I,a))]);m=m?{mouseenter:function(e){T.triggerHeaderHelpEvent(e,E)},mouseleave:T.handleTargetLeaveEvent}:{};return R("div",{class:["vxe-form--item",e.id,g?"vxe-col--".concat(g," is--span"):null,p?_xeUtils.default.isFunction(p)?p(E):p:"",{"is--title":l,"is--required":i,"is--hidden":n&&U,"is--active":!x||x(E),"is--error":f}],key:t},[R("div",{class:"vxe-form--item-inner"},[l||r&&r.title?R("div",{class:["vxe-form--item-title",y?"align--".concat(y):null,{"is--ellipsis":O}],style:b?{width:isNaN(b)?b:"".concat(b,"px")}:null,attrs:{title:s?(0,_utils.getFuncText)(l):null},on:m},(0,_render.renderTitle)(R,T,e)):null,R("div",{class:["vxe-form--item-content",_?"align--".concat(_):null]},w.concat([u?R("div",{class:"vxe-form--item-trigger-node",on:{click:T.toggleCollapseEvent}},[R("span",{class:"vxe-form--item-trigger-text"},U?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),R("i",{class:["vxe-form--item-trigger-icon",U?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})]):null,d&&j.showMessage?R("div",{class:"vxe-form--item-valid",style:d.maxWidth?{width:"".concat(d.maxWidth,"px")}:null},d.content):null]))])])})}var _default2={name:"VxeForm",mixins:[_size.default],props:{collapseStatus:{type:Boolean,default:!0},loading:Boolean,data:Object,size:{type:String,default:function(){return _conf.default.form.size||_conf.default.size}},span:{type:[String,Number],default:function(){return _conf.default.form.span}},align:{type:String,default:function(){return _conf.default.form.align}},titleAlign:{type:String,default:function(){return _conf.default.form.titleAlign}},titleWidth:{type:[String,Number],default:function(){return _conf.default.form.titleWidth}},titleColon:{type:Boolean,default:function(){return _conf.default.form.titleColon}},titleAsterisk:{type:Boolean,default:function(){return _conf.default.form.titleAsterisk}},titleOverflow:{type:[Boolean,String],default:null},className:[String,Function],items:Array,rules:Object,preventSubmit:{type:Boolean,default:function(){return _conf.default.form.preventSubmit}},validConfig:Object,customLayout:{type:Boolean,default:function(){return _conf.default.form.customLayout}}},data:function(){return{collapseAll:this.collapseStatus,staticItems:[],formItems:[],tooltipTimeout:null,tooltipActive:!1,tooltipStore:{item:null,visible:!1}}},provide:function(){return{$xeform:this}},computed:{validOpts:function(){return Object.assign({},_conf.default.form.validConfig,this.validConfig)},tooltipOpts:function(){var e=Object.assign({leaveDelay:300},_conf.default.form.tooltipConfig,this.tooltipConfig);return e.enterable&&(e.leaveMethod=this.handleTooltipLeaveMethod),e}},watch:{staticItems:function(e){this.formItems=e},items:function(e){this.loadItem(e)},collapseStatus:function(e){this.collapseAll=!!e}},created:function(){var t=this;this.$nextTick(function(){var e=t.items;"development"===process.env.NODE_ENV&&t.customLayout&&t.items&&(0,_log.errLog)("vxe.error.errConflicts",["custom-layout","items"]),e&&t.loadItem(e)})},render:function(e){var t=this._e,i=this.loading,r=this.className,l=this.data,n=this.vSize,o=this.tooltipOpts,s=this.formItems,a=this.customLayout,u=_vXETable.default._tooltip;return e("form",{class:["vxe-form",r?_xeUtils.default.isFunction(r)?r({items:s,data:l,$form:this}):r:"",(_defineProperty(r={},"size--".concat(n),n),_defineProperty(r,"is--colon",this.titleColon),_defineProperty(r,"is--asterisk",this.titleAsterisk),_defineProperty(r,"is--loading",i),r)],on:{submit:this.submitEvent,reset:this.resetEvent}},[e("div",{class:"vxe-form--wrapper vxe-row"},a?this.$slots.default:renderItems(e,this,s)),e("div",{class:"vxe-form-slots",ref:"hideItem"},a?[]:this.$slots.default),e("div",{class:["vxe-loading",{"is--visible":i}]},[e("div",{class:"vxe-loading--spinner"})]),u?e("vxe-tooltip",_objectSpread({ref:"tooltip"},o)):t()])},methods:{callSlot:function(e,t,i){if(e){var r=this.$scopedSlots;if(_xeUtils.default.isString(e)&&(e=r[e]||null),_xeUtils.default.isFunction(e))return e.call(this,t,i)}return[]},loadItem:function(e){var t,i=this;return"development"===process.env.NODE_ENV&&(t=this.$scopedSlots,e.forEach(function(e){e.slots&&_xeUtils.default.each(e.slots,function(e){_xeUtils.default.isFunction(e)||t[e]||(0,_log.errLog)("vxe.error.notSlot",[e])})})),this.staticItems=_xeUtils.default.mapTree(e,function(e){return(0,_util.createItem)(i,e)},{children:"children"}),this.$nextTick()},getItems:function(){var t=[];return _xeUtils.default.eachTree(this.formItems,function(e){t.push(e)},{children:"children"}),t},getItemByField:function(t){var e=_xeUtils.default.findTree(this.formItems,function(e){return e.field===t},{children:"children"});return e?e.item:null},toggleCollapse:function(){var e=!this.collapseAll;return this.collapseAll=e,this.$emit("update:collapseStatus",e),this.$nextTick()},toggleCollapseEvent:function(e){this.toggleCollapse();var t=this.collapseAll;this.$emit("toggle-collapse",{status:t,collapse:t,data:this.data,$form:this,$event:e},e),this.$emit("collapse",{status:t,collapse:t,data:this.data,$form:this,$event:e},e)},submitEvent:function(t){var i=this;t.preventDefault(),this.preventSubmit||(this.clearValidate(),this.beginValidate(this.getItems()).then(function(){i.$emit("submit",{data:i.data,$form:i,$event:t})}).catch(function(e){i.$emit("submit-invalid",{data:i.data,errMap:e,$form:i,$event:t})}))},reset:function(){var l=this,n=this.data;return n&&this.getItems().forEach(function(e){var t=e.field,i=e.resetValue,r=e.itemRender;(0,_utils.isEnableConf)(r)&&((r=_vXETable.default.renderer.get(r.name))&&r.itemResetMethod?r.itemResetMethod({data:n,field:t,property:t,item:e,$form:l}):t&&_xeUtils.default.set(n,t,null===i?getResetValue(_xeUtils.default.get(n,t),void 0):i))}),this.clearValidate()},resetEvent:function(e){e.preventDefault(),this.reset(),this.$emit("reset",{data:this.data,$form:this,$event:e})},handleTooltipLeaveMethod:function(){var e=this,t=this.tooltipOpts;return setTimeout(function(){e.tooltipActive||e.closeTooltip()},t.leaveDelay),!1},closeTooltip:function(){var e=this.tooltipStore,t=this.$refs.tooltip;return e.visible&&(Object.assign(e,{item:null,visible:!1}),t&&t.close()),this.$nextTick()},triggerHeaderHelpEvent:function(e,t){var i=t.item,r=this.tooltipStore,l=this.$refs.tooltip,n=e.currentTarget.children[0],t=(n.textContent||"").trim(),e=n.scrollWidth>n.clientWidth;clearTimeout(this.tooltipTimeout),this.tooltipActive=!0,this.closeTooltip(),t&&e&&(Object.assign(r,{item:i,visible:!0}),l&&l.open(n,t))},handleTargetLeaveEvent:function(){var e=this,t=this.tooltipOpts,i=this.$refs.tooltip;this.tooltipActive=!1,i&&i.setActived(!1),t.enterable?this.tooltipTimeout=setTimeout(function(){(i=e.$refs.tooltip)&&!i.isActived()&&e.closeTooltip()},t.leaveDelay):this.closeTooltip()},clearValidate:function(e){return e?(e=(0,_util.handleFieldOrItem)(this,e))&&(e.showError=!1):this.getItems().forEach(function(e){e.showError=!1}),this.$nextTick()},validate:function(e){return this.clearValidate(),this.beginValidate(this.getItems(),"",e)},validateField:function(e,t){e=(0,_util.handleFieldOrItem)(this,e);return this.beginValidate(e?[e]:[],"",t)},beginValidate:function(t,e,i){var l=this,n=this.data,r=this.rules,o=this.validOpts,s={},a=[],u=[];return clearTimeout(this.showErrTime),n&&r?(t.forEach(function(i){var r=i.field;r&&u.push(l.validItemRules(e||"all",r).then(function(){i.errRule=null}).catch(function(e){var t=e.rule,e={rule:t,rules:e.rules,data:n,field:r,property:r,$form:l};return s[r]||(s[r]=[]),s[r].push(e),a.push(r),i.errRule=t,Promise.reject(e)}))}),Promise.all(u).then(function(){i&&i()}).catch(function(){return new Promise(function(e){l.showErrTime=setTimeout(function(){t.forEach(function(e){e.errRule&&(e.showError=!0)})},20),o.autoPos&&l.$nextTick(function(){l.handleFocus(a)}),i?(i(s),e()):e(s)})})):(i&&i(),Promise.resolve())},validItemRules:function(n,o,e){var s,a,u=this,c=this.data,t=this.rules,f=[],d=[];return o&&t&&((s=_xeUtils.default.get(t,o))&&(a=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(c,o):e,s.forEach(function(t){var e,i=t.type,r=t.trigger,l=t.required;"all"!==n&&r&&n!==t.trigger||(_xeUtils.default.isFunction(t.validator)?(e=t.validator({itemValue:a,rule:t,rules:s,data:c,field:o,property:o,$form:u}))&&(_xeUtils.default.isError(e)?f.push(new Rule({type:"custom",trigger:r,content:e.message,rule:new Rule(t)})):e.catch&&d.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)}))}))):(i="array"===i?!_xeUtils.default.isArray(a)||!a.length:(0,_utils.eqEmptyValue)(a),(l?i||validErrorRuleValue(t,a):!i&&validErrorRuleValue(t,a))&&f.push(new Rule(t))))}))),Promise.all(d).then(function(){if(f.length){var e={rules:f,rule:f[0]};return Promise.reject(e)}})},handleFocus:function(e){var n=this,o=this.$el;e.some(function(e,t){var i=n.getItemByField(e);if(i&&(0,_utils.isEnableConf)(i.itemRender)){var r,l=i.itemRender,e=_vXETable.default.renderer.get(l.name);if(t||_dom.default.scrollToView(o.querySelector(".".concat(i.id))),r=!(r=l.autofocus?o.querySelector(".".concat(i.id," ").concat(l.autofocus)):r)&&e&&e.autofocus?o.querySelector(".".concat(i.id," ").concat(e.autofocus)):r)return r.focus(),_dom.browse.msie&&((r=r.createTextRange()).collapse(!1),r.select()),!0}})},updateStatus:function(e,t){var i=this,r=e.property;r&&this.validItemRules("change",r,t).then(function(){i.clearValidate(r)}).catch(function(e){var t=e.rule,e=i.getItemByField(r);e&&(e.showError=!0,e.errRule=t)})}}};exports.default=_default2;

package/lib/form/src/render.js

@@ -9,7 +9,7 @@ var _conf = _interopRequireDefault(require("../../v-x-e-table/src/conf"));
 
 var _vXETable = _interopRequireDefault(require("../../v-x-e-table"));
 
-var _tools = require("../../tools");
+var _utils = require("../../tools/utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -36,7 +36,7 @@ function renderTitle(h, _vm, item) {
       itemRender = item.itemRender,
       titlePrefix = item.titlePrefix,
       titleSuffix = item.titleSuffix;
-  var compConf = (0, _tools.isEnableConf)(itemRender) ? _vXETable.default.renderer.get(itemRender.name) : null;
+  var compConf = (0, _utils.isEnableConf)(itemRender) ? _vXETable.default.renderer.get(itemRender.name) : null;
   var params = {
     data: data,
     property: field,
@@ -49,7 +49,7 @@ function renderTitle(h, _vm, item) {
   if (titlePrefix) {
     titVNs.push(titlePrefix.content || titlePrefix.message ? h('vxe-tooltip', {
       props: {
-        content: _tools.UtilTools.getFuncText(titlePrefix.content || titlePrefix.message),
+        content: (0, _utils.getFuncText)(titlePrefix.content || titlePrefix.message),
         enterable: titlePrefix.enterable,
         theme: titlePrefix.theme
       }
@@ -58,7 +58,7 @@ function renderTitle(h, _vm, item) {
 
   titVNs.push(h('span', {
     class: 'vxe-form--item-title-label'
-  }, compConf && compConf.renderItemTitle ? compConf.renderItemTitle(itemRender, params) : slots && slots.title ? _vm.callSlot(slots.title, params, h) : _tools.UtilTools.getFuncText(item.title)));
+  }, compConf && compConf.renderItemTitle ? compConf.renderItemTitle(itemRender, params) : slots && slots.title ? _vm.callSlot(slots.title, params, h) : (0, _utils.getFuncText)(item.title)));
   contVNs.push(h('div', {
     class: 'vxe-form--item-title-content'
   }, titVNs));
@@ -67,7 +67,7 @@ function renderTitle(h, _vm, item) {
   if (titleSuffix) {
     fixVNs.push(titleSuffix.content || titleSuffix.message ? h('vxe-tooltip', {
       props: {
-        content: _tools.UtilTools.getFuncText(titleSuffix.content || titleSuffix.message),
+        content: (0, _utils.getFuncText)(titleSuffix.content || titleSuffix.message),
         enterable: titleSuffix.enterable,
         theme: titleSuffix.theme
       }

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

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

package/lib/form/src/util.js

@@ -7,13 +7,14 @@ exports.assemItem = assemItem;
 exports.createItem = createItem;
 exports.destroyItem = destroyItem;
 exports.getItemConfig = getItemConfig;
+exports.handleFieldOrItem = void 0;
 exports.isItem = isItem;
 
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
 
 var _vXETable = _interopRequireDefault(require("../../v-x-e-table"));
 
-var _tools = require("../../tools");
+var _log = require("../../tools/log");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -56,7 +57,7 @@ var ItemConfig = /*#__PURE__*/function () {
       var compConf = item.itemRender ? _vXETable.default.renderer.get(item.itemRender.name) : null;
 
       if (compConf && !compConf.renderItemContent && compConf.renderItem) {
-        _tools.UtilTools.warn('vxe.error.delProp', ['item-render.renderItem', 'item-render.renderItemContent']);
+        (0, _log.warnLog)('vxe.error.delProp', ['item-render.renderItem', 'item-render.renderItemContent']);
       }
     }
   }
@@ -79,6 +80,16 @@ function getItemConfig($xeform, _vm, options) {
   return isItem(_vm) ? _vm : new ItemConfig($xeform, _vm, options);
 }
 
+var handleFieldOrItem = function handleFieldOrItem($xeform, fieldOrItem) {
+  if (fieldOrItem) {
+    return _xeUtils.default.isString(fieldOrItem) ? $xeform.getItemByField(fieldOrItem) : fieldOrItem;
+  }
+
+  return null;
+};
+
+exports.handleFieldOrItem = handleFieldOrItem;
+
 function createItem($xeform, _vm) {
   return getItemConfig($xeform, _vm);
 }

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

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