eoss-ui 0.6.20 → 0.6.22

package/packages/main/src/main.vue

@@ -112,71 +112,79 @@ export default {
     this.params = util.getParams() || {};
     this.sysCode = this.params.sysCode;
     this.appCode = this.params.appCode;
+    if (
+      this.params.cookie &&
+      (this.params.cookie == true || this.params.cookie == 1)
+    ) {
+      this.isLogin = true;
+    }
     this.getConfig(this.params);
     // 主应用监听事件
   },
   mounted() {
-    if (util.win.$wujie) {
-      util.win.$wujie.bus.$on('changeTheme', (res) => {
-        util.updateTheme(res);
-      });
-    }
+    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', function (method, args) {
+      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', function (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', function (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', function (method, args) {
-      // 主应用发送事件
-      WujieVue.bus.$emit(method, args);
-    });
 
-    window.addEventListener('message', (method, args) => {
-      switch (method) {
-        case 'reLogin':
-          this.handleReLogin(args);
-          break;
-        case 'refresh':
-          this.$refs.main.handleRefresh(args);
-          break;
-        case 'jumpMenu':
-          this.$refs.main.jumpMenu(args);
-          break;
-        case 'emit':
-          let origin = args.origin || '*';
-          window.postMessage(args, 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', (method, args) => {
+        switch (method) {
+          case 'reLogin':
+            this.handleReLogin(args);
+            break;
+          case 'refresh':
+            this.$refs.main.handleRefresh(args);
+            break;
+          case 'jumpMenu':
+            this.$refs.main.jumpMenu(args);
+            break;
+          case 'emit':
+            let origin = args.origin || '*';
+            window.postMessage(args, 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);
+              }
             }
-          }
-          break;
-      }
-    });
+            break;
+        }
+      });
+    }
   },
   methods: {
     /**
@@ -306,7 +314,7 @@ export default {
     getConfig(query) {
       const token =
         util.getStorage('token') || util.getStorage('Authorization');
-      this.isLogin = token ? true : false;
+      this.isLogin = token ? true : this.isLogin;
       if (
         !token &&
         Object.prototype.hasOwnProperty.call(query, 'serverId') &&

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>