From 57c5124828e0bb9c2ccd93457982fafad343dc78 Mon Sep 17 00:00:00 2001
From: 23688nl <329261568@qq.com>
Date: Thu, 29 Sep 2022 14:40:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4:=20=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=20=E8=A7=A6=E5=8F=91=E5=99=A8=E4=B8=AD=20cro?=
 =?UTF-8?q?n=20=E4=BD=BF=E7=94=A8=E5=BC=B9=E7=AA=97=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=8F=B3=E4=B8=8A=E8=A7=92=E5=85=B3=E9=97=AD=EF=BC=8C=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ESceneManage/ESceneTriggers/src/index.js        | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/index.js b/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/index.js
index eea7d308..37408ea5 100644
--- a/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/index.js
+++ b/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/index.js
@@ -29,6 +29,7 @@ export default {
       exeStartTime: "",
       open: false,
       isAntiShake: false,
+      oldCronValue: ''
     }
   },
   mounted() {
@@ -79,7 +80,7 @@ export default {
       if (!this.dataItem['execScript']) {
         this.dataItem['execScript'] = '* * * * * ? *';
       }
-      this.open = false
+      this.open = false;
     }
   },
   watch: {
@@ -159,14 +160,14 @@ export default {
                   dataItem.method === 'TIMER' ?
                   <div>
                     <el-input placeholder="请输入内容" v-model={dataItem['execScript']}>
-                      <el-button slot="append" onClick={() => { this.open = true}} icon="el-icon-connection"></el-button>
+                      <el-button slot="append" onClick={() => { this.open = true; this.oldCronValue = dataItem['execScript']}} icon="el-icon-connection"></el-button>
                     </el-input>
                   </div> : null
                 }
                 <el-dialog
                   title="cron-表达式"
                   visible={this.open}
-                  onClose={() => {this.open = false}}
+                  show-close={false}
                   class="eldialog-wrap"
                   width="880px"
                   append-to-body
@@ -183,7 +184,11 @@ export default {
                   />
 
                   <div slot="footer" class="dialog-footer" style="padding-right: 10px;">
-                    <el-button type="primary" size="mini" onClick={this.handleCronSubmit} >确 定</el-button>
+                    <el-button type="primary" size="mini" style="margin-right: 10px;" onClick={this.handleCronSubmit} >确 定</el-button>
+                    <el-button size="mini" onClick={() => {
+                      dataItem['execScript'] = this.oldCronValue
+                      this.open = false;
+                    }} >取 消</el-button>
                   </div>
 
                 </el-dialog>