vxe-pc-ui 3.14.35 → 3.14.36

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

@@ -23,6 +23,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
     collapseWidth: [String, Number],
     loading: Boolean,
     padding: Boolean,
+    collapseConfig: Object,
     size: {
       type: String,
       default: function _default() {
@@ -45,6 +46,11 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
     };
   },
   computed: Object.assign(Object.assign({}, {}), {
+    computeCollapseOpts: function computeCollapseOpts() {
+      var $xeLayoutAside = this;
+      var props = $xeLayoutAside;
+      return Object.assign({}, (0, _ui.getConfig)().layoutAside.collapseConfig, props.collapseConfig);
+    },
     computeWrapperWidth: function computeWrapperWidth() {
       var $xeLayoutAside = this;
       var props = $xeLayoutAside;
@@ -86,9 +92,10 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
         padding = props.padding;
       var wrapperWidth = $xeLayoutAside.computeWrapperWidth;
       var vSize = $xeLayoutAside.computeSize;
+      var collapseOpts = $xeLayoutAside.computeCollapseOpts;
       var defaultSlot = slots.default;
       return h('aside', {
-        class: ['vxe-layout-aside', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--padding', padding), 'is--default-width', !width), 'is--collapse', collapsed), 'is--loading', loading)],
+        class: ['vxe-layout-aside', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--animat', collapseOpts.animation !== false), 'is--padding', padding), 'is--default-width', !width), 'is--collapse', collapsed), 'is--loading', loading)],
         style: wrapperWidth ? {
           width: wrapperWidth
         } : {}

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _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}}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)}function _defineProperty(e,t,i){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[t]=i,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var i=e[Symbol.toPrimitive];if(void 0===i)return("string"===t?String:Number)(e);i=i.call(e,t||"default");if("object"!=_typeof(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}var _default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeLayoutAside",mixins:[_ui.globalMixins.sizeMixin],props:{width:[String,Number],collapsed:Boolean,collapseWidth:[String,Number],loading:Boolean,padding:Boolean,size:{type:String,default:function(){return(0,_ui.getConfig)().layoutAside.size||(0,_ui.getConfig)().size}}},provide:function(){return{$xeLayoutAside:this}},data:function(){return{xID:_xeUtils.default.uniqueId(),reactData:{}}},computed:Object.assign(Object.assign({},{}),{computeWrapperWidth:function(){var e=this,t=e.width,i=e.collapseWidth;if(e.collapsed){if(i)return(0,_dom.toCssUnit)(i)}else if(t)return(0,_dom.toCssUnit)(t);return""}}),methods:{dispatchEvent:function(e,t,i){this.$emit(e,(0,_ui.createEvent)(i,{$layoutAside:this},t))},renderVN:function(e){var t=this,i=t.$scopedSlots,r=t.width,o=t.collapsed,n=t.loading,u=t.padding,a=t.computeWrapperWidth,t=t.computeSize,i=i.default;return e("aside",{class:["vxe-layout-aside",_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({},"size--".concat(t),t),"is--padding",u),"is--default-width",!r),"is--collapse",o),"is--loading",n)],style:a?{width:a}:{}},[e("div",{class:"vxe-layout-aside--inner"},i?i({}):[]),e(_loading.default,{class:"vxe-list-view--loading",props:{value:n}})])}},render:function(e){return this.renderVN(e)}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _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}}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)}function _defineProperty(e,t,i){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[t]=i,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var i=e[Symbol.toPrimitive];if(void 0===i)return("string"===t?String:Number)(e);i=i.call(e,t||"default");if("object"!=_typeof(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}var _default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeLayoutAside",mixins:[_ui.globalMixins.sizeMixin],props:{width:[String,Number],collapsed:Boolean,collapseWidth:[String,Number],loading:Boolean,padding:Boolean,collapseConfig:Object,size:{type:String,default:function(){return(0,_ui.getConfig)().layoutAside.size||(0,_ui.getConfig)().size}}},provide:function(){return{$xeLayoutAside:this}},data:function(){return{xID:_xeUtils.default.uniqueId(),reactData:{}}},computed:Object.assign(Object.assign({},{}),{computeCollapseOpts:function(){return Object.assign({},(0,_ui.getConfig)().layoutAside.collapseConfig,this.collapseConfig)},computeWrapperWidth:function(){var e=this,t=e.width,i=e.collapseWidth;if(e.collapsed){if(i)return(0,_dom.toCssUnit)(i)}else if(t)return(0,_dom.toCssUnit)(t);return""}}),methods:{dispatchEvent:function(e,t,i){this.$emit(e,(0,_ui.createEvent)(i,{$layoutAside:this},t))},renderVN:function(e){var t=this,i=t.$scopedSlots,o=t.width,r=t.collapsed,n=t.loading,u=t.padding,a=t.computeWrapperWidth,l=t.computeSize,t=t.computeCollapseOpts,i=i.default;return e("aside",{class:["vxe-layout-aside",_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({},"size--".concat(l),l),"is--animat",!1!==t.animation),"is--padding",u),"is--default-width",!o),"is--collapse",r),"is--loading",n)],style:a?{width:a}:{}},[e("div",{class:"vxe-layout-aside--inner"},i?i({}):[]),e(_loading.default,{class:"vxe-list-view--loading",props:{value:n}})])}},render:function(e){return this.renderVN(e)}});

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}