kz-ui-base 1.0.28 → 1.0.29

package/common/src/views/login.vue

@@ -125,6 +125,7 @@ import Cookies from "~../../js-cookie";
 import { encrypt, decrypt } from "../utils/jsencrypt";
 import { getWebConfig } from "../utils/utils";
 import { getAllRouters } from "@api/menu";
+import { removeToken } from "@utils/auth";
 export default {
   name: "Login",
   data() {
@@ -171,30 +172,34 @@ export default {
     },
   },
   created() {
-    localStorage.clear();
-    let enterpriseName = Cookies.get("enterpriseName");
-    var webConfig = getWebConfig();
-    if (webConfig) {
-      localStorage.setItem("configRes", JSON.stringify(webConfig));
-      if (!enterpriseName) {
-        if (webConfig.tenantName) {
-          this.loginForm.enterpriseName = webConfig.tenantName;
-        } else {
-          // this.loginForm.enterpriseName = "mom";
+    this.$store.dispatch("LogOut").then(() => {
+      this.$store.dispatch("tagsView/delAllViews");
+        localStorage.clear();
+        removeToken();
+        let enterpriseName = Cookies.get("enterpriseName");
+        var webConfig = getWebConfig();
+        if (webConfig) {
+          localStorage.setItem("configRes", JSON.stringify(webConfig));
+          if (!enterpriseName) {
+            if (webConfig.tenantName) {
+              this.loginForm.enterpriseName = webConfig.tenantName;
+            } else {
+              // this.loginForm.enterpriseName = "mom";
+            }
+          }
+          if (this.$route.query.tenantName) {
+            this.loginForm.enterpriseName = this.$route.query.tenantName;
+          }
+          if (webConfig.bgImages) {
+            this.imgs = webConfig.bgImages;
+          }
+          if (webConfig.tenantSystemName) {
+            this.loginForm.title = webConfig.tenantSystemName;
+          }
         }
-      }
-      if (this.$route.query.tenantName) {
-        this.loginForm.enterpriseName = this.$route.query.tenantName;
-      }
-      if (webConfig.bgImages) {
-        this.imgs = webConfig.bgImages;
-      }
-      if (webConfig.tenantSystemName) {
-        this.loginForm.title = webConfig.tenantSystemName;
-      }
-    }
-    this.getCode();
-    this.getCookie();
+        this.getCode();
+        this.getCookie();
+    });
   },
   methods: {
     getCode() {

package/common/src/views/tenantLogin.vue

@@ -124,6 +124,7 @@ import { getAllRouters } from "@api/menu";
 import { getCodeImg } from "../api/login";
 import Cookies from "~../../js-cookie";
 import { encrypt, decrypt } from "../utils/jsencrypt";
+import { removeToken } from "@utils/auth";
 export default {
   name: "Login",
   data() {
@@ -170,24 +171,27 @@ export default {
     },
   },
   created() {
-    localStorage.clear();
-    this.axios.get("/config.json").then((res) => {
-      localStorage.setItem("configRes", JSON.stringify(res.data));
-      // if (res.data.tenantName) {
-      //   this.loginForm.enterpriseName = res.data.tenantName;
-      // } else {
-      //   this.loginForm.enterpriseName = "administrator";
-      // }
-      if (res.data.bgImages) {
-        this.imgs = res.data.bgImages;
-      }
-      if (res.data.tenantSystemName) {
-        this.loginForm.title = res.data.tenantSystemName;
-      }
+    this.$store.dispatch("LogOut").then(() => {
+      this.$store.dispatch("tagsView/delAllViews");
+        localStorage.clear();
+        removeToken();
+        this.axios.get("/config.json").then((res) => {
+          // if (res.data.tenantName) {
+          //   this.loginForm.enterpriseName = res.data.tenantName;
+          // } else {
+          //   this.loginForm.enterpriseName = "administrator";
+          // }
+          if (res.data.bgImages) {
+            this.imgs = res.data.bgImages;
+          }
+          if (res.data.tenantSystemName) {
+            this.loginForm.title = res.data.tenantSystemName;
+          }
+        });
+        this.getCode();
+        this.getCookie();
+   
     });
-
-    this.getCode();
-    this.getCookie();
   },
   methods: {
     getCode() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kz-ui-base",
-  "version": "1.0.28",
+  "version": "1.0.29",
   "description": "",
   "main": "index.js",
   "scripts": {