vue2-client 1.8.166 → 1.8.167

package/src/services/api/common.js

@@ -1,274 +1,274 @@
-import { indexedDB } from '@vue2-client/utils/indexedDB'
-import notification from 'ant-design-vue/lib/notification'
-import message from 'ant-design-vue/lib/message'
-import { blobValidate } from '@vue2-client/utils/common'
-import errorCode from '@vue2-client/utils/errorCode'
-import { saveAs } from 'file-saver'
-import { post } from '@vue2-client/services/api/restTools'
-
-const commonApi = {
-  // 获取配置
-  getConfig: 'logic/openapi/getLiuliConfiguration',
-  // 获取原生配置
-  getNativeConfig: 'logic/openapi/getLiuliNativeConfiguration',
-  // 配置解析
-  parseConfig: 'logic/parseConfig',
-  // 通用查询
-  query: 'logic/commonQuery',
-  // 表单查询
-  queryWithResource: 'logic/commonQueryWithResource',
-  // 通用新增/修改
-  addOrModify: 'logic/commonAddOrModify',
-  // 通用删除
-  delete: 'logic/commonDelete',
-  // 导入数据
-  importData: 'crud/importDataByExcel',
-  // 导出数据
-  exportData: 'logic/commonExport',
-  // 导入模板下载
-  downloadImportTemplate: 'logic/commonDownloadImportTemplate',
-  // 下载数据
-  download: 'resource/download',
-  // 通用上传
-  upload: 'resource/upload',
-  // 文件实体操作
-  fileEntity: 'entity/t_files',
-  // 获取所有员工及其部门的级联菜单数据
-  getEmpTree: '/api/af-system/logic/getEmpTree',
-  // 获取表格列配置
-  getColumnsJson: '/api/af-system/logic/getColumns',
-}
-
-/**
- * 获取字典键参数
- */
-export function getDictionaryParam (isDev) {
-  let apiPre = '/api/'
-  if (isDev) {
-    apiPre = '/devApi/'
-  }
-  return post(apiPre + 'af-system/logic/getDictionaryParam', {})
-}
-
-/**
- * 根据配置名获取配置内容
- * @param content 已有的配置内容
- * @param configName 配置名称
- * @param serviceName 命名空间名称
- * @param callback 回调函数
- * @param isDev 是否为开发环境
- */
-export function getConfig (content, configName, serviceName = process.env.VUE_APP_SYSTEM_NAME, callback, isDev) {
-  if (content) {
-    return content
-  }
-  let apiPre = '/api/'
-  if (isDev) {
-    apiPre = '/devApi/'
-  }
-  const getConfigUrl = apiPre + serviceName + '/' + commonApi.getConfig
-  indexedDB.getByWeb(configName, getConfigUrl, { configName: configName }, callback)
-}
-
-export function getConfigByName (configName, serviceName = process.env.VUE_APP_SYSTEM_NAME, callback, isDev) {
-  return getConfig(undefined, configName, serviceName, callback, isDev)
-}
-
-export function getNativeConfig (configName, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
-  let apiPre = '/api/'
-  if (isDev) {
-    apiPre = '/devApi/'
-  }
-  const getConfigUrl = apiPre + serviceName + '/' + commonApi.getNativeConfig
-  return post(getConfigUrl, { configName: configName })
-}
-
-/**
- * 调用Logic获取配置内容
- * @param logicName Logic名称
- * @param parameter Logic调用参数
- * @param serviceName 命名空间名称
- * @param callback 回调函数
- * @param isDev 是否是开发环境
- */
-export function getConfigByLogic (logicName, parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, callback, isDev) {
-  let apiPre = '/api/'
-  if (isDev) {
-    apiPre = '/devApi/'
-  }
-  indexedDB.getByWeb(`${logicName}_${JSON.stringify(parameter)}`, apiPre + serviceName + '/logic/' + logicName,
-    parameter, callback)
-}
-
-/**
- * 配置解析
- * @param configContent 原配置内容
- * @param configType 配置类型
- * @param serviceName 命名空间名称
- * @param isDev 是否是开发环境
- */
-export function parseConfig (configContent, configType, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
-  let apiPre = '/api/'
-  if (isDev) {
-    apiPre = '/devApi/'
-  }
-  const url = apiPre + serviceName + '/' + commonApi.parseConfig
-  return post(url, {
-    configType: configType,
-    configContent: configContent
-  })
-}
-
-/**
- * 通用执行业务逻辑
- */
-export function runLogic (logicName, parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
-  let apiPre = '/api/'
-  if (isDev) {
-    apiPre = '/devApi/'
-  }
-  return post(apiPre + serviceName + '/logic/' + logicName, parameter)
-}
-
-/**
- * 通用查询
- */
-export function query (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
-  let apiPre = '/api/'
-  if (isDev) {
-    apiPre = '/devApi/'
-  }
-  return post(apiPre + serviceName + '/' + commonApi.query, parameter, null)
-}
-
-/**
- * 通用表单查询
- */
-export function queryWithResource (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
-  let apiPre = '/api/'
-  if (isDev) {
-    apiPre = '/devApi/'
-  }
-  return post(apiPre + serviceName + '/' + commonApi.queryWithResource, parameter, null)
-}
-
-/**
- * 通用新增/修改
- */
-export function addOrModify (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
-  let apiPre = '/api/'
-  if (isDev) {
-    apiPre = '/devApi/'
-  }
-  return post(apiPre + serviceName + '/' + commonApi.addOrModify, parameter, null)
-}
-
-/**
- * 通用删除
- */
-export function remove (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
-  let apiPre = '/api/'
-  if (isDev) {
-    apiPre = '/devApi/'
-  }
-  return post(apiPre + serviceName + '/' + commonApi.delete, parameter, null)
-}
-
-/**
- * 通用导入
- */
-export function importData (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
-  let apiPre = '/api/'
-  if (isDev) {
-    apiPre = '/devApi/'
-  }
-  return post(apiPre + serviceName + '/' + commonApi.importData, parameter, null)
-}
-
-/**
- * 通用导出
- */
-export function exportData (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
-  let apiPre = '/api/'
-  if (isDev) {
-    apiPre = '/devApi/'
-  }
-  return post(apiPre + serviceName + '/' + commonApi.exportData, parameter, null)
-}
-
-/**
- * 通用上传
- */
-export function upload (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, config, isDev) {
-  let apiPre = '/api/'
-  if (isDev) {
-    apiPre = '/devApi/'
-  }
-  return post(apiPre + serviceName + '/' + commonApi.upload, parameter, config)
-}
-
-/**
- * 通用导入模板下载
- */
-export function downloadImportExcel (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
-  let apiPre = '/api/'
-  if (isDev) {
-    apiPre = '/devApi/'
-  }
-  return post(apiPre + serviceName + '/' + commonApi.downloadImportTemplate, parameter, null)
-}
-
-// 通用下载
-export function download (parameter, filename, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
-  let apiPre = '/api/'
-  if (isDev) {
-    apiPre = '/devApi/'
-  }
-  const notificationKey = 'download'
-  notification.open({
-    key: notificationKey,
-    message: '正在下载数据，请稍候',
-    duration: null,
-    icon: h => {
-      return h(
-        'a-icon',
-        {
-          props: {
-            type: 'loading'
-          }
-        }
-      )
-    }
-  })
-  return post(apiPre + serviceName + '/' + commonApi.download, parameter, {
-    responseType: 'blob'
-  }).then(async (data) => {
-    const isLogin = await blobValidate(data)
-    if (isLogin) {
-      const blob = new Blob([data])
-      saveAs(blob, filename)
-      message.success('下载成功')
-    } else {
-      const resText = await data.text()
-      const rspObj = JSON.parse(resText)
-      const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode.default
-      message.error(errMsg)
-    }
-    notification.close(notificationKey)
-  }).catch((r) => {
-    message.error('功能尚未实现，敬请期待！')
-    // message.error('下载文件出现错误，请联系管理员！')
-    notification.close(notificationKey)
-  })
-}
-
-// 文件删除
-export function fileDelete (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
-  let apiPre = '/api/'
-  if (isDev) {
-    apiPre = '/devApi/'
-  }
-  return post(apiPre + serviceName + '/' + commonApi.fileEntity, parameter)
-}
-
-export { commonApi }
+import { indexedDB } from '@vue2-client/utils/indexedDB'
+import notification from 'ant-design-vue/lib/notification'
+import message from 'ant-design-vue/lib/message'
+import { blobValidate } from '@vue2-client/utils/common'
+import errorCode from '@vue2-client/utils/errorCode'
+import { saveAs } from 'file-saver'
+import { post } from '@vue2-client/services/api/restTools'
+
+const commonApi = {
+  // 获取配置
+  getConfig: 'logic/openapi/getLiuliConfiguration',
+  // 获取原生配置
+  getNativeConfig: 'logic/openapi/getLiuliNativeConfiguration',
+  // 配置解析
+  parseConfig: 'logic/parseConfig',
+  // 通用查询
+  query: 'logic/commonQuery',
+  // 表单查询
+  queryWithResource: 'logic/commonQueryWithResource',
+  // 通用新增/修改
+  addOrModify: 'logic/commonAddOrModify',
+  // 通用删除
+  delete: 'logic/commonDelete',
+  // 导入数据
+  importData: 'crud/importDataByExcel',
+  // 导出数据
+  exportData: 'logic/commonExport',
+  // 导入模板下载
+  downloadImportTemplate: 'logic/commonDownloadImportTemplate',
+  // 下载数据
+  download: 'resource/download',
+  // 通用上传
+  upload: 'resource/upload',
+  // 文件实体操作
+  fileEntity: 'entity/t_files',
+  // 获取所有员工及其部门的级联菜单数据
+  getEmpTree: '/api/af-system/logic/getEmpTree',
+  // 获取表格列配置
+  getColumnsJson: '/api/af-system/logic/getColumns',
+}
+
+/**
+ * 获取字典键参数
+ */
+export function getDictionaryParam (isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + 'af-system/logic/getDictionaryParam', {})
+}
+
+/**
+ * 根据配置名获取配置内容
+ * @param content 已有的配置内容
+ * @param configName 配置名称
+ * @param serviceName 命名空间名称
+ * @param callback 回调函数
+ * @param isDev 是否为开发环境
+ */
+export function getConfig (content, configName, serviceName = process.env.VUE_APP_SYSTEM_NAME, callback, isDev) {
+  if (content) {
+    return content
+  }
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  const getConfigUrl = apiPre + serviceName + '/' + commonApi.getConfig
+  indexedDB.getByWeb(configName, getConfigUrl, { configName: configName }, callback)
+}
+
+export function getConfigByName (configName, serviceName = process.env.VUE_APP_SYSTEM_NAME, callback, isDev) {
+  return getConfig(undefined, configName, serviceName, callback, isDev)
+}
+
+export function getNativeConfig (configName, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  const getConfigUrl = apiPre + serviceName + '/' + commonApi.getNativeConfig
+  return post(getConfigUrl, { configName: configName })
+}
+
+/**
+ * 调用Logic获取配置内容
+ * @param logicName Logic名称
+ * @param parameter Logic调用参数
+ * @param serviceName 命名空间名称
+ * @param callback 回调函数
+ * @param isDev 是否是开发环境
+ */
+export function getConfigByLogic (logicName, parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, callback, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  indexedDB.getByWeb(`${logicName}_${JSON.stringify(parameter)}`, apiPre + serviceName + '/logic/' + logicName,
+    parameter, callback)
+}
+
+/**
+ * 配置解析
+ * @param configContent 原配置内容
+ * @param configType 配置类型
+ * @param serviceName 命名空间名称
+ * @param isDev 是否是开发环境
+ */
+export function parseConfig (configContent, configType, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  const url = apiPre + serviceName + '/' + commonApi.parseConfig
+  return post(url, {
+    configType: configType,
+    configContent: configContent
+  })
+}
+
+/**
+ * 通用执行业务逻辑
+ */
+export function runLogic (logicName, parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/logic/' + logicName, parameter)
+}
+
+/**
+ * 通用查询
+ */
+export function query (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.query, parameter, null)
+}
+
+/**
+ * 通用表单查询
+ */
+export function queryWithResource (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.queryWithResource, parameter, null)
+}
+
+/**
+ * 通用新增/修改
+ */
+export function addOrModify (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.addOrModify, parameter, null)
+}
+
+/**
+ * 通用删除
+ */
+export function remove (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.delete, parameter, null)
+}
+
+/**
+ * 通用导入
+ */
+export function importData (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.importData, parameter, null)
+}
+
+/**
+ * 通用导出
+ */
+export function exportData (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.exportData, parameter, null)
+}
+
+/**
+ * 通用上传
+ */
+export function upload (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, config, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.upload, parameter, config)
+}
+
+/**
+ * 通用导入模板下载
+ */
+export function downloadImportExcel (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.downloadImportTemplate, parameter, null)
+}
+
+// 通用下载
+export function download (parameter, filename, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  const notificationKey = 'download'
+  notification.open({
+    key: notificationKey,
+    message: '正在下载数据，请稍候',
+    duration: null,
+    icon: h => {
+      return h(
+        'a-icon',
+        {
+          props: {
+            type: 'loading'
+          }
+        }
+      )
+    }
+  })
+  return post(apiPre + serviceName + '/' + commonApi.download, parameter, {
+    responseType: 'blob'
+  }).then(async (data) => {
+    const isLogin = await blobValidate(data)
+    if (isLogin) {
+      const blob = new Blob([data])
+      saveAs(blob, filename)
+      message.success('下载成功')
+    } else {
+      const resText = await data.text()
+      const rspObj = JSON.parse(resText)
+      const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode.default
+      message.error(errMsg)
+    }
+    notification.close(notificationKey)
+  }).catch((r) => {
+    message.error('功能尚未实现，敬请期待！')
+    // message.error('下载文件出现错误，请联系管理员！')
+    notification.close(notificationKey)
+  })
+}
+
+// 文件删除
+export function fileDelete (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+  let apiPre = '/api/'
+  if (isDev) {
+    apiPre = '/devApi/'
+  }
+  return post(apiPre + serviceName + '/' + commonApi.fileEntity, parameter)
+}
+
+export { commonApi }

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 } 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,
-  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 } 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,
+  TicketDetailsViewApi
+}