From 336228b0689fc3b4323dc172c1a3a1edac94197c Mon Sep 17 00:00:00 2001 From: datagear Date: Mon, 18 Mar 2019 15:52:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=95=B0=E6=8D=AE=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E9=A1=B5=E5=9C=A8=E6=96=B0=E7=AA=97=E5=8F=A3=E4=B8=AD?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=90=8E=E6=B2=A1=E6=9C=89=E5=A1=AB=E6=BB=A1?= =?UTF-8?q?=E6=95=B4=E4=B8=AA=E9=A1=B5=E9=9D=A2=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/webapp/WEB-INF/view/data/data_grid.ftl | 6 +++--- .../webapp/WEB-INF/view/data/data_prop_value_grid.ftl | 6 +++--- .../webapp/WEB-INF/view/data/data_select_prop_value.ftl | 6 +++--- .../WEB-INF/view/driverEntity/driverEntity_grid.ftl | 6 +++--- .../WEB-INF/view/reset_password_request_history.ftl | 6 +++--- .../src/main/webapp/WEB-INF/view/user/user_grid.ftl | 6 +++--- datagear-web/src/main/webapp/static/theme/common.css | 8 +++----- 7 files changed, 21 insertions(+), 23 deletions(-) diff --git a/datagear-web/src/main/webapp/WEB-INF/view/data/data_grid.ftl b/datagear-web/src/main/webapp/WEB-INF/view/data/data_grid.ftl index 3fd492d3..015d800f 100644 --- a/datagear-web/src/main/webapp/WEB-INF/view/data/data_grid.ftl +++ b/datagear-web/src/main/webapp/WEB-INF/view/data/data_grid.ftl @@ -11,7 +11,7 @@ List PropertyPathDisplayName conditionSource 可用的查询条件列表，不 <#assign titleDisplayName=(titleDisplayName!'')> <#assign titleDisplayDesc=(titleDisplayDesc!'')> <#assign readonly=(readonly!false)> - + <#include "../include/html_head.ftl"> @@ -29,9 +29,9 @@ List PropertyPathDisplayName conditionSource 可用的查询条件列表，不 <@spring.message code='bracketRight' /> - + <#if !isAjaxRequest> -
+
diff --git a/datagear-web/src/main/webapp/WEB-INF/view/data/data_prop_value_grid.ftl b/datagear-web/src/main/webapp/WEB-INF/view/data/data_prop_value_grid.ftl index 04b704ae..d1133e79 100644 --- a/datagear-web/src/main/webapp/WEB-INF/view/data/data_prop_value_grid.ftl +++ b/datagear-web/src/main/webapp/WEB-INF/view/data/data_prop_value_grid.ftl @@ -17,7 +17,7 @@ List PropertyPathDisplayName conditionSource 可用的查询条件列表，isCli <#assign titleDisplayName=(titleDisplayName!'')> <#assign readonly=(readonly!false)> <#assign isAllowEditGrid=(isPrivatePropertyModel && !readonly)> - + <#include "../include/html_head.ftl"> @@ -27,9 +27,9 @@ List PropertyPathDisplayName conditionSource 可用的查询条件列表，isCli ${titleDisplayName?html} - + <#if !isAjaxRequest> -
+
diff --git a/datagear-web/src/main/webapp/WEB-INF/view/data/data_select_prop_value.ftl b/datagear-web/src/main/webapp/WEB-INF/view/data/data_select_prop_value.ftl index 74256d39..a6544bd7 100644 --- a/datagear-web/src/main/webapp/WEB-INF/view/data/data_select_prop_value.ftl +++ b/datagear-web/src/main/webapp/WEB-INF/view/data/data_select_prop_value.ftl @@ -11,7 +11,7 @@ boolean isMultipleSelect 是否多选，默认为false --> <#assign titleDisplayName=(titleDisplayName!'')> <#assign isMultipleSelect=(isMultipleSelect!false)> - + <#include "../include/html_head.ftl"> @@ -20,9 +20,9 @@ boolean isMultipleSelect 是否多选，默认为false ${titleDisplayName?html} - + <#if !isAjaxRequest> -
+
diff --git a/datagear-web/src/main/webapp/WEB-INF/view/driverEntity/driverEntity_grid.ftl b/datagear-web/src/main/webapp/WEB-INF/view/driverEntity/driverEntity_grid.ftl index 969d622b..950fad14 100644 --- a/datagear-web/src/main/webapp/WEB-INF/view/driverEntity/driverEntity_grid.ftl +++ b/datagear-web/src/main/webapp/WEB-INF/view/driverEntity/driverEntity_grid.ftl @@ -5,14 +5,14 @@ titleMessageKey 标题标签I18N关键字，不允许null selectonly 是否选择操作，允许为null --> <#assign selectonly=(selectonly!false)> - + <#include "../include/html_head.ftl"> <#include "../include/html_title_app_name.ftl"><@spring.message code='${titleMessageKey}' /> - + <#if !isAjaxRequest> -
+
diff --git a/datagear-web/src/main/webapp/WEB-INF/view/reset_password_request_history.ftl b/datagear-web/src/main/webapp/WEB-INF/view/reset_password_request_history.ftl index 0390fa55..c3f2868a 100644 --- a/datagear-web/src/main/webapp/WEB-INF/view/reset_password_request_history.ftl +++ b/datagear-web/src/main/webapp/WEB-INF/view/reset_password_request_history.ftl @@ -1,13 +1,13 @@ <#include "include/import_global.ftl"> <#include "include/html_doctype.ftl"> - + <#include "include/html_head.ftl"> <#include "include/html_title_app_name.ftl"><@spring.message code='resetPasswordRequestHistory.resetPasswordRequestHistory' /> - + <#if !isAjaxRequest> -
+
diff --git a/datagear-web/src/main/webapp/WEB-INF/view/user/user_grid.ftl b/datagear-web/src/main/webapp/WEB-INF/view/user/user_grid.ftl index 4857f5df..abdc3244 100644 --- a/datagear-web/src/main/webapp/WEB-INF/view/user/user_grid.ftl +++ b/datagear-web/src/main/webapp/WEB-INF/view/user/user_grid.ftl @@ -5,14 +5,14 @@ titleMessageKey 标题标签I18N关键字，不允许null selectonly 是否选择操作，允许为null --> <#assign selectonly=(selectonly!false)> - + <#include "../include/html_head.ftl"> <#include "../include/html_title_app_name.ftl"><@spring.message code='${titleMessageKey}' /> - + <#if !isAjaxRequest> -
+
diff --git a/datagear-web/src/main/webapp/static/theme/common.css b/datagear-web/src/main/webapp/static/theme/common.css index af1bc07e..cec23759 100644 --- a/datagear-web/src/main/webapp/static/theme/common.css +++ b/datagear-web/src/main/webapp/static/theme/common.css @@ -1079,8 +1079,9 @@ table.dataTable tbody tr .column-check .row-data-state .ui-icon{ .page-grid .foot.foot-edit-grid .edit-grid{ display: inline-block; width: 50%; - height: 100%; - position: relative; + position: absolute; + bottom: 1px; + left: 1px; } .page-grid .foot.foot-edit-grid .edit-grid .edit-grid-switch-wrapper{ display: inline-block; @@ -1105,9 +1106,6 @@ table.dataTable tbody tr .column-check .row-data-state .ui-icon{ padding-right: 3em; margin-left: 2em; } -.page-grid .foot.foot-edit-grid .pagination-wrapper{ - width: 49%; -} .page-form-buildSchemaUrl .url-preview{ margin-top: 1em;