eoss-ui 0.5.68 → 0.5.70

package/lib/main.js

@@ -153,21 +153,17 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
  * @param {Array} [encodes] - 需要对参数值进行encodeURIComponent编码的参数值名称
  **/
 // 请求
-var pendingRequest = new Map();
-function getRequestKey(config) {
-  var method = config.method,
-      url = config.url,
-      params = config.params,
-      data = config.data;
-
-  return [method, url, qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(params), qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data)].join('&');
-};
-function delPendingRequest(config) {
-  var requestKey = getRequestKey(config);
-  if (pendingRequest.has(requestKey)) {
-    pendingRequest.delete(requestKey);
-  }
-}
+// const pendingRequest = new Map();
+// function getRequestKey(config) {
+//   const { method, url, params, data } = config;
+//   return [method, url, qs.stringify(params), qs.stringify(data)].join('&');
+// };
+// function delPendingRequest(config) {
+//   let requestKey = getRequestKey(config);
+//   if (pendingRequest.has(requestKey)) {
+//     pendingRequest.delete(requestKey);
+//   }
+// }
 var ajax = function ajax(_ref) {
   var headers = _ref.headers,
       method = _ref.method,
@@ -216,30 +212,32 @@ var ajax = function ajax(_ref) {
   http.interceptors.request.use(function (config) {
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
-    var requestKey = getRequestKey(config);
-    // 判断请求是否重复
-    if (pendingRequest.has(requestKey)) {
-      // 取消上次请求
-      var cancel = pendingRequest.get(requestKey);
-      cancel();
-      // 删除请求信息
-      pendingRequest.delete(requestKey);
-    }
-    // 把请求信息,添加请求到map当中
-    // 生成取消方法
-    config.cancelToken = config.cancelToken || new axios__WEBPACK_IMPORTED_MODULE_1___default.a.CancelToken(function (cancel) {
-      // 把取消方法添加到map
-      if (!pendingRequest.has(requestKey)) {
-        pendingRequest.set(requestKey, cancel);
-      }
-    });
+    // let requestKey = getRequestKey(config);
+    // // 判断请求是否重复
+    // if (pendingRequest.has(requestKey)) {
+    //   // 取消上次请求
+    //   let cancel = pendingRequest.get(requestKey);
+    //   cancel();
+    //   // 删除请求信息
+    //   pendingRequest.delete(requestKey);
+    // }
+    // // 把请求信息,添加请求到map当中
+    // // 生成取消方法
+    // config.cancelToken =
+    //   config.cancelToken ||
+    //   new axios.CancelToken(cancel => {
+    //     // 把取消方法添加到map
+    //     if (!pendingRequest.has(requestKey)) {
+    //       pendingRequest.set(requestKey, cancel);
+    //     }
+    //   });
     return config;
   }, function (err) {
     return err;
   });
   // 响应拦截
   http.interceptors.response.use(function (response) {
-    delPendingRequest(response.config);
+    // delPendingRequest(response.config);
     loading && loading.close();
     if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
       if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
@@ -356,9 +354,9 @@ var ajax = function ajax(_ref) {
     }
   }, function (error) {
     loading && loading.close();
-    if (!axios__WEBPACK_IMPORTED_MODULE_1___default.a.isCancel(error)) {
-      delPendingRequest(error.config || {});
-    }
+    // if (!axios.isCancel(error)) {
+    //   delPendingRequest(error.config || {});
+    // }
     if (error && error.response) {
       if (error.response.status) {
         switch (error.response.status) {
@@ -3765,7 +3763,8 @@ module.exports = require("stompjs");
 module.exports = require("sm-crypto");
 
 /***/ }),
-/* 11 */
+/* 11 */,
+/* 12 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3792,13 +3791,12 @@ window.__store = store;
 /* harmony default export */ __webpack_exports__["a"] = (store);
 
 /***/ }),
-/* 12 */
+/* 13 */
 /***/ (function(module, exports) {
 
 module.exports = require("babel-runtime/regenerator");
 
 /***/ }),
-/* 13 */,
 /* 14 */,
 /* 15 */,
 /* 16 */,
@@ -3828,7 +3826,7 @@ module.exports = require("runtime-import");
 // 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/main/src/main.vue?vue&type=template&id=3910f883&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=098112dd&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3883,6 +3881,8 @@ var render = function () {
                         attrs: {
                           mode: "horizontal",
                           icons: _vm.icons,
+                          "menu-icon": _vm.menuIcon,
+                          "sub-icon": _vm.subIcon,
                           popperClass: "el-menu--popup-" + _vm.layout,
                           data: _vm.navs,
                           deep: _vm.layout === "topnav",
@@ -3975,7 +3975,10 @@ var render = function () {
                                 : _vm._e(),
                             ]),
                             _c("es-handle-user", {
-                              attrs: { data: { type: "user" } },
+                              attrs: {
+                                data: { type: "user" },
+                                userModel: _vm.userModel,
+                              },
                               on: { click: _vm.handleClick },
                             }),
                           ],
@@ -4021,13 +4024,17 @@ var render = function () {
                             "is-top": _vm.layout == "topside",
                             data: _vm.menu,
                             "default-active": _vm.active,
-                            width: _vm.navWidth,
+                            width: _vm.navsWidth,
+                            "nav-width": _vm.navWidth,
                             icons: _vm.icons,
+                            "menu-icon": _vm.menuIcon,
+                            "sub-icon": _vm.subIcon,
                             biserial: _vm.biserial,
                             title: _vm.showNavTitle ? _vm.title : false,
                             showCollapse: _vm.showNavTitle,
                             "menu-tips": _vm.menuTips,
                             "is-default": _vm.isDefault,
+                            paddingLeft: _vm.navPaddingLeft,
                           },
                           on: {
                             open: function (res) {
@@ -4058,6 +4065,7 @@ var render = function () {
                           data: _vm.tabs,
                           titleIcons: false,
                           "default-active": _vm.tabsId,
+                          "menu-icon": _vm.menuIcon,
                           "menu-tips": _vm.menuTips,
                         },
                         on: {
@@ -4260,7 +4268,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=3910f883&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=098112dd&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=75d533de&
 var userinfovue_type_template_id_75d533de_render = function () {
@@ -4289,7 +4297,7 @@ userinfovue_type_template_id_75d533de_render._withStripped = true
 var api = __webpack_require__(1);
 
 // EXTERNAL MODULE: ./src/utils/store.js
-var store = __webpack_require__(11);
+var store = __webpack_require__(12);
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -5939,7 +5947,7 @@ async_componentvue_type_template_id_8b78c8b6_scoped_true_render._withStripped =
 // CONCATENATED MODULE: ./packages/main/src/async-component/index.vue?vue&type=template&id=8b78c8b6&scoped=true&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
-var regenerator_ = __webpack_require__(12);
+var regenerator_ = __webpack_require__(13);
 var regenerator_default = /*#__PURE__*/__webpack_require__.n(regenerator_);
 
 // EXTERNAL MODULE: external "runtime-import"
@@ -6349,6 +6357,14 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -6381,8 +6397,15 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
     maxHeight: String,
     //菜单导航地址
     menuUrl: String,
-    //菜单展开关闭
+    //菜单展开关闭图标
     icons: Object,
+    //菜单前置默认图标
+    menuIcon: String,
+    //子菜单是否显示前置图标
+    subIcon: {
+      type: Boolean,
+      default: true
+    },
     //logo
     logo: String,
     //菜单显示类型
@@ -6506,7 +6529,10 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
       type: [Boolean, String],
       default: true
     },
-    appCode: String
+    appCode: String,
+    //菜单左边距
+    navPaddingLeft: Number,
+    navWidth: String
   },
   computed: {
     showHeader: function showHeader() {
@@ -6533,7 +6559,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
       }
       return true;
     },
-    navWidth: function navWidth() {
+    navsWidth: function navsWidth() {
       return this.layout === 'topside' ? '230px' : undefined;
     },
     showNavTitle: function showNavTitle() {
@@ -7853,8 +7879,12 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
                 }
               }
             } else {
-              console.error('缺少路由配置');
-              return;
+              this.method = 'iframe';
+              this.refresh = false;
+              this.page = util["a" /* default */].handlerUrl(page, param);
+              this.$nextTick(function () {
+                _this10.refresh = true;
+              });
             }
           }
         }

package/lib/menu.js

@@ -87,6 +87,13 @@ module.exports =
 /************************************************************************/
 /******/ ({
 
+/***/ 11:
+/***/ (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__(11);
+
 // 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,52 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       isChange: false
     };
   },
-  mounted: function mounted() {},
+  beforeCreate: function beforeCreate() {
+    var _this = this;
+
+    this.getMaxWidth = Object(external_throttle_debounce_["debounce"])(300, function () {
+      _this.getWidth();
+    });
+  },
+  created: function created() {},
+  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 +394,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 +403,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 +436,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 +471,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 +496,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 +524,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 +556,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 +566,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 +584,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),