af-mobile-client-vue3 1.3.77 → 1.3.78

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,147 +1,166 @@
-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) {
+  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: 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 }

package/src/stores/modules/user.ts

@@ -251,7 +251,7 @@ export const useUserStore = defineStore('app-user', () => {
     }
   }
   const loginExternalMini = async (data: any) => {
-    try {
+    try {
       // 设置Token
       setToken(data.access_token)
 

package/src/styles/login.less

@@ -1,109 +1,109 @@
-html:not(.dark) {
-  .form {
-    .form_field {
-      :deep(.van-field__label) {
-        color: rgb(88, 88, 88);
-      }
-      :deep(.van-field__body) {
-        background: rgb(251, 251, 251);
-        box-shadow: inset 0 0 1px 0 rgba(0, 0, 0, 0.1);
-        color: rgb(71, 71, 71);
-      }
-      :deep(.van-cell) {
-        background: #ffffff;
-      }
-    }
-    .extra_setting {
-      .extra_setting_for_remember_password {
-        color: rgb(88, 88, 88);
-      }
-    }
-  }
-}
-.form {
-  width: 100%;
-  padding: 0 40px;
-  .form_field {
-    padding-right: 0;
-    padding-left: 0;
-    :deep(.van-field__label) {
-      opacity: 0.7;
-      font-size: 16px;
-      font-weight: 400;
-      line-height: 23px;
-      text-transform: uppercase;
-      text-indent: 10px;
-    }
-    :deep(.van-field__body) {
-      height: 40px;
-      border-radius: 5px;
-      font-size: 16px;
-      font-weight: 400;
-      padding: 8px 10px;
-      opacity: 0.6;
-    }
-  }
-  .extra_setting {
-    font-size: 12px;
-    font-weight: 400;
-    line-height: 12px;
-    .extra_setting_for_remember_password {
-      opacity: 0.7;
-      span {
-        position: relative;
-        bottom: 3px;
-        left: 5px;
-      }
-    }
-    .extra_setting_for_reset_password {
-      position: relative;
-      top: 2px;
-      opacity: 0.7;
-      color: rgb(56, 149, 250);
-    }
-  }
-  .btn {
-    height: 50px;
-    :deep(.van-button__text) {
-      color: rgb(255, 255, 255);
-      font-size: 16px;
-      font-weight: 700;
-      line-height: 23px;
-    }
-  }
-  .login_btn {
-    background: rgb(56, 149, 250);
-    margin-top: 104px;
-  }
-  .reset_btn {
-    margin: 24px 0;
-  }
-  .back_btn {
-    :deep(.van-button__text) {
-      color: rgb(56, 149, 250);
-    }
-  }
-  :deep(.van-cell:after) {
-    border-bottom: none;
-  }
-}
-.login_form {
-  margin-top: 65px;
-}
-.forget_password_form {
-  margin-top: 15px;
-}
-/* 使图标垂直居中 */
-.wechat-login-btn .van-icon {
-  vertical-align: middle;
-}
-/* 悬停效果 */
-.wechat-login-btn:hover {
-  background-color: #06ad56 !important;
-  border-color: #06ad56 !important;
-}
-/* 点击效果 */
-.wechat-login-btn:active {
-  background-color: #05994c !important;
-  border-color: #05994c !important;
-}
+html:not(.dark) {
+  .form {
+    .form_field {
+      :deep(.van-field__label) {
+        color: rgb(88, 88, 88);
+      }
+      :deep(.van-field__body) {
+        background: rgb(251, 251, 251);
+        box-shadow: inset 0 0 1px 0 rgba(0, 0, 0, 0.1);
+        color: rgb(71, 71, 71);
+      }
+      :deep(.van-cell) {
+        background: #ffffff;
+      }
+    }
+    .extra_setting {
+      .extra_setting_for_remember_password {
+        color: rgb(88, 88, 88);
+      }
+    }
+  }
+}
+.form {
+  width: 100%;
+  padding: 0 40px;
+  .form_field {
+    padding-right: 0;
+    padding-left: 0;
+    :deep(.van-field__label) {
+      opacity: 0.7;
+      font-size: 16px;
+      font-weight: 400;
+      line-height: 23px;
+      text-transform: uppercase;
+      text-indent: 10px;
+    }
+    :deep(.van-field__body) {
+      height: 40px;
+      border-radius: 5px;
+      font-size: 16px;
+      font-weight: 400;
+      padding: 8px 10px;
+      opacity: 0.6;
+    }
+  }
+  .extra_setting {
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 12px;
+    .extra_setting_for_remember_password {
+      opacity: 0.7;
+      span {
+        position: relative;
+        bottom: 3px;
+        left: 5px;
+      }
+    }
+    .extra_setting_for_reset_password {
+      position: relative;
+      top: 2px;
+      opacity: 0.7;
+      color: rgb(56, 149, 250);
+    }
+  }
+  .btn {
+    height: 50px;
+    :deep(.van-button__text) {
+      color: rgb(255, 255, 255);
+      font-size: 16px;
+      font-weight: 700;
+      line-height: 23px;
+    }
+  }
+  .login_btn {
+    background: rgb(56, 149, 250);
+    margin-top: 104px;
+  }
+  .reset_btn {
+    margin: 24px 0;
+  }
+  .back_btn {
+    :deep(.van-button__text) {
+      color: rgb(56, 149, 250);
+    }
+  }
+  :deep(.van-cell:after) {
+    border-bottom: none;
+  }
+}
+.login_form {
+  margin-top: 65px;
+}
+.forget_password_form {
+  margin-top: 15px;
+}
+/* 使图标垂直居中 */
+.wechat-login-btn .van-icon {
+  vertical-align: middle;
+}
+/* 悬停效果 */
+.wechat-login-btn:hover {
+  background-color: #06ad56 !important;
+  border-color: #06ad56 !important;
+}
+/* 点击效果 */
+.wechat-login-btn:active {
+  background-color: #05994c !important;
+  border-color: #05994c !important;
+}