vue2-client 1.10.31 → 1.10.32-alpha.1

package/src/services/user.js

@@ -1,90 +1,90 @@
-import {
-  LOGIN,
-  MODIFY_PASSWORD,
-  ROUTES,
-  V4_GET_INFO,
-  V4_LOGIN,
-  V4_LOGOUT
-} from '@vue2-client/services/apiService'
-import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
-import EncryptUtil from '@vue2-client/utils/EncryptUtil'
-import axios from 'axios'
-
-/**
- * 登录服务
- * @param name 账户名
- * @param password 账户密码
- * @returns {Promise<AxiosResponse<T>>}
- */
-export async function login (name, password) {
-  let data = {
-    name: name,
-    password: password
-  }
-  data = '$' + EncryptUtil.RSAEncrypt(JSON.stringify(data))
-  return request(LOGIN, METHOD.POST, data)
-}
-
-export async function modifyPassword (name, password, newPassword) {
-  return request(MODIFY_PASSWORD, METHOD.POST, {
-    data: {
-      ename: name,
-      password: password,
-      newpassword: newPassword,
-      affirmpassword: newPassword
-    }
-  })
-}
-
-export async function V4Login (name, password, routeName) {
-  return request(V4_LOGIN, METHOD.POST, {
-    username: name,
-    password: password,
-    resourceName: routeName
-  })
-}
-
-export async function V4RefreshToken () {
-  const { AESDecrypt } = EncryptUtil
-  const info = AESDecrypt(localStorage.getItem('SinglePage_TOKEN'), '3KMKqvgwR8ULbR8Z')
-  return axios.post(V4_LOGIN, {
-    username: info.name,
-    password: info.password,
-    resourceName: '智慧燃气'
-  })
-}
-
-export async function V4GetInfo () {
-  return request(V4_GET_INFO, METHOD.POST, {})
-}
-
-export async function getRoutesConfig (value, routeName = '智慧燃气') {
-  return request(ROUTES + '/' + routeName, METHOD.POST, value)
-}
-
-/**
- * 退出登录
- */
-export function logout () {
-  if (window.__MICRO_APP_ENVIRONMENT__) {
-    window.microApp.dispatch({ type: 'logout' })
-  }
-  return new Promise((resolve, reject) => {
-    request(V4_LOGOUT, METHOD.DELETE, {}).then(() => {
-      resolve()
-    }).catch(error => {
-      reject(error)
-    }).finally(() => {
-      localStorage.removeItem(process.env.VUE_APP_ROUTES_KEY)
-      localStorage.removeItem(process.env.VUE_APP_PERMISSIONS_KEY)
-      localStorage.removeItem(process.env.VUE_APP_ROLES_KEY)
-      removeAuthorization()
-    })
-  })
-}
-export default {
-  login,
-  logout,
-  getRoutesConfig,
-  V4RefreshToken
-}
+import {
+  LOGIN,
+  MODIFY_PASSWORD,
+  ROUTES,
+  V4_GET_INFO,
+  V4_LOGIN,
+  V4_LOGOUT
+} from '@vue2-client/services/apiService'
+import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
+import EncryptUtil from '@vue2-client/utils/EncryptUtil'
+import axios from 'axios'
+
+/**
+ * 登录服务
+ * @param name 账户名
+ * @param password 账户密码
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+export async function login (name, password) {
+  let data = {
+    name: name,
+    password: password
+  }
+  data = '$' + EncryptUtil.RSAEncrypt(JSON.stringify(data))
+  return request(LOGIN, METHOD.POST, data)
+}
+
+export async function modifyPassword (name, password, newPassword) {
+  return request(MODIFY_PASSWORD, METHOD.POST, {
+    data: {
+      ename: name,
+      password: password,
+      newpassword: newPassword,
+      affirmpassword: newPassword
+    }
+  })
+}
+
+export async function V4Login (name, password, routeName) {
+  return request(V4_LOGIN, METHOD.POST, {
+    username: name,
+    password: password,
+    resourceName: routeName
+  })
+}
+
+export async function V4RefreshToken () {
+  const { AESDecrypt } = EncryptUtil
+  const info = AESDecrypt(localStorage.getItem('SinglePage_TOKEN'), '3KMKqvgwR8ULbR8Z')
+  return axios.post(V4_LOGIN, {
+    username: info.name,
+    password: info.password,
+    resourceName: '智慧燃气'
+  })
+}
+
+export async function V4GetInfo () {
+  return request(V4_GET_INFO, METHOD.POST, {})
+}
+
+export async function getRoutesConfig (value, routeName = '智慧燃气') {
+  return request(ROUTES + '/' + routeName, METHOD.POST, value)
+}
+
+/**
+ * 退出登录
+ */
+export function logout () {
+  if (window.__MICRO_APP_ENVIRONMENT__) {
+    window.microApp.dispatch({ type: 'logout' })
+  }
+  return new Promise((resolve, reject) => {
+    request(V4_LOGOUT, METHOD.DELETE, {}).then(() => {
+      resolve()
+    }).catch(error => {
+      reject(error)
+    }).finally(() => {
+      localStorage.removeItem(process.env.VUE_APP_ROUTES_KEY)
+      localStorage.removeItem(process.env.VUE_APP_PERMISSIONS_KEY)
+      localStorage.removeItem(process.env.VUE_APP_ROLES_KEY)
+      removeAuthorization()
+    })
+  })
+}
+export default {
+  login,
+  logout,
+  getRoutesConfig,
+  V4RefreshToken
+}

package/src/services/v3Api.js

@@ -1,116 +1,116 @@
-import { METHOD, request } from '@vue2-client/utils/request'
-import { runLogic } from '@vue2-client/services/api/common'
-
-function getLeafNodes (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) {
-  // 确保 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) {
-        leaves.push({
-          ...node,
-          name: parent ? `${node.name}-${parent}` : node.name,
-        })
-      }
-      // 递归处理子节点
-      leaves.push(...getLeafNodesByCondition(type, node.children, updatedParent))
-    } else if (isValidNode) {
-      // 无子节点但符合条件时，直接加入叶子节点列表
-      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,
-      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('人员')) {
-      callback(transformData(getLeafNodes(res)))
-    } else {
-      const type = params.source.includes('公司') ? 'organization' : 'department'
-      callback(transformData(getLeafNodesByCondition(type, res)))
-    }
-  }
-
-  await getResData(params, toCallback)
-}
-
-export async function search (params) {
-  return request('/rs/search', METHOD.POST, params)
-}
-
-export default { searchToOption, search }
+import { METHOD, request } from '@vue2-client/utils/request'
+import { runLogic } from '@vue2-client/services/api/common'
+
+function getLeafNodes (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) {
+  // 确保 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) {
+        leaves.push({
+          ...node,
+          name: parent ? `${node.name}-${parent}` : node.name,
+        })
+      }
+      // 递归处理子节点
+      leaves.push(...getLeafNodesByCondition(type, node.children, updatedParent))
+    } else if (isValidNode) {
+      // 无子节点但符合条件时，直接加入叶子节点列表
+      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,
+      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('人员')) {
+      callback(transformData(getLeafNodes(res)))
+    } else {
+      const type = params.source.includes('公司') ? 'organization' : 'department'
+      callback(transformData(getLeafNodesByCondition(type, res)))
+    }
+  }
+
+  await getResData(params, toCallback)
+}
+
+export async function search (params) {
+  return request('/rs/search', METHOD.POST, params)
+}
+
+export default { searchToOption, search }

package/src/store/modules/account.js

@@ -1,115 +1,115 @@
-export default {
-  namespaced: true,
-  state: {
-    // 旧营收产品$login对象
-    login: undefined,
-    user: undefined,
-    permissions: null,
-    roles: null,
-    routesConfig: null,
-    single: []
-  },
-  getters: {
-    user: state => {
-      if (!state.user) {
-        try {
-          const user = localStorage.getItem(process.env.VUE_APP_USER_KEY)
-          state.user = JSON.parse(user)
-        } catch (e) {
-          console.error(e)
-        }
-      }
-      return state.user
-    },
-    login: state => {
-      if (!state.login) {
-        try {
-          const user = localStorage.getItem(process.env.VUE_APP_LOGIN_KEY)
-          state.login = JSON.parse(user)
-        } catch (e) {
-          console.error(e)
-        }
-      }
-      return state.login
-    },
-    permissions: state => {
-      if (!state.permissions) {
-        try {
-          const permissions = localStorage.getItem(process.env.VUE_APP_PERMISSIONS_KEY)
-          state.permissions = JSON.parse(permissions)
-          state.permissions = state.permissions ? state.permissions : []
-        } catch (e) {
-          console.error(e.message)
-        }
-      }
-      return state.permissions
-    },
-    roles: state => {
-      if (!state.roles) {
-        try {
-          const roles = localStorage.getItem(process.env.VUE_APP_ROLES_KEY)
-          state.roles = JSON.parse(roles)
-          state.roles = state.roles ? state.roles : []
-        } catch (e) {
-          console.error(e.message)
-        }
-      }
-      return state.roles
-    },
-    routesConfig: state => {
-      if (!state.routesConfig) {
-        try {
-          const routesConfig = localStorage.getItem(process.env.VUE_APP_ROUTES_KEY)
-          state.routesConfig = JSON.parse(routesConfig)
-          state.routesConfig = state.routesConfig ? state.routesConfig : []
-        } catch (e) {
-          console.error(e.message)
-        }
-      }
-      return state.routesConfig
-    }
-  },
-  mutations: {
-    setUser (state, user) {
-      state.user = Object.assign(user, {
-        operaInfo: {
-          f_operator: user?.name,
-          f_operatorid: user?.id,
-          f_orgid: user?.orgid,
-          f_orgname: user?.orgs,
-          f_depid: user?.depids,
-          f_depname: user?.deps,
-          f_zoneid: user?.zoneid,
-          f_zones: user?.zones
-        }
-      })
-      // 组织组织机构信息
-      localStorage.setItem(process.env.VUE_APP_USER_KEY, JSON.stringify(user))
-    },
-    setSingle (state, page) {
-      if (page.path && page.delete) {
-        // 删除
-        state.single = state.single.filter(item => item.fullPath !== page.path)
-      } else if (state.single.filter(item => item.meta.singlePage === page.meta.singlePage).length === 0) {
-        // 添加
-        state.single.push(page)
-      }
-    },
-    setLogin (state, login) {
-      state.login = login
-      localStorage.setItem(process.env.VUE_APP_LOGIN_KEY, JSON.stringify(login))
-    },
-    setPermissions (state, permissions) {
-      state.permissions = permissions
-      localStorage.setItem(process.env.VUE_APP_PERMISSIONS_KEY, JSON.stringify(permissions))
-    },
-    setRoles (state, roles) {
-      state.roles = roles
-      localStorage.setItem(process.env.VUE_APP_ROLES_KEY, JSON.stringify(roles))
-    },
-    setRoutesConfig (state, routesConfig) {
-      state.routesConfig = routesConfig
-      localStorage.setItem(process.env.VUE_APP_ROUTES_KEY, JSON.stringify(routesConfig))
-    }
-  }
-}
+export default {
+  namespaced: true,
+  state: {
+    // 旧营收产品$login对象
+    login: undefined,
+    user: undefined,
+    permissions: null,
+    roles: null,
+    routesConfig: null,
+    single: []
+  },
+  getters: {
+    user: state => {
+      if (!state.user) {
+        try {
+          const user = localStorage.getItem(process.env.VUE_APP_USER_KEY)
+          state.user = JSON.parse(user)
+        } catch (e) {
+          console.error(e)
+        }
+      }
+      return state.user
+    },
+    login: state => {
+      if (!state.login) {
+        try {
+          const user = localStorage.getItem(process.env.VUE_APP_LOGIN_KEY)
+          state.login = JSON.parse(user)
+        } catch (e) {
+          console.error(e)
+        }
+      }
+      return state.login
+    },
+    permissions: state => {
+      if (!state.permissions) {
+        try {
+          const permissions = localStorage.getItem(process.env.VUE_APP_PERMISSIONS_KEY)
+          state.permissions = JSON.parse(permissions)
+          state.permissions = state.permissions ? state.permissions : []
+        } catch (e) {
+          console.error(e.message)
+        }
+      }
+      return state.permissions
+    },
+    roles: state => {
+      if (!state.roles) {
+        try {
+          const roles = localStorage.getItem(process.env.VUE_APP_ROLES_KEY)
+          state.roles = JSON.parse(roles)
+          state.roles = state.roles ? state.roles : []
+        } catch (e) {
+          console.error(e.message)
+        }
+      }
+      return state.roles
+    },
+    routesConfig: state => {
+      if (!state.routesConfig) {
+        try {
+          const routesConfig = localStorage.getItem(process.env.VUE_APP_ROUTES_KEY)
+          state.routesConfig = JSON.parse(routesConfig)
+          state.routesConfig = state.routesConfig ? state.routesConfig : []
+        } catch (e) {
+          console.error(e.message)
+        }
+      }
+      return state.routesConfig
+    }
+  },
+  mutations: {
+    setUser (state, user) {
+      state.user = Object.assign(user, {
+        operaInfo: {
+          f_operator: user?.name,
+          f_operatorid: user?.id,
+          f_orgid: user?.orgid,
+          f_orgname: user?.orgs,
+          f_depid: user?.depids,
+          f_depname: user?.deps,
+          f_zoneid: user?.zoneid,
+          f_zones: user?.zones
+        }
+      })
+      // 组织组织机构信息
+      localStorage.setItem(process.env.VUE_APP_USER_KEY, JSON.stringify(user))
+    },
+    setSingle (state, page) {
+      if (page.path && page.delete) {
+        // 删除
+        state.single = state.single.filter(item => item.fullPath !== page.path)
+      } else if (state.single.filter(item => item.meta.singlePage === page.meta.singlePage).length === 0) {
+        // 添加
+        state.single.push(page)
+      }
+    },
+    setLogin (state, login) {
+      state.login = login
+      localStorage.setItem(process.env.VUE_APP_LOGIN_KEY, JSON.stringify(login))
+    },
+    setPermissions (state, permissions) {
+      state.permissions = permissions
+      localStorage.setItem(process.env.VUE_APP_PERMISSIONS_KEY, JSON.stringify(permissions))
+    },
+    setRoles (state, roles) {
+      state.roles = roles
+      localStorage.setItem(process.env.VUE_APP_ROLES_KEY, JSON.stringify(roles))
+    },
+    setRoutesConfig (state, routesConfig) {
+      state.routesConfig = routesConfig
+      localStorage.setItem(process.env.VUE_APP_ROUTES_KEY, JSON.stringify(routesConfig))
+    }
+  }
+}

package/src/store/modules/index.js

@@ -1,5 +1,5 @@
-import account from './account'
-import setting from './setting'
-import lowCode from './lowCode'
-
-export default { account, setting, lowCode }
+import account from './account'
+import setting from './setting'
+import lowCode from './lowCode'
+
+export default { account, setting, lowCode }