|
|
@ -150,6 +150,11 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { |
|
|
|
|
|
|
|
|
|
|
|
freshPropertyMode(innerCreator); |
|
|
|
freshPropertyMode(innerCreator); |
|
|
|
if (isExtraWidget) { |
|
|
|
if (isExtraWidget) { |
|
|
|
|
|
|
|
// REPORT-55603: 仅对于插件控件,将尺寸*位置面板放置在definePane下方,其余控件将尺寸*位置面板放置在definePane上方
|
|
|
|
|
|
|
|
widgetBoundPane = createWidgetBoundPane(xCreator); |
|
|
|
|
|
|
|
if (widgetBoundPane != null) { |
|
|
|
|
|
|
|
attriCardPane.add(widgetBoundPane, BorderLayout.CENTER); |
|
|
|
|
|
|
|
} |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -187,10 +192,18 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { |
|
|
|
}); |
|
|
|
}); |
|
|
|
DataModify<Widget> definePane = rn.getDefinePane(); |
|
|
|
DataModify<Widget> definePane = rn.getDefinePane(); |
|
|
|
|
|
|
|
|
|
|
|
// 使用单独的JPane和BorderLayout.North进行包装,避免出现CENTER嵌套CENTER后,内容高度变大的情况
|
|
|
|
JComponent definePaneComponent = definePane.toSwingComponent(); |
|
|
|
JPanel definePaneWrapContent = FRGUIPaneFactory.createBorderLayout_S_Pane(); |
|
|
|
boolean isExtraWidget = FormWidgetDefinePaneFactoryBase.isExtraXWidget(creator.toData()); |
|
|
|
definePaneWrapContent.add(definePane.toSwingComponent(), BorderLayout.NORTH); |
|
|
|
|
|
|
|
attriCardPane.add(definePaneWrapContent, BorderLayout.CENTER); |
|
|
|
if (isExtraWidget) { |
|
|
|
|
|
|
|
// REPORT-55603: 仅对于插件控件,将尺寸*位置面板放置在definePane下方,其余控件将尺寸*位置面板放置在definePane上方
|
|
|
|
|
|
|
|
attriCardPane.add(definePaneComponent, BorderLayout.NORTH); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
// 使用单独的JPane和BorderLayout.North进行包装,避免出现CENTER嵌套CENTER后,内容高度变大的情况
|
|
|
|
|
|
|
|
JPanel definePaneWrapContent = FRGUIPaneFactory.createBorderLayout_S_Pane(); |
|
|
|
|
|
|
|
definePaneWrapContent.add(definePaneComponent, BorderLayout.NORTH); |
|
|
|
|
|
|
|
attriCardPane.add(definePaneWrapContent, BorderLayout.CENTER); |
|
|
|
|
|
|
|
} |
|
|
|
currentEditorDefinePane = definePane; |
|
|
|
currentEditorDefinePane = definePane; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|