|
|
@ -28,6 +28,7 @@ import com.fr.design.menu.KeySetUtils; |
|
|
|
import com.fr.design.menu.MenuDef; |
|
|
|
import com.fr.design.menu.MenuDef; |
|
|
|
import com.fr.design.menu.ShortCut; |
|
|
|
import com.fr.design.menu.ShortCut; |
|
|
|
import com.fr.design.menu.ToolBarDef; |
|
|
|
import com.fr.design.menu.ToolBarDef; |
|
|
|
|
|
|
|
import com.fr.design.parameter.ParameterPropertyPane; |
|
|
|
import com.fr.design.roleAuthority.RolesAlreadyEditedPane; |
|
|
|
import com.fr.design.roleAuthority.RolesAlreadyEditedPane; |
|
|
|
import com.fr.design.utils.gui.LayoutUtils; |
|
|
|
import com.fr.design.utils.gui.LayoutUtils; |
|
|
|
import com.fr.file.FILE; |
|
|
|
import com.fr.file.FILE; |
|
|
@ -247,6 +248,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm { |
|
|
|
ComparatorUtils.equals(editingComponent.getClass(), NoSupportAuthorityEdit.class) ? editingComponent : createAuthorityEditPane()); |
|
|
|
ComparatorUtils.equals(editingComponent.getClass(), NoSupportAuthorityEdit.class) ? editingComponent : createAuthorityEditPane()); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
EastRegionContainerPane.getInstance().replaceUpPane(editingComponent); |
|
|
|
EastRegionContainerPane.getInstance().replaceUpPane(editingComponent); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -615,8 +617,10 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
EastRegionContainerPane.getInstance().replaceUpPane(WidgetPropertyPane.getInstance(formDesign)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
EastRegionContainerPane.getInstance().replaceUpPane(WidgetPropertyPane.getInstance(formDesign)); |
|
|
|
|
|
|
|
//sharetest
|
|
|
|
|
|
|
|
EastRegionContainerPane.getInstance().addParameterPane(ParameterPropertyPane.getInstance(formDesign)); |
|
|
|
if (EastRegionContainerPane.getInstance().getDownPane() == null) { |
|
|
|
if (EastRegionContainerPane.getInstance().getDownPane() == null) { |
|
|
|
new Thread() { |
|
|
|
new Thread() { |
|
|
|
public void run() { |
|
|
|
public void run() { |
|
|
@ -636,6 +640,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm { |
|
|
|
pane.setLayout(new BorderLayout()); |
|
|
|
pane.setLayout(new BorderLayout()); |
|
|
|
pane.add(FormWidgetDetailPane.getInstance(formDesign), BorderLayout.CENTER); |
|
|
|
pane.add(FormWidgetDetailPane.getInstance(formDesign), BorderLayout.CENTER); |
|
|
|
EastRegionContainerPane.getInstance().replaceDownPane(pane); |
|
|
|
EastRegionContainerPane.getInstance().replaceDownPane(pane); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|