vue2-client 1.12.3 → 1.12.5

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

@@ -1,145 +1,145 @@
-import { getSystemVersion, METHOD, request } from '@vue2-client/utils/request'
-import { fetchEventSource } from '@microsoft/fetch-event-source'
-import { ACCESS_TOKEN, V4_ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
-
-/**
- * GET请求
- * @param url 请求地址
- * @param parameter 路径参数
- * @returns {Promise<AxiosResponse<T>>}
- */
-function get (url, parameter) {
-  return request(url, METHOD.GET, parameter)
-}
-
-/**
- * POST请求
- * @param url 请求地址
- * @param parameter 请求参数
- * @param config
- * @returns {Promise<AxiosResponse<T>>}
- */
-function post (url, parameter, config = {}) {
-  return request(url, METHOD.POST, parameter, config)
-}
-
-/**
- * POST请求
- * @param url 请求地址
- * @param parameter 请求参数
- * @param serviceName
- * @param isDev
- * @param config
- * @returns {Promise<AxiosResponse<T>>}
- */
-function postByServiceName (url, parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev, config = {}) {
-  if (url.startsWith('api/') || url.startsWith('/api/')) {
-    return request(url, METHOD.POST, parameter, config)
-  }
-  let apiPre = '/api/'
-  if (isDev) {
-    apiPre = '/devApi/'
-  }
-  if (!url.startsWith('/')) {
-    url = '/' + url
-  }
-  url = apiPre + serviceName + url
-  return request(url, METHOD.POST, parameter, config)
-}
-
-/**
- * DELETE请求
- * @param url 请求地址
- * @param parameter 请求参数
- * @param config
- * @returns {Promise<AxiosResponse<T>>}
- */
-function del (url, parameter, config = {}) {
-  return request(url, METHOD.DELETE, parameter, config)
-}
-
-/**
- * PUT请求
- * @param url 请求地址
- * @param parameter 请求参数
- * @param config
- * @returns {Promise<AxiosResponse<T>>}
- */
-function put (url, parameter, config = {}) {
-  return request(url, METHOD.PUT, parameter, config)
-}
-
-/**
- * 封装 EventSource 请求函数
- * @param {string} url - 请求地址
- * @param {Object} options - 请求选项（包括 method, headers, body 等）
- * @param {Function} onDataUpdate - 数据更新回调，每次接收到新的数据都会调用
- * @param {Function} onError - 错误处理回调
- * @returns {Function} - 用于取消请求的函数
- */
-function startEventStreamPOST (url, params, headers = {}, onDataUpdate, onError, serviceName = process.env.VUE_APP_SYSTEM_NAME, method = 'GET') {
-  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
-  if (!(url.startsWith('api/') || url.startsWith('/api/') || url.startsWith('http'))) {
-    if (!url.startsWith('/')) {
-      url = '/' + url
-    }
-    url = '/api/' + serviceName + url
-  }
-  const controller = new AbortController()
-  const { signal } = controller
-  const token = localStorage.getItem(ACCESS_TOKEN)
-  // 增加 V4 登录请求头
-  if (token) {
-    const compatible = getSystemVersion()
-    if (compatible === 'V4') {
-      // V4 环境则添加 V4请求头
-      headers[V4_ACCESS_TOKEN] = token
-    } else {
-      headers[ACCESS_TOKEN] = token
-    }
-  }
-  // 开始请求
-  fetchEventSource(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('连接已打开')
-    },
-    onmessage (event) {
-      if (isStopped) return
-      const data = event.data
-      try {
-        const parsedData = JSON.parse(data)
-        onDataUpdate?.(parsedData)
-      } catch (e) {
-        onDataUpdate?.(data)
-      }
-    },
-    onerror (error) {
-      if (isStopped) return
-      console.error('发生错误:', error)
-      isStopped = true
-      controller.abort()
-      onError?.(error)
-    },
-  }).then(r => {})
-
-  // 返回停止函数
-  return () => {
-    isStopped = true
-    controller.abort()
-    console.log('连接已关闭')
-  }
-}
-
-export { get, post, del, put, postByServiceName, startEventStream, startEventStreamPOST }
+import { getSystemVersion, METHOD, request } from '@vue2-client/utils/request'
+import { fetchEventSource } from '@microsoft/fetch-event-source'
+import { ACCESS_TOKEN, V4_ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
+
+/**
+ * GET请求
+ * @param url 请求地址
+ * @param parameter 路径参数
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function get (url, parameter) {
+  return request(url, METHOD.GET, parameter)
+}
+
+/**
+ * POST请求
+ * @param url 请求地址
+ * @param parameter 请求参数
+ * @param config
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function post (url, parameter, config = {}) {
+  return request(url, METHOD.POST, parameter, config)
+}
+
+/**
+ * POST请求
+ * @param url 请求地址
+ * @param parameter 请求参数
+ * @param serviceName
+ * @param isDev
+ * @param config
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function postByServiceName (url, parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev, config = {}) {
+  if (url.startsWith('api/') || url.startsWith('/api/')) {
+    return request(url, METHOD.POST, parameter, config)
+  }
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  if (!url.startsWith('/')) {
+    url = '/' + url
+  }
+  url = apiPre + serviceName + url
+  return request(url, METHOD.POST, parameter, config)
+}
+
+/**
+ * DELETE请求
+ * @param url 请求地址
+ * @param parameter 请求参数
+ * @param config
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function del (url, parameter, config = {}) {
+  return request(url, METHOD.DELETE, parameter, config)
+}
+
+/**
+ * PUT请求
+ * @param url 请求地址
+ * @param parameter 请求参数
+ * @param config
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+function put (url, parameter, config = {}) {
+  return request(url, METHOD.PUT, parameter, config)
+}
+
+/**
+ * 封装 EventSource 请求函数
+ * @param {string} url - 请求地址
+ * @param {Object} options - 请求选项（包括 method, headers, body 等）
+ * @param {Function} onDataUpdate - 数据更新回调，每次接收到新的数据都会调用
+ * @param {Function} onError - 错误处理回调
+ * @returns {Function} - 用于取消请求的函数
+ */
+function startEventStreamPOST (url, params, headers = {}, onDataUpdate, onError, serviceName = process.env.VUE_APP_SYSTEM_NAME, method = 'GET') {
+  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
+  if (!(url.startsWith('api/') || url.startsWith('/api/') || url.startsWith('http'))) {
+    if (!url.startsWith('/')) {
+      url = '/' + url
+    }
+    url = '/api/' + serviceName + url
+  }
+  const controller = new AbortController()
+  const { signal } = controller
+  const token = localStorage.getItem(ACCESS_TOKEN)
+  // 增加 V4 登录请求头
+  if (token) {
+    const compatible = getSystemVersion()
+    if (compatible === 'V4') {
+      // V4 环境则添加 V4请求头
+      headers[V4_ACCESS_TOKEN] = token
+    } else {
+      headers[ACCESS_TOKEN] = token
+    }
+  }
+  // 开始请求
+  fetchEventSource(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('连接已打开')
+    },
+    onmessage (event) {
+      if (isStopped) return
+      const data = event.data
+      try {
+        const parsedData = JSON.parse(data)
+        onDataUpdate?.(parsedData)
+      } catch (e) {
+        onDataUpdate?.(data)
+      }
+    },
+    onerror (error) {
+      if (isStopped) return
+      console.error('发生错误:', error)
+      isStopped = true
+      controller.abort()
+      onError?.(error)
+    },
+  }).then(r => {})
+
+  // 返回停止函数
+  return () => {
+    isStopped = true
+    controller.abort()
+    console.log('连接已关闭')
+  }
+}
+
+export { get, post, del, put, postByServiceName, startEventStream, startEventStreamPOST }

package/src/services/api/workFlow.js

@@ -1,63 +1,63 @@
-// 工单专用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',
-  // 获取工作流流程图设计
-  getWorkFlowPaintWorkFlowDefine: '/logic/getWorkFlowPaintWorkFlowDefine',
-  // 简单添加字典项
-  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',
+  // 获取工作流流程图设计
+  getWorkFlowPaintWorkFlowDefine: '/logic/getWorkFlowPaintWorkFlowDefine',
+  // 简单添加字典项
+  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/services/apiService.js

@@ -1,16 +1,16 @@
-// 跨域代理前缀
-// const API_PROXY_PREFIX='/api'
-// const BASE_URL = process.env.NODE_ENV === 'production' ? process.env.VUE_APP_API_BASE_URL : API_PROXY_PREFIX
-
-module.exports = {
-  LOGIN: `/rs/logic/getLogin`,
-  MODIFY_PASSWORD: '/rs/user/modifypwd',
-  V4_LOGIN: '/api/af-auth/login',
-  V4_LOGOUT: '/api/af-auth/logout',
-  V4_REFRESH_TOKEN: '/api/af-auth/refresh',
-  ROUTES: `/rs/user/userLogin`,
-  SEARCH: `/rs/search`,
-  GOODS: `/goods`,
-  GOODS_COLUMNS: `/columns`,
-  V4_GET_INFO: '/api/af-system/user/info'
-}
+// 跨域代理前缀
+// const API_PROXY_PREFIX='/api'
+// const BASE_URL = process.env.NODE_ENV === 'production' ? process.env.VUE_APP_API_BASE_URL : API_PROXY_PREFIX
+
+module.exports = {
+  LOGIN: `/rs/logic/getLogin`,
+  MODIFY_PASSWORD: '/rs/user/modifypwd',
+  V4_LOGIN: '/api/af-auth/login',
+  V4_LOGOUT: '/api/af-auth/logout',
+  V4_REFRESH_TOKEN: '/api/af-auth/refresh',
+  ROUTES: `/rs/user/userLogin`,
+  SEARCH: `/rs/search`,
+  GOODS: `/goods`,
+  GOODS_COLUMNS: `/columns`,
+  V4_GET_INFO: '/api/af-system/user/info'
+}