vue2-client 1.18.47 → 1.18.49

package/src/store/modules/setting.js

@@ -1,119 +1,119 @@
-import config from '@vue2-client/config'
-import { ADMIN } from '@vue2-client/config/default'
-import { formatFullPath } from '@vue2-client/utils/i18n'
-import { filterMenu } from '@vue2-client/utils/authority-utils'
-import { getLocalSetting } from '@vue2-client/utils/themeUtil'
-import deepClone from 'lodash.clonedeep'
-
-const localSetting = getLocalSetting(true)
-const customTitlesStr = sessionStorage.getItem(process.env.VUE_APP_TBAS_TITLES_KEY)
-const customTitles = (customTitlesStr && JSON.parse(customTitlesStr)) || []
-
-export default {
-  namespaced: true,
-  state: {
-    isMobile: false,
-    animates: ADMIN.animates,
-    palettes: ADMIN.palettes,
-    pageMinHeight: 0,
-    menuData: [],
-    activatedFirst: undefined,
-    customTitles,
-    ...config,
-    ...localSetting
-  },
-  getters: {
-    menuData (state, getters, rootState) {
-      if (state.filterMenu) {
-        const { permissions, roles } = rootState.account
-        return filterMenu(deepClone(state.menuData), permissions, roles)
-      }
-      return state.menuData
-    },
-    firstMenu (state, getters) {
-      const { menuData } = getters
-      if (menuData.length > 0 && !menuData[0].fullPath) {
-        formatFullPath(menuData)
-      }
-      return menuData.map(item => {
-        const menuItem = { ...item }
-        delete menuItem.children
-        return menuItem
-      })
-    },
-    subMenu (state) {
-      const { menuData, activatedFirst } = state
-      if (menuData.length > 0 && !menuData[0].fullPath) {
-        formatFullPath(menuData)
-      }
-      const current = menuData.find(menu => menu.fullPath === activatedFirst)
-      return current && current.children || []
-    }
-  },
-  mutations: {
-    setDevice (state, isMobile) {
-      state.isMobile = isMobile
-    },
-    setTheme (state, theme) {
-      state.theme = theme
-    },
-    setLayout (state, layout) {
-      state.layout = layout
-    },
-    setMultiPage (state, multiPage) {
-      state.multiPage = multiPage
-    },
-    setAnimate (state, animate) {
-      state.animate = animate
-    },
-    setWeekMode (state, weekMode) {
-      state.weekMode = weekMode
-    },
-    setFixedHeader (state, fixedHeader) {
-      state.fixedHeader = fixedHeader
-    },
-    setFixedSideBar (state, fixedSideBar) {
-      state.fixedSideBar = fixedSideBar
-    },
-    setLang (state, lang) {
-      state.lang = lang
-    },
-    setHideSetting (state, hideSetting) {
-      state.hideSetting = hideSetting
-    },
-    correctPageMinHeight (state, minHeight) {
-      state.pageMinHeight += minHeight
-    },
-    setMenuData (state, menuData) {
-      state.menuData = menuData
-    },
-    setAsyncRoutes (state, asyncRoutes) {
-      state.asyncRoutes = asyncRoutes
-    },
-    setPageWidth (state, pageWidth) {
-      state.pageWidth = pageWidth
-    },
-    setActivatedFirst (state, activatedFirst) {
-      state.activatedFirst = activatedFirst
-    },
-    setFixedTabs (state, fixedTabs) {
-      state.fixedTabs = fixedTabs
-    },
-    setCustomTitle (state, { path, title }) {
-      if (title) {
-        const obj = state.customTitles.find(item => item.path === path)
-        if (obj) {
-          obj.title = title
-        } else {
-          state.customTitles.push({ path, title })
-        }
-        sessionStorage.setItem(process.env.VUE_APP_TBAS_TITLES_KEY, JSON.stringify(state.customTitles))
-      }
-    },
-    setSetting (state, setting) {
-      for (const key in setting) {
-        state[key] = setting[key]
-      }
-    }
-  }
-}
+import config from '@vue2-client/config'
+import { ADMIN } from '@vue2-client/config/default'
+import { formatFullPath } from '@vue2-client/utils/i18n'
+import { filterMenu } from '@vue2-client/utils/authority-utils'
+import { getLocalSetting } from '@vue2-client/utils/themeUtil'
+import deepClone from 'lodash.clonedeep'
+
+const localSetting = getLocalSetting(true)
+const customTitlesStr = sessionStorage.getItem(process.env.VUE_APP_TBAS_TITLES_KEY)
+const customTitles = (customTitlesStr && JSON.parse(customTitlesStr)) || []
+
+export default {
+  namespaced: true,
+  state: {
+    isMobile: false,
+    animates: ADMIN.animates,
+    palettes: ADMIN.palettes,
+    pageMinHeight: 0,
+    menuData: [],
+    activatedFirst: undefined,
+    customTitles,
+    ...config,
+    ...localSetting
+  },
+  getters: {
+    menuData (state, getters, rootState) {
+      if (state.filterMenu) {
+        const { permissions, roles } = rootState.account
+        return filterMenu(deepClone(state.menuData), permissions, roles)
+      }
+      return state.menuData
+    },
+    firstMenu (state, getters) {
+      const { menuData } = getters
+      if (menuData.length > 0 && !menuData[0].fullPath) {
+        formatFullPath(menuData)
+      }
+      return menuData.map(item => {
+        const menuItem = { ...item }
+        delete menuItem.children
+        return menuItem
+      })
+    },
+    subMenu (state) {
+      const { menuData, activatedFirst } = state
+      if (menuData.length > 0 && !menuData[0].fullPath) {
+        formatFullPath(menuData)
+      }
+      const current = menuData.find(menu => menu.fullPath === activatedFirst)
+      return current && current.children || []
+    }
+  },
+  mutations: {
+    setDevice (state, isMobile) {
+      state.isMobile = isMobile
+    },
+    setTheme (state, theme) {
+      state.theme = theme
+    },
+    setLayout (state, layout) {
+      state.layout = layout
+    },
+    setMultiPage (state, multiPage) {
+      state.multiPage = multiPage
+    },
+    setAnimate (state, animate) {
+      state.animate = animate
+    },
+    setWeekMode (state, weekMode) {
+      state.weekMode = weekMode
+    },
+    setFixedHeader (state, fixedHeader) {
+      state.fixedHeader = fixedHeader
+    },
+    setFixedSideBar (state, fixedSideBar) {
+      state.fixedSideBar = fixedSideBar
+    },
+    setLang (state, lang) {
+      state.lang = lang
+    },
+    setHideSetting (state, hideSetting) {
+      state.hideSetting = hideSetting
+    },
+    correctPageMinHeight (state, minHeight) {
+      state.pageMinHeight += minHeight
+    },
+    setMenuData (state, menuData) {
+      state.menuData = menuData
+    },
+    setAsyncRoutes (state, asyncRoutes) {
+      state.asyncRoutes = asyncRoutes
+    },
+    setPageWidth (state, pageWidth) {
+      state.pageWidth = pageWidth
+    },
+    setActivatedFirst (state, activatedFirst) {
+      state.activatedFirst = activatedFirst
+    },
+    setFixedTabs (state, fixedTabs) {
+      state.fixedTabs = fixedTabs
+    },
+    setCustomTitle (state, { path, title }) {
+      if (title) {
+        const obj = state.customTitles.find(item => item.path === path)
+        if (obj) {
+          obj.title = title
+        } else {
+          state.customTitles.push({ path, title })
+        }
+        sessionStorage.setItem(process.env.VUE_APP_TBAS_TITLES_KEY, JSON.stringify(state.customTitles))
+      }
+    },
+    setSetting (state, setting) {
+      for (const key in setting) {
+        state[key] = setting[key]
+      }
+    }
+  }
+}

package/src/utils/authority-utils.js

@@ -1,85 +1,85 @@
-/**
- * 判断是否有路由的权限
- * @param authority 路由权限配置
- * @param permissions 用户权限集合
- * @returns {boolean|*}
- */
-function hasPermission (authority, permissions) {
-  let required = '*'
-  if (typeof authority === 'string') {
-    required = authority
-  } else if (Array.isArray(authority)) {
-    required = authority
-  } else if (typeof authority === 'object') {
-    required = authority.permission
-  }
-  return required === '*' || hasAnyItem(required, permissions, (r, t) => !!(r === t || r === t.id))
-}
-
-/**
- * 判断是否有路由需要的角色
- * @param authority 路由权限配置
- * @param roles 用户角色集合
- */
-function hasRole (authority, roles) {
-  let required
-  if (typeof authority === 'object') {
-    required = authority.role
-  }
-  return authority === '*' || hasAnyItem(required, roles, (r, t) => !!(r === t || r === t.id))
-}
-
-/**
- * 判断目标数组是否有所需元素
- * @param {String | String[]}required 所需元素，数组或单个元素
- * @param {String[]|Object[]} source 目标数组
- * @param {Function} filter 匹配条件
- * (r: String, s: String|Object) => boolean
- * @returns {boolean}
- */
-function hasAnyItem (required, source, filter) {
-  if (!required) {
-    return false
-  }
-  const checkedList = Array.isArray(required) ? required : [required]
-  return !!source.find(s => checkedList.find(r => filter(r, s)))
-}
-
-/**
- * 路由权限校验
- * @param route 路由
- * @param permissions 用户权限集合
- * @param roles 用户角色集合
- * @returns {boolean}
- */
-function hasAuthority (route, permissions, roles) {
-  const authorities = [...route.meta.pAuthorities, route.meta.authority]
-  for (const authority of authorities) {
-    if (!hasPermission(authority, permissions) && !hasRole(authority, roles)) {
-      return false
-    }
-  }
-  return true
-}
-
-/**
- * 根据权限配置过滤菜单数据
- * @param menuData
- * @param permissions
- * @param roles
- */
-function filterMenu (menuData, permissions, roles) {
-  return menuData.filter(menu => {
-    if (menu.meta && menu.meta.invisible === undefined) {
-      if (!hasAuthority(menu, permissions, roles)) {
-        return false
-      }
-    }
-    if (menu.children && menu.children.length > 0) {
-      menu.children = filterMenu(menu.children, permissions, roles)
-    }
-    return true
-  })
-}
-
-export { filterMenu, hasAuthority }
+/**
+ * 判断是否有路由的权限
+ * @param authority 路由权限配置
+ * @param permissions 用户权限集合
+ * @returns {boolean|*}
+ */
+function hasPermission (authority, permissions) {
+  let required = '*'
+  if (typeof authority === 'string') {
+    required = authority
+  } else if (Array.isArray(authority)) {
+    required = authority
+  } else if (typeof authority === 'object') {
+    required = authority.permission
+  }
+  return required === '*' || hasAnyItem(required, permissions, (r, t) => !!(r === t || r === t.id))
+}
+
+/**
+ * 判断是否有路由需要的角色
+ * @param authority 路由权限配置
+ * @param roles 用户角色集合
+ */
+function hasRole (authority, roles) {
+  let required
+  if (typeof authority === 'object') {
+    required = authority.role
+  }
+  return authority === '*' || hasAnyItem(required, roles, (r, t) => !!(r === t || r === t.id))
+}
+
+/**
+ * 判断目标数组是否有所需元素
+ * @param {String | String[]}required 所需元素，数组或单个元素
+ * @param {String[]|Object[]} source 目标数组
+ * @param {Function} filter 匹配条件
+ * (r: String, s: String|Object) => boolean
+ * @returns {boolean}
+ */
+function hasAnyItem (required, source, filter) {
+  if (!required) {
+    return false
+  }
+  const checkedList = Array.isArray(required) ? required : [required]
+  return !!source.find(s => checkedList.find(r => filter(r, s)))
+}
+
+/**
+ * 路由权限校验
+ * @param route 路由
+ * @param permissions 用户权限集合
+ * @param roles 用户角色集合
+ * @returns {boolean}
+ */
+function hasAuthority (route, permissions, roles) {
+  const authorities = [...route.meta.pAuthorities, route.meta.authority]
+  for (const authority of authorities) {
+    if (!hasPermission(authority, permissions) && !hasRole(authority, roles)) {
+      return false
+    }
+  }
+  return true
+}
+
+/**
+ * 根据权限配置过滤菜单数据
+ * @param menuData
+ * @param permissions
+ * @param roles
+ */
+function filterMenu (menuData, permissions, roles) {
+  return menuData.filter(menu => {
+    if (menu.meta && menu.meta.invisible === undefined) {
+      if (!hasAuthority(menu, permissions, roles)) {
+        return false
+      }
+    }
+    if (menu.children && menu.children.length > 0) {
+      menu.children = filterMenu(menu.children, permissions, roles)
+    }
+    return true
+  })
+}
+
+export { filterMenu, hasAuthority }

package/src/utils/errorCode.js

@@ -1,6 +1,6 @@
-export default {
-  401: '认证失败，无法访问系统资源',
-  403: '当前操作没有权限',
-  404: '访问资源不存在',
-  default: '系统未知错误，请反馈给管理员'
-}
+export default {
+  401: '认证失败，无法访问系统资源',
+  403: '当前操作没有权限',
+  404: '访问资源不存在',
+  default: '系统未知错误，请反馈给管理员'
+}

package/src/utils/request.js

@@ -12,81 +12,34 @@ import { logout, V4RefreshToken } from '@vue2-client/services/user'
 import { LOGIN, SEARCH, V4_LOGIN } from '@vue2-client/services/apiService'
 import { setV4AccessToken } from '@vue2-client/utils/login'
 import EncryptUtil from '@vue2-client/utils/EncryptUtil'
+// 引入请求去重模块
+import {
+  DEDUPE_STRATEGY,
+  generateRequestKey,
+  hasPendingRequest,
+  addPendingRequest,
+  handleDuplicateRequest,
+  resolvePendingRequest,
+  rejectPendingRequest,
+  clearPendingRequests as clearAllPendingRequests,
+  shouldEnableDedupe,
+  getDedupeStrategy
+} from '@vue2-client/utils/requestDedupe'
 
 // 是否显示重新登录
 let isReloginShow
 
-// ============ 请求去重管理 ============
-// 存储进行中的请求 Map<requestKey, { promise, controller }>
-const pendingRequests = new Map()
-
-/**
- * 生成请求唯一标识
- * @param {object} config - axios 请求配置
- * @returns {string} 请求标识
- */
-function generateRequestKey (config) {
-  const { method, url, data, params } = config
-  let dataStr = ''
-  let paramsStr = ''
-  try {
-    dataStr = data ? JSON.stringify(data) : ''
-    paramsStr = params ? JSON.stringify(params) : ''
-  } catch (e) {
-    // 循环引用或其他序列化问题，使用时间戳保证唯一性
-    console.warn('[请求去重] 参数序列化失败，跳过去重')
-    dataStr = `_${Date.now()}_${Math.random()}`
-  }
-  return `${method}:${url}:${dataStr}:${paramsStr}`
-}
-
-/**
- * 添加请求到 pending 列表
- * @param {object} config - axios 请求配置
- */
-function addPendingRequest (config) {
-  const requestKey = generateRequestKey(config)
-  config._requestKey = requestKey
-
-  if (!pendingRequests.has(requestKey)) {
-    // 创建 AbortController 用于取消请求
-    const controller = new AbortController()
-    config.signal = controller.signal
-    pendingRequests.set(requestKey, { controller, config })
-  }
-}
-
-/**
- * 移除已完成的请求
- * @param {object} config - axios 请求配置
- */
-function removePendingRequest (config) {
-  const requestKey = config._requestKey || generateRequestKey(config)
-  if (pendingRequests.has(requestKey)) {
-    pendingRequests.delete(requestKey)
-  }
-}
-
-/**
- * 检查是否有相同的请求正在进行
- * @param {object} config - axios 请求配置
- * @returns {boolean}
- */
-function hasPendingRequest (config) {
-  const requestKey = generateRequestKey(config)
-  return pendingRequests.has(requestKey)
-}
-
 /**
  * 清空所有 pending 请求
+ * @description 页面切换或需要取消所有请求时调用
  */
 export function clearPendingRequests () {
-  pendingRequests.forEach(({ controller }) => {
-    controller.abort()
-  })
-  pendingRequests.clear()
+  clearAllPendingRequests()
 }
 
+// 导出去重策略常量，方便外部使用
+export { DEDUPE_STRATEGY }
+
 axios.defaults.timeout = 50000
 axios.defaults.withCredentials = true
 // 如果是microapp
@@ -219,19 +172,35 @@ function loadInterceptors () {
   axios.interceptors.request.use(config => {
     // ============ 请求去重逻辑 ============
     // POST 请求默认开启去重，可通过 config.dedupe = false 关闭
-    const shouldDedupe = config.method?.toLowerCase() === 'post' && config.dedupe !== false
+    // 支持两种策略：reject（拒绝，默认）和 reuse（复用结果）
+    const enableDedupe = shouldEnableDedupe(config)
 
-    if (shouldDedupe && hasPendingRequest(config)) {
-      // 相同请求正在进行中，直接拒绝，不发起请求
-      console.warn(`重复请求被拦截: ${config.url}`)
-      const error = new Error('重复请求被取消')
-      error.code = 'ERR_DUPLICATE_REQUEST'
-      error.config = config
-      return Promise.reject(error)
-    }
+    if (enableDedupe) {
+      const requestKey = generateRequestKey(config)
+      config._requestKey = requestKey
 
-    if (shouldDedupe) {
-      addPendingRequest(config)
+      // 检查是否有相同请求正在进行
+      if (hasPendingRequest(requestKey)) {
+        const result = handleDuplicateRequest(requestKey, config)
+        
+        if (!result.shouldProceed) {
+          if (result.isReuse && result.promise) {
+            // 复用策略：返回相同的 Promise，标记为复用请求
+            config._isReuseRequest = true
+            config._reusePromise = result.promise
+            // 返回一个特殊标记，让后续逻辑知道这是复用请求
+            return config
+          } else {
+            // 拒绝策略：直接返回错误
+            return Promise.reject(result.error)
+          }
+        }
+      }
+
+      // 添加到 pending 列表
+      const strategy = getDedupeStrategy(config)
+      const { signal } = addPendingRequest(requestKey, config, strategy)
+      config.signal = signal
     }
     // ============ 去重逻辑结束 ============
 
@@ -279,8 +248,12 @@ function loadInterceptors () {
   }, errorHandler)
   // 加载响应拦截器
   axios.interceptors.response.use((res) => {
-    // 请求完成，移除 pending 记录
-    removePendingRequest(res.config)
+    const requestKey = res.config._requestKey
+
+    // 如果是复用请求，直接返回复用的 Promise 结果
+    if (res.config._isReuseRequest && res.config._reusePromise) {
+      return res.config._reusePromise
+    }
 
     // 判断是否需要解密
     if (res.headers && res.headers['x-encrypted'] === '1') {
@@ -358,10 +331,22 @@ function loadInterceptors () {
           description: msg
         })
       } else {
+        // 请求成功，通知复用的请求并返回数据
+        if (requestKey) {
+          resolvePendingRequest(requestKey, res.data)
+        }
         return res.data
       }
+      // 请求失败，通知复用的请求
+      if (requestKey) {
+        rejectPendingRequest(requestKey, new Error(msg))
+      }
       return Promise.reject(msg)
     } else {
+      // 请求成功，通知复用的请求并返回数据
+      if (requestKey) {
+        resolvePendingRequest(requestKey, res.data)
+      }
       return res.data
     }
   }, errorHandler)
@@ -408,9 +393,12 @@ function loginExpire () {
 }
 // 异常拦截处理器
 const errorHandler = (error) => {
-  // 请求失败，移除 pending 记录
+  // 请求失败，通知复用的请求并移除 pending 记录
   if (error.config) {
-    removePendingRequest(error.config)
+    const requestKey = error.config._requestKey
+    if (requestKey) {
+      rejectPendingRequest(requestKey, error)
+    }
   }
 
   // 如果是被取消的请求（去重导致或 AbortController），静默处理