vue2-client 1.2.57 → 1.2.60

package/CHANGELOG.md

@@ -1,7 +1,7 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.2.57 -2022-05-23 @张振宇**
+**1.2.57 - 1.2.60 -2022-05-23 @张振宇**
 - 功能修改：
 - 文件上传 基础表单相关修改
 

package/package.json

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

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

@@ -234,18 +234,10 @@
                   </a-form-model-item>
                 </a-col>
                 <a-col :span="8">
-                  <a-form-model-item
-                    label="允许上传文件类型"
-                    prop="accept"
-                    v-if="item.formType === 'file'">
-                    <a-input v-model="item.accept" placeholder="指定文件类型，默认不限制，可选">
-                      <a-popover slot="suffix" title="关于允许上传文件类型" placement="bottom">
-                        <template slot="content">
-                          <p>指定允许上传的文件类型扩展名，如：.doc,.docx等，详情请参考<a target="_blank" @click="visitAcceptFile">允许上传文件类型</a></p>
-                        </template>
-                        <a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
-                      </a-popover>
-                    </a-input>
+                  <a-form-model-item v-if="item.formType === 'file'" label="允许上传文件类型" prop="accept">
+                    <a-select v-model="item.accept" mode="tags" placeholder="指定文件类型，默认不限制" @change="itemAcceptChange">
+                      <a-select-option v-for="type_item in fileType" :key="type_item.accept">{{ type_item.label }}</a-select-option>
+                    </a-select>
                   </a-form-model-item>
                 </a-col>
                 <!-- TODO 配置文件上传表单-所属模块 -->
@@ -409,10 +401,10 @@
 </template>
 
 <script>
+import { fileType, queryType } from '@vue2-client/config/CreateQueryConfig'
 import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
 import JsonViewer from 'vue-json-viewer'
 import FileSaver from 'file-saver'
-import { queryType } from '@vue2-client/config/CreateQueryConfig'
 import { mapState } from 'vuex'
 import { commonApi, post } from '@vue2-client/services/api'
 const DemoJson = [{ value: 'zhejiang', label: 'Zhejiang', children: [{ value: 'hangzhou', label: 'Hangzhou', children: [{ value: 'xihu', label: 'West Lake' }] }] }]
@@ -424,6 +416,7 @@ export default {
   },
   data () {
     return {
+      fileType,
       DemoJson,
       // 页面宽度
       screenWidth: document.documentElement.clientWidth,
@@ -544,6 +537,7 @@ export default {
           this.itemMap[columnItem.key] = Object.assign({
             key: '',
             title: '',
+            pathKey: '',
             rule: {
               required: 'false'
             }
@@ -585,7 +579,7 @@ export default {
     editColumnItem (key, index) {
       if (this.itemMap[key]) {
         this.type = '修改'
-        this.item = Object.assign({ formType: 'input', type: 'string' }, this.itemMap[key])
+        this.item = Object.assign({ formType: 'input', type: 'string', pathKey: '' }, this.itemMap[key])
         this.selectIndex = index
         this.dataColumnVisible = true
       } else {
@@ -736,12 +730,12 @@ export default {
     submit () {
       this.onModelClose()
       this.$refs.businessCreateForm.validate(valid => {
-          if (valid) {
-            this.viewHandle(() => {
-              // saveQueryParams
-              this.$emit('saveSimpleFormQueryParams', this.result)
-            })
-          }
+        if (valid) {
+          this.viewHandle(() => {
+            // saveQueryParams
+            this.$emit('saveSimpleFormQueryParams', this.result)
+          })
+        }
       })
     },
     // 修改上传到哪个仓库
@@ -782,6 +776,12 @@ export default {
         item.slotKeyMap = item.selectKey
       }
     },
+    // 文件上传限制类型修改
+    itemAcceptChange (newVal) {
+      if (newVal.includes('*')) {
+        this.item.accept = ['*']
+      }
+    },
     visitAcceptFile () {
       window.open('https://developer.mozilla.org/zh-CN/docs/Web/HTML/Element/input/file#attr-accept')
     },

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

@@ -126,6 +126,10 @@ export default {
     },
     // 删除文件
     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)
       // 从列表中移除该文件

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

@@ -1,316 +1,317 @@
-<template>
-  <div class="table-page-search-wrapper">
-    <a-form-model
-      v-if="loaded"
-      ref="selectForm"
-      :model="form"
-      :rules="rules">
-      <a-row :gutter="16">
-        <x-form-item
-          v-for="(item, index) in realJsonData"
-          mode="新增/修改"
-          :attr="item"
-          :form="form"
-          :key="index"
-          :disabled="itemDisabled(item)"
-          :xl="12"
-          :xxl="8"
-        />
-        <div v-for="group in realJsonSelectsData" :key="group[0].group">
-          <x-form-col v-for="groupItem in group" :key="groupItem.group + groupItem.groupIndex" :xl="12" :xxl="8">
-            <a-form-model-item :label="groupItem.name" :disabled="itemDisabled(groupItem)">
-              <a-select v-model="form[groupItem.model]" :disabled="itemDisabledPlus(groupItem.group,groupItem.groupIndex)" :allowClear="true" @change="selectsItemCheck(groupItem.group,groupItem.groupIndex,form[groupItem.model],group)" placeholder="请选择">
-                <template v-for="option in SelectsArray[groupItem.group][groupItem.groupIndex]">
-                  <a-select-option :key="option.label" :value="option.value">
-                    {{ option.label }}
-                  </a-select-option>
-                </template>
-              </a-select>
-            </a-form-model-item>
-          </x-form-col>
-        </div>
-      </a-row>
-    </a-form-model>
-  </div>
-</template>
-<script>
-import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
-import { formatDate } from '@vue2-client/utils/util'
-import { mapState } from 'vuex'
-import { post } from '@vue2-client/services/api'
-
-export default {
-    name: 'XAddNativeForm',
-    components: {
-      XFormItem
-    },
-    data () {
-      return {
-        // 内容加载是否完成
-        loaded: false,
-        // 表单Model
-        form: undefined,
-        // 多层下拉框组 数据储存
-        SelectsArray: {},
-        // 多层下拉框组 各组数量
-        SelectsNumber: {},
-        // 校验
-        rules: {},
-        // 图标样式
-        iconStyle: {
-          position: 'relative',
-          top: '1px'
-        }
-      }
-    },
-    computed: {
-      // 过滤出用于新增/修改场景的表单项
-      realJsonData: function () {
-        return this.jsonData.filter(function (item) {
-          return item.addOrEdit && item.addOrEdit !== 'no' &&
-            item.addOrEdit !== 'silenceAdd' && !item.group && item.addOrEdit !== 'version'
-        })
-      },
-      // 过滤出多个下拉框分组级联得数据
-      realJsonSelectsData: function () {
-        const Selectsata = this.jsonData.filter(item => !item.isOnlyAddOrEdit && item.group)
-        const groupName = [...new Set(Selectsata.map(item => item.group))]
-        // 初始化数据组
-        groupName.forEach(item => {
-          this.SelectsArray[item] = []
-        })
-        return groupName.map(groupName => {
-          const SelectsItem = Selectsata.filter(item => {
-              if (item.groupIndex === 1) {
-                if (item.keyName.substring(0, 6) === 'logic@') {
-                  // 请求logic
-                  post('/webmeterapi/' + item.keyName.substring(6), {}).then(res => {
-                    this.SelectsArray[item.group][item.groupIndex] = res
-                  })
-                } else {
-                  this.SelectsArray[item.group][item.groupIndex] = JSON.parse(item.keyName)
-                }
-              }
-              return item.group === groupName
-            }
-          )
-          this.SelectsNumber[groupName] = SelectsItem.length ? SelectsItem.length : 0
-          return SelectsItem
-        })
-      },
-      // 过滤出用于静默新增场景的表单项
-      silenceAddJsonData: function () {
-        return this.jsonData.filter(function (item) {
-          return item.addOrEdit === 'silenceAdd'
-        })
-      },
-      // 过滤出版本号表单项
-      versionJsonData: function () {
-        return this.jsonData.filter(function (item) {
-          return item.addOrEdit === 'version'
-        })
-      },
-      ...mapState('account', { currUser: 'user' })
-    },
-    props: {
-      jsonData: {
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
-      // 业务类型
-      businessType: {
-        type: String,
-        default: ''
-      },
-      // 修改操作前查询出的业务数据
-      modifyModelData: {
-        type: Object,
-        default: () => {
-          return {}
-        }
-      },
-      // 新增或修改业务是否执行中
-      loading: {
-        type: Boolean,
-        default: () => {
-          return false
-        }
-      },
-      // 固定新增表单
-      fixedAddForm: {
-        type: Object,
-        default: () => {
-          return {}
-        }
-      }
-    },
-    watch: {
-      visible (rel) {
-        if (rel) {
-          this.formItemLoad()
-        }
-      }
-    },
-    mounted () {
-      this.formItemLoad()
-    },
-    methods: {
-      selectsItemCheck (groupName, index, value, group) {
-        const tem = { }
-        // 获取当前下拉框子下拉框的数据
-        this.SelectsArray[groupName][index + 1] = this.SelectsArray[groupName][index].filter(item => item.value === value)[0].children
-        // 清空子下拉框的子们的数据
-        for (let i = index; i < this.SelectsNumber[groupName]; i++) {
-          tem[group[i].model] = undefined
-        }
-        this.form = Object.assign({}, this.form, tem)
-        // 清空子下拉框的子们的数据源
-        for (let i = index + 2; i <= this.SelectsNumber[groupName]; i++) {
-          this.SelectsArray[groupName][i] = []
-        }
-      },
-      formItemLoad () {
-        const formData = Object.assign({}, this.fixedAddForm)
-        for (let i = 0; i < this.realJsonData.length; i++) {
-          const item = this.realJsonData[i]
-          formData[item.model] = undefined
-          // 处理表单校验情况
-          if (item.rule) {
-            this.rules[item.model] = []
-            const required = item.rule.required ? item.rule.required === true || item.rule.required === 'true' : false
-            let trigger
-            let message
-            if (required) {
-              switch (item.type) {
-                case 'select':
-                  message = '请选择' + item.name
-                  trigger = 'change'
-                  break
-                default:
-                  message = '请输入' + item.name
-                  trigger = 'blur'
-              }
-              this.rules[item.model].push({
-                required: true,
-                message: message,
-                trigger: trigger
-              })
-            }
-
-            switch (item.rule.type) {
-              case 'number':
-              case 'integer':
-              case 'float':
-                let defaultValue
-                let message
-                switch (item.rule.type) {
-                  case 'number':
-                    message = '数字'
-                    defaultValue = 0
-                    break
-                  case 'integer':
-                    message = '整数'
-                    defaultValue = 0
-                    break
-                  case 'float':
-                    message = '小数'
-                    defaultValue = 0.0
-                    break
-                }
-                this.rules[item.model].push({
-                  type: item.rule.type,
-                  message: item.name + '必须为' + message,
-                  transform: (value) => {
-                    if (value && value.length !== 0) {
-                      return Number(value)
-                    } else {
-                      return defaultValue
-                    }
-                  },
-                  trigger: 'blur'
-                })
-                break
-            }
-          }
-        }
-        this.form = formData
-        if (Object.keys(this.modifyModelData).length > 0) {
-          this.getModifyModelData()
-        }
-        this.loaded = true
-      },
-      itemDisabled (value) {
-        return (this.businessType === '新增' && value.addOrEdit === 'edit') ||
-          (this.businessType === '修改' && value.addOrEdit === 'add')
-      },
-      itemDisabledPlus (group, index) {
-        return (!this.SelectsArray[group][index]) || (this.SelectsArray[group][index] && this.SelectsArray[group][index].length === 0)
-      },
-      resetForm () {
-        this.$refs.selectForm.resetFields()
-      },
-      async onSubmit () {
-        this.$refs.selectForm.validate(async valid => {
-          for (const key of Object.keys(this.form)) {
-            if (this.form[key] === null || this.form[key] === '') {
-              this.form[key] = undefined
-            }
-          }
-          const requestParameters = Object.assign({}, this.form)
-          // 追加静默新增字段
-          if (this.businessType === '新增') {
-            for (const item of this.silenceAddJsonData) {
-              switch (item.silencePurpose) {
-                case 'createTime':
-                  requestParameters[item.model] = formatDate('now')
-                  break
-                case 'operator':
-                  requestParameters[item.model] = this.currUser.name
-                  break
-                case 'orgId':
-                  requestParameters[item.model] = this.currUser.orgid
-                  break
-              }
-            }
-            // 通过请求追加静默新增：自定义字段
-            for (const item of this.silenceAddJsonData.filter((item) => item.silencePurpose === 'customize')) {
-              requestParameters[item.model] = await this.getSilenceSource(item.silenceSource, requestParameters)
-            }
-          }
-          const data = {
-            valid: valid,
-            form: requestParameters
-          }
-          this.$emit('onSubmit', data)
-        })
-      },
-      async getSilenceSource (silenceSource, requestParameters) {
-        const result = await post('/webmeterapi/' + silenceSource, requestParameters)
-        return result
-      },
-      getModifyModelData () {
-        for (let i = 0; i < this.realJsonData.length; i++) {
-          const item = this.realJsonData[i]
-          if (this.modifyModelData[item.model] || this.modifyModelData[item.model] === 0) {
-            this.form[item.model] = this.modifyModelData[item.model] + ''
-          } else {
-            this.form[item.model] = undefined
-          }
-        }
-        // 追加版本号信息
-        for (const item of this.versionJsonData) {
-          if (!this.modifyModelData[item.model]) {
-            this.form[item.model] = 0
-          } else {
-            this.form[item.model] = this.modifyModelData[item.model] + ''
-          }
-        }
-      },
-      onClose () {
-        this.$emit('update:visible', false)
-      }
-    }
-  }
-</script>
+<template>
+  <div class="table-page-search-wrapper">
+    <a-form-model
+      v-if="loaded"
+      ref="selectForm"
+      :model="form"
+      :rules="rules">
+      <a-row :gutter="16">
+        <x-form-item
+          v-for="(item, index) in realJsonData"
+          mode="新增/修改"
+          :attr="item"
+          :form="form"
+          :key="index"
+          :files="files"
+          :images="images"
+          :disabled="itemDisabled(item)"
+          :selectsArray="SelectsArray"
+          @selectsItemCheck="selectsItemCheck"
+          :xl="12"
+          :xxl="8"
+        />
+      </a-row>
+    </a-form-model>
+  </div>
+</template>
+<script>
+import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
+import { formatDate } from '@vue2-client/utils/util'
+import { mapState } from 'vuex'
+import { post } from '@vue2-client/services/api'
+
+export default {
+    name: 'XAddNativeForm',
+    components: {
+      XFormItem
+    },
+    data () {
+      return {
+        // 内容加载是否完成
+        loaded: false,
+        // 表单Model
+        form: undefined,
+        // 修改有文件得表单时使用
+        files: [],
+        images: [],
+        // 多层下拉框组 数据储存
+        SelectsArray: {},
+        // 多层下拉框组 各组数量
+        SelectsNumber: {},
+        // 校验
+        rules: {},
+        // 图标样式
+        iconStyle: {
+          position: 'relative',
+          top: '1px'
+        }
+      }
+    },
+    computed: {
+      // 过滤出用于新增/修改场景的表单项
+      realJsonData: function () {
+        return this.jsonData.filter(function (item) {
+          return item.addOrEdit && item.addOrEdit !== 'no' && item.addOrEdit !== 'silenceAdd' && item.addOrEdit !== 'version'
+        })
+      },
+      // 过滤出用于静默新增场景的表单项
+      silenceAddJsonData: function () {
+        return this.jsonData.filter(function (item) {
+          return item.addOrEdit === 'silenceAdd'
+        })
+      },
+      // 过滤出版本号表单项
+      versionJsonData: function () {
+        return this.jsonData.filter(function (item) {
+          return item.addOrEdit === 'version'
+        })
+      },
+      ...mapState('account', { currUser: 'user' })
+    },
+    props: {
+      jsonData: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      // 业务类型
+      businessType: {
+        type: String,
+        default: ''
+      },
+      // 修改操作前查询出的业务数据
+      modifyModelData: {
+        type: Object,
+        default: () => {
+          return {}
+        }
+      },
+      // 新增或修改业务是否执行中
+      loading: {
+        type: Boolean,
+        default: () => {
+          return false
+        }
+      },
+      // 固定新增表单
+      fixedAddForm: {
+        type: Object,
+        default: () => {
+          return {}
+        }
+      }
+    },
+    watch: {
+      visible (rel) {
+        if (rel) {
+          this.formItemLoad()
+          this.getSelectsArray()
+        }
+      }
+    },
+    mounted () {
+      this.formItemLoad()
+      this.getSelectsArray()
+    },
+    methods: {
+      // 初始化级联框数据
+      getSelectsArray () {
+        const selectSate = this.jsonData.filter(item => !item.isOnlyAddOrEdit && item.group)
+        const groupName = [...new Set(selectSate.map(item => item.group))]
+        // 初始化数据组
+        groupName.forEach(groupName => {
+            this.SelectsArray[groupName] = []
+            const SelectsItem = selectSate.filter(item => {
+                if (item.groupIndex === 1) {
+                  if (item.keyName.substring(0, 6) === 'logic@') {
+                    // 请求logic
+                    post('/webmeterapi/' + item.keyName.substring(6), {}).then(res => {
+                      this.SelectsArray[item.group][item.groupIndex] = res
+                      this.SelectsArray = JSON.parse(JSON.stringify(this.SelectsArray))
+                    })
+                  } else {
+                    this.SelectsArray[item.group][item.groupIndex] = JSON.parse(item.keyName)
+                    this.SelectsArray = JSON.parse(JSON.stringify(this.SelectsArray))
+                  }
+                }
+                return item.group === groupName
+              }
+            )
+            this.SelectsNumber[groupName] = SelectsItem.length ? SelectsItem.length : 0
+          }
+        )
+        this.loaded = true
+      },
+      selectsItemCheck (callback, groupName, index, value) {
+        const tem = { }
+        const group = this.realJsonData.filter(item => item.addOrEdit && item.group && item.group === groupName)
+        // 获取当前下拉框子下拉框的数据
+        this.SelectsArray[groupName][index + 1] = this.SelectsArray[groupName][index].filter(item => item.value === value)[0].children
+        // 清空子下拉框的子们的数据
+        for (let i = index; i < this.SelectsNumber[groupName]; i++) {
+          tem[group[i].model] = undefined
+        }
+        this.form = Object.assign({}, this.form, tem)
+        // 清空子下拉框的子们的数据源
+        for (let i = index + 2; i <= this.SelectsNumber[groupName]; i++) {
+          this.SelectsArray[groupName][i] = []
+        }
+        callback(this.SelectsArray)
+      },
+      formItemLoad () {
+        const formData = Object.assign({}, this.fixedAddForm)
+        for (let i = 0; i < this.realJsonData.length; i++) {
+          const item = this.realJsonData[i]
+          formData[item.model] = undefined
+          // 处理表单校验情况
+          if (item.rule) {
+            this.rules[item.model] = []
+            const required = item.rule.required ? item.rule.required === true || item.rule.required === 'true' : false
+            let trigger
+            let message
+            if (required) {
+              switch (item.type) {
+                case 'select':
+                  message = '请选择' + item.name
+                  trigger = 'change'
+                  break
+                default:
+                  message = '请输入' + item.name
+                  trigger = 'blur'
+              }
+              this.rules[item.model].push({
+                required: true,
+                message: message,
+                trigger: trigger
+              })
+            }
+
+            switch (item.rule.type) {
+              case 'number':
+              case 'integer':
+              case 'float':
+                let defaultValue
+                let message
+                switch (item.rule.type) {
+                  case 'number':
+                    message = '数字'
+                    defaultValue = 0
+                    break
+                  case 'integer':
+                    message = '整数'
+                    defaultValue = 0
+                    break
+                  case 'float':
+                    message = '小数'
+                    defaultValue = 0.0
+                    break
+                }
+                this.rules[item.model].push({
+                  type: item.rule.type,
+                  message: item.name + '必须为' + message,
+                  transform: (value) => {
+                    if (value && value.length !== 0) {
+                      return Number(value)
+                    } else {
+                      return defaultValue
+                    }
+                  },
+                  trigger: 'blur'
+                })
+                break
+            }
+          }
+        }
+        this.form = formData
+        if (this.modifyModelData.data) {
+          this.files = this.modifyModelData.files
+          this.images = this.modifyModelData.images
+          if (Object.keys(this.modifyModelData.data).length > 0) {
+            this.getModifyModelData()
+          }
+        }
+      },
+      itemDisabled (value) {
+        return (this.businessType === '新增' && value.addOrEdit === 'edit') ||
+          (this.businessType === '修改' && value.addOrEdit === 'add')
+      },
+      itemDisabledPlus (group, index) {
+        return (!this.SelectsArray[group][index]) || (this.SelectsArray[group][index] && this.SelectsArray[group][index].length === 0)
+      },
+      resetForm () {
+        this.$refs.selectForm.resetFields()
+      },
+      async onSubmit () {
+        this.$refs.selectForm.validate(async valid => {
+          for (const key of Object.keys(this.form)) {
+            if (this.form[key] === null || this.form[key] === '') {
+              this.form[key] = undefined
+            }
+          }
+          const requestParameters = Object.assign({}, this.form)
+          // 追加静默新增字段
+          if (this.businessType === '新增') {
+            for (const item of this.silenceAddJsonData) {
+              switch (item.silencePurpose) {
+                case 'createTime':
+                  requestParameters[item.model] = formatDate('now')
+                  break
+                case 'operator':
+                  requestParameters[item.model] = this.currUser.name
+                  break
+                case 'orgId':
+                  requestParameters[item.model] = this.currUser.orgid
+                  break
+              }
+            }
+            // 通过请求追加静默新增：自定义字段
+            for (const item of this.silenceAddJsonData.filter((item) => item.silencePurpose === 'customize')) {
+              requestParameters[item.model] = await this.getSilenceSource(item.silenceSource, requestParameters)
+            }
+          }
+          const data = {
+            valid: valid,
+            form: requestParameters
+          }
+          this.$emit('onSubmit', data)
+        })
+      },
+      async getSilenceSource (silenceSource, requestParameters) {
+        const result = await post('/webmeterapi/' + silenceSource, requestParameters)
+        return result
+      },
+      getModifyModelData () {
+        for (let i = 0; i < this.realJsonData.length; i++) {
+          const item = this.realJsonData[i]
+          if (this.modifyModelData.data[item.model] || this.modifyModelData.data[item.model] === 0) {
+            this.form[item.model] = this.modifyModelData.data[item.model] + ''
+          } else {
+            this.form[item.model] = undefined
+          }
+        }
+        // 追加版本号信息
+        for (const item of this.versionJsonData) {
+          if (!this.modifyModelData.data[item.model]) {
+            this.form[item.model] = 0
+          } else {
+            this.form[item.model] = this.modifyModelData.data[item.model] + ''
+          }
+        }
+      },
+      onClose () {
+        this.$emit('update:visible', false)
+      }
+    }
+  }
+</script>

package/src/pages/CreateQueryPage.vue

@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import { post } from '@/services/api/restTools'
+import { post } from '@vue2-client/services/api/restTools'
 
 export default {
   name: 'CreateQueryPage',