From 57f07227fc5b888effa1850dd1814cc2bb12529e Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Tue, 3 Sep 2024 15:45:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E8=A3=85ts=E6=95=B0=E6=8D=AE=E6=89=A9?=
 =?UTF-8?q?=E5=B1=95=EF=BC=9AisMainValue=3Dtrue=E6=83=85=E5=86=B5=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0=E5=8F=AF=E9=80=89=E5=8F=AF?=
 =?UTF-8?q?=E7=A9=BA=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                  | 1 +
 src/components/BasicForm/src/BasicForm.vue | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f3c150968..d73d0dd7b 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ form: {
           value:'prodLine', // 指主表某字段 
           message: '请选择生产线信息！', // 当前置条件为空时 弹出信息提示
           isMainValue: true // 表示查询条件是主表的字段的值
+          isOptional:true, // isMainValue=true情况，添加参数可选可空的判断
           isFilterValue:true // 字段拼到filters里，和isMainValue配合使用
           action: '==', // 查询拼接条件
         },
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 5c772061e..7daea779c 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -516,7 +516,9 @@ const opensearchTable = (
             _searchCondition[searchCondition[i].key] == '' ||
             _searchCondition[searchCondition[i].key] == undefined
           ) {
-            isNull = true
+            if(!searchCondition[i].isOptional){ // 添加参数可选可空的判断
+              isNull = true
+            }
           }
           if (isNull) {
             message.warning(