eoss-ui 0.6.47 → 0.6.49

package/packages/main/src/main.vue

@@ -151,7 +151,8 @@ export default {
         WujieVue.bus.$emit(method, args);
       });
 
-      window.addEventListener('message', (method, args) => {
+      window.addEventListener('message', (e) => {
+        const { method, args } = e.data;
         switch (method) {
           case 'reLogin':
             this.handleReLogin(args);
@@ -163,8 +164,20 @@ export default {
             this.$refs.main.jumpMenu(args);
             break;
           case 'emit':
-            let origin = args.origin || '*';
-            window.postMessage(args, origin);
+            const { origin, ...data } = args;
+            let iframes = document.getElementsByTagName('iframe');
+            iframes = iframes.filter((item) => {
+              return origin
+                ? item.src.indexOf(origin) > -1
+                : item.src.indexOf(e.origin) == -1;
+            });
+            for (let i = 0; i < iframes.length; i++) {
+              iframes[i] &&
+                iframes[i].contentWindow.postMessage(
+                  data,
+                  origin ? origin : '*'
+                );
+            }
             break;
           case 'openDialog':
             this.dialogs.push(args);
@@ -296,9 +309,7 @@ export default {
                     util.win.top.location.href = '/login.html';
                   }
                 }
-              } catch (error) {
-                util.win.postMessage({ type: 1 }, '*');
-              }
+              } catch (error) {}
             })
             .catch((e) => {
               sessionStorage.removeItem('remind');
@@ -390,13 +401,24 @@ export default {
       this.visibles.splice(index, 1);
     },
     /**
-     * @desc:主应用相子应用发送事件
+     * @desc:主应用向子应用发送事件
      * @author huangbo
      * @date 2024年9月7日
      **/
     busEmit(event, args) {
       WujieVue.bus.$emit(event, args);
-      window.postMessage({ method: event, query: args }, '*');
+      const iframes = document.getElementsByTagName('iframe');
+      for (let i = 0; i < iframes.length; i++) {
+        let src = iframes[i] ? iframes[i].src : null;
+        let origin = util.win.location.origin;
+        if (src && util.startWith(src, 'http') && src.indexOf(origin) === -1) {
+          iframes[i] &&
+            iframes[i].contentWindow.postMessage(
+              { method: event, query: args },
+              '*'
+            );
+        }
+      }
       const bus = this.bus || this.$root.Bus;
       bus && bus.$emit(event, args);
       this.$emit('busEvent', event, args);

package/packages/main/src/public/online.vue

@@ -1,89 +1,89 @@
-<template>
-  <es-data-table
-    numbers
-    :url="sysuseronline"
-    :thead="thead"
-    page
-  ></es-data-table>
-</template>
-
-<script>
-import { userOnline } from 'eoss-ui/src/config/api.js';
-export default {
-  name: 'Online',
-  components: {},
-  props: {
-    sysuseronline: {
-      type: String,
-      default: userOnline
-    }
-  },
-  data() {
-    return {
-      thead: [
-        {
-          title: '单位',
-          field: 'orgName',
-          minWidth: 120
-        },
-        {
-          title: '部门',
-          field: 'depName',
-          align: 'center',
-          minWidth: 120
-        },
-        {
-          title: '姓名',
-          field: 'userName',
-          align: 'center',
-          width: 120
-        },
-        {
-          title: '职务',
-          field: 'position',
-          align: 'center',
-          width: 120
-        },
-        {
-          title: '账号',
-          field: 'loginName',
-          align: 'center',
-          width: 120
-        },
-        {
-          title: '登录时间',
-          field: 'loginDate',
-          align: 'center',
-          width: 156
-        },
-        {
-          title: '登录次数',
-          field: 'freQuency',
-          align: 'center',
-          width: 100
-        },
-        {
-          title: '登录方式',
-          field: 'loginModel',
-          align: 'center',
-          width: 100,
-          render: (h, params) => {
-            let {
-              row: { loginModel }
-            } = params;
-            let types = ['普通登录', 'CA登录', '手机登录'];
-            return h('span', {}, [types[loginModel] || types[0]]);
-          }
-        }
-      ]
-    };
-  },
-  computed: {},
-  watch: {},
-  created() {},
-  mounted() {},
-  methods: {}
-};
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <es-data-table
+    numbers
+    :url="sysuseronline"
+    :thead="thead"
+    page
+  ></es-data-table>
+</template>
+
+<script>
+import { userOnline } from 'eoss-ui/src/config/api.js';
+export default {
+  name: 'Online',
+  components: {},
+  props: {
+    sysuseronline: {
+      type: String,
+      default: userOnline
+    }
+  },
+  data() {
+    return {
+      thead: [
+        {
+          title: '单位',
+          field: 'orgName',
+          minWidth: 120
+        },
+        {
+          title: '部门',
+          field: 'depName',
+          align: 'center',
+          minWidth: 120
+        },
+        {
+          title: '姓名',
+          field: 'userName',
+          align: 'center',
+          width: 120
+        },
+        {
+          title: '职务',
+          field: 'position',
+          align: 'center',
+          width: 120
+        },
+        {
+          title: '账号',
+          field: 'loginName',
+          align: 'center',
+          width: 120
+        },
+        {
+          title: '登录时间',
+          field: 'loginDate',
+          align: 'center',
+          width: 156
+        },
+        {
+          title: '登录次数',
+          field: 'freQuency',
+          align: 'center',
+          width: 100
+        },
+        {
+          title: '登录方式',
+          field: 'loginModel',
+          align: 'center',
+          width: 100,
+          render: (h, params) => {
+            let {
+              row: { loginModel }
+            } = params;
+            let types = ['普通登录', 'CA登录', '手机登录'];
+            return h('span', {}, [types[loginModel] || types[0]]);
+          }
+        }
+      ]
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  methods: {}
+};
+</script>
+
+<style lang="scss" scoped></style>