vxe-pc-ui 4.14.35 → 4.14.37

package/lib/layout-aside/src/layout-aside.js

@@ -19,6 +19,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
     collapseWidth: [String, Number],
     loading: Boolean,
     padding: Boolean,
+    collapseConfig: Object,
     size: {
       type: String,
       default: () => (0, _ui.getConfig)().layoutAside.size || (0, _ui.getConfig)().size
@@ -39,6 +40,9 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
     const refMaps = {
       refElem
     };
+    const computeCollapseOpts = (0, _vue.computed)(() => {
+      return Object.assign({}, (0, _ui.getConfig)().layoutAside.collapseConfig, props.collapseConfig);
+    });
     const computeWrapperWidth = (0, _vue.computed)(() => {
       const {
         width,
@@ -86,11 +90,13 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       } = props;
       const wrapperWidth = computeWrapperWidth.value;
       const vSize = computeSize.value;
+      const collapseOpts = computeCollapseOpts.value;
       const defaultSlot = slots.default;
       return (0, _vue.h)('aside', {
         ref: refElem,
         class: ['vxe-layout-aside', {
           [`size--${vSize}`]: vSize,
+          'is--animat': collapseOpts.animation !== false,
           'is--padding': padding,
           'is--default-width': !width,
           'is--collapse': collapsed,

package/lib/layout-aside/src/layout-aside.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_comp=require("../../ui/src/comp"),_dom=require("../../ui/src/dom"),_ui=require("../../ui"),_loading=_interopRequireDefault(require("../../loading/src/loading")),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeLayoutAside",props:{width:[String,Number],collapsed:Boolean,collapseWidth:[String,Number],loading:Boolean,padding:Boolean,size:{type:String,default:()=>(0,_ui.getConfig)().layoutAside.size||(0,_ui.getConfig)().size}},emits:[],setup(o,e){let{slots:d,emit:u}=e;var i=_xeUtils.default.uniqueId();let s=(0,_vue.ref)(),n=(0,_ui.useSize)(o).computeSize;var t=(0,_vue.reactive)({});let r={refElem:s},p=(0,_vue.computed)(()=>{var{width:e,collapsed:i,collapseWidth:t}=o;if(i){if(t)return(0,_dom.toCssUnit)(t)}else if(e)return(0,_dom.toCssUnit)(e);return""}),a={computeSize:n},l={xID:i,props:o,context:e,reactData:t,getRefMaps:()=>r,getComputeMaps:()=>a};Object.assign(l,{dispatchEvent:(e,i,t)=>{u(e,(0,_ui.createEvent)(t,{$layoutAside:l},i))}},{});return(0,_vue.provide)("$xeLayoutAside",l),l.renderVN=()=>{var{width:e,collapsed:i,loading:t,padding:u}=o,r=p.value,a=n.value,l=d.default;return(0,_vue.h)("aside",{ref:s,class:["vxe-layout-aside",{["size--"+a]:a,"is--padding":u,"is--default-width":!e,"is--collapse":i,"is--loading":t}],style:r?{width:r}:null},[(0,_vue.h)("div",{class:"vxe-layout-aside--inner"},l?l({}):[]),(0,_vue.h)(_loading.default,{class:"vxe-list-view--loading",modelValue:t})])},l},render(){return this.renderVN()}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_comp=require("../../ui/src/comp"),_dom=require("../../ui/src/dom"),_ui=require("../../ui"),_loading=_interopRequireDefault(require("../../loading/src/loading")),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeLayoutAside",props:{width:[String,Number],collapsed:Boolean,collapseWidth:[String,Number],loading:Boolean,padding:Boolean,collapseConfig:Object,size:{type:String,default:()=>(0,_ui.getConfig)().layoutAside.size||(0,_ui.getConfig)().size}},emits:[],setup(s,e){let{slots:d,emit:u}=e;var i=_xeUtils.default.uniqueId();let n=(0,_vue.ref)(),p=(0,_ui.useSize)(s).computeSize;var t=(0,_vue.reactive)({});let a={refElem:n},c=(0,_vue.computed)(()=>Object.assign({},(0,_ui.getConfig)().layoutAside.collapseConfig,s.collapseConfig)),_=(0,_vue.computed)(()=>{var{width:e,collapsed:i,collapseWidth:t}=s;if(i){if(t)return(0,_dom.toCssUnit)(t)}else if(e)return(0,_dom.toCssUnit)(e);return""}),l={computeSize:p},o={xID:i,props:s,context:e,reactData:t,getRefMaps:()=>a,getComputeMaps:()=>l};Object.assign(o,{dispatchEvent:(e,i,t)=>{u(e,(0,_ui.createEvent)(t,{$layoutAside:o},i))}},{});return(0,_vue.provide)("$xeLayoutAside",o),o.renderVN=()=>{var{width:e,collapsed:i,loading:t,padding:u}=s,a=_.value,l=p.value,o=c.value,r=d.default;return(0,_vue.h)("aside",{ref:n,class:["vxe-layout-aside",{["size--"+l]:l,"is--animat":!1!==o.animation,"is--padding":u,"is--default-width":!e,"is--collapse":i,"is--loading":t}],style:a?{width:a}:null},[(0,_vue.h)("div",{class:"vxe-layout-aside--inner"},r?r({}):[]),(0,_vue.h)(_loading.default,{class:"vxe-list-view--loading",modelValue:t})])},o},render(){return this.renderVN()}});

package/lib/layout-aside/style/style.css

@@ -3,9 +3,11 @@
   display: flex;
   flex-direction: column;
   flex-shrink: 0;
-  transition: width 0.3s;
   overflow: hidden;
 }
+.vxe-layout-aside.is--animat {
+  transition: width 0.3s;
+}
 .vxe-layout-aside.is--default-width {
   width: var(--vxe-ui-layout-aside-default-width);
 }

package/lib/layout-aside/style/style.min.css

@@ -1 +1 @@
-.vxe-layout-aside{position:relative;display:flex;flex-direction:column;flex-shrink:0;transition:width .3s;overflow:hidden}.vxe-layout-aside.is--default-width{width:var(--vxe-ui-layout-aside-default-width)}.vxe-layout-aside.is--collapse{width:var(--vxe-ui-layout-aside-collapse-width)}.vxe-layout-aside.is--padding{padding:var(--vxe-ui-layout-padding-default)}.vxe-layout-aside--inner{flex-grow:1;overflow-y:auto;overflow-x:hidden;outline:0}
+.vxe-layout-aside{position:relative;display:flex;flex-direction:column;flex-shrink:0;overflow:hidden}.vxe-layout-aside.is--animat{transition:width .3s}.vxe-layout-aside.is--default-width{width:var(--vxe-ui-layout-aside-default-width)}.vxe-layout-aside.is--collapse{width:var(--vxe-ui-layout-aside-collapse-width)}.vxe-layout-aside.is--padding{padding:var(--vxe-ui-layout-padding-default)}.vxe-layout-aside--inner{flex-grow:1;overflow-y:auto;overflow-x:hidden;outline:0}