vxe-pc-ui 3.20.8 → 3.20.10

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

@@ -18,7 +18,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defineVxeComponent)({
   name: 'VxeLayoutAside',
-  mixins: [_ui.globalMixins.sizeMixin],
+  mixins: [_ui.globalMixins.sizeMixin, _ui.globalMixins.vScrollbarMixin],
   props: {
     width: [String, Number],
     collapsed: Boolean,

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"),_utils=require("../../ui/src/utils"),_xeUtils=_interopRequireDefault(require("xe-utils")),_loading=_interopRequireDefault(require("../../loading")),_scrollbar=_interopRequireDefault(require("../../scrollbar"));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,useScrollbar:{type:Boolean,default:function(){return(0,_utils.getDefaultConfig)((0,_ui.getConfig)().layoutAside.useScrollbar,(0,_ui.getConfig)().useScrollbar)}},scrollbarConfig: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)},computeVarStyle:function(){var e=this.width,t=this.collapseWidth,i={};return t&&(i["--vxe-ui-layout-aside-collapse-width"]=(0,_dom.toCssUnit)(t)),e&&(i["--vxe-ui-layout-aside-default-width"]=(0,_dom.toCssUnit)(e)),i},computeScrollbarOpts:function(){return Object.assign({},(0,_ui.getConfig)().layoutAside.scrollbarConfig,this.scrollbarConfig)}}),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.collapsed,r=t.loading,n=t.padding,l=t.useScrollbar,a=t.computeVarStyle,u=t.computeSize,s=t.computeCollapseOpts,t=t.computeScrollbarOpts,c=t.className,d=t.viewClassName,f=t.viewInnerClassName,p=i.default;return e("aside",{class:["vxe-layout-aside",_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({},"size--".concat(u),u),"is--animat",!1!==s.animation),"is--padding",n),"is--collapse",o),"is--loading",r)],style:a},[l?e(_scrollbar.default,{props:{width:t.width,height:t.height,autoHide:t.autoHide,visible:t.visible,xConfig:{visible:!1},yConfig:t.yConfig,className:"vxe-layout-aside--scrollbar"+(c?" "+c:""),viewAttrs:t.viewAttrs,viewClassName:"vxe-layout-aside--scrollbar-view"+(d?" "+d:""),viewInnerClassName:"vxe-layout-aside--scrollbar-inner"+(f?" "+f:"")},scopedSlots:{default:function(){return p?p({}):[]}}}):e("div",{class:"vxe-layout-aside--inner"},p?p({}):[]),e(_loading.default,{class:"vxe-layout-aside-view--loading",props:{value:r}})])}},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"),_utils=require("../../ui/src/utils"),_xeUtils=_interopRequireDefault(require("xe-utils")),_loading=_interopRequireDefault(require("../../loading")),_scrollbar=_interopRequireDefault(require("../../scrollbar"));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,_ui.globalMixins.vScrollbarMixin],props:{width:[String,Number],collapsed:Boolean,collapseWidth:[String,Number],loading:Boolean,padding:Boolean,collapseConfig:Object,useScrollbar:{type:Boolean,default:function(){return(0,_utils.getDefaultConfig)((0,_ui.getConfig)().layoutAside.useScrollbar,(0,_ui.getConfig)().useScrollbar)}},scrollbarConfig: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)},computeVarStyle:function(){var e=this.width,t=this.collapseWidth,i={};return t&&(i["--vxe-ui-layout-aside-collapse-width"]=(0,_dom.toCssUnit)(t)),e&&(i["--vxe-ui-layout-aside-default-width"]=(0,_dom.toCssUnit)(e)),i},computeScrollbarOpts:function(){return Object.assign({},(0,_ui.getConfig)().layoutAside.scrollbarConfig,this.scrollbarConfig)}}),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.collapsed,r=t.loading,n=t.padding,l=t.useScrollbar,a=t.computeVarStyle,u=t.computeSize,s=t.computeCollapseOpts,t=t.computeScrollbarOpts,c=t.className,d=t.viewClassName,f=t.viewInnerClassName,p=i.default;return e("aside",{class:["vxe-layout-aside",_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({},"size--".concat(u),u),"is--animat",!1!==s.animation),"is--padding",n),"is--collapse",o),"is--loading",r)],style:a},[l?e(_scrollbar.default,{props:{width:t.width,height:t.height,autoHide:t.autoHide,visible:t.visible,xConfig:{visible:!1},yConfig:t.yConfig,className:"vxe-layout-aside--scrollbar"+(c?" "+c:""),viewAttrs:t.viewAttrs,viewClassName:"vxe-layout-aside--scrollbar-view"+(d?" "+d:""),viewInnerClassName:"vxe-layout-aside--scrollbar-inner"+(f?" "+f:"")},scopedSlots:{default:function(){return p?p({}):[]}}}):e("div",{class:"vxe-layout-aside--inner"},p?p({}):[]),e(_loading.default,{class:"vxe-layout-aside-view--loading",props:{value:r}})])}},render:function(e){return this.renderVN(e)}});

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

@@ -24,7 +24,7 @@ function createReactData() {
 }
 var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defineVxeComponent)({
   name: 'VxeLayoutBody',
-  mixins: [_ui.globalMixins.sizeMixin],
+  mixins: [_ui.globalMixins.sizeMixin, _ui.globalMixins.vScrollbarMixin],
   props: {
     loading: Boolean,
     padding: Boolean,

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_ui=require("../../ui"),_xeUtils=_interopRequireDefault(require("xe-utils")),_utils=require("../../ui/src/utils"),_loading=_interopRequireDefault(require("../../loading")),_scrollbar=_interopRequireDefault(require("../../scrollbar")),_backtop=_interopRequireDefault(require("../../backtop"));function _interopRequireDefault(t){return t&&t.__esModule?t:{default:t}}function _typeof(t){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function _defineProperty(t,e,o){return(e=_toPropertyKey(e))in t?Object.defineProperty(t,e,{value:o,enumerable:!0,configurable:!0,writable:!0}):t[e]=o,t}function _toPropertyKey(t){t=_toPrimitive(t,"string");return"symbol"==_typeof(t)?t:t+""}function _toPrimitive(t,e){if("object"!=_typeof(t)||!t)return t;var o=t[Symbol.toPrimitive];if(void 0===o)return("string"===e?String:Number)(t);o=o.call(t,e||"default");if("object"!=_typeof(o))return o;throw new TypeError("@@toPrimitive must return a primitive value.")}function createInternalData(){return{}}function createReactData(){return{}}var _default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeLayoutBody",mixins:[_ui.globalMixins.sizeMixin],props:{loading:Boolean,padding:Boolean,showBacktop:{type:Boolean,default:function(){return(0,_ui.getConfig)().layoutBody.showBacktop}},backtopConfig:Object,useScrollbar:{type:Boolean,default:function(){return(0,_utils.getDefaultConfig)((0,_ui.getConfig)().layoutBody.useScrollbar,(0,_ui.getConfig)().useScrollbar)}},scrollbarConfig:Object,size:{type:String,default:function(){return(0,_ui.getConfig)().layoutBody.size||(0,_ui.getConfig)().size}}},data:function(){var t=_xeUtils.default.uniqueId(),e="vxe_layout_body_backtop_".concat(t),o=createReactData();return Object.assign(Object.assign({},{}),{xID:t,backtopId:e,reactData:o})},computed:Object.assign(Object.assign({},{}),{computeBacktopOpts:function(){var t=this.backtopId;return Object.assign({},(0,_ui.getConfig)().layoutBody.backtopConfig,this.backtopConfig,{target:"#"+t})},computeScrollbarOpts:function(){return Object.assign({},(0,_ui.getConfig)().layoutBody.scrollbarConfig,this.scrollbarConfig)},computeScrollbarProps:function(){var t=this,e=t.backtopId,o=t.showBacktop,t=t.computeScrollbarOpts,r=t.className,i=t.viewClassName,a=t.viewInnerClassName;return{width:t.width,height:t.height,autoHide:t.autoHide,visible:t.visible,xConfig:t.xConfig,yConfig:t.yConfig,className:"vxe-layout-body--scrollbar"+(r?" "+r:""),viewAttrs:Object.assign(Object.assign({},t.viewAttrs),{id:o&&e||null}),viewClassName:"vxe-layout-body--scrollbar-view"+(i?" "+i:""),viewInnerClassName:"vxe-layout-body--scrollbar-inner"+(a?" "+a:"")}}}),methods:{dispatchEvent:function(t,e,o){this.$emit(t,(0,_ui.createEvent)(o,{$layoutBody:this},e))},renderVN:function(t){var e=this,o=e.$scopedSlots,r=e.backtopId,i=e.loading,a=e.padding,n=e.showBacktop,u=e.useScrollbar,l=e.computeBacktopOpts,s=e.computeScrollbarProps,c=e.computeSize,p=o.default,f=o.backtop,d=o.backtopTop||o["backtop-top"],o=o.backtopBottom||o["backtop-bottom"],b={};return f&&(b.default=f),d&&(b.top=d),o&&(b.bottom=o),t("div",{class:["vxe-layout-body",_defineProperty(_defineProperty(_defineProperty({},"size--".concat(c),c),"is--loading",i),"is--padding",a)]},[u?t(_scrollbar.default,{props:s,scopedSlots:{default:function(){return p?p({}):[]}}}):t("div",{attrs:{id:n?r:""},class:"vxe-layout-body--inner"},p?p({}):[]),t(_loading.default,{class:"vxe-layout-body-view--loading",props:{value:i}}),n?t(_backtop.default,{props:l,scopedSlots:b}):(0,_ui.renderEmptyElement)(e)])}},created:function(){this.internalData=createInternalData()},beforeDestroy:function(){var t=this.reactData,e=this.internalData;_xeUtils.default.assign(t,createReactData()),_xeUtils.default.assign(e,createInternalData())},render:function(t){return this.renderVN(t)}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_ui=require("../../ui"),_xeUtils=_interopRequireDefault(require("xe-utils")),_utils=require("../../ui/src/utils"),_loading=_interopRequireDefault(require("../../loading")),_scrollbar=_interopRequireDefault(require("../../scrollbar")),_backtop=_interopRequireDefault(require("../../backtop"));function _interopRequireDefault(t){return t&&t.__esModule?t:{default:t}}function _typeof(t){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function _defineProperty(t,e,o){return(e=_toPropertyKey(e))in t?Object.defineProperty(t,e,{value:o,enumerable:!0,configurable:!0,writable:!0}):t[e]=o,t}function _toPropertyKey(t){t=_toPrimitive(t,"string");return"symbol"==_typeof(t)?t:t+""}function _toPrimitive(t,e){if("object"!=_typeof(t)||!t)return t;var o=t[Symbol.toPrimitive];if(void 0===o)return("string"===e?String:Number)(t);o=o.call(t,e||"default");if("object"!=_typeof(o))return o;throw new TypeError("@@toPrimitive must return a primitive value.")}function createInternalData(){return{}}function createReactData(){return{}}var _default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeLayoutBody",mixins:[_ui.globalMixins.sizeMixin,_ui.globalMixins.vScrollbarMixin],props:{loading:Boolean,padding:Boolean,showBacktop:{type:Boolean,default:function(){return(0,_ui.getConfig)().layoutBody.showBacktop}},backtopConfig:Object,useScrollbar:{type:Boolean,default:function(){return(0,_utils.getDefaultConfig)((0,_ui.getConfig)().layoutBody.useScrollbar,(0,_ui.getConfig)().useScrollbar)}},scrollbarConfig:Object,size:{type:String,default:function(){return(0,_ui.getConfig)().layoutBody.size||(0,_ui.getConfig)().size}}},data:function(){var t=_xeUtils.default.uniqueId(),e="vxe_layout_body_backtop_".concat(t),o=createReactData();return Object.assign(Object.assign({},{}),{xID:t,backtopId:e,reactData:o})},computed:Object.assign(Object.assign({},{}),{computeBacktopOpts:function(){var t=this.backtopId;return Object.assign({},(0,_ui.getConfig)().layoutBody.backtopConfig,this.backtopConfig,{target:"#"+t})},computeScrollbarOpts:function(){return Object.assign({},(0,_ui.getConfig)().layoutBody.scrollbarConfig,this.scrollbarConfig)},computeScrollbarProps:function(){var t=this,e=t.backtopId,o=t.showBacktop,t=t.computeScrollbarOpts,i=t.className,r=t.viewClassName,a=t.viewInnerClassName;return{width:t.width,height:t.height,autoHide:t.autoHide,visible:t.visible,xConfig:t.xConfig,yConfig:t.yConfig,className:"vxe-layout-body--scrollbar"+(i?" "+i:""),viewAttrs:Object.assign(Object.assign({},t.viewAttrs),{id:o&&e||null}),viewClassName:"vxe-layout-body--scrollbar-view"+(r?" "+r:""),viewInnerClassName:"vxe-layout-body--scrollbar-inner"+(a?" "+a:"")}}}),methods:{dispatchEvent:function(t,e,o){this.$emit(t,(0,_ui.createEvent)(o,{$layoutBody:this},e))},renderVN:function(t){var e=this,o=e.$scopedSlots,i=e.backtopId,r=e.loading,a=e.padding,n=e.showBacktop,u=e.useScrollbar,l=e.computeBacktopOpts,s=e.computeScrollbarProps,c=e.computeSize,p=o.default,f=o.backtop,d=o.backtopTop||o["backtop-top"],o=o.backtopBottom||o["backtop-bottom"],b={};return f&&(b.default=f),d&&(b.top=d),o&&(b.bottom=o),t("div",{class:["vxe-layout-body",_defineProperty(_defineProperty(_defineProperty({},"size--".concat(c),c),"is--loading",r),"is--padding",a)]},[u?t(_scrollbar.default,{props:s,scopedSlots:{default:function(){return p?p({}):[]}}}):t("div",{attrs:{id:n?i:""},class:"vxe-layout-body--inner"},p?p({}):[]),t(_loading.default,{class:"vxe-layout-body-view--loading",props:{value:r}}),n?t(_backtop.default,{props:l,scopedSlots:b}):(0,_ui.renderEmptyElement)(e)])}},created:function(){this.internalData=createInternalData()},beforeDestroy:function(){var t=this.reactData,e=this.internalData;_xeUtils.default.assign(t,createReactData()),_xeUtils.default.assign(e,createInternalData())},render:function(t){return this.renderVN(t)}});

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

@@ -12,15 +12,25 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+var getConfig = _ui.VxeUI.getConfig,
+  baseUtils = _ui.VxeUI.baseUtils,
+  createEvent = _ui.VxeUI.createEvent;
+var getDefVal = baseUtils.getDefVal;
 var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defineVxeComponent)({
   name: 'VxeLayoutContainer',
-  mixins: [_ui.globalMixins.sizeMixin],
+  mixins: [_ui.globalMixins.sizeMixin, _ui.globalMixins.vScrollbarMixin],
   props: {
     vertical: Boolean,
+    useScrollbar: {
+      type: Boolean,
+      default: function _default() {
+        return getDefVal(getConfig().layoutContainer.useScrollbar, getConfig().useScrollbar);
+      }
+    },
     size: {
       type: String,
       default: function _default() {
-        return (0, _ui.getConfig)().layoutContainer.size || (0, _ui.getConfig)().size;
+        return getConfig().layoutContainer.size || getConfig().size;
       }
     }
   },
@@ -39,7 +49,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
     //
     dispatchEvent: function dispatchEvent(type, params, evnt) {
       var $xeLayoutContainer = this;
-      $xeLayoutContainer.$emit(type, (0, _ui.createEvent)(evnt, {
+      $xeLayoutContainer.$emit(type, createEvent(evnt, {
         $layoutContainer: $xeLayoutContainer
       }, params));
     },

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui");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,r){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,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 r=e[Symbol.toPrimitive];if(void 0===r)return("string"===t?String:Number)(e);r=r.call(e,t||"default");if("object"!=_typeof(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}var _default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeLayoutContainer",mixins:[_ui.globalMixins.sizeMixin],props:{vertical:Boolean,size:{type:String,default:function(){return(0,_ui.getConfig)().layoutContainer.size||(0,_ui.getConfig)().size}}},data:function(){return{xID:_xeUtils.default.uniqueId(),reactData:{}}},computed:Object.assign({},{}),methods:{dispatchEvent:function(e,t,r){this.$emit(e,(0,_ui.createEvent)(r,{$layoutContainer:this},t))},renderVN:function(e){var t=this,r=t.$scopedSlots,i=t.vertical,t=t.computeSize,r=r.default;return e("div",{class:["vxe-layout-container",_defineProperty(_defineProperty({},"size--".concat(t),t),"is--vertical",i)]},r?r({}):[])}},render:function(e){return this.renderVN(e)}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui");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,r){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,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 r=e[Symbol.toPrimitive];if(void 0===r)return("string"===t?String:Number)(e);r=r.call(e,t||"default");if("object"!=_typeof(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}var getConfig=_ui.VxeUI.getConfig,baseUtils=_ui.VxeUI.baseUtils,createEvent=_ui.VxeUI.createEvent,getDefVal=baseUtils.getDefVal,_default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeLayoutContainer",mixins:[_ui.globalMixins.sizeMixin,_ui.globalMixins.vScrollbarMixin],props:{vertical:Boolean,useScrollbar:{type:Boolean,default:function(){return getDefVal(getConfig().layoutContainer.useScrollbar,getConfig().useScrollbar)}},size:{type:String,default:function(){return getConfig().layoutContainer.size||getConfig().size}}},data:function(){return{xID:_xeUtils.default.uniqueId(),reactData:{}}},computed:Object.assign({},{}),methods:{dispatchEvent:function(e,t,r){this.$emit(e,createEvent(r,{$layoutContainer:this},t))},renderVN:function(e){var t=this,r=t.$scopedSlots,i=t.vertical,t=t.computeSize,r=r.default;return e("div",{class:["vxe-layout-container",_defineProperty(_defineProperty({},"size--".concat(t),t),"is--vertical",i)]},r?r({}):[])}},render:function(e){return this.renderVN(e)}});

package/lib/list/src/list.js

@@ -31,14 +31,9 @@ var getConfig = _ui.VxeUI.getConfig,
   getIcon = _ui.VxeUI.getIcon,
   getI18n = _ui.VxeUI.getI18n,
   domUtils = _ui.VxeUI.domUtils,
-  scrollbarUtils = _ui.VxeUI.scrollbarUtils,
   menus = _ui.VxeUI.menus,
   globalEvents = _ui.VxeUI.globalEvents,
   globalResize = _ui.VxeUI.globalResize;
-var getThumbOffsetSize = scrollbarUtils.getThumbOffsetSize,
-  getThumbSize = scrollbarUtils.getThumbSize,
-  getScrollFromClick = scrollbarUtils.getScrollFromClick,
-  getScrollFromDrag = scrollbarUtils.getScrollFromDrag;
 var _createComponentLog = (0, _log.createComponentLog)('tree'),
   warnLog = _createComponentLog.warnLog,
   errLog = _createComponentLog.errLog;
@@ -114,7 +109,7 @@ function createInternalData() {
 }
 var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defineVxeComponent)({
   name: 'VxeList',
-  mixins: [_ui.globalMixins.sizeMixin],
+  mixins: [_ui.globalMixins.sizeMixin, _ui.globalMixins.vScrollbarMixin, _ui.globalMixins.initVScrollbarMixin],
   props: {
     data: Array,
     height: [Number, String],
@@ -176,7 +171,8 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       xID: xID,
       reactData: reactData,
       crossListDragRowInfo: _store.crossListDragRowGlobal,
-      reFlag: 0
+      reLayoutFlag: 0,
+      reScrollFlag: 0
     });
   },
   computed: Object.assign(Object.assign({}, {}), {
@@ -374,6 +370,11 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       }
       return [];
     },
+    getScrollViewElem: function getScrollViewElem() {
+      var $xeList = this;
+      var viewEl = $xeList.$refs.refVirtualWrapper;
+      return viewEl || null;
+    },
     getRowId: function getRowId(row) {
       var $xeList = this;
       var keyField = $xeList.computeKeyField;
@@ -686,8 +687,14 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
     },
     updateScrollbar: function updateScrollbar() {
       var $xeList = this;
-      $xeList.updateThumbSize();
-      $xeList.updateThumbOffset();
+      var isVScrollbar = $xeList.computeIsVScrollbar;
+      if (isVScrollbar) {
+        return $xeList.$nextTick().then(function () {
+          $xeList.updateThumbSize();
+          $xeList.updateThumbOffset();
+        });
+      }
+      return Promise.resolve();
     },
     /**
      * 重新计算列表
@@ -708,10 +715,11 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
           parentHeight = parentEl.clientHeight - Math.ceil(_xeUtils.default.toNumber(parentStyle.paddingLeft) + _xeUtils.default.toNumber(parentStyle.paddingRight));
         }
         reactData.parentHeight = parentHeight;
-        $xeList.updateScrollbar();
         $xeList.updateHeight();
         if (el.clientWidth && el.clientHeight) {
-          return $xeList.computeScrollLoad();
+          return $xeList.computeScrollLoad().then(function () {
+            $xeList.updateScrollbar();
+          });
         }
       }
       return $xeList.$nextTick();
@@ -725,7 +733,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
         visibleSize = scrollYStore.visibleSize,
         offsetSize = scrollYStore.offsetSize,
         rowHeight = scrollYStore.rowHeight;
-      var scrollBodyElem = evnt.target;
+      var scrollBodyElem = evnt.currentTarget;
       var scrollTop = scrollBodyElem.scrollTop;
       var toVisibleIndex = Math.floor(scrollTop / rowHeight);
       var offsetStartIndex = Math.max(0, toVisibleIndex - 1 - offsetSize);
@@ -742,7 +750,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var $xeList = this;
       var reactData = $xeList.reactData;
       var internalData = $xeList.internalData;
-      var scrollBodyElem = evnt.target;
+      var scrollBodyElem = evnt.currentTarget;
       var scrollTop = scrollBodyElem.scrollTop;
       var scrollLeft = scrollBodyElem.scrollLeft;
       var isX = scrollLeft !== internalData.lastScrollLeft;
@@ -2108,186 +2116,26 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       }, evnt);
     },
     // 滚动条
-    updateThumbSize: function updateThumbSize() {
-      var $xeList = this;
-      var reactData = $xeList.reactData;
-      var viewEl = $xeList.$refs.refVirtualWrapper;
-      if (!viewEl) {
-        return;
-      }
-      if (!viewEl.clientHeight || !viewEl.clientHeight) {
-        return;
-      }
-      var trackXEl = $xeList.$refs.refTrackXElem;
-      var xThumbWidth = trackXEl ? getThumbSize(viewEl.clientWidth, viewEl.scrollWidth, trackXEl.clientWidth) : 0;
-      var thumbXElem = $xeList.$refs.refThumbXElem;
-      if (thumbXElem) {
-        thumbXElem.style.width = xThumbWidth + 'px';
-      }
-      reactData.xThumbWidth = xThumbWidth;
-      var trackYEl = $xeList.$refs.refTrackYElem;
-      var yThumbHeight = trackYEl ? getThumbSize(viewEl.clientHeight, viewEl.scrollHeight, trackYEl.clientHeight) : 0;
-      var thumbYElem = $xeList.$refs.refThumbYElem;
-      if (thumbYElem) {
-        thumbYElem.style.height = yThumbHeight + 'px';
-      }
-      reactData.yThumbHeight = yThumbHeight;
-    },
-    updateThumbOffset: function updateThumbOffset() {
-      var $xeList = this;
-      var reactData = $xeList.reactData;
-      var internalData = $xeList.internalData;
-      var viewEl = $xeList.$refs.refVirtualWrapper;
-      if (!viewEl) {
-        return;
-      }
-      if (!viewEl.clientHeight || !viewEl.clientHeight) {
-        return;
-      }
-      var xThumbWidth = reactData.xThumbWidth,
-        yThumbHeight = reactData.yThumbHeight;
-      var trackXEl = $xeList.$refs.refTrackXElem;
-      var thumbXElem = $xeList.$refs.refThumbXElem;
-      var xThumbLeft = trackXEl && xThumbWidth ? getThumbOffsetSize(viewEl.scrollLeft, viewEl.clientWidth, viewEl.scrollWidth, trackXEl.clientWidth, xThumbWidth) : 0;
-      internalData.xThumbLeft = xThumbLeft;
-      if (thumbXElem && xThumbWidth) {
-        thumbXElem.style.width = xThumbWidth + 'px';
-        thumbXElem.style.transform = "translateX(".concat(xThumbLeft, "px)");
-      }
-      var trackYEl = $xeList.$refs.refTrackYElem;
-      var thumbYElem = $xeList.$refs.refThumbYElem;
-      var yThumbTop = trackYEl && yThumbHeight ? getThumbOffsetSize(viewEl.scrollTop, viewEl.clientHeight, viewEl.scrollHeight, trackYEl.clientHeight, yThumbHeight) : 0;
-      internalData.yThumbTop = yThumbTop;
-      if (thumbYElem && yThumbHeight) {
-        thumbYElem.style.height = yThumbHeight + 'px';
-        thumbYElem.style.transform = "translateY(".concat(yThumbTop, "px)");
-      }
-    },
-    clickTrackXEvent: function clickTrackXEvent(evnt) {
-      var $xeList = this;
-      var reactData = $xeList.reactData;
-      var trackEl = evnt.currentTarget;
-      if (trackEl !== evnt.target) {
-        return;
-      }
-      var viewEl = $xeList.$refs.refVirtualWrapper;
-      if (!viewEl) {
-        return;
-      }
-      var xThumbWidth = reactData.xThumbWidth;
-      var trackRect = trackEl.getBoundingClientRect();
-      viewEl.scrollTo({
-        left: getScrollFromClick(evnt.clientX - trackRect.left, viewEl.clientWidth, viewEl.scrollWidth, trackEl.clientWidth, xThumbWidth),
-        behavior: 'auto'
-      });
-    },
-    clickTrackYEvent: function clickTrackYEvent(evnt) {
-      var $xeList = this;
-      var reactData = $xeList.reactData;
-      var trackEl = evnt.currentTarget;
-      if (trackEl !== evnt.target) {
-        return;
-      }
-      var viewEl = $xeList.$refs.refVirtualWrapper;
-      if (!viewEl) {
-        return;
-      }
-      var yThumbHeight = reactData.yThumbHeight;
-      var trackRect = trackEl.getBoundingClientRect();
-      viewEl.scrollTo({
-        top: getScrollFromClick(evnt.clientY - trackRect.top, viewEl.clientHeight, viewEl.scrollHeight, trackEl.clientHeight, yThumbHeight),
-        behavior: 'auto'
-      });
-    },
-    pointerdownThumbXEvent: function pointerdownThumbXEvent(evnt) {
-      var $xeList = this;
-      var reactData = $xeList.reactData;
-      var internalData = $xeList.internalData;
-      var thumbEl = evnt.currentTarget;
-      internalData.isThumbDrag = true;
-      thumbEl.setPointerCapture(evnt.pointerId);
-      var viewEl = $xeList.$refs.refVirtualWrapper;
-      if (!viewEl) {
-        return;
-      }
-      var xThumbWidth = reactData.xThumbWidth;
-      var trackEl = thumbEl.parentElement;
-      var trackRect = trackEl.getBoundingClientRect();
-      var pointerPosition = evnt.clientX - trackRect.left;
-      // 记录 thumb 的偏移
-      var thumbOffset = getThumbOffsetSize(viewEl.scrollLeft, viewEl.clientWidth, viewEl.scrollWidth, trackEl.clientWidth, xThumbWidth);
-      internalData.thumbDragOffset = pointerPosition - thumbOffset;
-    },
-    pointermoveThumbXEvent: function pointermoveThumbXEvent(evnt) {
-      var $xeList = this;
-      var reactData = $xeList.reactData;
-      var internalData = $xeList.internalData;
-      var thumbEl = evnt.currentTarget;
-      if (!thumbEl.hasPointerCapture(evnt.pointerId)) {
-        return;
-      }
-      var isThumbDrag = internalData.isThumbDrag,
-        thumbDragOffset = internalData.thumbDragOffset;
-      if (isThumbDrag) {
-        var viewEl = $xeList.$refs.refVirtualWrapper;
-        if (!viewEl) {
-          return;
-        }
-        var xThumbWidth = reactData.xThumbWidth;
-        var _thumbEl = evnt.currentTarget;
-        var trackEl = _thumbEl.parentElement;
-        var trackRect = trackEl.getBoundingClientRect();
-        // 更新偏移
-        viewEl.scrollLeft = getScrollFromDrag(evnt.clientX - trackRect.left, thumbDragOffset, viewEl.clientWidth, viewEl.scrollWidth, trackEl.clientWidth, xThumbWidth);
-      }
-    },
-    cleatPointerThumbEvent: function cleatPointerThumbEvent(evnt) {
-      var $xeList = this;
-      var internalData = $xeList.internalData;
-      var thumbEl = evnt.currentTarget;
-      thumbEl.releasePointerCapture(evnt.pointerId);
-      internalData.isThumbDrag = false;
-    },
-    pointerdownThumbYEvent: function pointerdownThumbYEvent(evnt) {
+    bindScrollbarResize: function bindScrollbarResize() {
       var $xeList = this;
-      var reactData = $xeList.reactData;
       var internalData = $xeList.internalData;
-      var thumbEl = evnt.currentTarget;
-      internalData.isThumbDrag = true;
-      thumbEl.setPointerCapture(evnt.pointerId);
-      var viewEl = $xeList.$refs.refVirtualWrapper;
-      if (!viewEl) {
-        return;
-      }
-      var yThumbHeight = reactData.yThumbHeight;
-      var trackEl = thumbEl.parentElement;
-      var trackRect = trackEl.getBoundingClientRect();
-      var pointerPosition = evnt.clientY - trackRect.top;
-      // 记录 thumb 的偏移
-      var thumbOffset = getThumbOffsetSize(viewEl.scrollTop, viewEl.clientHeight, viewEl.scrollHeight, trackEl.clientHeight, yThumbHeight);
-      internalData.thumbDragOffset = pointerPosition - thumbOffset;
-    },
-    pointermoveThumbYEvent: function pointermoveThumbYEvent(evnt) {
-      var $xeList = this;
-      var reactData = $xeList.reactData;
-      var internalData = $xeList.internalData;
-      var thumbEl = evnt.currentTarget;
-      if (!thumbEl.hasPointerCapture(evnt.pointerId)) {
-        return;
-      }
-      var isThumbDrag = internalData.isThumbDrag,
-        thumbDragOffset = internalData.thumbDragOffset;
-      if (isThumbDrag) {
-        var viewEl = $xeList.$refs.refVirtualWrapper;
-        if (!viewEl) {
-          return;
+      var scrollObserver = internalData.scrollObserver;
+      var isVScrollbar = $xeList.computeIsVScrollbar;
+      if (isVScrollbar) {
+        if (!scrollObserver) {
+          var el = $xeList.$refs.refElem;
+          var viewInnerEl = $xeList.$refs.refVirtualSpaceElem;
+          var _scrollObserver = globalResize.create(function () {
+            $xeList.reScrollFlag++;
+          });
+          if (el) {
+            _scrollObserver.observe(el);
+          }
+          if (viewInnerEl) {
+            _scrollObserver.observe(viewInnerEl);
+          }
+          internalData.scrollObserver = _scrollObserver;
         }
-        var yThumbHeight = reactData.yThumbHeight;
-        var _thumbEl2 = evnt.currentTarget;
-        var trackEl = _thumbEl2.parentElement;
-        var trackRect = trackEl.getBoundingClientRect();
-        // 更新偏移
-        viewEl.scrollTop = getScrollFromDrag(evnt.clientY - trackRect.top, thumbDragOffset, viewEl.clientHeight, viewEl.scrollHeight, trackEl.clientHeight, yThumbHeight);
       }
     },
     //
@@ -2526,8 +2374,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var slots = $xeList.$scopedSlots;
       var showCheckbox = props.showCheckbox,
         className = props.className,
-        loading = props.loading,
-        useScrollbar = props.useScrollbar;
+        loading = props.loading;
       var bodyHeight = reactData.bodyHeight,
         topSpaceHeight = reactData.topSpaceHeight,
         rowList = reactData.rowList,
@@ -2539,6 +2386,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       var headerSlot = slots.header;
       var footerSlot = slots.footer;
       var vSize = $xeList.computeSize;
+      var isVScrollbar = $xeList.computeIsVScrollbar;
       var wrapperStyles = $xeList.computeWrapperStyles;
       var virtualStyles = $xeList.computeVirtualStyles;
       var radioOpts = $xeList.computeRadioOpts;
@@ -2565,9 +2413,9 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       }
       return h('div', {
         ref: 'refElem',
-        class: ['vxe-list', useScrollbar ? "ov-x--".concat(scrollXVisible === false ? 'hidden' : 'visible') : '', useScrollbar ? "ov-y--".concat(scrollYVisible === false ? 'hidden' : 'visible') : '', useScrollbar ? "sx-pos--".concat(scrollbarXToTop ? 'top' : 'bottom') : '', useScrollbar ? "sy-pos--".concat(scrollbarYToLeft ? 'left' : 'right') : '', className ? _xeUtils.default.isFunction(className) ? className({
+        class: ['vxe-list', isVScrollbar ? "ov-x--".concat(scrollXVisible === false ? 'hidden' : 'visible') : '', isVScrollbar ? "ov-y--".concat(scrollYVisible === false ? 'hidden' : 'visible') : '', isVScrollbar ? "sx-pos--".concat(scrollbarXToTop ? 'top' : 'bottom') : '', isVScrollbar ? "sy-pos--".concat(scrollbarYToLeft ? 'left' : 'right') : '', className ? _xeUtils.default.isFunction(className) ? className({
           $list: $xeList
-        }) : className : '', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--virtual-scrollbar', useScrollbar), 'ov-padding', useScrollbar && scrollbarOpts.padding), 'ov-x--auto-hide', useScrollbar && scrollXAutoHide), 'ov-y--auto-hide', useScrollbar && scrollYAutoHide), 'overflow-y', yThumbHeight), 'overflow-x', xThumbWidth), 'is--drag', isDrag), 'is--loading', loading)],
+        }) : className : '', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--virtual-scrollbar', isVScrollbar), 'ov-padding', isVScrollbar && scrollbarOpts.padding), 'ov-x--auto-hide', isVScrollbar && scrollXAutoHide), 'ov-y--auto-hide', isVScrollbar && scrollYAutoHide), 'overflow-y', yThumbHeight), 'overflow-x', xThumbWidth), 'is--drag', isDrag), 'is--loading', loading)],
         on: leOns,
         style: wrapperStyles
       }, [headerSlot || showDefChekboxHead ? h('div', {
@@ -2598,6 +2446,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
           scroll: $xeList.scrollEvent
         }
       }, [h('div', {
+        ref: 'refVirtualSpaceElem',
         class: 'vxe-list--y-space',
         style: {
           height: bodyHeight ? "".concat(bodyHeight, "px") : ''
@@ -2629,7 +2478,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       /**
        * 滚动条
        */
-      useScrollbar ? h('div', {
+      isVScrollbar ? h('div', {
         class: scrollbarWrapperClss
       }, [scrollXVisible === false ? (0, _ui.renderEmptyElement)($xeList) : h('div', {
         ref: 'refTrackXElem',
@@ -2687,50 +2536,61 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
     },
     height: function height() {
       var $xeList = this;
-      $xeList.reFlag++;
+      $xeList.reLayoutFlag++;
     },
     maxHeight: function maxHeight() {
       var $xeList = this;
-      $xeList.reFlag++;
+      $xeList.reLayoutFlag++;
     },
     syncResize: function syncResize() {
       var $xeList = this;
-      $xeList.reFlag++;
+      $xeList.reLayoutFlag++;
     },
-    useScrollbar: function useScrollbar() {
+    computeIsVScrollbar: function computeIsVScrollbar() {
       var $xeList = this;
-      $xeList.reFlag++;
+      $xeList.$nextTick(function () {
+        $xeList.bindScrollbarResize();
+        $xeList.$nextTick(function () {
+          $xeList.reLayoutFlag++;
+        });
+      });
     },
     computeRowHeight: function computeRowHeight() {
       var $xeList = this;
-      $xeList.reFlag++;
+      $xeList.reLayoutFlag++;
     },
     computeScrollYWidth: function computeScrollYWidth() {
       var $xeList = this;
-      $xeList.reFlag++;
+      $xeList.reLayoutFlag++;
     },
     computeScrollXHeight: function computeScrollXHeight() {
       var $xeList = this;
-      $xeList.reFlag++;
+      $xeList.reLayoutFlag++;
     },
     computeScrollXVisible: function computeScrollXVisible() {
       var $xeList = this;
       $xeList.$nextTick(function () {
-        $xeList.reFlag++;
+        $xeList.reLayoutFlag++;
       });
     },
     computeScrollYVisible: function computeScrollYVisible() {
       var $xeList = this;
       $xeList.$nextTick(function () {
-        $xeList.reFlag++;
+        $xeList.reLayoutFlag++;
       });
     },
-    reFlag: function reFlag() {
+    reLayoutFlag: function reLayoutFlag() {
       var $xeList = this;
       $xeList.recalculate().then(function () {
         $xeList.recalculate();
       });
     },
+    reScrollFlag: function reScrollFlag() {
+      var $xeList = this;
+      $xeList.updateScrollbar().then(function () {
+        $xeList.updateScrollbar();
+      });
+    },
     checkRowKey: function checkRowKey() {
       var $xeList = this;
       $xeList.updateRadioModeValue();
@@ -2754,8 +2614,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
     var showSeq = props.showSeq,
       showRadio = props.showRadio,
       showCheckbox = props.showCheckbox,
-      autoResize = props.autoResize,
-      useScrollbar = props.useScrollbar;
+      autoResize = props.autoResize;
     var rowOpts = $xeList.computeRowOpts;
     var useKey = rowOpts.useKey,
       keyField = rowOpts.keyField;
@@ -2777,25 +2636,12 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
     if (useKey && !keyField) {
       errLog('vxe.error.reqSupportProp', ['row-config.useKey', 'row-config.keyField']);
     }
-    var el = $xeList.$refs.refElem;
-    if (useScrollbar) {
-      var viewInnerEl = $xeList.$refs.refVirtualBody;
-      var scrollObserver = globalResize.create(function () {
-        $xeList.reFlag++;
-      });
-      if (el) {
-        scrollObserver.observe(el);
-      }
-      if (viewInnerEl) {
-        scrollObserver.observe(viewInnerEl);
-      }
-      internalData.scrollObserver = scrollObserver;
-    }
     if (autoResize) {
+      var el = $xeList.$refs.refElem;
       var parentEl = $xeList.getParentElem();
       var resizeObserver = globalResize.create(function () {
         if (props.autoResize) {
-          $xeList.reFlag++;
+          $xeList.reLayoutFlag++;
         }
       });
       if (el) {
@@ -2806,9 +2652,10 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
       }
       internalData.resizeObserver = resizeObserver;
     }
-    $xeList.reFlag++;
+    $xeList.reLayoutFlag++;
+    $xeList.bindScrollbarResize();
     globalEvents.on($xeList, 'resize', function () {
-      $xeList.reFlag++;
+      $xeList.reLayoutFlag++;
     });
   },
   activated: function activated() {