af-mobile-client-vue3 1.1.8 → 1.1.10

package/src/services/restTools.ts

@@ -1,56 +1,56 @@
-import { http } from '@af-mobile-client-vue3/utils/http'
-
-/**
- * GET请求
- * @param url 请求地址
- * @param params 路径参数
- */
-export function get<T = any>(url: string, params?: any): Promise<T> {
-  return http.request<T>({
-    url,
-    method: 'GET',
-    params,
-  })
-}
-
-/**
- * POST请求
- * @param url 请求地址
- * @param data 请求参数
- */
-/**
- * POST请求
- * @param url 请求地址
- * @param data 请求参数
- */
-export function post<T = any>(url: string, data: any): Promise<T> {
-  return http.request <T>({
-    url,
-    method: 'POST',
-    data,
-  })
-}
-
-export function postWithConfig<T = any>(url: string, data: any, config: any): Promise<T> {
-  return http.request<T>({
-    url,
-    method: 'POST',
-    data,
-    headers: { ...config },
-  })
-}
-
-/**
- * DELETE请求
- * @param url 请求地址
- * @param data 查询参数
- * @param config 额外的配置项（如自定义头信息等）
- */
-export function del<T = any>(url: string, data?: any, config?: any): Promise<T> {
-  return http.request<T>({
-    url,
-    method: 'DELETE',
-    data,
-    ...config,
-  })
-}
+import { http } from '@af-mobile-client-vue3/utils/http'
+
+/**
+ * GET请求
+ * @param url 请求地址
+ * @param params 路径参数
+ */
+export function get<T = any>(url: string, params?: any): Promise<T> {
+  return http.request<T>({
+    url,
+    method: 'GET',
+    params,
+  })
+}
+
+/**
+ * POST请求
+ * @param url 请求地址
+ * @param data 请求参数
+ */
+/**
+ * POST请求
+ * @param url 请求地址
+ * @param data 请求参数
+ */
+export function post<T = any>(url: string, data: any): Promise<T> {
+  return http.request <T>({
+    url,
+    method: 'POST',
+    data,
+  })
+}
+
+export function postWithConfig<T = any>(url: string, data: any, config: any): Promise<T> {
+  return http.request<T>({
+    url,
+    method: 'POST',
+    data,
+    headers: { ...config },
+  })
+}
+
+/**
+ * DELETE请求
+ * @param url 请求地址
+ * @param data 查询参数
+ * @param config 额外的配置项（如自定义头信息等）
+ */
+export function del<T = any>(url: string, data?: any, config?: any): Promise<T> {
+  return http.request<T>({
+    url,
+    method: 'DELETE',
+    data,
+    ...config,
+  })
+}

package/src/services/v3Api.ts

@@ -9,7 +9,7 @@ function getLeafNodes(nodes) {
     if (node.children && node.children.length) {
       // 递归处理子节点并合并结果
       leaves.push(...getLeafNodes(node.children))
-    }
+    }
     else {
       // 当前节点是叶子节点时，直接加入结果
       leaves.push(node)
@@ -45,7 +45,7 @@ function getLeafNodesByCondition(type, nodes, parent = null) {
       }
       // 递归处理子节点
       leaves.push(...getLeafNodesByCondition(type, node.children, updatedParent))
-    }
+    }
     else if (isValidNode) {
       // 无子节点但符合条件时，直接加入叶子节点列表
       if (node.resourcetype === 'organization') {
@@ -53,7 +53,7 @@ function getLeafNodesByCondition(type, nodes, parent = null) {
           ...node,
           name: parent ? `${node.name}-${parent}` : node.name,
         })
-      }
+      }
       else if (node.resourcetype === 'department' && !nodeArray.includes(node.name)) {
         // console.log('数组',nodeArray.includes(node.name))
         leaves.push({
@@ -86,16 +86,16 @@ function getResData(params, toCallback) {
   const data = { userId: params.userid, roleName: params.roleName }
   if (params.source === '获取分公司') {
     runLogic('getOrgBySearch', data, 'af-system').then(res => toCallback(res))
-  }
+  }
   else if (params.source === '获取部门') {
     runLogic('getDepBySearch', data, 'af-system').then(res => toCallback(res))
-  }
+  }
   else if (params.source === '获取人员') {
     runLogic('getUserBySearch', data, 'af-system').then(res => toCallback(res))
-  }
+  }
   else if (params.source === '根据角色获取人员') {
     runLogic('getUserBySearchRole', data, 'af-system').then(res => toCallback(res))
-  }
+  }
   else {
     return search(params).then(res => toCallback(res))
   }
@@ -107,15 +107,15 @@ export async function searchToOption(params, callback) {
       if (res[0].children && res[0].children.length) {
         if (res[0].children[0].children) {
           callback(transformData(res[0].children[0].children))
-        }
+        }
         else {
           callback(transformData(res[0].children))
         }
-      }
+      }
       else {
         callback(res[0].children)
       }
-    }
+    }
     else {
       callback(res)
     }
@@ -129,7 +129,7 @@ export async function searchToListOption(params, callback) {
     if (params.source.includes('人员')) {
       // console.log('ren---------',res)
       callback(transformData(getLeafNodes(res)))
-    }
+    }
     else {
       const type = params.source.includes('公司') ? 'organization' : 'department'
       // console.log('bumenpgonngsi',res)

package/src/stores/modules/routeCache.ts

@@ -0,0 +1,22 @@
+import { defineStore } from 'pinia'
+import type { RouteRecordName } from 'vue-router'
+import type { EnhancedRouteLocation } from '@/router/types'
+
+const useRouteCacheStore = defineStore('route-cache', () => {
+  const routeCaches = ref<RouteRecordName[]>([])
+
+  const addRoute = (route: EnhancedRouteLocation) => {
+    if (routeCaches.value.includes(route.name))
+      return
+
+    if (route?.meta?.keepAlive)
+      routeCaches.value.push(route.name)
+  }
+
+  return {
+    routeCaches,
+    addRoute,
+  }
+})
+
+export default useRouteCacheStore

package/src/stores/modules/setting.ts

@@ -1,52 +1,52 @@
-import { getConfigByNameAsync } from '@af-mobile-client-vue3/services/api/common'
-import { APP_WEB_CONFIG_KEY } from '@af-mobile-client-vue3/stores/mutation-type'
-import { createStorage } from '@af-mobile-client-vue3/utils/Storage'
-import { defineStore } from 'pinia'
-import { ref } from 'vue'
-
-export interface WebConfig {
-  systemName: string
-  routerName: string
-  systemDesc: string
-  homePage: string
-  defaultAvatarUrl: string
-  wechatLogin: boolean
-}
-
-//  存放 webConfig 中的 setting 配置
-export const useSettingStore = defineStore('setting', () => {
-  const setting = ref<WebConfig>(undefined)
-  const setSetting = (newSetting: WebConfig) => {
-    setting.value = newSetting
-  }
-  const getSetting = () => {
-    return setting.value
-  }
-
-  const useStore = createStorage()
-
-  const store = useSettingStore()
-
-  const init = async () => {
-    const catchWebConfig = useStore.get(APP_WEB_CONFIG_KEY)
-    if (catchWebConfig) {
-      setSetting(catchWebConfig)
-    }
-    else {
-      const res = await getConfigByNameAsync('webMobileConfig')
-      useStore.set(APP_WEB_CONFIG_KEY, res)
-      const setting: WebConfig = res.setting
-      if (setting)
-        store.setSetting(setting)
-    }
-  }
-
-  init().then(() => {})
-
-  return {
-    setSetting,
-    getSetting,
-  }
-})
-
-export default useSettingStore
+import { getConfigByNameAsync } from '@af-mobile-client-vue3/services/api/common'
+import { APP_WEB_CONFIG_KEY } from '@af-mobile-client-vue3/stores/mutation-type'
+import { createStorage } from '@af-mobile-client-vue3/utils/Storage'
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+
+export interface WebConfig {
+  systemName: string
+  routerName: string
+  systemDesc: string
+  homePage: string
+  defaultAvatarUrl: string
+  wechatLogin: boolean
+}
+
+//  存放 webConfig 中的 setting 配置
+export const useSettingStore = defineStore('setting', () => {
+  const setting = ref<WebConfig>(undefined)
+  const setSetting = (newSetting: WebConfig) => {
+    setting.value = newSetting
+  }
+  const getSetting = () => {
+    return setting.value
+  }
+
+  const useStore = createStorage()
+
+  const store = useSettingStore()
+
+  const init = async () => {
+    const catchWebConfig = useStore.get(APP_WEB_CONFIG_KEY)
+    if (catchWebConfig) {
+      setSetting(catchWebConfig)
+    }
+    else {
+      const res = await getConfigByNameAsync('webMobileConfig')
+      useStore.set(APP_WEB_CONFIG_KEY, res)
+      const setting: WebConfig = res.setting
+      if (setting)
+        store.setSetting(setting)
+    }
+  }
+
+  init().then(() => {})
+
+  return {
+    setSetting,
+    getSetting,
+  }
+})
+
+export default useSettingStore

package/src/stores/mutation-type.ts

@@ -1,7 +1,7 @@
-export const CURRENT_USER = 'CURRENT-USER'
-export const ACCESS_TOKEN = 'Authorization'
-export const APP_LOGIN_KEY = 'admin.login'
-export const APP_PERMISSIONS_KEY = 'admin.permissions'
-export const APP_ROLES_KEY = 'admin.roles'
-export const APP_ROUTES_KEY = 'admin.routes'
-export const APP_WEB_CONFIG_KEY = 'admin.webconfig'
+export const CURRENT_USER = 'CURRENT-USER'
+export const ACCESS_TOKEN = 'Authorization'
+export const APP_LOGIN_KEY = 'admin.login'
+export const APP_PERMISSIONS_KEY = 'admin.permissions'
+export const APP_ROLES_KEY = 'admin.roles'
+export const APP_ROUTES_KEY = 'admin.routes'
+export const APP_WEB_CONFIG_KEY = 'admin.webconfig'

package/src/utils/authority-utils.ts

@@ -1,84 +1,84 @@
-/**
- * 判断是否有路由的权限
- * @param authority 路由权限配置
- * @param permissions 用户权限集合
- */
-function hasPermission(authority: any, permissions: any): boolean {
-  let required: string = '*'
-  if (typeof authority === 'string')
-    required = authority
-  else if (Array.isArray(authority))
-    required = authority.toString()
-  else if (typeof authority === 'object')
-    required = authority.permission
-
-  return required === '*' || hasAnyItem(required, permissions, (r, t) => !!(r === t || r === t.id))
-}
-
-/**
- * 判断是否有路由需要的角色
- * @param authority 路由权限配置
- * @param roles 用户角色集合
- */
-function hasRole(authority, roles) {
-  let required
-  if (typeof authority === 'object')
-    required = authority.role
-
-  return authority === '*' || hasAnyItem(required, roles, (r, t) => !!(r === t || r === t.id))
-}
-
-/**
- * 判断目标数组是否有所需元素
- * @param {string | string[]}required 所需元素，数组或单个元素
- * @param {string[] | object[]} source 目标数组
- * @param {Function} filter 匹配条件
- * (r: String, s: String|Object) => boolean
- */
-function hasAnyItem(required, source, filter): boolean {
-  if (!required)
-    return false
-
-  const checkedList = Array.isArray(required) ? required : [required]
-  return !!source.find(s => checkedList.find(r => filter(r, s)))
-}
-
-/**
- * 路由权限校验
- * @param route 路由
- * @param permissions 用户权限集合
- * @param roles 用户角色集合
- */
-function hasAuthority(route, permissions, roles) {
-  // TODO 此处判断可能有问题
-  if (!route.meta.pAuthorities)
-    return true
-
-  const authorities = [...route.meta.pAuthorities, route.meta.authority]
-  for (const authority of authorities) {
-    if (!hasPermission(authority, permissions) && !hasRole(authority, roles))
-      return false
-  }
-  return true
-}
-
-/**
- * 根据权限配置过滤菜单数据
- * @param menuData
- * @param permissions
- * @param roles
- */
-function filterMenu(menuData, permissions, roles) {
-  return menuData.filter((menu) => {
-    if (menu.meta && menu.meta.invisible === undefined) {
-      if (!hasAuthority(menu, permissions, roles))
-        return false
-    }
-    if (menu.children && menu.children.length > 0)
-      menu.children = filterMenu(menu.children, permissions, roles)
-
-    return true
-  })
-}
-
-export { filterMenu, hasAuthority }
+/**
+ * 判断是否有路由的权限
+ * @param authority 路由权限配置
+ * @param permissions 用户权限集合
+ */
+function hasPermission(authority: any, permissions: any): boolean {
+  let required: string = '*'
+  if (typeof authority === 'string')
+    required = authority
+  else if (Array.isArray(authority))
+    required = authority.toString()
+  else if (typeof authority === 'object')
+    required = authority.permission
+
+  return required === '*' || hasAnyItem(required, permissions, (r, t) => !!(r === t || r === t.id))
+}
+
+/**
+ * 判断是否有路由需要的角色
+ * @param authority 路由权限配置
+ * @param roles 用户角色集合
+ */
+function hasRole(authority, roles) {
+  let required
+  if (typeof authority === 'object')
+    required = authority.role
+
+  return authority === '*' || hasAnyItem(required, roles, (r, t) => !!(r === t || r === t.id))
+}
+
+/**
+ * 判断目标数组是否有所需元素
+ * @param {string | string[]}required 所需元素，数组或单个元素
+ * @param {string[] | object[]} source 目标数组
+ * @param {Function} filter 匹配条件
+ * (r: String, s: String|Object) => boolean
+ */
+function hasAnyItem(required, source, filter): boolean {
+  if (!required)
+    return false
+
+  const checkedList = Array.isArray(required) ? required : [required]
+  return !!source.find(s => checkedList.find(r => filter(r, s)))
+}
+
+/**
+ * 路由权限校验
+ * @param route 路由
+ * @param permissions 用户权限集合
+ * @param roles 用户角色集合
+ */
+function hasAuthority(route, permissions, roles) {
+  // TODO 此处判断可能有问题
+  if (!route.meta.pAuthorities)
+    return true
+
+  const authorities = [...route.meta.pAuthorities, route.meta.authority]
+  for (const authority of authorities) {
+    if (!hasPermission(authority, permissions) && !hasRole(authority, roles))
+      return false
+  }
+  return true
+}
+
+/**
+ * 根据权限配置过滤菜单数据
+ * @param menuData
+ * @param permissions
+ * @param roles
+ */
+function filterMenu(menuData, permissions, roles) {
+  return menuData.filter((menu) => {
+    if (menu.meta && menu.meta.invisible === undefined) {
+      if (!hasAuthority(menu, permissions, roles))
+        return false
+    }
+    if (menu.children && menu.children.length > 0)
+      menu.children = filterMenu(menu.children, permissions, roles)
+
+    return true
+  })
+}
+
+export { filterMenu, hasAuthority }

package/src/utils/crypto.ts

@@ -1,39 +1,39 @@
-import AesEncryptJS from 'crypto-js'
-
-export default {
-  /**
-   * AES加密
-   *
-   * @param word
-   * @param encryKey
-   */
-  AESEncrypt(word: string, encryKey: string): string {
-    const key = AesEncryptJS.enc.Utf8.parse(encryKey)
-    const srcs = AesEncryptJS.enc.Utf8.parse(word)
-    const encrypted = AesEncryptJS.AES.encrypt(srcs, key, {
-      mode: AesEncryptJS.mode.ECB,
-      padding: AesEncryptJS.pad.Pkcs7,
-    })
-    return encrypted.toString()
-  },
-  /**
-   * AES解密
-   *
-   * @param word
-   * @param encryKey
-   */
-  AESDecrypt(word: string, encryKey: string): any {
-    const key = AesEncryptJS.enc.Utf8.parse(encryKey)
-    const decrypt = AesEncryptJS.AES.decrypt(word, key, {
-      mode: AesEncryptJS.mode.ECB,
-      padding: AesEncryptJS.pad.Pkcs7,
-    })
-    const ret = AesEncryptJS.enc.Utf8.stringify(decrypt).toString()
-    try {
-      return JSON.parse(ret)
-    }
-    catch {
-      return ret
-    }
-  },
-}
+import AesEncryptJS from 'crypto-js'
+
+export default {
+  /**
+   * AES加密
+   *
+   * @param word
+   * @param encryKey
+   */
+  AESEncrypt(word: string, encryKey: string): string {
+    const key = AesEncryptJS.enc.Utf8.parse(encryKey)
+    const srcs = AesEncryptJS.enc.Utf8.parse(word)
+    const encrypted = AesEncryptJS.AES.encrypt(srcs, key, {
+      mode: AesEncryptJS.mode.ECB,
+      padding: AesEncryptJS.pad.Pkcs7,
+    })
+    return encrypted.toString()
+  },
+  /**
+   * AES解密
+   *
+   * @param word
+   * @param encryKey
+   */
+  AESDecrypt(word: string, encryKey: string): any {
+    const key = AesEncryptJS.enc.Utf8.parse(encryKey)
+    const decrypt = AesEncryptJS.AES.decrypt(word, key, {
+      mode: AesEncryptJS.mode.ECB,
+      padding: AesEncryptJS.pad.Pkcs7,
+    })
+    const ret = AesEncryptJS.enc.Utf8.stringify(decrypt).toString()
+    try {
+      return JSON.parse(ret)
+    }
+    catch {
+      return ret
+    }
+  },
+}

package/src/utils/i18n.ts

@@ -1,41 +1,41 @@
-// // import { createI18n } from 'vue-i18n'
-// import enUS from 'vant/es/locale/lang/en-US'
-// import zhCN from 'vant/es/locale/lang/zh-CN'
-//
-// /**
-//  * All i18n resources specified in the plugin `include` option can be loaded
-//  * at once using the import syntax
-//  */
-// // import messages from '@intlify/unplugin-vue-i18n/messages'
-// import { Locale, type PickerColumn } from 'vant'
-//
-// // export const i18n = createI18n({
-// //   locale: localStorage.getItem('language') || navigator.language,
-// //   fallbackLocale: 'zhCN',
-// //   messages,
-// // })
-//
-// /** 多语言 picker columns */
-// export const languageColumns: PickerColumn = [
-//   { text: '简体中文', value: 'zh-CN' },
-//   { text: 'English', value: 'en-US' },
-// ]
-//
-// /** 当前语言 */
-// export const locale = computed({
-//   get() {
-//     return (i18n.global.locale as unknown as Ref<string>).value
-//   },
-//   set(language: string) {
-//     localStorage.setItem('language', language);
-//     (i18n.global.locale as unknown as Ref<string>).value = language
-//     Locale.use(language)
-//   },
-// })
-//
-// // 载入 vant 语言包
-// Locale.use('zh-CN', zhCN)
-// Locale.use('en-US', enUS)
-//
-// // 根据当前语言切换 vant 语言包
-// Locale.use(locale.value)
+// // import { createI18n } from 'vue-i18n'
+// import enUS from 'vant/es/locale/lang/en-US'
+// import zhCN from 'vant/es/locale/lang/zh-CN'
+//
+// /**
+//  * All i18n resources specified in the plugin `include` option can be loaded
+//  * at once using the import syntax
+//  */
+// // import messages from '@intlify/unplugin-vue-i18n/messages'
+// import { Locale, type PickerColumn } from 'vant'
+//
+// // export const i18n = createI18n({
+// //   locale: localStorage.getItem('language') || navigator.language,
+// //   fallbackLocale: 'zhCN',
+// //   messages,
+// // })
+//
+// /** 多语言 picker columns */
+// export const languageColumns: PickerColumn = [
+//   { text: '简体中文', value: 'zh-CN' },
+//   { text: 'English', value: 'en-US' },
+// ]
+//
+// /** 当前语言 */
+// export const locale = computed({
+//   get() {
+//     return (i18n.global.locale as unknown as Ref<string>).value
+//   },
+//   set(language: string) {
+//     localStorage.setItem('language', language);
+//     (i18n.global.locale as unknown as Ref<string>).value = language
+//     Locale.use(language)
+//   },
+// })
+//
+// // 载入 vant 语言包
+// Locale.use('zh-CN', zhCN)
+// Locale.use('en-US', enUS)
+//
+// // 根据当前语言切换 vant 语言包
+// Locale.use(locale.value)