vxe-pc-ui 3.18.22 → 3.18.23

package/lib/index.umd.js

@@ -13347,7 +13347,7 @@ var es_array_filter = __webpack_require__(2008);
 
 
 var log_log = VxeUI.log;
-var uiVersion = "ui v".concat("3.18.22");
+var uiVersion = "ui v".concat("3.18.23");
 function createComponentLog(name) {
   var tableVersion = VxeUI.tableVersion ? "table v".concat(VxeUI.tableVersion) : '';
   var ganttVersion = VxeUI.ganttVersion ? "gantt v".concat(VxeUI.ganttVersion) : '';
@@ -13367,7 +13367,7 @@ var errLog = log_log.create('error', uiVersion);
 
 
 
-var ui_version = "3.18.22";
+var ui_version = "3.18.23";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -58160,7 +58160,8 @@ function scrollbar_createInternalData() {
       var props = $xeScrollbar;
       var slots = $xeScrollbar.$scopedSlots;
       var native = props.native,
-        loading = props.loading;
+        loading = props.loading,
+        autoResize = props.autoResize;
       var wrapperStyle = $xeScrollbar.computeWrapperStyle;
       var wrapperClss = $xeScrollbar.computeWrapperClss;
       var viewClss = $xeScrollbar.computeViewClss;
@@ -58180,7 +58181,11 @@ function scrollbar_createInternalData() {
       }, [h('div', {
         ref: 'refViewInnerElem',
         class: 'vxe-scrollbar--view-inner'
-      }, defaultSlot ? defaultSlot({}) : [])]), native || xOpts.visible === 'hidden' ? scrollbar_renderEmptyElement($xeScrollbar) : h('div', {
+      }, autoResize ? [h('div', {
+        key: 'vi',
+        ref: 'refViewInnerElem',
+        class: 'vxe-scrollbar--view-inner'
+      }, defaultSlot ? defaultSlot({}) : [])] : defaultSlot ? defaultSlot({}) : [])]), native || xOpts.visible === 'hidden' ? scrollbar_renderEmptyElement($xeScrollbar) : h('div', {
         ref: 'refTrackXElem',
         class: 'vxe-scrollbar--track-x',
         on: {
@@ -58221,6 +58226,30 @@ function scrollbar_createInternalData() {
     }
   },
   watch: {
+    height: function height() {
+      var $xeScrollbar = this;
+      $xeScrollbar.reFlag++;
+    },
+    width: function width() {
+      var $xeScrollbar = this;
+      $xeScrollbar.reFlag++;
+    },
+    minHeight: function minHeight() {
+      var $xeScrollbar = this;
+      $xeScrollbar.reFlag++;
+    },
+    minWidth: function minWidth() {
+      var $xeScrollbar = this;
+      $xeScrollbar.reFlag++;
+    },
+    maxHeight: function maxHeight() {
+      var $xeScrollbar = this;
+      $xeScrollbar.reFlag++;
+    },
+    maxWidth: function maxWidth() {
+      var $xeScrollbar = this;
+      $xeScrollbar.reFlag++;
+    },
     native: function native() {
       var $xeScrollbar = this;
       $xeScrollbar.reFlag++;
@@ -58245,19 +58274,23 @@ function scrollbar_createInternalData() {
     var props = $xeScrollbar;
     var internalData = $xeScrollbar.internalData;
     var autoResize = props.autoResize;
+    var viewEl = $xeScrollbar.$refs.refViewElem;
     var viewInnerEl = $xeScrollbar.$refs.refViewInnerElem;
-    if (autoResize && viewInnerEl) {
+    if (autoResize) {
       var resizeObserver = scrollbar_globalResize.create(function () {
         if (props.autoResize) {
           $xeScrollbar.reFlag++;
         }
       });
-      resizeObserver.observe(viewInnerEl);
+      if (viewEl) {
+        resizeObserver.observe(viewEl);
+      }
+      if (viewInnerEl) {
+        resizeObserver.observe(viewInnerEl);
+      }
       internalData.resizeObserver = resizeObserver;
     }
-    $xeScrollbar.$nextTick(function () {
-      $xeScrollbar.recalculate();
-    });
+    $xeScrollbar.reFlag++;
   },
   beforeDestroy: function beforeDestroy() {
     var $xeScrollbar = this;