vue2-client 1.2.94 → 1.2.97

package/CHANGELOG.md

@@ -1,10 +1,12 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.2.94 -2022-08-05 @张振宇**
+**1.2.94 -2022-08-05  - 1.2.97 @张振宇**
 - 功能新增：
 - 新增表单组件 人员选择框
 - 新增表单配置可以配置自定义请求
+- 文件表单项新增附件用途配置
+- 文件表单项cascader 修改了一下能用了
 
 **1.2.93 -2022-08-03 @江超**
 - 功能新增：

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.2.94",
+  "version": "1.2.97",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/base-client/components/common/CreateQuery/CreateQueryItem.vue

@@ -182,7 +182,7 @@
         </a-col>
         <a-col v-if="item.formType" :span="9">
           <a-card :bodyStyle="bodyStyle" title="扩展属性">
-            <template v-if="(dataMode.addOrEditForm || dataMode.queryForm ) && (item.formType === 'input' || item.formType === 'select' || item.formType === 'selects')">
+            <template v-if="(dataMode.addOrEditForm || dataMode.queryForm ) && (item.formType === 'input' || item.formType === 'select' || item.formType === 'selects' || item.formType === 'cascader')">
               <a-divider style="font-size: 14px;margin-top: 0">提示相关</a-divider>
               <a-form-model-item label="表单水印" prop="placeholder">
                 <a-input v-model="item.placeholder" placeholder="表单水印（placeholder）" />
@@ -299,6 +299,11 @@
                   :min="1"
                 />
               </a-form-model-item>
+              <a-form-model-item label="附件用途" prop="useType">
+                <a-select v-model="item.useType" placeholder="指定文件用途，同表单不同用途">
+                  <a-select-option v-for="userTypeItem in $appdata.getDictionaryList('useType')" :key="userTypeItem.value">{{ userTypeItem.value }}</a-select-option>
+                </a-select>
+              </a-form-model-item>
               <a-form-model-item label="上传的仓库" prop="resUploadStock">
                 <a-select v-model="item.resUploadStock" placeholder="选择文件上传到的仓库" @change="changeStock">
                   <a-select-option v-for="stock in stockList" :key="stock.id">{{ stock.f_name }}</a-select-option>
@@ -325,7 +330,7 @@
         style="margin-top: 5px"
         type="error"/>
       <a-alert
-        v-if="dataMode.addOrEditForm && !dataMode.sqlQueryItem && item.formType !== 'file' && item.formType !== 'image' && item.formType !== 'personSetting' "
+        v-if="dataMode.addOrEditForm && !dataMode.sqlQueryItem && item.formType !== 'file' && item.formType !== 'image' && item.formType !== 'personSetting' && item.formType !== 'cascader' "
         message="错误：如果要生成新增/修改表单项，必须勾选生成SQL查询项"
         show-icon
         style="margin-top: 5px"
@@ -375,7 +380,7 @@ export default {
   computed: {
     // 是否展示数据源相关字段
     selectDataShow () {
-      return this.item.formType === 'select' || (this.item.formType === 'selects' && this.item.groupIndexView === '1') || this.item.formType === 'checkbox' || this.item.formType === 'radio'
+      return this.item.formType === 'select' || this.item.formType === 'cascader' || (this.item.formType === 'selects' && this.item.groupIndexView === '1') || this.item.formType === 'checkbox' || this.item.formType === 'radio'
     },
     // 作用域插槽是否禁用
     slotTypeDisabled () {
@@ -587,7 +592,7 @@ export default {
             this.$message.error('请至少选择一种数据模式')
             return
           }
-          if (!fileBool && (this.dataMode.addOrEditForm && !this.dataMode.sqlQueryItem) && this.item.formType !== 'personSetting') {
+          if (!fileBool && (this.dataMode.addOrEditForm && !this.dataMode.sqlQueryItem) && this.item.formType !== 'personSetting' && this.item.formType !== 'cascader') {
             this.$message.error('如果要生成新增/修改表单项，必须勾选生成SQL查询项')
             return
           }

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

@@ -1,151 +1,152 @@
-<template>
-  <div>
-    <a-upload-dragger
-      v-if="model.type === 'file'"
-      name="file"
-      :multiple="true"
-      :accept="model.accept.join('')"
-      :remove="deleteFileItem"
-      :customRequest="uploadFiles"
-      :file-list="uploadedFileList">
-      <p class="ant-upload-drag-icon">
-        <a-icon type="inbox"/>
-      </p>
-      <p class="ant-upload-text">
-        点击或拖动文件到该区域上传
-      </p>
-      <p class="ant-upload-hint">
-        支持单个或多个文件
-      </p>
-    </a-upload-dragger>
-    <a-upload
-      v-if=" model.type === 'image'"
-      list-type="picture-card"
-      :accept="model.accept.join('')"
-      :customRequest="uploadFiles"
-      :remove="deleteFileItem"
-      :file-list="uploadedFileList">
-      <a-icon type="plus"/>
-      <div class="ant-upload-text">
-        Upload
-      </div>
-    </a-upload>
-  </div>
-</template>
-
-<script>
-
-import { post } from '@vue2-client/services/api'
-import { mapState } from 'vuex'
-
-export default {
-  name: 'uploads',
-  data () {
-    return {
-      uploadedFileList: [],
-    }
-  },
-  props: {
-    // 表单属性
-    model: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    files: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
-    images: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' })
-  },
-  created () {
-    this.uploadedFileList = this.model.type === 'file' ? [...this.files] : [...this.images]
-  },
-  methods: {
-    uploadFiles (info) {
-      if (this.uploadedFileList.length >= this.model.acceptCount) {
-        this.$message.error(`当前表单限制仅可上传 ${this.model.acceptCount} 个文件`)
-        return
-      }
-      // 初始化文件信息
-      const fileInfo = {
-        uid: info.file.uid,
-        name: info.file.name,
-        status: 'uploading',
-        response: '',
-        url: '',
-      }
-      // 放入上传列表中，以便于显示上传进度
-      this.uploadedFileList.push(fileInfo)
-      // 组装上传数据
-      const headers = {
-        'Content-Type': 'multipart/form-data',
-      }
-      // TODO 暂时给默认值 基础表单调整好后处理
-      const formData = new FormData()
-      formData.append('avatar', info.file)
-      formData.append('resUploadMode', this.model.resUploadMode ?? 'server')
-      if (this.model.pathKey) {
-        formData.append('pathKey', this.model.pathKey ?? 'Default')
-      }
-      // formData.append('stockAlias', this.model.stockAlias)
-      formData.append('formType', this.model.type)
-      formData.append('resUploadStock', this.model.resUploadStock)
-      formData.append('filename', info.file.name)
-      formData.append('filesize', (info.file.size / 1024 / 1024).toFixed(4))
-      formData.append('f_operator', this.currUser ? this.currUser.username : '')
-
-      // const url = '/webmeteruploadapi/resource'
-      // if (process.env.NODE_ENV === 'production') {
-      //   url = `/${this.model.stockAlias}/webmeteruploadapi/resource`
-      // }
-      post('/webmeterresourceapi/upload', formData, { headers }).then(res => {
-        // 根据服务端返回的结果判断成功与否，设置文件条目的状态
-        if (res.success) {
-          fileInfo.status = 'done'
-          fileInfo.response = JSON.parse(res.data)
-          fileInfo.id = JSON.parse(res.data).id
-          fileInfo.url = JSON.parse(res.data).f_downloadpath
-          this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
-          this.$message.success('上传成功！')
-        } else {
-          fileInfo.status = 'error'
-          fileInfo.response = res.data
-          this.$message.error('上传失败！')
-        }
-      }).catch((e) => {
-        fileInfo.status = 'error'
-        fileInfo.response = e
-        this.$message.error(`请求失败！${e}`)
-      })
-    },
-    // 删除文件
-    deleteFileItem (file) {
-      if (file.id) {
-        post('/rs/entity/t_files', { id: file.id, f_state: '删除' }).then(res => {
-        }).catch(e => { })
-      }
-      // 找到当前文件所在列表的索引
-      const index = this.uploadedFileList.indexOf(file)
-      // 从列表中移除该文件
-      this.uploadedFileList.splice(index, 1)
-      this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
-      return true
-    }
-  }
-}
-</script>
-<style lang="less" scoped>
-
-</style>
+<template>
+  <div>
+    <a-upload-dragger
+      v-if="model.type === 'file'"
+      name="file"
+      :multiple="true"
+      :accept="model.accept.join('')"
+      :remove="deleteFileItem"
+      :customRequest="uploadFiles"
+      :file-list="uploadedFileList">
+      <p class="ant-upload-drag-icon">
+        <a-icon type="inbox"/>
+      </p>
+      <p class="ant-upload-text">
+        点击或拖动文件到该区域上传
+      </p>
+      <p class="ant-upload-hint">
+        支持单个或多个文件
+      </p>
+    </a-upload-dragger>
+    <a-upload
+      v-if=" model.type === 'image'"
+      list-type="picture-card"
+      :accept="model.accept.join('')"
+      :customRequest="uploadFiles"
+      :remove="deleteFileItem"
+      :file-list="uploadedFileList">
+      <a-icon type="plus"/>
+      <div class="ant-upload-text">
+        Upload
+      </div>
+    </a-upload>
+  </div>
+</template>
+
+<script>
+
+import { post } from '@vue2-client/services/api'
+import { mapState } from 'vuex'
+
+export default {
+  name: 'uploads',
+  data () {
+    return {
+      uploadedFileList: [],
+    }
+  },
+  props: {
+    // 表单属性
+    model: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    files: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    images: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' })
+  },
+  created () {
+    this.uploadedFileList = this.model.type === 'file' ? [...this.files] : [...this.images]
+  },
+  methods: {
+    uploadFiles (info) {
+      if (this.uploadedFileList.length >= this.model.acceptCount) {
+        this.$message.error(`当前表单限制仅可上传 ${this.model.acceptCount} 个文件`)
+        return
+      }
+      // 初始化文件信息
+      const fileInfo = {
+        uid: info.file.uid,
+        name: info.file.name,
+        status: 'uploading',
+        response: '',
+        url: '',
+      }
+      // 放入上传列表中，以便于显示上传进度
+      this.uploadedFileList.push(fileInfo)
+      // 组装上传数据
+      const headers = {
+        'Content-Type': 'multipart/form-data',
+      }
+      // TODO 暂时给默认值 基础表单调整好后处理
+      const formData = new FormData()
+      formData.append('avatar', info.file)
+      formData.append('resUploadMode', this.model.resUploadMode ?? 'server')
+      if (this.model.pathKey) {
+        formData.append('pathKey', this.model.pathKey ?? 'Default')
+      }
+      // formData.append('stockAlias', this.model.stockAlias)
+      formData.append('formType', this.model.type)
+      formData.append('useType', this.model.useType ?? 'Default')
+      formData.append('resUploadStock', this.model.resUploadStock)
+      formData.append('filename', info.file.name)
+      formData.append('filesize', (info.file.size / 1024 / 1024).toFixed(4))
+      formData.append('f_operator', this.currUser ? this.currUser.username : '')
+
+      // const url = '/webmeteruploadapi/resource'
+      // if (process.env.NODE_ENV === 'production') {
+      //   url = `/${this.model.stockAlias}/webmeteruploadapi/resource`
+      // }
+      post('/webmeterresourceapi/upload', formData, { headers }).then(res => {
+        // 根据服务端返回的结果判断成功与否，设置文件条目的状态
+        if (res.success) {
+          fileInfo.status = 'done'
+          fileInfo.response = JSON.parse(res.data)
+          fileInfo.id = JSON.parse(res.data).id
+          fileInfo.url = JSON.parse(res.data).f_downloadpath
+          this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
+          this.$message.success('上传成功！')
+        } else {
+          fileInfo.status = 'error'
+          fileInfo.response = res.data
+          this.$message.error('上传失败！')
+        }
+      }).catch((e) => {
+        fileInfo.status = 'error'
+        fileInfo.response = e
+        this.$message.error(`请求失败！${e}`)
+      })
+    },
+    // 删除文件
+    deleteFileItem (file) {
+      if (file.id) {
+        post('/rs/entity/t_files', { id: file.id, f_state: '删除' }).then(res => {
+        }).catch(e => { })
+      }
+      // 找到当前文件所在列表的索引
+      const index = this.uploadedFileList.indexOf(file)
+      // 从列表中移除该文件
+      this.uploadedFileList.splice(index, 1)
+      this.$emit('setFiles', this.uploadedFileList.filter(item => item.status === 'done').map(item => item.id))
+      return true
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+
+</style>

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -170,12 +170,13 @@
     :xl="xl"
     :xxl="xxl">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
-      <template v-if="attr.keys">
-        <a-dcascader :disabled="disabled" :option="attr.keys" :value="form[attr.model]"/>
-      </template>
-      <template v-else>
-        <a-dcascader :disabled="disabled" :option="option" :value="form[attr.model]"/>
-      </template>
+      <a-cascader
+        :disabled="disabled"
+        change-on-select
+        :options="option"
+        v-model="form[attr.model]"
+        :placeholder="attr.placeholder ? attr.placeholder : '请选择'+attr.name.replace(/\s*/g, '')"
+        :rows="4"/>
     </a-form-model-item>
   </x-form-col>
   <!-- 文本域 -->
@@ -323,7 +324,10 @@ export default {
     },
     // 文件框时设置上传组件的值
     setFiles (fileIds) {
-      this.form[this.attr.model] = fileIds
+      if (!this.form[this.attr.model]) {
+        this.form[this.attr.model] = []
+      }
+      this.form[this.attr.model] = [...this.form[this.attr.model], ...fileIds]
     },
     // 懒加载检索方法
     fetchFunction (value) {

package/src/config/CreateQueryConfig.js

@@ -38,6 +38,9 @@ module.exports = {
     {
       label: '级联选择框', key: 'selects'
     },
+    {
+      label: 'cascader选择框', key: 'cascader'
+    },
     {
       label: '多选框', key: 'checkbox'
     },
@@ -288,12 +291,12 @@ module.exports = {
     {
       label: '字典键',
       key: 'key',
-      noMatch: ['selects']
+      noMatch: ['selects', 'cascader']
     },
     {
       label: '固定集合',
       key: 'fixArray',
-      noMatch: ['selects']
+      noMatch: ['selects', 'cascader']
     },
     {
       label: '业务逻辑',