From 230d86c8fabe3fb32c0380d42c19b365e6be0cf8 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Mon, 10 Oct 2022 14:48:28 +0800
Subject: [PATCH] =?UTF-8?q?swagger=E5=AE=9A=E6=97=B6=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../definition/ApiTestCaseService.java        |  2 +-
 .../src/business/definition/ApiDefinition.vue |  7 ++-
 .../components/import/ApiSchedule.vue         | 61 +++++++++----------
 3 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/api-test/backend/src/main/java/io/metersphere/service/definition/ApiTestCaseService.java b/api-test/backend/src/main/java/io/metersphere/service/definition/ApiTestCaseService.java
index 845122be79..296b10ed29 100644
--- a/api-test/backend/src/main/java/io/metersphere/service/definition/ApiTestCaseService.java
+++ b/api-test/backend/src/main/java/io/metersphere/service/definition/ApiTestCaseService.java
@@ -690,7 +690,7 @@ public class ApiTestCaseService {
     public void editApiBathByParam(ApiTestBatchRequest request) {
         List<String> ids = request.getIds();
         if (request.isSelectAll()) {
-            ids = this.getAllApiCaseIdsByFrontedSelect(request.getFilters(), request.getModuleIds(), request.getName(), request.getProjectId(), request.getProtocol(), request.getUnSelectIds(), request.getStatus(), null, request.getCombine());
+            ids = this.getAllApiCaseIdsByFrontedSelect(request.getFilters(), request.getModuleIds(), request.getName(), request.getProjectId(), request.getProtocol(), request.getUnSelectIds(), request.getStatus(), request.getApiDefinitionId(), request.getCombine());
         }
 
         if (StringUtils.equals("tags", request.getType())) {
diff --git a/api-test/frontend/src/business/definition/ApiDefinition.vue b/api-test/frontend/src/business/definition/ApiDefinition.vue
index f2e99cc18d..5c966d7ab1 100644
--- a/api-test/frontend/src/business/definition/ApiDefinition.vue
+++ b/api-test/frontend/src/business/definition/ApiDefinition.vue
@@ -217,7 +217,7 @@
             </div>
 
             <!-- 定时任务 -->
-            <div v-if="item.type=== 'SCHEDULE'" class="ms-api-div">
+            <div v-if="item.type=== 'SCHEDULE'" class="ms-api-schedule-div">
               <api-schedule :param="param" :module-options="nodeTree" ref="apiSchedules"/>
             </div>
           </el-tab-pane>
@@ -1007,6 +1007,11 @@ export default {
   height: calc(100vh - 100px)
 }
 
+.ms-api-schedule-div {
+  overflow-y: auto;
+  height: calc(100vh - 100px)
+}
+
 :deep(.el-main) {
   overflow: auto;
 }
diff --git a/api-test/frontend/src/business/definition/components/import/ApiSchedule.vue b/api-test/frontend/src/business/definition/components/import/ApiSchedule.vue
index 8200e7bd9f..1024d27575 100644
--- a/api-test/frontend/src/business/definition/components/import/ApiSchedule.vue
+++ b/api-test/frontend/src/business/definition/components/import/ApiSchedule.vue
@@ -1,17 +1,21 @@
 <template>
   <el-main>
-    <div class="api-schedule-form">
+    <div class="api-schedule-form" style="overflow: auto!important;">
       <el-form :model="formData" :rules="rules" v-loading="result" label-width="80px" ref="form">
         <el-row>
           <el-col :span="12">
             <el-form-item :label-width="labelWith" :label="'Swagger URL'" prop="swaggerUrl" class="swagger-url">
               <el-input size="small" v-model="formData.swaggerUrl" clearable/>
             </el-form-item>
-            <el-form-item :label-width="labelWith" :label="'Cron表达式'" prop="rule">
+            <el-form-item :label-width="labelWith" :label="$t('commons.schedule_cron_title')" prop="rule">
               <el-input :disabled="isReadOnly"
                         v-model="formData.rule"
                         size="small"
-                        :placeholder="$t('schedule.please_input_cron_expression')"/>
+                        :placeholder="$t('schedule.please_input_cron_expression')">
+                <a :disabled="isReadOnly" @click="showCronDialog" slot="suffix" class="head">
+                  {{ $t('schedule.generate_expression') }}
+                </a>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -60,39 +64,30 @@
           </el-col>
         </el-row>
 
-        <el-form-item class="expression-link">
-          <el-link :disabled="isReadOnly" type="primary" @click="showCronDialog">
-            {{ $t('schedule.generate_expression') }}
-          </el-link>
-        </el-form-item>
         <el-form-item>
           <crontab-result :ex="formData.rule" ref="crontabResult"/>
         </el-form-item>
       </el-form>
 
-      <div style="margin-top: 20px;" class="clearfix">
-        <el-row>
-          <el-col :span="4">
-            <el-button type="primary" style="float: right" size="mini" @click="openSchedule">
-              {{ $t('schedule.task_notification') }}
-            </el-button>
-          </el-col>
-          <el-col :span="20">
-            <el-button v-if="!formData.id" type="primary" style="float: right" size="mini" @click="saveCron">
-              {{ $t('commons.add') }}
-            </el-button>
-            <div v-else>
-              <el-button type="primary" style="float: right;margin-left: 10px" size="mini" @click="clear">
-                {{ $t('commons.clear') }}
-              </el-button>
-              <el-button type="primary" style="float: right" size="mini" @click="saveCron">{{ $t('commons.update') }}
-              </el-button>
-            </div>
-          </el-col>
-        </el-row>
+      <div class="clearfix">
+        <el-button v-if="!formData.id" type="primary" style="float: right" size="mini" @click="saveCron">
+          {{ $t('commons.add') }}
+        </el-button>
+        <div v-else>
+          <el-button type="primary" style="float: right;margin-left: 10px" size="mini" @click="clear">
+            {{ $t('commons.clear') }}
+          </el-button>
+          <el-button type="primary" style="float: right" size="mini" @click="saveCron">{{ $t('commons.update') }}
+          </el-button>
+        </div>
       </div>
     </div>
 
+    <div style="margin-top: 10px;">
+      <el-button type="primary" style="float: left" size="mini" @click="openSchedule">
+        {{ $t('schedule.task_notification') }}
+      </el-button>
+    </div>
     <div class="task-list">
       <swagger-task-list
         @clear="clear"
@@ -414,10 +409,14 @@ export default {
 }
 
 .task-list {
-  margin-top: 15px;
+  margin-top: 50px;
 }
 
-.expression-link {
-  margin-bottom: 0;
+.head {
+  border-bottom: 1px solid var(--primary_color);
+  color: var(--primary_color);
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
+  font-size: 13px;
+  cursor: pointer;
 }
 </style>