Browse Source

Merge pull request #1529 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit 'e215b36f5e43ef1fce974ab9cf33f0b36ce3a9c5':
  REPORT-28257 && REPORT-28257
feature/big-screen
Hades 5 years ago
parent
commit
015e1d15e0
  1. 6
      designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java
  2. 2
      designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java
  3. 1
      designer-realize/src/main/java/com/fr/start/DesignerLauncher.java
  4. 14
      designer-realize/src/main/java/com/fr/start/FineDesigner.java

6
designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java

@ -142,8 +142,10 @@ public class FunctionManagerPane extends BasicPane {
editorButton.setPreferredSize(new Dimension(editorButton.getPreferredSize().width, classNameTextField.getPreferredSize().height));
reportletNamePane.add(editorButton);
editorButton.addActionListener(createEditorButtonActionListener());
northPane.add(GUICoreUtils.createFlowPane(new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name") + ":"),
reportletNamePane}, FlowLayout.LEFT));
JPanel classNamePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
classNamePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name") + ":"), BorderLayout.NORTH);
classNamePane.add(reportletNamePane, BorderLayout.CENTER);
northPane.add(classNamePane);
DescriptionTextArea descriptionArea = new DescriptionTextArea();
descriptionArea.setWrapStyleWord(true);
descriptionArea.setLineWrap(true);

2
designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java

@ -29,7 +29,7 @@ import java.awt.event.ActionListener;
public abstract class CustomJobPane extends BasicBeanPane {
protected UITextField classNameTextField;
protected ObjectProperiesPane objectProperiesPane;
public static final int DEFAULT_LENGTH = 30;
private static final int DEFAULT_LENGTH = 25;
public CustomJobPane() {
this.setLayout(FRGUIPaneFactory.createBorderLayout());

1
designer-realize/src/main/java/com/fr/start/DesignerLauncher.java

@ -46,6 +46,7 @@ public class DesignerLauncher {
jvmSettings(DesignerJavaRuntime.getInstance().getJvmOptions()).
arguments(args).
directory(BIN_HOME).
entryPackage(FineDesigner.class).
startProcess(DesignerProcessType.INSTANCE);
DesignerSuperListener.getInstance().start();
}

14
designer-realize/src/main/java/com/fr/start/FineDesigner.java

@ -0,0 +1,14 @@
package com.fr.start;
import com.fr.process.engine.core.FineProcessEntry;
/**
* 包装类 改变子进程的进程名
*
* @author hades
* @version 10.0
* Created by hades on 2020/3/24
*/
public class FineDesigner extends FineProcessEntry {
}
Loading…
Cancel
Save