vxe-table 4.3.2 → 4.3.3

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

@@ -22,8 +22,14 @@ export var formItemProps = {
     field: String,
     span: [String, Number],
     align: String,
-    titleAlign: String,
-    titleWidth: [String, Number],
+    titleAlign: {
+        type: String,
+        default: null
+    },
+    titleWidth: {
+        type: [String, Number],
+        default: null
+    },
     titleColon: {
         type: Boolean,
         default: null
@@ -33,7 +39,10 @@ export var formItemProps = {
         default: null
     },
     className: [String, Function],
-    titleOverflow: { type: [Boolean, String], default: null },
+    titleOverflow: {
+        type: [Boolean, String],
+        default: null
+    },
     titlePrefix: Object,
     titleSuffix: Object,
     resetValue: { default: null },
@@ -67,7 +76,7 @@ export default defineComponent({
         });
         var renderItem = function ($xeform, item) {
             var props = $xeform.props, reactData = $xeform.reactData;
-            var data = props.data, rules = props.rules, allTitleOverflow = props.titleOverflow;
+            var data = props.data, rules = props.rules, allTitleAlign = props.titleAlign, allTitleWidth = props.titleWidth, allTitleColon = props.titleColon, allTitleAsterisk = props.titleAsterisk, allTitleOverflow = props.titleOverflow;
             var collapseAll = reactData.collapseAll;
             var computeValidOpts = $xeform.getComputeMaps().computeValidOpts;
             var validOpts = computeValidOpts.value;
@@ -78,8 +87,10 @@ export default defineComponent({
             var titleSlot = slots ? slots.title : null;
             var span = item.span || props.span;
             var align = item.align || props.align;
-            var titleAlign = item.titleAlign || props.titleAlign;
-            var titleWidth = item.titleWidth || props.titleWidth;
+            var titleAlign = XEUtils.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
+            var titleWidth = XEUtils.eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
+            var titleColon = XEUtils.eqNull(item.titleColon) ? allTitleColon : item.titleColon;
+            var titleAsterisk = XEUtils.eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk;
             var itemOverflow = (XEUtils.isUndefined(titleOverflow) || XEUtils.isNull(titleOverflow)) ? allTitleOverflow : titleOverflow;
             var showEllipsis = itemOverflow === 'ellipsis';
             var showTitle = itemOverflow === 'title';
@@ -143,6 +154,8 @@ export default defineComponent({
                     itemClassName ? (XEUtils.isFunction(itemClassName) ? itemClassName(params) : itemClassName) : '',
                     {
                         'is--title': title,
+                        'is--colon': titleColon,
+                        'is--asterisk': titleAsterisk,
                         'is--required': isRequired,
                         'is--hidden': folding && collapseAll,
                         'is--active': isActivetem($xeform, item),

package/es/tools/log.js

@@ -1,6 +1,6 @@
 import GlobalConfig from '../v-x-e-table/src/conf';
 export function getLog(message, params) {
-    return "[vxe-table v".concat("4.3.2", "] ").concat(GlobalConfig.i18n(message, params));
+    return "[vxe-table v".concat("4.3.3", "] ").concat(GlobalConfig.i18n(message, params));
 }
 function outLog(type) {
     return function (message, params) {

package/es/v-x-e-table/index.js

@@ -83,7 +83,7 @@ export var config = new VXETableConfig();
 export var v = 'v4';
 export var VXETable = {
     v: v,
-    version: "4.3.2",
+    version: "4.3.3",
     setup: setup,
     interceptor: interceptor,
     renderer: renderer,

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

@@ -44,8 +44,14 @@ var formItemProps = {
   field: String,
   span: [String, Number],
   align: String,
-  titleAlign: String,
-  titleWidth: [String, Number],
+  titleAlign: {
+    type: String,
+    default: null
+  },
+  titleWidth: {
+    type: [String, Number],
+    default: null
+  },
   titleColon: {
     type: Boolean,
     default: null
@@ -107,6 +113,10 @@ var _default = (0, _vue.defineComponent)({
           reactData = $xeform.reactData;
       var data = props.data,
           rules = props.rules,
+          allTitleAlign = props.titleAlign,
+          allTitleWidth = props.titleWidth,
+          allTitleColon = props.titleColon,
+          allTitleAsterisk = props.titleAsterisk,
           allTitleOverflow = props.titleOverflow;
       var collapseAll = reactData.collapseAll;
       var computeValidOpts = $xeform.getComputeMaps().computeValidOpts;
@@ -128,8 +138,10 @@ var _default = (0, _vue.defineComponent)({
       var titleSlot = slots ? slots.title : null;
       var span = item.span || props.span;
       var align = item.align || props.align;
-      var titleAlign = item.titleAlign || props.titleAlign;
-      var titleWidth = item.titleWidth || props.titleWidth;
+      var titleAlign = _xeUtils.default.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
+      var titleWidth = _xeUtils.default.eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
+      var titleColon = _xeUtils.default.eqNull(item.titleColon) ? allTitleColon : item.titleColon;
+      var titleAsterisk = _xeUtils.default.eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk;
       var itemOverflow = _xeUtils.default.isUndefined(titleOverflow) || _xeUtils.default.isNull(titleOverflow) ? allTitleOverflow : titleOverflow;
       var showEllipsis = itemOverflow === 'ellipsis';
       var showTitle = itemOverflow === 'title';
@@ -198,6 +210,8 @@ var _default = (0, _vue.defineComponent)({
         ref: refElem,
         class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : '', className ? _xeUtils.default.isFunction(className) ? className(params) : className : '', itemClassName ? _xeUtils.default.isFunction(itemClassName) ? itemClassName(params) : itemClassName : '', {
           'is--title': title,
+          'is--colon': titleColon,
+          'is--asterisk': titleAsterisk,
           'is--required': isRequired,
           'is--hidden': folding && collapseAll,
           'is--active': (0, _util.isActivetem)($xeform, item),

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

package/lib/index.umd.js

@@ -8872,7 +8872,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("4.3.2", "] ").concat(src_conf.i18n(message, params));
+  return "[vxe-table v".concat("4.3.3", "] ").concat(src_conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10906,7 +10906,7 @@ var v_x_e_table_config = new v_x_e_table_VXETableConfig();
 var v = 'v4';
 var VXETable = {
   v: v,
-  version: "4.3.2",
+  version: "4.3.3",
   setup: setup_setup,
   interceptor: interceptor,
   renderer: renderer,
@@ -29726,8 +29726,14 @@ var formItemProps = {
   field: String,
   span: [String, Number],
   align: String,
-  titleAlign: String,
-  titleWidth: [String, Number],
+  titleAlign: {
+    type: String,
+    default: null
+  },
+  titleWidth: {
+    type: [String, Number],
+    default: null
+  },
   titleColon: {
     type: Boolean,
     default: null
@@ -29787,6 +29793,10 @@ var formItemProps = {
           reactData = $xeform.reactData;
       var data = props.data,
           rules = props.rules,
+          allTitleAlign = props.titleAlign,
+          allTitleWidth = props.titleWidth,
+          allTitleColon = props.titleColon,
+          allTitleAsterisk = props.titleAsterisk,
           allTitleOverflow = props.titleOverflow;
       var collapseAll = reactData.collapseAll;
 
@@ -29811,8 +29821,10 @@ var formItemProps = {
       var titleSlot = slots ? slots.title : null;
       var span = item.span || props.span;
       var align = item.align || props.align;
-      var titleAlign = item.titleAlign || props.titleAlign;
-      var titleWidth = item.titleWidth || props.titleWidth;
+      var titleAlign = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
+      var titleWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleWidth) ? allTitleWidth : item.titleWidth;
+      var titleColon = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleColon) ? allTitleColon : item.titleColon;
+      var titleAsterisk = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk;
       var itemOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isUndefined(titleOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isNull(titleOverflow) ? allTitleOverflow : titleOverflow;
       var showEllipsis = itemOverflow === 'ellipsis';
       var showTitle = itemOverflow === 'title';
@@ -29881,6 +29893,8 @@ var formItemProps = {
         ref: refElem,
         class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(className) ? className(params) : className : '', itemClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(itemClassName) ? itemClassName(params) : itemClassName : '', {
           'is--title': title,
+          'is--colon': titleColon,
+          'is--asterisk': titleAsterisk,
           'is--required': isRequired,
           'is--hidden': folding && collapseAll,
           'is--active': isActivetem($xeform, item),