vue2-client 1.8.166 → 1.8.167

package/src/utils/login.js

@@ -1,141 +1,141 @@
-import { getRoutesConfig, login } from '@vue2-client/services/user'
-import { loadRoutes, funcToRouter } from '@vue2-client/utils/routerUtil'
-import JSEncrypt from 'jsencrypt'
-import { positions } from '@vue2-client/mock/common'
-import { timeFix } from '@vue2-client/utils/util'
-import { indexedDB } from '@vue2-client/utils/indexedDB'
-import Vue from 'vue'
-import { message } from 'ant-design-vue'
-import {
-  ACCESS_TOKEN,
-  V4_ACCESS_TOKEN,
-} from '@vue2-client/store/mutation-types'
-// 认证类型
-const AUTH_TYPE = {
-  BEARER: 'Bearer',
-  BASIC: 'basic',
-  AUTH1: 'auth1',
-  AUTH2: 'auth2',
-}
-export function checkSingleAuthorization (authType = AUTH_TYPE.BEARER) {
-  switch (authType) {
-    case AUTH_TYPE.BEARER:
-      if (localStorage.getItem(V4_ACCESS_TOKEN)) {
-        return true
-      }
-      break
-    case AUTH_TYPE.BASIC:
-    case AUTH_TYPE.AUTH1:
-    case AUTH_TYPE.AUTH2:
-    default:
-      break
-  }
-  return false
-}
-function setSingleAuthorization (auth, authType = AUTH_TYPE.BEARER) {
-  switch (authType) {
-    case AUTH_TYPE.BEARER:
-      localStorage.setItem(V4_ACCESS_TOKEN, 'Bearer ' + auth.token)
-      break
-    case AUTH_TYPE.BASIC:
-    case AUTH_TYPE.AUTH1:
-    case AUTH_TYPE.AUTH2:
-    default:
-      break
-  }
-}
-function setAccessToken (data) {
-  if (data) {
-    localStorage.setItem(ACCESS_TOKEN, data)
-    let timestamp = new Date().getTime() // 当前的时间戳
-    timestamp = timestamp + 12 * 60 * 60 * 1000
-    // 格式化时间获取年月日, 登陆过期时间
-    const dateAfter = new Date(timestamp)
-    setSingleAuthorization({ token: data, expireAt: dateAfter })
-  }
-}
-function afterGeneral (result, options) {
-  const { password, store } = options
-  const user = Object.assign(
-    {
-      id: result.id,
-      username: result.ename,
-      password: password,
-      name: result.name,
-      avatar:
-        'https://gw.alipayobjects.com/zos/rmsportal/jZUIxmJycoymBprLOUbT.png',
-      address: '西安市',
-      position: positions[0],
-    },
-    result
-  )
-  const setUser = store._mutations['account/setUser'][0]
-  const setPermissions = store._mutations['account/setPermissions'][0]
-  const setRoles = store._mutations['account/setRoles'][0]
-  setUser(user)
-  setPermissions([{ id: 'queryForm', operation: ['add', 'edit'] }])
-  setRoles([{ id: 'admin', operation: ['add', 'edit', 'delete'] }])
-  loadRoutes(funcToRouter(user.functions))
-  // 每次重新登录时，清除indexedDB缓存
-  indexedDB.clear()
-  message.success(timeFix().CN + `，${result.name} 欢迎回来`, 3)
-}
-function afterLogin (res, options) {
-  const { name, password, store, router, pathname } = options
-  const setting = store.state.setting
-  const loginRes = res.states
-  if (loginRes === '登录成功') {
-    const encrypt = new JSEncrypt()
-    encrypt.setPublicKey(
-      'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB'
-    )
-    const data = encrypt.encrypt(
-      JSON.stringify({ username: name, password: password })
-    )
-    // 获取路由配置
-    getRoutesConfig(data, setting.routeName)
-      .then((result) => {
-        Vue.$login
-          .login(result)
-          .then(() => {
-            // V3任何情况首位加入资源管理
-            const resourceManageMain = {
-              name: '资源管理',
-              icon: 'api',
-              position: 1,
-              link: 'resourceManageMain',
-            }
-            result.functions.unshift(resourceManageMain)
-            afterGeneral(result, options)
-            setAccessToken(data)
-            if (result.deps === '用户工单登记') {
-              router.push(setting.ticketPage).catch(() => {
-              })
-            } else {
-              console.log('去往的页面', pathname)
-              router.push(pathname).catch(() => {
-              })
-            }
-          })
-          .finally(() => {
-          })
-      })
-      .catch((res) => {
-      })
-  }
-}
-export function startLogin (options) {
-  const { name, password, store } = options
-  const setting = store.state.setting
-  switch (setting.compatible) {
-    case 'V2':
-    case 'V3': {
-      login(name, password)
-        .then((res) => {
-          afterLogin(res, options)
-        })
-        .catch((msg) => {})
-      break
-    }
-  }
-}
+import { getRoutesConfig, login } from '@vue2-client/services/user'
+import { loadRoutes, funcToRouter } from '@vue2-client/utils/routerUtil'
+import JSEncrypt from 'jsencrypt'
+import { positions } from '@vue2-client/mock/common'
+import { timeFix } from '@vue2-client/utils/util'
+import { indexedDB } from '@vue2-client/utils/indexedDB'
+import Vue from 'vue'
+import { message } from 'ant-design-vue'
+import {
+  ACCESS_TOKEN,
+  V4_ACCESS_TOKEN,
+} from '@vue2-client/store/mutation-types'
+// 认证类型
+const AUTH_TYPE = {
+  BEARER: 'Bearer',
+  BASIC: 'basic',
+  AUTH1: 'auth1',
+  AUTH2: 'auth2',
+}
+export function checkSingleAuthorization (authType = AUTH_TYPE.BEARER) {
+  switch (authType) {
+    case AUTH_TYPE.BEARER:
+      if (localStorage.getItem(V4_ACCESS_TOKEN)) {
+        return true
+      }
+      break
+    case AUTH_TYPE.BASIC:
+    case AUTH_TYPE.AUTH1:
+    case AUTH_TYPE.AUTH2:
+    default:
+      break
+  }
+  return false
+}
+function setSingleAuthorization (auth, authType = AUTH_TYPE.BEARER) {
+  switch (authType) {
+    case AUTH_TYPE.BEARER:
+      localStorage.setItem(V4_ACCESS_TOKEN, 'Bearer ' + auth.token)
+      break
+    case AUTH_TYPE.BASIC:
+    case AUTH_TYPE.AUTH1:
+    case AUTH_TYPE.AUTH2:
+    default:
+      break
+  }
+}
+function setAccessToken (data) {
+  if (data) {
+    localStorage.setItem(ACCESS_TOKEN, data)
+    let timestamp = new Date().getTime() // 当前的时间戳
+    timestamp = timestamp + 12 * 60 * 60 * 1000
+    // 格式化时间获取年月日, 登陆过期时间
+    const dateAfter = new Date(timestamp)
+    setSingleAuthorization({ token: data, expireAt: dateAfter })
+  }
+}
+function afterGeneral (result, options) {
+  const { password, store } = options
+  const user = Object.assign(
+    {
+      id: result.id,
+      username: result.ename,
+      password: password,
+      name: result.name,
+      avatar:
+        'https://gw.alipayobjects.com/zos/rmsportal/jZUIxmJycoymBprLOUbT.png',
+      address: '西安市',
+      position: positions[0],
+    },
+    result
+  )
+  const setUser = store._mutations['account/setUser'][0]
+  const setPermissions = store._mutations['account/setPermissions'][0]
+  const setRoles = store._mutations['account/setRoles'][0]
+  setUser(user)
+  setPermissions([{ id: 'queryForm', operation: ['add', 'edit'] }])
+  setRoles([{ id: 'admin', operation: ['add', 'edit', 'delete'] }])
+  loadRoutes(funcToRouter(user.functions))
+  // 每次重新登录时，清除indexedDB缓存
+  indexedDB.clear()
+  message.success(timeFix().CN + `，${result.name} 欢迎回来`, 3)
+}
+function afterLogin (res, options) {
+  const { name, password, store, router, pathname } = options
+  const setting = store.state.setting
+  const loginRes = res.states
+  if (loginRes === '登录成功') {
+    const encrypt = new JSEncrypt()
+    encrypt.setPublicKey(
+      'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB'
+    )
+    const data = encrypt.encrypt(
+      JSON.stringify({ username: name, password: password })
+    )
+    // 获取路由配置
+    getRoutesConfig(data, setting.routeName)
+      .then((result) => {
+        Vue.$login
+          .login(result)
+          .then(() => {
+            // V3任何情况首位加入资源管理
+            const resourceManageMain = {
+              name: '资源管理',
+              icon: 'api',
+              position: 1,
+              link: 'resourceManageMain',
+            }
+            result.functions.unshift(resourceManageMain)
+            afterGeneral(result, options)
+            setAccessToken(data)
+            if (result.deps === '用户工单登记') {
+              router.push(setting.ticketPage).catch(() => {
+              })
+            } else {
+              console.log('去往的页面', pathname)
+              router.push(pathname).catch(() => {
+              })
+            }
+          })
+          .finally(() => {
+          })
+      })
+      .catch((res) => {
+      })
+  }
+}
+export function startLogin (options) {
+  const { name, password, store } = options
+  const setting = store.state.setting
+  switch (setting.compatible) {
+    case 'V2':
+    case 'V3': {
+      login(name, password)
+        .then((res) => {
+          afterLogin(res, options)
+        })
+        .catch((msg) => {})
+      break
+    }
+  }
+}

package/src/utils/map-utils.js

@@ -1,47 +1,47 @@
-import AMapLoader from '@amap/amap-jsapi-loader'
-let Amap
-async function GetGDMap (secretKey, key) {
-  if (!Amap) {
-    window._AMapSecurityConfig = {
-      securityJsCode: secretKey
-    }
-    //  解决高德地图加载报错 ---> 禁止多种API加载方式混用
-    AMapLoader.reset()
-    Amap = await AMapLoader.load({
-      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
-      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
-        'AMap.ToolBar', 'AMap.Geolocation', 'AMap.MouseTool',
-        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-      AMapUI: {
-        version: '1.1', // AMapUI 缺省 1.1
-        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
-      }
-    })
-  }
-  return Amap
-}
-
-async function getGDMap (address) {
-  new (await GetGDMap()).Geocoder({
-    radius: 500 // 范围，默认：500
-  }).getLocation(address, function (status, result) {
-    if (status === 'complete' && result.geocodes.length) {
-      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
-    } else {
-      // eslint-disable-next-line prefer-promise-reject-errors
-      throw new Error('根据经纬度查询地址失败')
-    }
-  })
-}
-
-async function GetLocation (address) {
-  return new Promise((resolve, reject) => {
-    try {
-      resolve(getGDMap(address))
-    } catch (e) {
-      reject(e)
-    }
-  })
-}
-export { GetGDMap, GetLocation }
+import AMapLoader from '@amap/amap-jsapi-loader'
+let Amap
+async function GetGDMap (secretKey, key) {
+  if (!Amap) {
+    window._AMapSecurityConfig = {
+      securityJsCode: secretKey
+    }
+    //  解决高德地图加载报错 ---> 禁止多种API加载方式混用
+    AMapLoader.reset()
+    Amap = await AMapLoader.load({
+      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
+      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
+        'AMap.ToolBar', 'AMap.Geolocation', 'AMap.MouseTool',
+        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+      AMapUI: {
+        version: '1.1', // AMapUI 缺省 1.1
+        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
+      }
+    })
+  }
+  return Amap
+}
+
+async function getGDMap (address) {
+  new (await GetGDMap()).Geocoder({
+    radius: 500 // 范围，默认：500
+  }).getLocation(address, function (status, result) {
+    if (status === 'complete' && result.geocodes.length) {
+      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
+    } else {
+      // eslint-disable-next-line prefer-promise-reject-errors
+      throw new Error('根据经纬度查询地址失败')
+    }
+  })
+}
+
+async function GetLocation (address) {
+  return new Promise((resolve, reject) => {
+    try {
+      resolve(getGDMap(address))
+    } catch (e) {
+      reject(e)
+    }
+  })
+}
+export { GetGDMap, GetLocation }