|
|
@ -34,6 +34,7 @@ import com.fr.form.ui.container.WAbsoluteLayout; |
|
|
|
import com.fr.form.ui.container.WBodyLayoutType; |
|
|
|
import com.fr.form.ui.container.WBodyLayoutType; |
|
|
|
import com.fr.form.ui.container.WFitLayout; |
|
|
|
import com.fr.form.ui.container.WFitLayout; |
|
|
|
import com.fr.general.ComparatorUtils; |
|
|
|
import com.fr.general.ComparatorUtils; |
|
|
|
|
|
|
|
import com.fr.general.act.BorderPacker; |
|
|
|
import com.fr.log.FineLoggerFactory; |
|
|
|
import com.fr.log.FineLoggerFactory; |
|
|
|
import com.fr.report.core.ReportUtils; |
|
|
|
import com.fr.report.core.ReportUtils; |
|
|
|
|
|
|
|
|
|
|
@ -191,9 +192,12 @@ public class FRFitLayoutDefinePane extends AbstractFRLayoutDefinePane<WFitLayout |
|
|
|
layout.setLayoutType(WBodyLayoutType.parse(state)); |
|
|
|
layout.setLayoutType(WBodyLayoutType.parse(state)); |
|
|
|
layout.setCompState(adaptComboBox.getSelectedIndex()); |
|
|
|
layout.setCompState(adaptComboBox.getSelectedIndex()); |
|
|
|
try { |
|
|
|
try { |
|
|
|
|
|
|
|
// 自适应布局切换到绝对布局
|
|
|
|
if (state == WBodyLayoutType.ABSOLUTE.getTypeValue()) { |
|
|
|
if (state == WBodyLayoutType.ABSOLUTE.getTypeValue()) { |
|
|
|
WAbsoluteBodyLayout wAbsoluteBodyLayout = new WAbsoluteBodyLayout("body"); |
|
|
|
WAbsoluteBodyLayout wAbsoluteBodyLayout = new WAbsoluteBodyLayout("body"); |
|
|
|
wAbsoluteBodyLayout.setCompState(WAbsoluteLayout.STATE_FIXED); |
|
|
|
wAbsoluteBodyLayout.setCompState(WAbsoluteLayout.STATE_FIXED); |
|
|
|
|
|
|
|
// 切换布局类型时,保留body背景样式
|
|
|
|
|
|
|
|
wAbsoluteBodyLayout.setBorderStyle((BorderPacker) (layout.getBorderStyle().clone())); |
|
|
|
Component[] components = xWFitLayout.getComponents(); |
|
|
|
Component[] components = xWFitLayout.getComponents(); |
|
|
|
xWFitLayout.removeAll(); |
|
|
|
xWFitLayout.removeAll(); |
|
|
|
layout.resetStyle(); |
|
|
|
layout.resetStyle(); |
|
|
|