eoss-ui 0.5.67 → 0.5.69

package/lib/menu.js

@@ -87,6 +87,13 @@ module.exports =
 /************************************************************************/
 /******/ ({
 
+/***/ 18:
+/***/ (function(module, exports) {
+
+module.exports = require("throttle-debounce");
+
+/***/ }),
+
 /***/ 3:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -199,9 +206,13 @@ function normalizeComponent(
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
+// EXTERNAL MODULE: external "throttle-debounce"
+var external_throttle_debounce_ = __webpack_require__(18);
+
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/menu/src/main.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; };
 
+
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
   name: 'EsMenu',
   inheritAttrs: false,
@@ -241,6 +252,15 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     paddingLeft: {
       type: Number,
       default: 14
+    },
+    menuIcon: {
+      type: String,
+      default: 'es-icon-application'
+    },
+    icons: Object,
+    subIcon: {
+      type: Boolean,
+      default: true
     }
   },
   computed: {
@@ -248,37 +268,18 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       return this.height === undefined ? this.maxH : this.height;
     },
     maxWidth: function maxWidth() {
-      if (this.mode === 'vertical') {
-        return this.width;
-      }
       return this.maxW;
     }
   },
   watch: {
     data: {
-      immediate: true,
       deep: true,
       handler: function handler() {
-        var _this = this;
-
-        if (this.mode === 'vertical') {
-          this.$nextTick(function () {
-            _this.maxH = _this.$refs.esMenu.$el.getBoundingClientRect().height + 'px';
-          });
-        } else {
-          this.$nextTick(function () {
-            var w = 0;
-            Array.from(_this.$refs.menu.$el.children).forEach(function (item) {
-              w += item.getBoundingClientRect().width;
-            });
-            var styles = window.getComputedStyle(_this.$refs.menu.$el);
-            w += parseFloat(styles.paddingLeft) + parseFloat(styles.paddingRight);
-            if (w > _this.$refs.esMenu.$el.getBoundingClientRect().width) {
-              _this.maxW = w + 'px';
-            }
-          });
-        }
+        this.getMaxWidth();
       }
+    },
+    width: function width() {
+      this.getMaxWidth();
     }
   },
   data: function data() {
@@ -290,19 +291,51 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       isChange: false
     };
   },
-  mounted: function mounted() {},
+  created: function created() {
+    var _this = this;
+
+    this.getMaxWidth = Object(external_throttle_debounce_["debounce"])(300, function () {
+      _this.getWidth();
+    });
+  },
+  mounted: function mounted() {
+    this.getMaxWidth();
+  },
 
   methods: {
-    handleReady: function handleReady() {
+    getWidth: function getWidth() {
       var _this2 = this;
 
+      if (this.mode === 'vertical') {
+        this.$nextTick(function () {
+          _this2.maxH = _this2.$refs.esMenu.$el.getBoundingClientRect().height + 'px';
+          var styles = window.getComputedStyle(_this2.$refs.menu.$el.parentNode);
+          _this2.maxW = _this2.width ? parseInt(_this2.width, 10) - parseInt(styles.marginLeft, 10) - parseInt(styles.marginRight, 10) + 'px' : '';
+        });
+      } else {
+        this.$nextTick(function () {
+          var w = 0;
+          Array.from(_this2.$refs.menu.$el.children).forEach(function (item) {
+            w += item.getBoundingClientRect().width;
+          });
+          var styles = window.getComputedStyle(_this2.$refs.menu.$el);
+          w += parseFloat(styles.paddingLeft) + parseFloat(styles.paddingRight);
+          if (w > _this2.$refs.esMenu.$el.getBoundingClientRect().width) {
+            _this2.maxW = w + 'px';
+          }
+        });
+      }
+    },
+    handleReady: function handleReady() {
+      var _this3 = this;
+
       if (this.mode === 'horizontal') {
         this.$refs.esMenu.wrap.onmouseover = function (e) {
-          _this2.$refs.esMenu.wrap.addEventListener('mousewheel', _this2.handleWheel, { passive: false }) || _this2.$refs.esMenu.wrap.addEventListener('DOMMouseScroll', _this2.handleWheel, false);
+          _this3.$refs.esMenu.wrap.addEventListener('mousewheel', _this3.handleWheel, { passive: false }) || _this3.$refs.esMenu.wrap.addEventListener('DOMMouseScroll', _this3.handleWheel, false);
           e.preventDefault();
         };
         this.$refs.esMenu.wrap.onmouseout = function (e) {
-          _this2.$refs.esMenu.wrap.removeEventListener('mousewheel', _this2.handleWheel, { passive: false }) || _this2.$refs.esMenu.wrap.removeEventListener('DOMMouseScroll', _this2.handleWheel, false);
+          _this3.$refs.esMenu.wrap.removeEventListener('mousewheel', _this3.handleWheel, { passive: false }) || _this3.$refs.esMenu.wrap.removeEventListener('DOMMouseScroll', _this3.handleWheel, false);
           e.preventDefault();
         };
       }
@@ -360,7 +393,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       }
     },
     handleSelect: function handleSelect(key, keyPath, item) {
-      var _this3 = this;
+      var _this4 = this;
 
       this.isChange = true;
       if (this.menuId !== null && keyPath.indexOf(this.menuId) == -1) {
@@ -369,7 +402,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         var openedMenus = item.rootMenu.openedMenus;
         openedMenus.forEach(function (item) {
           if (keyPath.indexOf(item) == -1) {
-            _this3.$refs.menu.close(item);
+            _this4.$refs.menu.close(item);
           }
         });
       }
@@ -402,18 +435,24 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         mode: this.mode
       });
     },
-    getSub: function getSub(item, h, popper, fourthTabs) {
-      var _this4 = this;
+    getSub: function getSub(item, h, popper, fourthTabs, subIcon) {
+      var _this5 = this;
 
       if (popper) {
         popper += this.popperClass !== undefined ? ' ' + this.popperClass : ' es-menu-popper-' + this.mode;
       } else {
         popper = this.popperClass !== undefined ? this.popperClass : ' es-menu-popper-' + this.mode;
       }
-      var title = [h('i', {
-        class: [item.icons ? this.unicode(item.icons) ? item.icons : 'es-icon iconfont' : 'es-icon-application', 'es-menu-item-icon'],
-        domProps: item.icons === '' || this.unicode(item.icons) ? {} : { innerHTML: item.icons }
-      }), h('div', {
+      var title = [];
+      if (subIcon) {
+        title.push(h('es-icon', {
+          props: {
+            contents: item.icons || this.menuIcon
+          },
+          class: ['es-menu-item-icon']
+        }));
+      }
+      title.push(h('div', {
         class: ['es-menu-title-text es-menu-title-' + this.mode]
       }, [h('el-badge', {
         class: ['es-badge', {
@@ -431,14 +470,14 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
           max: 99,
           hidden: !item.tips
         }
-      }, [item.text])])];
+      }, [item.text])]));
       var doms = [h('template', { slot: 'title' }, this.titleIcons ? title : [title[1]])];
       if (this.deep && item.children && item.children.length && (!item.extendData || item.extendData.businessStatus != 0)) {
         doms = doms.concat(item.children.map(function (ele, index) {
           if (!ele) {
             console.error('\u5BF9\u8C61\u5B50\u6570\u636E\u4E2D\u7B2C[' + index + ']\u6761\u6570\u636E\u9519\u8BEF', item);
           } else {
-            return _this4.getSub(ele, h, popper);
+            return _this5.getSub(ele, h, popper, false, _this5.subIcon);
           }
         }));
         return [h('el-submenu', {
@@ -456,7 +495,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
           if (!ele) {
             console.error('\u5BF9\u8C61\u5B50\u6570\u636E\u4E2D\u7B2C[' + index + ']\u6761\u6570\u636E\u9519\u8BEF', item);
           } else {
-            return _this4.getSub(ele, h, popper, true);
+            return _this5.getSub(ele, h, popper, true, _this5.subIcon);
           }
         }));
         return [h('el-submenu', {
@@ -484,28 +523,23 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
           }
         }, this.titleIcons ? title : [title[1]])];
       }
-    },
-    unicode: function unicode(res) {
-      if (!res) {
-        return false;
-      }
-      var reg = new RegExp(/^es-\S+/, 'g');
-      return res.match(reg) ? res.match(reg).length : 0;
     }
   },
   render: function render(h) {
-    var _this5 = this;
+    var _this6 = this;
 
     var doms = [];
     this.data.forEach(function (item) {
       if (item.children && item.children.length && (!item.extendData || item.extendData.businessStatus != 0)) {
-        doms = doms.concat(_this5.getSub(item, h, 'es-sub-menu'));
+        doms = doms.concat(_this6.getSub(item, h, 'es-sub-menu', false, true));
       } else {
-        var title = [h('i', {
-          class: [item.icons ? _this5.unicode(item.icons) ? item.icons : 'es-icon iconfont' : 'es-icon-application', 'es-menu-item-icon'],
-          domProps: item.icons === '' || _this5.unicode(item.icons) ? {} : { innerHTML: item.icons }
+        var title = [h('es-icon', {
+          props: {
+            contents: item.icons || _this6.menuIcon
+          },
+          class: ['es-menu-item-icon']
         }), h('div', {
-          class: ['es-menu-title-text es-menu-title-' + _this5.mode]
+          class: ['es-menu-title-text es-menu-title-' + _this6.mode]
         }, [h('el-badge', {
           class: ['es-badge', {
             'es-badge-right': item.tips && typeof item.tips !== 'boolean',
@@ -521,9 +555,9 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
           }
         }, [item.text])])];
         doms.push(h('el-menu-item', {
-          class: ['es-menu-item-' + _this5.mode],
+          class: ['es-menu-item-' + _this6.mode],
           props: {
-            paddingLeft: _this5.paddingLeft,
+            paddingLeft: _this6.paddingLeft,
             disabled: item.extendData && item.extendData.businessStatus == 0
           },
           attrs: {
@@ -531,7 +565,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
             index: item.id,
             key: item.id
           }
-        }, _this5.titleIcons ? title : [title[1]]));
+        }, _this6.titleIcons ? title : [title[1]]));
       }
     });
     return h('el-scrollbar', {
@@ -549,7 +583,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         defaultActive: this.defaultActive,
         collapse: this.collapse,
         mode: this.mode,
-        uniqueOpened: this.uniqueOpened
+        uniqueOpened: this.uniqueOpened,
+        icons: this.icons
       },
       style: { width: this.maxWidth },
       attrs: _extends({}, this.$attrs),

package/lib/nav.js

@@ -3630,7 +3630,7 @@ module.exports = require("axios");
 // 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/nav/src/main.vue?vue&type=template&id=5d7ddb00&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/nav/src/main.vue?vue&type=template&id=04099294&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3660,6 +3660,9 @@ var render = function () {
                       deep: false,
                       "default-active": _vm.subActive,
                       biserial: _vm.biserial,
+                      "menu-icons": _vm.menuIcon,
+                      icons: _vm.icons,
+                      "sub-icon": _vm.subIcon,
                     },
                     on: { select: _vm.handleTrigger },
                   },
@@ -3685,6 +3688,7 @@ var render = function () {
           ],
           staticClass: "es-nav-main",
           style: { width: _vm.biserial ? _vm.width : _vm.boxWidth },
+          attrs: { biserial: _vm.biserial },
         },
         [
           _vm.showTitle
@@ -3751,6 +3755,10 @@ var render = function () {
                   width: _vm.isTop ? _vm.boxWidth : _vm.menuWidth,
                   "is-default": _vm.isDefault,
                   biserial: _vm.biserial,
+                  paddingLeft: _vm.paddingLeft,
+                  "menu-icon": _vm.menuIcon,
+                  icons: _vm.icons,
+                  "sub-icon": _vm.subIcon,
                 },
                 on: {
                   select: _vm.handleSelect,
@@ -3773,7 +3781,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/nav/src/main.vue?vue&type=template&id=5d7ddb00&
+// CONCATENATED MODULE: ./packages/nav/src/main.vue?vue&type=template&id=04099294&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -3835,6 +3843,14 @@ var util = __webpack_require__(0);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
@@ -3854,6 +3870,10 @@ var util = __webpack_require__(0);
       type: String,
       default: '200px'
     },
+    navWidth: {
+      type: String,
+      default: '70px'
+    },
     showCollapse: {
       type: Boolean,
       default: true
@@ -3865,7 +3885,14 @@ var util = __webpack_require__(0);
     //是否双列导航
     biserial: Boolean,
     defaultActive: [String, Array],
-    isDefault: Boolean
+    isDefault: Boolean,
+    paddingLeft: Number,
+    menuIcon: String,
+    icons: Object,
+    subIcon: {
+      type: Boolean,
+      default: true
+    }
   },
   computed: {
     menu: function menu() {
@@ -3890,10 +3917,10 @@ var util = __webpack_require__(0);
         if (this.isShow) {
           return this.width;
         } else {
-          return '70px';
+          return this.navWidth;
         }
       }
-      return this.subMenu && this.subMenu.length && this.isShow ? parseInt(this.width, 10) + 70 + 'px' : '70px';
+      return this.subMenu && this.subMenu.length && this.isShow ? parseInt(this.width, 10) + parseInt(this.navWidth, 10) + 'px' : this.navWidth;
     }
   },
   watch: {

package/lib/player.js

@@ -3497,7 +3497,7 @@ module.exports = require("sm-crypto");
 
 /***/ }),
 
-/***/ 18:
+/***/ 19:
 /***/ (function(module, exports) {
 
 module.exports = require("video.js");
@@ -3672,7 +3672,7 @@ render._withStripped = true
 // CONCATENATED MODULE: ./packages/player/src/main.vue?vue&type=template&id=29c1659e&
 
 // EXTERNAL MODULE: external "video.js"
-var external_video_js_ = __webpack_require__(18);
+var external_video_js_ = __webpack_require__(19);
 var external_video_js_default = /*#__PURE__*/__webpack_require__.n(external_video_js_);
 
 // EXTERNAL MODULE: external "video.js/dist/lang/zh-CN.json"