vue2-client 1.2.54 → 1.2.55-test2

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

@@ -220,7 +220,7 @@
               <a-divider style="font-size: 14px;margin-top: 0">数据源相关</a-divider>
               <a-form-model-item label="数据源类型" prop="selectType">
                 <a-select v-model="item.selectType" placeholder="请选择数据源类型" @change="changeSelectKType">
-                  <a-select-option v-for="selectDataTypeItem in selectDataType" :key="selectDataTypeItem.key">{{ selectDataTypeItem.label }}</a-select-option>
+                  <a-select-option v-for="selectDataTypeItem in selectDataType.filter(h=>!h.noMatch.includes(item.formType))" :key="selectDataTypeItem.key">{{ selectDataTypeItem.label }}</a-select-option>
                   <a-popover
                     slot="suffixIcon"
                     placement="bottom"
@@ -358,7 +358,7 @@ import {
   addOrEditType,
   selectDataType
 } from '@vue2-client/config/CreateQueryConfig'
-import { commonApi, post } from '@/services/api'
+import { commonApi, post } from '@vue2-client/services/api'
 import JsonViewer from 'vue-json-viewer'
 
 const DemoJson = [{

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

@@ -50,11 +50,26 @@ export default {
       default: () => {
         return {}
       }
+    },
+    files: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    images: {
+      type: Array,
+      default: () => {
+        return []
+      }
     }
   },
   computed: {
     ...mapState('account', { currUser: 'user' })
   },
+  created () {
+    this.uploadedFileList = this.mode.type === 'file' ? [...this.files] : [...this.images]
+  },
   methods: {
     uploadFiles (info) {
       // 初始化文件信息
@@ -78,16 +93,17 @@ export default {
         formData.append('pathKey', this.model.pathKey)
       }
       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.username)
 
-      let url = '/webmeteruploadapi/upload'
-      if (process.env.NODE_ENV === 'production') {
-        url = `/${this.model.stockAlias}/webmeteruploadapi/upload`
-      }
-      post(url, formData, { headers }).then(res => {
+      // 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'

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

@@ -20,6 +20,8 @@
             v-for="(item, index) in realJsonData"
             mode="新增/修改"
             :attr="item"
+            :files="files"
+            :images="images"
             :form="form"
             :key="index"
             :disabled="itemDisabled(item)"
@@ -54,6 +56,9 @@ export default {
         SelectsArray: { },
         // 多层下拉框组 各组数量
         SelectsNumber: {},
+        // 修改有文件得表单是使用
+        files: [],
+        images: [],
         // 校验
         rules: {},
         // 图标样式
@@ -252,6 +257,9 @@ export default {
           }
         }
         this.form = formData
+        this.files = this.modifyModelData.files
+        this.images = this.modifyModelData.images
+        this.modifyModelData = this.modifyModelData.data
         if (Object.keys(this.modifyModelData).length > 0) {
           this.getModifyModelData()
         }

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

@@ -204,7 +204,7 @@
     :xs="24"
     :xxl="24">
     <a-form-model-item :ref="attr.model" :label="attr.name" :prop="attr.model">
-      <upload :model="attr" @setFiles="setFiles"></upload>
+      <upload :model="attr" @setFiles="setFiles" :files="files" :images="images"></upload>
     </a-form-model-item>
   </x-form-col>
   <!-- TODO 地点搜索框 -->
@@ -235,11 +235,9 @@
 
 import { post } from '@vue2-client/services/api'
 import { debounce } from 'ant-design-vue/lib/vc-table/src/utils'
-import AddressSearchCombobox from '@/base-client/components/common/AddressSearchCombobox/AddressSearchCombobox'
 
 export default {
   name: 'XFormItem',
-  components: { AddressSearchCombobox },
   data () {
     // 检索去抖
     this.fetchFunction = debounce(this.fetchFunction, 800)
@@ -288,7 +286,19 @@ export default {
       default: () => {
         return {}
       }
-    }
+    },
+    files: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    images: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
   },
   created () {
     if (this.attr.keyName && this.attr.keyName.indexOf('logic@') !== -1) {