eoss-ui 0.5.81-beta20 → 0.5.81-beta22

package/lib/main.js

@@ -3941,7 +3941,7 @@ module.exports = require("wujie-vue2");
 // 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=46c88986&
+// 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=a3c25372&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4015,10 +4015,10 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=46c88986&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=a3c25372&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=template&id=cd15edd8&scoped=true&
-var simplicityvue_type_template_id_cd15edd8_scoped_true_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=template&id=7188d482&scoped=true&
+var simplicityvue_type_template_id_7188d482_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4498,50 +4498,39 @@ var simplicityvue_type_template_id_cd15edd8_scoped_true_render = function () {
                 [
                   (_vm.isIE && item.method !== "router") ||
                   item.method == "iframe"
-                    ? [
-                        _c("iframe", {
-                          attrs: {
-                            id: _vm.activeName == item.id ? _vm.iframeId : "",
-                            name: _vm.activeName == item.id ? _vm.iframeId : "",
-                            frameborder: "0",
-                            width: "100%",
-                            height: "100%",
-                            src: item.url,
-                          },
-                        }),
-                      ]
+                    ? _c("iframe", {
+                        attrs: {
+                          id: _vm.activeName == item.id ? _vm.iframeId : "",
+                          name: _vm.activeName == item.id ? _vm.iframeId : "",
+                          frameborder: "0",
+                          width: "100%",
+                          height: "100%",
+                          src: item.url,
+                        },
+                      })
                     : item.method === "wujie" && item.refresh
-                    ? [
-                        _c("es-wujie", {
-                          attrs: {
-                            show: true,
-                            props: _vm.wjProps,
-                            attrs: _vm.wjAttrs,
-                            name: item.appCode,
-                            url: item.url,
-                          },
-                        }),
-                      ]
+                    ? _c("es-wujie", {
+                        attrs: {
+                          show: true,
+                          props: _vm.wjProps,
+                          attrs: _vm.wjAttrs,
+                          name: item.appCode,
+                          url: item.url,
+                        },
+                      })
                     : item.method === "router" && item.refresh
-                    ? [
-                        _c(
+                    ? _c(
+                        "router-page",
+                        _vm._b(
+                          { attrs: { query: _vm.$parent.params } },
                           "router-page",
-                          _vm._b(
-                            {
-                              attrs: {
-                                show: _vm.activeName == item.id,
-                                query: _vm.$parent.params,
-                              },
-                            },
-                            "router-page",
-                            item,
-                            false
-                          )
-                        ),
-                      ]
+                          item,
+                          false
+                        )
+                      )
                     : _vm._e(),
                 ],
-                2
+                1
               )
             }),
           ],
@@ -4627,11 +4616,11 @@ var simplicityvue_type_template_id_cd15edd8_scoped_true_render = function () {
     ),
   ])
 }
-var simplicityvue_type_template_id_cd15edd8_scoped_true_staticRenderFns = []
-simplicityvue_type_template_id_cd15edd8_scoped_true_render._withStripped = true
+var simplicityvue_type_template_id_7188d482_scoped_true_staticRenderFns = []
+simplicityvue_type_template_id_7188d482_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=cd15edd8&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=7188d482&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/avatar.vue?vue&type=template&id=1560e8bf&scoped=true&
 var avatarvue_type_template_id_1560e8bf_scoped_true_render = function () {
@@ -8310,8 +8299,8 @@ var settings_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var settings = (settings_component.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/simplicity/router-page.vue?vue&type=template&id=ec0c2718&scoped=true&
-var router_pagevue_type_template_id_ec0c2718_scoped_true_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/router-page.vue?vue&type=template&id=fa212f84&scoped=true&
+var router_pagevue_type_template_id_fa212f84_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -8321,11 +8310,11 @@ var router_pagevue_type_template_id_ec0c2718_scoped_true_render = function () {
     1
   )
 }
-var router_pagevue_type_template_id_ec0c2718_scoped_true_staticRenderFns = []
-router_pagevue_type_template_id_ec0c2718_scoped_true_render._withStripped = true
+var router_pagevue_type_template_id_fa212f84_scoped_true_staticRenderFns = []
+router_pagevue_type_template_id_fa212f84_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/router-page.vue?vue&type=template&id=ec0c2718&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/router-page.vue?vue&type=template&id=fa212f84&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/router-page.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; };
@@ -8350,34 +8339,25 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       default: function _default() {
         return {};
       }
-    },
-    show: Boolean
+    }
   },
   data: function data() {
-    return {
-      params: {}
-    };
+    return {};
   },
 
   computed: {},
-  watch: {
-    show: function show(val) {
-      if (val) {
-        this.jump();
-      }
-    }
-  },
+  watch: {},
   created: function created() {},
   mounted: function mounted() {
-    this.params = util["a" /* default */].getParams({ url: this.url });
     this.jump();
   },
 
   methods: {
     jump: function jump() {
+      var params = util["a" /* default */].getParams({ url: this.url });
       this.$router.push({
         path: this.path,
-        query: _extends({}, this.query, this.params)
+        query: _extends({}, this.query, params)
       });
     }
   }
@@ -8394,11 +8374,11 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
 var router_page_component = Object(componentNormalizer["a" /* default */])(
   simplicity_router_pagevue_type_script_lang_js_,
-  router_pagevue_type_template_id_ec0c2718_scoped_true_render,
-  router_pagevue_type_template_id_ec0c2718_scoped_true_staticRenderFns,
+  router_pagevue_type_template_id_fa212f84_scoped_true_render,
+  router_pagevue_type_template_id_fa212f84_scoped_true_staticRenderFns,
   false,
   null,
-  "ec0c2718",
+  "fa212f84",
   null
   
 )
@@ -8831,12 +8811,6 @@ var simplicityvue_type_script_lang_js_extends = Object.assign || function (targe
 //
 //
 //
-//
-//
-//
-//
-//
-//
 
 
 
@@ -8930,6 +8904,7 @@ var events = [function (tabs, index, that) {
       type: Boolean,
       default: true
     },
+    sysCode: String,
     appCode: String,
     //logo
     logo: String,
@@ -9379,6 +9354,44 @@ var events = [function (tabs, index, that) {
       });
     },
 
+    /**
+     * @desc 获取菜单层级id
+     * @param {Array} [menus]    - 系统菜单数据对象
+     * @param {String} [url] - 菜单id或url地址
+     */
+    getId: function getId(menus, code) {
+      if (!code) {
+        return false;
+      }
+      for (var i = 0; i < menus.length; i++) {
+        var item = menus[i];
+        if (item.appCode === code) {
+          return item.id;
+        } else if (Object.prototype.hasOwnProperty.call(item, 'children') && item.children.length) {
+          var id = this.getId(item.children, code);
+          if (id) {
+            if (item.pid === 'root' || Array.isArray(id)) {
+              return [item.id].concat(id);
+            } else if (typeof id === 'string') {
+              return [item.id, id];
+            }
+            return id;
+          }
+        } else if (Object.prototype.hasOwnProperty.call(item, 'fourthTabs') && item.fourthTabs.length) {
+          var _id = this.getId(item.fourthTabs, code);
+          if (_id) {
+            if (item.pid === 'root' || Array.isArray(_id)) {
+              return [item.id].concat(_id);
+            } else if (typeof _id === 'string') {
+              return [item.id, _id];
+            }
+            return _id;
+          }
+        }
+      }
+      return false;
+    },
+
     /**
      * @desc:获取菜单列表
      * @author huangbo
@@ -9395,8 +9408,9 @@ var events = [function (tabs, index, that) {
             _this2.setTips(_this2.menus);
             store["a" /* default */].set('nav', _this2.menus);
             if (_this2.appCode) {
+              var code = _this2.sysCode || _this2.appCode;
               var app = _this2.userApps.filter(function (item) {
-                return item.code === _this2.appCode;
+                return item.code === code;
               })[0];
               if (app) {
                 _this2.active = app.id;
@@ -9411,11 +9425,14 @@ var events = [function (tabs, index, that) {
                   }
                 }
               }
-              var subMenus = _this2.getMenu(_this2.menus, _this2.appCode, 'appCode');
-              if (subMenus) {
-                if (_this2.tabs.length == 0) {
-                  var _obj = _this2.getFirst(subMenus);
+              if (_this2.sysCode) {
+                var subMenus = _this2.getMenu(_this2.menus, _this2.sysCode, 'appCode');
+                if (subMenus) {
+                  var _obj = _this2.getMenu(_this2.menus, _this2.appCode, 'appCode');
                   if (_obj) {
+                    if (!_obj.url) {
+                      _obj = _this2.getFirst(_obj);
+                    }
                     _this2.subActive = _obj.id;
                     var _tab = _this2.setIframeType(_obj);
                     _this2.tabs = [_tab];
@@ -9423,23 +9440,43 @@ var events = [function (tabs, index, that) {
                   } else {
                     _this2.subActive = '';
                   }
+                  _this2.subMenus = subMenus;
+                  _this2.showMenu = true;
+                } else {
+                  _this2.subMenus = null;
+                  _this2.showMenu = false;
                 }
-                _this2.subMenus = subMenus;
-                _this2.showMenu = true;
               } else {
-                _this2.subMenus = null;
-                _this2.showMenu = false;
+                var _subMenus = _this2.getMenu(_this2.menus, _this2.appCode, 'appCode');
+                if (_subMenus) {
+                  if (_this2.tabs.length == 0) {
+                    var _obj2 = _this2.getFirst(_subMenus);
+                    if (_obj2) {
+                      _this2.subActive = _obj2.id;
+                      var _tab2 = _this2.setIframeType(_obj2);
+                      _this2.tabs = [_tab2];
+                      _this2.activeName = _tab2.id;
+                    } else {
+                      _this2.subActive = '';
+                    }
+                  }
+                  _this2.subMenus = _subMenus;
+                  _this2.showMenu = true;
+                } else {
+                  _this2.subMenus = null;
+                  _this2.showMenu = false;
+                }
               }
             } else {
               if (_this2.indexUrl) {
-                var _obj2 = _this2.getMenu(_this2.menus, _this2.indexUrl);
-                if (_obj2) {
+                var _obj3 = _this2.getMenu(_this2.menus, _this2.indexUrl);
+                if (_obj3) {
                   if (!_this2.appCode) {
-                    var _tab2 = _this2.setIframeType(_obj2);
-                    _this2.tabs = [_tab2];
-                    _this2.activeName = _tab2.id;
+                    var _tab3 = _this2.setIframeType(_obj3);
+                    _this2.tabs = [_tab3];
+                    _this2.activeName = _tab3.id;
                   }
-                  _this2.homePage = _obj2;
+                  _this2.homePage = _obj3;
                 } else {
                   _this2.homePage = _this2.setIframeType({
                     url: _this2.indexUrl,
@@ -9453,11 +9490,11 @@ var events = [function (tabs, index, that) {
                   }
                 }
               } else if (_this2.initApps && _this2.initApps.length && !_this2.appCode) {
-                var _obj3 = _this2.getMenu(_this2.menus, _this2.initApps[_this2.initApps.length - 1]);
-                if (_obj3) {
-                  var _tab3 = _this2.setIframeType(_obj3);
-                  _this2.tabs.push(_tab3);
-                  _this2.activeName = _tab3.id;
+                var _obj4 = _this2.getMenu(_this2.menus, _this2.initApps[_this2.initApps.length - 1]);
+                if (_obj4) {
+                  var _tab4 = _this2.setIframeType(_obj4);
+                  _this2.tabs.push(_tab4);
+                  _this2.activeName = _tab4.id;
                 }
               }
             }
@@ -9548,9 +9585,9 @@ var events = [function (tabs, index, that) {
               return obj;
             }
           } else if (Object.prototype.hasOwnProperty.call(item, 'fourthTabs') && item.fourthTabs.length) {
-            var _obj4 = this.getMenu(item.fourthTabs, res, key);
-            if (_obj4) {
-              return _obj4;
+            var _obj5 = this.getMenu(item.fourthTabs, res, key);
+            if (_obj5) {
+              return _obj5;
             }
           }
         }
@@ -9762,9 +9799,9 @@ var events = [function (tabs, index, that) {
                   }
                 }
               } else {
-                var _tab4 = this.setIframeType(res);
-                this.tabs.push(_tab4);
-                this.activeName = _tab4.id;
+                var _tab5 = this.setIframeType(res);
+                this.tabs.push(_tab5);
+                this.activeName = _tab5.id;
               }
             } else {
               if (res.method == 'iframe') {
@@ -9789,8 +9826,8 @@ var events = [function (tabs, index, that) {
               var _i = util["a" /* default */].indexOfObj(this.tabs, subMenus, 'id');
               this.activeName = subMenus.id;
               if (_i == -1) {
-                var _tab5 = this.setIframeType(subMenus);
-                this.tabs.push(_tab5);
+                var _tab6 = this.setIframeType(subMenus);
+                this.tabs.push(_tab6);
               } else {
                 if (subMenus.method == 'iframe') {
                   subMenus.url = util["a" /* default */].handlerUrl(subMenus.url);
@@ -9848,23 +9885,24 @@ var events = [function (tabs, index, that) {
       this.showMsg = false;
       this.showSet = false;
       var i = util["a" /* default */].indexOfObj(this.tabs, res, 'id');
-      this.activeName = res.id;
       if (i == -1) {
         var tab = this.setIframeType(res);
         this.tabs.push(tab);
+        this.activeName = res.id;
       } else {
-        if (res.method == 'iframe') {
-          res.url = util["a" /* default */].handlerUrl(res.url);
+        var _tab7 = this.tabs[i];
+        if (_tab7.method === 'iframe') {
+          this.activeName = res.id;
+          this.$set(this.tabs[i], 'url', util["a" /* default */].handlerUrl(_tab7.url));
         } else {
-          var _tab6 = this.tabs[i];
-          if (_tab6.method === 'iframe') {
-            this.$set(this.tabs[i], 'url', util["a" /* default */].handlerUrl(_tab6.url));
-          } else {
-            this.$set(this.tabs[i], 'refresh', false);
-            this.$nextTick(function () {
-              _this5.$set(_this5.tabs[i], 'refresh', true);
-            });
+          this.$set(this.tabs[i], 'refresh', false);
+          if (_tab7.method === 'wujie') {
+            this.activeName = res.id;
           }
+          this.$nextTick(function () {
+            _this5.$set(_this5.tabs[i], 'refresh', true);
+            _this5.activeName = res.id;
+          });
         }
       }
     },
@@ -9922,9 +9960,9 @@ var events = [function (tabs, index, that) {
       if (tab.method === 'iframe') {
         tab.url = util["a" /* default */].handlerUrl(tab.url);
       } else {
-        var _tab7 = this.tabs[i];
-        if (_tab7.method === 'iframe') {
-          this.$set(this.tabs[i], 'url', util["a" /* default */].handlerUrl(_tab7.url));
+        var _tab8 = this.tabs[i];
+        if (_tab8.method === 'iframe') {
+          this.$set(this.tabs[i], 'url', util["a" /* default */].handlerUrl(_tab8.url));
         } else {
           this.$set(this.tabs[i], 'refresh', false);
           this.$nextTick(function () {
@@ -10204,9 +10242,9 @@ var events = [function (tabs, index, that) {
           var tab = this.setIframeType(obj);
           this.tabs.splice(n + 1, 0, tab);
         } else {
-          var _tab8 = this.tabs[i];
-          if (_tab8.method === 'iframe') {
-            this.$set(this.tabs[i], 'url', util["a" /* default */].handlerUrl(_tab8.url));
+          var _tab9 = this.tabs[i];
+          if (_tab9.method === 'iframe') {
+            this.$set(this.tabs[i], 'url', util["a" /* default */].handlerUrl(_tab9.url));
           } else {
             this.$set(this.tabs[i], 'refresh', false);
             this.$nextTick(function () {
@@ -10252,11 +10290,11 @@ var events = [function (tabs, index, that) {
 
 var simplicity_component = Object(componentNormalizer["a" /* default */])(
   src_simplicityvue_type_script_lang_js_,
-  simplicityvue_type_template_id_cd15edd8_scoped_true_render,
-  simplicityvue_type_template_id_cd15edd8_scoped_true_staticRenderFns,
+  simplicityvue_type_template_id_7188d482_scoped_true_render,
+  simplicityvue_type_template_id_7188d482_scoped_true_staticRenderFns,
   false,
   null,
-  "cd15edd8",
+  "7188d482",
   null
   
 )
@@ -14398,6 +14436,7 @@ var bus = external_wujie_vue2_default.a.bus;
   watch: {},
   data: function data() {
     return {
+      sysCode: '',
       appCode: '',
       params: {},
       dialogs: [],
@@ -14406,6 +14445,7 @@ var bus = external_wujie_vue2_default.a.bus;
   },
   created: function created() {
     this.params = util["a" /* default */].getParams() || {};
+    this.sysCode = this.params.sysCode;
     this.appCode = this.params.appCode;
     this.getConfig(this.params);
     // 主应用监听事件

package/lib/selector-panel.js

@@ -4484,8 +4484,8 @@ var component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var tree = (component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector-panel/src/selection.vue?vue&type=template&id=45aba2c9&
-var selectionvue_type_template_id_45aba2c9_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector-panel/src/selection.vue?vue&type=template&id=a9db4d6e&
+var selectionvue_type_template_id_a9db4d6e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4537,7 +4537,7 @@ var selectionvue_type_template_id_45aba2c9_render = function () {
                           label:
                             _vm.isObject || typeof item == "string"
                               ? item
-                              : item[_vm.valKey],
+                              : item[_vm.valueKey],
                           disabled:
                             typeof item == "string" ? false : item.disabled,
                           "value-key": _vm.valueKey,
@@ -4600,7 +4600,7 @@ var selectionvue_type_template_id_45aba2c9_render = function () {
                           label:
                             _vm.isObject || typeof item == "string"
                               ? item
-                              : item[_vm.valKey],
+                              : item[_vm.valueKey],
                           disabled:
                             typeof item == "string" ? false : item.disabled,
                           "value-key": _vm.valueKey,
@@ -4642,11 +4642,11 @@ var selectionvue_type_template_id_45aba2c9_render = function () {
     1
   )
 }
-var selectionvue_type_template_id_45aba2c9_staticRenderFns = []
-selectionvue_type_template_id_45aba2c9_render._withStripped = true
+var selectionvue_type_template_id_a9db4d6e_staticRenderFns = []
+selectionvue_type_template_id_a9db4d6e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector-panel/src/selection.vue?vue&type=template&id=45aba2c9&
+// CONCATENATED MODULE: ./packages/selector-panel/src/selection.vue?vue&type=template&id=a9db4d6e&
 
 // EXTERNAL MODULE: external "sortablejs"
 var external_sortablejs_ = __webpack_require__(24);
@@ -4822,8 +4822,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
 var selection_component = Object(componentNormalizer["a" /* default */])(
   src_selectionvue_type_script_lang_js_,
-  selectionvue_type_template_id_45aba2c9_render,
-  selectionvue_type_template_id_45aba2c9_staticRenderFns,
+  selectionvue_type_template_id_a9db4d6e_render,
+  selectionvue_type_template_id_a9db4d6e_staticRenderFns,
   false,
   null,
   null,

package/lib/selector.js

@@ -3743,7 +3743,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/selector/src/main.vue?vue&type=template&id=4fe58ff0&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/main.vue?vue&type=template&id=b8fc187a&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4237,6 +4237,7 @@ var render = function () {
                     title: _vm.title,
                     visible: _vm.visible,
                     width: _vm.width,
+                    height: _vm.height,
                     css: false,
                     "append-to-body": true,
                     "close-on-click-modal": false,
@@ -4298,7 +4299,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=4fe58ff0&
+// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=b8fc187a&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -4522,6 +4523,7 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
 //
 //
 //
+//