vue2-client 1.18.46 → 1.18.49

package/src/base-client/components/common/XFormTable/demo.vue

@@ -14,12 +14,10 @@
       :defaultQueryForm="{
         s_f_user_name: '张三'
       }"
-      serviceName="af-safecheck"
+      serviceName="af-system"
       ref="xFormTable"
-    >
-    </x-form-table>
-    <div style="height: 100px; width: 100%; background-color: #f0f2f5;">
-    </div>
+    ></x-form-table>
+    <div style="height: 100px; width: 100%; background-color: #f0f2f5"></div>
   </a-card>
 </template>
 
@@ -29,12 +27,12 @@ import { microDispatch } from '@vue2-client/utils/microAppUtils'
 export default {
   name: 'Demo',
   components: {
-    XFormTable,
+    XFormTable
   },
-  data () {
+  data() {
     return {
       // 查询配置文件名
-      queryParamsName: 'checkPlanListCRUD',
+      queryParamsName: 'ceshiCRUD',
       // 查询配置左侧tree
       xTreeConfigName: 'addressType',
       // 新增表单固定值
@@ -47,30 +45,21 @@ export default {
       selectedKeys: [],
       selected: {
         keys: [],
-        rows: [],
-      },
+        rows: []
+      }
     }
   },
 
   methods: {
     // ========== 原有方法 ==========
-    rowDblClick (record) {
+    rowDblClick(record) {
       console.log('rowDblClick', record)
     },
     // input框 行編輯參數傳遞
-    ceshi (...args) {
+    ceshi(...args) {
       // attr, value, currentRecord, currentIndex, nextRecord, nextIndex
-      const [attr, value, currentRecord, currentIndex, nextRecord, nextIndex] =
-        args
-      console.log(
-        'ceshi',
-        attr,
-        value,
-        currentRecord,
-        currentIndex,
-        nextRecord,
-        nextIndex
-      )
+      const [attr, value, currentRecord, currentIndex, nextRecord, nextIndex] = args
+      console.log('ceshi', attr, value, currentRecord, currentIndex, nextRecord, nextIndex)
       // 示例：当按下 Enter 键且有下一行时，跳转到下一行的同一列
       // 可以在这里执行业务逻辑（例如：保存数据）
       console.log('当前行:', currentIndex, '下一行:', nextIndex)
@@ -81,42 +70,42 @@ export default {
       // 跳转到下一行的同一列
       this.$refs.xFormTable.$refs.xTable.focusInput(nextIndex, attr.model)
     },
-    test () {
+    test() {
       this.$refs.xFormTable.setTableData([])
     },
-    defaultF () {
+    defaultF() {
       this.$refs.xFormTable.setTableSize('default')
     },
-    middleF () {
+    middleF() {
       this.$refs.xFormTable.setTableSize('middle')
     },
-    smallF () {
+    smallF() {
       this.$refs.xFormTable.setTableSize('small')
     },
-    columnClick (key, value, record) {
+    columnClick(key, value, record) {
       microDispatch({
         type: 'v3route',
         path: '/bingliguanli/dianzibingliluru',
-        props: { selected: arguments[0].his_f_admission_id },
+        props: { selected: arguments[0].his_f_admission_id }
       })
     },
-    action (record, id, actionType) {
+    action(record, id, actionType) {
       this.detailVisible = true
       console.log('触发了详情操作', record, id, actionType)
     },
-    onClose () {
+    onClose() {
       this.detailVisible = false
       // 关闭详情之后重新查询表单
       this.$refs.xFormTable.refreshTable(true)
     },
-    selectRow (selectedRowKeys, selectedRows) {
+    selectRow(selectedRowKeys, selectedRows) {
       this.selected = {
         keys: selectedRowKeys,
-        rows: selectedRows,
+        rows: selectedRows
       }
       console.log('selectedDemo', this.selected)
-    },
-  },
+    }
+  }
 }
 </script>
 

package/src/base-client/components/common/XTab/XTab.vue

@@ -200,6 +200,33 @@ export default {
       if (initStatus) {
         this.activeKey = this.defaultActiveKey
       }
+
+      // 每次切换后，重新应用单个页签的显示/隐藏规则
+      this.applyTabHeaderVisibility()
+    },
+    applyTabHeaderVisibility () {
+      // 根级 showTabBar 为 false 时，整个头都不显示，就不再处理单个页签
+      if (!this.showTabBar || !this.config || !Array.isArray(this.config.data)) return
+
+      this.$nextTick(() => {
+        try {
+          const navTabs = this.$el.querySelectorAll('.ant-tabs-nav .ant-tabs-tab')
+          if (!navTabs || !navTabs.length) return
+
+          this.config.data.forEach((tab, index) => {
+            const tabNode = navTabs[index]
+            if (!tabNode) return
+            if (tab && tab.showTabBar === false) {
+              tabNode.style.display = 'none'
+            } else {
+              tabNode.style.display = ''
+            }
+          })
+        } catch (e) {
+          // DOM 结构异常时不影响主流程
+          console.error('applyTabHeaderVisibility error', e)
+        }
+      })
     },
 
     // 新增：等待组件就绪的方法
@@ -331,6 +358,8 @@ export default {
       if (this.config && this.config.data) {
         this.markTabAsLoaded(this.defaultActiveKey)
       }
+      // 初始化完成后，根据每个 tab 的 showTabBar 设置头部显示
+      this.applyTabHeaderVisibility()
     },
     getConfig () {
       getConfigByName(this.configName, this.serverName, res => {
@@ -341,6 +370,8 @@ export default {
         if (this.config && this.config.data) {
           this.markTabAsLoaded(this.defaultActiveKey)
         }
+        // 从服务端配置加载完成后，应用单个页签的显示/隐藏
+        this.applyTabHeaderVisibility()
       }, this.env === 'dev')
     },
     getEventHandlers (tab, index) {

package/src/base-client/components/his/XHisEditor/XHisEditor.vue

@@ -614,9 +614,10 @@ export default {
           f_file_name: this.fileName
         }
         // 保存HTML文档和结构化数据到后端服务
+        const queryParams = {admissionId: this.admissionId, f_template_id: this.templateId}
         runLogic(this.saveDataLogicName, data, this.serviceName).then(res => {
           this.$message.success('保存成功')
-          this.changeRes(res.currResData.id)
+          this.reload({...queryParams,resId: res.currResData.id})
           this.$emit('saveafter', data.dataObject)
         }).finally(() => {
           this.resDataModalVisible = false

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,13 +50,13 @@ 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'),
@@ -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/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)
 }
 

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），静默处理