vue2-client 1.12.2 → 1.12.3-9.alpha.1

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, 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('人员')) {
+      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/utils/EncryptUtil.js

@@ -1,4 +1,3 @@
-import AesEncryptJS from 'crypto-js'
 import CryptoJS from 'crypto-js'
 import RsaEncryptJS from 'jsencrypt'
 
@@ -9,9 +8,9 @@ export default {
    * @returns {*}
    */
   AESEncrypt (word, encryKey) {
-    const key = AesEncryptJS.enc.Utf8.parse(encryKey)
-    const srcs = AesEncryptJS.enc.Utf8.parse(word)
-    const encrypted = AesEncryptJS.AES.encrypt(srcs, key, { mode: AesEncryptJS.mode.ECB, padding: AesEncryptJS.pad.Pkcs7 })
+    const key = CryptoJS.enc.Utf8.parse(encryKey)
+    const srcs = CryptoJS.enc.Utf8.parse(word)
+    const encrypted = CryptoJS.AES.encrypt(srcs, key, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 })
     return encrypted.toString()
   },
   /**
@@ -20,9 +19,9 @@ export default {
    * @returns {*}
    */
   AESDecrypt (word, encryKey) {
-    const key = AesEncryptJS.enc.Utf8.parse(encryKey)
-    const decrypt = AesEncryptJS.AES.decrypt(word, key, { mode: AesEncryptJS.mode.ECB, padding: AesEncryptJS.pad.Pkcs7 })
-    const ret = AesEncryptJS.enc.Utf8.stringify(decrypt).toString()
+    const key = CryptoJS.enc.Utf8.parse(encryKey)
+    const decrypt = CryptoJS.AES.decrypt(word, key, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 })
+    const ret = CryptoJS.enc.Utf8.stringify(decrypt).toString()
     try {
       return JSON.parse(ret)
     } catch (e) {

package/src/utils/indexedDB.js

@@ -7,6 +7,8 @@ const DB_CONFIG = {
   CURRENT_VERSION: 1
 }
 
+const LIULI_WEB_DB_NAME = 'view_liuli_web'
+
 export class IndexedDBManager {
   constructor () {
     this.db = undefined
@@ -120,7 +122,7 @@ export class IndexedDBManager {
 
     this.locks[key] = (async () => {
       try {
-        const data = await this.getData(key)
+        const data = DB_CONFIG.NAME === LIULI_WEB_DB_NAME ? undefined : await this.getData(key)
         if (!data && url) {
           const res = await post(url, params)
           const processedData = processFun ? processFun(res) : res

package/src/utils/request.js

@@ -150,20 +150,16 @@ function loadInterceptors () {
     // 让每个请求携带自定义 token 请根据实际情况自行修改
     if (token) {
       if (config.url !== V4_LOGIN) {
-        // 判断是否为V4环境
-        const compatible = getSystemVersion()
-        if (compatible === 'V4') {
-          // V4 环境则添加 V4请求头
-          config.headers[V4_ACCESS_TOKEN] = token
-        } else {
-          config.headers[ACCESS_TOKEN] = token
-        }
+        // V4 环境则添加 V4请求头
+        config.headers[V4_ACCESS_TOKEN] = token
+        config.headers[ACCESS_TOKEN] = token
       }
     }
 
     const v4SessionKey = localStorage.getItem(V4_SESSION_KEY)
     if (['post'].includes(config.method.toLowerCase()) && v4SessionKey &&
       !config.url.includes('/logic/openapi/') &&
+      !config.url.includes('devApi') &&
       !config.url.includes('auth/login')) {
       if (config.data && !(config.data instanceof FormData)) {
         config.data = {

package/src/utils/routerUtil.js

@@ -515,6 +515,23 @@ function parsefuncOA (func) {
       icon: row.icon,
       name: row.name
     }
+    if (row.link) {
+      if (route.router.includes('?')) {
+        // 把问号后面的都删了
+        const [url, queryString] = route.router.split('?')
+        route.router = url
+        try {
+          const params = new URLSearchParams(queryString)
+          for (const [key, value] of params.entries()) {
+            route.meta[key] = value
+          }
+          if (route.meta.path) {
+            route.path = route.meta.path
+            delete route.meta.path
+          }
+        } catch (e) {}
+      }
+    }
     if (row.children && row.children.length > 0) {
       route.children = parsefunc(row.children)
     }

package/.babelrc

@@ -1,3 +0,0 @@
-{
-  "presets": ["@babel/preset-env"]
-}