vue2-client 1.2.54 → 1.2.55-test

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

@@ -83,11 +83,11 @@ export default {
       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/resource', formData, { headers }).then(res => {
         // 根据服务端返回的结果判断成功与否，设置文件条目的状态
         if (res.success) {
           fileInfo.status = 'done'