eoss 0.1.0-alpha.47 → 0.1.0-alpha.49

package/lib/scrollbar.js

@@ -108,13 +108,6 @@ module.exports = require("eoss/lib/utils/resize-event.js");
 
 /***/ }),
 
-/***/ 27:
-/***/ (function(module, exports) {
-
-module.exports = require("eoss/lib/utils/scrollbar.js");
-
-/***/ }),
-
 /***/ 277:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -128,16 +121,13 @@ var external_throttle_debounce_ = __webpack_require__(13);
 // EXTERNAL MODULE: external "eoss/lib/utils/resize-event.js"
 var resize_event_js_ = __webpack_require__(25);
 
-// EXTERNAL MODULE: external "eoss/lib/utils/scrollbar.js"
-var scrollbar_js_ = __webpack_require__(27);
-
-// EXTERNAL MODULE: external "eoss/lib/utils/util.js"
-var util_js_ = __webpack_require__(0);
-
 // EXTERNAL MODULE: external "eoss/lib/components/bar.js"
 var bar_js_ = __webpack_require__(45);
 var bar_js_default = /*#__PURE__*/__webpack_require__.n(bar_js_);
 
+// EXTERNAL MODULE: external "eoss/lib/utils/util.js"
+var util_js_ = __webpack_require__(0);
+
 // CONCATENATED MODULE: ./packages/scrollbar/src/scroll-mixin.js
 /**
  * Scrollbar 混入对象
@@ -278,18 +268,50 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 
 
 
+// 数字或纯数字字符串补 px，其余形式（100%、inherit 等）原样透传
+function toCssSize(val) {
+  var str = String(val).trim();
+  return (/^-?\d+(\.\d+)?$/.test(str) ? str + 'px' : str
+  );
+}
+
+// 把 'a: b; c-d: e' 形式的样式串解析成驼峰对象
+function parseStyleText(styleText) {
+  var res = {};
+  var list = String(styleText || '').split(';');
+  for (var i = 0; i < list.length; i++) {
+    var item = list[i];
+    var index = item.indexOf(':');
+    if (index < 0) continue;
+    var key = item.slice(0, index).trim();
+    if (!key) continue;
+    res[key.replace(/-(\w)/g, function (match, letter) {
+      return letter.toUpperCase();
+    })] = item.slice(index + 1).trim();
+  }
+  return res;
+}
 
-// 缓存 getScrollbarWidth 计算结果
-var cachedScrollbarWidth = null;
-function getCachedScrollbarWidth() {
-  if (cachedScrollbarWidth === null) {
-    cachedScrollbarWidth = Object(scrollbar_js_["getScrollbarWidth"])();
-    // 监听窗口大小变化，重置缓存
-    window.addEventListener('resize', function () {
-      cachedScrollbarWidth = null;
-    });
+// wrap-style 可以是 String / Object / Array，统一归一化成新对象：
+// Vue 2 仅解析绑定为字符串的顶层 style，数组里的字符串项会被丢掉，
+// 另外也不能直接在传入的对象上写字段，避免变更 prop
+function normalizeWrapStyle(val) {
+  if (typeof val === 'string') {
+    return parseStyleText(val);
   }
-  return cachedScrollbarWidth;
+  if (Array.isArray(val)) {
+    return Object(util_js_["toObject"])(val.map(function (item) {
+      return typeof item === 'string' ? parseStyleText(item) : item || {};
+    }));
+  }
+  var res = {};
+  var source = val || {};
+  for (var key in source) {
+    if (Object.prototype.hasOwnProperty.call(source, key)) {
+      res[key] = source[key];
+    }
+  }
+  return res;
 }
 
 /* istanbul ignore next */
@@ -384,7 +406,6 @@ function getCachedScrollbarWidth() {
       sizeHeight: '0',
       moveX: 0,
       moveY: 0,
-      height: null,
       initialized: false,
       isHovering: false,
       hideTimer: null,
@@ -415,45 +436,26 @@ function getCachedScrollbarWidth() {
     }
   },
 
-  // 在 render 方法中使用缓存
   render: function render(h) {
-    var gutter = getCachedScrollbarWidth();
-    var style = this.wrapStyle;
-    if (gutter) {
-      var gutterWith = '-' + gutter + 'px';
-      var gutterStyle = 'margin-bottom: ' + gutterWith + '; margin-right: ' + gutterWith + ';';
-      if (this.styles || this.height || this.maxHeight) {
-        var height = this.height || this.styles && this.styles.height;
-        if (height === '100%') {
-          gutterStyle += 'height:calc(100% + ' + gutter + 'px);';
-        } else {
-          gutterStyle += height ? 'height:' + (parseInt(height, 10) + gutter) + 'px' : '';
-        }
-        var maxHeight = this.maxHeight || this.styles && this.styles.maxHeight || this.styles && this.styles['max-height'];
-        if (maxHeight === '100%') {
-          gutterStyle += 'max-height:calc(100% + ' + gutter + 'px);';
-        } else {
-          gutterStyle += maxHeight ? 'max-height:' + parseInt(maxHeight, 10) + 'px' : '';
-        }
-      } else {
-        gutterStyle += 'height:calc(100% + ' + gutter + 'px);';
-      }
-
-      if (Array.isArray(this.wrapStyle)) {
-        style = Object(util_js_["toObject"])(this.wrapStyle);
-        style.marginRight = style.marginBottom = gutterWith;
-        if (!style.height && !style.maxHeight) {
-          style.height = '100%';
-        }
-      } else if (typeof this.wrapStyle === 'string') {
-        style += gutterStyle;
-      } else {
-        style = gutterStyle;
-      }
-    } else {
-      style = 'height:100%;';
+    // wrap 内联样式只负责高度声明与自定义样式，不再做原生滚动条的占位补偿：
+    // 原生滚动条已由 CSS 隐藏（--hidden-default 恒挂，IE 走 -ms-overflow-style），
+    // 本身不占位；此前的负 margin + calc(100% + gutter) 在浏览器缩放时，量取的
+    // gutter 取整宽度和实际渲染宽度对不上，底部/右侧就会露出一条灰边。
+    var wrapStyles = normalizeWrapStyle(this.wrapStyle);
+    var height = this.styles && this.styles.height;
+    var maxHeight = this.maxHeight || this.styles && (this.styles.maxHeight || this.styles['max-height']);
+
+    // 已有的键不覆盖，保证用户显式写的 wrap-style 优先
+    if (height && wrapStyles.height === undefined) {
+      wrapStyles.height = toCssSize(height);
+    }
+    if (maxHeight && wrapStyles.maxHeight === undefined) {
+      wrapStyles.maxHeight = toCssSize(maxHeight);
     }
 
+    var hasStyle = Object.keys(wrapStyles).length > 0;
+    var style = hasStyle ? wrapStyles : undefined;
+
     // 虚拟滚动实现
     var view = h(this.tag, {
       class: ['es-scrollbar__view', this.viewClass],
@@ -470,7 +472,7 @@ function getCachedScrollbarWidth() {
           'scroll': this.handleScroll
         },
 
-        'class': [this.wrapClass, 'es-scrollbar__wrap', gutter ? '' : 'es-scrollbar__wrap--hidden-default']
+        'class': [this.wrapClass, 'es-scrollbar__wrap es-scrollbar__wrap--hidden-default']
       },
       [[view]]
     );
@@ -508,8 +510,12 @@ function getCachedScrollbarWidth() {
         'div',
         {
           ref: 'wrap',
-          'class': [this.wrapClass, 'es-scrollbar__wrap'],
-          style: style
+          style: style,
+          on: {
+            'scroll': this.handleScroll
+          },
+
+          'class': [this.wrapClass, 'es-scrollbar__wrap']
         },
         [[view]]
       )];
@@ -838,18 +844,8 @@ function getCachedScrollbarWidth() {
         var wrap = _this5.wrap;
         if (!wrap) return;
 
-        // 确保 wrap 元素有正确的高度设置，特别是在嵌套场景下
-        if (!wrap.style.height && !wrap.style.maxHeight && !_this5.height && !_this5.maxHeight) {
-          // 如果没有设置高度，尝试从父元素获取
-          var parent = wrap.parentNode;
-          if (parent && parent.style.height) {
-            wrap.style.height = parent.style.height;
-          } else if (parent && parent.style.maxHeight) {
-            wrap.style.height = parent.style.maxHeight;
-          } else if (parent && parent.clientHeight) {
-            wrap.style.height = parent.clientHeight + 'px';
-          }
-        }
+        // wrap 高度：CSS 给默认的 height: 100%，需要限高时由调用方通过
+        // max-height / wrap-style 声明（组件自身的 wrap-class 限高不受干扰）
 
         // 缓存计算值
         var clientHeight = wrap.clientHeight;
@@ -870,18 +866,6 @@ function getCachedScrollbarWidth() {
         }
 
         _this5.onReady && _this5.onReady(_this5.sizeHeight, _this5.sizeWidth);
-
-        // 延迟执行高度计算逻辑
-        requestAnimationFrame(function () {
-          var maxH = wrap.parentNode.style['max-height'];
-          if (maxH) {
-            maxH = parseInt(maxH, 10);
-            var gutter = getCachedScrollbarWidth();
-            if (wrap.offsetHeight - gutter > maxH) {
-              _this5.height = maxH;
-            }
-          }
-        });
       });
     },
 

package/lib/select.js

@@ -713,7 +713,7 @@ module.exports = require("eoss/lib/utils/vue-popper.js");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/select/src/select.vue?vue&type=template&id=5f1334b0&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/select/src/select.vue?vue&type=template&id=4639eab5&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -1449,7 +1449,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/select/src/select.vue?vue&type=template&id=5f1334b0&
+// CONCATENATED MODULE: ./packages/select/src/select.vue?vue&type=template&id=4639eab5&
 
 // EXTERNAL MODULE: external "eoss/lib/mixins/emitter.js"
 var emitter_js_ = __webpack_require__(8);
@@ -1921,14 +1921,14 @@ var scrollbar_default = /*#__PURE__*/__webpack_require__.n(scrollbar_);
 var external_throttle_debounce_ = __webpack_require__(13);
 
 // EXTERNAL MODULE: external "eoss/lib/utils/clickoutside.js"
-var clickoutside_js_ = __webpack_require__(29);
+var clickoutside_js_ = __webpack_require__(28);
 var clickoutside_js_default = /*#__PURE__*/__webpack_require__.n(clickoutside_js_);
 
 // EXTERNAL MODULE: external "eoss/lib/utils/resize-event.js"
 var resize_event_js_ = __webpack_require__(25);
 
 // EXTERNAL MODULE: external "eoss/lib/utils/scrollbar.js"
-var scrollbar_js_ = __webpack_require__(27);
+var scrollbar_js_ = __webpack_require__(33);
 
 // EXTERNAL MODULE: external "eoss/lib/utils/util.js"
 var util_js_ = __webpack_require__(0);
@@ -3093,6 +3093,10 @@ var _this = undefined;
 
 
     results: {
+      // 树形模式的 options 完全由 data/results 驱动（树节点不是 es-option，不会自注册），
+      // 必须 immediate：否则静态传入 data 时 results 初始化不触发 watcher，
+      // options 恒为 []，下拉被 v-show="options.length > 0" 隐藏并显示「无数据」
+      immediate: true,
       deep: true,
       handler: function handler(val) {
         if (this.tree) {
@@ -3686,11 +3690,17 @@ var _this = undefined;
         if (this.filterable) this.$refs.input.focus();
         this.resetInputHeight();
       } else {
+        var selectValue = option.value;
         if (this.valueType === 'string') {
-          this.$emit('input', Object(util_js_["getValueByPath"])(option.value, this.actualValueKey));
-        } else {
-          this.$emit('input', option.value);
+          selectValue = Object(util_js_["getValueByPath"])(option.value, this.actualValueKey);
+          // 树节点未提供 value-key 对应字段时取值为 undefined，直接写入 v-model 会让
+          // setSelected 解析不出 label（表现为选中后不回显），此处退回整节点对象，
+          // 由 getOption 的对象分支按 label-key 取标签
+          if (this.tree && selectValue === undefined) {
+            selectValue = option.value;
+          }
         }
+        this.$emit('input', selectValue);
         this.emitChange(option.value);
         this.visible = false;
       }
@@ -3949,24 +3959,24 @@ module.exports = require("eoss/lib/utils/resize-event.js");
 
 /***/ }),
 
-/***/ 27:
+/***/ 28:
 /***/ (function(module, exports) {
 
-module.exports = require("eoss/lib/utils/scrollbar.js");
+module.exports = require("eoss/lib/utils/clickoutside.js");
 
 /***/ }),
 
-/***/ 29:
+/***/ 3:
 /***/ (function(module, exports) {
 
-module.exports = require("eoss/lib/utils/clickoutside.js");
+module.exports = require("eoss/lib/utils/ajax.js");
 
 /***/ }),
 
-/***/ 3:
+/***/ 33:
 /***/ (function(module, exports) {
 
-module.exports = require("eoss/lib/utils/ajax.js");
+module.exports = require("eoss/lib/utils/scrollbar.js");
 
 /***/ }),
 

package/lib/selector-panel.js

@@ -1887,7 +1887,7 @@ var input_ = __webpack_require__(9);
 var input_default = /*#__PURE__*/__webpack_require__.n(input_);
 
 // EXTERNAL MODULE: external "eoss/lib/option"
-var option_ = __webpack_require__(33);
+var option_ = __webpack_require__(32);
 var option_default = /*#__PURE__*/__webpack_require__.n(option_);
 
 // EXTERNAL MODULE: external "eoss/lib/select"
@@ -2493,7 +2493,7 @@ module.exports = require("eoss/lib/utils/ajax.js");
 
 /***/ }),
 
-/***/ 33:
+/***/ 32:
 /***/ (function(module, exports) {
 
 module.exports = require("eoss/lib/option");

package/lib/selector.js

@@ -255,7 +255,7 @@ module.exports = require("eoss/lib/utils/resize-event.js");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector.vue?vue&type=template&id=015c6e04&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector.vue?vue&type=template&id=950e8dd4&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -516,7 +516,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/selector.vue?vue&type=template&id=015c6e04&
+// CONCATENATED MODULE: ./packages/selector/src/selector.vue?vue&type=template&id=950e8dd4&
 
 // EXTERNAL MODULE: external "eoss/lib/utils/util.js"
 var util_js_ = __webpack_require__(0);
@@ -528,7 +528,7 @@ var types_js_ = __webpack_require__(22);
 var api_js_ = __webpack_require__(2);
 
 // EXTERNAL MODULE: external "eoss/lib/utils/clickoutside.js"
-var clickoutside_js_ = __webpack_require__(29);
+var clickoutside_js_ = __webpack_require__(28);
 var clickoutside_js_default = /*#__PURE__*/__webpack_require__.n(clickoutside_js_);
 
 // EXTERNAL MODULE: external "eoss/lib/utils/ajax.js"
@@ -573,7 +573,7 @@ var selector_panel_default = /*#__PURE__*/__webpack_require__.n(selector_panel_)
 var resize_event_js_ = __webpack_require__(25);
 
 // EXTERNAL MODULE: external "eoss/lib/utils/scrollbar.js"
-var scrollbar_js_ = __webpack_require__(27);
+var scrollbar_js_ = __webpack_require__(33);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector.vue?vue&type=script&lang=js&
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -1159,8 +1159,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       timer: null,
       tagsHeight: 0,
       moveTo: 0,
-      barSize: 0,
-      scrollbarWidth: 0
+      barSize: 0
     };
   },
 
@@ -1168,12 +1167,12 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     styles: function styles() {
       return this.tagsHeight ? { 'max-height': this.tagsHeight + 'px', overflow: 'hidden' } : {};
     },
+
+    // tags 折叠限高时内层容器自身滚动，原生条由 CSS 隐藏（见 selector.scss），
+    // 不占位也就无需按条宽加宽容器把它推出去——那样在浏览器缩放时量到的
+    // 15px 和实际渲染宽度对不上，右侧会露出一条灰边
     tagsStyle: function tagsStyle() {
-      return this.tagsHeight ? {
-        'max-height': this.tagsHeight + 'px',
-        overflowY: 'scroll',
-        width: 'calc(100% + ' + this.scrollbarWidth + 'px)'
-      } : {};
+      return this.tagsHeight ? { 'max-height': this.tagsHeight + 'px', overflowY: 'scroll' } : {};
     },
 
     // 滚动容器
@@ -1294,7 +1293,6 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
   mounted: function mounted() {
     var _this2 = this;
 
-    this.scrollbarWidth = Object(scrollbar_js_["getScrollbarWidth"])();
     //this.resetInputHeight();
     if (this.filterable) {
       this.$nextTick(function () {
@@ -1629,24 +1627,24 @@ selector.install = function (Vue) {
 
 /***/ }),
 
-/***/ 27:
+/***/ 28:
 /***/ (function(module, exports) {
 
-module.exports = require("eoss/lib/utils/scrollbar.js");
+module.exports = require("eoss/lib/utils/clickoutside.js");
 
 /***/ }),
 
-/***/ 29:
+/***/ 3:
 /***/ (function(module, exports) {
 
-module.exports = require("eoss/lib/utils/clickoutside.js");
+module.exports = require("eoss/lib/utils/ajax.js");
 
 /***/ }),
 
-/***/ 3:
+/***/ 33:
 /***/ (function(module, exports) {
 
-module.exports = require("eoss/lib/utils/ajax.js");
+module.exports = require("eoss/lib/utils/scrollbar.js");
 
 /***/ }),
 

package/lib/slider.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 202);
+/******/ 	return __webpack_require__(__webpack_require__.s = 203);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -199,7 +199,7 @@ module.exports = require("eoss/lib/tooltip");
 
 /***/ }),
 
-/***/ 202:
+/***/ 203:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/step.js

@@ -972,7 +972,7 @@ module.exports = require("eoss/lib/checkbox-group");
 
 /***/ }),
 
-/***/ 30:
+/***/ 29:
 /***/ (function(module, exports) {
 
 module.exports = require("eoss/lib/radio-group");
@@ -1125,7 +1125,7 @@ var input_number_ = __webpack_require__(40);
 var input_number_default = /*#__PURE__*/__webpack_require__.n(input_number_);
 
 // EXTERNAL MODULE: external "eoss/lib/radio-group"
-var radio_group_ = __webpack_require__(30);
+var radio_group_ = __webpack_require__(29);
 var radio_group_default = /*#__PURE__*/__webpack_require__.n(radio_group_);
 
 // EXTERNAL MODULE: external "eoss/lib/checkbox-group"

package/lib/steps.js

@@ -1015,7 +1015,7 @@ render._withStripped = true
 // CONCATENATED MODULE: ./packages/steps/src/steps.vue?vue&type=template&id=23b8394e&
 
 // EXTERNAL MODULE: external "eoss/lib/mixins/migrating.js"
-var migrating_js_ = __webpack_require__(31);
+var migrating_js_ = __webpack_require__(30);
 var migrating_js_default = /*#__PURE__*/__webpack_require__.n(migrating_js_);
 
 // EXTERNAL MODULE: ./packages/steps/src/step.vue + 4 modules
@@ -1276,14 +1276,14 @@ steps.install = function (Vue) {
 
 /***/ }),
 
-/***/ 30:
+/***/ 29:
 /***/ (function(module, exports) {
 
 module.exports = require("eoss/lib/radio-group");
 
 /***/ }),
 
-/***/ 31:
+/***/ 30:
 /***/ (function(module, exports) {
 
 module.exports = require("eoss/lib/mixins/migrating.js");
@@ -1436,7 +1436,7 @@ var input_number_ = __webpack_require__(40);
 var input_number_default = /*#__PURE__*/__webpack_require__.n(input_number_);
 
 // EXTERNAL MODULE: external "eoss/lib/radio-group"
-var radio_group_ = __webpack_require__(30);
+var radio_group_ = __webpack_require__(29);
 var radio_group_default = /*#__PURE__*/__webpack_require__.n(radio_group_);
 
 // EXTERNAL MODULE: external "eoss/lib/checkbox-group"

package/lib/submenu.js

@@ -197,7 +197,7 @@ function normalizeComponent(
 
 "use strict";
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/menu/src/submenu.vue?vue&type=template&id=09f0751a&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/menu/src/submenu.vue?vue&type=template&id=87f03422&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -408,8 +408,11 @@ var render = function () {
                             style: {
                               backgroundColor:
                                 _vm.rootMenu.backgroundColor || "",
+                              // 原生条已由 CSS 隐藏（见 menu.scss 的
+                              // .es-menu-hidden > .es-menu--popup），不占位也就无需再用
+                              // marginRight: -条宽 把它推出容器——缩放时量到的 15px 和
+                              // 实际渲染宽度对不上，popup 右/下侧会露出一条灰边
                               maxHeight: _vm.maxH === undefined ? "" : _vm.maxH,
-                              marginRight: _vm.isScroll ? _vm.gutterWith : "",
                             },
                             attrs: { role: "menu" },
                           },
@@ -504,10 +507,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/menu/src/submenu.vue?vue&type=template&id=09f0751a&
-
-// EXTERNAL MODULE: external "eoss/lib/utils/scrollbar.js"
-var scrollbar_js_ = __webpack_require__(27);
+// CONCATENATED MODULE: ./packages/menu/src/submenu.vue?vue&type=template&id=87f03422&
 
 // EXTERNAL MODULE: ./packages/menu/src/mixins.js
 var mixins = __webpack_require__(65);
@@ -705,7 +705,9 @@ var scrollbar_default = /*#__PURE__*/__webpack_require__.n(scrollbar_);
 //
 //
 //
-
+//
+//
+//
 
 
 
@@ -939,9 +941,6 @@ var poperMixins = {
       }
       return rootMenu.mode === 'horizontal' && isFirstLevel ? 'es-icon-xia' : 'es-icon-you';
     },
-    gutterWith: function gutterWith() {
-      return '-' + Object(scrollbar_js_["getScrollbarWidth"])() + 'px';
-    },
     iconClass: function iconClass() {
       return this.icon || this.rootMenu.parentMenuIcon || this.rootMenu.icon;
     },
@@ -1001,7 +1000,6 @@ var poperMixins = {
       items: {},
       submenus: {},
       mouseInChild: false,
-      isScroll: false,
       height: '',
       isHoveringTitle: false
     };
@@ -1144,11 +1142,8 @@ var poperMixins = {
 
     this.$nextTick(function () {
       var dom = _this5.$refs.menucontent;
-      if (dom && (dom.scrollHeight > dom.clientHeight || dom.offsetHeight > dom.clientHeight)) {
-        _this5.isScroll = true;
-      } else {
-        _this5.isScroll = false;
-      }
+      // 只需要给 es-scrollbar 分支算高度；popup 分支的原生条由 CSS 隐藏，
+      // 不再需要判定是否出了滚动条去抵消它的占位
       if (dom && _this5.maxH && dom.clientHeight > parseInt(_this5.maxH, 10)) {
         _this5.height = _this5.maxH;
       } else {
@@ -1234,13 +1229,6 @@ module.exports = require("eoss/lib/tooltip");
 
 /***/ }),
 
-/***/ 27:
-/***/ (function(module, exports) {
-
-module.exports = require("eoss/lib/utils/scrollbar.js");
-
-/***/ }),
-
 /***/ 47:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -1778,8 +1766,12 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
           open = item.open,
           extendData = item.extendData,
           rest = _objectWithoutProperties(item, ['id', 'index', 'open', 'extendData']);
+      // extendData 存在时以它为准，没有则回退到 item 自身的 open；
+      // 原写法 `open || extendData ? Boolean(extendData.openStatus)` 在
+      // 只声明了 open、没带 extendData 的菜单项上会直接抛错
+
 
-      var openStatus = open || extendData ? Boolean(extendData.openStatus) : false;
+      var openStatus = extendData ? Boolean(extendData.openStatus) : Boolean(open);
       var props = void 0;
       if (this.isFourthTabs) {
         if (item.children && item.children.length || item.fourthTabs && item.fourthTabs.length) {

package/lib/switch.js

@@ -348,7 +348,7 @@ var focus_js_ = __webpack_require__(74);
 var focus_js_default = /*#__PURE__*/__webpack_require__.n(focus_js_);
 
 // EXTERNAL MODULE: external "eoss/lib/mixins/migrating.js"
-var migrating_js_ = __webpack_require__(31);
+var migrating_js_ = __webpack_require__(30);
 var migrating_js_default = /*#__PURE__*/__webpack_require__.n(migrating_js_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/switch/src/switch.vue?vue&type=script&lang=js&
@@ -769,7 +769,7 @@ src_switch.install = function (Vue) {
 
 /***/ }),
 
-/***/ 31:
+/***/ 30:
 /***/ (function(module, exports) {
 
 module.exports = require("eoss/lib/mixins/migrating.js");