vue2-client 1.14.54 → 1.14.56

package/src/services/api/entity.js

@@ -1,18 +1,18 @@
-import { post } from '@vue2-client/services/api/restTools'
-
-const entityApi = {
-  // 根据ID查询数据
-  getById: (entityName, id, data = {}, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/query/${entityName}/${id}`, data)
-  },
-  // 根据ID集合查询所有数据
-  findAllByIds: (entityName, data, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/query/${entityName}`, data)
-  },
-  // 查询实体的总数量
-  getCount: (entityName, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
-    return post(`/api/${serviceName}/entity/queryCount/${entityName}`, {})
-  }
-}
-
-export { entityApi }
+import { post } from '@vue2-client/services/api/restTools'
+
+const entityApi = {
+  // 根据ID查询数据
+  getById: (entityName, id, data = {}, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/query/${entityName}/${id}`, data)
+  },
+  // 根据ID集合查询所有数据
+  findAllByIds: (entityName, data, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/query/${entityName}`, data)
+  },
+  // 查询实体的总数量
+  getCount: (entityName, serviceName = process.env.VUE_APP_SYSTEM_NAME) => {
+    return post(`/api/${serviceName}/entity/queryCount/${entityName}`, {})
+  }
+}
+
+export { entityApi }

package/src/services/api/index.js

@@ -1,17 +1,17 @@
-import { commonApi, getConfig, query, addOrModify, remove } from '@vue2-client/services/api/common'
-import { QueryParamsDetailsViewApi } from '@vue2-client/services/api/QueryParamsDetailsViewApi'
-import { DictionaryDetailsViewApi } from '@vue2-client/services/api/DictionaryDetailsViewApi'
-import { LogDetailsViewApi } from '@vue2-client/services/api/LogDetailsViewApi'
-import { manageApi } from '@vue2-client/services/api/manage'
-import { get, post, postByServiceName } from '@vue2-client/services/api/restTools'
-import { TicketDetailsViewApi } from '@vue2-client/services/api/TicketDetailsViewApi'
-
-export {
-  commonApi, getConfig, query, addOrModify, remove,
-  DictionaryDetailsViewApi,
-  LogDetailsViewApi,
-  manageApi,
-  QueryParamsDetailsViewApi,
-  get, post, postByServiceName,
-  TicketDetailsViewApi
-}
+import { commonApi, getConfig, query, addOrModify, remove } from '@vue2-client/services/api/common'
+import { QueryParamsDetailsViewApi } from '@vue2-client/services/api/QueryParamsDetailsViewApi'
+import { DictionaryDetailsViewApi } from '@vue2-client/services/api/DictionaryDetailsViewApi'
+import { LogDetailsViewApi } from '@vue2-client/services/api/LogDetailsViewApi'
+import { manageApi } from '@vue2-client/services/api/manage'
+import { get, post, postByServiceName } from '@vue2-client/services/api/restTools'
+import { TicketDetailsViewApi } from '@vue2-client/services/api/TicketDetailsViewApi'
+
+export {
+  commonApi, getConfig, query, addOrModify, remove,
+  DictionaryDetailsViewApi,
+  LogDetailsViewApi,
+  manageApi,
+  QueryParamsDetailsViewApi,
+  get, post, postByServiceName,
+  TicketDetailsViewApi
+}

package/src/services/api/restTools.js

@@ -81,13 +81,23 @@ function startEventStreamPOST (url, params, headers = {}, onDataUpdate, onError,
   return startEventStream(url, params, headers, onDataUpdate, onError, serviceName, 'POST')
 }
 function startEventStream (url, params, headers = {}, onDataUpdate, onError, serviceName = process.env.VUE_APP_SYSTEM_NAME, method = 'GET') {
+  // let isStopped = false
   let isStopped = false
+  let requestCount = 0
+
   if (!(url.startsWith('api/') || url.startsWith('/api/') || url.startsWith('http'))) {
     if (!url.startsWith('/')) {
       url = '/' + url
     }
     url = '/api/' + serviceName + url
   }
+
+  console.log(`[EventStream] 开始新的请求: ${url}`, {
+    params,
+    headers,
+    method
+  })
+
   const controller = new AbortController()
   const { signal } = controller
   const token = localStorage.getItem(ACCESS_TOKEN)
@@ -101,38 +111,99 @@ function startEventStream (url, params, headers = {}, onDataUpdate, onError, ser
       headers[ACCESS_TOKEN] = token
     }
   }
-  // 开始请求
-  fetchEventSource(url, {
+  fetch(url, {
     method: method,
-    headers: headers,
-    body: JSON.stringify(params),
-    signal,
-    onopen (response) {
-      if (!response.ok) {
-        const error = new Error(`Error: ${response.status} ${response.statusText}`)
-        onError?.(error)
-        throw error
-      }
-      console.log('连接已打开')
+    headers: {
+      ...headers,
+      Accept: 'text/event-stream',
+      'Cache-Control': 'no-cache',
+      Connection: 'keep-alive'
     },
-    onmessage (event) {
-      if (isStopped) return
-      const data = event.data
-      try {
-        const parsedData = JSON.parse(data)
-        onDataUpdate?.(parsedData)
-      } catch (e) {
-        onDataUpdate?.(data)
+    body: JSON.stringify(params),
+    signal
+  }).then(response => {
+    if (!response.ok) {
+      throw new Error(`HTTP error! status: ${response.status}`)
+    }
+
+    requestCount++
+    console.log(`[EventStream] 请求已打开 (第${requestCount}次): ${url}`, {
+      status: response.status,
+      statusText: response.statusText
+    })
+
+    const reader = response.body.getReader()
+    const decoder = new TextDecoder()
+    let buffer = ''
+
+    function processStream () {
+      if (isStopped) {
+        console.log(`[EventStream] 请求已停止，停止读取流: ${url}`)
+        return
       }
-    },
-    onerror (error) {
-      if (isStopped) return
-      console.error('发生错误:', error)
+
+      reader.read().then(({ done, value }) => {
+        if (done) {
+          console.log(`[EventStream] 流读取完成: ${url}`)
+          return
+        }
+
+        const chunk = decoder.decode(value, { stream: true })
+        buffer += chunk
+
+        // 处理接收到的数据
+        const lines = buffer.split('\n')
+        buffer = lines.pop() // 保留最后一个不完整的行
+
+        let currentEvent = null
+        let currentData = null
+
+        for (const line of lines) {
+          if (line.startsWith('event: ')) {
+            currentEvent = line.slice(7)
+          } else if (line.startsWith('data: ')) {
+            currentData = line.slice(6)
+            try {
+              const parsedData = JSON.parse(currentData)
+              if (currentEvent === 'additionalInfo') {
+                // 触发 additionalInfo 回调
+                onDataUpdate?.(parsedData, 'additionalInfo')
+              } else {
+                // 普通消息数据
+                onDataUpdate?.(parsedData, 'sourceInfo')
+              }
+            } catch (e) {
+              if (currentEvent === 'sourceInfo') {
+                // 触发 sourceInfo 回调
+                onDataUpdate?.(currentData, 'sourceInfo')
+              } else {
+                onDataUpdate?.(currentData, 'data')
+              }
+            }
+            // 重置当前事件和数据
+            currentEvent = null
+            currentData = null
+          }
+        }
+
+        processStream()
+      }).catch(error => {
+        console.error(`[EventStream] 流读取错误: ${url}`, error)
+        if (!isStopped) {
+          isStopped = true
+          onError?.(error)
+        }
+      })
+    }
+
+    processStream()
+  }).catch(error => {
+    console.error(`[EventStream] 请求错误: ${url}`, error)
+    if (!isStopped) {
       isStopped = true
-      controller.abort()
       onError?.(error)
-    },
-  }).then(r => {})
+    }
+  })
 
   // 返回停止函数
   return () => {

package/src/services/api/workFlow.js

@@ -1,61 +1,61 @@
-// 工单专用api
-const workFlowViewApi = {
-  // 查询：获取工作流基本数据
-  getWorkFlowBasicInfo: '/logic/getWorkFlowBasicInfo',
-  // 保存工作流流程定义
-  saveWorkFlowWorkflowDefine: '/logic/saveWorkFlowWorkflowDefine',
-  // 获取工作流流程定义
-  getWorkFlowDefine: '/logic/getWorkFlowDefine',
-  // 获取工作流当前步骤
-  getWorkFlowCurrentSubState: '/logic/getWorkFlowCurrentSubState',
-  // 保存用户每一步输入的表单内容
-  saveWorkFlowStepFormData: '/logic/saveWorkFlowStepFormData',
-  // 获取已经完成步骤的用户填写数据
-  getWorkFlowCompletedStepData: '/logic/getWorkFlowCompletedStepData',
-  // 改变工作流进度
-  updateWorkFlowState: '/logic/updateWorkFlowState',
-  // 完工确认后更改工作流状态
-  afterWorkFlowFinalStepSubmit: '/logic/afterWorkFlowFinalStepSubmit',
-  // 获取步骤留言和表单填写人姓名
-  getStepNoteAndHandler: '/logic/getStepNoteAndHandler',
-  // 更新步骤信息
-  updateWorkFlowStepData: '/logic/updateWorkFlowStepData',
-  // 保存工作流日志
-  saveWorkFlowLog: '/logic/saveWorkFlowLog',
-  // 获取工作流日志
-  getWorkFlowLog: '/logic/getWorkFlowLog',
-  // 获取员工任务详情信息
-  getEmployeeTaskDetail: '/logic/getEmployeeTaskDetail',
-  // 根据条件查询任务
-  getWorkFlowListByCondition: '/logic/getWorkFlowListByCondition',
-  // 根据流程名称获取所有步骤名称
-  getWorkFlowStepNames: '/logic/getWorkFlowStepNames',
-  // 获取工作流任务留言
-  getWorkFlowLeaveMessage: '/logic/getWorkFlowLeaveMessage',
-  // 更新任务完成时间
-  updateWorkFlowCompleteTime: '/logic/updateWorkFlowCompleteTime',
-  // 获取任务完成时间更改记录
-  getWorkFlowCompleteTimeChange: '/logic/getWorkFlowCompleteTimeChange',
-  // 修改工单
-  updateWorkFlow: '/logic/updateWorkFlow',
-  // 简单添加字典项
-  simpleInsertIntoDictionary: '/logic/simpleInsertIntoDictionary',
-  // 删除工作流项目
-  deleteWorkFlow: '/logic/deleteWorkFlow',
-  // 获取流程分类数据
-  getWorkFlowCategoryTree: '/logic/getWorkFlowCategoryTree',
-  // 创建任务
-  createWorkflowTask: '/logic/createWorkflowTask',
-  // 获取部门选择框数据
-  getDepartmentList: '/logic/getDepartmentList',
-  // 获取人员任务汇总数据
-  getEmployeeSummary: '/logic/getEmployeeSummary',
-  // 获取逾期任务排行榜
-  getOverdueRanking: '/logic/getOverdueRanking',
-  // 根据人查询对应的t_workflow_step中字段f_workflow_id的数据组
-  getWorkFlowStepWorkFlowId: '/logic/getWorkFlowStepWorkFlowId',
-  // 表单提交到下一步
-  submitToNextStep: '/logic/submitToNextStep'
-}
-
-export { workFlowViewApi }
+// 工单专用api
+const workFlowViewApi = {
+  // 查询：获取工作流基本数据
+  getWorkFlowBasicInfo: '/logic/getWorkFlowBasicInfo',
+  // 保存工作流流程定义
+  saveWorkFlowWorkflowDefine: '/logic/saveWorkFlowWorkflowDefine',
+  // 获取工作流流程定义
+  getWorkFlowDefine: '/logic/getWorkFlowDefine',
+  // 获取工作流当前步骤
+  getWorkFlowCurrentSubState: '/logic/getWorkFlowCurrentSubState',
+  // 保存用户每一步输入的表单内容
+  saveWorkFlowStepFormData: '/logic/saveWorkFlowStepFormData',
+  // 获取已经完成步骤的用户填写数据
+  getWorkFlowCompletedStepData: '/logic/getWorkFlowCompletedStepData',
+  // 改变工作流进度
+  updateWorkFlowState: '/logic/updateWorkFlowState',
+  // 完工确认后更改工作流状态
+  afterWorkFlowFinalStepSubmit: '/logic/afterWorkFlowFinalStepSubmit',
+  // 获取步骤留言和表单填写人姓名
+  getStepNoteAndHandler: '/logic/getStepNoteAndHandler',
+  // 更新步骤信息
+  updateWorkFlowStepData: '/logic/updateWorkFlowStepData',
+  // 保存工作流日志
+  saveWorkFlowLog: '/logic/saveWorkFlowLog',
+  // 获取工作流日志
+  getWorkFlowLog: '/logic/getWorkFlowLog',
+  // 获取员工任务详情信息
+  getEmployeeTaskDetail: '/logic/getEmployeeTaskDetail',
+  // 根据条件查询任务
+  getWorkFlowListByCondition: '/logic/getWorkFlowListByCondition',
+  // 根据流程名称获取所有步骤名称
+  getWorkFlowStepNames: '/logic/getWorkFlowStepNames',
+  // 获取工作流任务留言
+  getWorkFlowLeaveMessage: '/logic/getWorkFlowLeaveMessage',
+  // 更新任务完成时间
+  updateWorkFlowCompleteTime: '/logic/updateWorkFlowCompleteTime',
+  // 获取任务完成时间更改记录
+  getWorkFlowCompleteTimeChange: '/logic/getWorkFlowCompleteTimeChange',
+  // 修改工单
+  updateWorkFlow: '/logic/updateWorkFlow',
+  // 简单添加字典项
+  simpleInsertIntoDictionary: '/logic/simpleInsertIntoDictionary',
+  // 删除工作流项目
+  deleteWorkFlow: '/logic/deleteWorkFlow',
+  // 获取流程分类数据
+  getWorkFlowCategoryTree: '/logic/getWorkFlowCategoryTree',
+  // 创建任务
+  createWorkflowTask: '/logic/createWorkflowTask',
+  // 获取部门选择框数据
+  getDepartmentList: '/logic/getDepartmentList',
+  // 获取人员任务汇总数据
+  getEmployeeSummary: '/logic/getEmployeeSummary',
+  // 获取逾期任务排行榜
+  getOverdueRanking: '/logic/getOverdueRanking',
+  // 根据人查询对应的t_workflow_step中字段f_workflow_id的数据组
+  getWorkFlowStepWorkFlowId: '/logic/getWorkFlowStepWorkFlowId',
+  // 表单提交到下一步
+  submitToNextStep: '/logic/submitToNextStep'
+}
+
+export { workFlowViewApi }

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 }

package/src/store/modules/lowCode.js

@@ -1,33 +1,33 @@
-export default {
-  namespace: true,
-  state: {
-    // 页面配置
-    config: { page: [] },
-    // 事件编辑
-    eventEditorContent: {},
-    // 已选中的容器
-    targetContainer: undefined
-  },
-  getters: {
-    config: state => {
-      return state.config
-    },
-    eventEditorContent: state => {
-      return state.eventEditorContent
-    },
-    targetContainer: state => {
-      return state.targetContainer
-    }
-  },
-  mutations: {
-    setConfig (state, newConfig) {
-      state.config = newConfig
-    },
-    setEventEditorContent (state, newContent) {
-      state.eventEditorContent = newContent
-    },
-    setTargetContainer (state, newVal) {
-      state.targetContainer = newVal
-    }
-  }
-}
+export default {
+  namespace: true,
+  state: {
+    // 页面配置
+    config: { page: [] },
+    // 事件编辑
+    eventEditorContent: {},
+    // 已选中的容器
+    targetContainer: undefined
+  },
+  getters: {
+    config: state => {
+      return state.config
+    },
+    eventEditorContent: state => {
+      return state.eventEditorContent
+    },
+    targetContainer: state => {
+      return state.targetContainer
+    }
+  },
+  mutations: {
+    setConfig (state, newConfig) {
+      state.config = newConfig
+    },
+    setEventEditorContent (state, newContent) {
+      state.eventEditorContent = newContent
+    },
+    setTargetContainer (state, newVal) {
+      state.targetContainer = newVal
+    }
+  }
+}