xs-common-plugins 1.1.2 → 1.1.6

package/src/utils/localStorage.js

@@ -1,21 +1,21 @@
-import Storage from 'web-storage-cache'
-
-const localStorage = new Storage()
-
-export function getLocalStorage(key) {
-  return localStorage.get(key)
-}
-
-export function setLocalStorage(key, value, expire = 30 * 24 * 3600) {
-  return localStorage.set(key, value, {
-    exp: expire
-  })
-}
-
-export function removeLocalStorage(key) {
-  return localStorage.delete(key)
-}
-
-export function clearLocalStorage() {
-  return localStorage.clear()
-}
+import Storage from 'web-storage-cache'
+
+const localStorage = new Storage()
+
+export function getLocalStorage(key) {
+  return localStorage.get(key)
+}
+
+export function setLocalStorage(key, value, expire = 30 * 24 * 3600) {
+  return localStorage.set(key, value, {
+    exp: expire
+  })
+}
+
+export function removeLocalStorage(key) {
+  return localStorage.delete(key)
+}
+
+export function clearLocalStorage() {
+  return localStorage.clear()
+}

package/src/utils/validate.js

@@ -1,20 +1,20 @@
-/**
- * Created by PanJiaChen on 16/11/18.
- */
-
-/**
- * @param {string} path
- * @returns {Boolean}
- */
-export function isExternal(path) {
-  return /^(https?:|mailto:|tel:)/.test(path)
-}
-
-/**
- * @param {string} str
- * @returns {Boolean}
- */
-export function validUsername(str) {
-  const valid_map = ['admin', 'editor']
-  return valid_map.indexOf(str.trim()) >= 0
-}
+/**
+ * Created by PanJiaChen on 16/11/18.
+ */
+
+/**
+ * @param {string} path
+ * @returns {Boolean}
+ */
+export function isExternal(path) {
+  return /^(https?:|mailto:|tel:)/.test(path)
+}
+
+/**
+ * @param {string} str
+ * @returns {Boolean}
+ */
+export function validUsername(str) {
+  const valid_map = ['admin', 'editor']
+  return valid_map.indexOf(str.trim()) >= 0
+}

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

@@ -1,45 +1,45 @@
-<template>
-  <div class="allSearch-wrapper">
-    <el-input
-      v-if="search"
-      suffix-icon="el-icon-search"
-      clearable
-      size="small"
-      v-model="globalSearch"
-      placeholder="请输入内容"
-      @change="changeHandler"
-      maxlength="50"
-    ></el-input>
-  </div>
-</template>
-
-<script>
-import { mapState } from "vuex";
-export default {
-  data() {
-    return {
-      // 全局搜索
-      globalSearch: ""
-    };
-  },
-  methods: {
-    /**
-     * 搜索框选中操作
-     */
-    changeHandler(val) {
-      this.search(val);
-    }
-  },
-  computed: {
-    ...mapState({
-      search: state => state.search
-    })
-  }
-};
-</script>
-
-<style lang="scss">
-.allSearch-wrapper .el-input--small .el-input__inner {
-  width: 300px;
-}
+<template>
+  <div class="allSearch-wrapper">
+    <el-input
+      v-if="search"
+      suffix-icon="el-icon-search"
+      clearable
+      size="small"
+      v-model="globalSearch"
+      placeholder="请输入内容"
+      @change="changeHandler"
+      maxlength="50"
+    ></el-input>
+  </div>
+</template>
+
+<script>
+import { mapState } from "vuex";
+export default {
+  data() {
+    return {
+      // 全局搜索
+      globalSearch: ""
+    };
+  },
+  methods: {
+    /**
+     * 搜索框选中操作
+     */
+    changeHandler(val) {
+      this.search(val);
+    }
+  },
+  computed: {
+    ...mapState({
+      search: state => state.search
+    })
+  }
+};
+</script>
+
+<style lang="scss">
+.allSearch-wrapper .el-input--small .el-input__inner {
+  width: 300px;
+}
 </style>

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

@@ -1,50 +1,50 @@
-<template>
-  <section class="app-main">
-    <router-view :key="key" />
-  </section>
-</template>
-
-<script>
-export default {
-  name: "AppMain",
-  data() {
-    return {
-      framepath: ""
-    };
-  },
-  computed: {
-    key() {
-      return this.$route.path;
-    }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-
-.app-main {
-  display: flex;
-  /*50 = navbar  */
-  height: calc(100vh - 50px);
-  width: 100%;
-  position: relative;
-  overflow: hidden;
-}
-.footer {
-  position: absolute;
-  bottom: -10px;
-  line-height: 1.5;
-  height: 50px;
-}
-.fixed-header + .app-main {
-  padding-top: 50px;
-}
-</style>
-
-<style lang="scss">
-.el-popup-parent--hidden {
-  .fixed-header {
-    padding-right: 15px;
-  }
-}
-</style>
+<template>
+  <section class="app-main">
+    <router-view :key="key" />
+  </section>
+</template>
+
+<script>
+export default {
+  name: "AppMain",
+  data() {
+    return {
+      framepath: ""
+    };
+  },
+  computed: {
+    key() {
+      return this.$route.path;
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+
+.app-main {
+  display: flex;
+  /*50 = navbar  */
+  height: calc(100vh - 50px);
+  width: 100%;
+  position: relative;
+  overflow: hidden;
+}
+.footer {
+  position: absolute;
+  bottom: -10px;
+  line-height: 1.5;
+  height: 50px;
+}
+.fixed-header + .app-main {
+  padding-top: 50px;
+}
+</style>
+
+<style lang="scss">
+.el-popup-parent--hidden {
+  .fixed-header {
+    padding-right: 15px;
+  }
+}
+</style>

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

@@ -31,6 +31,7 @@
       <AllSearch />
       <div class="is-dot">
         <el-badge
+          style="margin: 0 3px;"
           v-if="isShowKF === 'isv' || isShowKF === 'erp'"
           is-dot
           class="item"
@@ -45,7 +46,7 @@
         </el-badge>
       </div>
       <div>
-        <el-tag>{{
+        <el-tag style="margin: 0 3px;">{{
           userProfile &&
           userProfile.hasOwnProperty("real_name") &&
           userProfile.real_name
@@ -61,6 +62,18 @@
               : "--未绑定--"
           }}
         </el-tag>
+      </div> 
+      <!-- 租户 -->
+      {{userProfile.TId}}
+      <div class="tenant" v-if="userProfile.TId">
+        <el-dropdown @command="changeTenant">
+          <span class="el-dropdown-link">
+            {{tenantList && tenantList[userProfile.TId]}}
+          </span>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item v-for="(value, key) in tenantList" :key="key" :command="key">{{value}}</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
       </div>
       <el-dropdown class="avatar-container" trigger="click">
         <div class="avatar-wrapper">
@@ -107,7 +120,9 @@ import AllSearch from "./AllSearch";
 import { getConfig } from "@/utils/global-config";
 import { getToken, removeToken, removeLocalToken } from "@/utils/auth"; // get token from cookie
 import ImCom from "@/components/im";
-import { getLocalStorage } from "@/utils/localStorage";
+import { getLocalStorage, setLocalStorage } from "@/utils/localStorage";
+import { setToken } from "@/utils/auth"; // get token from cookie
+import { initMenu } from '@/utils/getMenu'
 
 export default {
   components: {
@@ -136,6 +151,7 @@ export default {
       LoginName: false,
       isShowKF: getConfig("GROUP"),
       defaultParentId: "887904812217cca9bc2b9adb875daf42",
+      tenantList: [], // 租户列表
     };
   },
   computed: {
@@ -146,8 +162,29 @@ export default {
     if (userName === "admin") {
       this.LoginName = true;
     }
+    if(this.userProfile.TId) this.getTenantList()
   },
   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()
+            
+        })
+    },
+    getTenantList () {
+      this.$ask.ucmng.api.sysmng.Tenant.GetTenants().then(res => {
+        this.tenantList = res.data
+      })
+    },
     toggleSideBar() {
       this.$store.dispatch("app/toggleSideBar");
     },
@@ -279,6 +316,10 @@ export default {
     }
   }
 
+  .tenant {
+    padding: 0 10px;
+  }
+
   .breadcrumb-container {
     float: left;
   }

package/src/views/layout/components/Sidebar/FixiOSBug.js

@@ -1,26 +1,26 @@
-export default {
-  computed: {
-    device() {
-      return this.$store.state.app.device
-    }
-  },
-  mounted() {
-    // In order to fix the click on menu on the ios device will trigger the mouseleave bug
-    // https://github.com/PanJiaChen/vue-element-admin/issues/1135
-    this.fixBugIniOS()
-  },
-  methods: {
-    fixBugIniOS() {
-      const $subMenu = this.$refs.subMenu
-      if ($subMenu) {
-        const handleMouseleave = $subMenu.handleMouseleave
-        $subMenu.handleMouseleave = (e) => {
-          if (this.device === 'mobile') {
-            return
-          }
-          handleMouseleave(e)
-        }
-      }
-    }
-  }
-}
+export default {
+  computed: {
+    device() {
+      return this.$store.state.app.device
+    }
+  },
+  mounted() {
+    // In order to fix the click on menu on the ios device will trigger the mouseleave bug
+    // https://github.com/PanJiaChen/vue-element-admin/issues/1135
+    this.fixBugIniOS()
+  },
+  methods: {
+    fixBugIniOS() {
+      const $subMenu = this.$refs.subMenu
+      if ($subMenu) {
+        const handleMouseleave = $subMenu.handleMouseleave
+        $subMenu.handleMouseleave = (e) => {
+          if (this.device === 'mobile') {
+            return
+          }
+          handleMouseleave(e)
+        }
+      }
+    }
+  }
+}

package/src/views/layout/components/Sidebar/Item.vue

@@ -1,28 +1,28 @@
-<script>
-export default {
-  name: 'MenuItem',
-  functional: true,
-  props: {
-    icon: {
-      type: String,
-      default: ''
-    },
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  render(h, context) {
-    const { icon, title } = context.props
-    const vnodes = []
-
-    if (icon) {
-      vnodes.push(<i class={[icon, 'iconfont']} ></i>)
-    }
-    if (title) {
-      vnodes.push(<span slot='title' style="marginLeft:10px">{(title)}</span>)
-    }
-    return vnodes
-  }
-}
-</script>
+<script>
+export default {
+  name: 'MenuItem',
+  functional: true,
+  props: {
+    icon: {
+      type: String,
+      default: ''
+    },
+    title: {
+      type: String,
+      default: ''
+    }
+  },
+  render(h, context) {
+    const { icon, title } = context.props
+    const vnodes = []
+
+    if (icon) {
+      vnodes.push(<i class={[icon, 'iconfont']} ></i>)
+    }
+    if (title) {
+      vnodes.push(<span slot='title' style="marginLeft:10px">{(title)}</span>)
+    }
+    return vnodes
+  }
+}
+</script>

package/src/views/layout/components/Sidebar/Link.vue

@@ -1,34 +1,34 @@
-
-<template>
-  <!-- eslint-disable vue/require-component-is -->
-  <component v-bind="linkProps(to)">
-    <slot />
-  </component>
-</template>
-
-<script>
-import { isExternal } from "@/utils/validate";
-
-export default {
-  props: {
-    to: {
-      type: String,
-      required: true
-    }
-  },
-  methods: {
-    linkProps(url) {
-      if (isExternal(url)) {
-        return {
-          is: "a",
-          href: url,
-        };
-      }
-      return {
-        is: "router-link",
-        to: url
-      };
-    }
-  }
-};
-</script>
+
+<template>
+  <!-- eslint-disable vue/require-component-is -->
+  <component v-bind="linkProps(to)">
+    <slot />
+  </component>
+</template>
+
+<script>
+import { isExternal } from "@/utils/validate";
+
+export default {
+  props: {
+    to: {
+      type: String,
+      required: true
+    }
+  },
+  methods: {
+    linkProps(url) {
+      if (isExternal(url)) {
+        return {
+          is: "a",
+          href: url,
+        };
+      }
+      return {
+        is: "router-link",
+        to: url
+      };
+    }
+  }
+};
+</script>