vue2-client 1.0.0 → 1.2.1

package/src/base-client/plugins/AppData.js

@@ -1,69 +1,69 @@
-import { post } from '@/services/api/restTools'
-import { manageApi } from '@/services/api/manage'
-import { commonApi } from '@/services/api/common'
-
-const GetAppDataService = {
-  install (Vue) {
-    // 给vue增添对话框显示方法
-    Vue.$appdata = Vue.prototype.$appdata = GetAppDataService
-  },
-  async load () {
-    const params = {}
-    // 查询燃气公司列表
-    const orgList = []
-    await post(manageApi.orgList, {}).then(async res => {
-      for (let i = 0, len = res.length; i < len; i++) {
-        orgList.push({
-          label: res[i],
-          value: res[i],
-          text: res[i]
-        })
-      }
-      params['orgList'] = orgList
-      await post(commonApi.getDictionaryValue, {}).then((res) => {
-        Object.assign(params, res)
-        const badgeItemArray = {}
-        for (const key of Object.keys(params)) {
-          badgeItemArray[key] = {}
-          for (const item of params[key]) {
-            if (item.status) {
-              badgeItemArray[key][item.value] = {
-                status: item.status,
-                text: item.text
-              }
-            }
-          }
-        }
-        // 追加参数
-        localStorage.setItem(process.env.VUE_APP_DICTIONARY_KEY, JSON.stringify(params))
-        localStorage.setItem(process.env.VUE_APP_BADGE_KEY, JSON.stringify(badgeItemArray))
-      })
-    })
-  },
-  getDictionaryList (key) {
-    const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)
-    const object = JSON.parse(str)
-    return object[key]
-  },
-  getParam (key, value) {
-    const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
-    const object = JSON.parse(str)
-    const result = object[key]
-    if (result && result.hasOwnProperty(value)) {
-      return result[value]
-    } else {
-      return null
-    }
-  },
-  getParams () {
-    const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)
-    const object = JSON.parse(str)
-    return object
-  },
-  getSingleValues () {
-    const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
-    const object = JSON.parse(str)
-    return object
-  }
-}
-export default GetAppDataService
+import { post } from '@vue2-client/services/api/restTools'
+import { manageApi } from '@vue2-client/services/api/manage'
+import { commonApi } from '@vue2-client/services/api/common'
+
+const GetAppDataService = {
+  install (Vue) {
+    // 给vue增添对话框显示方法
+    Vue.$appdata = Vue.prototype.$appdata = GetAppDataService
+  },
+  async load () {
+    const params = {}
+    // 查询燃气公司列表
+    const orgList = []
+    await post(manageApi.orgList, {}).then(async res => {
+      for (let i = 0, len = res.length; i < len; i++) {
+        orgList.push({
+          label: res[i],
+          value: res[i],
+          text: res[i]
+        })
+      }
+      params['orgList'] = orgList
+      await post(commonApi.getDictionaryValue, {}).then((res) => {
+        Object.assign(params, res)
+        const badgeItemArray = {}
+        for (const key of Object.keys(params)) {
+          badgeItemArray[key] = {}
+          for (const item of params[key]) {
+            if (item.status) {
+              badgeItemArray[key][item.value] = {
+                status: item.status,
+                text: item.text
+              }
+            }
+          }
+        }
+        // 追加参数
+        localStorage.setItem(process.env.VUE_APP_DICTIONARY_KEY, JSON.stringify(params))
+        localStorage.setItem(process.env.VUE_APP_BADGE_KEY, JSON.stringify(badgeItemArray))
+      })
+    })
+  },
+  getDictionaryList (key) {
+    const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)
+    const object = JSON.parse(str)
+    return object[key]
+  },
+  getParam (key, value) {
+    const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
+    const object = JSON.parse(str)
+    const result = object[key]
+    if (result && result.hasOwnProperty(value)) {
+      return result[value]
+    } else {
+      return null
+    }
+  },
+  getParams () {
+    const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)
+    const object = JSON.parse(str)
+    return object
+  },
+  getSingleValues () {
+    const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
+    const object = JSON.parse(str)
+    return object
+  }
+}
+export default GetAppDataService

package/src/base-client/plugins/GetLoginInfoService.js

@@ -1,222 +1,221 @@
-import Vue from 'vue'
-import { SEARCH } from '@/services/api'
-import { post } from '@/services/api/restTools'
-import store from '@/store'
-
-const loginGen = async function (response) {
-  Vue.$login.f = response
-  await Promise.all([Vue.$appdata.load(), getGasman(), getLic(), getViewDetails()])
-  const login = {
-    f: Vue.$login.f,
-    jwt: Vue.$login.f.id,
-    r: Vue.$login.r
-  }
-  store.commit('account/setLogin', login)
-}
-
-/**
- * 获取片区
- * @returns {Promise<void>}
- */
-// eslint-disable-next-line
-async function getAllArea () {
-  try {
-    const getAllArea = await post(SEARCH, {
-      source: 'this.getParentByType($organization$).getChildByName($片区$).getChildren()',
-      userid: Vue.$login.f.id
-    })
-    const areaTemp = []
-    for (let i = 0; i < getAllArea.length; i++) {
-      areaTemp.push({ label: getAllArea[i].name, value: getAllArea[i] })
-    }
-    Vue.$login.f.f_allArea = areaTemp
-  } catch (error) {
-    Vue.$login.f.f_allArea = []
-    console.log('获取片区异常', error)
-  }
-}
-/**
- * 获取抄表员
- * @returns {Promise<void>}
- */
-async function getGasman () {
-  try {
-    const getGasman = await post(SEARCH, {
-      source: 'this.getParentByType($organization$).getChildByName($抄表员$).getUsers()',
-      userid: Vue.$login.f.id
-    })
-    const gasman = []
-    for (let i = 0; i < getGasman.length; i++) {
-      gasman.push(getGasman[i])
-    }
-    Vue.$login.f.f_gasman = gasman
-  } catch (error) {
-    Vue.$login.f.f_gasman = []
-    console.log('获取抄表员异常', error)
-  }
-}
-/**
- * 获取资源服务权限
- * @returns {Promise<void>}
- */
-async function getLic () {
-  try {
-    const getLic = await post(SEARCH, { data: {
-        source: 'this.getRights().where(row.getType()==$function$ && row.getPath($name$).indexOf($资源操作$) != -1)',
-        userid: Vue.$login.f.id
-      } }, { resolveMsg: null, rejectMsg: null })
-    const arry = []
-    getLic.forEach((item) => {
-      arry.push(item.name)
-    })
-    Vue.$login.f.lics = arry
-  } catch (error) {
-    Vue.$login.f.f_gasman = []
-    console.log('获取资源服务权限异常', error)
-  }
-}
-/**
- * 获取界面细节 (界面权限)
- * @returns {Promise<void>}
- */
-async function getViewDetails () {
-  try {
-    const viewDetails = await post(SEARCH, {
-      source: 'this.getRights().where(row.getType()==$function$ && row.getPath($name$).indexOf($功能权限$) != -1)',
-      userid: Vue.$login.f.id
-    }, { resolveMsg: null, rejectMsg: null })
-    const r = viewDetails
-    Vue.$login.r = []
-    r.forEach(x => Vue.$login.r.push(x.name))
-  } catch (error) {
-    Vue.$login.r = []
-    console.log('获取界面细节异常', error)
-  }
-}
-/**
- * 获取资源功能
- * @returns {Promise<void>}
- */
-async function getResourceFunction () {
-  try {
-    const resourceFunction = await post(SEARCH, {
-      source: 'tool.getFullTree(this.getRights().where(row.getName() == $组织管理$||row.getName() == $功能管理$||row.getName() == $部门管理$ || row.getName() == $角色管理$ || row.getName() == $人员管理$|| row.getName() == $资源调配$ ))',
-      userid: Vue.$login.f.id
-    }, { resolveMsg: null, rejectMsg: null })
-    return resourceFunction
-  } catch (error) {
-    console.log('获取资源功能异常', error)
-  }
-}
-
-const GetLoginInfoService = {
-  install (Vue) {
-    // 给vue增添对话框显示方法
-    Vue.$login = Vue.prototype.$login = GetLoginInfoService
-  },
-
-  f: {
-
-  },
-
-  login (response) {
-    return loginGen(response)
-  },
-
-  convertToIn (val) {
-    let temp = ''
-    if (val instanceof Array) {
-      if (val.length >= 1) {
-        temp = '('
-        val.forEach((res) => {
-          temp += `'${res}',`
-        })
-        temp = temp.substr(0, temp.length - 1) + ')'
-      }
-    }
-    return temp
-  },
-  toStandardTimeString () {
-    const dt = new Date()
-    const month = dt.getMonth() + 1
-    const date = dt.getDate()
-    const hour = dt.getHours()
-    const min = dt.getMinutes()
-    const sec = dt.getSeconds()
-    return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date) +
-      ' ' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
-  },
-
-  guid () {
-    const buf = new Uint16Array(8)
-    window.crypto.getRandomValues(buf)
-    const S4 = function (num) {
-      let ret = num.toString()
-      while (ret.length < 4) {
-        ret = '0' + ret
-      }
-      return ret
-    }
-    return (S4(buf[0]) + S4(buf[1]) + S4(buf[2]) + S4(buf[3]) + S4(buf[4]) + S4(buf[5]) + S4(buf[6]) + S4(buf[7]))
-  },
-  required (param) {
-    if (typeof param === 'number' && param === 0) {
-      return false
-    }
-    if (!param) {
-      return true
-    }
-    param = param + ''
-    param = param.trim()
-    return !param
-  },
-
-  isInt (n) {
-    return !window.isNaN(n) && n % 1 === 0
-  },
-
-  // 不能选择器中截取掉多余的字符
-  orgName (name) {
-    return name.substring(10)
-  },
-
-  addDate (date, days) {
-    // 求取当前时间的工具
-    let endDate = new Date(date)
-    endDate = endDate.valueOf()
-    endDate = endDate + days * 24 * 60 * 60 * 1000
-    endDate = new Date(endDate)
-    const month = endDate.getMonth() + 1
-    const day = endDate.getDate()
-    const hour = endDate.getHours()
-    const min = endDate.getMinutes()
-    const sec = endDate.getSeconds()
-    return endDate.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (day < 10 ? '0' + day : day) +
-      ' ' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
-    // return a
-  },
-
-  // 对字符串进行加密
-  compileStr (code) {
-    let c = String.fromCharCode(code.charCodeAt(0) + code.length)
-    for (let i = 1; i < code.length; i++) {
-      c += String.fromCharCode(code.charCodeAt(i) + code.charCodeAt(i - 1))
-    }
-    return escape(c)
-  },
-
-  // 字符串进行解密
-  uncompileStr (code) {
-    code = unescape(code)
-    let c = String.fromCharCode(code.charCodeAt(0) - code.length)
-    for (let i = 1; i < code.length; i++) {
-      c += String.fromCharCode(code.charCodeAt(i) - c.charCodeAt(i - 1))
-    }
-    return c
-  }
-}
-
-export default GetLoginInfoService
-export {
-  getResourceFunction
-}
+import Vue from 'vue'
+import { SEARCH } from '@vue2-client/services/api'
+import { post } from '@vue2-client/services/api/restTools'
+
+const loginGen = async function (response) {
+  Vue.$login.f = response
+  await Promise.all([Vue.$appdata.load(), getGasman(), getLic(), getViewDetails()])
+  const login = {
+    f: Vue.$login.f,
+    jwt: Vue.$login.f.id,
+    r: Vue.$login.r
+  }
+  Vue.$store.commit('account/setLogin', login)
+}
+
+/**
+ * 获取片区
+ * @returns {Promise<void>}
+ */
+// eslint-disable-next-line
+async function getAllArea () {
+  try {
+    const getAllArea = await post(SEARCH, {
+      source: 'this.getParentByType($organization$).getChildByName($片区$).getChildren()',
+      userid: Vue.$login.f.id
+    })
+    const areaTemp = []
+    for (let i = 0; i < getAllArea.length; i++) {
+      areaTemp.push({ label: getAllArea[i].name, value: getAllArea[i] })
+    }
+    Vue.$login.f.f_allArea = areaTemp
+  } catch (error) {
+    Vue.$login.f.f_allArea = []
+    console.log('获取片区异常', error)
+  }
+}
+/**
+ * 获取抄表员
+ * @returns {Promise<void>}
+ */
+async function getGasman () {
+  try {
+    const getGasman = await post(SEARCH, {
+      source: 'this.getParentByType($organization$).getChildByName($抄表员$).getUsers()',
+      userid: Vue.$login.f.id
+    })
+    const gasman = []
+    for (let i = 0; i < getGasman.length; i++) {
+      gasman.push(getGasman[i])
+    }
+    Vue.$login.f.f_gasman = gasman
+  } catch (error) {
+    Vue.$login.f.f_gasman = []
+    console.log('获取抄表员异常', error)
+  }
+}
+/**
+ * 获取资源服务权限
+ * @returns {Promise<void>}
+ */
+async function getLic () {
+  try {
+    const getLic = await post(SEARCH, { data: {
+        source: 'this.getRights().where(row.getType()==$function$ && row.getPath($name$).indexOf($资源操作$) != -1)',
+        userid: Vue.$login.f.id
+      } }, { resolveMsg: null, rejectMsg: null })
+    const arry = []
+    getLic.forEach((item) => {
+      arry.push(item.name)
+    })
+    Vue.$login.f.lics = arry
+  } catch (error) {
+    Vue.$login.f.f_gasman = []
+    console.log('获取资源服务权限异常', error)
+  }
+}
+/**
+ * 获取界面细节 (界面权限)
+ * @returns {Promise<void>}
+ */
+async function getViewDetails () {
+  try {
+    const viewDetails = await post(SEARCH, {
+      source: 'this.getRights().where(row.getType()==$function$ && row.getPath($name$).indexOf($功能权限$) != -1)',
+      userid: Vue.$login.f.id
+    }, { resolveMsg: null, rejectMsg: null })
+    const r = viewDetails
+    Vue.$login.r = []
+    r.forEach(x => Vue.$login.r.push(x.name))
+  } catch (error) {
+    Vue.$login.r = []
+    console.log('获取界面细节异常', error)
+  }
+}
+/**
+ * 获取资源功能
+ * @returns {Promise<void>}
+ */
+async function getResourceFunction () {
+  try {
+    const resourceFunction = await post(SEARCH, {
+      source: 'tool.getFullTree(this.getRights().where(row.getName() == $组织管理$||row.getName() == $功能管理$||row.getName() == $部门管理$ || row.getName() == $角色管理$ || row.getName() == $人员管理$|| row.getName() == $资源调配$ ))',
+      userid: Vue.$login.f.id
+    }, { resolveMsg: null, rejectMsg: null })
+    return resourceFunction
+  } catch (error) {
+    console.log('获取资源功能异常', error)
+  }
+}
+
+const GetLoginInfoService = {
+  install (Vue) {
+    // 给vue增添对话框显示方法
+    Vue.$login = Vue.prototype.$login = GetLoginInfoService
+  },
+
+  f: {
+
+  },
+
+  login (response) {
+    return loginGen(response)
+  },
+
+  convertToIn (val) {
+    let temp = ''
+    if (val instanceof Array) {
+      if (val.length >= 1) {
+        temp = '('
+        val.forEach((res) => {
+          temp += `'${res}',`
+        })
+        temp = temp.substr(0, temp.length - 1) + ')'
+      }
+    }
+    return temp
+  },
+  toStandardTimeString () {
+    const dt = new Date()
+    const month = dt.getMonth() + 1
+    const date = dt.getDate()
+    const hour = dt.getHours()
+    const min = dt.getMinutes()
+    const sec = dt.getSeconds()
+    return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date) +
+      ' ' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
+  },
+
+  guid () {
+    const buf = new Uint16Array(8)
+    window.crypto.getRandomValues(buf)
+    const S4 = function (num) {
+      let ret = num.toString()
+      while (ret.length < 4) {
+        ret = '0' + ret
+      }
+      return ret
+    }
+    return (S4(buf[0]) + S4(buf[1]) + S4(buf[2]) + S4(buf[3]) + S4(buf[4]) + S4(buf[5]) + S4(buf[6]) + S4(buf[7]))
+  },
+  required (param) {
+    if (typeof param === 'number' && param === 0) {
+      return false
+    }
+    if (!param) {
+      return true
+    }
+    param = param + ''
+    param = param.trim()
+    return !param
+  },
+
+  isInt (n) {
+    return !window.isNaN(n) && n % 1 === 0
+  },
+
+  // 不能选择器中截取掉多余的字符
+  orgName (name) {
+    return name.substring(10)
+  },
+
+  addDate (date, days) {
+    // 求取当前时间的工具
+    let endDate = new Date(date)
+    endDate = endDate.valueOf()
+    endDate = endDate + days * 24 * 60 * 60 * 1000
+    endDate = new Date(endDate)
+    const month = endDate.getMonth() + 1
+    const day = endDate.getDate()
+    const hour = endDate.getHours()
+    const min = endDate.getMinutes()
+    const sec = endDate.getSeconds()
+    return endDate.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (day < 10 ? '0' + day : day) +
+      ' ' + (hour < 10 ? '0' + hour : hour) + ':' + (min < 10 ? '0' + min : min) + ':' + (sec < 10 ? '0' + sec : sec)
+    // return a
+  },
+
+  // 对字符串进行加密
+  compileStr (code) {
+    let c = String.fromCharCode(code.charCodeAt(0) + code.length)
+    for (let i = 1; i < code.length; i++) {
+      c += String.fromCharCode(code.charCodeAt(i) + code.charCodeAt(i - 1))
+    }
+    return escape(c)
+  },
+
+  // 字符串进行解密
+  uncompileStr (code) {
+    code = unescape(code)
+    let c = String.fromCharCode(code.charCodeAt(0) - code.length)
+    for (let i = 1; i < code.length; i++) {
+      c += String.fromCharCode(code.charCodeAt(i) - c.charCodeAt(i - 1))
+    }
+    return c
+  }
+}
+
+export default GetLoginInfoService
+export {
+  getResourceFunction
+}

package/src/base-client/plugins/index.js

@@ -1,21 +1,21 @@
-import GetLoginInfoService from '@/base-client/plugins/GetLoginInfoService'
-import GetAppDataService from '@/base-client/plugins/AppData'
-import getConfig from '@/base-client/plugins/Config'
-import moment from '@/base-client/plugins/moment'
-
-import VueI18nPlugin from './i18n-extend'
-import AuthorityPlugin from './authority-plugin'
-import TabsPagePlugin from './tabs-page-plugin'
-
-const Plugins = {
-  install: function (Vue) {
-    Vue.use(GetLoginInfoService)
-    Vue.use(GetAppDataService)
-    Vue.use(getConfig)
-    Vue.use(moment)
-    Vue.use(VueI18nPlugin)
-    Vue.use(AuthorityPlugin)
-    Vue.use(TabsPagePlugin)
-  }
-}
-export default Plugins
+import GetLoginInfoService from '@vue2-client/base-client/plugins/GetLoginInfoService'
+import GetAppDataService from '@vue2-client/base-client/plugins/AppData'
+import getConfig from '@vue2-client/base-client/plugins/Config'
+import moment from '@vue2-client/base-client/plugins/moment'
+
+import VueI18nPlugin from './i18n-extend'
+import AuthorityPlugin from './authority-plugin'
+import TabsPagePlugin from './tabs-page-plugin'
+
+const Plugins = {
+  install: function (Vue) {
+    Vue.use(GetLoginInfoService)
+    Vue.use(GetAppDataService)
+    Vue.use(getConfig)
+    Vue.use(moment)
+    Vue.use(VueI18nPlugin)
+    Vue.use(AuthorityPlugin)
+    Vue.use(TabsPagePlugin)
+  }
+}
+export default Plugins

package/src/bootstrap.js

@@ -1,7 +1,8 @@
-import { loadRoutes, loadGuards, setAppOptions } from '@/utils/routerUtil'
-import { loadInterceptors } from '@/utils/request'
-import guards from '@/router/guards'
-import interceptors from '@/utils/axios-interceptors'
+import Vue from 'vue'
+import { loadRoutes, loadGuards, setAppOptions } from '@vue2-client/utils/routerUtil'
+import { loadInterceptors } from '@vue2-client/utils/request'
+import guards from '@vue2-client/router/guards'
+import interceptors from '@vue2-client/utils/axios-interceptors'
 
 /**
  * 启动引导方法
@@ -12,6 +13,7 @@ import interceptors from '@/utils/axios-interceptors'
  * @param i18n 应用的 message 实例
  */
 function bootstrap ({ router, store, i18n, message }) {
+  Vue.$store = store
   // 设置应用配置
   setAppOptions({ router, store, i18n })
   // 加载 axios 拦截器