eoss-ui 0.6.33 → 0.6.34

package/lib/main.js

@@ -3991,7 +3991,7 @@ var nightImg = 'data:image/jpeg;base64,/9j/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBA
 // 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=43324a71&
+// 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=774e8f3b&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4089,13 +4089,13 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=43324a71&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=774e8f3b&
 
 // EXTERNAL MODULE: ./src/config/image.js
 var config_image = __webpack_require__(18);
 
-// 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=9473ec14&scoped=true&
-var simplicityvue_type_template_id_9473ec14_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=00d9126a&scoped=true&
+var simplicityvue_type_template_id_00d9126a_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4731,11 +4731,11 @@ var simplicityvue_type_template_id_9473ec14_scoped_true_render = function () {
     ),
   ])
 }
-var simplicityvue_type_template_id_9473ec14_scoped_true_staticRenderFns = []
-simplicityvue_type_template_id_9473ec14_scoped_true_render._withStripped = true
+var simplicityvue_type_template_id_00d9126a_scoped_true_staticRenderFns = []
+simplicityvue_type_template_id_00d9126a_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=9473ec14&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=00d9126a&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=e722b45c&scoped=true&
 var avatarvue_type_template_id_e722b45c_scoped_true_render = function () {
@@ -10001,6 +10001,8 @@ var search_component = Object(componentNormalizer["a" /* default */])(
 var store = __webpack_require__(13);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=script&lang=js&
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
 var simplicityvue_type_script_lang_js_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; };
 
 //
@@ -11132,7 +11134,7 @@ var events = [function (tabs, index, that) {
             if (item[key] === res) {
               return item;
             }
-          } else if (item.url === res || item.id === res) {
+          } else if (item.url === res || item.id === res || item.appCode && item.appCode === res) {
             return item;
           }
           if (Object.prototype.hasOwnProperty.call(item, 'children') && item.children.length) {
@@ -11831,8 +11833,12 @@ var events = [function (tabs, index, that) {
     },
     jumpMenu: function jumpMenu(res, close) {
       var apps = res;
+      var param = null;
       if (typeof res === 'string') {
         apps = res.split(',');
+      } else if ((typeof res === 'undefined' ? 'undefined' : _typeof(res)) === 'object') {
+        apps = res.appCode.split(',');
+        param = res.param;
       }
       var obj = this.getMenu(this.menus, apps[apps.length - 1]);
       if (obj) {
@@ -11842,16 +11848,22 @@ var events = [function (tabs, index, that) {
         this.activeName = obj.id;
         if (i == -1) {
           var tab = this.setIframeType(obj);
+          this.$set(tab, 'url', util["a" /* default */].handlerUrl(tab.url, param));
           this.tabs.splice(n + 1, 0, tab);
         } else {
           var _tab7 = this.tabs[i];
           if (_tab7.method === 'iframe') {
-            this.$set(this.tabs[i], 'url', util["a" /* default */].handlerUrl(_tab7.url));
+            this.$set(this.tabs[i], 'url', util["a" /* default */].handlerUrl(_tab7.url, param));
           }
           if (_tab7.method === 'wujie' && _tab7.appCode) {
-            window.document.querySelector('iframe[name=' + _tab7.appCode + ']').contentWindow.location.reload(true);
+            if (param) {
+              window.document.querySelector('iframe[name=' + _tab7.appCode + ']').contentWindow.location.href = util["a" /* default */].handlerUrl(_tab7.url, param);
+            } else {
+              window.document.querySelector('iframe[name=' + _tab7.appCode + ']').contentWindow.location.reload(true);
+            }
           }
           if (_tab7.method === 'router') {
+            this.$set(this.tabs[i], 'url', util["a" /* default */].handlerUrl(_tab7.url, param));
             this.$set(this.tabs[i], 'keys', util["a" /* default */].uuid());
           }
         }
@@ -11912,18 +11924,18 @@ var events = [function (tabs, index, that) {
 
 var simplicity_component = Object(componentNormalizer["a" /* default */])(
   src_simplicityvue_type_script_lang_js_,
-  simplicityvue_type_template_id_9473ec14_scoped_true_render,
-  simplicityvue_type_template_id_9473ec14_scoped_true_staticRenderFns,
+  simplicityvue_type_template_id_00d9126a_scoped_true_render,
+  simplicityvue_type_template_id_00d9126a_scoped_true_staticRenderFns,
   false,
   null,
-  "9473ec14",
+  "00d9126a",
   null
   
 )
 
 /* harmony default export */ var simplicity = (simplicity_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/default/index.vue?vue&type=template&id=0e385525&
-var defaultvue_type_template_id_0e385525_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/default/index.vue?vue&type=template&id=3e631434&
+var defaultvue_type_template_id_3e631434_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -12320,11 +12332,11 @@ var defaultvue_type_template_id_0e385525_render = function () {
     1
   )
 }
-var defaultvue_type_template_id_0e385525_staticRenderFns = []
-defaultvue_type_template_id_0e385525_render._withStripped = true
+var defaultvue_type_template_id_3e631434_staticRenderFns = []
+defaultvue_type_template_id_3e631434_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=0e385525&
+// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=3e631434&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/userinfo.vue?vue&type=template&id=b6520920&
 var userinfovue_type_template_id_b6520920_render = function () {
@@ -14564,7 +14576,7 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
       }
       for (var i = 0; i < menus.length; i++) {
         var item = menus[i];
-        if (item.id === url) {
+        if (item.id === url || item.appCode && item.appCode === url) {
           if (item.url) {
             if (Object.prototype.hasOwnProperty.call(item, 'children') && item.children.length) {
               var id = this.getId(item.children, item.url);
@@ -15553,8 +15565,8 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
 
 var default_component = Object(componentNormalizer["a" /* default */])(
   src_defaultvue_type_script_lang_js_,
-  defaultvue_type_template_id_0e385525_render,
-  defaultvue_type_template_id_0e385525_staticRenderFns,
+  defaultvue_type_template_id_3e631434_render,
+  defaultvue_type_template_id_3e631434_staticRenderFns,
   false,
   null,
   null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.6.33",
+  "version": "0.6.34",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -70,7 +70,7 @@
     "stompjs": "^2.3.3",
     "throttle-debounce": "^5.0.2",
     "video.js": "^8.0.4",
-    "wujie-vue2": "^1.0.22"
+    "wujie-vue2": "^1.0.26"
   },
   "peerDependencies": {
     "vue": "^2.5.22"

package/packages/main/src/default/index.vue

@@ -1033,7 +1033,7 @@ export default {
       }
       for (let i = 0; i < menus.length; i++) {
         let item = menus[i];
-        if (item.id === url) {
+        if (item.id === url || (item.appCode && item.appCode === url)) {
           if (item.url) {
             if (
               Object.prototype.hasOwnProperty.call(item, 'children') &&

package/packages/main/src/main.vue

@@ -134,7 +134,7 @@ export default {
         bus.$on('reLogin', this.handleReLogin);
         bus.$on('refresh', this.$refs.main.handleRefresh);
         bus.$on('jumpMenu', this.$refs.main.jumpMenu);
-        bus.$on('emit', function (method, args) {
+        bus.$on('emit', (method, args) => {
           // 主应用发送事件
           bus.$emit(method, args);
         });
@@ -146,7 +146,7 @@ export default {
       WujieVue.bus.$on('reLogin', this.handleReLogin);
       WujieVue.bus.$on('refresh', this.$refs.main.handleRefresh);
       WujieVue.bus.$on('jumpMenu', this.$refs.main.jumpMenu);
-      WujieVue.bus.$on('emit', function (method, args) {
+      WujieVue.bus.$on('emit', (method, args) => {
         // 主应用发送事件
         WujieVue.bus.$emit(method, args);
       });

package/packages/main/src/simplicity/index.vue

@@ -1166,7 +1166,11 @@ export default {
             if (item[key] === res) {
               return item;
             }
-          } else if (item.url === res || item.id === res) {
+          } else if (
+            item.url === res ||
+            item.id === res ||
+            (item.appCode && item.appCode === res)
+          ) {
             return item;
           }
           if (
@@ -1889,8 +1893,12 @@ export default {
     },
     jumpMenu(res, close) {
       let apps = res;
+      let param = null;
       if (typeof res === 'string') {
         apps = res.split(',');
+      } else if (typeof res === 'object') {
+        apps = res.appCode.split(',');
+        param = res.param;
       }
       let obj = this.getMenu(this.menus, apps[apps.length - 1]);
       if (obj) {
@@ -1900,18 +1908,26 @@ export default {
         this.activeName = obj.id;
         if (i == -1) {
           let tab = this.setIframeType(obj);
+          this.$set(tab, 'url', util.handlerUrl(tab.url, param));
           this.tabs.splice(n + 1, 0, tab);
         } else {
           let tab = this.tabs[i];
           if (tab.method === 'iframe') {
-            this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
+            this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url, param));
           }
           if (tab.method === 'wujie' && tab.appCode) {
-            window.document
-              .querySelector(`iframe[name=${tab.appCode}]`)
-              .contentWindow.location.reload(true);
+            if (param) {
+              window.document.querySelector(
+                `iframe[name=${tab.appCode}]`
+              ).contentWindow.location.href = util.handlerUrl(tab.url, param);
+            } else {
+              window.document
+                .querySelector(`iframe[name=${tab.appCode}]`)
+                .contentWindow.location.reload(true);
+            }
           }
           if (tab.method === 'router') {
+            this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url, param));
             this.$set(this.tabs[i], 'keys', util.uuid());
           }
         }

package/src/index.js

@@ -121,7 +121,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.6.33',
+  version: '0.6.34',
   install,
   Button,
   ButtonGroup,