af-mobile-client-vue3 1.3.16 → 1.3.17

package/src/services/v3Api.ts

@@ -1,147 +1,147 @@
-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)
-  // 确保 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 {
-      // 当前节点是叶子节点时，直接加入结果
-      leaves.push(node)
-    }
-    return leaves
-  }, [])
-}
-
-function getLeafNodesByCondition(type, nodes, parent = null) {
-  // console.log('nodes------',nodes)
-  // 确保 nodes 是数组
-  const nodeArray = Array.isArray(nodes) ? nodes : [nodes]
-
-  return nodeArray.reduce((leaves, node) => {
-    const isValidNode = node.resourcetype === type && node.name !== '组织机构'
-    const updatedParent = node.name === '组织机构' ? null : node.name
-
-    if (node.children && node.children.length) {
-      // 当前节点符合条件时，加入叶子节点列表
-      if (isValidNode && node.resourcetype === 'organization') {
-        leaves.push({
-          ...node,
-          name: parent ? `${node.name}` : node.name,
-          children: [],
-        })
-      }
-      if (isValidNode && node.resourcetype === 'department') {
-        leaves.push({
-          ...node,
-          name: parent ? `${node.name}-${parent}` : node.name,
-          children: [],
-        })
-      }
-      // 递归处理子节点
-      leaves.push(...getLeafNodesByCondition(type, node.children, updatedParent))
-    }
-    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,
-        })
-      }
-    }
-    return leaves
-  }, [])
-}
-
-function transformData(inputData) {
-  function transform(node) {
-    return {
-      label: node.name,
-      value: node.id,
-      f_organization_id: node.f_organization_id,
-      f_department_id: node.f_department_id,
-      parentid: node.parentid,
-      orgid: node.orgid,
-      children: node.children ? node.children.map(transform) : [],
-    }
-  }
-
-  return inputData.map(transform)
-}
-
-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))
-  }
-}
-
-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 {
-          callback(transformData(res[0].children))
-        }
-      }
-      else {
-        callback(res[0].children)
-      }
-    }
-    else {
-      callback(res)
-    }
-  }
-
-  await getResData(params, toCallback)
-}
-
-export async function searchToListOption(params, callback) {
-  function toCallback(res) {
-    if (params.source.includes('人员')) {
-      // console.log('ren---------',res)
-      callback(transformData(getLeafNodes(res)))
-    }
-    else {
-      const type = params.source.includes('公司') ? 'organization' : 'department'
-      // console.log('bumenpgonngsi',res)
-      callback(transformData(getLeafNodesByCondition(type, res)))
-    }
-  }
-
-  await getResData(params, toCallback)
-}
-
-export async function search(params) {
-  return request('/rs/search', METHOD.POST, params, params.config)
-}
-
-export default { searchToOption, search }
+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)
+  // 确保 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 {
+      // 当前节点是叶子节点时，直接加入结果
+      leaves.push(node)
+    }
+    return leaves
+  }, [])
+}
+
+function getLeafNodesByCondition(type, nodes, parent = null) {
+  // console.log('nodes------',nodes)
+  // 确保 nodes 是数组
+  const nodeArray = Array.isArray(nodes) ? nodes : [nodes]
+
+  return nodeArray.reduce((leaves, node) => {
+    const isValidNode = node.resourcetype === type && node.name !== '组织机构'
+    const updatedParent = node.name === '组织机构' ? null : node.name
+
+    if (node.children && node.children.length) {
+      // 当前节点符合条件时，加入叶子节点列表
+      if (isValidNode && node.resourcetype === 'organization') {
+        leaves.push({
+          ...node,
+          name: parent ? `${node.name}` : node.name,
+          children: [],
+        })
+      }
+      if (isValidNode && node.resourcetype === 'department') {
+        leaves.push({
+          ...node,
+          name: parent ? `${node.name}-${parent}` : node.name,
+          children: [],
+        })
+      }
+      // 递归处理子节点
+      leaves.push(...getLeafNodesByCondition(type, node.children, updatedParent))
+    }
+    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,
+        })
+      }
+    }
+    return leaves
+  }, [])
+}
+
+function transformData(inputData) {
+  function transform(node) {
+    return {
+      label: node.name,
+      value: node.id,
+      f_organization_id: node.f_organization_id,
+      f_department_id: node.f_department_id,
+      parentid: node.parentid,
+      orgid: node.orgid,
+      children: node.children ? node.children.map(transform) : [],
+    }
+  }
+
+  return inputData.map(transform)
+}
+
+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))
+  }
+}
+
+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 {
+          callback(transformData(res[0].children))
+        }
+      }
+      else {
+        callback(res[0].children)
+      }
+    }
+    else {
+      callback(res)
+    }
+  }
+
+  await getResData(params, toCallback)
+}
+
+export async function searchToListOption(params, callback) {
+  function toCallback(res) {
+    if (params.source.includes('人员')) {
+      // console.log('ren---------',res)
+      callback(transformData(getLeafNodes(res)))
+    }
+    else {
+      const type = params.source.includes('公司') ? 'organization' : 'department'
+      // console.log('bumenpgonngsi',res)
+      callback(transformData(getLeafNodesByCondition(type, res)))
+    }
+  }
+
+  await getResData(params, toCallback)
+}
+
+export async function search(params) {
+  return request('/rs/search', METHOD.POST, params, params.config)
+}
+
+export default { searchToOption, search }

package/src/stores/index.ts

@@ -1,11 +1,11 @@
-import { createPinia } from 'pinia'
-import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
-
-import useRouteCacheStore from './modules/routeCache'
-import useUserStore from './modules/user'
-
-const pinia = createPinia()
-pinia.use(piniaPluginPersistedstate)
-
-export { useRouteCacheStore, useUserStore }
-export default pinia
+import { createPinia } from 'pinia'
+import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
+
+import useRouteCacheStore from './modules/routeCache'
+import useUserStore from './modules/user'
+
+const pinia = createPinia()
+pinia.use(piniaPluginPersistedstate)
+
+export { useRouteCacheStore, useUserStore }
+export default pinia

package/src/stores/modules/counter.ts

@@ -1,19 +1,19 @@
-import { defineStore } from 'pinia'
-import { ref } from 'vue'
-
-const useCounterStore = defineStore('counter', () => {
-  const counter = ref(0)
-
-  const increment = () => {
-    counter.value++
-  }
-
-  return {
-    counter,
-    increment,
-  }
-}, {
-  persist: true,
-})
-
-export default useCounterStore
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+
+const useCounterStore = defineStore('counter', () => {
+  const counter = ref(0)
+
+  const increment = () => {
+    counter.value++
+  }
+
+  return {
+    counter,
+    increment,
+  }
+}, {
+  persist: true,
+})
+
+export default useCounterStore

package/src/stores/modules/routeCache.ts

@@ -1,23 +1,23 @@
-import type { EnhancedRouteLocation } from '@af-mobile-client-vue3/router/types'
-import type { RouteRecordName } from 'vue-router'
-import { defineStore } from 'pinia'
-import { ref } from 'vue'
-
-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
+import type { EnhancedRouteLocation } from '@af-mobile-client-vue3/router/types'
+import type { RouteRecordName } from 'vue-router'
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+
+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,76 +1,76 @@
-import { getConfigByNameAsync } from '@af-mobile-client-vue3/services/api/common'
-import { APP_WEB_CONFIG_KEY } from '@af-mobile-client-vue3/stores/mutation-type'
-import { secureStorageBatchWrite } from '@af-mobile-client-vue3/utils/secureStorage'
-import { createStorage } from '@af-mobile-client-vue3/utils/Storage'
-import { defineStore } from 'pinia'
-import { ref } from 'vue'
-
-export interface WebConfig {
-  isAttendance: boolean | false
-  systemName: string
-  routerName: string
-  systemDesc: string
-  homePage: any
-  defaultAvatarUrl: string
-  wechatLogin: boolean
-  wxLoginAge: boolean
-  wxAutoLogin: string
-  tenantName: string
-  systemLogo: string
-  homeAppList: Array<any>
-  slideshowList: Array<any>
-}
-
-//  存放 webConfig 中的 setting 配置
-export const useSettingStore = defineStore('setting', () => {
-  const setting = ref<WebConfig>(undefined)
-  const isInitialized = ref(false)
-
-  const setSetting = (newSetting: WebConfig) => {
-    setting.value = newSetting
-  }
-
-  const getSetting = () => {
-    return setting.value
-  }
-
-  // 将 init 作为 store 的方法导出
-  const init = async () => {
-    if (isInitialized.value)
-      return
-
-    const useStore = createStorage()
-    const catchWebConfig = useStore.get(APP_WEB_CONFIG_KEY)
-    if (catchWebConfig?.setting) {
-      setSetting(catchWebConfig?.setting)
-    }
-    else {
-      const res = await getConfigByNameAsync('webMobileConfig')
-      if (res.setting) {
-        useStore.set(APP_WEB_CONFIG_KEY, res)
-        console.log('res.setting', res.setting)
-        setSetting(res.setting)
-        // 如果有pos相关的配置存储到app安全存储中
-        if (res.setting.posConfig) {
-          secureStorageBatchWrite([
-            {
-              key: 'posConfig',
-              value: res.setting.posConfig,
-            },
-          ])
-        }
-      }
-    }
-
-    isInitialized.value = true
-  }
-
-  return {
-    setSetting,
-    getSetting,
-    init, // 导出 init 方法
-    isInitialized,
-  }
-})
-
-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 { secureStorageBatchWrite } from '@af-mobile-client-vue3/utils/secureStorage'
+import { createStorage } from '@af-mobile-client-vue3/utils/Storage'
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+
+export interface WebConfig {
+  isAttendance: boolean | false
+  systemName: string
+  routerName: string
+  systemDesc: string
+  homePage: any
+  defaultAvatarUrl: string
+  wechatLogin: boolean
+  wxLoginAge: boolean
+  wxAutoLogin: string
+  tenantName: string
+  systemLogo: string
+  homeAppList: Array<any>
+  slideshowList: Array<any>
+}
+
+//  存放 webConfig 中的 setting 配置
+export const useSettingStore = defineStore('setting', () => {
+  const setting = ref<WebConfig>(undefined)
+  const isInitialized = ref(false)
+
+  const setSetting = (newSetting: WebConfig) => {
+    setting.value = newSetting
+  }
+
+  const getSetting = () => {
+    return setting.value
+  }
+
+  // 将 init 作为 store 的方法导出
+  const init = async () => {
+    if (isInitialized.value)
+      return
+
+    const useStore = createStorage()
+    const catchWebConfig = useStore.get(APP_WEB_CONFIG_KEY)
+    if (catchWebConfig?.setting) {
+      setSetting(catchWebConfig?.setting)
+    }
+    else {
+      const res = await getConfigByNameAsync('webMobileConfig')
+      if (res.setting) {
+        useStore.set(APP_WEB_CONFIG_KEY, res)
+        console.log('res.setting', res.setting)
+        setSetting(res.setting)
+        // 如果有pos相关的配置存储到app安全存储中
+        if (res.setting.posConfig) {
+          secureStorageBatchWrite([
+            {
+              key: 'posConfig',
+              value: res.setting.posConfig,
+            },
+          ])
+        }
+      }
+    }
+
+    isInitialized.value = true
+  }
+
+  return {
+    setSetting,
+    getSetting,
+    init, // 导出 init 方法
+    isInitialized,
+  }
+})
+
+export default useSettingStore