xs-common-plugins 1.2.2 → 1.2.3

package/src/plugins/index.js

@@ -1,60 +1,60 @@
-import Install_config from '@modules/module.config'
-import { Enum, OrgEnum, EnumList } from '@/utils/enum'
-import utils from 'xs-component/lib/utils'
-import base from 'xs-component/lib/base'
-import api from '@/automatically/api'
-import Vue from 'vue'
-import store from '../store/index'
-import {request, requestApi} from 'xs-request'
-import ossService from '@/utils/ossService'
-//  以上部分为 xs-component 引入
-base.install(api ? api : {}) // 请求及api映射
-
-// 字典， 调用方法， 取值缓存
-function getDicVal (name, value) {
-  store.dispatch('dic/GET_ASK', {props: name, value})
-}
-
-// 向ui组件库传值
-utils.install({
-  formatUtils: {Enum, OrgEnum, EnumList, format: Install_config.format ? Install_config.format: {}}, // Install_config.format 前端自定义枚举文件导出内容
-  dicUtils: getDicVal, //  字典工具
-  requestUtils: request, // 发送请求工具
-  ossUtils: ossService,  // oss 图片上传
-})
-
-
-import cellCmp from '@/plugins/row-col-cmp'
-import ImCmp from '@/plugins/im'
-
-import apiMap from '@/utils/api'
-
-import { getConfig } from '@/utils/global-config'
-import { getToken } from "@/utils/auth";
-
-let clientId = getConfig('CLIENT_ID')
-let apis = getConfig('apis')
-
-
-// 获取 标识： 服务地址的映射关系
-function getApi (type) {
-  let serviceObj = {}  // 服务名: 服务地址 映射关系 （新版）
-  let moduleObj = {} // 模块id: 服务地址 映射关系 （旧版）
-  for (const key in apis) {
-    // 服务名
-    let apiList = apis[key].EndPoint.split("/")
-    let serverkey = apiList[apiList.length - 2]
-    serviceObj[serverkey] = apis[key].EndPoint
-    //moduleId (模块id)
-    moduleObj[apis[key]['ModuleId']] = apis[key].EndPoint
-  }
-  if(type == 'service') return serviceObj
-  else if(type == 'moduleId') return moduleObj
-}
-
-// 向插件内部传值
-Vue.use(requestApi, {apis: getApi('moduleId'), api:apiMap, clientId, token: getToken }) // 旧版api, 标识 为 moduleId
-Vue.use(request, {apis: getApi('service'), clientId, token: getToken}) // 新版api， 标识为 service , 接口服务名
-Vue.use(cellCmp)
-Vue.use(ImCmp)
-
+import Install_config from '@modules/module.config'
+import { Enum, OrgEnum, EnumList } from '@/utils/enum'
+import utils from 'xs-component/lib/utils'
+import base from 'xs-component/lib/base'
+import api from '@/automatically/api'
+import Vue from 'vue'
+import store from '../store/index'
+import {request, requestApi} from 'xs-request'
+import ossService from '@/utils/ossService'
+//  以上部分为 xs-component 引入
+base.install(api ? api : {}) // 请求及api映射
+
+// 字典， 调用方法， 取值缓存
+function getDicVal (name, value) {
+  store.dispatch('dic/GET_ASK', {props: name, value})
+}
+
+// 向ui组件库传值
+utils.install({
+  formatUtils: {Enum, OrgEnum, EnumList, format: Install_config.format ? Install_config.format: {}}, // Install_config.format 前端自定义枚举文件导出内容
+  dicUtils: getDicVal, //  字典工具
+  requestUtils: request, // 发送请求工具
+  ossUtils: ossService,  // oss 图片上传
+})
+
+
+import cellCmp from '@/plugins/row-col-cmp'
+import ImCmp from '@/plugins/im'
+
+import apiMap from '@/utils/api'
+
+import { getConfig } from '@/utils/global-config'
+import { getToken } from "@/utils/auth";
+
+let clientId = getConfig('CLIENT_ID')
+let apis = getConfig('apis')
+
+
+// 获取 标识： 服务地址的映射关系
+function getApi (type) {
+  let serviceObj = {}  // 服务名: 服务地址 映射关系 （新版）
+  let moduleObj = {} // 模块id: 服务地址 映射关系 （旧版）
+  for (const key in apis) {
+    // 服务名
+    let apiList = apis[key].EndPoint.split("/")
+    let serverkey = apiList[apiList.length - 2]
+    serviceObj[serverkey] = apis[key].EndPoint
+    //moduleId (模块id)
+    moduleObj[apis[key]['ModuleId']] = apis[key].EndPoint
+  }
+  if(type == 'service') return serviceObj
+  else if(type == 'moduleId') return moduleObj
+}
+
+// 向插件内部传值
+Vue.use(requestApi, {apis: getApi('moduleId'), api:apiMap, clientId, token: getToken }) // 旧版api, 标识 为 moduleId
+Vue.use(request, {apis: getApi('service'), clientId, token: getToken}) // 新版api， 标识为 service , 接口服务名
+Vue.use(cellCmp)
+Vue.use(ImCmp)
+

package/src/plugins/row-col-cmp/index.js

@@ -1,21 +1,21 @@
-import rowCmp from "./rowCmp";
-import colCmp from "./colCmp";
-
-export default {
-    install: function (Vue) {
-        Vue.component("rowCmp", rowCmp);
-        Vue.component("colCmp", colCmp);
-    }
-}
-
-// 调用如下：
-// <!-- <row-cmp :column='2'>
-// <col-cmp name="仓库编码1" :column='2'>{{ scope.row.code }}565656</col-cmp>
-// <col-cmp name="更新时间3" :column='2'>{{ scope.row.createTime | dateFormat("MM-DD HH:mm:ss") }}</col-cmp>
-// <col-cmp name="联电话电话" :column='2'>{{ scope.row.tel }}</col-cmp>
-// <col-cmp name="更新时间4" :column='2'>{{ scope.row.createTime | dateFormat("MM-DD HH:mm:ss") }}</col-cmp>
-// <col-cmp name="更新时间5" :column='2'>{{ scope.row.createTime | dateFormat("MM-DD HH:mm:ss") }}联系电话联系电话联系</col-cmp>
-// <col-cmp name="更新时间6" :column='2'>{{ scope.row.createTime | dateFormat("MM-DD HH:mm:ss") }}</col-cmp>
-// <col-cmp name="更新时间7" :column='2'>{{ scope.row.createTime | dateFormat("MM-DD HH:mm:ss") }}</col-cmp>
-// <col-cmp name="更新时间8" :column='2'>{{ scope.row.createTime | dateFormat("MM-DD HH:mm:ss") }}</col-cmp>
+import rowCmp from "./rowCmp";
+import colCmp from "./colCmp";
+
+export default {
+    install: function (Vue) {
+        Vue.component("rowCmp", rowCmp);
+        Vue.component("colCmp", colCmp);
+    }
+}
+
+// 调用如下：
+// <!-- <row-cmp :column='2'>
+// <col-cmp name="仓库编码1" :column='2'>{{ scope.row.code }}565656</col-cmp>
+// <col-cmp name="更新时间3" :column='2'>{{ scope.row.createTime | dateFormat("MM-DD HH:mm:ss") }}</col-cmp>
+// <col-cmp name="联电话电话" :column='2'>{{ scope.row.tel }}</col-cmp>
+// <col-cmp name="更新时间4" :column='2'>{{ scope.row.createTime | dateFormat("MM-DD HH:mm:ss") }}</col-cmp>
+// <col-cmp name="更新时间5" :column='2'>{{ scope.row.createTime | dateFormat("MM-DD HH:mm:ss") }}联系电话联系电话联系</col-cmp>
+// <col-cmp name="更新时间6" :column='2'>{{ scope.row.createTime | dateFormat("MM-DD HH:mm:ss") }}</col-cmp>
+// <col-cmp name="更新时间7" :column='2'>{{ scope.row.createTime | dateFormat("MM-DD HH:mm:ss") }}</col-cmp>
+// <col-cmp name="更新时间8" :column='2'>{{ scope.row.createTime | dateFormat("MM-DD HH:mm:ss") }}</col-cmp>
 // </row-cmp> -->

package/src/router/permission.js

@@ -1,126 +1,126 @@
-/**
- * 登录判断
- */
-import { getQuery } from "@/common/utils";
-import { getToken } from "@/utils/auth"; // get token from cookie
-import { getConfig } from "@/utils/global-config";
-import { getLocalStorage, setLocalStorage } from "@/utils/localStorage";
-import NProgress from "nprogress"; // progress bar
-import "nprogress/nprogress.css"; // progress bar style
-import Oidc from "oidc-client";
-import { requestApi as HTTP } from "xs-request";
-import router from "./index";
-
-NProgress.configure({
-  showSpinner: false,
-});
-
-const curOrigin = window.location.origin;
-const path = window.location.pathname;
-const _redirect_uri = `${curOrigin}${path}#/callback`;
-
-const id4config = {
-  authority: getConfig("ID4_AUTH"),
-  client_id: getConfig("CLIENT_ID"),
-  redirect_uri: _redirect_uri,
-  client_secret: getConfig("CLIENT_SECRET"),
-  response_type: "code",
-  scope: getConfig("ID4_SCOPE"),
-  response_mode: "query",
-};
-
-window.$mgr = new Oidc.UserManager(id4config);
-// NProgress Configuration
-const whiteList = ["/login", "/404", "/slienceAuth"]; // no redirect whitelist
-router.beforeEach((to, from, next) => {
-  const clientId = getConfig("CLIENT_ID");
-  const title = getLocalStorage(`title_${clientId}`);
-  if (title) { // 此处只作用于 ucuser项目
-    beforeInPage(title);
-  } else {
-    HTTP.get("api.GetProject", {
-      clientId,
-    }).then((res) => {
-      setLocalStorage(
-        `title_${clientId}`,
-        { title: res.data.title },
-        60 * 60 * 1000
-      );
-      beforeInPage(res.data);
-    });
-  }
-
-
-  const isLogin = getToken();    // title_js_ucmngvue 获取个项目token
-  const isLoginPage = whiteList.indexOf(to.path) !== -1; // 存在
-  if (to.path === '/home') {
-    if (window.parent !== window.self && window.name === 'qualityTestParty') {
-      next()
-    }
-  }
-  if (to.path === "/callback" || to.path === "/scan" || to.path === '/slienceAuth') next();
-  else if (isLogin && !isLoginPage) next();
-  // 登录 & 进入的不是登录页 => 不做处理
-  else if (!isLogin && isLoginPage) next();
-  // 没登录 & 在登录页 => 不做处理
-  else if (isLogin && isLoginPage) {
-    toTargetPage(to, next);
-  } // 登录 & 在登录页 => 跳转到目标页
-  else if (!isLogin && !isLoginPage) {
-    toLoginPage(to, next);
-
-  } // 没登录 & 没在登录页 => 跳转到登录页
-});
-
-router.afterEach(() => {
-  NProgress.done();
-});
-
-function beforeInPage(to, next) {
-  var url =
-    "https://id4lp194.365xs.cn/ucmng/ucvue/#/login?ReturnUrl=https%3A%2F%2Fid4lp194.365xs.cn%2Fucid4%2Fconnect%2Fauthorize%2Fcallback%3Fclient_id%3Djs_localvue%26redirect_uri%3Dhttp%253A%252F%252Flocalhost%253A9528%252F%2523%252Fcallback%253Fredic_url%253D%252Fhome%26response_type%3Dcode%26scope%3Daimng%2520commng%2520cpmng%2520cvmng%2520erpmng%2520hkmng%2520mtmng%2520otmng%2520rcmng%2520ucmng%2520ucuser%2520openid%2520profile%26state%3D561cf219797d4e33b5db795975180886%26code_challenge%3DYO8UTivoEb6jRFH9SS213zH_exJ6z4FfhTnUqZlL6EU%26code_challenge_method%3DS256%26response_mode%3Dquery";
-
-  // start progress bar
-  NProgress.start();
-  // set page title
-  const title = getConfig("PROJECT_NAME_TEXT") || "Vue Admin Template";
-  const pageTitle = to.title;
-  document.title = pageTitle ? `${pageTitle}` : `${title}`;
-}
-
-function toTargetPage(to, next) {
-  if (getConfig("ID4_LOGINTYPE")) {
-    next();
-  } else {
-    if (getConfig("NEW_LOGIN")) {
-      const redirectUrl = getQuery(to.fullPath, "redirect");
-      const isExtenalPage = redirectUrl.startsWith("http");
-      if (isExtenalPage) {
-        window.location = decodeURIComponent(redirectUrl);
-      } else {
-        next({ path: "/" });
-      }
-    }
-  }
-}
-
-function toLoginPage(to, next) {
-  // 使用 ID4 接管
-  if (getConfig("ID4_LOGINTYPE")) {
-    id4config.redirect_uri = `${id4config.redirect_uri}?redic_url=${to.path}`;
-    window.$mgr = new Oidc.UserManager(id4config);
-
-    window.$mgr.signinRedirect();
-  } else {
-    if (getConfig("NEW_LOGIN")) {
-      const redirectUrl = `${window.location.origin}${window.location.pathname}#/${to.path}`;
-      window.location = `${getConfig(
-        "USER_CENTER_URL"
-      )}/#/login?redirect=${redirectUrl}`
-        .replace(/\/{2}/gi, "/")
-        .replace(/(http:\/|https:\/)/gi, "$1/");
-    } else {
-      next(`/login?redirect=${to.path}`);
-    }
-  }
-}
+/**
+ * 登录判断
+ */
+import { getQuery } from "@/common/utils";
+import { getToken } from "@/utils/auth"; // get token from cookie
+import { getConfig } from "@/utils/global-config";
+import { getLocalStorage, setLocalStorage } from "@/utils/localStorage";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+import Oidc from "oidc-client";
+import { requestApi as HTTP } from "xs-request";
+import router from "./index";
+
+NProgress.configure({
+  showSpinner: false,
+});
+
+const curOrigin = window.location.origin;
+const path = window.location.pathname;
+const _redirect_uri = `${curOrigin}${path}#/callback`;
+
+const id4config = {
+  authority: getConfig("ID4_AUTH"),
+  client_id: getConfig("CLIENT_ID"),
+  redirect_uri: _redirect_uri,
+  client_secret: getConfig("CLIENT_SECRET"),
+  response_type: "code",
+  scope: getConfig("ID4_SCOPE"),
+  response_mode: "query",
+};
+
+window.$mgr = new Oidc.UserManager(id4config);
+// NProgress Configuration
+const whiteList = ["/login", "/404", "/slienceAuth"]; // no redirect whitelist
+router.beforeEach((to, from, next) => {
+  const clientId = getConfig("CLIENT_ID");
+  const title = getLocalStorage(`title_${clientId}`);
+  if (title) { // 此处只作用于 ucuser项目
+    beforeInPage(title);
+  } else {
+    HTTP.get("api.GetProject", {
+      clientId,
+    }).then((res) => {
+      setLocalStorage(
+        `title_${clientId}`,
+        { title: res.data.title },
+        60 * 60 * 1000
+      );
+      beforeInPage(res.data);
+    });
+  }
+
+
+  const isLogin = getToken();    // title_js_ucmngvue 获取个项目token
+  const isLoginPage = whiteList.indexOf(to.path) !== -1; // 存在
+  if (to.path === '/home') {
+    if (window.parent !== window.self && window.name === 'qualityTestParty') {
+      next()
+    }
+  }
+  if (to.path === "/callback" || to.path === "/scan" || to.path === '/slienceAuth') next();
+  else if (isLogin && !isLoginPage) next();
+  // 登录 & 进入的不是登录页 => 不做处理
+  else if (!isLogin && isLoginPage) next();
+  // 没登录 & 在登录页 => 不做处理
+  else if (isLogin && isLoginPage) {
+    toTargetPage(to, next);
+  } // 登录 & 在登录页 => 跳转到目标页
+  else if (!isLogin && !isLoginPage) {
+    toLoginPage(to, next);
+
+  } // 没登录 & 没在登录页 => 跳转到登录页
+});
+
+router.afterEach(() => {
+  NProgress.done();
+});
+
+function beforeInPage(to, next) {
+  var url =
+    "https://id4lp194.365xs.cn/ucmng/ucvue/#/login?ReturnUrl=https%3A%2F%2Fid4lp194.365xs.cn%2Fucid4%2Fconnect%2Fauthorize%2Fcallback%3Fclient_id%3Djs_localvue%26redirect_uri%3Dhttp%253A%252F%252Flocalhost%253A9528%252F%2523%252Fcallback%253Fredic_url%253D%252Fhome%26response_type%3Dcode%26scope%3Daimng%2520commng%2520cpmng%2520cvmng%2520erpmng%2520hkmng%2520mtmng%2520otmng%2520rcmng%2520ucmng%2520ucuser%2520openid%2520profile%26state%3D561cf219797d4e33b5db795975180886%26code_challenge%3DYO8UTivoEb6jRFH9SS213zH_exJ6z4FfhTnUqZlL6EU%26code_challenge_method%3DS256%26response_mode%3Dquery";
+
+  // start progress bar
+  NProgress.start();
+  // set page title
+  const title = getConfig("PROJECT_NAME_TEXT") || "Vue Admin Template";
+  const pageTitle = to.title;
+  document.title = pageTitle ? `${pageTitle}` : `${title}`;
+}
+
+function toTargetPage(to, next) {
+  if (getConfig("ID4_LOGINTYPE")) {
+    next();
+  } else {
+    if (getConfig("NEW_LOGIN")) {
+      const redirectUrl = getQuery(to.fullPath, "redirect");
+      const isExtenalPage = redirectUrl.startsWith("http");
+      if (isExtenalPage) {
+        window.location = decodeURIComponent(redirectUrl);
+      } else {
+        next({ path: "/" });
+      }
+    }
+  }
+}
+
+function toLoginPage(to, next) {
+  // 使用 ID4 接管
+  if (getConfig("ID4_LOGINTYPE")) {
+    id4config.redirect_uri = `${id4config.redirect_uri}?redic_url=${to.path}`;
+    window.$mgr = new Oidc.UserManager(id4config);
+
+    window.$mgr.signinRedirect();
+  } else {
+    if (getConfig("NEW_LOGIN")) {
+      const redirectUrl = `${window.location.origin}${window.location.pathname}#/${to.path}`;
+      window.location = `${getConfig(
+        "USER_CENTER_URL"
+      )}/#/login?redirect=${redirectUrl}`
+        .replace(/\/{2}/gi, "/")
+        .replace(/(http:\/|https:\/)/gi, "$1/");
+    } else {
+      next(`/login?redirect=${to.path}`);
+    }
+  }
+}

package/src/store/modules/dic.js

@@ -1,75 +1,75 @@
-/**
- * 功能： 字典功能
- * 服务对象： 列表页面上需要通过 id 去调用接口得到具体名称的 字段
- */
- import Vue from "vue";
- import request from "xs-request";
- const state = {
-   ask: {},
- };
- 
- const mutations = {
-   SET_ASK(state, { key, val }) {
-     if (state.ask[key]) {
-       state.ask[key] = state.ask[key].concat(val);
-     } else {
-       Vue.set(state.ask, key, val);
-     }
-   },
- };
- 
- // 正在运行的 dic 字典
- let dicing = [];
- const actions = {
-   GET_ASK({ state, commit }, { props, value }) {
-    if (!value || value == '0') return;
-     let servers = props[0] || "";
-     let tableName = props[1] || "";
-     let key = servers + tableName;
-     let row = dicing.find((item) => item.key == key); // 查看 项目字典运作中的是否存在
-     if (row) {
-       // 存在追加id
-       row.list.push(value);
-     } else {
-       row = { key, timer: null, list: [value] }; // 不存在， 创建
-       dicing.push(row);
-     }
-     if (row && row.timer != null) {
-       clearTimeout(row.timer);
-     }
-     row.timer = setTimeout(() => {
-       let url = servers + "/UserAll/Search/Dic/" + tableName;
-       let ids = [...new Set(row.list)];
-       request.post(url, ids).then((res) => {
-         if (res.code !== 0) return;
-         row.timer = clearTimeout(row.timer);
-         row.list = [];
-        let minusList = [];
-        if (res.data.length !== ids.length) {
-          // 库里查询回来为空
-          minusList = checkMinus(ids, res.data);
-        }
-        commit("SET_ASK", { key, val: [...res.data, ...minusList] });
-       });
-     }, 500);
-   },
- };
-/**
- * 判断两数据间的差值
- */
-function checkMinus(ids, resData) {
-  let resIds = resData.map((item) => item.id);
-  let minus = ids.filter((val) => resIds.indexOf(val) === -1);
-  let list = [];
-  minus.forEach((item) => {
-    list.push({ id: item, isNull: true });
-  });
-  return list;
-}
-
-export default {
-  namespaced: true,
-  state,
-  mutations,
-  actions,
+/**
+ * 功能： 字典功能
+ * 服务对象： 列表页面上需要通过 id 去调用接口得到具体名称的 字段
+ */
+ import Vue from "vue";
+ import request from "xs-request";
+ const state = {
+   ask: {},
+ };
+ 
+ const mutations = {
+   SET_ASK(state, { key, val }) {
+     if (state.ask[key]) {
+       state.ask[key] = state.ask[key].concat(val);
+     } else {
+       Vue.set(state.ask, key, val);
+     }
+   },
+ };
+ 
+ // 正在运行的 dic 字典
+ let dicing = [];
+ const actions = {
+   GET_ASK({ state, commit }, { props, value }) {
+    if (!value || value == '0') return;
+     let servers = props[0] || "";
+     let tableName = props[1] || "";
+     let key = servers + tableName;
+     let row = dicing.find((item) => item.key == key); // 查看 项目字典运作中的是否存在
+     if (row) {
+       // 存在追加id
+       row.list.push(value);
+     } else {
+       row = { key, timer: null, list: [value] }; // 不存在， 创建
+       dicing.push(row);
+     }
+     if (row && row.timer != null) {
+       clearTimeout(row.timer);
+     }
+     row.timer = setTimeout(() => {
+       let url = servers + "/UserAll/Search/Dic/" + tableName;
+       let ids = [...new Set(row.list)];
+       request.post(url, ids).then((res) => {
+         if (res.code !== 0) return;
+         row.timer = clearTimeout(row.timer);
+         row.list = [];
+        let minusList = [];
+        if (res.data.length !== ids.length) {
+          // 库里查询回来为空
+          minusList = checkMinus(ids, res.data);
+        }
+        commit("SET_ASK", { key, val: [...res.data, ...minusList] });
+       });
+     }, 500);
+   },
+ };
+/**
+ * 判断两数据间的差值
+ */
+function checkMinus(ids, resData) {
+  let resIds = resData.map((item) => item.id);
+  let minus = ids.filter((val) => resIds.indexOf(val) === -1);
+  let list = [];
+  minus.forEach((item) => {
+    list.push({ id: item, isNull: true });
+  });
+  return list;
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
 }

package/src/store/modules/oss.js

@@ -1,41 +1,41 @@
-/**
- * 功能: oss 图片上次
- * 使用对象： 需要将图片上传到 oss 存放的项目 
- * 数据存放再 store 原因： 在token 的有效期间内（通过比较时间戳)， 不再发起获取 oss-token 的请求
- */
-
- const state = {
-    ossCfg: {
-        region: null,
-        accessKeyId: null,
-        accessKeySecret: null,
-        bucket: null,
-        stsToken: null,
-        timeout: 0,
-        baseDir: ''
-    }
- };
-
- const getters = {
-    ossCfg: state => state.ossCfg
- }
- 
- const mutations = {
-    SET_OSS (state, value) { // 存放 oss 的校验信息
-        state.ossCfg = value
-    }
- };
- 
- const actions = {
-    
- };
- 
- 
- export default {
-   namespaced: true,
-   state,
-   mutations,
-   actions,
-   getters
- };
+/**
+ * 功能: oss 图片上次
+ * 使用对象： 需要将图片上传到 oss 存放的项目 
+ * 数据存放再 store 原因： 在token 的有效期间内（通过比较时间戳)， 不再发起获取 oss-token 的请求
+ */
+
+ const state = {
+    ossCfg: {
+        region: null,
+        accessKeyId: null,
+        accessKeySecret: null,
+        bucket: null,
+        stsToken: null,
+        timeout: 0,
+        baseDir: ''
+    }
+ };
+
+ const getters = {
+    ossCfg: state => state.ossCfg
+ }
+ 
+ const mutations = {
+    SET_OSS (state, value) { // 存放 oss 的校验信息
+        state.ossCfg = value
+    }
+ };
+ 
+ const actions = {
+    
+ };
+ 
+ 
+ export default {
+   namespaced: true,
+   state,
+   mutations,
+   actions,
+   getters
+ };