|
|
@ -12,6 +12,7 @@ import com.fr.design.designer.creator.XWFitLayout; |
|
|
|
import com.fr.design.designer.creator.XWParameterLayout; |
|
|
|
import com.fr.design.designer.creator.XWParameterLayout; |
|
|
|
import com.fr.design.designer.creator.cardlayout.XWCardTagLayout; |
|
|
|
import com.fr.design.designer.creator.cardlayout.XWCardTagLayout; |
|
|
|
import com.fr.design.designer.creator.cardlayout.XWTabFitLayout; |
|
|
|
import com.fr.design.designer.creator.cardlayout.XWTabFitLayout; |
|
|
|
|
|
|
|
import com.fr.design.file.HistoryTemplateListCache; |
|
|
|
import com.fr.design.utils.ComponentUtils; |
|
|
|
import com.fr.design.utils.ComponentUtils; |
|
|
|
import com.fr.design.utils.gui.LayoutUtils; |
|
|
|
import com.fr.design.utils.gui.LayoutUtils; |
|
|
|
import com.fr.form.ui.Widget; |
|
|
|
import com.fr.form.ui.Widget; |
|
|
@ -270,7 +271,9 @@ public class FormSelection { |
|
|
|
LayoutAdapter layoutAdapter = AdapterBus.searchLayoutAdapter(designer, creator); |
|
|
|
LayoutAdapter layoutAdapter = AdapterBus.searchLayoutAdapter(designer, creator); |
|
|
|
if (layoutAdapter != null) { |
|
|
|
if (layoutAdapter != null) { |
|
|
|
if (creator.acceptType(XWAbsoluteLayout.class) && recs.size() > i) { |
|
|
|
if (creator.acceptType(XWAbsoluteLayout.class) && recs.size() > i) { |
|
|
|
creator.setBackupBound(recs.get(i)); |
|
|
|
Rectangle rectangle = recs.get(i); |
|
|
|
|
|
|
|
check4ParaPane(rectangle); |
|
|
|
|
|
|
|
creator.setBackupBound(rectangle); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
creator.setBackupBound(backupBounds); |
|
|
|
creator.setBackupBound(backupBounds); |
|
|
|
} |
|
|
|
} |
|
|
@ -280,6 +283,19 @@ public class FormSelection { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* 检查下有没有参数面板,如果存在,处理下参数面板造成的偏移量 |
|
|
|
|
|
|
|
* @param rectangle |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
private void check4ParaPane(Rectangle rectangle) { |
|
|
|
|
|
|
|
int paraHeight = 0; |
|
|
|
|
|
|
|
JTemplate<?, ?> jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); |
|
|
|
|
|
|
|
if (jTemplate instanceof JForm) { |
|
|
|
|
|
|
|
paraHeight = ((JForm) jTemplate).getFormDesign().getParaHeight(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
rectangle.y += paraHeight; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void removeCreatorFromContainer(XCreator creator) { |
|
|
|
private void removeCreatorFromContainer(XCreator creator) { |
|
|
|
XLayoutContainer parent = XCreatorUtils.getParentXLayoutContainer(creator); |
|
|
|
XLayoutContainer parent = XCreatorUtils.getParentXLayoutContainer(creator); |
|
|
|
if (parent == null) { |
|
|
|
if (parent == null) { |
|
|
|