Merge branch 'master' of https://github.com/metersphere/metersphere into master

frontend/src/business/components/api/definition/components/complete/BasisApi.vue

@@ -1,59 +1,59 @@
 <template>
-  <el-form :model="basicForm" label-position="right" label-width="80px" size="small" :rules="rule" ref="basicForm" style="margin-right: 20px">
-    <!-- 基础信息 -->
-    <el-row>
-      <el-col :span="12">
-        <el-form-item :label="$t('commons.name')" prop="name">
-          <el-input class="ms-http-input" size="small" v-model="basicForm.name"/>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item :label="$t('test_track.module.module')" prop="moduleId">
-          <el-select class="ms-http-input" size="small" v-model="basicForm.moduleId" style="width: 100%">
-            <el-option v-for="item in moduleOptions" :key="item.id" :label="item.path" :value="item.id"/>
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="12">
-        <el-form-item :label="$t('commons.status')" prop="status">
-          <el-select class="ms-http-input" size="small" v-model="basicForm.status" style="width: 100%">
-            <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id"/>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item :label="$t('api_test.definition.request.responsible')" prop="userId">
-          <el-select v-model="basicForm.userId"
-                     :placeholder="$t('api_test.definition.request.responsible')" filterable size="small"
-                     class="ms-http-input" style="width: 100%">
-            <el-option
-              v-for="item in maintainerOptions"
-              :key="item.id"
-              :label="item.id + ' (' + item.name + ')'"
-              :value="item.id">
-            </el-option>
-          </el-select>
+  <div v-loading="loading">
+    <el-form :model="basicForm" label-position="right" label-width="80px" size="small" :rules="rule" ref="basicForm" style="margin-right: 20px">
+      <!-- 基础信息 -->
+      <el-row>
+        <el-col :span="12">
+          <el-form-item :label="$t('commons.name')" prop="name">
+            <el-input class="ms-http-input" size="small" v-model="basicForm.name"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item :label="$t('test_track.module.module')" prop="moduleId">
+            <el-select class="ms-http-input" size="small" v-model="basicForm.moduleId" style="width: 100%" @change="reload">
+              <el-option v-for="item in moduleOptions" :key="item.id" :label="item.path" :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item :label="$t('commons.status')" prop="status">
+            <el-select class="ms-http-input" size="small" v-model="basicForm.status" style="width: 100%">
+              <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item :label="$t('api_test.definition.request.responsible')" prop="userId">
+            <el-select v-model="basicForm.userId"
+                       :placeholder="$t('api_test.definition.request.responsible')" filterable size="small"
+                       class="ms-http-input" style="width: 100%">
+              <el-option
+                v-for="item in maintainerOptions"
+                :key="item.id"
+                :label="item.id + ' (' + item.name + ')'"
+                :value="item.id">
+              </el-option>
+            </el-select>
 
-        </el-form-item>
-      </el-col>
-    </el-row>
+          </el-form-item>
+        </el-col>
+      </el-row>
 
-    <el-row>
-      <el-col>
-        <el-form-item :label="$t('commons.description')" prop="description">
-          <el-input class="ms-http-textarea"
-                    v-model="basicForm.description"
-                    type="textarea"
-                    :autosize="{ minRows: 2, maxRows: 10}"
-                    :rows="2" size="small"/>
-        </el-form-item>
-      </el-col>
-    </el-row>
-
-
-  </el-form>
+      <el-row>
+        <el-col>
+          <el-form-item :label="$t('commons.description')" prop="description">
+            <el-input class="ms-http-textarea"
+                      v-model="basicForm.description"
+                      type="textarea"
+                      :autosize="{ minRows: 2, maxRows: 10}"
+                      :rows="2" size="small"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
 </template>
 
 <script>
@@ -81,6 +81,7 @@
         httpVisible: false,
         currentModule: {},
         maintainerOptions: [],
+        loading: false,
         rule: {
           name: [
             {required: true, message: this.$t('test_track.case.input_name'), trigger: 'blur'},
@@ -102,6 +103,12 @@
           this.maintainerOptions = response.data;
         });
       },
+      reload() {
+        this.loading = true
+        this.$nextTick(() => {
+          this.loading = false
+        })
+      },
       validate() {
         this.$refs['basicForm'].validate((valid) => {
           if (valid) {

frontend/src/business/components/api/definition/components/complete/EditCompleteDubboApi.vue

@@ -61,6 +61,7 @@
         this.validateApi();
         if (this.validated) {
           this.basisData.request = this.request;
+          console.log(this.basisData)
           this.$emit('saveApi', this.basisData);
         }
       },