eoss-ui 0.7.30 → 0.7.32

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

@@ -277,8 +277,8 @@
             frameborder="0"
             width="100%"
             height="100%"
-            :id="activeName == item.id ? iframeId : ''"
-            :name="activeName == item.id ? iframeId : ''"
+            :id="activeName == item.id ? iframeId : item.id || item.appCode"
+            :name="activeName == item.id ? iframeId : item.id || item.appCode"
             :onload="handleLoadIframe(item)"
             :src="item.url"
           ></iframe>
@@ -379,6 +379,7 @@ import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
 const isIE = /MSIE|Trident/.test(navigator.userAgent);
 const systemMode = util.win.systemMode || 'default';
+import WujieVue from 'wujie-vue2';
 let events = [
   (tabs, index, that) => {
     let tab = tabs[index];
@@ -1804,7 +1805,7 @@ export default {
      **/
     handleRefresh(arg) {
       let i =
-        arg && arg != true
+        arg && arg != true && arg !== 'pageData'
           ? util.indexOfObj(this.tabs, arg, 'appCode,code,id,url')
           : util.indexOfObj(this.tabs, this.activeName, 'id');
       let tab = this.tabs[i];
@@ -1813,15 +1814,29 @@ export default {
       } else {
         let tab = this.tabs[i];
         if (tab.method === 'iframe') {
-          this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
+          if (arg && arg === 'pageData') {
+            const iframe = document.getElementById(tab.id || tab.appCode);
+            iframe.contentWindow.postMessage({ method: 'refresh' }, tab.url);
+          } else {
+            this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
+          }
         }
         if (tab.method === 'wujie' && tab.appCode) {
-          window.document
-            .querySelector(`iframe[name=${tab.appCode}]`)
-            .contentWindow.location.reload(true);
+          if (arg && arg === 'pageData') {
+            WujieVue.$emit('refresh', tab);
+          } else {
+            window.document
+              .querySelector(`iframe[name=${tab.appCode}]`)
+              .contentWindow.location.reload(true);
+          }
         }
         if (tab.method === 'router') {
-          this.$set(this.tabs[i], 'keys', util.uuid());
+          if (arg && arg === 'pageData') {
+            const bus = this.bus || this.$root.Bus;
+            bus.$emit('refresh', tab);
+          } else {
+            this.$set(this.tabs[i], 'keys', util.uuid());
+          }
         }
       }
     },

package/src/index.js

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

package/src/utils/util.js

@@ -557,21 +557,32 @@ const browser = function () {
  * @author huangbo
  * @date 2022年5月7日
  **/
-const busEmit = function (that, { method, args }) {
+const busEmit = function (that, { method, args, opener }) {
+  if (opener) {
+    const { source, origin } = opener;
+    source.postMessage({ method, query: args, args }, origin);
+    return;
+  }
   if (isIE) {
-    const bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
-    if (bus) {
-      Array.isArray(args) ? bus.$emit(method, ...args) : bus.$emit(method, args);
-    } else {
-      win.parent.postMessage({ method, query: args, args }, '*');
+    if (win.top !== win.self) {
+      win.top.postMessage({ method, query: args, args }, '*');
+      return;
     }
+    const bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
+    bus && (Array.isArray(args) ? bus.$emit(method, ...args) : bus.$emit(method, args));
   } else {
-    const bus = win.$wujie ? win.$wujie.bus : that ? that.bus || that.$root.Bus || that.$root.$bus : null;
-    if (bus) {
-      Array.isArray(args) ? bus.$emit(method, ...args) : bus.$emit(method, args);
-    } else {
-      win.parent.postMessage({ method, query: args, args }, '*');
+    if (win.top !== win.self) {
+      const bus = win.$wujie ? win.$wujie.bus : null;
+      if (bus) {
+        Array.isArray(args) ? bus.$emit(method, ...args) : bus.$emit(method, args);
+
+      } else {
+        win.top.postMessage({ method, query: args, args }, '*');
+      }
+      return;
     }
+    const bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
+    bus && (Array.isArray(args) ? bus.$emit(method, ...args) : bus.$emit(method, args));
   }
 };