From 7c218284a12082be6d457dae1473e53aa2cda5a5 Mon Sep 17 00:00:00 2001
From: shaohuzhang1 <shaohu.zhang@fit2cloud.com>
Date: Wed, 28 Aug 2024 15:57:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=BB=E5=B8=83?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/workflow/common/NodeCascader.vue           | 14 ++++----------
 ui/src/workflow/nodes/ai-chat-node/index.vue      | 15 ++++-----------
 ui/src/workflow/nodes/base-node/index.vue         | 10 +++-------
 ui/src/workflow/nodes/condition-node/index.vue    | 12 +++---------
 ui/src/workflow/nodes/function-lib-node/index.vue |  4 ----
 ui/src/workflow/nodes/function-node/index.vue     |  8 +-------
 ui/src/workflow/nodes/question-node/index.vue     | 13 +++----------
 ui/src/workflow/nodes/reply-node/index.vue        | 10 +++-------
 .../workflow/nodes/search-dataset-node/index.vue  |  4 ----
 9 files changed, 21 insertions(+), 69 deletions(-)

diff --git a/ui/src/workflow/common/NodeCascader.vue b/ui/src/workflow/common/NodeCascader.vue
index 0ac0edf20..ab9bf5eb6 100644
--- a/ui/src/workflow/common/NodeCascader.vue
+++ b/ui/src/workflow/common/NodeCascader.vue
@@ -1,8 +1,6 @@
 <template>
   <el-cascader
     @wheel="wheel"
-    @keydown="isKeyDown = true"
-    @keyup="isKeyDown = false"
     :teleported="false"
     :options="options"
     @visible-change="visibleChange"
@@ -11,12 +9,7 @@
     separator=" > "
   >
     <template #default="{ node, data }">
-      <span
-        class="flex align-center"
-        @wheel="wheel"
-        @keydown="isKeyDown = true"
-        @keyup="isKeyDown = false"
-      >
+      <span class="flex align-center" @wheel="wheel">
         <component :is="iconComponent(`${data.type}-icon`)" class="mr-8" :size="18" />{{
           data.label
         }}</span
@@ -42,10 +35,11 @@ const data = computed({
   }
 })
 const options = ref<Array<any>>([])
-const isKeyDown = ref(false)
+
 const wheel = (e: any) => {
-  if (isKeyDown.value) {
+  if (e.ctrlKey === true) {
     e.preventDefault()
+    return true
   } else {
     e.stopPropagation()
     return true
diff --git a/ui/src/workflow/nodes/ai-chat-node/index.vue b/ui/src/workflow/nodes/ai-chat-node/index.vue
index 236d1bac0..f3791adbc 100644
--- a/ui/src/workflow/nodes/ai-chat-node/index.vue
+++ b/ui/src/workflow/nodes/ai-chat-node/index.vue
@@ -4,10 +4,6 @@
     <el-card shadow="never" class="card-never" style="--el-card-padding: 12px">
       <el-form
         @submit.prevent
-        @mousemove.stop
-        @mousedown.stop
-        @keydown.stop
-        @click.stop
         :model="chat_data"
         label-position="top"
         require-asterisk-position="right"
@@ -44,8 +40,6 @@
           <el-select
             @change="model_change"
             @wheel="wheel"
-            @keydown="isKeyDown = true"
-            @keyup="isKeyDown = false"
             :teleported="false"
             v-model="chat_data.model_id"
             placeholder="请选择 AI 模型"
@@ -138,8 +132,6 @@
           </template>
           <MdEditor
             @wheel="wheel"
-            @keydown="isKeyDown = true"
-            @keyup="isKeyDown = false"
             class="reply-node-editor"
             style="height: 150px"
             v-model="chat_data.prompt"
@@ -216,11 +208,12 @@ import type { Provider } from '@/api/type/model'
 import { isLastNode } from '@/workflow/common/data'
 import AIModeParamSettingDialog from '@/views/application/component/AIModeParamSettingDialog.vue'
 
-const { model, application } = useStore()
-const isKeyDown = ref(false)
+const { model } = useStore()
+
 const wheel = (e: any) => {
-  if (isKeyDown.value) {
+  if (e.ctrlKey === true) {
     e.preventDefault()
+    return true
   } else {
     e.stopPropagation()
     return true
diff --git a/ui/src/workflow/nodes/base-node/index.vue b/ui/src/workflow/nodes/base-node/index.vue
index d9a5df47c..66243053c 100644
--- a/ui/src/workflow/nodes/base-node/index.vue
+++ b/ui/src/workflow/nodes/base-node/index.vue
@@ -2,9 +2,6 @@
   <NodeContainer :nodeModel="nodeModel">
     <el-form
       @submit.prevent
-      @mousedown.stop
-      @keydown.stop
-      @click.stop
       :model="form_data"
       label-position="top"
       require-asterisk-position="right"
@@ -42,8 +39,6 @@
       <el-form-item label="开场白">
         <MdEditor
           @wheel="wheel"
-          @keydown="isKeyDown = true"
-          @keyup="isKeyDown = false"
           style="height: 150px"
           v-model="form_data.prologue"
           :preview="false"
@@ -82,10 +77,11 @@ const form = {
   prologue:
     '您好，我是 MaxKB 小助手，您可以向我提出 MaxKB 使用问题。\n- MaxKB 主要功能有什么？\n- MaxKB 支持哪些大语言模型？\n- MaxKB 支持哪些文档类型？'
 }
-const isKeyDown = ref(false)
+
 const wheel = (e: any) => {
-  if (isKeyDown.value) {
+  if (e.ctrlKey === true) {
     e.preventDefault()
+    return true
   } else {
     e.stopPropagation()
     return true
diff --git a/ui/src/workflow/nodes/condition-node/index.vue b/ui/src/workflow/nodes/condition-node/index.vue
index 8bf5b18e6..2a2346aa5 100644
--- a/ui/src/workflow/nodes/condition-node/index.vue
+++ b/ui/src/workflow/nodes/condition-node/index.vue
@@ -6,11 +6,7 @@
       require-asterisk-position="right"
       label-width="auto"
       ref="ConditionNodeFormRef"
-      @keydown.stop
       @submit.prevent
-      @click.stop
-      @mousedown.stop
-      @mousemove.stop
     >
       <template v-for="(item, index) in form_data.branch" :key="item.id">
         <el-card
@@ -68,8 +64,6 @@
                   >
                     <el-select
                       @wheel="wheel"
-                      @keydown="isKeyDown = true"
-                      @keyup="isKeyDown = false"
                       :teleported="false"
                       v-model="condition.compare"
                       placeholder="请选择条件"
@@ -158,16 +152,16 @@ const form = {
     }
   ]
 }
-const isKeyDown = ref(false)
+
 const wheel = (e: any) => {
-  if (isKeyDown.value) {
+  if (e.ctrlKey === true) {
     e.preventDefault()
+    return true
   } else {
     e.stopPropagation()
     return true
   }
 }
-
 const resizeCondition = (wh: any, row: any, index: number) => {
   const branch_condition_list = cloneDeep(
     props.nodeModel.properties.branch_condition_list
diff --git a/ui/src/workflow/nodes/function-lib-node/index.vue b/ui/src/workflow/nodes/function-lib-node/index.vue
index 37bbc81f2..f85c4483f 100644
--- a/ui/src/workflow/nodes/function-lib-node/index.vue
+++ b/ui/src/workflow/nodes/function-lib-node/index.vue
@@ -4,10 +4,6 @@
     <h5 class="lighter mb-8">输入变量</h5>
     <el-form
       @submit.prevent
-      @mousemove.stop
-      @mousedown.stop
-      @keydown.stop
-      @click.stop
       ref="FunctionNodeFormRef"
       :model="chat_data"
       label-position="top"
diff --git a/ui/src/workflow/nodes/function-node/index.vue b/ui/src/workflow/nodes/function-node/index.vue
index 7f081c4ce..3aed32457 100644
--- a/ui/src/workflow/nodes/function-node/index.vue
+++ b/ui/src/workflow/nodes/function-node/index.vue
@@ -9,10 +9,6 @@
     </div>
     <el-form
       @submit.prevent
-      @mousemove.stop
-      @mousedown.stop
-      @keydown.stop
-      @click.stop
       ref="FunctionNodeFormRef"
       :model="chat_data"
       label-position="top"
@@ -228,6 +224,4 @@ onMounted(() => {
   }, 100)
 })
 </script>
-<style lang="scss">
-
-</style>
+<style lang="scss"></style>
diff --git a/ui/src/workflow/nodes/question-node/index.vue b/ui/src/workflow/nodes/question-node/index.vue
index 92ae8849d..60eba1bb6 100644
--- a/ui/src/workflow/nodes/question-node/index.vue
+++ b/ui/src/workflow/nodes/question-node/index.vue
@@ -4,10 +4,6 @@
     <el-card shadow="never" class="card-never" style="--el-card-padding: 12px">
       <el-form
         @submit.prevent
-        @mousemove.stop
-        @mousedown.stop
-        @keydown.stop
-        @click.stop
         :model="form_data"
         label-position="top"
         require-asterisk-position="right"
@@ -44,8 +40,6 @@
           <el-select
             @change="model_change"
             @wheel="wheel"
-            @keydown="isKeyDown = true"
-            @keyup="isKeyDown = false"
             :teleported="false"
             v-model="form_data.model_id"
             placeholder="请选择 AI 模型"
@@ -136,8 +130,6 @@
           </template>
           <MdEditor
             @wheel="wheel"
-            @keydown="isKeyDown = true"
-            @keyup="isKeyDown = false"
             class="reply-node-editor"
             style="height: 150px"
             v-model="form_data.prompt"
@@ -216,10 +208,11 @@ import { isLastNode } from '@/workflow/common/data'
 const AIModeParamSettingDialogRef = ref<InstanceType<typeof AIModeParamSettingDialog>>()
 
 const { model } = useStore()
-const isKeyDown = ref(false)
+
 const wheel = (e: any) => {
-  if (isKeyDown.value) {
+  if (e.ctrlKey === true) {
     e.preventDefault()
+    return true
   } else {
     e.stopPropagation()
     return true
diff --git a/ui/src/workflow/nodes/reply-node/index.vue b/ui/src/workflow/nodes/reply-node/index.vue
index f0f0e3c76..344d7d441 100644
--- a/ui/src/workflow/nodes/reply-node/index.vue
+++ b/ui/src/workflow/nodes/reply-node/index.vue
@@ -3,9 +3,6 @@
     <el-card shadow="never" class="card-never" style="--el-card-padding: 12px">
       <el-form
         @submit.prevent
-        @mousedown.stop
-        @keydown.stop
-        @click.stop
         :model="form_data"
         label-position="top"
         require-asterisk-position="right"
@@ -30,8 +27,6 @@
           <MdEditor
             v-if="form_data.reply_type === 'content'"
             @wheel="wheel"
-            @keydown="isKeyDown = true"
-            @keyup="isKeyDown = false"
             class="reply-node-editor"
             style="height: 150px"
             v-model="form_data.content"
@@ -92,10 +87,11 @@ import { ref, computed, onMounted } from 'vue'
 import { isLastNode } from '@/workflow/common/data'
 
 const props = defineProps<{ nodeModel: any }>()
-const isKeyDown = ref(false)
+
 const wheel = (e: any) => {
-  if (isKeyDown.value) {
+  if (e.ctrlKey === true) {
     e.preventDefault()
+    return true
   } else {
     e.stopPropagation()
     return true
diff --git a/ui/src/workflow/nodes/search-dataset-node/index.vue b/ui/src/workflow/nodes/search-dataset-node/index.vue
index 3d03d82ad..c065668a4 100644
--- a/ui/src/workflow/nodes/search-dataset-node/index.vue
+++ b/ui/src/workflow/nodes/search-dataset-node/index.vue
@@ -4,10 +4,6 @@
     <el-card shadow="never" class="card-never">
       <el-form
         @submit.prevent
-        @mousemove.stop
-        @mousedown.stop
-        @keydown.stop
-        @click.stop
         :model="form_data"
         label-position="top"
         require-asterisk-position="right"