From 0cd3efa642535d3b03d979bb3984b793538669a8 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 21 Aug 2024 14:32:24 +0800
Subject: [PATCH] =?UTF-8?q?HL-5395WMS=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     | 7 ++++++-
 src/components/Search/src/Search.vue | 7 +++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue
index 1a9076d65..33db690db 100644
--- a/src/components/Form/src/Form.vue
+++ b/src/components/Form/src/Form.vue
@@ -55,7 +55,7 @@ export default defineComponent({
     vLoading: propTypes.bool.def(false),
     labelPosition: propTypes.string.def('left'),
   },
-  emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onBlur','onFocus','onEnter','hiddenFilterButton','changeDialogWidth','onInput'],
+  emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onSubmit', 'onBlur','onFocus','onEnter','hiddenFilterButton','changeDialogWidth','onInput'],
   setup(props, { slots, expose, emit }) {
     // element form 实例
     const elFormRef = ref<ComponentRef<typeof ElForm>>()
@@ -196,6 +196,10 @@ export default defineComponent({
     const onChange = (field, cur) => {
       emit('onChange', field, cur)
     }
+    const onSubmit = (event) => {
+      emit('onSubmit', event)
+    }
+    
     /**
      * 监听失去焦点
      * @param field 当前操作字段
@@ -461,6 +465,7 @@ export default defineComponent({
         class={prefixCls}
         v-loading={props.vLoading}
         label-position={props.labelPosition}
+        onSubmit={(e)=>{onSubmit(e)}}
       >
         {{
           // 如果需要自定义，就什么都不渲染，而是提供默认插槽
diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue
index f75d6fa2f..deea2f7a7 100644
--- a/src/components/Search/src/Search.vue
+++ b/src/components/Search/src/Search.vue
@@ -122,7 +122,12 @@ const onInput = (field,value) => {
 const onChange = (field, value)=>{
   emit('onChange', field,value)
 }
+
+const onSubmit = (e) => {
+  e.preventDefault();
+}
 const onEnter = async (field, value, e) => {
+  
   if(props.enterSearch){
     search()
   }else{
@@ -183,6 +188,7 @@ const opensearchTable = (
             return
           }
         }
+
       }else if(searchCondition[i].isTableRowValue){
         if(searchCondition[i].required){
           if (row[searchCondition[i].value] == '' ||row[searchCondition[i].value] == undefined) {
@@ -305,6 +311,7 @@ defineExpose({setFormValues,search}) // 提供 open 方法，用于打开弹窗
       @opensearchTable="opensearchTable"
       @onChange="onChange"
       @onEnter="onEnter"
+      @onSubmit="onSubmit"
     >
       <template #action>
         <div v-if="layout === 'inline'">