Browse Source

Pull request #9845: REPORT-78995 开启空报表,双击模板直接打开设计器,未打开对应模板

Merge in DESIGN/design from ~DESTINY.LIN/design:release/11.0 to release/11.0

* commit 'caee9b93700786691bdb69d4520c9e9cafc6c0b4':
  REPORT-78995 开启空报表,双击模板直接打开设计器,未打开对应模板
newui
Destiny.Lin 2 years ago
parent
commit
be9ed0bc32
  1. 1
      designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionManagerPane.java
  2. 15
      designer-base/src/main/java/com/fr/start/BaseDesigner.java
  3. 1
      designer-realize/src/main/java/com/fr/design/cell/editor/TextCellEditor.java
  4. 1
      designer-realize/src/main/java/com/fr/grid/GridMouseAdapter.java

1
designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionManagerPane.java

@ -4,6 +4,7 @@ import com.fr.design.gui.frpane.LoadingBasicPane;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.file.ConnectionConfig;
import javax.swing.JPanel;
import java.awt.BorderLayout;
import java.util.HashMap;

15
designer-base/src/main/java/com/fr/start/BaseDesigner.java

@ -48,6 +48,9 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
private final String[] args;
//判断是否是通过打开指定模板来启动设计器,如果是则置false
private Boolean openFlag = true;
public BaseDesigner(String[] args) {
this.args = args;
@ -124,6 +127,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
FILE file = null;
if (args != null && args.length > 0) {
file = DesignerStartupUtil.convertArgs2FILE(args);
setOpenFlag(false);
} else {
file = FILEFactory.createFILE(FILEFactory.ENV_PREFIX + DesignerEnvManager.getEnvManager().getLastOpenFile());
}
@ -146,8 +150,9 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
//启动时打开指定文件的接口
DesignerStartOpenFileProcessor processor = ExtraDesignClassManager.getInstance().getSingle(DesignerStartOpenFileProcessor.XML_TAG);
// 如果插件没有,且又开启了启动时打开空文件,则使用启动时打开空文件
if (processor == null && DesignerEnvManager.getEnvManager().isStartWithEmptyFile()) {
if (processor == null && DesignerEnvManager.getEnvManager().isStartWithEmptyFile() && isOpenAppoint()) {
processor = DesignerStartWithEmptyFile.getInstance();
setOpenFlag(true);
}
if (processor != null) {
FILE f = processor.fileToShow();
@ -216,6 +221,14 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
}
}
public Boolean isOpenAppoint() {
return openFlag;
}
public void setOpenFlag(Boolean openFlag) {
this.openFlag = openFlag;
}
// 收集用户信息码
protected void collectUserInformation() {

1
designer-realize/src/main/java/com/fr/design/cell/editor/TextCellEditor.java

@ -136,7 +136,6 @@ public class TextCellEditor extends AbstractCellEditor {
style = cellElement.getStyle();
}
this.ajustTextStyle(grid, style, value, resolution);
return this.textField;
}

1
designer-realize/src/main/java/com/fr/grid/GridMouseAdapter.java

@ -118,7 +118,6 @@ public class GridMouseAdapter implements MouseListener, MouseWheelListener, Mous
if (!evt.isShiftDown() && ePane.getSelection() instanceof CellSelection) {
tempOldSelectedCell = GridUtils.getAdjustEventColumnRow_withresolution(ePane, oldEvtX, oldEvtY, resolution);
}
}
/**

Loading…
Cancel
Save