vue2-client 1.18.47 → 1.18.51

package/src/pages/system/monitor/operLog/index.vue

@@ -1,37 +1,37 @@
-<template>
-  <a-card :bordered="false">
-    <x-form-table
-      title="操作日志"
-      :queryParamsName="queryParamsName"
-      serviceName="af-system"
-      @action="toDetail">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-
-export default {
-  name: 'OperLog',
-  components: {
-    XFormTable
-  },
-  data () {
-    return {
-      // 选中的编号
-      selectNo: undefined,
-      // 查询配置文件名
-      queryParamsName: 'crud_oper_log_manage',
-      // 是否显示详情抽屉
-      detailVisible: false
-    }
-  },
-  methods: {
-    toDetail (record, id) {
-      this.selectNo = id + ''
-      this.detailVisible = true
-    }
-  }
-}
-</script>
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="操作日志"
+      :queryParamsName="queryParamsName"
+      serviceName="af-system"
+      @action="toDetail">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+
+export default {
+  name: 'OperLog',
+  components: {
+    XFormTable
+  },
+  data () {
+    return {
+      // 选中的编号
+      selectNo: undefined,
+      // 查询配置文件名
+      queryParamsName: 'crud_oper_log_manage',
+      // 是否显示详情抽屉
+      detailVisible: false
+    }
+  },
+  methods: {
+    toDetail (record, id) {
+      this.selectNo = id + ''
+      this.detailVisible = true
+    }
+  }
+}
+</script>

package/src/router/async/router.map.js

@@ -25,8 +25,7 @@ routerResource.chargeQuery = () => import('@vue2-client/base-client/components/c
 // --------------------------------------仪表盘--------------------------------------
 routerResource.dashboard = view.blank
 // 工作台
-routerResource.workplace = () =>
-  import('@vue2-client/pages/dashboard/workplace')
+routerResource.workplace = () => import('@vue2-client/pages/dashboard/workplace')
 // --------------------------------------系统配置--------------------------------------
 routerResource.system = view.blank
 // 字典管理
@@ -51,18 +50,18 @@ routerResource.dynamicStatistics = () => import('@vue2-client/pages/DynamicStati
 routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynamicStatistics')
 // 示例页面
 routerResource.example = {
-path: 'example',
+  path: 'example',
   name: '示例主页面',
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/his/HChart/demo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
-  component: () => import('@vue2-client/base-client/components/common/ImagePreviewModal/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
+  // component: () => import('@vue2-client/base-client/components/common/ImagePreviewModal/demo.vue'),
   // component: () => import('@vue2-client/components/xScrollBox/example.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/pages/addressSelect/addressDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
+  component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue')
   // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
@@ -103,34 +102,30 @@ const routerMap = {
   login: {
     authority: '*',
     path: '/login',
-    component: process.env.VUE_APP_LOGIN_VERSION === 'V3'
-      ? view.loginv3 : view.login
+    component: process.env.VUE_APP_LOGIN_VERSION === 'V3' ? view.loginv3 : view.login
   },
   root: {
     path: '/',
     name: '首页',
     // 只有在非微前端环境下才进行重定向，或者通过环境变量控制
     redirect: window.__MICRO_APP_ENVIRONMENT__ ? undefined : homePage,
-    component: process.env.VUE_APP_SINGLE_PAPER === 'TRUE' ? view.blank : view.tabs,
+    component: process.env.VUE_APP_SINGLE_PAPER === 'TRUE' ? view.blank : view.tabs
   },
   exp403: {
     authority: '*',
     name: 'exp403',
     path: '403',
-    component: () =>
-      import('@vue2-client/pages/exception/403')
+    component: () => import('@vue2-client/pages/exception/403')
   },
   exp404: {
     name: 'exp404',
     path: '404',
-    component: () =>
-      import('@vue2-client/pages/exception/404')
+    component: () => import('@vue2-client/pages/exception/404')
   },
   exp500: {
     name: 'exp500',
     path: '500',
-    component: () =>
-      import('@vue2-client/pages/exception/500')
+    component: () => import('@vue2-client/pages/exception/500')
   }
 }
 Object.assign(routerMap, routerResource)

package/src/services/api/cas.js

@@ -1,79 +1,79 @@
-import { post } from '@vue2-client/services/api/restTools'
-import notification from 'ant-design-vue/lib/notification'
-import { logout } from '@vue2-client/services/user'
-import Cookie from 'js-cookie'
-
-const casApi = {
-  // 根据用户信息校验服务访问权限并生成ST
-  createSTByUserInfo: '/api/af-sso/logic/createSTByUserInfo',
-  // 根据TGC生成ST
-  createSTByTGC: '/api/af-sso/logic/createSTByTGC',
-  // 验证ST
-  serviceValidate: '/api/af-sso/logic/openapi/serviceValidate',
-  // 其他验证
-  otherValidate: '/api/af-sso/logic'
-}
-
-function setTGTCookie (cookie) {
-  return Cookie.set('TGT-Cookie', cookie)
-}
-function removeTGTCookie () {
-  return Cookie.remove('TGT-Cookie')
-}
-export function getTGTCookie () {
-  return Cookie.get('TGT-Cookie')
-}
-
-export function CASLoginByAuth (serviceKey) {
-  return new Promise((resolve, reject) => {
-    post(casApi.createSTByUserInfo, {
-      serviceKey: serviceKey
-    }).then(res => {
-      setTGTCookie(res.tgc)
-      resolve(res)
-    }).catch(msg => {
-      reject(msg)
-    })
-  })
-}
-
-export function CASLogin (serviceKey, inner) {
-  // 从第三方跳转登录
-  const tgc = getTGTCookie()
-  if (tgc && !inner) {
-    return new Promise((resolve, reject) => {
-      post(casApi.createSTByTGC, {
-        serviceKey: serviceKey,
-        tgc: tgc
-      }).then(res => {
-        resolve(res)
-      }).catch(msg => {
-        if (msg === '当前操作没有权限') {
-          removeTGTCookie()
-          notification.error({
-            message: '授权已过期，请重新登录',
-            description: '2秒后自动跳转回登陆页面'
-          })
-          logout().then(() => {
-            setTimeout(() => {
-              window.location.href = '/login?serviceKey=' + serviceKey
-            }, 1500)
-          })
-        } else {
-          reject(msg)
-        }
-      })
-    })
-  } else {
-    return CASLoginByAuth(serviceKey)
-  }
-}
-
-export function doOtherValidate (logicName, st, serviceKey) {
-  return post(casApi.otherValidate + '/' + logicName, {
-    st: st,
-    serviceKey: serviceKey
-  }, null)
-}
-
-export default casApi
+import { post } from '@vue2-client/services/api/restTools'
+import notification from 'ant-design-vue/lib/notification'
+import { logout } from '@vue2-client/services/user'
+import Cookie from 'js-cookie'
+
+const casApi = {
+  // 根据用户信息校验服务访问权限并生成ST
+  createSTByUserInfo: '/api/af-sso/logic/createSTByUserInfo',
+  // 根据TGC生成ST
+  createSTByTGC: '/api/af-sso/logic/createSTByTGC',
+  // 验证ST
+  serviceValidate: '/api/af-sso/logic/openapi/serviceValidate',
+  // 其他验证
+  otherValidate: '/api/af-sso/logic'
+}
+
+function setTGTCookie (cookie) {
+  return Cookie.set('TGT-Cookie', cookie)
+}
+function removeTGTCookie () {
+  return Cookie.remove('TGT-Cookie')
+}
+export function getTGTCookie () {
+  return Cookie.get('TGT-Cookie')
+}
+
+export function CASLoginByAuth (serviceKey) {
+  return new Promise((resolve, reject) => {
+    post(casApi.createSTByUserInfo, {
+      serviceKey: serviceKey
+    }).then(res => {
+      setTGTCookie(res.tgc)
+      resolve(res)
+    }).catch(msg => {
+      reject(msg)
+    })
+  })
+}
+
+export function CASLogin (serviceKey, inner) {
+  // 从第三方跳转登录
+  const tgc = getTGTCookie()
+  if (tgc && !inner) {
+    return new Promise((resolve, reject) => {
+      post(casApi.createSTByTGC, {
+        serviceKey: serviceKey,
+        tgc: tgc
+      }).then(res => {
+        resolve(res)
+      }).catch(msg => {
+        if (msg === '当前操作没有权限') {
+          removeTGTCookie()
+          notification.error({
+            message: '授权已过期，请重新登录',
+            description: '2秒后自动跳转回登陆页面'
+          })
+          logout().then(() => {
+            setTimeout(() => {
+              window.location.href = '/login?serviceKey=' + serviceKey
+            }, 1500)
+          })
+        } else {
+          reject(msg)
+        }
+      })
+    })
+  } else {
+    return CASLoginByAuth(serviceKey)
+  }
+}
+
+export function doOtherValidate (logicName, st, serviceKey) {
+  return post(casApi.otherValidate + '/' + logicName, {
+    st: st,
+    serviceKey: serviceKey
+  }, null)
+}
+
+export default casApi

package/src/services/api/common.js

@@ -141,13 +141,21 @@ export function parseConfig (configContent, configType) {
 
 /**
  * 通用执行业务逻辑
+ * @param {string} logicName - 业务逻辑名称
+ * @param {object} parameter - 请求参数
+ * @param {string} serviceName - 服务名称
+ * @param {boolean} isDev - 是否开发环境
+ * @param {object} config - 请求配置
+ * @param {boolean} config.dedupe - 是否启用去重（默认 true）
+ * @param {string} config.dedupeStrategy - 去重策略：'reject'（拒绝）或 'reuse'（复用结果）
+ * @param {boolean|string} config.globalLoading - 是否显示全局 Loading
  */
-export function runLogic (logicName, parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+export function runLogic (logicName, parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev, config = {}) {
   let apiPre = '/api/'
   if (isDev) {
     apiPre = '/devApi/'
   }
-  return post(apiPre + serviceName + '/logic/' + logicName, parameter)
+  return post(apiPre + serviceName + '/logic/' + logicName, parameter, config)
 }
 
 /**

package/src/services/api/restTools.js

@@ -19,7 +19,18 @@ function get (url, parameter) {
  * @param config 配置项
  * @param {boolean|string} config.globalLoading - 是否显示全局 Loading，可传入字符串作为提示文字
  * @param {boolean} config.dedupe - 是否启用请求去重（POST 默认开启，设为 false 可关闭）
+ * @param {string} config.dedupeStrategy - 去重策略：'reject'（拒绝，默认）或 'reuse'（复用结果）
  * @returns {Promise<AxiosResponse<T>>}
+ * 
+ * @example
+ * // 表单提交 - 默认拒绝重复（防止重复提交）
+ * post('/api/save', formData)
+ * 
+ * // 下拉框数据 - 复用结果（多处同时请求共享结果）
+ * post('/api/options', params, { dedupe: true, dedupeStrategy: 'reuse' })
+ * 
+ * // 列表查询 - 关闭去重（允许重复查询）
+ * post('/api/list', params, { dedupe: false })
  */
 function post (url, parameter, config = {}) {
   // 兼容 config 为 null 的情况

package/src/services/v3Api.js

@@ -1,7 +1,7 @@
 import { METHOD, request } from '@vue2-client/utils/request'
 import { runLogic } from '@vue2-client/services/api/common'
 
-function getLeafNodes (nodes) {
+function getLeafNodes(nodes) {
   // 确保 nodes 是数组
   const nodeArray = Array.isArray(nodes) ? nodes : [nodes]
   return nodeArray.reduce((leaves, node) => {
@@ -16,7 +16,7 @@ function getLeafNodes (nodes) {
   }, [])
 }
 
-function getLeafNodesByCondition (type, nodes, parent = null) {
+function getLeafNodesByCondition(type, nodes, parent = null) {
   // 确保 nodes 是数组
   const nodeArray = Array.isArray(nodes) ? nodes : [nodes]
 
@@ -29,7 +29,7 @@ function getLeafNodesByCondition (type, nodes, parent = null) {
       if (isValidNode) {
         leaves.push({
           ...node,
-          name: parent ? `${node.name}-${parent}` : node.name,
+          name: parent ? `${node.name}-${parent}` : node.name
         })
       }
       // 递归处理子节点
@@ -38,7 +38,7 @@ function getLeafNodesByCondition (type, nodes, parent = null) {
       // 无子节点但符合条件时，直接加入叶子节点列表
       leaves.push({
         ...node,
-        name: parent ? `${node.name}-${parent}` : node.name,
+        name: parent ? `${node.name}-${parent}` : node.name
       })
     }
 
@@ -46,8 +46,8 @@ function getLeafNodesByCondition (type, nodes, parent = null) {
   }, [])
 }
 
-function transformData (inputData) {
-  function transform (node) {
+function transformData(inputData) {
+  function transform(node) {
     return {
       label: node.name,
       value: node.id,
@@ -61,23 +61,31 @@ function transformData (inputData) {
   return inputData.map(transform)
 }
 
-function getResData (params, toCallback) {
-  const data = { userId: params.userid, roleName: params.roleName, filter: params.filter, filterType: params.filterType }
+// 复用策略配置：相同请求共享结果，避免重复网络请求
+const REUSE_CONFIG = { dedupe: true, dedupeStrategy: 'reuse' }
+
+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))
+    runLogic('getOrgBySearch', data, 'af-system', false, REUSE_CONFIG).then(res => toCallback(res))
   } else if (params.source === '获取部门') {
-    runLogic('getDepBySearch', data, 'af-system').then(res => toCallback(res))
+    runLogic('getDepBySearch', data, 'af-system', false, REUSE_CONFIG).then(res => toCallback(res))
   } else if (params.source === '获取人员') {
-    runLogic('getUserBySearch', data, 'af-system').then(res => toCallback(res))
+    runLogic('getUserBySearch', data, 'af-system', false, REUSE_CONFIG).then(res => toCallback(res))
   } else if (params.source === '根据角色获取人员') {
-    runLogic('getUserBySearchRole', data, 'af-system').then(res => toCallback(res))
+    runLogic('getUserBySearchRole', data, 'af-system', false, REUSE_CONFIG).then(res => toCallback(res))
   } else {
     return search(params).then(res => toCallback(res))
   }
 }
 
-export async function searchToOption (params, callback) {
-  function 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) {
@@ -96,8 +104,8 @@ export async function searchToOption (params, callback) {
   await getResData(params, toCallback)
 }
 
-export async function searchToListOption (params, callback) {
-  function toCallback (res) {
+export async function searchToListOption(params, callback) {
+  function toCallback(res) {
     if (params.source.includes('人员')) {
       callback(transformData(getLeafNodes(res)))
     } else {
@@ -109,7 +117,7 @@ export async function searchToListOption (params, callback) {
   await getResData(params, toCallback)
 }
 
-export async function search (params) {
+export async function search(params) {
   return request('/rs/search', METHOD.POST, params)
 }