af-mobile-client-vue3 1.4.62 → 1.4.64

package/src/components/data/XFormItem/index.vue

@@ -1477,6 +1477,7 @@ function scanCodeOrNfc(attr) {
       v-if="attr.type === 'select' && showItem"
       v-model="modelData"
       :label="labelData"
+      :label-align="labelAlign"
       :readonly="readonly"
       clearable
       :placeholder="placeholder"

package/src/router/guards.ts

@@ -1,131 +1,131 @@
-import type { RouteLocationNormalized } from 'vue-router'
-import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
-import { UserType } from '@af-mobile-client-vue3/types/auth'
-import { hasAuthority } from '@af-mobile-client-vue3/utils/authority-utils'
-import { isExternalUser } from '@af-mobile-client-vue3/utils/platform-auth'
-import { showToast } from 'vant'
-
-// 不需要登录拦截的路由配置
-const loginIgnore = {
-  names: ['404', '403', 'user-appointment', 'appointment-form', 'appointment-history', 'AuthLoading'], // 根据路由名称匹配
-  paths: ['/login', '/XReportFormIframeView', '/invoiceShow', '/register', '/loading'], // 根据路由fullPath匹配
-  /**
-   * 判断路由是否包含在该配置中
-   * @param route vue-router 的 route 对象
-   */
-  includes(route) {
-    return this.names.includes(route.name) || this.paths.includes(route.path)
-  },
-}
-
-/**
- * 登录守卫 - 支持外部用户微信授权
- * @param to 目标路由
- * @param from 来源路由
- * @param next 导航函数
- */
-function loginGuard(to: RouteLocationNormalized, from: RouteLocationNormalized, next: any) {
-  const userStore = useUserStore()
-  const token = userStore.getToken()
-
-  // 跳过不需要登录验证的路由
-  if (loginIgnore.includes(to)) {
-    next()
-    return
-  }
-
-  // 已登录用户的处理
-  if (token && !to.query.appData && !(to.query.code && to.query.state)) {
-    // 如果已登录且访问登录页，重定向到首页
-    if (to.path === '/login') {
-      const defaultRoute = userStore.getDefaultRoute()
-      next({ path: defaultRoute })
-      return
-    }
-    next()
-    return
-  }
-
-  // 未登录用户的处理
-  if (!token || to.query.appData || (to.query.code && to.query.state)) {
-    // 使用统一的检测函数判断用户类型
-    const externalResult = isExternalUser(to)
-
-    if (externalResult.isExternal) {
-      // 外部用户统一跳转到 loading 页面
-      const query: any = {
-        redirect: to.path,
-      }
-      Object.assign(query, to.query)
-      // 直接将认证参数传递到路由查询参数中
-      if (externalResult.authParams) {
-        Object.assign(query, externalResult.authParams)
-      }
-
-      next({
-        path: '/loading',
-        query,
-      })
-      return
-    }
-
-    // 内部用户跳转到登录页
-    showToast({
-      message: '登录状态已失效，请重新登录！',
-      position: 'bottom',
-    })
-    next({ path: '/login' })
-  }
-}
-
-/**
- * 权限守卫 - 支持外部用户权限检查
- * @param to 目标路由
- * @param from 来源路由
- * @param next 导航函数
- */
-function authorityGuard(to: RouteLocationNormalized, from: RouteLocationNormalized, next: any) {
-  const userStore = useUserStore()
-  const userType = userStore.getUserType()
-  const permissions = userStore.getPermissions()
-  const roles = userStore.getRoles()
-
-  // 跳过不需要权限验证的路由
-  if (loginIgnore.includes(to)) {
-    next()
-    return
-  }
-
-  const meta = to.meta
-
-  // 如果路由不需要认证，直接通过
-  if (meta.requiresAuth === false) {
-    next()
-    return
-  }
-
-  // 检查用户类型权限
-  const isExternalUser = userType === UserType.EXTERNAL
-  const allowExternalUser = meta.allowExternalUser ?? false
-
-  if (isExternalUser && !allowExternalUser) {
-    // 外部用户访问不被允许的页面，重定向到403页面
-    next({ path: '/403' })
-    return
-  }
-
-  // 传统权限检查
-  if (!hasAuthority(to, permissions, roles)) {
-    // 没有权限，重定向到403页面
-    next({ path: '/403' })
-    return
-  }
-
-  // 权限检查通过
-  next()
-}
-
-export default {
-  beforeEach: [loginGuard, authorityGuard],
-  afterEach: [],
-}
+import type { RouteLocationNormalized } from 'vue-router'
+import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
+import { UserType } from '@af-mobile-client-vue3/types/auth'
+import { hasAuthority } from '@af-mobile-client-vue3/utils/authority-utils'
+import { isExternalUser } from '@af-mobile-client-vue3/utils/platform-auth'
+import { showToast } from 'vant'
+
+// 不需要登录拦截的路由配置
+const loginIgnore = {
+  names: ['404', '403', 'user-appointment', 'appointment-form', 'appointment-history', 'AuthLoading'], // 根据路由名称匹配
+  paths: ['/login', '/XReportFormIframeView', '/invoiceShow', '/register', '/loading'], // 根据路由fullPath匹配
+  /**
+   * 判断路由是否包含在该配置中
+   * @param route vue-router 的 route 对象
+   */
+  includes(route) {
+    return this.names.includes(route.name) || this.paths.includes(route.path)
+  },
+}
+
+/**
+ * 登录守卫 - 支持外部用户微信授权
+ * @param to 目标路由
+ * @param from 来源路由
+ * @param next 导航函数
+ */
+function loginGuard(to: RouteLocationNormalized, from: RouteLocationNormalized, next: any) {
+  const userStore = useUserStore()
+  const token = userStore.getToken()
+
+  // 跳过不需要登录验证的路由
+  if (loginIgnore.includes(to)) {
+    next()
+    return
+  }
+
+  // 已登录用户的处理
+  if (token && !to.query.appData && !(to.query.code && to.query.state)) {
+    // 如果已登录且访问登录页，重定向到首页
+    if (to.path === '/login') {
+      const defaultRoute = userStore.getDefaultRoute()
+      next({ path: defaultRoute })
+      return
+    }
+    next()
+    return
+  }
+
+  // 未登录用户的处理
+  if (!token || to.query.appData || (to.query.code && to.query.state)) {
+    // 使用统一的检测函数判断用户类型
+    const externalResult = isExternalUser(to)
+
+    if (externalResult.isExternal) {
+      // 外部用户统一跳转到 loading 页面
+      const query: any = {
+        redirect: to.path,
+      }
+      Object.assign(query, to.query)
+      // 直接将认证参数传递到路由查询参数中
+      if (externalResult.authParams) {
+        Object.assign(query, externalResult.authParams)
+      }
+
+      next({
+        path: '/loading',
+        query,
+      })
+      return
+    }
+
+    // 内部用户跳转到登录页
+    showToast({
+      message: '登录状态已失效，请重新登录！',
+      position: 'bottom',
+    })
+    next({ path: '/login' })
+  }
+}
+
+/**
+ * 权限守卫 - 支持外部用户权限检查
+ * @param to 目标路由
+ * @param from 来源路由
+ * @param next 导航函数
+ */
+function authorityGuard(to: RouteLocationNormalized, from: RouteLocationNormalized, next: any) {
+  const userStore = useUserStore()
+  const userType = userStore.getUserType()
+  const permissions = userStore.getPermissions()
+  const roles = userStore.getRoles()
+
+  // 跳过不需要权限验证的路由
+  if (loginIgnore.includes(to)) {
+    next()
+    return
+  }
+
+  const meta = to.meta
+
+  // 如果路由不需要认证，直接通过
+  if (meta.requiresAuth === false) {
+    next()
+    return
+  }
+
+  // 检查用户类型权限
+  const isExternalUser = userType === UserType.EXTERNAL
+  const allowExternalUser = meta.allowExternalUser ?? false
+
+  if (isExternalUser && !allowExternalUser) {
+    // 外部用户访问不被允许的页面，重定向到403页面
+    next({ path: '/403' })
+    return
+  }
+
+  // 传统权限检查
+  if (!hasAuthority(to, permissions, roles)) {
+    // 没有权限，重定向到403页面
+    next({ path: '/403' })
+    return
+  }
+
+  // 权限检查通过
+  next()
+}
+
+export default {
+  beforeEach: [loginGuard, authorityGuard],
+  afterEach: [],
+}

package/src/services/api/Login.ts

@@ -1,6 +1,6 @@
-const loginApi = {
-  Login: '/af-auth/login',
-  Logout: '/af-auth/logout',
-}
-
-export { loginApi }
+const loginApi = {
+  Login: '/af-auth/login',
+  Logout: '/af-auth/logout',
+}
+
+export { loginApi }

package/src/services/v3Api.ts

@@ -1,170 +1,170 @@
-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) {
-  if (!inputData || !Array.isArray(inputData))
-    return []
-
-  function transform(node) {
-    if (!node || typeof node !== 'object')
-      return {}
-
-    let children = []
-    if (node.children) {
-      if (Array.isArray(node.children)) {
-        children = node.children.map(transform)
-      }
-      else if (typeof node.children === 'object') {
-        // 检查是否是空标记
-        if (node.children.empty === true) {
-          children = []
-        }
-        else if (node.children.id || node.children.name) {
-          // 如果是单个节点对象
-          children = [transform(node.children)]
-        }
-      }
-    }
-
-    return {
-      label: node.name || '',
-      value: node.id ?? null,
-      f_organization_id: node.f_organization_id,
-      f_department_id: node.f_department_id,
-      parentid: node.parentid || node.parentId || node.parent_id || null,
-      orgid: node.orgid,
-      children,
-    }
-  }
-
-  return inputData.map(transform)
-}
-
-function getResData(params, toCallback) {
-  const data = { userId: params.userid, roleName: params.roleName, filter: params.filter, filterType: params.filterType }
-  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) {
+  if (!inputData || !Array.isArray(inputData))
+    return []
+
+  function transform(node) {
+    if (!node || typeof node !== 'object')
+      return {}
+
+    let children = []
+    if (node.children) {
+      if (Array.isArray(node.children)) {
+        children = node.children.map(transform)
+      }
+      else if (typeof node.children === 'object') {
+        // 检查是否是空标记
+        if (node.children.empty === true) {
+          children = []
+        }
+        else if (node.children.id || node.children.name) {
+          // 如果是单个节点对象
+          children = [transform(node.children)]
+        }
+      }
+    }
+
+    return {
+      label: node.name || '',
+      value: node.id ?? null,
+      f_organization_id: node.f_organization_id,
+      f_department_id: node.f_department_id,
+      parentid: node.parentid || node.parentId || node.parent_id || null,
+      orgid: node.orgid,
+      children,
+    }
+  }
+
+  return inputData.map(transform)
+}
+
+function getResData(params, toCallback) {
+  const data = { userId: params.userid, roleName: params.roleName, filter: params.filter, filterType: params.filterType }
+  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 }