vue2-client 1.2.49 → 1.2.52

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

@@ -1,124 +1,124 @@
-<template>
-  <div>
-    <a-upload-dragger
-      v-if="model.type === 'file'"
-      name="file"
-      :multiple="true"
-      :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"
-      :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 {}
-      }
-    }
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' })
-  },
-  methods: {
-    uploadFiles (info) {
-      // 初始化文件信息
-      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',
-      }
-      const formData = new FormData()
-      formData.append('avatar', info.file)
-      formData.append('resUploadMode', this.model.resUploadMode)
-      if (this.model.pathKey) {
-        formData.append('pathKey', this.model.pathKey)
-      }
-      formData.append('stockAlias', this.model.stockAlias)
-      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.username)
-
-      let url = '/webmeteruploadapi/upload'
-      if (process.env.NODE_ENV === 'production') {
-        url = `/${this.model.stockAlias}/webmeteruploadapi/upload`
-      }
-      post(url, 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) {
-      // 找到当前文件所在列表的索引
-      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"
+      :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"
+      :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 {}
+      }
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' })
+  },
+  methods: {
+    uploadFiles (info) {
+      // 初始化文件信息
+      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',
+      }
+      const formData = new FormData()
+      formData.append('avatar', info.file)
+      formData.append('resUploadMode', this.model.resUploadMode)
+      if (this.model.pathKey) {
+        formData.append('pathKey', this.model.pathKey)
+      }
+      formData.append('stockAlias', this.model.stockAlias)
+      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.username)
+
+      let url = '/webmeteruploadapi/upload'
+      if (process.env.NODE_ENV === 'production') {
+        url = `/${this.model.stockAlias}/webmeteruploadapi/upload`
+      }
+      post(url, 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) {
+      // 找到当前文件所在列表的索引
+      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/Upload/index.js

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

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

@@ -25,20 +25,9 @@
             :disabled="itemDisabled(item)"
             :xl="12"
             :xxl="8"
+            :selectsArray="SelectsArray"
+            @selectsItemCheck="selectsItemCheck"
           />
-          <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>
@@ -62,7 +51,7 @@ export default {
         // 表单Model
         form: undefined,
         // 多层下拉框组 数据储存
-        SelectsArray: {},
+        SelectsArray: { },
         // 多层下拉框组 各组数量
         SelectsNumber: {},
         // 校验
@@ -78,35 +67,7 @@ export default {
       // 过滤出用于新增/修改场景的表单项
       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
+          return item.addOrEdit && item.addOrEdit !== 'no' && item.addOrEdit !== 'silenceAdd' && item.addOrEdit !== 'version'
         })
       },
       // 过滤出用于静默新增场景的表单项
@@ -173,15 +134,46 @@ export default {
       visible (rel) {
         if (rel) {
           this.formItemLoad()
+          this.getSelectsArray()
         }
       }
     },
-    mounted () {
+    created () {
       this.formItemLoad()
+      this.getSelectsArray()
     },
     methods: {
-      selectsItemCheck (groupName, index, value, group) {
+      // 初始化级联框数据
+      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
         // 清空子下拉框的子们的数据
@@ -193,6 +185,7 @@ export default {
         for (let i = index + 2; i <= this.SelectsNumber[groupName]; i++) {
           this.SelectsArray[groupName][i] = []
         }
+        callback(this.SelectsArray)
       },
       formItemLoad () {
         const formData = Object.assign({}, this.fixedAddForm)
@@ -262,7 +255,6 @@ export default {
         if (Object.keys(this.modifyModelData).length > 0) {
           this.getModifyModelData()
         }
-        this.loaded = true
       },
       itemDisabled (value) {
         return (this.businessType === '新增' && value.addOrEdit === 'edit') ||