xs-common-plugins 1.2.2 → 1.2.3

package/src/utils/getMenu.js

@@ -1,83 +1,83 @@
-import { getToken } from '@/utils/auth.js'
-import { getConfig } from '@/utils/global-config'
-import menu from "@/automatically/menu.js"
-import ask from '@/automatically/api'
-import store from '@/store'
-
-function main () {
-  // if(process.env.NODE_ENV == "development") return
-  getVersion();
-}
-
-function getVersion() {
-    const token = getToken(`${getConfig('CLIENT_ID')}_token`)
-    if(!token) return;
-    ask.ucmng.api.sysmng.MenuOper.GetVersion({clientId: window.$baseCfg.CLIENT_ID}).then((res)=> {
-      if(res.code == 0) {
-        getMenuTree(res.data)//获取菜单树
-      }
-    })
-}
-
-function getMenuTree (version) {
-    let apiVersion = menu.version;
-    if (version == null || apiVersion > version) {
-      if(!(menu && menu.list)) return;
-      let moduleName = menu.list[0].moduleName ? menu.list[0].moduleName : ''
-      let menuList = menu.list;
-      let obj = {
-        clientId: window.$baseCfg ?  window.$baseCfg.CLIENT_ID : '',
-        moduleName: moduleName,
-        menus: menuList,
-        version: menu.version +''
-      }
-      ask.ucmng.api.sysmng.MenuOper.UpdateMenu.post(obj).then(() => {
-        // 新版本菜单
-        initMenu()
-      });
-    } else {
-      // 新版本菜单
-      initMenu()
-    }
-}
-
-function initMenu () {
-  ask.ucuser.api.sys.CurUser.InitMenu().then(res => {
-    if(res.code == 0) {
-      let { subItems } = hasChildren({subItems: res.data})
-      store.dispatch("app/getMenuList", subItems);
-    }
-  })
-}
-
-function hasChildren(obj) {
-  let list = obj.subItems
-  if(list && list.length > 0) {
-    if(list.every(i => i['hide'] === true)) {
-      obj.subItems = []
-    } else {
-      obj.subItems = list.filter(item => item['hide'] !== true)
-      obj.subItems.forEach(item => hasChildren(item))
-    }
-  }
-  return obj
-}
-
-
-function getApis () {
-  let obj = {}
-  let apis = getConfig('apis')
-  for (const key in apis) {
-    let apiList = apis[key].EndPoint.split("/")
-    let serverkey = apiList[apiList.length - 2]
-    obj[serverkey] = key
-  }
-  return obj
-}
-
-export {
-
-  main,
-  initMenu
-  
+import { getToken } from '@/utils/auth.js'
+import { getConfig } from '@/utils/global-config'
+import menu from "@/automatically/menu.js"
+import ask from '@/automatically/api'
+import store from '@/store'
+
+function main () {
+  // if(process.env.NODE_ENV == "development") return
+  getVersion();
+}
+
+function getVersion() {
+    const token = getToken(`${getConfig('CLIENT_ID')}_token`)
+    if(!token) return;
+    ask.ucmng.api.sysmng.MenuOper.GetVersion({clientId: window.$baseCfg.CLIENT_ID}).then((res)=> {
+      if(res.code == 0) {
+        getMenuTree(res.data)//获取菜单树
+      }
+    })
+}
+
+function getMenuTree (version) {
+    let apiVersion = menu.version;
+    if (version == null || apiVersion > version) {
+      if(!(menu && menu.list)) return;
+      let moduleName = menu.list[0].moduleName ? menu.list[0].moduleName : ''
+      let menuList = menu.list;
+      let obj = {
+        clientId: window.$baseCfg ?  window.$baseCfg.CLIENT_ID : '',
+        moduleName: moduleName,
+        menus: menuList,
+        version: menu.version +''
+      }
+      ask.ucmng.api.sysmng.MenuOper.UpdateMenu.post(obj).then(() => {
+        // 新版本菜单
+        initMenu()
+      });
+    } else {
+      // 新版本菜单
+      initMenu()
+    }
+}
+
+function initMenu () {
+  ask.ucuser.api.sys.CurUser.InitMenu().then(res => {
+    if(res.code == 0) {
+      let { subItems } = hasChildren({subItems: res.data})
+      store.dispatch("app/getMenuList", subItems);
+    }
+  })
+}
+
+function hasChildren(obj) {
+  let list = obj.subItems
+  if(list && list.length > 0) {
+    if(list.every(i => i['hide'] === true)) {
+      obj.subItems = []
+    } else {
+      obj.subItems = list.filter(item => item['hide'] !== true)
+      obj.subItems.forEach(item => hasChildren(item))
+    }
+  }
+  return obj
+}
+
+
+function getApis () {
+  let obj = {}
+  let apis = getConfig('apis')
+  for (const key in apis) {
+    let apiList = apis[key].EndPoint.split("/")
+    let serverkey = apiList[apiList.length - 2]
+    obj[serverkey] = key
+  }
+  return obj
+}
+
+export {
+
+  main,
+  initMenu
+  
 }

package/src/utils/global_directive.js

@@ -0,0 +1,10 @@
+import Vue from 'vue'
+
+Vue.directive('keep-alive', {
+  bind(el) {
+    const selectWrap = el.querySelector('.el-table__body-wrapper')
+    selectWrap.addEventListener('scroll', function () {
+      el.setAttribute('scrollTop', this.scrollTop)
+    })
+  },
+})

package/src/utils/ossService.js

@@ -1,55 +1,55 @@
-import OSS from 'ali-oss'
-import { requestApi as axios} from 'xs-request'
-import store from '../store/index'
-import { getLocalStorage } from "@/utils/localStorage";
-import {getConfig} from '@/utils/global-config'
-
-// 去哪个服务下 获取 token 信息
-function getOssToken () {
-  return axios.get('@commng/UserCur/Oss/Config/' + getConfig('CLIENT_ID'))
-}
-
-let ossCfg = {}
-// 从 vuex 中 获取初始化值
-const initToken = function() {
-  ossCfg = store.getters.ossCfg
-  let timestamp = new Date().getTime()
-  // 有效期内不发送获取token 请求
-  if (ossCfg.region && ossCfg.timeout > timestamp) { return }
-  getOssToken()
-    .then(({ data }) => {
-      ossCfg.region = data.ossEndpoint
-      ossCfg.bucket = data.bucketName
-      ossCfg.accessKeyId = data.stsAccessKeyId
-      ossCfg.accessKeySecret = data.stsAccessKeySecret
-      ossCfg.stsToken = data.stsSecurityToken
-      ossCfg.baseDir = data.baseDir
-      ossCfg.timeout = timestamp + (data.durationSeconds * 1000)
-      store.commit("oss/SET_OSS", ossCfg)
-    })
-    .catch((err) => {
-      console.log('获取Token错误', err)
-    })
-}
-const newFileName = function(id = getConfig('CLIENT_ID'), userid = getLocalStorage("userProfile").id) {
-  let dt = new Date()
-  let y = dt.getFullYear()
-  let m = dt.getMonth() + 1 < 10 ? '0' + (dt.getMonth() + 1) : dt.getMonth() + 1
-  let d = dt.getDate() < 10 ? '0' + dt.getDate() : dt.getDate()
-  return `${ossCfg.baseDir}/${userid}/${y}${m}${d}/${id}_${dt.getTime()}` // 定义唯一的文件名
-}
-
-const ossService = {
-  token: ossCfg,
-  initToken,
-  newFileName,
-  _ossClient: null,
-  getOssClient() {
-    if (this._ossClient == null) { this._ossClient = new OSS(ossCfg) }
-    return this._ossClient
-  }
-}
-
-export default ossService
-
-
+import OSS from 'ali-oss'
+import { requestApi as axios} from 'xs-request'
+import store from '../store/index'
+import { getLocalStorage } from "@/utils/localStorage";
+import {getConfig} from '@/utils/global-config'
+
+// 去哪个服务下 获取 token 信息
+function getOssToken () {
+  return axios.get('@commng/UserCur/Oss/Config/' + getConfig('CLIENT_ID'))
+}
+
+let ossCfg = {}
+// 从 vuex 中 获取初始化值
+const initToken = function() {
+  ossCfg = store.getters.ossCfg
+  let timestamp = new Date().getTime()
+  // 有效期内不发送获取token 请求
+  if (ossCfg.region && ossCfg.timeout > timestamp) { return }
+  getOssToken()
+    .then(({ data }) => {
+      ossCfg.region = data.ossEndpoint
+      ossCfg.bucket = data.bucketName
+      ossCfg.accessKeyId = data.stsAccessKeyId
+      ossCfg.accessKeySecret = data.stsAccessKeySecret
+      ossCfg.stsToken = data.stsSecurityToken
+      ossCfg.baseDir = data.baseDir
+      ossCfg.timeout = timestamp + (data.durationSeconds * 1000)
+      store.commit("oss/SET_OSS", ossCfg)
+    })
+    .catch((err) => {
+      console.log('获取Token错误', err)
+    })
+}
+const newFileName = function(id = getConfig('CLIENT_ID'), userid = getLocalStorage("userProfile").id) {
+  let dt = new Date()
+  let y = dt.getFullYear()
+  let m = dt.getMonth() + 1 < 10 ? '0' + (dt.getMonth() + 1) : dt.getMonth() + 1
+  let d = dt.getDate() < 10 ? '0' + dt.getDate() : dt.getDate()
+  return `${ossCfg.baseDir}/${userid}/${y}${m}${d}/${id}_${dt.getTime()}` // 定义唯一的文件名
+}
+
+const ossService = {
+  token: ossCfg,
+  initToken,
+  newFileName,
+  _ossClient: null,
+  getOssClient() {
+    if (this._ossClient == null) { this._ossClient = new OSS(ossCfg) }
+    return this._ossClient
+  }
+}
+
+export default ossService
+
+

package/src/utils/prototype.js

@@ -1,47 +1,47 @@
-import Vue from 'vue'
-import { Module_Search } from '@modules/module.config'
-import 'moment-duration-format'
-import moment from 'moment'// 导入文件
-import ask from '@/automatically/api'
-import {requestApi} from 'xs-request'
-import echarts from 'echarts';
-import {loadTableData, loadReportData, msg, countDownSetColor, showDlg} from '@/utils/index'
-import signalr from '@/utils/signalR'
-import {Enum, OrgEnum, EnumList} from '@/utils/enum'
-import common from '@/common/common'
-import Common_Search from '@/utils/search';
-import filterRules from './filterRules'
-import ossService from '@/utils/ossService'
-
-//新版api 请求
-Vue.prototype.$ask = ask
-//旧版 请求
-Vue.prototype.$http = requestApi
-Vue.prototype.$echarts = echarts;
-// 日期格式
-Vue.prototype.$moment = moment// 赋值使用
-// 加载表格数据
-Vue.prototype.loadTableData = loadTableData
-// 加载报表数据
-Vue.prototype.loadReportData = loadReportData
-// 消息
-Vue.prototype.$msg = msg
-Vue.$SearchTool = Object.assign({}, Common_Search, Module_Search ? Module_Search : {})
-Vue.prototype.countDownSetColor = countDownSetColor
-Vue.prototype.signalr = signalr
-Vue.prototype.$enum = Enum
-Vue.prototype.$orgEnum = OrgEnum
-Vue.prototype.$enumList = EnumList
-Vue.prototype.$common = common
-Vue.http = requestApi;
-Vue.Enum = Enum;
-Vue.OrgEnum = OrgEnum;
-Vue.EnumList = EnumList;
-// 显示弹出对话框
-Vue.prototype.showDlg =showDlg
-
-// 校验
-Vue.prototype.$filterRules = filterRules
-
-// oss 图片上次服务
+import Vue from 'vue'
+import { Module_Search } from '@modules/module.config'
+import 'moment-duration-format'
+import moment from 'moment'// 导入文件
+import ask from '@/automatically/api'
+import {requestApi} from 'xs-request'
+import echarts from 'echarts';
+import {loadTableData, loadReportData, msg, countDownSetColor, showDlg} from '@/utils/index'
+import signalr from '@/utils/signalR'
+import {Enum, OrgEnum, EnumList} from '@/utils/enum'
+import common from '@/common/common'
+import Common_Search from '@/utils/search';
+import filterRules from './filterRules'
+import ossService from '@/utils/ossService'
+
+//新版api 请求
+Vue.prototype.$ask = ask
+//旧版 请求
+Vue.prototype.$http = requestApi
+Vue.prototype.$echarts = echarts;
+// 日期格式
+Vue.prototype.$moment = moment// 赋值使用
+// 加载表格数据
+Vue.prototype.loadTableData = loadTableData
+// 加载报表数据
+Vue.prototype.loadReportData = loadReportData
+// 消息
+Vue.prototype.$msg = msg
+Vue.$SearchTool = Object.assign({}, Common_Search, Module_Search ? Module_Search : {})
+Vue.prototype.countDownSetColor = countDownSetColor
+Vue.prototype.signalr = signalr
+Vue.prototype.$enum = Enum
+Vue.prototype.$orgEnum = OrgEnum
+Vue.prototype.$enumList = EnumList
+Vue.prototype.$common = common
+Vue.http = requestApi;
+Vue.Enum = Enum;
+Vue.OrgEnum = OrgEnum;
+Vue.EnumList = EnumList;
+// 显示弹出对话框
+Vue.prototype.showDlg =showDlg
+
+// 校验
+Vue.prototype.$filterRules = filterRules
+
+// oss 图片上次服务
 Vue.prototype.$ossService = ossService

package/src/utils/search.js

@@ -1,34 +1,34 @@
-export function qcDateRange(_fieldName = '', _defaultValue = '', options) {
-    return Object.assign({}, {
-      fieldName: 'datepic',
-      defaultValue: _defaultValue,
-      conditionType: 4,
-      url: '',
-      dataSource: '',
-      displayNam: '',
-      dataSourceType: 1,
-      sort: 0,
-      isIndex: true
-    }, options)
-  }
-  
-  export function qcInput(_fieldName = '', _defaultValue, options) {
-    return Object.assign({}, {
-      displayName: "",
-      fieldName: _fieldName,
-      defaultValue: _defaultValue,
-      conditionType: 0,
-      url: "",
-      dataSource: "",
-      dataSourceType: 0,
-      sort: 0,
-      isIndex: true,
-    }, options)
-  }
-  
-  
-  export default {
-    qcDateRange,
-    qcInput
-  }
+export function qcDateRange(_fieldName = '', _defaultValue = '', options) {
+    return Object.assign({}, {
+      fieldName: 'datepic',
+      defaultValue: _defaultValue,
+      conditionType: 4,
+      url: '',
+      dataSource: '',
+      displayNam: '',
+      dataSourceType: 1,
+      sort: 0,
+      isIndex: true
+    }, options)
+  }
+  
+  export function qcInput(_fieldName = '', _defaultValue, options) {
+    return Object.assign({}, {
+      displayName: "",
+      fieldName: _fieldName,
+      defaultValue: _defaultValue,
+      conditionType: 0,
+      url: "",
+      dataSource: "",
+      dataSourceType: 0,
+      sort: 0,
+      isIndex: true,
+    }, options)
+  }
+  
+  
+  export default {
+    qcDateRange,
+    qcInput
+  }
   

package/src/utils/signalR.js

@@ -1,24 +1,24 @@
-import * as signalR from '@microsoft/signalr'
-import { getToken } from '@/utils/auth'
-
-const signalr = create('signalR/WorkerHub')
-import { getConfig } from '@/utils/global-config'
-const tokenKey = `${getConfig('CLIENT_ID')}_token`
-
-
-function create(url) {
-  const signalUrl = `../${url}`
-
-  return new signalR.HubConnectionBuilder()
-    // 服务器地址
-    .withUrl(signalUrl, { accessTokenFactory: () => getToken(tokenKey) })
-    .withAutomaticReconnect({
-      nextRetryDelayInMilliseconds: retryContext => {
-        console.log(retryContext.elapsedMilliseconds, '重新链接所花费的时间')
-        return 1001 // 每秒请求
-      }
-    }) // 自动重连
-    .build()
-}
-
-export default signalr
+import * as signalR from '@microsoft/signalr'
+import { getToken } from '@/utils/auth'
+
+const signalr = create('signalR/WorkerHub')
+import { getConfig } from '@/utils/global-config'
+const tokenKey = `${getConfig('CLIENT_ID')}_token`
+
+
+function create(url) {
+  const signalUrl = `../${url}`
+
+  return new signalR.HubConnectionBuilder()
+    // 服务器地址
+    .withUrl(signalUrl, { accessTokenFactory: () => getToken(tokenKey) })
+    .withAutomaticReconnect({
+      nextRetryDelayInMilliseconds: retryContext => {
+        console.log(retryContext.elapsedMilliseconds, '重新链接所花费的时间')
+        return 1001 // 每秒请求
+      }
+    }) // 自动重连
+    .build()
+}
+
+export default signalr

package/src/views/callback/index.vue

@@ -1,36 +1,36 @@
-<template></template>
-<script>
-import { setToken } from "@/utils/auth"; // get token from cookie
-import { getQuery } from "@/common/utils";
-import { getConfig } from "@/utils/global-config";
-import { setLocalStorage } from "@utils/localStorage";
-const endTimestamp = new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1;
-export default {
-  mounted() {
-    if (getConfig("ID4_LOGINTYPE")) {
-      const that = this;
-      window.$mgr.signinRedirectCallback().then(function () {
-          window.$mgr.getUser().then((user) => {
-            setToken(user.access_token);
-            setToken("LoginUserName", user.profile.name);
-            setLocalStorage("userProfile", user.profile);
-            localStorage.setItem("token", user.access_token);
-            // 作为第三方系统被嵌套在iframe中使用
-            sessionStorage.setItem("token", user.access_token);
-            sessionStorage.setItem("iframeAuthExpireTime", endTimestamp);
-            var redic_url = getQuery(window.location.href, "redic_url");
-            that.$router.push(
-              redic_url ? decodeURIComponent(redic_url).substr(1) : `/`
-            );
-          })
-          .catch(function (e) {
-            console.log("getUser", e);
-          });
-        })
-        .catch(function (e) {
-          console.log("getToken", e);
-        });
-    }
-  },
-};
+<template></template>
+<script>
+import { setToken } from "@/utils/auth"; // get token from cookie
+import { getQuery } from "@/common/utils";
+import { getConfig } from "@/utils/global-config";
+import { setLocalStorage } from "@utils/localStorage";
+const endTimestamp = new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1;
+export default {
+  mounted() {
+    if (getConfig("ID4_LOGINTYPE")) {
+      const that = this;
+      window.$mgr.signinRedirectCallback().then(function () {
+          window.$mgr.getUser().then((user) => {
+            setToken(user.access_token);
+            setToken("LoginUserName", user.profile.name);
+            setLocalStorage("userProfile", user.profile);
+            localStorage.setItem("token", user.access_token);
+            // 作为第三方系统被嵌套在iframe中使用
+            sessionStorage.setItem("token", user.access_token);
+            sessionStorage.setItem("iframeAuthExpireTime", endTimestamp);
+            var redic_url = getQuery(window.location.href, "redic_url");
+            that.$router.push(
+              redic_url ? decodeURIComponent(redic_url).substr(1) : `/`
+            );
+          })
+          .catch(function (e) {
+            console.log("getUser", e);
+          });
+        })
+        .catch(function (e) {
+          console.log("getToken", e);
+        });
+    }
+  },
+};
 </script>

package/src/views/home/index.vue

@@ -1,25 +1,25 @@
-<template>
-  <div class="home-wrapper" />
-</template>
-<script>
-export default {
-  beforeRouteEnter(to, from, next) {
-    next((vm) => {
-      vm.apartyGetToken(to, next, vm)
-    })
-  },
-  methods: {
-    async apartyGetToken(to, next, vm) {
-      // 识别被哪个 iframe 引用;qualityTestParty=质检详情
-      if (window.parent !== window.self && window.name === 'qualityTestParty') {
-        if (to.query.orderId && to.query.orderId != 'undefined') {
-          sessionStorage.setItem('iframeOrderId', to.query.orderId)
-        }
-        next('/zhijian-details')
-      } else {
-        next()
-      }
-    }
-  }
-}
-</script>
+<template>
+  <div class="home-wrapper" />
+</template>
+<script>
+export default {
+  beforeRouteEnter(to, from, next) {
+    next((vm) => {
+      vm.apartyGetToken(to, next, vm)
+    })
+  },
+  methods: {
+    async apartyGetToken(to, next, vm) {
+      // 识别被哪个 iframe 引用;qualityTestParty=质检详情
+      if (window.parent !== window.self && window.name === 'qualityTestParty') {
+        if (to.query.orderId && to.query.orderId != 'undefined') {
+          sessionStorage.setItem('iframeOrderId', to.query.orderId)
+        }
+        next('/zhijian-details')
+      } else {
+        next()
+      }
+    }
+  }
+}
+</script>

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

@@ -1,6 +1,9 @@
 <template>
   <section class="app-main">
-    <router-view :key="key" />
+    <keep-alive>
+      <router-view v-if="!$route.meta.noCache && isRouterAlive" :key="key" />
+    </keep-alive>
+    <router-view v-if="$route.meta.noCache" :key="key" />
   </section>
 </template>
 
@@ -9,19 +12,32 @@ export default {
   name: "AppMain",
   data() {
     return {
-      framepath: ""
+      framepath: "",
+      isRouterAlive: true,
+    };
+  },
+  provide() {
+    return {
+      reload: this.reload,
     };
   },
   computed: {
     key() {
       return this.$route.path;
-    }
-  }
+    },
+  },
+  methods: {
+    reload() {
+      this.isRouterAlive = false;
+      this.$nextTick(function () {
+        this.isRouterAlive = true;
+      });
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
-
 .app-main {
   display: flex;
   /*50 = navbar  */