From 7c64b70e743d4f82caa5de47e4d4fda4006f9671 Mon Sep 17 00:00:00 2001
From: Hermes Agent <hermes@opencomputing.cn>
Date: Mon, 22 Jun 2026 13:27:22 +0800
Subject: [PATCH] feat: move InlineForm into Tabular search_form option

Remove standalone InlineForm sibling from CRUD template. Pass filter
fields as search_form config inside Tabular options. Toolbar filter
button toggles the embedded form visibility.
---
 xls2ddl/__pycache__/tmpls.cpython-312.pyc | Bin 14998 -> 14407 bytes
 xls2ddl/tmpls.py                          |  37 +++++-----------------
 2 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/xls2ddl/__pycache__/tmpls.cpython-312.pyc b/xls2ddl/__pycache__/tmpls.cpython-312.pyc
index 1a4c59a6cc918af81bd323aee158ffc0de241da2..c72c60b9be495c65306818ca3e31d376a4876fd6 100644
GIT binary patch
delta 184
zcmbPMdc1(|G%qg~0}yl^x5(nPn8;_%w1#`4cjV@y%%?g0IXRVzQxl7lGvd?oi*l8$
zs<}9ULdnI&N>)nAiA5<&I$(i<#FUiGymX+TML`8rtT-dTJU%BeDK$sQDlIXmI2EXL
zvOlBj<ZMQ1IZmat%+#C|pfT0eS;hHzdMTy31;rX^nK>n?Me&nA2&*##4W6vXBf5DJ
X&n{iAEJjh53k-rE!k8zgSs4HTpPV+@

delta 759
zcma)4&x#W<9A1|_IDsy#A`1&b43xIe9ac~&QwriiSOhN~L~1FSNwSTmnUJL0U525L
zAnSk+;2RWAdhqH&1RubM@b1N5W_qZg;N0?kzx?w3nJ?zuV*hKag?8Z69|x~qCRh8z
z-CwP%Coj@AmI5>C=~PJNxy4ko?Q<+7SIpsdi3${vrDSK^`%A+~LQb`knm^9%ob-W{
z46vf`snT@L%W~>Cwb`s%-?{l9a}LOiS{6nlVkl!$p8+;77Y*cQ`Esgg$`wfjRgU*j
z^*Op-{fLg9l12qd#;9l?W06}du+;w&3M1f3#0wde;?W3qvYhcwa1lk(TXfVKt2{Tc
z)Qn%8Ose(4;i{;k(7DGorKs~T-v^j$2J1osu$Y6g&7Oh;qqS+#<W!cVPnuUZaC4|}
zqiDuwxnkUINH4vDpx{onTuJ6<B)NOP{9hq|sM0KiQu~{rs0@9i;0{tBLvM9)@TlWT
zG->m5u6;lj>0EliRxm^}FLS+V*JW0kzyRT?h1y}98WV3<3}tWHYo-%&PAvu$k8o;b
z_S(g8@p=8%Ji0t(-OgV&bb3Q9?};v4>tVX2(uWPPh1|LA8fxj>^@ap&O%OQSYGnQX
e+x6<r?u`%6(5GXxx^`>t`_947hkMoG;N&+nCG$!E

diff --git a/xls2ddl/tmpls.py b/xls2ddl/tmpls.py
index ade5126..7251921 100644
--- a/xls2ddl/tmpls.py
+++ b/xls2ddl/tmpls.py
@@ -3,35 +3,6 @@ data_browser_tmpl = """
 	"widgettype":"VBox",
 	"options":{"height":"100%","width":"100%"},
 	"subwidgets":[
-{% if data_filter and data_filter.fields %}
-{
-	"widgettype":"InlineForm",
-	"id":"{{tblname}}_search",
-	"options":{
-		"css":"card",
-		"padding":"8px",
-		"show_label":false,
-		"submit_label":"搜索",
-		"submit_css":"primary",
-		"fields":[
-{%- for f in data_filter.fields %}
-{%- if f.uitype == 'code' %}
-			{{json.dumps(filter_fields[loop.index0], ensure_ascii=False)}}{% if not loop.last %},{% endif %}
-{%- else %}
-			{"name":"{{f.field}}","uitype":"{{f.uitype}}","placeholder":"{{f.title}}","cwidth":15}{% if not loop.last %},{% endif %}
-{%- endif %}
-{%- endfor %}
-		]
-	},
-	"binds":[{
-		"wid":"self",
-		"event":"submit",
-		"actiontype":"script",
-		"target":"app.{{tblname}}_tbl",
-		"script":"var tbl = bricks.getWidgetById('app.{{tblname}}_tbl'); if(tbl) await tbl.render(params);"
-	}]
-},
-{% endif %}
 {
 	"id":"{{tblname}}_tbl",
 	"widgettype":"Tabular",
@@ -104,6 +75,14 @@ data_browser_tmpl = """
 {% endif %}
 {% if data_filter %}
 		"data_filter":{{json.dumps(data_filter, indent=4, ensure_ascii=False)}},
+		"search_form":{
+			"css":"card",
+			"padding":"8px",
+			"show_label":false,
+			"submit_label":"搜索",
+			"submit_css":"primary",
+			"fields":{{json.dumps(filter_fields, indent=4, ensure_ascii=False)}}
+		},
 {% endif %}
 {% if filter_labels %}
 		"filter_labels":{{json.dumps(filter_labels, indent=4, ensure_ascii=False)}},