From 3acc2a1eddb34da6264b265ebe91b3031caf113c Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Wed, 27 Jan 2021 14:51:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20switch=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/definition/components/import/ApiImport.vue          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/definition/components/import/ApiImport.vue b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
index a808a985f2..a7bb46b646 100644
--- a/frontend/src/business/components/api/definition/components/import/ApiImport.vue
+++ b/frontend/src/business/components/api/definition/components/import/ApiImport.vue
@@ -50,8 +50,9 @@
             <el-switch
               v-model="swaggerSynchronization"
               @click.native="scheduleEdit"
-              :active-text="$t('api_test.api_import.timing_synchronization')">
+              >
             </el-switch>
+            <span style="color: #6C317C;cursor: pointer;font-weight: bold;margin-left: 10px" @click="scheduleEditByText">{{$t('api_test.api_import.timing_synchronization')}}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12"
@@ -188,6 +189,9 @@ export default {
         }
       }
     },
+    scheduleEditByText(){
+      this.$refs.scheduleEdit.open(this.buildParam());
+    },
     open(module) {
       this.currentModule = module;
       this.visible = true;

From ead49634135c7ffdd5b32ae299d4a76140803747 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 27 Jan 2021 14:56:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E7=94=A8=E4=BE=8B=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=94=A8=E4=BE=8B=E6=97=B6=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=9C=AA=E6=B8=85=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/definition/components/case/ApiCaseItem.vue           | 3 ++-
 .../api/definition/components/case/ApiCaseList.vue           | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
index 231fbc59b4..7fcfa5c573 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
@@ -212,7 +212,8 @@
         this.$emit('singleRun', data);
       },
       copyCase(data) {
-        let obj = {name: "copy_" + data.name, priority: data.priority, active: true, request: data.request};
+        let uuid = getUUID();
+        let obj = {name: "copy_" + data.name, priority: data.priority, active: true, request: data.request, uuid: uuid};
         this.$emit('copyCase', obj);
       },
       selectTestCase(item, $event) {
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
index 0ca8e31d57..08f54fca93 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
@@ -20,7 +20,7 @@
 
       <el-container v-loading="result.loading">
         <el-main>
-          <div v-for="(item,index) in apiCaseList" :key="index">
+          <div v-for="(item,index) in apiCaseList" :key="item.id ? item.id : item.uuid">
             <api-case-item v-loading="singleLoading && singleRunId === item.id || batchLoadingIds.indexOf(item.id) > -1"
                            @refresh="refresh"
                            @singleRun="singleRun"
@@ -243,7 +243,8 @@
           if (!request.hashTree) {
             request.hashTree = [];
           }
-          let obj = {apiDefinitionId: this.api.id, name: '', priority: 'P0', active: true, tags: []};
+          let uuid = getUUID();
+          let obj = {apiDefinitionId: this.api.id, name: '', priority: 'P0', active: true, tags: [], uuid: uuid};
           obj.request = request;
           this.apiCaseList.unshift(obj);
         }