From 871781ab707f3ecc1ec72d1c76650227989ccfb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Tue, 24 Oct 2023 18:39:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84detection=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E7=AD=96=E7=95=A5=E6=97=B6=E4=BF=A1=E6=81=AF=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99=E5=AE=8C=E6=AF=95=EF=BC=8C=E4=B8=8D=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?continue=E4=B9=9F=E5=8F=AF=E4=BB=A5=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../table/detection/GeneralSettings.vue       |  8 ++++++--
 .../table/detection/RuleDefinition.vue        | 12 ++++++++---
 src/views/detectionsNew/DetectionForm.vue     | 20 ++++++++++---------
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/components/table/detection/GeneralSettings.vue b/src/components/table/detection/GeneralSettings.vue
index ee028daa..29f8260a 100644
--- a/src/components/table/detection/GeneralSettings.vue
+++ b/src/components/table/detection/GeneralSettings.vue
@@ -72,7 +72,7 @@
             show-word-limit
             placeholder=""
             v-model="settingObj.name"
-            @input="changeEditFlag"
+            @blur="changeEditFlag"
             class="form-setting__input" />
       </el-form-item>
 
@@ -85,7 +85,7 @@
             v-model="settingObj.description"
             type="textarea"
             resize='none'
-            @input="changeEditFlag"
+            @blur="changeEditFlag"
             class="form-setting__textarea" />
       </div>
     </el-form>
@@ -184,6 +184,10 @@ export default {
     },
     changeEditFlag () {
       this.settingObj.editFlag = true
+      if (this.settingObj.ruleType && this.settingObj.category && this.settingObj.eventType && this.settingObj.name) {
+        this.settingObj.settingNoContinue = true
+        this.onContinue()
+      }
     },
     /** 点击继续，进行第二步 */
     onContinue () {
diff --git a/src/components/table/detection/RuleDefinition.vue b/src/components/table/detection/RuleDefinition.vue
index eb8f7a63..44d3bd3e 100644
--- a/src/components/table/detection/RuleDefinition.vue
+++ b/src/components/table/detection/RuleDefinition.vue
@@ -165,7 +165,7 @@
       <el-form ref="form" :model="indicatorRuleObj" label-position="top" :rules="rules">
         <!--Source-->
         <el-form-item :label="$t('config.user.source')" prop="dataSource" class="form-setting__block margin-b-20">
-          <el-select v-model="indicatorRuleObj.dataSource" class="form-setting__select" placeholder=" " size="mini">
+          <el-select v-model="indicatorRuleObj.dataSource" class="form-setting__select" placeholder=" " size="mini" @change="handleParamsComplete">
             <el-option
                 v-for="item in sourceList"
                 :key="item.value"
@@ -177,7 +177,7 @@
 
         <!--Library-->
         <el-form-item :label="$t('detection.library')" prop="knowledgeId" class="form-setting__block margin-b-20">
-          <el-select v-model="indicatorRuleObj.knowledgeId" class="form-setting__select" placeholder=" " size="mini">
+          <el-select v-model="indicatorRuleObj.knowledgeId" class="form-setting__select" placeholder=" " size="mini" @change="handleParamsComplete">
             <el-option
                 v-for="item in libraryList"
                 :key="item.knowledgeId"
@@ -189,7 +189,7 @@
 
         <!--Level-->
         <el-form-item :label="$t('detection.level')" prop="level" class="form-setting__block">
-          <el-select v-model="indicatorRuleObj.level" class="condition__select form-setting__select" placeholder=" " size="mini">
+          <el-select v-model="indicatorRuleObj.level" class="condition__select form-setting__select" placeholder=" " size="mini" @change="handleParamsComplete">
             <template #prefix>
               <div
                   class="condition__select__icon"
@@ -518,6 +518,12 @@ export default {
         obj[item.level] = str
       })
       this.thresholdRuleObj.conditions = obj
+    },
+    handleParamsComplete () {
+      if (this.indicatorRuleObj.dataSource && this.indicatorRuleObj.knowledgeId && this.indicatorRuleObj.level) {
+        this.indicatorRuleObj.ruleNoContinue = true
+        this.onContinue()
+      }
     }
   }
 }
diff --git a/src/views/detectionsNew/DetectionForm.vue b/src/views/detectionsNew/DetectionForm.vue
index 05a47183..57e36bd4 100644
--- a/src/views/detectionsNew/DetectionForm.vue
+++ b/src/views/detectionsNew/DetectionForm.vue
@@ -223,22 +223,24 @@ export default {
     },
     /** 获取General Settings折叠板form数据 */
     getFormSetting (data) {
-      this.handleActiveNames('1', this.activeNames)
+      this.handleActiveNames('1', this.activeNames, data.settingNoContinue)
       this.settingObj = JSON.parse(JSON.stringify(data))
     },
     /** 获取Rule Definition折叠板form数据 */
     getRuleObj (data) {
-      this.handleActiveNames('2', this.activeNames)
+      this.handleActiveNames('2', this.activeNames, data.ruleNoContinue)
       this.ruleObj = JSON.parse(JSON.stringify(data))
     },
     /** 自动展开收起折叠板 */
-    handleActiveNames (name, arr) {
-      const list = arr
-      list.splice(list.indexOf(name), 1)
-      this.activeNames = []
-      list.forEach(t => {
-        this.activeNames.push(t)
-      })
+    handleActiveNames (name, arr, flag) {
+      if (!flag) {
+        const list = arr
+        list.splice(list.indexOf(name), 1)
+        this.activeNames = []
+        list.forEach(t => {
+          this.activeNames.push(t)
+        })
+      }
     },
     /** 创建policy */
     createPolicy (flag) {