From 2b0f6b770f8505c32af83a0c23f7a7ca0e862a95 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 19 Aug 2024 13:38:50 +0800
Subject: [PATCH] =?UTF-8?q?HL-5395=20WMS=EF=BC=8CSCP=EF=BC=8CQMS=E5=9C=A8?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E5=88=97=E8=A1=A8=E9=A1=B5=E4=B8=8A=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=A1=86=E4=B8=AD=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=90=8E=E6=8C=89=E3=80=90=E5=9B=9E=E8=BD=A6?=
 =?UTF-8?q?=E3=80=91=EF=BC=8C=E5=8F=AF=E4=BB=A5=E7=9B=B4=E6=8E=A5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E7=9B=B8=E5=BD=93=E4=BA=8E=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E4=BA=86=E3=80=90=E6=9F=A5=E8=AF=A2=E6=8C=89=E9=92=AE=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Form/src/Form.vue     |  6 ++++++
 src/components/Search/src/Search.vue | 16 +++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue
index d8421d87c..1a9076d65 100644
--- a/src/components/Form/src/Form.vue
+++ b/src/components/Form/src/Form.vue
@@ -400,6 +400,12 @@ export default defineComponent({
                       onBlur={(e) => { onBlur(item.field, e) }}
                       onFocus={(e) => { onFocus(item.field) }}
                       onInput={(value)=>{onInput(item.field,value)}}
+                      onKeyup={(event)=>{
+                          if(event.keyCode === 13){
+                            //回车
+                            emit('onEnter',item.field,formModel.value[item.field],event)
+                          }
+                      }} 
                       {...(notRenderOptions.includes(item?.component as string) &&
                       item?.componentProps?.options
                         ? { options: item?.componentProps?.options || [] }
diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue
index c233dd92c..f75d6fa2f 100644
--- a/src/components/Search/src/Search.vue
+++ b/src/components/Search/src/Search.vue
@@ -63,9 +63,15 @@ const props = defineProps({
     required: false,
     default: []
   },
+  //回车触发搜索。默认true
+  enterSearch:{
+    type: Boolean,
+    required: false,
+    default: true
+  },
 })
 
-const emit = defineEmits(['search', 'reset','onInput','onChange','searchTableSuccess'])
+const emit = defineEmits(['search', 'reset','onInput','onChange','onEnter','searchTableSuccess'])
 
 const visible = ref(true)
 
@@ -116,6 +122,13 @@ const onInput = (field,value) => {
 const onChange = (field, value)=>{
   emit('onChange', field,value)
 }
+const onEnter = async (field, value, e) => {
+  if(props.enterSearch){
+    search()
+  }else{
+    emit('onEnter', field, value, e)
+  }
+}
 const searchTableRef = ref()
 const opensearchTable = (
   formField,
@@ -291,6 +304,7 @@ defineExpose({setFormValues,search}) // 提供 open 方法，用于打开弹窗
       @onInput="onInput"
       @opensearchTable="opensearchTable"
       @onChange="onChange"
+      @onEnter="onEnter"
     >
       <template #action>
         <div v-if="layout === 'inline'">