冲突解决

src/components/SimpleProcessDesignerV2/src/nodes-config/TriggerNodeConfig.vue

@@ -403,7 +403,10 @@ const changeTriggerType = () => {
             response: []
             response: []
           }
           }
     configForm.value.formSettings = undefined
     configForm.value.formSettings = undefined
-  } else if (configForm.value.type === TriggerTypeEnum.ASYNC_HTTP_REQUEST) {
+    return
+  } 
+  
+  if (configForm.value.type === TriggerTypeEnum.ASYNC_HTTP_REQUEST) {
     configForm.value.httpRequestSetting =
     configForm.value.httpRequestSetting =
       originalSetting?.type === TriggerTypeEnum.ASYNC_HTTP_REQUEST && originalSetting.httpRequestSetting
       originalSetting?.type === TriggerTypeEnum.ASYNC_HTTP_REQUEST && originalSetting.httpRequestSetting
         ? originalSetting.httpRequestSetting
         ? originalSetting.httpRequestSetting
@@ -414,7 +417,10 @@ const changeTriggerType = () => {
             response: []
             response: []
           }
           }
     configForm.value.formSettings = undefined
     configForm.value.formSettings = undefined
-  }else if (configForm.value.type === TriggerTypeEnum.FORM_UPDATE) {
+    return
+  }
+
+  if (configForm.value.type === TriggerTypeEnum.FORM_UPDATE) {
     configForm.value.formSettings =
     configForm.value.formSettings =
       originalSetting?.type === TriggerTypeEnum.FORM_UPDATE && originalSetting.formSettings
       originalSetting?.type === TriggerTypeEnum.FORM_UPDATE && originalSetting.formSettings
         ? originalSetting.formSettings
         ? originalSetting.formSettings
@@ -426,7 +432,10 @@ const changeTriggerType = () => {
             }
             }
           ]
           ]
     configForm.value.httpRequestSetting = undefined
     configForm.value.httpRequestSetting = undefined
-  } else if (configForm.value.type === TriggerTypeEnum.FORM_DELETE) {
+    return
+  }
+
+  if (configForm.value.type === TriggerTypeEnum.FORM_DELETE) {
     configForm.value.formSettings =
     configForm.value.formSettings =
       originalSetting?.type === TriggerTypeEnum.FORM_DELETE && originalSetting.formSettings
       originalSetting?.type === TriggerTypeEnum.FORM_DELETE && originalSetting.formSettings
         ? originalSetting.formSettings
         ? originalSetting.formSettings
@@ -438,6 +447,7 @@ const changeTriggerType = () => {
             }
             }
           ]
           ]
     configForm.value.httpRequestSetting = undefined
     configForm.value.httpRequestSetting = undefined
+    return
   }
   }
 }
 }