xs-common-plugins 1.2.0 → 1.2.3

package/src/views/layout/components/Navbar.vue

@@ -122,7 +122,7 @@ import ImCom from "@/components/im";
 import { getLocalStorage, setLocalStorage } from "@/utils/localStorage";
 import { setToken } from "@/utils/auth"; // get token from cookie
 import { initMenu } from '@/utils/getMenu'
-
+import Vue from 'vue'
 export default {
   components: {
     Breadcrumb,
@@ -156,6 +156,9 @@ export default {
   computed: {
     ...mapGetters(["sidebar", "avatar"]),
   },
+  beforeCreate () {
+    Vue.prototype.$bus = this
+  },
   created() {
     const userName = getToken("LoginUserName");
     if (userName === "admin") {
@@ -165,19 +168,23 @@ export default {
   },
   methods: {
     changeTenant (id) {
-       if(id === this.userProfile.TId) return
-        this.$router.push("/home")
-        this.$ask.ucmng.api.sysmng.Tenant.SwitchTenant({clientId: getConfig('CLIENT_ID'), newTId: id}).then(res => {
-          let newuser = this.userProfile
-          newuser.TId = id
-          setLocalStorage('userProfile', newuser)
-          this.userProfile = getLocalStorage('userProfile')
-          let user = res.data
-            setToken(user.accessToken);
-            localStorage.setItem("token", user.accessToken);
-            initMenu()
-            
+      if(id === this.userProfile.TId) return
+      this.$nextTick(() => {
+        this.$router.replace({
+          path: '/redirect' + '/home'
         })
+      })
+      this.$ask.ucmng.api.sysmng.Tenant.SwitchTenant({clientId: getConfig('CLIENT_ID'), newTId: id}).then(res => {
+        let newuser = this.userProfile
+        newuser.TId = id
+        setLocalStorage('userProfile', newuser)
+        this.userProfile = getLocalStorage('userProfile')
+        let user = res.data
+          setToken(user.accessToken);
+          localStorage.setItem("token", user.accessToken);
+          this.$bus.$emit('changeTenant', id) // 全局通知
+          initMenu()
+      })
     },
     getTenantList () {
       this.$ask.ucmng.api.sysmng.Tenant.GetTenants().then(res => {

package/src/views/layout/components/TagsView/index.vue

@@ -1,24 +1,38 @@
 <template>
   <div id="tags-view-container" class="tags-view-container">
-    <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
+    <scroll-pane
+      ref="scrollPane"
+      class="tags-view-wrapper"
+      @scroll="handleScroll"
+    >
       <router-link
         v-for="tag in visitedViews"
         ref="tag"
         :key="tag.path"
-        :class="isActive(tag)?'active':''"
+        :class="isActive(tag) ? 'active' : ''"
         :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
         tag="span"
         class="tags-view-item"
-        @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
-        @contextmenu.prevent.native="openMenu(tag,$event)"
+        @click.middle.native="!isAffix(tag) ? closeSelectedTag(tag) : ''"
+        @contextmenu.prevent.native="openMenu(tag, $event)"
       >
         {{ tag.title }}
-        <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
+        <span
+          v-if="!isAffix(tag)"
+          class="el-icon-close"
+          @click.prevent.stop="closeSelectedTag(tag)"
+        />
       </router-link>
     </scroll-pane>
-    <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
+    <ul
+      v-show="visible"
+      :style="{ left: left + 'px', top: top + 'px' }"
+      class="contextmenu"
+    >
       <li @click="refreshSelectedTag(selectedTag)">刷新</li>
-      <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">关闭</li>
+      <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">
+        关闭
+      </li>
       <li @click="closeOthersTags">关闭其他</li>
       <li @click="closeAllTags(selectedTag)">关闭全部</li>
     </ul>
@@ -26,9 +40,23 @@
 </template>
 
 <script>
-import ScrollPane from './ScrollPane'
-import path from 'path'
-import router from '../../../../router/index'
+import ScrollPane from "./ScrollPane";
+import path from "path";
+import router from "../../../../router/index";
+
+function _forEachRoute(arr, path) {
+  if (arr && arr.length > 0) {
+     arr.find((item) => {
+      if (item.url === path) {
+        item["meta"]["upload"] = true;
+        return item;
+      } else {
+        _forEachRoute(item.children, path);
+      }
+    });
+  }
+}
+
 export default {
   components: { ScrollPane },
   data() {
@@ -37,163 +65,174 @@ export default {
       top: 0,
       left: 0,
       selectedTag: {},
-      affixTags: []
-    }
+      affixTags: [],
+    };
   },
   computed: {
     visitedViews() {
-      return this.$store.state.tagsView.visitedViews
+      return this.$store.state.tagsView.visitedViews;
     },
     routes() {
-      return router.options.routes
-    }
+      return router.options.routes;
+    },
   },
   watch: {
     $route() {
-      this.addTags()
-      this.moveToCurrentTag()
+      this.addTags();
+      this.moveToCurrentTag();
     },
     visible(value) {
       if (value) {
-        document.body.addEventListener('click', this.closeMenu)
+        document.body.addEventListener("click", this.closeMenu);
       } else {
-        document.body.removeEventListener('click', this.closeMenu)
+        document.body.removeEventListener("click", this.closeMenu);
       }
-    }
+    },
   },
   mounted() {
-    this.initTags()
-    this.addTags()
+    this.initTags();
+    this.addTags();
   },
   methods: {
     isActive(route) {
-      return route.path === this.$route.path
+      return route.path === this.$route.path;
     },
     isAffix(tag) {
-      return tag.meta && tag.meta.affix
+      return tag.meta && tag.meta.affix;
     },
-    filterAffixTags(routes, basePath = '/') {
-      let tags = []
-      routes.forEach(route => {
+    filterAffixTags(routes, basePath = "/") {
+      let tags = [];
+      routes.forEach((route) => {
         if (route.meta && route.meta.affix) {
-          const tagPath = path.resolve(basePath, route.path)
+          const tagPath = path.resolve(basePath, route.path);
           tags.push({
             fullPath: tagPath,
             path: tagPath,
             name: route.name,
-            meta: { ...route.meta }
-          })
+            meta: { ...route.meta },
+          });
         }
         if (route.children) {
-          const tempTags = this.filterAffixTags(route.children, route.path)
+          const tempTags = this.filterAffixTags(route.children, route.path);
           if (tempTags.length >= 1) {
-            tags = [...tags, ...tempTags]
+            tags = [...tags, ...tempTags];
           }
         }
-      })
-      return tags
+      });
+      return tags;
     },
     initTags() {
-      const affixTags = this.affixTags = this.filterAffixTags(this.routes)
+      const affixTags = (this.affixTags = this.filterAffixTags(this.routes));
       for (const tag of affixTags) {
         if (tag.name) {
-          this.$store.dispatch('tagsView/addVisitedView', tag)
+          this.$store.dispatch("tagsView/addVisitedView", tag);
         }
       }
     },
     addTags() {
-      const { meta } = this.$route
+      const { meta } = this.$route;
       if (meta && meta.title) {
-        this.$store.dispatch('tagsView/addView', this.$route)
+        this.$store.dispatch("tagsView/addView", this.$route);
       }
-      return false
+      return false;
     },
     moveToCurrentTag() {
-      const tags = this.$refs.tag
+      const tags = this.$refs.tag;
       this.$nextTick(() => {
         for (const tag of tags) {
           if (tag.to.path === this.$route.path) {
-            this.$refs.scrollPane.moveToTarget(tag)
+            this.$refs.scrollPane.moveToTarget(tag);
             // when query is different then update
             if (tag.to.fullPath !== this.$route.fullPath) {
-              this.$store.dispatch('tagsView/updateVisitedView', this.$route)
+              this.$store.dispatch("tagsView/updateVisitedView", this.$route);
             }
-            break
+            break;
           }
         }
-      })
+      });
     },
     refreshSelectedTag(view) {
-      this.$store.dispatch('tagsView/delCachedView', view).then(() => {
-        const { fullPath } = view
+      this.$store.dispatch("tagsView/delCachedView", view).then(() => {
+        const { fullPath } = view;
         this.$nextTick(() => {
           this.$router.replace({
-            path: '/redirect' + fullPath
-          })
-        })
-      })
+            path: "/redirect" + fullPath,
+          });
+        });
+      });
     },
+
     closeSelectedTag(view) {
-      this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
-        if (this.isActive(view)) {
-          this.toLastView(visitedViews, view)
-        }
-      })
+      console.log('closeTag',view);
+      const arr = this.$router.options.routes;
+      _forEachRoute(arr, view.path);
+
+      this.$store
+        .dispatch("tagsView/delView", view)
+        .then(({ visitedViews }) => {
+          if (this.isActive(view)) {
+            // 通知标签页组件清除缓存/更新视图
+            window.nnav = true;
+            this.toLastView(visitedViews, view);
+          }
+        });
     },
     closeOthersTags() {
-      this.$router.push(this.selectedTag)
-      this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => {
-        this.moveToCurrentTag()
-      })
+      this.$router.push(this.selectedTag);
+      this.$store
+        .dispatch("tagsView/delOthersViews", this.selectedTag)
+        .then(() => {
+          this.moveToCurrentTag();
+        });
     },
     closeAllTags(view) {
-      this.$store.dispatch('tagsView/delAllViews').then(({ visitedViews }) => {
-        if (this.affixTags.some(tag => tag.path === view.path)) {
-          return
+      this.$store.dispatch("tagsView/delAllViews").then(({ visitedViews }) => {
+        if (this.affixTags.some((tag) => tag.path === view.path)) {
+          return;
         }
-        this.toLastView(visitedViews, view)
-      })
+        this.toLastView(visitedViews, view);
+      });
     },
     toLastView(visitedViews, view) {
-      const latestView = visitedViews.slice(-1)[0]
+      const latestView = visitedViews.slice(-1)[0];
       if (latestView) {
-        this.$router.push(latestView.fullPath)
+        this.$router.push(latestView.fullPath);
       } else {
         // now the default is to redirect to the home page if there is no tags-view,
         // you can adjust it according to your needs.
-        if (view.name === 'Dashboard') {
+        if (view.name === "Dashboard") {
           // to reload home page
-          this.$router.replace({ path: '/redirect' + view.fullPath })
+          this.$router.replace({ path: "/redirect" + view.fullPath });
         } else {
-          this.$router.push('/')
+          this.$router.push("/");
         }
       }
     },
     openMenu(tag, e) {
-      const menuMinWidth = 105
-      const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
-      const offsetWidth = this.$el.offsetWidth // container width
-      const maxLeft = offsetWidth - menuMinWidth // left boundary
-      const left = e.clientX - offsetLeft + 15 // 15: margin right
+      const menuMinWidth = 105;
+      const offsetLeft = this.$el.getBoundingClientRect().left; // container margin left
+      const offsetWidth = this.$el.offsetWidth; // container width
+      const maxLeft = offsetWidth - menuMinWidth; // left boundary
+      const left = e.clientX - offsetLeft + 15; // 15: margin right
 
       if (left > maxLeft) {
-        this.left = maxLeft
+        this.left = maxLeft;
       } else {
-        this.left = left
+        this.left = left;
       }
 
-      this.top = e.clientY
-      this.visible = true
-      this.selectedTag = tag
+      this.top = e.clientY;
+      this.visible = true;
+      this.selectedTag = tag;
     },
     closeMenu() {
-      this.visible = false
+      this.visible = false;
     },
     handleScroll() {
-      this.closeMenu()
-    }
-  }
-}
+      this.closeMenu();
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -202,7 +241,7 @@ export default {
   width: 100%;
   background: #fff;
   border-bottom: 1px solid #d8dce5;
-  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
+  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
   .tags-view-wrapper {
     .tags-view-item {
       display: inline-block;
@@ -224,11 +263,11 @@ export default {
         margin-right: 15px;
       }
       &.active {
-        background-color: #409EFF;
+        background-color: #409eff;
         color: #fff;
-        border-color: #409EFF;
+        border-color: #409eff;
         &::before {
-          content: '';
+          content: "";
           background: #fff;
           display: inline-block;
           width: 8px;
@@ -251,7 +290,7 @@ export default {
     font-size: 12px;
     font-weight: 400;
     color: #333;
-    box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
+    box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
     li {
       margin: 0;
       padding: 7px 16px;
@@ -274,10 +313,10 @@ export default {
       vertical-align: 2px;
       border-radius: 50%;
       text-align: center;
-      transition: all .3s cubic-bezier(.645, .045, .355, 1);
+      transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
       transform-origin: 100% 50%;
       &:before {
-        transform: scale(.6);
+        transform: scale(0.6);
         display: inline-block;
         vertical-align: -3px;
       }

package/src/views/slienceAuth/index.vue

@@ -1,42 +1,42 @@
-<template>
-  <div class="slienceAuth">
-    <!-- 静默授权， 获取平台token -->
-  </div>
-</template>
-<script>
-import http from 'xs-request/lib/requestApi'
-import { getConfig } from "@/utils/global-config";
-import { setLocalStorage } from "@/utils/localStorage";
-export default {
-  beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.apartyGetToken(to, next, vm)
-    });
-  },
-  methods: {
-    async apartyGetToken(to, next, vm) {
-      if(window.parent !== window.self && window.name === "qualityTestParty") { // 识别被哪个 iframe 引用
-        if (!localStorage.getItem("token")) {
-          await http.get(
-            getConfig("ID4_AUTH") +
-              "AccountIframe/Token?accountName=" +
-              to.query.accountName
-          ).then(async (res) => {
-            if (res.code == 0) {
-              localStorage.setItem('token', res.data)
-              await http.get(getConfig("ID4_AUTH") + 'connect/userinfo').then((res) => {
-                setLocalStorage("userProfile", res.data);
-                next('/')
-              })
-            }
-          });
-        } else {
-          localStorage.removeItem("token");
-          vm.apartyGetToken(to, next, vm)
-        }
-      }
-    }
-  }
-}
-</script>
-<style lang="sass" scoped></style>
+<template>
+  <div class="slienceAuth">
+    <!-- 静默授权， 获取平台token -->
+  </div>
+</template>
+<script>
+import http from 'xs-request/lib/requestApi'
+import { getConfig } from "@/utils/global-config";
+import { setLocalStorage } from "@/utils/localStorage";
+export default {
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.apartyGetToken(to, next, vm)
+    });
+  },
+  methods: {
+    async apartyGetToken(to, next, vm) {
+      if(window.parent !== window.self && window.name === "qualityTestParty") { // 识别被哪个 iframe 引用
+        if (!localStorage.getItem("token")) {
+          await http.get(
+            getConfig("ID4_AUTH") +
+              "AccountIframe/Token?accountName=" +
+              to.query.accountName
+          ).then(async (res) => {
+            if (res.code == 0) {
+              localStorage.setItem('token', res.data)
+              await http.get(getConfig("ID4_AUTH") + 'connect/userinfo').then((res) => {
+                setLocalStorage("userProfile", res.data);
+                next('/')
+              })
+            }
+          });
+        } else {
+          localStorage.removeItem("token");
+          vm.apartyGetToken(to, next, vm)
+        }
+      }
+    }
+  }
+}
+</script>
+<style lang="sass" scoped></style>