Browse Source

控件剪切、复制按钮fix

release/11.0
renekton 3 months ago
parent
commit
620f17f591
  1. 18
      designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java
  2. 12
      designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

18
designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java

@ -88,6 +88,8 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
private static Image paraImage = BaseUtils.readImage("/com/fr/design/images/form/parameter.png"); private static Image paraImage = BaseUtils.readImage("/com/fr/design/images/form/parameter.png");
private UpdateAction[] basicMainPaneActions;
public FormParaDesigner() { public FormParaDesigner() {
this(new FormParameterUI()); this(new FormParameterUI());
} }
@ -342,6 +344,14 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
return designerActions.toArray(new UpdateAction[designerActions.size()]); return designerActions.toArray(new UpdateAction[designerActions.size()]);
} }
public UpdateAction[] getBasicMainActions() {
if (basicMainPaneActions == null) {
basicMainPaneActions = new UpdateAction[]{new CutAction(this), new CopyAction(this), new PasteAction(this),
new FormDeleteAction(this)};
}
return basicMainPaneActions;
}
private boolean searchQueryCreators(XLayoutContainer rootContainer) { private boolean searchQueryCreators(XLayoutContainer rootContainer) {
boolean b = false; boolean b = false;
for (int i = 0; i < rootContainer.getXCreatorCount(); i++) { for (int i = 0; i < rootContainer.getXCreatorCount(); i++) {
@ -736,8 +746,12 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
* @return 按钮组 a * @return 按钮组 a
*/ */
public JComponent[] toolBarButton4Form() { public JComponent[] toolBarButton4Form() {
return new JComponent[]{new CutAction(this).createToolBarComponent(), new CopyAction(this).createToolBarComponent(), new PasteAction(this).createToolBarComponent(), UpdateAction[] actions = getBasicMainActions();
new FormDeleteAction(this).createToolBarComponent()}; JComponent[] components = new JComponent[actions.length];
for (int i = 0; i < actions.length; i++) {
components[i] = actions[i].createToolBarComponent();
}
return components;
} }
@Override @Override

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

@ -777,6 +777,14 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
for (UpdateAction action : getActions()) { for (UpdateAction action : getActions()) {
action.update(); action.update();
} }
UpdateAction[] actions = getBasicMainActions();
if (actions != null) {
for (UpdateAction action : actions) {
action.update();
}
}
} }
} }
@ -1485,6 +1493,10 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
return designerActions.toArray(new UpdateAction[designerActions.size()]); return designerActions.toArray(new UpdateAction[designerActions.size()]);
} }
public UpdateAction[] getBasicMainActions() {
return null;
}
private List<UpdateAction> getBasicActions(){ private List<UpdateAction> getBasicActions(){
if (basicActions == null) { if (basicActions == null) {
basicActions = new ArrayList<UpdateAction>(); basicActions = new ArrayList<UpdateAction>();

Loading…
Cancel
Save