From 119d2b3c6095e5ae380025f67a12ba9085606ea9 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Wed, 21 Sep 2022 14:08:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/datie_02/menus/menuButton.vue | 1 +
 src/scripts/cmdPlugin/ValidateHandler.js        | 5 +++--
 src/views/trainingManage/editOperate.vue        | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/jmapNew/theme/datie_02/menus/menuButton.vue b/src/jmapNew/theme/datie_02/menus/menuButton.vue
index 76e154404..be6de9955 100644
--- a/src/jmapNew/theme/datie_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuButton.vue
@@ -494,6 +494,7 @@ export default {
                 // 清除按钮
                 const operate = {
                     start: true,
+                    userOperationType: 'leftClick',
                     operation: operation
                 };
                 this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
diff --git a/src/scripts/cmdPlugin/ValidateHandler.js b/src/scripts/cmdPlugin/ValidateHandler.js
index 7148de052..e77f3f886 100644
--- a/src/scripts/cmdPlugin/ValidateHandler.js
+++ b/src/scripts/cmdPlugin/ValidateHandler.js
@@ -66,8 +66,9 @@ class ValidateHandler {
         if (operate.userOperationType || stepOperation.userOperationType) {
             valid = (operate.userOperationType === stepOperation.userOperationType) && valid;
         }
-        if (operate.param || stepOperation.params) {
-            valid = objectIsEqual(operate.param, stepOperation.params) && valid;
+        const opParam = operate.param == undefined ? {} : operate.param;
+        if (opParam || stepOperation.params) {
+            valid = objectIsEqual(opParam, stepOperation.params) && valid;
         }
         Handler.handleCheckNewTrainingResult(valid);
         return valid;
diff --git a/src/views/trainingManage/editOperate.vue b/src/views/trainingManage/editOperate.vue
index 4a375ee00..6036b6e61 100644
--- a/src/views/trainingManage/editOperate.vue
+++ b/src/views/trainingManage/editOperate.vue
@@ -16,8 +16,8 @@
           <!--<div v-for="item in stepDetail.operations" :key="item">
             <div>{{ item }}</div>
           </div>-->
-          <template v-for="(item, index) in stepDetail.operations">
-            <div :key="index">
+          <template>
+            <div v-for="(item, index) in stepDetail.operations" :key="index">
               <el-tag :type="tagIndex === index? 'success':''" closable @close="deleteOperation(index)" @click="changeTagIndex(index)">
                 {{ covertString(item) }}
               </el-tag>
@@ -60,7 +60,7 @@ export default {
                     userOperationType: val.userOperationType || '',
                     domId: val.operation || '',
                     operationType: val.cmdType ? val.cmdType.value : '',
-                    params: val.params || {},
+                    params: val.param || {},
                     t: 'C'
                 };
                 this.stepDetail.operations.push(data);