From df70f8ec0697fabd859a28568cfa24c631e48cb3 Mon Sep 17 00:00:00 2001
From: maxbad <26058031@qq.com>
Date: Fri, 12 May 2023 15:34:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=9F=A5=E8=AF=A2=E7=9A=84=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=88=99=E9=9A=90=E8=97=8F=E6=90=9C=E7=B4=A2=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hggen/views/curd_generate_web_index.go    | 24 +++++++++++++++++++
 .../default/curd/web.index.vue.template       |  3 ++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/server/internal/library/hggen/views/curd_generate_web_index.go b/server/internal/library/hggen/views/curd_generate_web_index.go
index ed55d79..828c34e 100644
--- a/server/internal/library/hggen/views/curd_generate_web_index.go
+++ b/server/internal/library/hggen/views/curd_generate_web_index.go
@@ -8,6 +8,7 @@ package views
 import (
 	"context"
 	"fmt"
+
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/text/gstr"
 )
@@ -60,5 +61,28 @@ func (l *gCurd) webIndexTplData(ctx context.Context, in *CurdPreviewInput) (g.Ma
 		data["iconsImport"] = fmt.Sprintf(IndexIconsImport, gstr.Implode(",", iconsImport))
 	}
 
+	// 没有需要查询的字段则隐藏搜索表单
+	isSearchForm := false
+	for _, field := range in.masterFields {
+		if field.IsQuery == true {
+			isSearchForm = true
+			break
+		}
+	}
+	if isSearchForm == false {
+		if len(in.options.Join) > 0 {
+		LoopOut:
+			for _, v := range in.options.Join {
+				for _, column := range v.Columns {
+					if column.IsQuery == true {
+						isSearchForm = true
+						break LoopOut
+					}
+				}
+			}
+		}
+	}
+	data["isSearchForm"] = isSearchForm
+
 	return data, nil
 }
diff --git a/server/resource/generate/default/curd/web.index.vue.template b/server/resource/generate/default/curd/web.index.vue.template
index 3ad610c..1e0b286 100644
--- a/server/resource/generate/default/curd/web.index.vue.template
+++ b/server/resource/generate/default/curd/web.index.vue.template
@@ -6,6 +6,7 @@
           <!--  这是系统自动生成的CURD表格，你可以将此行注释改为表格的描述 -->
         </n-card>
       </div>
+@{ if eq .isSearchForm true }
       <BasicForm
         @register="register"
         @submit="reloadTable"
@@ -16,7 +17,7 @@
         <template #statusSlot="{ model, field }">
           <n-input v-model:value="model[field]" />
         </template>
-      </BasicForm>
+      </BasicForm>@{end}
 
       <BasicTable
         :openChecked="@{.options.Step.HasCheck}"