vxe-table 3.6.1 → 3.6.3

package/lib/footer/style/style.css

@@ -23,20 +23,3 @@
 /*select*/
 /*switch*/
 /*pulldown*/
-.vxe-table--footer-wrapper {
-  color: #606266;
-  margin-top: -1px; }
-  .vxe-table--footer-wrapper.body--wrapper {
-    overflow-x: auto; }
-
-.vxe-footer--column.col--ellipsis > .vxe-cell {
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center; }
-  .vxe-footer--column.col--ellipsis > .vxe-cell .vxe-cell--item {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap; }

package/lib/footer/style/style.min.css

@@ -1 +0,0 @@
-.vxe-table--footer-wrapper{color:#606266;margin-top:-1px}.vxe-table--footer-wrapper.body--wrapper{overflow-x:auto}.vxe-footer--column.col--ellipsis>.vxe-cell{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.vxe-footer--column.col--ellipsis>.vxe-cell .vxe-cell--item{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}

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

@@ -27,8 +27,14 @@ var props = {
   size: 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
@@ -69,6 +75,10 @@ var renderItem = function renderItem(h, _vm, item, slots) {
       data = _vm.data,
       collapseAll = _vm.collapseAll,
       validOpts = _vm.validOpts,
+      allTitleAlign = _vm.titleAlign,
+      allTitleWidth = _vm.titleWidth,
+      allTitleColon = _vm.titleColon,
+      allTitleAsterisk = _vm.titleAsterisk,
       allTitleOverflow = _vm.titleOverflow;
   var title = item.title,
       folding = item.folding,
@@ -84,8 +94,10 @@ var renderItem = function renderItem(h, _vm, item, slots) {
   var itemClassName = compConf ? compConf.itemClassName : '';
   var span = item.span || _vm.span;
   var align = item.align || _vm.align;
-  var titleAlign = item.titleAlign || _vm.titleAlign;
-  var titleWidth = item.titleWidth || _vm.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';
@@ -135,6 +147,8 @@ var renderItem = function renderItem(h, _vm, item, slots) {
   return h('div', {
     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)(_vm, item),

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")),_utils=require("../../tools/utils"),_util=require("./util"),_render=require("./render"),_vn=require("../../tools/vn");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],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},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._e,o=t.rules,a=t.data,s=t.collapseAll,u=t.validOpts,d=t.titleOverflow,f=i.title,c=i.folding,m=i.visible,v=i.field,g=i.collapseNode,p=i.itemRender,_=i.showError,x=i.errRule,h=i.className,b=i.titleOverflow,N=(0,_utils.isEnableConf)(p)?_vXETable.default.renderer.get(p.name):null,S=N?N.itemClassName:"",q=i.span||t.span,O=i.align||t.align,y=i.titleAlign||t.titleAlign,I=i.titleWidth||t.titleWidth,w=_xeUtils.default.isUndefined(b)||_xeUtils.default.isNull(b)?d:b,d="title"===w,b=!0===w||"tooltip"===w,w=d||b||"ellipsis"===w,C={data:a,field:v,property:v,item:i,$form:t};if(!1===m)return r();!o||(F=o[v])&&(n=F.some(function(e){return e.required}));var F=[];l&&l.default?F=t.callSlot(l.default,C,e):N&&N.renderItemContent?F=(0,_vn.getSlotVNs)(N.renderItemContent.call(t,e,p,C)):N&&N.renderItem?F=(0,_vn.getSlotVNs)(N.renderItem.call(t,e,p,C)):v&&(F=["".concat(_xeUtils.default.get(a,v))]);b=b?{mouseenter:function(e){t.triggerTitleTipEvent(e,C)},mouseleave:t.handleTitleTipLeaveEvent}:{};return e("div",{class:["vxe-form--item",i.id,q?"vxe-col--".concat(q," is--span"):"",h?_xeUtils.default.isFunction(h)?h(C):h:"",S?_xeUtils.default.isFunction(S)?S(C):S:"",{"is--title":f,"is--required":n,"is--hidden":c&&s,"is--active":(0,_util.isActivetem)(t,i),"is--error":_}]},[e("div",{class:"vxe-form--item-inner"},[f||l&&l.title?e("div",{class:["vxe-form--item-title",y?"align--".concat(y):null,{"is--ellipsis":w}],style:I?{width:isNaN(I)?I:"".concat(I,"px")}:null,attrs:{title:d?(0,_utils.getFuncText)(f):null},on:b},(0,_render.renderTitle)(e,t,i)):null,e("div",{class:["vxe-form--item-content",O?"align--".concat(O):null]},F.concat([g?e("div",{class:"vxe-form--item-trigger-node",on:{click:t.toggleCollapseEvent}},[e("span",{class:"vxe-form--item-trigger-text"},s?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),e("i",{class:["vxe-form--item-trigger-icon",s?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})]):null,x&&u.showMessage?e("div",{class:"vxe-form--item-valid",style:x.maxWidth?{width:"".concat(x.maxWidth,"px")}:null},x.message):null]))])])},_default={name:"VxeFormItem",props:props,inject:{$xeform:{default:null},$xeformgather:{default:null}},provide:function(){return{$xeformitem:this,$xeformiteminfo:this}},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;
+"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"),_vn=require("../../tools/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var props={title:String,field:String,size: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},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,l,i){var n,r=t._e,o=t.rules,s=t.data,a=t.collapseAll,u=t.validOpts,d=t.titleAlign,f=t.titleWidth,c=t.titleColon,m=t.titleAsterisk,v=t.titleOverflow,g=l.title,p=l.folding,_=l.visible,x=l.field,h=l.collapseNode,N=l.itemRender,q=l.showError,b=l.errRule,y=l.className,S=l.titleOverflow,C=(0,_utils.isEnableConf)(N)?_vXETable.default.renderer.get(N.name):null,O=C?C.itemClassName:"",I=l.span||t.span,U=l.align||t.align,w=_xeUtils.default.eqNull(l.titleAlign)?d:l.titleAlign,d=_xeUtils.default.eqNull(l.titleWidth)?f:l.titleWidth,f=_xeUtils.default.eqNull(l.titleColon)?c:l.titleColon,c=_xeUtils.default.eqNull(l.titleAsterisk)?m:l.titleAsterisk,m=_xeUtils.default.isUndefined(S)||_xeUtils.default.isNull(S)?v:S,v="title"===m,S=!0===m||"tooltip"===m,m=v||S||"ellipsis"===m,A={data:s,field:x,property:x,item:l,$form:t};if(!1===_)return r();!o||(F=o[x])&&(n=F.some(function(e){return e.required}));var F=[];i&&i.default?F=t.callSlot(i.default,A,e):C&&C.renderItemContent?F=(0,_vn.getSlotVNs)(C.renderItemContent.call(t,e,N,A)):C&&C.renderItem?F=(0,_vn.getSlotVNs)(C.renderItem.call(t,e,N,A)):x&&(F=["".concat(_xeUtils.default.get(s,x))]);S=S?{mouseenter:function(e){t.triggerTitleTipEvent(e,A)},mouseleave:t.handleTitleTipLeaveEvent}:{};return e("div",{class:["vxe-form--item",l.id,I?"vxe-col--".concat(I," is--span"):"",y?_xeUtils.default.isFunction(y)?y(A):y:"",O?_xeUtils.default.isFunction(O)?O(A):O:"",{"is--title":g,"is--colon":f,"is--asterisk":c,"is--required":n,"is--hidden":p&&a,"is--active":(0,_util.isActivetem)(t,l),"is--error":q}]},[e("div",{class:"vxe-form--item-inner"},[g||i&&i.title?e("div",{class:["vxe-form--item-title",w?"align--".concat(w):null,{"is--ellipsis":m}],style:d?{width:isNaN(d)?d:"".concat(d,"px")}:null,attrs:{title:v?(0,_utils.getFuncText)(g):null},on:S},(0,_render.renderTitle)(e,t,l)):null,e("div",{class:["vxe-form--item-content",U?"align--".concat(U):null]},F.concat([h?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,b&&u.showMessage?e("div",{class:"vxe-form--item-valid",style:b.maxWidth?{width:"".concat(b.maxWidth,"px")}:null},b.message):null]))])])},_default={name:"VxeFormItem",props:props,inject:{$xeform:{default:null},$xeformgather:{default:null}},provide:function(){return{$xeformitem:this,$xeformiteminfo:this}},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;