diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/about.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/about.ftl
index d3ac3db9..43de9223 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/about.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/about.ftl
@@ -15,6 +15,7 @@
 <title><#include "include/html_title_app_name.ftl"><@spring.message code='about.about' /></title>
 </head>
 <body>
+<#include "include/page_js_obj.ftl" >
 <div id="${pageId}" class="page page-about">
 	<form id="${pageId}-form">
 		<div class="form-content">
@@ -53,7 +54,6 @@
 		</div>
 	</form>
 </div>
-<#include "include/page_js_obj.ftl" >
 <#include "include/page_obj_form.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/analysis/analysisProject/analysisProject_form.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/analysis/analysisProject/analysisProject_form.ftl
index 252c3f87..f220ffe6 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/analysis/analysisProject/analysisProject_form.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/analysis/analysisProject/analysisProject_form.ftl
@@ -22,6 +22,7 @@ readonly 是否只读操作，允许为null
 <title><#include "../../include/html_title_app_name.ftl"><@spring.message code='${titleMessageKey}' /></title>
 </head>
 <body>
+<#include "../../include/page_js_obj.ftl" >
 <div id="${pageId}" class="page-form page-form-analysisProject">
 	<form id="${pageId}-form" action="${contextPath}/analysis/project/${formAction}" method="POST">
 		<div class="form-head"></div>
@@ -51,7 +52,6 @@ readonly 是否只读操作，允许为null
 		</div>
 	</form>
 </div>
-<#include "../../include/page_js_obj.ftl" >
 <#include "../../include/page_obj_form.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/analysis/chartPlugin/chartPlugin_grid.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/analysis/chartPlugin/chartPlugin_grid.ftl
index 5e846b41..66c93fd2 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/analysis/chartPlugin/chartPlugin_grid.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/analysis/chartPlugin/chartPlugin_grid.ftl
@@ -22,10 +22,11 @@ selectOperation 是否选择操作，允许为null
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "../../include/page_js_obj.ftl">
 <div id="${pageId}" class="page-grid page-grid-hidden-foot page-grid-chartPlugin">
 	<div class="head">
 		<div class="search">
-			<#include "../../include/page_obj_searchform.html.ftl">
+			<#include "../../include/page_obj_searchform.ftl">
 		</div>
 		<div class="operation">
 			<#if selectOperation>
@@ -51,8 +52,6 @@ selectOperation 是否选择操作，允许为null
 <#if !isAjaxRequest>
 </div>
 </#if>
-<#include "../../include/page_js_obj.ftl">
-<#include "../../include/page_obj_searchform_js.ftl">
 <#include "../../include/page_obj_grid.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/analysis/chartPlugin/chartPlugin_select.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/analysis/chartPlugin/chartPlugin_select.ftl
index 9282c303..530d4d42 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/analysis/chartPlugin/chartPlugin_select.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/analysis/chartPlugin/chartPlugin_select.ftl
@@ -17,10 +17,11 @@
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "../../include/page_js_obj.ftl">
 <div id="${pageId}" class="page-grid page-grid-chartPlugin-select">
 	<div class="head">
 		<div class="search">
-			<#include "../../include/page_obj_searchform.html.ftl">
+			<#include "../../include/page_obj_searchform.ftl">
 		</div>
 		<div class="operation">
 			<input name="confirmButton" type="button" class="recommended" value="<@spring.message code='confirm' />" />
@@ -42,8 +43,6 @@
 <#if !isAjaxRequest>
 </div>
 </#if>
-<#include "../../include/page_js_obj.ftl">
-<#include "../../include/page_obj_searchform_js.ftl">
 <script type="text/javascript">
 (function(po)
 {
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/analysis/chartPlugin/chartPlugin_upload.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/analysis/chartPlugin/chartPlugin_upload.ftl
index a2a988bf..5df23036 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/analysis/chartPlugin/chartPlugin_upload.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/analysis/chartPlugin/chartPlugin_upload.ftl
@@ -14,6 +14,7 @@
 <title><#include "../../include/html_title_app_name.ftl"><@spring.message code='chartPlugin.uploadChartPlugin' /></title>
 </head>
 <body>
+<#include "../../include/page_js_obj.ftl" >
 <div id="${pageId}" class="page-form page-form-uploadChartPlugin">
 	<form id="${pageId}-form" action="${contextPath}/analysis/chartPlugin/saveUpload" method="POST">
 		<div class="form-head"></div>
@@ -45,7 +46,6 @@
 		</div>
 	</form>
 </div>
-<#include "../../include/page_js_obj.ftl" >
 <#include "../../include/page_obj_form.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/analysis/include/analysisProjectAware_grid_search.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/analysis/include/analysisProjectAware_grid_search.ftl
index 20ee1259..42a5c34a 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/analysis/include/analysisProjectAware_grid_search.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/analysis/include/analysisProjectAware_grid_search.ftl
@@ -10,7 +10,7 @@
 数据分析项目相关表格页：扩展数据分析项目查询参数
 
 依赖：
-page_obj_searchform_js.ftl 或者 page_obj_searchform_data_filter.ftl
+page_obj_searchform.ftl 或者 page_obj_searchform_data_filter.ftl
 -->
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/authorization/authorization_form.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/authorization/authorization_form.ftl
index 6adeaad6..d8cab426 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/authorization/authorization_form.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/authorization/authorization_form.ftl
@@ -37,6 +37,7 @@ readonly 是否只读操作，允许为null
 <title><#include "../include/html_title_app_name.ftl"><@spring.message code='${titleMessageKey}' /> - <@spring.message code='${resourceMeta.resouceTypeLabel}' /></title>
 </head>
 <body>
+<#include "../include/page_js_obj.ftl" >
 <div id="${pageId}" class="page-form page-form-authorization">
 	<form id="${pageId}-form" action="${contextPath}/authorization/${resourceMeta.resourceType}/${formAction}" method="POST">
 		<div class="form-head"></div>
@@ -215,7 +216,6 @@ readonly 是否只读操作，允许为null
 		</div>
 	</form>
 </div>
-<#include "../include/page_js_obj.ftl" >
 <#include "../include/page_obj_form.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/authorization/authorization_grid.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/authorization/authorization_grid.ftl
index 47b9ae33..3303d6a0 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/authorization/authorization_grid.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/authorization/authorization_grid.ftl
@@ -23,10 +23,11 @@ ResourceMeta resourceMeta 资源元信息，不允许null
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "../include/page_js_obj.ftl">
 <div id="${pageId}" class="page-grid page-grid-hidden-foot page-grid-authorization">
 	<div class="head">
 		<div class="search">
-			<#include "../include/page_obj_searchform.html.ftl">
+			<#include "../include/page_obj_searchform.ftl">
 		</div>
 		<div class="operation">
 			<input name="addButton" type="button" value="<@spring.message code='add' />" />
@@ -48,8 +49,6 @@ ResourceMeta resourceMeta 资源元信息，不允许null
 <#if !isAjaxRequest>
 </div>
 </#if>
-<#include "../include/page_js_obj.ftl">
-<#include "../include/page_obj_searchform_js.ftl">
 <#include "../include/page_obj_grid.ftl">
 <#include "../include/page_obj_data_permission.ftl">
 <script type="text/javascript">
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/changelog.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/changelog.ftl
index e3584255..f85912e8 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/changelog.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/changelog.ftl
@@ -14,6 +14,7 @@
 <title><#include "include/html_title_app_name.ftl"><@spring.message code='changelog.changelog' /></title>
 </head>
 <body>
+<#include "include/page_js_obj.ftl" >
 <div id="${pageId}">
 	<#if !isAjaxRequest>
 	<div class="main-page-head">
@@ -54,7 +55,6 @@
 		</form>
 	</div>
 </div>
-<#include "include/page_js_obj.ftl" >
 <#include "include/page_obj_form.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/dashboardGlobalRes/dashboardGlobalRes_form.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/dashboardGlobalRes/dashboardGlobalRes_form.ftl
index 0ba6e829..c8dc9a08 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/dashboardGlobalRes/dashboardGlobalRes_form.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/dashboardGlobalRes/dashboardGlobalRes_form.ftl
@@ -21,6 +21,7 @@ readonly 是否只读操作，允许为null
 <title><#include "../include/html_title_app_name.ftl"><@spring.message code='${titleMessageKey}' /></title>
 </head>
 <body>
+<#include "../include/page_js_obj.ftl" >
 <div id="${pageId}" class="page-form page-form-dashboardGlobalResContent">
 	<form id="${pageId}-form" action="${contextPath}/dashboardGlobalRes/${formAction}" method="POST">
 		<input type="hidden" name="initSavePath" value="${resourcePath}" />
@@ -57,7 +58,6 @@ readonly 是否只读操作，允许为null
 		</div>
 	</form>
 </div>
-<#include "../include/page_js_obj.ftl" >
 <#include "../include/page_obj_form.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/dashboardGlobalRes/dashboardGlobalRes_grid.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/dashboardGlobalRes/dashboardGlobalRes_grid.ftl
index b8a5f07e..4d6071e6 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/dashboardGlobalRes/dashboardGlobalRes_grid.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/dashboardGlobalRes/dashboardGlobalRes_grid.ftl
@@ -22,10 +22,11 @@ selectOperation 是否选择操作，允许为null
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "../include/page_js_obj.ftl">
 <div id="${pageId}" class="page-grid page-grid-hidden-foot page-grid-dashboardGlobalRes">
 	<div class="head">
 		<div class="search">
-			<#include "../include/page_obj_searchform.html.ftl">
+			<#include "../include/page_obj_searchform.ftl">
 		</div>
 		<div class="operation">
 			<#if selectOperation>
@@ -54,8 +55,6 @@ selectOperation 是否选择操作，允许为null
 <#if !isAjaxRequest>
 </div>
 </#if>
-<#include "../include/page_js_obj.ftl">
-<#include "../include/page_obj_searchform_js.ftl">
 <#include "../include/page_obj_grid.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/dashboardGlobalRes/dashboardGlobalRes_upload.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/dashboardGlobalRes/dashboardGlobalRes_upload.ftl
index 72a99c45..295ab687 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/dashboardGlobalRes/dashboardGlobalRes_upload.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/dashboardGlobalRes/dashboardGlobalRes_upload.ftl
@@ -21,6 +21,7 @@ readonly 是否只读操作，允许为null
 <title><#include "../include/html_title_app_name.ftl"><@spring.message code='${titleMessageKey}' /></title>
 </head>
 <body>
+<#include "../include/page_js_obj.ftl" >
 <div id="${pageId}" class="page-form page-form-dashboardGlobalRes">
 	<form id="${pageId}-form" action="${contextPath}/dashboardGlobalRes/${formAction}" method="POST">
 		<div class="form-head"></div>
@@ -75,7 +76,6 @@ readonly 是否只读操作，允许为null
 		</div>
 	</form>
 </div>
-<#include "../include/page_js_obj.ftl" >
 <#include "../include/page_obj_form.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/data/data_form.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/data/data_form.ftl
index 8a0b8291..61cac488 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/data/data_form.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/data/data_form.ftl
@@ -47,6 +47,7 @@ boolean batchSet 是否开启批量执行功能，默认为false
 </title>
 </head>
 <body>
+<#include "include/data_page_obj.ftl">
 <div id="${pageId}" class="page-form">
 	<div class="head">
 	</div>
@@ -57,7 +58,6 @@ boolean batchSet 是否开启批量执行功能，默认为false
 	<div class="foot">
 	</div>
 </div>
-<#include "include/data_page_obj.ftl">
 <#include "include/data_page_obj_form.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/data/data_grid.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/data/data_grid.ftl
index a6edd8d4..6e7521a4 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/data/data_grid.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/data/data_grid.ftl
@@ -48,10 +48,11 @@ boolean readonly 是否只读操作，默认为false
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "include/data_page_obj.ftl">
 <div id="${pageId}" class="page-grid page-grid-query">
 	<div class="head">
 		<div class="search">
-			<#include "include/data_page_obj_searchform_html.ftl">
+			<#include "include/data_page_obj_searchform.ftl">
 		</div>
 		<div class="operation">
 			<#if selectOperation>
@@ -88,8 +89,6 @@ boolean readonly 是否只读操作，默认为false
 <#if !isAjaxRequest>
 </div>
 </#if>
-<#include "include/data_page_obj.ftl">
-<#include "include/data_page_obj_searchform_js.ftl">
 <#include "../include/page_obj_pagination.ftl">
 <#include "include/data_page_obj_grid.ftl">
 <#if !readonly>
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/data/include/data_page_obj_searchform_js.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/data/include/data_page_obj_searchform.ftl
similarity index 76%
rename from datagear-web/src/main/resources/org/datagear/web/templates/data/include/data_page_obj_searchform_js.ftl
rename to datagear-web/src/main/resources/org/datagear/web/templates/data/include/data_page_obj_searchform.ftl
index 0fdce977..f2cf729b 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/data/include/data_page_obj_searchform_js.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/data/include/data_page_obj_searchform.ftl
@@ -7,11 +7,10 @@
  *
 -->
 <#--
-查询表单JS片段。
+查询表单片段。
 
 依赖：
 data_page_obj.ftl
-data_page_obj_searchform_html.ftl
 
 变量：
 //查询回调函数，不允许为null，格式为：function(searchParam){}
@@ -19,6 +18,31 @@ po.search = undefined;
 //查询条件autocomplete初始数据，不允许为null
 po.conditionAutocompleteSource = undefined;
 -->
+<form id="${pageId}-searchForm" class="search-form" action="#" tabindex="0">
+	<div class="ui-widget ui-widget-content keyword-widget">
+	<span class="ui-icon like-switch-icon ui-icon-radio-off" title="<@spring.message code='data.likeTitle' />"></span><div class="keyword-input-parent"><input name="keyword" type="text" class="ui-widget ui-widget-content keyword-input" tabindex="2" title="<@spring.message code='data.keywordTitle' />" /></div>
+	<input type="hidden" name="notLike" value="" />
+	</div>
+	<div class="search-condition-icon-parent" title="<@spring.message code='data.conditionPanelWithShortcut' />">
+		<span class="ui-icon ui-icon-caret-1-s search-condition-icon"></span>
+		<span class="ui-icon ui-icon-bullet search-condition-icon-tip"></span>
+	</div>
+	<button type="submit" class="ui-button ui-corner-all ui-widget" tabindex="3"><@spring.message code='query' /></button>
+	<div class="condition-panel-parent">
+		<div class="ui-widget ui-widget-content ui-widget-shadow condition-panel" tabindex="0">
+			<div class="ui-corner-all ui-widget-header ui-helper-clearfix ui-draggable-handle condition-panel-title-bar">
+				<span class="ui-icon ui-icon-arrowthickstop-1-n condition-panel-resetpos-icon" title="<@spring.message code='restoration' />"></span>
+			</div>
+			<div class="condition-parent">
+				<textarea name="condition" tabindex="5" class="ui-widget ui-widget-content" title="<@spring.message code='data.conditionTitle' />"></textarea>
+			</div>
+			<div class="condition-action">
+				<span class="ui-icon ui-icon-trash condition-panel-clear-icon" title="<@spring.message code='data.clearWithShortcut' />"></span>
+				<span class="ui-icon ui-icon-search condition-panel-submit-icon" title="<@spring.message code='data.queryWithShortcut' />"></span>
+			</div>
+		</div>
+	</div>
+</form>
 <script type="text/javascript">
 (function(po)
 {
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/data/include/data_page_obj_searchform_html.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/data/include/data_page_obj_searchform_html.ftl
deleted file mode 100644
index 9f79d075..00000000
--- a/datagear-web/src/main/resources/org/datagear/web/templates/data/include/data_page_obj_searchform_html.ftl
+++ /dev/null
@@ -1,36 +0,0 @@
-<#--
- *
- * Copyright 2018 datagear.tech
- *
- * Licensed under the LGPLv3 license:
- * http://www.gnu.org/licenses/lgpl-3.0.html
- *
--->
-<#--
-查询表单HTML片段。
--->
-<form id="${pageId}-searchForm" class="search-form" action="#" tabindex="0">
-	<div class="ui-widget ui-widget-content keyword-widget">
-	<span class="ui-icon like-switch-icon ui-icon-radio-off" title="<@spring.message code='data.likeTitle' />"></span><div class="keyword-input-parent"><input name="keyword" type="text" class="ui-widget ui-widget-content keyword-input" tabindex="2" title="<@spring.message code='data.keywordTitle' />" /></div>
-	<input type="hidden" name="notLike" value="" />
-	</div>
-	<div class="search-condition-icon-parent" title="<@spring.message code='data.conditionPanelWithShortcut' />">
-		<span class="ui-icon ui-icon-caret-1-s search-condition-icon"></span>
-		<span class="ui-icon ui-icon-bullet search-condition-icon-tip"></span>
-	</div>
-	<button type="submit" class="ui-button ui-corner-all ui-widget" tabindex="3"><@spring.message code='query' /></button>
-	<div class="condition-panel-parent">
-		<div class="ui-widget ui-widget-content ui-widget-shadow condition-panel" tabindex="0">
-			<div class="ui-corner-all ui-widget-header ui-helper-clearfix ui-draggable-handle condition-panel-title-bar">
-				<span class="ui-icon ui-icon-arrowthickstop-1-n condition-panel-resetpos-icon" title="<@spring.message code='restoration' />"></span>
-			</div>
-			<div class="condition-parent">
-				<textarea name="condition" tabindex="5" class="ui-widget ui-widget-content" title="<@spring.message code='data.conditionTitle' />"></textarea>
-			</div>
-			<div class="condition-action">
-				<span class="ui-icon ui-icon-trash condition-panel-clear-icon" title="<@spring.message code='data.clearWithShortcut' />"></span>
-				<span class="ui-icon ui-icon-search condition-panel-submit-icon" title="<@spring.message code='data.queryWithShortcut' />"></span>
-			</div>
-		</div>
-	</div>
-</form>
\ No newline at end of file
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/dataSetResDirectory/dataSetResDirectory_form.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/dataSetResDirectory/dataSetResDirectory_form.ftl
index cb84b5a1..52f9a201 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/dataSetResDirectory/dataSetResDirectory_form.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/dataSetResDirectory/dataSetResDirectory_form.ftl
@@ -22,6 +22,7 @@ readonly 是否只读操作，允许为null
 <title><#include "../include/html_title_app_name.ftl"><@spring.message code='${titleMessageKey}' /></title>
 </head>
 <body>
+<#include "../include/page_js_obj.ftl" >
 <div id="${pageId}" class="page-form page-form-dataSetResDirectory">
 	<form id="${pageId}-form" action="${contextPath}/dataSetResDirectory/${formAction}" method="POST">
 		<div class="form-head"></div>
@@ -53,7 +54,6 @@ readonly 是否只读操作，允许为null
 		</div>
 	</form>
 </div>
-<#include "../include/page_js_obj.ftl" >
 <#include "../include/page_obj_form.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/dataSetResDirectory/dataSetResDirectory_grid.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/dataSetResDirectory/dataSetResDirectory_grid.ftl
index 2656a3b9..b3e684c5 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/dataSetResDirectory/dataSetResDirectory_grid.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/dataSetResDirectory/dataSetResDirectory_grid.ftl
@@ -27,7 +27,7 @@ selectOperation 是否选择操作，允许为null
 <div id="${pageId}" class="page-grid page-grid-dataSetResDirectory">
 	<div class="head">
 		<div class="search search-dataSetResDirectory">
-			<#include "../include/page_obj_searchform.html.ftl">
+			<#include "../include/page_obj_searchform.ftl">
 		</div>
 		<div class="operation">
 			<#if selectOperation>
@@ -57,7 +57,6 @@ selectOperation 是否选择操作，允许为null
 <#if !isAjaxRequest>
 </div>
 </#if>
-<#include "../include/page_obj_searchform_js.ftl">
 <#include "../include/page_obj_pagination.ftl">
 <#include "../include/page_obj_grid.ftl">
 <#include "../include/page_obj_data_permission.ftl" >
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/export.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/export.ftl
index 8accba36..8247aec0 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/export.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/export.ftl
@@ -26,6 +26,7 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "../include/page_js_obj.ftl">
 <div id="${pageId}" class="page-dataexchange-type page-dataexport-type">
 	<div class="head">
 	</div>
@@ -96,8 +97,6 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 </div>
 </#if>
-
-<#include "../include/page_js_obj.ftl">
 <script type="text/javascript">
 (function(po)
 {
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/export_csv.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/export_csv.ftl
index afe236aa..fb4b9787 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/export_csv.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/export_csv.ftl
@@ -26,6 +26,7 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "../include/page_js_obj.ftl">
 <div id="${pageId}" class="page-dataexchange page-dataexport-text page-dataexport-csv">
 	<div class="head">
 		<@spring.message code='dataExport.exportCsvData' />
@@ -105,8 +106,6 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 </div>
 </#if>
-
-<#include "../include/page_js_obj.ftl">
 <#include "../include/page_obj_grid.ftl">
 <#include "../include/page_obj_format_time.ftl" >
 <#include "include/dataExchange_js.ftl" >
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/export_excel.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/export_excel.ftl
index a8fe32e0..ef25f7ea 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/export_excel.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/export_excel.ftl
@@ -26,6 +26,7 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "../include/page_js_obj.ftl">
 <div id="${pageId}" class="page-dataexchange page-dataexport-text page-dataexport-excel">
 	<div class="head">
 		<@spring.message code='dataExport.exportExcelData' />
@@ -107,8 +108,6 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 </div>
 </#if>
-
-<#include "../include/page_js_obj.ftl">
 <#include "../include/page_obj_grid.ftl">
 <#include "../include/page_obj_format_time.ftl" >
 <#include "include/dataExchange_js.ftl" >
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/export_json.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/export_json.ftl
index 3f742627..94eb1787 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/export_json.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/export_json.ftl
@@ -26,6 +26,7 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "../include/page_js_obj.ftl">
 <div id="${pageId}" class="page-dataexchange page-dataexport-text page-dataexport-json">
 	<div class="head">
 		<@spring.message code='dataExport.exportJsonData' />
@@ -116,8 +117,6 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 </div>
 </#if>
-
-<#include "../include/page_js_obj.ftl">
 <#include "../include/page_obj_grid.ftl">
 <#include "../include/page_obj_format_time.ftl" >
 <#include "include/dataExchange_js.ftl" >
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/export_sql.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/export_sql.ftl
index e0ba7307..b19eb9fa 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/export_sql.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/export_sql.ftl
@@ -26,6 +26,7 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "../include/page_js_obj.ftl">
 <div id="${pageId}" class="page-dataexchange page-dataexport-text page-dataexport-sql">
 	<div class="head">
 		<@spring.message code='dataExport.exportSqlData' />
@@ -116,8 +117,6 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 </div>
 </#if>
-
-<#include "../include/page_js_obj.ftl">
 <#include "../include/page_obj_grid.ftl">
 <#include "../include/page_obj_format_time.ftl" >
 <#include "include/dataExchange_js.ftl" >
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import.ftl
index df75f62b..0e24bc43 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import.ftl
@@ -26,6 +26,7 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "../include/page_js_obj.ftl">
 <div id="${pageId}" class="page-dataexchange-type page-dataimport-type">
 	<div class="head">
 	</div>
@@ -101,8 +102,6 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 </div>
 </#if>
-
-<#include "../include/page_js_obj.ftl">
 <script type="text/javascript">
 (function(po)
 {
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import_csv.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import_csv.ftl
index 621e8c1b..b379b418 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import_csv.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import_csv.ftl
@@ -26,6 +26,7 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "../include/page_js_obj.ftl">
 <div id="${pageId}" class="page-dataexchange page-dataimport-text page-dataimport-csv">
 	<div class="head">
 		<@spring.message code='dataImport.importCsvData' />
@@ -126,8 +127,6 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 </div>
 </#if>
-
-<#include "../include/page_js_obj.ftl">
 <#include "../include/page_obj_grid.ftl">
 <#include "../include/page_obj_format_time.ftl" >
 <#include "include/dataExchange_js.ftl" >
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import_db.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import_db.ftl
index 5e755387..9a451ba2 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import_db.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import_db.ftl
@@ -26,6 +26,7 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "../include/page_js_obj.ftl">
 <div id="${pageId}" class="page-dataimport">
 	<div class="head">
 	</div>
@@ -53,8 +54,6 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 </div>
 </#if>
-
-<#include "../include/page_js_obj.ftl">
 <script type="text/javascript">
 (function(po)
 {
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import_excel.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import_excel.ftl
index eb972fce..be144d69 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import_excel.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import_excel.ftl
@@ -26,6 +26,7 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "../include/page_js_obj.ftl">
 <div id="${pageId}" class="page-dataexchange page-dataimport-text page-dataimport-excel">
 	<div class="head">
 		<@spring.message code='dataImport.importExcelData' />
@@ -128,8 +129,6 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 </div>
 </#if>
-
-<#include "../include/page_js_obj.ftl">
 <#include "../include/page_obj_grid.ftl">
 <#include "../include/page_obj_format_time.ftl" >
 <#include "include/dataExchange_js.ftl" >
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import_json.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import_json.ftl
index 4dffc54e..5f296b86 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import_json.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import_json.ftl
@@ -26,6 +26,7 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "../include/page_js_obj.ftl">
 <div id="${pageId}" class="page-dataexchange page-dataimport-text page-dataimport-json">
 	<div class="head">
 		<@spring.message code='dataImport.importJsonData' />
@@ -137,8 +138,6 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 </div>
 </#if>
-
-<#include "../include/page_js_obj.ftl">
 <#include "../include/page_obj_grid.ftl">
 <#include "../include/page_obj_format_time.ftl" >
 <#include "include/dataExchange_js.ftl" >
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import_sql.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import_sql.ftl
index ed6ce747..2cc589c3 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import_sql.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/import_sql.ftl
@@ -26,6 +26,7 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "../include/page_js_obj.ftl">
 <div id="${pageId}" class="page-dataexchange page-dataimport-text page-dataimport-csv">
 	<div class="head">
 		<@spring.message code='dataImport.importSqlData' />
@@ -102,8 +103,6 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 </div>
 </#if>
-
-<#include "../include/page_js_obj.ftl">
 <#include "../include/page_obj_grid.ftl">
 <#include "../include/page_obj_format_time.ftl" >
 <#include "include/dataExchange_js.ftl" >
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/view_log.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/view_log.ftl
index c74958dc..fe46baae 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/view_log.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/dataexchange/view_log.ftl
@@ -26,6 +26,7 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "../include/page_js_obj.ftl">
 <div id="${pageId}" class="page-dataexchange-log">
 	<div class="head">
 	</div>
@@ -40,8 +41,6 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 </div>
 </#if>
-
-<#include "../include/page_js_obj.ftl">
 <script type="text/javascript">
 (function(po)
 {
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/driverEntity/driverEntity_form.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/driverEntity/driverEntity_form.ftl
index 6e4390c1..72a53d1f 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/driverEntity/driverEntity_form.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/driverEntity/driverEntity_form.ftl
@@ -21,6 +21,7 @@ readonly 是否只读操作，允许为null
 <title><#include "../include/html_title_app_name.ftl"><@spring.message code='${titleMessageKey}' /></title>
 </head>
 <body>
+<#include "../include/page_js_obj.ftl" >
 <div id="${pageId}" class="page-form page-form-driverEntity">
 	<form id="${pageId}-form" action="${contextPath}/driverEntity/${formAction}" method="POST">
 		<div class="form-head"></div>
@@ -87,7 +88,6 @@ readonly 是否只读操作，允许为null
 		</div>
 	</form>
 </div>
-<#include "../include/page_js_obj.ftl" >
 <#include "../include/page_obj_form.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/driverEntity/driverEntity_grid.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/driverEntity/driverEntity_grid.ftl
index 6c56704f..d090492a 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/driverEntity/driverEntity_grid.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/driverEntity/driverEntity_grid.ftl
@@ -22,10 +22,11 @@ selectOperation 是否选择操作，允许为null
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "../include/page_js_obj.ftl">
 <div id="${pageId}" class="page-grid page-grid-hidden-foot page-grid-driverEntity">
 	<div class="head">
 		<div class="search">
-			<#include "../include/page_obj_searchform.html.ftl">
+			<#include "../include/page_obj_searchform.ftl">
 		</div>
 		<div class="operation">
 			<#if selectOperation>
@@ -56,8 +57,6 @@ selectOperation 是否选择操作，允许为null
 <#if !isAjaxRequest>
 </div>
 </#if>
-<#include "../include/page_js_obj.ftl">
-<#include "../include/page_obj_searchform_js.ftl">
 <#include "../include/page_obj_grid.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/driverEntity/driverEntity_import.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/driverEntity/driverEntity_import.ftl
index 4fa2114d..59730603 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/driverEntity/driverEntity_import.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/driverEntity/driverEntity_import.ftl
@@ -14,6 +14,7 @@
 <title><#include "../include/html_title_app_name.ftl"><@spring.message code='driverEntity.importDriverEntity' /></title>
 </head>
 <body>
+<#include "../include/page_js_obj.ftl" >
 <div id="${pageId}" class="page-form page-form-driverEntityImport">
 	<form id="${pageId}-form" action="${contextPath}/driverEntity/saveImport" method="POST">
 		<div class="form-head"></div>
@@ -45,7 +46,6 @@
 		</div>
 	</form>
 </div>
-<#include "../include/page_js_obj.ftl" >
 <#include "../include/page_obj_form.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/include/page_obj_grid.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/include/page_obj_grid.ftl
index 1b08e03c..e984c447 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/include/page_obj_grid.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/include/page_obj_grid.ftl
@@ -61,7 +61,7 @@ page_js_obj.ftl
 	};
 	
 	/**
-	 * 集成data_page_obj_searchform_js.ftl的默认实现。
+	 * 集成page_obj_searchform.ftl的默认实现。
 	 */
 	po.search = function(searchParam)
 	{
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/include/page_obj_searchform.html.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/include/page_obj_searchform.ftl
similarity index 68%
rename from datagear-web/src/main/resources/org/datagear/web/templates/include/page_obj_searchform.html.ftl
rename to datagear-web/src/main/resources/org/datagear/web/templates/include/page_obj_searchform.ftl
index ba53a7f6..3af7c6cf 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/include/page_obj_searchform.html.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/include/page_obj_searchform.ftl
@@ -7,7 +7,14 @@
  *
 -->
 <#--
-查询表单HTML片段。
+查询表单片段。
+
+依赖：
+page_js_obj.ftl
+
+变量：
+//查询回调函数，不允许为null，格式为：function(searchParam){}
+po.search = undefined;
 -->
 <form id="${pageId}-searchForm" class="search-form" action="#">
 	<div class="ui-widget ui-widget-content keyword-widget simple">
@@ -17,3 +24,4 @@
 	</div>
 	<input name="submit" type="submit" value="<@spring.message code='query' />" />
 </form>
+<#include "page_obj_searchform_js.ftl">
\ No newline at end of file
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/include/page_obj_searchform_js.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/include/page_obj_searchform_js.ftl
index badc6884..5bf2f4cb 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/include/page_obj_searchform_js.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/include/page_obj_searchform_js.ftl
@@ -7,11 +7,10 @@
  *
 -->
 <#--
-查询表单JS片段。
+查询表单片段。
 
 依赖：
 page_js_obj.ftl
-page_obj_searchform_html.ftl
 
 变量：
 //查询回调函数，不允许为null，格式为：function(searchParam){}
@@ -29,7 +28,7 @@ po.search = undefined;
 		
 		return false;
 	});
-
+	
 	po.getSearchParam = function()
 	{
 		var param =
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/login.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/login.ftl
index b9808117..d2ef9961 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/login.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/login.ftl
@@ -14,6 +14,7 @@
 <title><#include "include/html_title_app_name.ftl"><@spring.message code='login.login' /></title>
 </head>
 <body>
+<#include "include/page_js_obj.ftl">
 <div id="${pageId}">
 	<div class="main-page-head">
 		<#include "include/html_logo.ftl">
@@ -58,7 +59,6 @@
 		</form>
 	</div>
 </div>
-<#include "include/page_js_obj.ftl">
 <#include "include/page_obj_form.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/register.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/register.ftl
index 37fb7aba..54a4caeb 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/register.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/register.ftl
@@ -14,6 +14,7 @@
 <title><#include "include/html_title_app_name.ftl"><@spring.message code='register.register' /></title>
 </head>
 <body>
+<#include "include/page_js_obj.ftl" >
 <div id="${pageId}">
 	<div class="main-page-head">
 		<#include "include/html_logo.ftl">
@@ -67,7 +68,6 @@
 		</form>
 	</div>
 </div>
-<#include "include/page_js_obj.ftl" >
 <#include "include/page_obj_form.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/reset_password.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/reset_password.ftl
index abbb619a..0f49a8ac 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/reset_password.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/reset_password.ftl
@@ -18,6 +18,7 @@
 <title><#include "include/html_title_app_name.ftl"><@spring.message code='resetPassword.resetPassword' /></title>
 </head>
 <body>
+<#include "include/page_js_obj.ftl">
 <div id="${pageId}">
 	<div class="main-page-head main-page-head-reset-passord">
 		<#include "include/html_logo.ftl">
@@ -106,7 +107,6 @@
 		</div>
 	</div>
 </div>
-<#include "include/page_js_obj.ftl">
 <#include "include/page_obj_form.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/role/role_form.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/role/role_form.ftl
index 0f9ad5b8..f7b5dafa 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/role/role_form.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/role/role_form.ftl
@@ -22,6 +22,7 @@ readonly 是否只读操作，允许为null
 <title><#include "../include/html_title_app_name.ftl"><@spring.message code='${titleMessageKey}' /></title>
 </head>
 <body>
+<#include "../include/page_js_obj.ftl" >
 <div id="${pageId}" class="page-form page-form-role">
 	<form id="${pageId}-form" action="${contextPath}/role/${formAction}" method="POST">
 		<div class="form-head"></div>
@@ -66,7 +67,6 @@ readonly 是否只读操作，允许为null
 		</div>
 	</form>
 </div>
-<#include "../include/page_js_obj.ftl" >
 <#include "../include/page_obj_form.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/role/role_grid.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/role/role_grid.ftl
index 339279c3..99def925 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/role/role_grid.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/role/role_grid.ftl
@@ -22,10 +22,11 @@ selectOperation 是否选择操作，允许为null
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "../include/page_js_obj.ftl">
 <div id="${pageId}" class="page-grid page-grid-role">
 	<div class="head">
 		<div class="search">
-			<#include "../include/page_obj_searchform.html.ftl">
+			<#include "../include/page_obj_searchform.ftl">
 		</div>
 		<div class="operation">
 			<#if selectOperation>
@@ -55,9 +56,7 @@ selectOperation 是否选择操作，允许为null
 <#if !isAjaxRequest>
 </div>
 </#if>
-<#include "../include/page_js_obj.ftl">
 <#include "../include/page_obj_pagination.ftl">
-<#include "../include/page_obj_searchform_js.ftl">
 <#include "../include/page_obj_grid.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/role/role_user_grid.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/role/role_user_grid.ftl
index 97961119..2b2b2b2d 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/role/role_user_grid.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/role/role_user_grid.ftl
@@ -17,10 +17,11 @@
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "../include/page_js_obj.ftl">
 <div id="${pageId}" class="page-grid page-grid-role-user">
 	<div class="head">
 		<div class="search">
-			<#include "../include/page_obj_searchform.html.ftl">
+			<#include "../include/page_obj_searchform.ftl">
 		</div>
 		<div class="operation">
 			<input name="addButton" type="button" value="<@spring.message code='add' />" />
@@ -40,9 +41,7 @@
 <#if !isAjaxRequest>
 </div>
 </#if>
-<#include "../include/page_js_obj.ftl">
 <#include "../include/page_obj_pagination.ftl">
-<#include "../include/page_obj_searchform_js.ftl">
 <#include "../include/page_obj_grid.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/schema/schema_build_url.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/schema/schema_build_url.ftl
index ed843f12..9a804a57 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/schema/schema_build_url.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/schema/schema_build_url.ftl
@@ -18,6 +18,7 @@ preview 是否是预览请求，允许为null
 <title><#include "../include/html_title_app_name.ftl"><@spring.message code='schema.schemaBuildUrl' /></title>
 </head>
 <body>
+<#include "../include/page_js_obj.ftl" >
 <div id="${pageId}" class="page-form page-form-buildSchemaUrl">
 	<div id="dbUrlBuilderScriptCode" style="display: none;">
 		${scriptCode!''}
@@ -70,7 +71,6 @@ preview 是否是预览请求，允许为null
 	<div class="url-preview"></div>
 	</#if>
 </div>
-<#include "../include/page_js_obj.ftl" >
 <#include "../include/page_obj_form.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/schema/schema_form.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/schema/schema_form.ftl
index 12c02b9e..8b34390b 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/schema/schema_form.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/schema/schema_form.ftl
@@ -21,6 +21,7 @@ readonly 是否只读操作，允许为null
 <title><#include "../include/html_title_app_name.ftl"><@spring.message code='${titleMessageKey}' /></title>
 </head>
 <body>
+<#include "../include/page_js_obj.ftl" >
 <div id="${pageId}" class="schema-form">
 	<form id="${pageId}-form" action="${contextPath}/schema/${formAction}" method="POST">
 		<div class="form-head"></div>
@@ -131,7 +132,6 @@ readonly 是否只读操作，允许为null
 		</div>
 	</form>
 </div>
-<#include "../include/page_js_obj.ftl" >
 <#include "../include/page_obj_form.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/schema/schema_grid.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/schema/schema_grid.ftl
index 0a251166..f578113d 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/schema/schema_grid.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/schema/schema_grid.ftl
@@ -24,10 +24,11 @@ boolean readonly 是否只读操作，默认为false
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "../include/page_js_obj.ftl">
 <div id="${pageId}" class="page-grid page-grid-hidden-foot page-grid-schema">
 	<div class="head">
 		<div class="search">
-			<#include "../include/page_obj_searchform.html.ftl">
+			<#include "../include/page_obj_searchform.ftl">
 		</div>
 		<div class="operation">
 			<#if selectOperation>
@@ -60,8 +61,6 @@ boolean readonly 是否只读操作，默认为false
 <#if !isAjaxRequest>
 </div>
 </#if>
-<#include "../include/page_js_obj.ftl">
-<#include "../include/page_obj_searchform_js.ftl">
 <#include "../include/page_obj_grid.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/schema_url_builder.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/schema_url_builder.ftl
index d64c8f1d..bf16b55c 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/schema_url_builder.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/schema_url_builder.ftl
@@ -14,6 +14,7 @@
 <title><#include "include/html_title_app_name.ftl"><@spring.message code='schemaUrlBuilder.schemaUrlBuilder' /></title>
 </head>
 <body>
+<#include "include/page_js_obj.ftl">
 <div id="${pageId}" class="page-form page-form-schemaUrlBuilder">
 	<form id="${pageId}-form" action="${contextPath}/schemaUrlBuilder/saveScriptCode" method="POST">
 		<div class="form-head"></div>
@@ -57,7 +58,6 @@
 		</div>
 	</form>
 </div>
-<#include "include/page_js_obj.ftl">
 <#include "include/page_obj_form.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/sqlpad/sqlpad.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/sqlpad/sqlpad.ftl
index 940a72f0..2b3dcccf 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/sqlpad/sqlpad.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/sqlpad/sqlpad.ftl
@@ -26,6 +26,7 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "../include/page_js_obj.ftl">
 <div id="${pageId}" class="page-sqlpad">
 	<div class="head button-operation">
 		<button id="executeSqlButton" class="ui-button ui-corner-all ui-widget ui-button-icon-only first" title="<@spring.message code='sqlpad.executeWithShortcut' />"><span class="ui-button-icon ui-icon ui-icon-play"></span><span class="ui-button-icon-space"> </span><@spring.message code='execute' /></button>
@@ -175,8 +176,6 @@ Schema schema 数据库，不允许为null
 <#if !isAjaxRequest>
 </div>
 </#if>
-
-<#include "../include/page_js_obj.ftl">
 <#include "../include/page_obj_tabs.ftl" >
 <#include "../include/page_obj_format_time.ftl" >
 <#include "../include/page_obj_data_permission.ftl">
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/user/user_form.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/user/user_form.ftl
index 5139ca49..3ede3ff6 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/user/user_form.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/user/user_form.ftl
@@ -22,6 +22,7 @@ readonly 是否只读操作，允许为null
 <title><#include "../include/html_title_app_name.ftl"><@spring.message code='${titleMessageKey}' /></title>
 </head>
 <body>
+<#include "../include/page_js_obj.ftl" >
 <div id="${pageId}" class="page-form page-form-user">
 	<form id="${pageId}-form" action="${contextPath}/user/${formAction}" method="POST">
 		<div class="form-head"></div>
@@ -87,7 +88,6 @@ readonly 是否只读操作，允许为null
 		</div>
 	</form>
 </div>
-<#include "../include/page_js_obj.ftl" >
 <#include "../include/page_obj_form.ftl">
 <script type="text/javascript">
 (function(po)
diff --git a/datagear-web/src/main/resources/org/datagear/web/templates/user/user_grid.ftl b/datagear-web/src/main/resources/org/datagear/web/templates/user/user_grid.ftl
index 5ff59b1e..d4345456 100644
--- a/datagear-web/src/main/resources/org/datagear/web/templates/user/user_grid.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/templates/user/user_grid.ftl
@@ -24,10 +24,11 @@ boolean readonly 是否只读操作，默认为false
 <#if !isAjaxRequest>
 <div class="fill-parent">
 </#if>
+<#include "../include/page_js_obj.ftl">
 <div id="${pageId}" class="page-grid page-grid-user">
 	<div class="head">
 		<div class="search">
-			<#include "../include/page_obj_searchform.html.ftl">
+			<#include "../include/page_obj_searchform.ftl">
 		</div>
 		<div class="operation">
 			<#if selectOperation>
@@ -56,9 +57,7 @@ boolean readonly 是否只读操作，默认为false
 <#if !isAjaxRequest>
 </div>
 </#if>
-<#include "../include/page_js_obj.ftl">
 <#include "../include/page_obj_pagination.ftl">
-<#include "../include/page_obj_searchform_js.ftl">
 <#include "../include/page_obj_grid.ftl">
 <script type="text/javascript">
 (function(po)
