af-mobile-client-vue3 1.0.95 → 1.0.96

package/src/services/restTools.ts

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

package/src/services/v3Api.ts

@@ -1,15 +1,16 @@
-import { METHOD, request } from '@af-mobile-client-vue3/utils/http/index'
 import { runLogic } from '@af-mobile-client-vue3/services/api/common'
+import { METHOD, request } from '@af-mobile-client-vue3/utils/http/index'
 
-function getLeafNodes (nodes) {
-   // console.log(nodes)
+function getLeafNodes(nodes) {
+  // console.log(nodes)
   // 确保 nodes 是数组
   const nodeArray = Array.isArray(nodes) ? nodes : [nodes]
   return nodeArray.reduce((leaves, node) => {
     if (node.children && node.children.length) {
       // 递归处理子节点并合并结果
       leaves.push(...getLeafNodes(node.children))
-    } else {
+    }
+    else {
       // 当前节点是叶子节点时，直接加入结果
       leaves.push(node)
     }
@@ -17,7 +18,7 @@ function getLeafNodes (nodes) {
   }, [])
 }
 
-function getLeafNodesByCondition (type, nodes, parent = null) {
+function getLeafNodesByCondition(type, nodes, parent = null) {
   // console.log('nodes------',nodes)
   // 确保 nodes 是数组
   const nodeArray = Array.isArray(nodes) ? nodes : [nodes]
@@ -44,27 +45,29 @@ function getLeafNodesByCondition (type, nodes, parent = null) {
       }
       // 递归处理子节点
       leaves.push(...getLeafNodesByCondition(type, node.children, updatedParent))
-    } else if (isValidNode) {
+    }
+    else if (isValidNode) {
       // 无子节点但符合条件时，直接加入叶子节点列表
-        if (node.resourcetype === 'organization'){
-          leaves.push({
-            ...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({
-            ...node,
-            name: parent ? `${node.name}-${parent}` : node.name,
-          })
-        }
+      if (node.resourcetype === 'organization') {
+        leaves.push({
+          ...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({
+          ...node,
+          name: parent ? `${node.name}-${parent}` : node.name,
+        })
       }
+    }
     return leaves
   }, [])
 }
 
-function transformData (inputData) {
-  function transform (node) {
+function transformData(inputData) {
+  function transform(node) {
     return {
       label: node.name,
       value: node.id,
@@ -72,41 +75,48 @@ function transformData (inputData) {
       f_department_id: node.f_department_id,
       parentid: node.parentid,
       orgid: node.orgid,
-      children: node.children ? node.children.map(transform) : []
+      children: node.children ? node.children.map(transform) : [],
     }
   }
 
   return inputData.map(transform)
 }
 
-function getResData (params, toCallback) {
+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 === '获取部门') {
+  }
+  else if (params.source === '获取部门') {
     runLogic('getDepBySearch', data, 'af-system').then(res => toCallback(res))
-  } else if (params.source === '获取人员') {
+  }
+  else if (params.source === '获取人员') {
     runLogic('getUserBySearch', data, 'af-system').then(res => toCallback(res))
-  } else if (params.source === '根据角色获取人员') {
+  }
+  else if (params.source === '根据角色获取人员') {
     runLogic('getUserBySearchRole', data, 'af-system').then(res => toCallback(res))
-  } else {
+  }
+  else {
     return search(params).then(res => toCallback(res))
   }
 }
 
-export async function searchToOption (params, callback) {
-  function toCallback (res) {
+export async function searchToOption(params, callback) {
+  function toCallback(res) {
     if (res.length) {
       if (res[0].children && res[0].children.length) {
         if (res[0].children[0].children) {
           callback(transformData(res[0].children[0].children))
-        } else {
+        }
+        else {
           callback(transformData(res[0].children))
         }
-      } else {
+      }
+      else {
         callback(res[0].children)
       }
-    } else {
+    }
+    else {
       callback(res)
     }
   }
@@ -114,12 +124,13 @@ export async function searchToOption (params, callback) {
   await getResData(params, toCallback)
 }
 
-export async function searchToListOption (params, callback) {
-  function toCallback (res) {
+export async function searchToListOption(params, callback) {
+  function toCallback(res) {
     if (params.source.includes('人员')) {
       // console.log('ren---------',res)
       callback(transformData(getLeafNodes(res)))
-    } else {
+    }
+    else {
       const type = params.source.includes('公司') ? 'organization' : 'department'
       // console.log('bumenpgonngsi',res)
       callback(transformData(getLeafNodesByCondition(type, res)))
@@ -129,7 +140,7 @@ export async function searchToListOption (params, callback) {
   await getResData(params, toCallback)
 }
 
-export async function search (params) {
+export async function search(params) {
   return request('/rs/search', METHOD.POST, params, params.config)
 }
 

package/src/stores/modules/cachedView.ts

@@ -1,6 +1,6 @@
+import type { toRouteType } from '@af-mobile-client-vue3/router'
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
-import type { toRouteType } from '@af-mobile-client-vue3/router'
 
 const useCachedViewStore = defineStore('cached-view', () => {
   // 缓存页面 keepAlive

package/src/stores/modules/setting.ts

@@ -1,52 +1,52 @@
-import { defineStore } from 'pinia'
-import { ref } from 'vue'
-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'
-
-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/modules/user.ts

@@ -1,7 +1,6 @@
-import { defineStore } from 'pinia'
-import { ref } from 'vue'
 import type { RouteRecordRaw } from 'vue-router'
-import { createStorage } from '@af-mobile-client-vue3/utils/Storage'
+import { doLogout, login, OALogin } from '@af-mobile-client-vue3/api/user'
+import router from '@af-mobile-client-vue3/router/index'
 import {
   ACCESS_TOKEN,
   APP_LOGIN_KEY,
@@ -10,9 +9,10 @@ import {
   APP_ROUTES_KEY,
   CURRENT_USER,
 } from '@af-mobile-client-vue3/stores/mutation-type'
-import { OALogin, doLogout, login } from '@af-mobile-client-vue3/api/user'
 import crypto from '@af-mobile-client-vue3/utils/crypto'
-import router from '@af-mobile-client-vue3/router/index'
+import { createStorage } from '@af-mobile-client-vue3/utils/Storage'
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
 
 const Storage = createStorage({ storage: localStorage })
 

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/styles/app.less

@@ -4,6 +4,11 @@
   --base-interval-2: 28px;
 }
 
+:root:root {
+  // 覆盖 primary 颜色
+  --van-blue: #2563EB;
+}
+
 #system-app {
   min-height: 100vh;
   position: relative;
@@ -11,7 +16,7 @@
 }
 
 html {
-  background: var(--van-white);
+  background: var(--van-gray-1);
   color-scheme: light;
 }
 

package/src/utils/Storage.ts

@@ -48,7 +48,7 @@ export function createStorage({ prefixKey = '', storage = localStorage } = {}) {
 
           this.remove(key)
         }
-        catch (e) {
+        catch {
           return def
         }
       }

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 }