|
|
@ -19,7 +19,11 @@ import com.fr.design.designer.creator.cardlayout.XWCardTitleLayout; |
|
|
|
import com.fr.design.designer.creator.cardlayout.XWTabFitLayout; |
|
|
|
import com.fr.design.designer.creator.cardlayout.XWTabFitLayout; |
|
|
|
import com.fr.design.designer.properties.FRFitLayoutConstraints; |
|
|
|
import com.fr.design.designer.properties.FRFitLayoutConstraints; |
|
|
|
import com.fr.design.designer.properties.FRFitLayoutPropertiesGroupModel; |
|
|
|
import com.fr.design.designer.properties.FRFitLayoutPropertiesGroupModel; |
|
|
|
|
|
|
|
import com.fr.design.file.HistoryTemplateListCache; |
|
|
|
import com.fr.design.fun.FormWidgetOptionProvider; |
|
|
|
import com.fr.design.fun.FormWidgetOptionProvider; |
|
|
|
|
|
|
|
import com.fr.design.mainframe.FormDesigner; |
|
|
|
|
|
|
|
import com.fr.design.mainframe.JForm; |
|
|
|
|
|
|
|
import com.fr.design.mainframe.JTemplate; |
|
|
|
import com.fr.design.mainframe.WidgetPropertyPane; |
|
|
|
import com.fr.design.mainframe.WidgetPropertyPane; |
|
|
|
import com.fr.design.utils.ComponentUtils; |
|
|
|
import com.fr.design.utils.ComponentUtils; |
|
|
|
import com.fr.form.ui.LayoutBorderStyle; |
|
|
|
import com.fr.form.ui.LayoutBorderStyle; |
|
|
@ -346,7 +350,10 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter { |
|
|
|
// REPORT-34739 对绝对画布块的backupBound.y的调整还需要考虑一下参数面板块的高度造成的偏移
|
|
|
|
// REPORT-34739 对绝对画布块的backupBound.y的调整还需要考虑一下参数面板块的高度造成的偏移
|
|
|
|
int paraHeight = 0; |
|
|
|
int paraHeight = 0; |
|
|
|
if (creator.acceptType(XWAbsoluteLayout.class)) { |
|
|
|
if (creator.acceptType(XWAbsoluteLayout.class)) { |
|
|
|
paraHeight = WidgetPropertyPane.getInstance().getEditingFormDesigner().getParaHeight(); |
|
|
|
JTemplate<?, ?> jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); |
|
|
|
|
|
|
|
if (jTemplate instanceof JForm) { |
|
|
|
|
|
|
|
paraHeight = ((JForm) jTemplate).getFormDesign().getParaHeight(); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
backupBound.y -= (container.getY() - paraHeight); |
|
|
|
backupBound.y -= (container.getY() - paraHeight); |
|
|
|
//当前拖拽组件的位置
|
|
|
|
//当前拖拽组件的位置
|
|
|
|