af-mobile-client-vue3 1.3.55 → 1.3.58

package/src/services/api/common.ts

@@ -1,109 +1,109 @@
-import { del, post, postWithConfig } from '@af-mobile-client-vue3/services/restTools'
-import { indexedDB } from '@af-mobile-client-vue3/utils/indexedDB'
-
-const commonApi = {
-  // 获取配置
-  getConfig: 'logic/openapi/getLiuliConfiguration',
-  // 通用查询
-  query: 'logic/commonQuery',
-  // 编辑前查询
-  queryWithResource: 'logic/commonQueryWithResource',
-  // 通用新增/修改
-  addOrModify: 'logic/commonAddOrModify',
-  // 通用删除
-  delete: 'logic/commonDelete',
-}
-
-/**
- * 根据配置名获取配置内容
- * @param configName 配置名称
- * @param callback 回调函数
- */
-export function getConfigByName(configName: string, callback: Function): void
-export function getConfigByName(configName: string, callback: Function, serviceName: string): void
-/**
- * 根据配置名获取配置内容
- * @param configName 配置名称
- * @param callback 回调函数
- * @param serviceName 服务名
- */
-export function getConfigByName(configName: string, callback: Function, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME): void {
-  indexedDB.getByWeb(configName, `/${serviceName}/${commonApi.getConfig}`, { configName }, callback, null)
-}
-
-export async function getConfigByNameAsync(configName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME): Promise<any> {
-  return new Promise((resolve, reject) => {
-    indexedDB.getByWeb(configName, `/${serviceName}/${commonApi.getConfig}`, { configName }, resolve, null)
-  })
-}
-
-/**
- * 临时使用
- * 获取琉璃配置，不走indexedDB缓存
- * @param configName
- * @param serviceName
- */
-export function getConfigByNameWithoutIndexedDB(configName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/${commonApi.getConfig}`, { configName })
-}
-
-/**
- * 通用执行业务逻辑
- */
-export function runLogic<T>(logicName: string, parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME): Promise<T> {
-  return post<T>(`/${serviceName}/logic/${logicName}`, parameter)
-}
-
-/**
- * 通用查询
- */
-export function query(parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/${commonApi.query}`, parameter)
-}
-
-/**
- * 编辑前查询
- */
-export function queryWithResource(parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/${commonApi.queryWithResource}`, parameter)
-}
-
-/**
- * 通用新增/修改
- */
-export function addOrModify(parameter: object, tableName = 't_files', serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/entity/${tableName}`, parameter)
-}
-
-/**
- * 通用新增/修改
- */
-export function addOrModifyEntity(parameter: object, tableName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/entity/save/${tableName}`, parameter)
-}
-
-/**
- * 通用删除
- */
-export function remove(parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/${commonApi.delete}`, parameter)
-}
-
-/**
- * @description: 上传
- */
-export function upload(parameter, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME, config) {
-  return postWithConfig(`/${serviceName}/resource/upload`, parameter, config)
-}
-
-/**
- * @description: 删除
- */
-export function deleteFile(data, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return del(`/${serviceName}/entity/t_files`, data)
-}
-
-export function openApiLogic(parameter, logicName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/logic/openapi/${logicName}`, parameter)
-}
-export { commonApi }
+import { del, post, postWithConfig } from '@af-mobile-client-vue3/services/restTools'
+import { indexedDB } from '@af-mobile-client-vue3/utils/indexedDB'
+
+const commonApi = {
+  // 获取配置
+  getConfig: 'logic/openapi/getLiuliConfiguration',
+  // 通用查询
+  query: 'logic/commonQuery',
+  // 编辑前查询
+  queryWithResource: 'logic/commonQueryWithResource',
+  // 通用新增/修改
+  addOrModify: 'logic/commonAddOrModify',
+  // 通用删除
+  delete: 'logic/commonDelete',
+}
+
+/**
+ * 根据配置名获取配置内容
+ * @param configName 配置名称
+ * @param callback 回调函数
+ */
+export function getConfigByName(configName: string, callback: Function): void
+export function getConfigByName(configName: string, callback: Function, serviceName: string): void
+/**
+ * 根据配置名获取配置内容
+ * @param configName 配置名称
+ * @param callback 回调函数
+ * @param serviceName 服务名
+ */
+export function getConfigByName(configName: string, callback: Function, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME): void {
+  indexedDB.getByWeb(configName, `/${serviceName}/${commonApi.getConfig}`, { configName }, callback, null)
+}
+
+export async function getConfigByNameAsync(configName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME): Promise<any> {
+  return new Promise((resolve, reject) => {
+    indexedDB.getByWeb(configName, `/${serviceName}/${commonApi.getConfig}`, { configName }, resolve, null)
+  })
+}
+
+/**
+ * 临时使用
+ * 获取琉璃配置，不走indexedDB缓存
+ * @param configName
+ * @param serviceName
+ */
+export function getConfigByNameWithoutIndexedDB(configName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return post(`/${serviceName}/${commonApi.getConfig}`, { configName })
+}
+
+/**
+ * 通用执行业务逻辑
+ */
+export function runLogic<T>(logicName: string, parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME): Promise<T> {
+  return post<T>(`/${serviceName}/logic/${logicName}`, parameter)
+}
+
+/**
+ * 通用查询
+ */
+export function query(parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return post(`/${serviceName}/${commonApi.query}`, parameter)
+}
+
+/**
+ * 编辑前查询
+ */
+export function queryWithResource(parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return post(`/${serviceName}/${commonApi.queryWithResource}`, parameter)
+}
+
+/**
+ * 通用新增/修改
+ */
+export function addOrModify(parameter: object, tableName = 't_files', serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return post(`/${serviceName}/entity/${tableName}`, parameter)
+}
+
+/**
+ * 通用新增/修改
+ */
+export function addOrModifyEntity(parameter: object, tableName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return post(`/${serviceName}/entity/save/${tableName}`, parameter)
+}
+
+/**
+ * 通用删除
+ */
+export function remove(parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return post(`/${serviceName}/${commonApi.delete}`, parameter)
+}
+
+/**
+ * @description: 上传
+ */
+export function upload(parameter, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME, config) {
+  return postWithConfig(`/${serviceName}/resource/upload`, parameter, config)
+}
+
+/**
+ * @description: 删除
+ */
+export function deleteFile(data, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return del(`/${serviceName}/entity/t_files`, data)
+}
+
+export function openApiLogic(parameter, logicName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return post(`/${serviceName}/logic/openapi/${logicName}`, parameter)
+}
+export { commonApi }

package/src/services/api/manage.ts

@@ -1,8 +1,8 @@
-const manageApi = {
-  // 查询：获取省市区街道三级分类
-  getDivisionsOhChina: '/af-system/logic/getDivisionsOhChina',
-}
-
-export {
-  manageApi,
-}
+const manageApi = {
+  // 查询：获取省市区街道三级分类
+  getDivisionsOhChina: '/af-system/logic/getDivisionsOhChina',
+}
+
+export {
+  manageApi,
+}

package/src/services/api/search.ts

@@ -1,16 +1,16 @@
-import { post } from '@af-mobile-client-vue3/services/restTools'
-
-export async function getUserPermissions(userid: string) {
-  interface permissions {
-    name: string
-  }
-
-  const res = await post<permissions[]>(`/af-system/search`, {
-    source: 'this.getRights().where(row.getType()==$function$ && row.getPath($name$).indexOf($功能权限$) != -1)',
-    userid,
-  })
-
-  return res.map((row) => {
-    return row.name
-  })
-}
+import { post } from '@af-mobile-client-vue3/services/restTools'
+
+export async function getUserPermissions(userid: string) {
+  interface permissions {
+    name: string
+  }
+
+  const res = await post<permissions[]>(`/af-system/search`, {
+    source: 'this.getRights().where(row.getType()==$function$ && row.getPath($name$).indexOf($功能权限$) != -1)',
+    userid,
+  })
+
+  return res.map((row) => {
+    return row.name
+  })
+}

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/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 }