fix (接口定义): case历史数据兼容处理

backend/src/main/java/io/metersphere/commons/json/JSONSchemaGenerator.java

@@ -109,7 +109,7 @@ public class JSONSchemaGenerator {
                 concept.put(propertyName, analyzeEnumProperty(object));
             } else if (propertyObjType.equals("string")) {
                 // 先设置空值
-                concept.put(propertyName, null);
+                concept.put(propertyName, "");
                 if (object.has("format")) {
                     String propertyFormat = object.get("format").getAsString();
                     if (propertyFormat.equals("date-time")) {

frontend/src/business/components/api/definition/components/body/ApiBody.vue

@@ -27,53 +27,74 @@
     </el-radio-group>
     <div style="min-width: 1200px;" v-if="body.type == 'Form Data' || body.type == 'WWW_FORM'">
       <el-row v-if="body.type == 'Form Data' || body.type == 'WWW_FORM'">
-        <el-link class="ms-el-link" @click="batchAdd"> {{$t("commons.batch_add")}}</el-link>
+        <el-link class="ms-el-link" @click="batchAdd"> {{ $t("commons.batch_add") }}</el-link>
       </el-row>
-      <ms-api-variable :with-mor-setting="true" :is-read-only="isReadOnly"
+      <ms-api-variable
+        :with-mor-setting="true"
+        :is-read-only="isReadOnly"
         :parameters="body.kvs"
-                       :isShowEnable="isShowEnable" type="body"/>
+        :isShowEnable="isShowEnable"
+        type="body"/>
     </div>
     <div v-if="body.type == 'JSON'">
       <div style="padding: 10px">
         <el-switch active-text="JSON-SCHEMA" v-model="body.format" @change="formatChange" active-value="JSON-SCHEMA"/>
       </div>
-      <ms-json-code-edit v-if="body.format==='JSON-SCHEMA'" :body="body" ref="jsonCodeEdit"/>
+      <ms-json-code-edit
-      <ms-code-edit v-else-if="codeEditActive" :read-only="isReadOnly" height="400px" :data.sync="body.raw" :modes="modes" :mode="'json'" ref="codeEdit"/>
+        v-if="body.format==='JSON-SCHEMA'"
+        :body="body"
+        ref="jsonCodeEdit"/>
+      <ms-code-edit
+        v-else-if="codeEditActive"
+        :read-only="isReadOnly"
+        :data.sync="body.raw"
+        :modes="modes"
+        :mode="'json'"
+        height="400px"
+        ref="codeEdit"/>
     </div>
 
     <div class="ms-body" v-if="body.type == 'XML'">
-      <ms-code-edit :read-only="isReadOnly" :data.sync="body.raw" :modes="modes" :mode="'text'" ref="codeEdit"/>
+      <ms-code-edit
+        :read-only="isReadOnly"
+        :data.sync="body.raw"
+        :modes="modes"
+        :mode="'text'"
+        ref="codeEdit"/>
     </div>
 
     <div class="ms-body" v-if="body.type == 'Raw'">
-      <ms-code-edit :read-only="isReadOnly" :data.sync="body.raw" :modes="modes" ref="codeEdit"/>
+      <ms-code-edit
+        :read-only="isReadOnly"
+        :data.sync="body.raw"
+        :modes="modes"
+        ref="codeEdit"/>
     </div>
 
-    <ms-api-binary-variable :is-read-only="isReadOnly"
+    <ms-api-binary-variable
+      :is-read-only="isReadOnly"
       :parameters="body.binary"
       :isShowEnable="isShowEnable"
       type="body"
       v-if="body.type == 'BINARY'"/>
-
     <batch-add-parameter @batchSave="batchSave" ref="batchAddParameter"/>
-
   </div>
 </template>
 
 <script>
-  import MsApiKeyValue from "../ApiKeyValue";
+import MsApiKeyValue from "../ApiKeyValue";
-  import {BODY_TYPE, KeyValue} from "../../model/ApiTestModel";
+import {BODY_TYPE, KeyValue} from "../../model/ApiTestModel";
-  import MsCodeEdit from "../../../../common/components/MsCodeEdit";
+import MsCodeEdit from "../../../../common/components/MsCodeEdit";
-  import MsJsonCodeEdit from "../../../../common/json-schema/JsonSchemaEditor";
+import MsJsonCodeEdit from "../../../../common/json-schema/JsonSchemaEditor";
-  import MsDropdown from "../../../../common/components/MsDropdown";
+import MsDropdown from "../../../../common/components/MsDropdown";
-  import MsApiVariable from "../ApiVariable";
+import MsApiVariable from "../ApiVariable";
-  import MsApiBinaryVariable from "./ApiBinaryVariable";
+import MsApiBinaryVariable from "./ApiBinaryVariable";
-  import MsApiFromUrlVariable from "./ApiFromUrlVariable";
+import MsApiFromUrlVariable from "./ApiFromUrlVariable";
-  import BatchAddParameter from "../basis/BatchAddParameter";
+import BatchAddParameter from "../basis/BatchAddParameter";
-  import Convert from "@/business/components/common/json-schema/convert/convert";
+import Convert from "@/business/components/common/json-schema/convert/convert";
 
 
-  export default {
+export default {
   name: "MsApiBody",
   components: {
     MsApiVariable,
@@ -203,35 +224,35 @@
       });
     }
   }
-  }
+}
 </script>
 
 <style scoped>
-  .textarea {
+.textarea {
   margin-top: 10px;
-  }
+}
 
-  .ms-body {
+.ms-body {
   padding: 15px 0;
   height: 400px;
-  }
+}
 
-  .el-dropdown {
+.el-dropdown {
   margin-left: 20px;
   line-height: 30px;
-  }
+}
 
-  .ace_editor {
+.ace_editor {
   border-radius: 5px;
-  }
+}
 
-  .el-radio-group {
+.el-radio-group {
   margin: 10px 10px;
   margin-top: 15px;
-  }
+}
 
-  .ms-el-link {
+.ms-el-link {
   float: right;
   margin-right: 45px;
-  }
+}
 </style>

frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue

@@ -181,12 +181,12 @@ import {TYPE_TO_C} from "@/business/components/api/automation/scenario/Setting";
 export default {
   name: "ApiCaseItem",
   filters: {
-    ellipsis (value) {
+    ellipsis(value) {
       if (!value) {
         return '';
       }
       if (value.length > 20) {
-        return value.slice(0,20) + '...'
+        return value.slice(0, 20) + '...'
       }
       return value
     }
@@ -432,8 +432,10 @@ export default {
       if (tmp.tags instanceof Array) {
         tmp.tags = JSON.stringify(tmp.tags);
       }
-      tmp.clazzName = TYPE_TO_C.get(tmp.type);
+      if (tmp.request) {
-      this.sort(tmp.hashTree);
+        tmp.request.clazzName = TYPE_TO_C.get(tmp.request.type);
+        this.sort(tmp.request.hashTree);
+      }
       this.result = this.$fileUpload(url, null, bodyFiles, tmp, (response) => {
         let data = response.data;
         row.id = data.id;

frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue

@@ -67,6 +67,11 @@
             <el-tab-pane :label="$t('api_test.definition.request.other_config')" name="advancedConfig">
               <ms-api-advanced-config :is-read-only="isReadOnly" :request="request"/>
             </el-tab-pane>
+<!--            <el-tab-pane name="create" v-if="hasPermission('PROJECT_API_DEFINITION:READ+CREATE_API')">-->
+<!--              <template v-slot:label>-->
+<!--                <el-button size="mini" type="primary" @click.stop @click="createTestData">生成测试数据</el-button>-->
+<!--              </template>-->
+<!--            </el-tab-pane>-->
 
           </el-tabs>
         </div>
@@ -93,6 +98,7 @@
   import MsApiAdvancedConfig from "./ApiAdvancedConfig";
   import MsJsr233Processor from "../../../../automation/scenario/component/Jsr233Processor";
   import ApiDefinitionStepButton from "../components/ApiDefinitionStepButton";
+  import {hasPermission} from '@/common/js/utils';
 
   export default {
     name: "MsApiHttpRequestForm",
@@ -176,6 +182,10 @@
     },
 
     methods: {
+      hasPermission,
+      createTestData(){
+
+      },
       remove(row) {
         let index = this.request.hashTree.indexOf(row);
         this.request.hashTree.splice(index, 1);