Browse Source

Pull request #7919: REPORT-65772 模板权限编辑状态切换问题-打开一张cpt,进入模板权限编辑后,再打开一张frm时,frm也有模板权限编辑框了

Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0

* commit '3dfe341cbbd81cef5abed61625f5f5fa72efbe26':
  REPORT-65772 模板权限编辑状态切换问题-打开一张cpt,进入模板权限编辑后,再打开一张frm时,frm也有模板权限编辑框了
bugfix/11.0
fanglei 3 years ago
parent
commit
7b1e8c5d4f
  1. 5
      designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

5
designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

@ -1520,7 +1520,10 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
private DesignerBaseOperate getLayoutBaseOperate(){ private DesignerBaseOperate getLayoutBaseOperate(){
FormSelection selection = this.getSelectionModel().getSelection(); FormSelection selection = this.getSelectionModel().getSelection();
XCreator creator = selection.getSelectedCreator(); XCreator creator = selection.getSelectedCreator();
XLayoutContainer container = (XLayoutContainer) creator.getParent(); XLayoutContainer container = null;
if (creator != null) {
container = (XLayoutContainer) creator.getParent();
}
if (container == null) { if (container == null) {
return new DefaultDesignerBaseOperate(); return new DefaultDesignerBaseOperate();
} }

Loading…
Cancel
Save