p85126437
/
datagear
forked from p81075629/datagear
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

解决数据表格页在新窗口中打开后没有填满整个页面的问题

This commit is contained in:
datagear 2019-03-18 15:52:42 +08:00
parent b97146b28a
commit 336228b068
7 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
datagear-web/src/main/webapp/WEB-INF/view/data/data_grid.ftl
View File

@ -11,7 +11,7 @@ List PropertyPathDisplayName conditionSource 可用的查询条件列表，不
<#assign titleDisplayName=(titleDisplayName!'')>
<#assign titleDisplayDesc=(titleDisplayDesc!'')>
<#assign readonly=(readonly!false)>
<html style="height:100%;">
<html>
<head>
<#include "../include/html_head.ftl">
<title>
@ -29,9 +29,9 @@ List PropertyPathDisplayName conditionSource 可用的查询条件列表，不
<@spring.message code='bracketRight' />
</title>
</head>
<body style="height:100%;">
<body class="fill-parent">
<#if !isAjaxRequest>
<div style="height:99%;">
<div class="fill-parent">
</#if>
<div id="${pageId}" class="page-grid page-grid-query">
<div class="head">

6
datagear-web/src/main/webapp/WEB-INF/view/data/data_prop_value_grid.ftl
View File

@ -17,7 +17,7 @@ List PropertyPathDisplayName conditionSource 可用的查询条件列表，isCli
<#assign titleDisplayName=(titleDisplayName!'')>
<#assign readonly=(readonly!false)>
<#assign isAllowEditGrid=(isPrivatePropertyModel && !readonly)>
<html style="height:100%;">
<html>
<head>
<#include "../include/html_head.ftl">
<title>
@ -27,9 +27,9 @@ List PropertyPathDisplayName conditionSource 可用的查询条件列表，isCli
${titleDisplayName?html}
</title>
</head>
<body style="height:100%;">
<body class="fill-parent">
<#if !isAjaxRequest>
<div style="height:99%;">
<div class="fill-parent">
</#if>
<div id="${pageId}" class="page-grid page-grid-empv">
<div class="head">

6
datagear-web/src/main/webapp/WEB-INF/view/data/data_select_prop_value.ftl
View File

@ -11,7 +11,7 @@ boolean isMultipleSelect 是否多选，默认为false
-->
<#assign titleDisplayName=(titleDisplayName!'')>
<#assign isMultipleSelect=(isMultipleSelect!false)>
<html style="height:100%;">
<html>
<head>
<#include "../include/html_head.ftl">
<title>
@ -20,9 +20,9 @@ boolean isMultipleSelect 是否多选，默认为false
${titleDisplayName?html}
</title>
</head>
<body style="height:100%;">
<body class="fill-parent">
<#if !isAjaxRequest>
<div style="height:99%;">
<div class="fill-parent">
</#if>
<div id="${pageId}" class="page-grid page-grid-spv">
<div class="head">

6
datagear-web/src/main/webapp/WEB-INF/view/driverEntity/driverEntity_grid.ftl
View File

@ -5,14 +5,14 @@ titleMessageKey 标题标签I18N关键字，不允许null
selectonly 是否选择操作，允许为null
-->
<#assign selectonly=(selectonly!false)>
<html style="height:100%;">
<html>
<head>
<#include "../include/html_head.ftl">
<title><#include "../include/html_title_app_name.ftl"><@spring.message code='${titleMessageKey}' /></title>
</head>
<body style="height:100%;">
<body class="fill-parent">
<#if !isAjaxRequest>
<div style="height:99%;">
<div class="fill-parent">
</#if>
<div id="${pageId}" class="page-grid page-grid-hidden-foot page-grid-driverEntity">
<div class="head">

6
datagear-web/src/main/webapp/WEB-INF/view/reset_password_request_history.ftl
View File

@ -1,13 +1,13 @@
<#include "include/import_global.ftl">
<#include "include/html_doctype.ftl">
<html style="height:100%;">
<html>
<head>
<#include "include/html_head.ftl">
<title><#include "include/html_title_app_name.ftl"><@spring.message code='resetPasswordRequestHistory.resetPasswordRequestHistory' /></title>
</head>
<body style="height:100%;">
<body class="fill-parent">
<#if !isAjaxRequest>
<div style="height:99%;">
<div class="fill-parent">
</#if>
<div id="${pageId}" class="page-grid page-grid-reset-password-request-history">
<div class="head">

6
datagear-web/src/main/webapp/WEB-INF/view/user/user_grid.ftl
View File

@ -5,14 +5,14 @@ titleMessageKey 标题标签I18N关键字，不允许null
selectonly 是否选择操作，允许为null
-->
<#assign selectonly=(selectonly!false)>
<html style="height:100%;">
<html>
<head>
<#include "../include/html_head.ftl">
<title><#include "../include/html_title_app_name.ftl"><@spring.message code='${titleMessageKey}' /></title>
</head>
<body style="height:100%;">
<body class="fill-parent">
<#if !isAjaxRequest>
<div style="height:99%;">
<div class="fill-parent">
</#if>
<div id="${pageId}" class="page-grid page-grid-hidden-foot page-grid-user">
<div class="head">

8
datagear-web/src/main/webapp/static/theme/common.css
View File

@ -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;