vue2-client 1.3.24 → 1.4.0

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

@@ -286,7 +286,7 @@ export default {
       // 图片列表
       imageList: [],
       // 附件列表
-      fileList:[],
+      fileList: [],
       // 表单数据
       form: {
         name: '',

package/src/services/api/common.js

@@ -1,58 +1,123 @@
-import { METHOD, request } from '@vue2-client/utils/request'
-import { indexedDB } from '@vue2-client/utils/indexedDB'
-
-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',
-}
-
-/**
- * 带缓存查询的表格配置文件查询
- * @param queryParamsName 配置名称
- * @param callback 回调函数
- */
-export function getColumnsJson (queryParamsName, callback) {
-  indexedDB.getByWeb(queryParamsName, commonApi.getColumnsJson, { str: queryParamsName }, callback)
-}
-
-/**
- * 通用查询
- */
-export function query (parameter, api = commonApi.query, serviceName = 'af-system') {
-  return request('/api/' + serviceName + '/' + api, METHOD.POST, parameter, null)
-}
-
-/**
- * 通用表单查询
- */
-export function queryWithResource (parameter, api = commonApi.queryWithResource, serviceName = 'af-system') {
-  return request('/api/' + serviceName + '/' + api, METHOD.POST, parameter, null)
-}
-
-/**
- * 通用新增/修改
- */
-export function addOrModify (parameter, api = commonApi.addOrModify, serviceName = 'af-system') {
-  return request('/api/' + serviceName + '/' + api, METHOD.POST, parameter, null)
-}
-
-/**
- * 通用删除
- */
-export function remove (parameter, api = commonApi.delete, serviceName = 'af-system') {
-  return request('/api/' + serviceName + '/' + api, METHOD.POST, parameter, null)
-}
-
-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 '@/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 }

package/src/utils/common.js

@@ -0,0 +1,10 @@
+// 验证是否为blob格式
+export async function blobValidate (data) {
+  try {
+    const text = await data.text()
+    JSON.parse(text)
+    return false
+  } catch (error) {
+    return true
+  }
+}

package/src/utils/errorCode.js

@@ -0,0 +1,6 @@
+export default {
+  '401': '认证失败，无法访问系统资源',
+  '403': '当前操作没有权限',
+  '404': '访问资源不存在',
+  'default': '系统未知错误，请反馈给管理员'
+}

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

@@ -1,109 +0,0 @@
-<template>
-  <a-drawer
-    title="请选择展示列"
-    :placement="placement"
-    :width="width"
-    :visible="visible"
-    @close="onClose"
-  >
-    <a-checkbox :indeterminate="indeterminate" :checked="checkAll" @change="onCheckAllChange">全选</a-checkbox>
-    <a-checkbox-group :options="columnsList" v-model="selectColumnsList" @change="onChange" />
-  </a-drawer>
-</template>
-
-<script>
-
-export default {
-  name: 'CustomColumnsDrawer',
-  props: {
-    placement: {
-      type: String,
-      default: 'right'
-    },
-    width: {
-      type: String,
-      default: '190'
-    },
-    columnsMeta: {
-      type: Array,
-      default: null
-    },
-    visible: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data () {
-    return {
-      // 表格列选择项集合
-      columnsList: [],
-      // 选中的列集合
-      selectColumnsList: [],
-      // 全选样式
-      indeterminate: false,
-      // 是否全选
-      checkAll: true
-    }
-  },
-  mounted () {
-    let index = 0
-    this.columnsMeta.forEach((item) => {
-      // 组织表格列选择项
-      const rowData = {
-        label: item.title,
-        value: item.dataIndex
-      }
-      if (index === 0) {
-        rowData.disabled = true
-        index++
-      } else {
-        // 如果存在固定列，则设置为不可选择项
-        rowData.disabled = item.fixed !== undefined
-      }
-      // 放入表格列选择项集合中
-      this.columnsList.push(rowData)
-      // 放入默认选择项
-      this.selectColumnsList.push(rowData.value)
-    })
-  },
-  methods: {
-    onChange (checkedValues) {
-      // 控制全选样式
-      this.indeterminate = !!checkedValues.length && checkedValues.length < this.columnsList.length
-      this.checkAll = checkedValues.length === this.columnsList.length
-    },
-    onCheckAllChange (e) {
-      const list = []
-      this.columnsList.forEach((item) => {
-        if (e.target.checked) {
-          list.push(item.value)
-        } else {
-          if (item.disabled) {
-            list.push(item.value)
-          }
-        }
-      })
-      Object.assign(this, {
-        selectColumnsList: list,
-        indeterminate: false,
-        checkAll: e.target.checked
-      })
-    },
-    onClose () {
-      this.$emit('update:visible', false)
-    }
-  },
-  watch: {
-    'selectColumnsList' (val) {
-      const selectColumns = []
-      // 遍历选中项，放入表格列中
-      this.columnsMeta.forEach((item) => {
-        if (val.indexOf(item.dataIndex) > -1) {
-          selectColumns.push(item)
-        }
-      })
-      this.$emit('update:columns', selectColumns)
-    }
-  }
-}
-</script>

package/src/base-client/components/common/CustomColumnsDrawer/index.js

@@ -1,3 +0,0 @@
-import CustomColumnsDrawer from './CustomColumnsDrawer'
-
-export default CustomColumnsDrawer

package/src/base-client/components/common/CustomColumnsDrawer/index.md

@@ -1,46 +0,0 @@
-# CustomColumnsDrawer 自定义表格列
-
-提供一个可以自定义选择需要展示的表格列抽屉实现
-
-
-
-## 何时使用
-
-允许用户自定义选择需要展示的表格列，常用于列较多的表格查询展示。
-
-
-
-引用方式：
-
-```javascript
-import CustomColumnsDrawer from '@vue2-client/vue2-client/components/CustomColumnsDrawer'
-
-export default {
-    components: {
-      CustomColumnsDrawer
-    }
-}
-```
-
-
-
-## 代码演示
-
-```html
-<custom-columns-drawer
-  :visible.sync="visible"
-  :columns.sync="tableShowColumns"
-  :columns-meta="columnsMeta"
-/>
-```
-
-## API
-
-| 参数          | 说明                            | 类型             | 默认值   |
-|-------------|-------------------------------|----------------|-------|
-| placement   | 抽屉的方向，详情参考Ant Design Vue的官方文档 | String, Object | right |
-| width       | 抽屉的宽度，详情参考Ant Design Vue的官方文档 | String, Object | 190   |
-| columnsMeta | 表格列配置的原始json数据                | Array          | null  |
-| visible     | 是否显示                          | Boolean        | false |
-
-