vue2-client 1.6.48 → 1.7.0

package/src/services/api/common.js

@@ -1,123 +1,137 @@
-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 = {
-  // 获取表格列配置
-  getColumnsJson: '/api/af-system/logic/getColumns',
-  // 通用查询
-  query: 'logic/commonQuery',
-  // 表单查询
-  queryWithResource: 'logic/commonQueryWithResource',
-  // 通用新增/修改
-  addOrModify: 'logic/commonAddOrModify',
-  // 通用删除
-  delete: 'logic/commonDelete',
-  // 获取字典键列表
-  getDictionaryParam: '/api/af-system/logic/getDictionaryParam',
-  // 获取所有员工及其部门的级联菜单数据
-  getEmpTree: '/api/af-system/logic/getEmpTree',
-  // 导入数据
-  importData: 'logic/importData',
-  // 下载数据
-  download: 'resource/download',
-  // 通用上传
-  upload: '/resource/upload'
-}
-
-/**
- * 带缓存查询的表格配置文件查询
- * @param queryParamsName 配置名称
- * @param callback 回调函数
- */
-export function getColumnsJson (queryParamsName, callback) {
-  indexedDB.getByWeb(queryParamsName, commonApi.getColumnsJson, { str: queryParamsName }, callback)
-}
-
-/**
- * 通用查询
- */
-export function query (parameter, serviceName = 'af-system') {
-  return post('/api/' + serviceName + '/' + commonApi.query, parameter, null)
-}
-
-/**
- * 通用表单查询
- */
-export function queryWithResource (parameter, serviceName = 'af-system') {
-  return post('/api/' + serviceName + '/' + commonApi.queryWithResource, parameter, null)
-}
-
-/**
- * 通用新增/修改
- */
-export function addOrModify (parameter, serviceName = 'af-system') {
-  return post('/api/' + serviceName + '/' + commonApi.addOrModify, parameter, null)
-}
-
-/**
- * 通用删除
- */
-export function remove (parameter, serviceName = 'af-system') {
-  return post('/api/' + serviceName + '/' + commonApi.delete, parameter, null)
-}
-
-/**
- * 通用导入
- */
-export function importData (parameter, serviceName = 'af-system') {
-  return post('/api/' + serviceName + '/' + commonApi.importData, parameter, null)
-}
-
-/**
- * 通用上传
- */
-export function upload (parameter, serviceName = 'af-system', config) {
-  return post('/api/' + serviceName + '/' + commonApi.upload, parameter, config)
-}
-
-// 通用下载
-export function download (parameter, filename, serviceName = 'af-system') {
-  const notificationKey = 'download'
-  notification.open({
-    key: notificationKey,
-    message: '正在下载数据，请稍候',
-    duration: null,
-    icon: h => {
-      return h(
-        'a-icon',
-        {
-          props: {
-            type: 'loading'
-          }
-        }
-      )
-    }
-  })
-  return post('/api/' + 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 { 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/getLiuliConfiguration',
+  // 通用查询
+  query: 'logic/commonQuery',
+  // 表单查询
+  queryWithResource: 'logic/commonQueryWithResource',
+  // 通用新增/修改
+  addOrModify: 'logic/commonAddOrModify',
+  // 通用删除
+  delete: 'logic/commonDelete',
+  // 获取字典键列表
+  getDictionaryParam: '/api/system/logic/getDictionaryParam',
+  // 获取所有员工及其部门的级联菜单数据
+  getEmpTree: '/api/system/logic/getEmpTree',
+  // 导入数据
+  importData: 'logic/importData',
+  // 导出数据
+  exportData: 'logic/commonExport',
+  // 下载数据
+  download: 'resource/download',
+  // 通用上传
+  upload: '/resource/upload'
+}
+
+export function getConfigUrl (serviceName = 'system') {
+  return '/api/' + serviceName + '/' + commonApi.getConfig
+}
+
+/**
+ * 带缓存查询的表格配置文件查询
+ * @param queryParamsName 配置名称
+ * @param serviceName 命名空间名称
+ * @param callback 回调函数
+ */
+export function getColumnsJson (queryParamsName, serviceName = 'system', callback) {
+  indexedDB.getByWeb(queryParamsName, getConfigUrl(serviceName), { configName: queryParamsName }, callback)
+}
+
+/**
+ * 通用查询
+ */
+export function query (parameter, serviceName = 'system') {
+  return post('/api/' + serviceName + '/' + commonApi.query, parameter, null)
+}
+
+/**
+ * 通用表单查询
+ */
+export function queryWithResource (parameter, serviceName = 'system') {
+  return post('/api/' + serviceName + '/' + commonApi.queryWithResource, parameter, null)
+}
+
+/**
+ * 通用新增/修改
+ */
+export function addOrModify (parameter, serviceName = 'system') {
+  return post('/api/' + serviceName + '/' + commonApi.addOrModify, parameter, null)
+}
+
+/**
+ * 通用删除
+ */
+export function remove (parameter, serviceName = 'system') {
+  return post('/api/' + serviceName + '/' + commonApi.delete, parameter, null)
+}
+
+/**
+ * 通用导入
+ */
+export function importData (parameter, serviceName = 'system') {
+  return post('/api/' + serviceName + '/' + commonApi.importData, parameter, null)
+}
+
+/**
+ * 通用导出
+ */
+export function exportData (parameter, serviceName = 'system') {
+  return post('/api/' + serviceName + '/' + commonApi.exportData, parameter, null)
+}
+
+/**
+ * 通用上传
+ */
+export function upload (parameter, serviceName = 'system', config) {
+  return post('/api/' + serviceName + '/' + commonApi.upload, parameter, config)
+}
+
+// 通用下载
+export function download (parameter, filename, serviceName = 'system') {
+  const notificationKey = 'download'
+  notification.open({
+    key: notificationKey,
+    message: '正在下载数据，请稍候',
+    duration: null,
+    icon: h => {
+      return h(
+        'a-icon',
+        {
+          props: {
+            type: 'loading'
+          }
+        }
+      )
+    }
+  })
+  return post('/api/' + 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 { commonApi }

package/src/services/api/commonTempTable.js

@@ -1,10 +1,10 @@
 const CommonTempTable = {
   // 初始化子表
-  initApplySubTable: '/api/af-system/logic/initApplySubTable',
+  initApplySubTable: '/api/system/logic/initApplySubTable',
   // 创建临时表，根据配置文件动态生成
-  createTempTable: '/api/af-system/logic/createTempTable',
+  createTempTable: '/api/system/logic/createTempTable',
   // 向临时表中插入数据
-  insertDataToTempTable: '/api/af-system/logic/insertDataToTempTable'
+  insertDataToTempTable: '/api/system/logic/insertDataToTempTable'
 }
 
 export { CommonTempTable }

package/src/services/api/logininfor/index.js

@@ -1,6 +1,6 @@
 const loginforApi = {
   // 查询：获取系统访问记录
-  query: '/api/af-system/logic/getLogininfor'
+  query: '/api/system/logic/getLogininfor'
 }
 
 export { loginforApi }

package/src/services/api/manage.js

@@ -1,8 +1,8 @@
 const manageApi = {
   // 查询：获取字典键列表
-  getDictionaryValue: '/api/af-system/logic/getDictionaryValue',
+  getDictionaryValue: '/api/system/logic/getDictionaryValue',
   // 查询：获取省市区街道三级分类
-  getDivisionsOhChina: '/api/af-system/logic/getDivisionsOhChina'
+  getDivisionsOhChina: '/api/system/logic/getDivisionsOhChina'
 }
 
 export { manageApi }

package/src/pages/system/queryParams/index.vue

@@ -1,43 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <query-params-details-view
-      v-if="selectId"
-      :id="selectId"
-      :visible.sync="detailVisible"
-    />
-    <x-form-table
-      :queryParamsName="queryParamsName"
-      title="查询配置"
-      @action="toDetail">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-  import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-  import QueryParamsDetailsView from '@vue2-client/base-client/components/system/QueryParamsDetailsView'
-
-  export default {
-    name: 'QueryParams',
-    components: {
-      XFormTable,
-      QueryParamsDetailsView
-    },
-    data () {
-      return {
-        // 选中的编号
-        selectId: undefined,
-        // 查询配置文件名
-        queryParamsName: 'queryParams',
-        // 是否显示详情抽屉
-        detailVisible: false
-      }
-    },
-    methods: {
-      toDetail (record, id) {
-        this.selectId = id + ''
-        this.detailVisible = true
-      }
-    }
-  }
-</script>