diff --git a/datagear-web/src/main/webapp/WEB-INF/jsp/data/include/data_page_obj_searchform_html.jsp b/datagear-web/src/main/webapp/WEB-INF/jsp/data/include/data_page_obj_searchform_html.jsp
index 62ad2dc0..a964af17 100644
--- a/datagear-web/src/main/webapp/WEB-INF/jsp/data/include/data_page_obj_searchform_html.jsp
+++ b/datagear-web/src/main/webapp/WEB-INF/jsp/data/include/data_page_obj_searchform_html.jsp
@@ -9,14 +9,14 @@
 --%>
 <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="<fmt:message key='data.likeTitle' />"></span><input name="keyword" type="text" class="ui-widget ui-widget-content input-keyword" tabindex="2" />
+	<span class="ui-icon like-switch-icon ui-icon-radio-off" title="<fmt:message key='data.likeTitle' />"></span><div class="keyword-input-parent"><input name="keyword" type="text" class="ui-widget ui-widget-content keyword-input" tabindex="2" /></div>
 	<input type="hidden" name="notLike" value="" />
 	</div>
 	<div class="search-condition-icon-parent" title="<fmt:message key='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>
-	<input name="submit" type="submit" value="<fmt:message key='query' />" tabindex="3" />
+	<button type="submit" class="ui-button ui-corner-all ui-widget" tabindex="3"><fmt:message key='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">
diff --git a/datagear-web/src/main/webapp/WEB-INF/jsp/data/include/data_page_obj_searchform_js.jsp b/datagear-web/src/main/webapp/WEB-INF/jsp/data/include/data_page_obj_searchform_js.jsp
index 0c1718b3..30d0cb20 100644
--- a/datagear-web/src/main/webapp/WEB-INF/jsp/data/include/data_page_obj_searchform_js.jsp
+++ b/datagear-web/src/main/webapp/WEB-INF/jsp/data/include/data_page_obj_searchform_js.jsp
@@ -261,6 +261,7 @@ pageObj.conditionAutocompleteSource = undefined;
 	});
 	
 	pageObj.conditionPanel.draggable({ handle: ".condition-panel-title-bar" });
+	pageObj.conditionPanel.resizable();
 	
 	pageObj.element("input:submit", pageObj.searchForm).button();
 	pageObj.updateNotLikeKeyword();
diff --git a/datagear-web/src/main/webapp/static/theme/common.css b/datagear-web/src/main/webapp/static/theme/common.css
index 64482433..5191a62f 100644
--- a/datagear-web/src/main/webapp/static/theme/common.css
+++ b/datagear-web/src/main/webapp/static/theme/common.css
@@ -714,21 +714,33 @@ table.dataTable tbody tr.selected .checkbox .ui-icon{
 
 /*查询表单*/
 .search-form{
+	position: relative;
 }
 .search-form .keyword-widget{
 	display: inline-block;
+	width: 70%;
+	height: 2em;
 	margin-left: 0.1em;
+	vertical-align: middle;
+	position: relative;
 }
-.search-form .keyword-widget .like-switch-icon{
-	width: 12px;
-	margin-left: -3px;
+.search-form .keyword-widget .like-switch-icon.ui-icon{
 	cursor: pointer;
+	margin-top: 0.2em;
 }
-.search-form .keyword-widget .input-keyword{
-	width: 15em;
-	height: 1.8em;
-	margin-left: 2px;
-	border: none;
+.search-form .keyword-widget .keyword-input-parent{
+	position: absolute;
+	left: 18px;
+	right: 0;
+	top: 0;
+	bottom: 0;
+}
+.search-form .keyword-widget .keyword-input-parent .keyword-input{
+    width: 100%;
+    height: 100%;
+    border: 0;
+    padding: 0 0;
+    margin: 0 0;
 }
 .search-form .search-condition-icon-parent{
 	position: relative;
@@ -745,41 +757,57 @@ table.dataTable tbody tr.selected .checkbox .ui-icon{
 }
 .search-form .condition-panel-parent{
 	position: relative;
+	width: 90%;
 }
 .search-form .condition-panel-parent .condition-panel{
-	position: absolute;
+	display: inline-block;
+	width: 100%;
+	height: 9em;
 	z-index: 2;
-	display: none;
 	margin-left: 0.1em;
-	padding: 0.2em 0.2em;
+	padding: 2px 2px;
+	position: relative;
 }
 .search-form .condition-panel-parent .condition-panel .condition-panel-title-bar{
 	text-align: right;
 	height: 16px;
 	cursor: move;
 }
+.search-form .condition-panel-parent .condition-panel .condition-panel-title-bar .condition-panel-resetpos-icon.ui-icon{
+	margin-top: -0.6em;
+}
 .search-form .condition-panel-parent .condition-panel .ui-icon{
-	margin: 0 0;
 	cursor: pointer;
 }
 .search-form .condition-panel-parent .condition-panel .condition-parent{
-	position: relative;
+	position: absolute;
+	top: 21px;
+	bottom: 21px;
+	left: 3px;
+	right: 3px;
+	display: inline-block;
 }
 .search-form .condition-panel-parent .condition-panel .condition-parent textarea{
-	width: 25em;
-	height: 6em;
+	display: inline-block;
+	width: 100%;
+	height: 100%;
+	box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	resize: none;
 	position: relative;
-	margin-top: 2px;
-	border-width: 0;
-	border-bottom-width: 1px;
-	/*resize: none;*/
 }
 .search-form .condition-panel-parent .condition-panel .condition-action{
+	position: absolute;
+	left: 2px;
+	bottom: 2px;
+	right: 25px;
 	height: 16px;
 	font-size: 8px;
 }
-.search-form .condition-panel-parent .condition-panel .condition-panel-submit-icon{
+.search-form .condition-panel-parent .condition-panel .condition-panel-submit-icon.ui-icon{
 	float: right;
+	margin-top: 0;
 }
 .search-form .ui-autocomplete{
     max-height: 8em;
@@ -795,21 +823,22 @@ table.dataTable tbody tr.selected .checkbox .ui-icon{
 	width: 100%;
 	height: 100%;
 	box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
 }
 .page-data-grid .head{
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 100%;
 	height: 2.5em;
-	display: inline-block;
 	padding: .25em 0;
 }
 .page-data-grid .head .search{
-	float:left;
+	display: inline-block;
+	width: 41%;
 }
 .page-data-grid .head .operation{
+	display: inline-block;
 	float: right;
+	width: 57%;
+	text-align: right;
 }
 .page-data-grid .content{
 	position: absolute;