eoss-ui 0.6.76 → 0.6.78

package/packages/main/src/main.vue

@@ -52,7 +52,6 @@ import Simplicity from './simplicity/index.vue';
 import MainDefault from './default/index.vue';
 import util from 'eoss-ui/src/utils/util';
 import WujieVue from 'wujie-vue2';
-import { isArray } from 'lodash';
 export default {
   name: 'EsMain',
   inheritAttrs: false,
@@ -121,84 +120,120 @@ export default {
     }
   },
   mounted() {
-    this.getConfig(this.params);
+    console.log('params', this.$refs, this.$refs.main);
+
+    const token = util.getStorage('token') || util.getStorage('Authorization');
+    this.isLogin = token ? true : this.isLogin;
+    if (
+      !token &&
+      Object.prototype.hasOwnProperty.call(this.params, 'serverId') &&
+      Object.prototype.hasOwnProperty.call(this.params, 'authType')
+    ) {
+      return false;
+    }
     if (this.isLogin) {
       if (util.win.$wujie) {
         util.win.$wujie.bus.$on('changeTheme', (res) => {
           util.updateTheme(res);
         });
       }
-
-      const bus = this.bus || this.$root.Bus;
-      if (bus) {
-        bus.$on('reLogin', this.handleReLogin);
-        bus.$on('refresh', this.$refs.main.handleRefresh);
-        bus.$on('jumpMenu', this.$refs.main.jumpMenu);
-        bus.$on('emit', (method, args) => {
+      this.$nextTick(() => {
+        this.getConfig();
+        const bus = this.bus || this.$root.Bus;
+        if (bus) {
+          bus.$on('reLogin', this.handleReLogin);
+          bus.$on('refresh', this.$refs.main.handleRefresh);
+          bus.$on('jumpMenu', this.$refs.main.jumpMenu);
+          bus.$on('emit', (method, args) => {
+            // 主应用发送事件
+            bus.$emit(method, args);
+          });
+        }
+        util.win.reLogin = this.handleReLogin;
+        util.win.windowOpen = this.openPage;
+        util.win.refresh = this.$refs.main.handleRefresh;
+        util.win.jumpMenu = this.$refs.main.jumpMenu;
+        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', (method, args) => {
           // 主应用发送事件
-          bus.$emit(method, args);
+          WujieVue.bus.$emit(method, args);
         });
-      }
-      util.win.reLogin = this.handleReLogin;
-      util.win.windowOpen = this.openPage;
-      util.win.refresh = this.$refs.main.handleRefresh;
-      util.win.jumpMenu = this.$refs.main.jumpMenu;
-      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', (method, args) => {
-        // 主应用发送事件
-        WujieVue.bus.$emit(method, args);
-      });
 
-      window.addEventListener('message', (e) => {
-        const { method, args } = e.data;
-        switch (method) {
-          case 'reLogin':
-            this.handleReLogin(args);
-            break;
-          case 'refresh':
-            this.$refs.main.handleRefresh(args);
-            break;
-          case 'jumpMenu':
-            Array.isArray(args)
-              ? this.$refs.main.jumpMenu(...args)
-              : this.$refs.main.jumpMenu(args);
-            break;
-          case 'emit':
-            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);
-            let index = this.visibles.length;
-            this.visibles.push(false);
-            this.$nextTick(() => {
-              this.$set(this.visibles, index, true);
-            });
-            break;
-          case 'closeDialog':
-            for (let i = 0; i < this.dialogs.length; i++) {
-              let item = this.dialogs[i];
-              if (item.url == args.url) {
-                this.$set(this.visibles, i, false);
+        window.addEventListener('message', (e) => {
+          const { method, args } = e.data;
+          switch (method) {
+            case 'reLogin':
+              this.handleReLogin(args);
+              break;
+            case 'refresh':
+              this.$refs.main.handleRefresh(args);
+              break;
+            case 'jumpMenu':
+              Array.isArray(args)
+                ? this.$refs.main.jumpMenu(...args)
+                : this.$refs.main.jumpMenu(args);
+              break;
+            case 'emit':
+              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;
-        }
+              break;
+            case 'openDialog':
+              this.dialogs.push(args);
+              let index = this.visibles.length;
+              this.visibles.push(false);
+              this.$nextTick(() => {
+                this.$set(this.visibles, index, true);
+              });
+              break;
+            case 'closeDialog':
+              for (let i = 0; i < this.dialogs.length; i++) {
+                let item = this.dialogs[i];
+                if (item.url == args.url) {
+                  this.$set(this.visibles, i, false);
+                }
+              }
+              break;
+          }
+        });
       });
+    } else {
+      const loginPage =
+        util.getStorage('login') || util.getStorage('loginPage');
+      if (loginPage) {
+        window.location.replace(loginPage);
+      } else if (document.referrer) {
+        const referrerUrl = new URL(document.referrer);
+        if (referrerUrl.host !== window.location.host) {
+          window.location.replace(document.referrer);
+        } else if (
+          window.location.href.indexOf('main.html') > -1 ||
+          window.location.href.indexOf('index.html') > -1 ||
+          document.referrer.indexOf('main.html') > -1 ||
+          document.referrer.indexOf('index.html') > -1
+        ) {
+          window.location.href = './login.html';
+        } else {
+          next('/login');
+        }
+      } else if (window.location.href.indexOf('main.html') > -1) {
+        window.location.href = './login.html';
+      } else {
+        next('/login');
+      }
     }
   },
   methods: {
@@ -324,25 +359,13 @@ export default {
      * @author huangbo
      * @date 2024年9月7日
      **/
-    getConfig(query) {
-      const token =
-        util.getStorage('token') || util.getStorage('Authorization');
-      this.isLogin = token ? true : this.isLogin;
-      if (
-        !token &&
-        Object.prototype.hasOwnProperty.call(query, 'serverId') &&
-        Object.prototype.hasOwnProperty.call(query, 'authType')
-      ) {
-        return false;
-      }
+    getConfig() {
       let mainConfig = util.getStorage('mainConfig');
       if (mainConfig) {
         mainConfig = JSON.parse(mainConfig);
-        this.$nextTick(() => {
-          this.$refs.main.init(mainConfig, true);
-          util.getMainConfig((res) => {
-            this.$refs.main.init(res, false);
-          });
+        this.$refs.main.init(mainConfig, true);
+        util.getMainConfig((res) => {
+          this.$refs.main.init(res, false);
         });
       } else {
         util.getMainConfig((res) => {

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>