Browse Source

REPORT-49986 【10.0.16】性能优化之阻塞EDT线程时优化

feature/10.0
hades 4 years ago
parent
commit
15c3770f54
  1. 16
      designer-base/src/main/java/com/fr/design/DesignModelAdapter.java
  2. 26
      designer-base/src/main/java/com/fr/design/actions/ForbiddenUpdateAction.java
  3. 3
      designer-base/src/main/java/com/fr/design/actions/edit/RedoAction.java
  4. 5
      designer-base/src/main/java/com/fr/design/actions/edit/UndoAction.java
  5. 8
      designer-base/src/main/java/com/fr/design/actions/file/SaveAsTemplateAction.java
  6. 5
      designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java
  7. 20
      designer-base/src/main/java/com/fr/design/actions/file/WebPreviewUtils.java
  8. 3
      designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java
  9. 5
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
  10. 21
      designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceLoader.java
  11. 44
      designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java
  12. 47
      designer-base/src/main/java/com/fr/design/env/WorkspaceChangeLoadingDialog.java
  13. 31
      designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java
  14. 29
      designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java
  15. 2
      designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java
  16. 52
      designer-base/src/main/java/com/fr/design/gui/ibutton/UIForbiddenButton.java
  17. 25
      designer-base/src/main/java/com/fr/design/gui/ibutton/UIForbiddenButtonUI.java
  18. 44
      designer-base/src/main/java/com/fr/design/gui/ibutton/UISaveForbiddenButton.java
  19. 25
      designer-base/src/main/java/com/fr/design/gui/ibutton/UISaveForbiddenButtonUI.java
  20. 18
      designer-base/src/main/java/com/fr/design/gui/imenu/UIForBiddenHeadMenu.java
  21. 25
      designer-base/src/main/java/com/fr/design/gui/imenu/UIForbiddenMenuUI.java
  22. 17
      designer-base/src/main/java/com/fr/design/gui/itoolbar/UIToolbar.java
  23. 45
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
  24. 27
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
  25. 46
      designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java
  26. 10
      designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
  27. 245
      designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
  28. 40
      designer-base/src/main/java/com/fr/design/mainframe/JTemplateSave.java
  29. 60
      designer-base/src/main/java/com/fr/design/mainframe/OpenLoadingPane.java
  30. 102
      designer-base/src/main/java/com/fr/design/mainframe/TransparentPane.java
  31. 37
      designer-base/src/main/java/com/fr/design/menu/MenuDef.java
  32. 49
      designer-base/src/main/java/com/fr/design/worker/WorkerManager.java
  33. 28
      designer-base/src/main/java/com/fr/design/worker/open/OpenResult.java
  34. 115
      designer-base/src/main/java/com/fr/design/worker/open/OpenWorker.java
  35. 75
      designer-base/src/main/java/com/fr/design/worker/save/CallbackSaveWorker.java
  36. 37
      designer-base/src/main/java/com/fr/design/worker/save/EmptyCallBackSaveWorker.java
  37. 82
      designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java
  38. 5
      designer-base/src/main/java/com/fr/file/FILEChooserPane.java
  39. 4
      designer-form/src/main/java/com/fr/design/mainframe/FormModelAdapter.java
  40. 8
      designer-form/src/main/java/com/fr/design/mainframe/JForm.java
  41. 12
      designer-form/src/main/java/com/fr/design/mainframe/ToolBarButton.java
  42. 3
      designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java
  43. 9
      designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java
  44. 3
      designer-realize/src/main/java/com/fr/design/mainframe/WorkBookModelAdapter.java
  45. 29
      designer-realize/src/main/java/com/fr/design/mainframe/app/AbstractWorkBookApp.java
  46. 8
      designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java
  47. 34
      designer-realize/src/main/java/com/fr/design/mainframe/app/FormApp.java
  48. 7
      designer-realize/src/main/java/com/fr/start/MainDesigner.java
  49. 2
      designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java
  50. 3
      designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceActivator.java

16
designer-base/src/main/java/com/fr/design/DesignModelAdapter.java

@ -75,6 +75,12 @@ public abstract class DesignModelAdapter<T extends BaseBook, S extends JTemplate
setCurrentModelAdapter(this); setCurrentModelAdapter(this);
} }
public DesignModelAdapter(S jTemplate, Parameter[] parameters) {
this.jTemplate = jTemplate;
initParameter(parameters);
setCurrentModelAdapter(this);
}
public static void setCurrentModelAdapter(DesignModelAdapter<?, ?> model) { public static void setCurrentModelAdapter(DesignModelAdapter<?, ?> model) {
currentModelAdapter = model; currentModelAdapter = model;
} }
@ -244,6 +250,16 @@ public abstract class DesignModelAdapter<T extends BaseBook, S extends JTemplate
&& (widget instanceof DataControl || widget instanceof MultiFileEditor); && (widget instanceof DataControl || widget instanceof MultiFileEditor);
} }
private void initParameter(Parameter[] parameters) {
// 全部参数
this.parameters = parameters;
// 数据及参数
this.tableDataParameters = getLatestTableDataParameters();
// 模板参数
this.templateParameters = getLatestTemplateParameters();
}
/** /**
* 更新缓存的参数 * 更新缓存的参数
*/ */

26
designer-base/src/main/java/com/fr/design/actions/ForbiddenUpdateAction.java

@ -0,0 +1,26 @@
package com.fr.design.actions;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ibutton.UIForbiddenButton;
import javax.swing.AbstractButton;
import javax.swing.JComponent;
/**
* @author hades
* @version 10.0
* Created by hades on 2021/4/12
*/
public abstract class ForbiddenUpdateAction extends UpdateAction {
@Override
public JComponent createToolBarComponent() {
Object object = this.getValue(UIForbiddenButton.class.getName());
if (!(object instanceof AbstractButton)) {
UIButton button = null;
button = new UIForbiddenButton();
object = initButton(button, UIForbiddenButton.class.getName());
}
return (JComponent) object;
}
}

3
designer-base/src/main/java/com/fr/design/actions/edit/RedoAction.java

@ -49,7 +49,8 @@ public class RedoAction extends UpdateAction implements TemplateComponentActionI
public void update() { public void update() {
JTemplate<?, ?> undoComponent = getEditingComponent(); JTemplate<?, ?> undoComponent = getEditingComponent();
if (DesignerEnvManager.getEnvManager().isSupportUndo()) { if (DesignerEnvManager.getEnvManager().isSupportUndo()) {
this.setEnabled(undoComponent != null && undoComponent.canRedo()); boolean enable = undoComponent != null && undoComponent.canRedo() && !undoComponent.isOpening() && !undoComponent.isSaving();
this.setEnabled(enable);
} else { } else {
this.setEnabled(false); this.setEnabled(false);
} }

5
designer-base/src/main/java/com/fr/design/actions/edit/UndoAction.java

@ -28,7 +28,7 @@ public class UndoAction extends UpdateAction implements TemplateComponentActionI
@Override @Override
public JTemplate<?, ?> getEditingComponent() { public JTemplate<?, ?> getEditingComponent() {
return t; return t;
} }
/** /**
@ -49,7 +49,8 @@ public class UndoAction extends UpdateAction implements TemplateComponentActionI
public void update() { public void update() {
JTemplate<?, ?> undoComponent = getEditingComponent(); JTemplate<?, ?> undoComponent = getEditingComponent();
if (DesignerEnvManager.getEnvManager().isSupportUndo()) { if (DesignerEnvManager.getEnvManager().isSupportUndo()) {
this.setEnabled(undoComponent != null && undoComponent.canUndo()); boolean enable = undoComponent != null && undoComponent.canUndo() && !undoComponent.isOpening() && !undoComponent.isSaving();
this.setEnabled(enable);
} else { } else {
this.setEnabled(false); this.setEnabled(false);
} }

8
designer-base/src/main/java/com/fr/design/actions/file/SaveAsTemplateAction.java

@ -31,7 +31,7 @@ public class SaveAsTemplateAction extends JTemplateAction<JTemplate<?, ?>> {
JTemplate<?, ?> jt = this.getEditingComponent(); JTemplate<?, ?> jt = this.getEditingComponent();
// kunsnat: 保存前停止编辑状态,保存属性. // kunsnat: 保存前停止编辑状态,保存属性.
jt.stopEditing(); jt.stopEditing();
jt.saveAsTemplate(); jt.saveAsDirectly();
this.setEnabled(true); this.setEnabled(true);
jt.requestFocus(); jt.requestFocus();
@ -40,9 +40,7 @@ public class SaveAsTemplateAction extends JTemplateAction<JTemplate<?, ?>> {
@Override @Override
public void update() { public void update() {
super.update(); super.update();
boolean enable = !this.getEditingComponent().isSaving() && !this.getEditingComponent().isOpening();
// this.setEnabled(!this.getEditingComponent().isSaved()); this.setEnabled(enable);
// 另存为按钮应该一直可用使用
this.setEnabled(true);
} }
} }

5
designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java

@ -31,14 +31,15 @@ public class SaveTemplateAction extends JTemplateAction<JTemplate<?, ?>> {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
JTemplate<?, ?> jt = this.getEditingComponent(); JTemplate<?, ?> jt = this.getEditingComponent();
jt.stopEditing(); jt.stopEditing();
jt.saveTemplate(); jt.saveDirectly();
jt.requestFocus(); jt.requestFocus();
} }
@Override @Override
public void update() { public void update() {
super.update(); super.update();
this.setEnabled(!this.getEditingComponent().isSaved()); boolean enable = !this.getEditingComponent().isSaved() && !this.getEditingComponent().isSaving() && !this.getEditingComponent().isOpening();
this.setEnabled(enable);
} }
} }

20
designer-base/src/main/java/com/fr/design/actions/file/WebPreviewUtils.java

@ -6,6 +6,7 @@ import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.JTemplate; import com.fr.design.mainframe.JTemplate;
import com.fr.design.utils.DesignUtils; import com.fr.design.utils.DesignUtils;
import com.fr.design.worker.save.CallbackSaveWorker;
import com.fr.file.FILE; import com.fr.file.FILE;
import com.fr.file.FileNodeFILE; import com.fr.file.FileNodeFILE;
import com.fr.general.GeneralUtils; import com.fr.general.GeneralUtils;
@ -83,15 +84,18 @@ public final class WebPreviewUtils {
WARNING_MESSAGE WARNING_MESSAGE
); );
if (OK_OPTION == selVal) { if (OK_OPTION == selVal) {
if (!jt.saveAsTemplate()) { CallbackSaveWorker worker = jt.saveAs();
return; worker.start(jt.getTarget().getTemplateID());
} worker.addSuccessCallback(new Runnable() {
} else { @Override
return; public void run() {
browseUrl(jt.getEditingFILE(), baseRoute, map, actionType, jt);
}
});
} }
currentTemplate = jt.getEditingFILE(); return;
} }
browseUrl(currentTemplate, baseRoute, map, actionType, jt); browseUrl(jt.getEditingFILE(), baseRoute, map, actionType, jt);
} else { } else {
// 说明模板没有保存在报表运行环境下面,提示用户 // 说明模板没有保存在报表运行环境下面,提示用户
int selVal = showConfirmDialog( int selVal = showConfirmDialog(
@ -150,7 +154,7 @@ public final class WebPreviewUtils {
WARNING_MESSAGE WARNING_MESSAGE
); );
if (OK_OPTION == selVal) { if (OK_OPTION == selVal) {
jt.saveAsTemplate(); jt.saveAsDirectly();
} }
} }
} }

3
designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java

@ -6,6 +6,7 @@ import com.fr.data.TableDataSource;
import com.fr.data.api.StoreProcedureAssist; import com.fr.data.api.StoreProcedureAssist;
import com.fr.data.impl.storeproc.StoreProcedure; import com.fr.data.impl.storeproc.StoreProcedure;
import com.fr.design.DesignModelAdapter; import com.fr.design.DesignModelAdapter;
import com.fr.design.actions.ForbiddenUpdateAction;
import com.fr.design.actions.UpdateAction; import com.fr.design.actions.UpdateAction;
import com.fr.design.data.datapane.TableDataCreatorProducer; import com.fr.design.data.datapane.TableDataCreatorProducer;
import com.fr.design.data.datapane.TableDataNameObjectCreator; import com.fr.design.data.datapane.TableDataNameObjectCreator;
@ -398,7 +399,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
return prefix + count; return prefix + count;
} }
protected class PreviewTableDataAction extends UpdateAction { protected class PreviewTableDataAction extends ForbiddenUpdateAction {
private TableDataTree dataTree; private TableDataTree dataTree;
public PreviewTableDataAction(TableDataTree dataTree) { public PreviewTableDataAction(TableDataTree dataTree) {

5
designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java

@ -6,6 +6,7 @@ import com.fr.data.TableDataSource;
import com.fr.data.impl.TableDataSourceDependent; import com.fr.data.impl.TableDataSourceDependent;
import com.fr.design.DesignModelAdapter; import com.fr.design.DesignModelAdapter;
import com.fr.design.ExtraDesignClassManager; import com.fr.design.ExtraDesignClassManager;
import com.fr.design.actions.ForbiddenUpdateAction;
import com.fr.design.actions.UpdateAction; import com.fr.design.actions.UpdateAction;
import com.fr.design.constants.UIConstants; import com.fr.design.constants.UIConstants;
import com.fr.design.data.BasicTableDataTreePane; import com.fr.design.data.BasicTableDataTreePane;
@ -243,7 +244,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
dg.setVisible(true); dg.setVisible(true);
} }
private class EditAction extends UpdateAction { private class EditAction extends ForbiddenUpdateAction {
public EditAction() { public EditAction() {
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
this.setMnemonic('E'); this.setMnemonic('E');
@ -260,7 +261,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
} }
} }
private class RemoveAction extends UpdateAction { private class RemoveAction extends ForbiddenUpdateAction {
public RemoveAction() { public RemoveAction() {
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"));

21
designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceLoader.java vendored

@ -0,0 +1,21 @@
package com.fr.design.env;
import com.fr.workspace.WorkContext;
import com.fr.workspace.Workspace;
/**
* @author hades
* @version 10.0
* Created by hades on 2021/4/11
*/
public class DesignerWorkspaceLoader {
public static void init() {
Workspace workspace = WorkContext.getCurrent();
if (workspace.isLocal()) {
return;
}
workspace.isWarDeploy();
workspace.isCluster();
}
}

44
designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java vendored

@ -14,6 +14,7 @@ import com.fr.workspace.connect.WorkspaceConnectionInfo;
import com.fr.workspace.server.authority.decision.DecisionOperator; import com.fr.workspace.server.authority.decision.DecisionOperator;
import com.fr.workspace.engine.rpc.WorkspaceProxyPool; import com.fr.workspace.engine.rpc.WorkspaceProxyPool;
import com.fr.workspace.pool.WorkObjectPool; import com.fr.workspace.pool.WorkObjectPool;
import javax.swing.SwingWorker;
/** /**
* Created by juhaoyu on 2018/6/14. * Created by juhaoyu on 2018/6/14.
@ -29,6 +30,10 @@ public class RemoteWorkspace implements Workspace {
private volatile Boolean isRoot = null; private volatile Boolean isRoot = null;
private volatile Boolean cluster;
private volatile Boolean warDeploy;
RemoteWorkspace(WorkspaceClient client, WorkspaceConnectionInfo connection) { RemoteWorkspace(WorkspaceClient client, WorkspaceConnectionInfo connection) {
this.client = client; this.client = client;
@ -50,12 +55,15 @@ public class RemoteWorkspace implements Workspace {
@Override @Override
public boolean isWarDeploy() { public boolean isWarDeploy() {
return WorkContext.getCurrent().get(CommonOperator.class, new ExceptionHandler<Boolean>() { if (warDeploy == null) {
@Override warDeploy = WorkContext.getCurrent().get(CommonOperator.class, new ExceptionHandler<Boolean>() {
public Boolean callHandler(RPCInvokerExceptionInfo rpcInvokerExceptionInfo) { @Override
return false; public Boolean callHandler(RPCInvokerExceptionInfo rpcInvokerExceptionInfo) {
} return false;
}).isWarDeploy(); }
}).isWarDeploy();
}
return warDeploy;
} }
@Override @Override
@ -79,12 +87,15 @@ public class RemoteWorkspace implements Workspace {
@Override @Override
public boolean isCluster() { public boolean isCluster() {
return WorkContext.getCurrent().get(ClusterOperator.class, new ExceptionHandler<Boolean>() { if (cluster == null) {
@Override cluster = WorkContext.getCurrent().get(ClusterOperator.class, new ExceptionHandler<Boolean>() {
public Boolean callHandler(RPCInvokerExceptionInfo rpcInvokerExceptionInfo) { @Override
return false; public Boolean callHandler(RPCInvokerExceptionInfo rpcInvokerExceptionInfo) {
} return false;
}).isCluster(); }
}).isCluster();
}
return cluster;
} }
@Override @Override
@ -114,8 +125,13 @@ public class RemoteWorkspace implements Workspace {
@Override @Override
public void close() { public void close() {
new SwingWorker<Void, Void>() {
client.close(); @Override
protected Void doInBackground() throws Exception {
client.close();
return null;
}
}.execute();
} }
@Override @Override

47
designer-base/src/main/java/com/fr/design/env/WorkspaceChangeLoadingDialog.java vendored

@ -0,0 +1,47 @@
package com.fr.design.env;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.utils.gui.GUICoreUtils;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
import javax.swing.ImageIcon;
import javax.swing.JDialog;
/**
* @author hades
* @version 10.0
* Created by hades on 2021/4/10
*/
public class WorkspaceChangeLoadingDialog extends JDialog {
private static final ImageIcon LOADING_ICON = new ImageIcon(WorkspaceChangeLoadingDialog.class.getResource("/com/fr/web/images/loading-local.gif"));
private static WorkspaceChangeLoadingDialog dialog;
public WorkspaceChangeLoadingDialog() {
super(DesignerContext.getDesignerFrame());
setLayout(new BorderLayout());
this.getContentPane().setBackground(Color.WHITE);
this.setResizable(false);
this.setUndecorated(true);
this.setAlwaysOnTop(true);
this.setModal(false);
this.setSize(new Dimension(400, 100));
this.add(new UILabel(LOADING_ICON, UILabel.CENTER), BorderLayout.NORTH);
this.add(new UILabel(Toolkit.i18nText("Fine-Design_Change_Workspace_Tip"), UILabel.CENTER), BorderLayout.CENTER);
GUICoreUtils.centerWindow(this);
}
public static void showDialog() {
dialog = new WorkspaceChangeLoadingDialog();
dialog.setVisible(true);
}
public static void hideDialog() {
dialog.dispose();
}
}

31
designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java

@ -33,6 +33,7 @@ import java.util.List;
import java.util.ListIterator; import java.util.ListIterator;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import javax.swing.SwingWorker;
/** /**
* 历史模板缓存 * 历史模板缓存
@ -45,6 +46,7 @@ public class HistoryTemplateListCache implements CallbackEvent {
private static final int DEAD_LINE = DesignerEnvManager.getEnvManager().getCachingTemplateLimit(); private static final int DEAD_LINE = DesignerEnvManager.getEnvManager().getCachingTemplateLimit();
private List<JTemplate<?, ?>> historyList; private List<JTemplate<?, ?>> historyList;
private JTemplate<?, ?> editingTemplate; private JTemplate<?, ?> editingTemplate;
private SwingWorker<Boolean, Void> stashWorker;
public static HistoryTemplateListCache getInstance() { public static HistoryTemplateListCache getInstance() {
return Holder.INSTANCE; return Holder.INSTANCE;
@ -338,6 +340,17 @@ public class HistoryTemplateListCache implements CallbackEvent {
* @see HistoryTemplateListCache#load() * @see HistoryTemplateListCache#load()
*/ */
public void stash() { public void stash() {
stashWorker = new SwingWorker<Boolean, Void>() {
@Override
protected Boolean doInBackground() throws Exception {
_stash();
return true;
}
};
stashWorker.execute();
}
private void _stash() {
FineLoggerFactory.getLogger().info("Env Change Template Stashing..."); FineLoggerFactory.getLogger().info("Env Change Template Stashing...");
if (stashFILEMap == null) { if (stashFILEMap == null) {
stashFILEMap = new HashMap<Integer, FILE>(); stashFILEMap = new HashMap<Integer, FILE>();
@ -363,6 +376,14 @@ public class HistoryTemplateListCache implements CallbackEvent {
FineLoggerFactory.getLogger().info("Env Change Template Stashed."); FineLoggerFactory.getLogger().info("Env Change Template Stashed.");
} }
private boolean checkStash() {
try {
return stashWorker.get();
} catch (Exception e) {
return false;
}
}
/** /**
* 切换环境前将正在编辑的模板暂存起来后在新环境重新读取一遍 * 切换环境前将正在编辑的模板暂存起来后在新环境重新读取一遍
* <p> * <p>
@ -371,6 +392,9 @@ public class HistoryTemplateListCache implements CallbackEvent {
* @see HistoryTemplateListCache#stash() * @see HistoryTemplateListCache#stash()
*/ */
public void load() { public void load() {
if (!checkStash()) {
return;
}
FineLoggerFactory.getLogger().info("Env Change Template Loading..."); FineLoggerFactory.getLogger().info("Env Change Template Loading...");
if (stashFILEMap != null && stashFILEMap.size() != 0) { if (stashFILEMap != null && stashFILEMap.size() != 0) {
int size = historyList.size(); int size = historyList.size();
@ -488,4 +512,11 @@ public class HistoryTemplateListCache implements CallbackEvent {
return false; return false;
} }
public void replaceCurrentEditingTemplate(JTemplate<?, ?> jt) {
int index = contains(this.editingTemplate);
this.editingTemplate = jt;
historyList.set(index, jt);
MutilTempalteTabPane.getInstance().refreshOpenedTemplate(historyList);
MutilTempalteTabPane.getInstance().setSelectedIndex(contains(jt));
}
} }

29
designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java

@ -14,6 +14,8 @@ import com.fr.design.mainframe.JTemplate;
import com.fr.design.utils.DesignUtils; import com.fr.design.utils.DesignUtils;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.design.utils.gui.GUIPaintUtils; import com.fr.design.utils.gui.GUIPaintUtils;
import com.fr.design.worker.WorkerManager;
import com.fr.design.worker.save.CallbackSaveWorker;
import com.fr.file.FILE; import com.fr.file.FILE;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
@ -682,9 +684,15 @@ public class MutilTempalteTabPane extends JComponent {
int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?", int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?",
Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
if (returnVal == JOptionPane.YES_OPTION) { if (returnVal == JOptionPane.YES_OPTION) {
specifiedTemplate.saveTemplate(); CallbackSaveWorker worker = specifiedTemplate.save();
FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); worker.addSuccessCallback(new Runnable() {
closeTpl(specifiedTemplate); @Override
public void run() {
FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName()));
closeTpl(specifiedTemplate);
}
});
worker.start(specifiedTemplate.getTarget().getTemplateID());
} else if (returnVal == JOptionPane.NO_OPTION) { } else if (returnVal == JOptionPane.NO_OPTION) {
closeTpl(specifiedTemplate); closeTpl(specifiedTemplate);
} }
@ -919,8 +927,19 @@ public class MutilTempalteTabPane extends JComponent {
closeIconIndex = getTemplateIndex(evtX); closeIconIndex = getTemplateIndex(evtX);
clodeMode = MOUSE_PRESS_CLOSE; clodeMode = MOUSE_PRESS_CLOSE;
//关闭close图标所在的模板{ //关闭close图标所在的模板{
closeFormat(openedTemplate.get(closeIconIndex)); JTemplate<?, ?> template = openedTemplate.get(closeIconIndex);
closeSpecifiedTemplate(openedTemplate.get(closeIconIndex)); if (template.isOpening()) {
WorkerManager.getInstance().cancelWorker(template.getPath());
} else if (template.isSaving()) {
boolean completed = WorkerManager.getInstance().isCompleted(template.getTarget().getTemplateID());
if (!completed) {
FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design_Close_Template_Tip", template.getEditingFILE().getName()));
return;
}
}
closeFormat(template);
closeSpecifiedTemplate(template);
DesignerContext.getDesignerFrame().getContentFrame().repaint(); DesignerContext.getDesignerFrame().getContentFrame().repaint();
isShowList = false; isShowList = false;
} else { } else {

2
designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java

@ -195,7 +195,7 @@ public class SaveSomeTemplatePane extends BasicPane {
specifiedTemplate.stopEditing(); specifiedTemplate.stopEditing();
int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?", int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?",
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
if (returnVal == JOptionPane.YES_OPTION && specifiedTemplate.saveTemplate()) { if (returnVal == JOptionPane.YES_OPTION) {
specifiedTemplate.saveTemplate(); specifiedTemplate.saveTemplate();
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName()));
} }

52
designer-base/src/main/java/com/fr/design/gui/ibutton/UIForbiddenButton.java

@ -0,0 +1,52 @@
package com.fr.design.gui.ibutton;
import com.fr.base.CellBorderStyle;
import javax.swing.Action;
import javax.swing.Icon;
import javax.swing.plaf.ButtonUI;
/**
* @author hades
* @version 10.0
* Created by hades on 2021/4/9
*/
public class UIForbiddenButton extends UIButton {
public UIForbiddenButton() {
super();
}
public UIForbiddenButton(String string) {
super(string);
}
public UIForbiddenButton(Icon icon) {
super(icon);
}
public UIForbiddenButton(Action action) {
super(action);
}
public UIForbiddenButton(String text, Icon icon) {
super(text, icon);
}
public UIForbiddenButton(Icon normal, Icon rollOver, Icon pressed) {
super(normal, rollOver, pressed);
}
public UIForbiddenButton(String resource, boolean needSetDisabledIcon) {
super(resource, needSetDisabledIcon);
}
@Override
public CellBorderStyle getBorderStyle() {
return super.getBorderStyle();
}
@Override
public ButtonUI getUI() {
return new UIForbiddenButtonUI();
}
}

25
designer-base/src/main/java/com/fr/design/gui/ibutton/UIForbiddenButtonUI.java

@ -0,0 +1,25 @@
package com.fr.design.gui.ibutton;
import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.mainframe.JTemplate;
import java.awt.Graphics;
import javax.swing.JComponent;
/**
* @author hades
* @version 10.0
* Created by hades on 2021/4/11
*/
public class UIForbiddenButtonUI extends UIButtonUI {
@Override
public void paint(Graphics g, JComponent c) {
super.paint(g, c);
JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
boolean flag = true;
if (template != null) {
flag = c.isEnabled() && !template.isSaving() && !template.isOpening();
}
c.setEnabled(flag);
}
}

44
designer-base/src/main/java/com/fr/design/gui/ibutton/UISaveForbiddenButton.java

@ -0,0 +1,44 @@
package com.fr.design.gui.ibutton;
import javax.swing.Action;
import javax.swing.Icon;
import javax.swing.plaf.ButtonUI;
/**
* @author hades
* @version 10.0
* Created by hades on 2021/4/10
*/
public class UISaveForbiddenButton extends UIButton {
public UISaveForbiddenButton() {
}
public UISaveForbiddenButton(String string) {
super(string);
}
public UISaveForbiddenButton(Icon icon) {
super(icon);
}
public UISaveForbiddenButton(Action action) {
super(action);
}
public UISaveForbiddenButton(String text, Icon icon) {
super(text, icon);
}
public UISaveForbiddenButton(Icon normal, Icon rollOver, Icon pressed) {
super(normal, rollOver, pressed);
}
public UISaveForbiddenButton(String resource, boolean needSetDisabledIcon) {
super(resource, needSetDisabledIcon);
}
@Override
public ButtonUI getUI() {
return new UISaveForbiddenButtonUI();
}
}

25
designer-base/src/main/java/com/fr/design/gui/ibutton/UISaveForbiddenButtonUI.java

@ -0,0 +1,25 @@
package com.fr.design.gui.ibutton;
import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.mainframe.JTemplate;
import java.awt.Graphics;
import javax.swing.JComponent;
/**
* @author hades
* @version 10.0
* Created by hades on 2021/4/14
*/
public class UISaveForbiddenButtonUI extends UIButtonUI {
@Override
public void paint(Graphics g, JComponent c) {
super.paint(g, c);
JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
boolean flag = true;
if (template != null) {
flag = !template.isSaving();
}
c.setEnabled(flag);
}
}

18
designer-base/src/main/java/com/fr/design/gui/imenu/UIForBiddenHeadMenu.java

@ -0,0 +1,18 @@
package com.fr.design.gui.imenu;
/**
* @author hades
* @version 10.0
* Created by hades on 2021/4/11
*/
public class UIForBiddenHeadMenu extends UIHeadMenu {
public UIForBiddenHeadMenu(String name) {
super(name);
}
@Override
public void updateUI() {
setUI(new UIForbiddenMenuUI());
}
}

25
designer-base/src/main/java/com/fr/design/gui/imenu/UIForbiddenMenuUI.java

@ -0,0 +1,25 @@
package com.fr.design.gui.imenu;
import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.mainframe.JTemplate;
import java.awt.Graphics;
import javax.swing.JComponent;
/**
* @author hades
* @version 10.0
* Created by hades on 2021/4/11
*/
public class UIForbiddenMenuUI extends UIMenuUI {
@Override
public void paint(Graphics g, JComponent c) {
// JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
// boolean flag = true;
// if (template != null) {
// flag = !template.isSaving() && !template.isOpening();
// }
// c.setEnabled(flag);
super.paint(g, c);
}
}

17
designer-base/src/main/java/com/fr/design/gui/itoolbar/UIToolbar.java

@ -1,8 +1,11 @@
package com.fr.design.gui.itoolbar; package com.fr.design.gui.itoolbar;
import javax.swing.*; import com.fr.design.file.HistoryTemplateListCache;
import java.awt.*; import com.fr.design.mainframe.JTemplate;
import java.awt.Component;
import java.awt.FlowLayout;
import java.util.ArrayList; import java.util.ArrayList;
import javax.swing.JToolBar;
public class UIToolbar extends JToolBar { public class UIToolbar extends JToolBar {
@ -31,4 +34,14 @@ public class UIToolbar extends JToolBar {
} }
} }
} }
public void refreshUIToolBar() {
JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
if (template != null) {
for (int i = 0; i < getComponentCount(); i++) {
Component component = getComponents()[i];
component.setEnabled(!template.isSaving() && !template.isOpening());
}
}
}
} }

45
designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java

@ -404,7 +404,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
designerOpenedListenerList.clear(); designerOpenedListenerList.clear();
} }
protected DesktopCardPane getCenterTemplateCardPane() { public DesktopCardPane getCenterTemplateCardPane() {
return centerTemplateCardPane; return centerTemplateCardPane;
} }
@ -811,6 +811,13 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
layeredPane.repaint(); layeredPane.repaint();
} }
public void refreshUIToolBar() {
if (toolbarComponent instanceof UIToolbar) {
((UIToolbar ) toolbarComponent).refreshUIToolBar();
}
combineUp.refreshUIToolBar();
}
public JComponent getToolbarComponent() { public JComponent getToolbarComponent() {
return this.toolbarComponent; return this.toolbarComponent;
@ -940,42 +947,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
return this.centerTemplateCardPane.getSelectedJTemplate(); return this.centerTemplateCardPane.getSelectedJTemplate();
} }
/**
* 保存当前编辑的模板
*/
public void saveCurrentEditingTemplate() {
JTemplate<?, ?> editingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
if (editingTemplate == null) {
return;
}
if (editingTemplate.isSaved()) {// isSaved == true表示已经保存过,或者新建的一张模板
if (editingTemplate.getEditingFILE().exists()) {// 表示磁盘上的某一张已经保存过的模板,要添加到历史中
// HistoryTemplateListPane.getInstance().addHistory();
}
} else {
editingTemplate.stopEditing();
if (!editingTemplate.getEditingFILE().exists()) {
int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + editingTemplate.getEditingFILE()
+ "\" ?", Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION,
JOptionPane.QUESTION_MESSAGE);
if (returnVal == JOptionPane.YES_OPTION && editingTemplate.saveTemplate()) {
editingTemplate.saveTemplate();
FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved",
editingTemplate.getEditingFILE().getName()));
}
} else {
if (editingTemplate.saveTemplate()) {
editingTemplate.saveTemplate();
FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved",
editingTemplate.getEditingFILE().getName()));
}
}
}
}
/** /**
* 添加新建模板, 并激活. * 添加新建模板, 并激活.
*/ */

27
designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

@ -289,16 +289,18 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
// 新建文件夹,重命名操作,在explorer中打开三个操作在选中单个文件夹或者文件时可用,其他情况不可用 // 新建文件夹,重命名操作,在explorer中打开三个操作在选中单个文件夹或者文件时可用,其他情况不可用
boolean singleSelected = selectedPathNum == 1; boolean singleSelected = selectedPathNum == 1;
// 打开和保存中 需要禁用相关操作
boolean enable = isEnable();
newFolderAction.setEnabled(singleSelected); newFolderAction.setEnabled(singleSelected);
renameAction.setEnabled(singleSelected); renameAction.setEnabled(singleSelected && enable);
showInExplorerAction.setEnabled(singleSelected); showInExplorerAction.setEnabled(singleSelected);
// 删除操作在至少选中一个时可用 // 删除操作在至少选中一个时可用
boolean selected = selectedPathNum > 0; boolean selected = selectedPathNum > 0;
delFileAction.setEnabled(selected); delFileAction.setEnabled(selected && enable);
// 刷新操作始终可用 // 刷新操作始终可用
refreshTreeAction.setEnabled(true); refreshTreeAction.setEnabled(true);
//触发vcsAction变化 //触发vcsAction变化
vcsAction.fireVcsActionChange(); vcsAction.fireVcsActionChange(enable);
// 其他状态 // 其他状态
otherStateChange(); otherStateChange();
@ -363,7 +365,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
/** /**
* 版本管理可用状态的监控 * 版本管理可用状态的监控
*/ */
private void fireVcsActionChange() { private void fireVcsActionChange(boolean enable) {
if (!DesignerEnvManager.getEnvManager().getVcsConfigManager().isVcsEnable() if (!DesignerEnvManager.getEnvManager().getVcsConfigManager().isVcsEnable()
|| VcsHelper.getInstance().isUnSelectedTemplate() || VcsHelper.getInstance().isUnSelectedTemplate()
|| WorkContext.getCurrent().isCluster()) { || WorkContext.getCurrent().isCluster()) {
@ -381,14 +383,14 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
if (node.getLock() != null && !ComparatorUtils.equals(node.getUserID(), node.getLock())) { if (node.getLock() != null && !ComparatorUtils.equals(node.getUserID(), node.getLock())) {
setEnabled(false); setEnabled(false);
} else { } else {
setEnabled(true); setEnabled(enable);
} }
} else { } else {
setEnabled(false); setEnabled(false);
} }
} else { } else {
//当前环境为本地环境时 //当前环境为本地环境时
setEnabled(pathSupportVcsAction); setEnabled(pathSupportVcsAction && enable);
} }
} }
} }
@ -915,5 +917,18 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
} }
} }
private boolean isEnable() {
List<JTemplate<?, ?>> templates = HistoryTemplateListCache.getInstance().getHistoryList();
for (JTemplate<?, ?> template : templates) {
if (template.isSaving() || template.isOpening()) {
FileNode node = TemplateTreePane.getInstance().getFileNode();
if (node != null && ComparatorUtils.equals(template.getEditingFILE().getPath(), node.getEnvPath())) {
return false;
}
}
}
return true;
}
} }

46
designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java

@ -11,6 +11,8 @@ import com.fr.design.event.TargetModifiedEvent;
import com.fr.design.event.TargetModifiedListener; import com.fr.design.event.TargetModifiedListener;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Component;
import javax.swing.JLayeredPane;
/** /**
@ -21,9 +23,21 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private JTemplate<?, ?> component; private JTemplate<?, ?> component;
private TransparentPane transparentPane = new TransparentPane();
private OpenLoadingPane loadingPane = new OpenLoadingPane();
private JLayeredPane layeredPane = new JLayeredPane() {
@Override
public void doLayout() {
for (Component comp : getComponents()) {
comp.setBounds(0, 0, getWidth(), getHeight());
}
}
};
protected DesktopCardPane() { protected DesktopCardPane() {
setLayout(new BorderLayout()); setLayout(new BorderLayout());
layeredPane.add(transparentPane, 1);
layeredPane.add(loadingPane, 2);
} }
protected void showJTemplate(final JTemplate<?, ?> jt) { protected void showJTemplate(final JTemplate<?, ?> jt) {
@ -36,10 +50,12 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
DesignerFrameFileDealerPane.getInstance().setCurrentEditingTemplate(jt); DesignerFrameFileDealerPane.getInstance().setCurrentEditingTemplate(jt);
if (component != null) { if (component != null) {
component.onLostFocus(); component.onLostFocus();
remove(component); layeredPane.remove(component);
} }
component = jt; component = jt;
add(component, BorderLayout.CENTER); layeredPane.add(component, 0);
checkSavingAndOpening(jt);
add(layeredPane, BorderLayout.CENTER);
validate(); validate();
repaint(); repaint();
revalidate(); revalidate();
@ -47,6 +63,32 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
component.onGetFocus(); component.onGetFocus();
} }
private void checkSavingAndOpening(JTemplate<?, ?> jt) {
if (jt.isSaving()) {
showCover();
} else if (jt.isOpening()) {
showOpenStatus();
} else {
hideCover();
}
}
private void showOpenStatus() {
DesignerContext.getDesignerFrame().refreshUIToolBar();
EastRegionContainerPane.getInstance().updateAllPropertyPane();
layeredPane.moveToFront(loadingPane);
}
public void showCover() {
layeredPane.moveToFront(transparentPane);
DesignerContext.getDesignerFrame().refreshUIToolBar();
}
public void hideCover() {
layeredPane.moveToFront(component);
}
protected JTemplate<?, ?> getSelectedJTemplate() { protected JTemplate<?, ?> getSelectedJTemplate() {
return component; return component;
} }

10
designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java

@ -6,6 +6,7 @@ import com.fr.base.vcs.DesignerMode;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;
import com.fr.design.ExtraDesignClassManager; import com.fr.design.ExtraDesignClassManager;
import com.fr.design.constants.UIConstants; import com.fr.design.constants.UIConstants;
import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.fun.PropertyItemPaneProvider; import com.fr.design.fun.PropertyItemPaneProvider;
import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ibutton.UIButtonUI; import com.fr.design.gui.ibutton.UIButtonUI;
@ -791,8 +792,13 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
// 选项不可用 // 选项不可用
public void setEnabled(boolean isEnabled) { public void setEnabled(boolean isEnabled) {
this.isEnabled = isEnabled; JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
button.setEnabled(isEnabled); if (template != null) {
this.isEnabled = isEnabled && !template.isOpening() && !template.isSaving();
} else {
this.isEnabled = isEnabled;
}
button.setEnabled(this.isEnabled);
} }
public void setIconBaseDir(String iconBaseDir) { public void setIconBaseDir(String iconBaseDir) {

245
designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@ -1,7 +1,6 @@
package com.fr.design.mainframe; package com.fr.design.mainframe;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.base.FRContext;
import com.fr.base.Parameter; import com.fr.base.Parameter;
import com.fr.base.io.BaseBook; import com.fr.base.io.BaseBook;
import com.fr.base.iofile.attr.DesignBanCopyAttrMark; import com.fr.base.iofile.attr.DesignBanCopyAttrMark;
@ -22,6 +21,7 @@ import com.fr.design.designer.DesignerProxy;
import com.fr.design.designer.TargetComponent; import com.fr.design.designer.TargetComponent;
import com.fr.design.dialog.FineJOptionPane; import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.dialog.InformationWarnPane; import com.fr.design.dialog.InformationWarnPane;
import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.file.TemplateResourceManager; import com.fr.design.file.TemplateResourceManager;
import com.fr.design.file.TemplateTreePane; import com.fr.design.file.TemplateTreePane;
@ -49,6 +49,8 @@ import com.fr.design.menu.NameSeparator;
import com.fr.design.menu.ShortCut; import com.fr.design.menu.ShortCut;
import com.fr.design.preview.PagePreview; import com.fr.design.preview.PagePreview;
import com.fr.design.ui.util.UIUtil; import com.fr.design.ui.util.UIUtil;
import com.fr.design.worker.save.CallbackSaveWorker;
import com.fr.design.worker.save.EmptyCallBackSaveWorker;
import com.fr.design.write.submit.DBManipulationInWidgetEventPane; import com.fr.design.write.submit.DBManipulationInWidgetEventPane;
import com.fr.design.write.submit.DBManipulationPane; import com.fr.design.write.submit.DBManipulationPane;
import com.fr.event.EventDispatcher; import com.fr.event.EventDispatcher;
@ -77,6 +79,7 @@ import com.fr.stable.core.UUID;
import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContext;
import com.fr.workspace.server.lock.TplOperator; import com.fr.workspace.server.lock.TplOperator;
import java.util.concurrent.Callable;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.Icon; import javax.swing.Icon;
import javax.swing.JComponent; import javax.swing.JComponent;
@ -92,10 +95,10 @@ import java.util.Set;
/** /**
* 报表设计和表单设计的编辑区域(设计器编辑的IO文件) * 报表设计和表单设计的编辑区域(设计器编辑的IO文件)
*/ */
public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>> extends TargetComponent<T> implements ToolBarMenuDockPlus, DesignerProxy { public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>> extends TargetComponent<T> implements ToolBarMenuDockPlus, DesignerProxy, JTemplateSave {
// TODO ALEX_SEP editingFILE这个属性一定要吗?如果非要不可,有没有可能保证不为null // TODO ALEX_SEP editingFILE这个属性一定要吗?如果非要不可,有没有可能保证不为null
private static final int PREFIX_NUM = 3000; private static final int PREFIX_NUM = 3000;
private FILE editingFILE = null; protected FILE editingFILE = null;
// alex:初始状态为saved,这样不管是新建模板,还是打开模板,如果未做任何操作直接关闭,不提示保存 // alex:初始状态为saved,这样不管是新建模板,还是打开模板,如果未做任何操作直接关闭,不提示保存
private boolean saved = true; private boolean saved = true;
private boolean authoritySaved = true; private boolean authoritySaved = true;
@ -110,6 +113,8 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
private DesignModelAdapter<T, ?> designModel; private DesignModelAdapter<T, ?> designModel;
private PreviewProvider previewType; private PreviewProvider previewType;
protected TimeConsumeTimer consumeTimer = new TimeConsumeTimer(); protected TimeConsumeTimer consumeTimer = new TimeConsumeTimer();
private volatile boolean saving = false;
private volatile boolean opening = false;
private PluginEventListener pluginListener; private PluginEventListener pluginListener;
@ -125,7 +130,15 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
this(t, file, false); this(t, file, false);
} }
public JTemplate(T t, FILE file, Parameter[] parameters) {
this(t, file, false, parameters);
}
public JTemplate(T t, FILE file, boolean isNewFile) { public JTemplate(T t, FILE file, boolean isNewFile) {
this(t, file, isNewFile, null);
}
public JTemplate(T t, FILE file, boolean isNewFile, Parameter[] parameters) {
super(t); super(t);
beforeInit(); beforeInit();
// 判断是否切换设计器状态到禁止拷贝剪切 // 判断是否切换设计器状态到禁止拷贝剪切
@ -139,7 +152,11 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
this.editingFILE = file; this.editingFILE = file;
this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.setBorder(BorderFactory.createEmptyBorder()); this.setBorder(BorderFactory.createEmptyBorder());
designModel = createDesignModel(); if (parameters == null) {
designModel = createDesignModel();
} else {
designModel = createDesignModel(parameters);
}
addCenterPane(); addCenterPane();
this.undoState = createUndoState(); this.undoState = createUndoState();
@ -397,6 +414,12 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
protected abstract DesignModelAdapter<T, ?> createDesignModel(); protected abstract DesignModelAdapter<T, ?> createDesignModel();
protected DesignModelAdapter<T, ?> createDesignModel(Parameter[] parameters) {
// 空实现 兼容下
return null;
}
/** /**
* 创建菜单项Preview * 创建菜单项Preview
* *
@ -614,6 +637,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
* *
* @return 保存模板 * @return 保存模板
*/ */
@Deprecated
public boolean saveTemplate() { public boolean saveTemplate() {
return this.saveTemplate(true); return this.saveTemplate(true);
} }
@ -623,6 +647,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
* *
* @return 保存成功返回true * @return 保存成功返回true
*/ */
@Deprecated
public boolean saveTemplate2Env() { public boolean saveTemplate2Env() {
return this.saveTemplate(false); return this.saveTemplate(false);
} }
@ -632,6 +657,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
* *
* @return 保存成功返回true * @return 保存成功返回true
*/ */
@Deprecated
public boolean saveAsTemplate() { public boolean saveAsTemplate() {
return this.saveAsTemplate(true); return this.saveAsTemplate(true);
} }
@ -641,6 +667,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
* *
* @return 保存成功返回true * @return 保存成功返回true
*/ */
@Deprecated
public boolean saveAsTemplate2Env() { public boolean saveAsTemplate2Env() {
return this.saveAsTemplate(false); return this.saveAsTemplate(false);
} }
@ -651,6 +678,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
* @param isShowLoc 是否本地 * @param isShowLoc 是否本地
* @return 保存成功返回true * @return 保存成功返回true
*/ */
@Deprecated
public boolean saveTemplate(boolean isShowLoc) { public boolean saveTemplate(boolean isShowLoc) {
FILE editingFILE = this.getEditingFILE(); FILE editingFILE = this.getEditingFILE();
// carl:editingFILE没有,当然不存了,虽然不会有这种情况 // carl:editingFILE没有,当然不存了,虽然不会有这种情况
@ -662,17 +690,6 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
if (!editingFILE.exists()) { if (!editingFILE.exists()) {
return saveAsTemplate(isShowLoc); return saveAsTemplate(isShowLoc);
} }
boolean access = false;
try {
access = FRContext.getOrganizationOperator().canAccess(this.getEditingFILE().getPath());
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
if (!access) {
FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.WARNING_MESSAGE);
return false;
}
collectInfo(); collectInfo();
return this.saveFile(); return this.saveFile();
} }
@ -702,6 +719,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
* @param fileName 保存文件名 * @param fileName 保存文件名
* @return * @return
*/ */
@Deprecated
public boolean saveAsTemplate(boolean isShowLoc, String fileName) { public boolean saveAsTemplate(boolean isShowLoc, String fileName) {
String oldName = this.getPath(); String oldName = this.getPath();
// alex:如果是SaveAs的话需要让用户来选择路径了 // alex:如果是SaveAs的话需要让用户来选择路径了
@ -717,20 +735,6 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
FILE sourceFile = editingFILE; FILE sourceFile = editingFILE;
if (isOkOperation(chooseResult)) { if (isOkOperation(chooseResult)) {
boolean access = false;
try {
access = FRContext.getOrganizationOperator().canAccess(fileChooser.getSelectedFILE().getPath());
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
if (!access) {
FineJOptionPane.showMessageDialog(
DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!",
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert"),
JOptionPane.WARNING_MESSAGE);
return false;
}
// 目标文件 // 目标文件
editingFILE = fileChooser.getSelectedFILE(); editingFILE = fileChooser.getSelectedFILE();
} }
@ -1392,4 +1396,187 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
return StringUtils.EMPTY; return StringUtils.EMPTY;
} }
private CallbackSaveWorker save(boolean showLoc) {
FILE editingFILE = this.getEditingFILE();
// carl:editingFILE没有,当然不存了,虽然不会有这种情况
if (editingFILE == null) {
return new EmptyCallBackSaveWorker();
}
// 检查一下editingFILE是不是已存在的文件,如果不存在则用saveAs
if (!editingFILE.exists()) {
return saveAs(showLoc);
}
CallbackSaveWorker worker = new CallbackSaveWorker(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
collectInfo();
return JTemplate.this.saveRealFile();
}
}, this);
worker.addSuccessCallback(new Runnable() {
@Override
public void run() {
callBackForSave();
}
});
return worker;
}
private void callBackForSave() {
JTemplate.this.saved = true;
JTemplate.this.authoritySaved = true;
DesignerContext.getDesignerFrame().setTitle();
JTemplate.this.fireJTemplateSaved();
}
private boolean saveRealFile() throws Exception {
FILE editingFILE = this.getEditingFILE();
if (editingFILE == null || editingFILE instanceof MemFILE) {
return false;
}
this.getTarget().export(TemplateResourceManager.getResource().saveTemplate(editingFILE));
this.editingFILE = editingFILE;
return true;
}
private CallbackSaveWorker saveAs(boolean showLoc) {
FILE editingFILE = this.getEditingFILE();
if (editingFILE == null) {
return new EmptyCallBackSaveWorker();
}
String oldName = this.getPath();
// alex:如果是SaveAs的话需要让用户来选择路径了
FILEChooserPane fileChooser = getFILEChooserPane(showLoc);
addChooseFILEFilter(fileChooser);
fileChooser.setFileNameTextField(editingFILE.getName(), this.suffix());
int chooseResult = fileChooser.showSaveDialog(DesignerContext.getDesignerFrame(), this.suffix());
if (isCancelOperation(chooseResult)) {
return new EmptyCallBackSaveWorker();
}
// 源文件
FILE sourceFile = editingFILE;
if (isOkOperation(chooseResult)) {
// 目标文件
editingFILE = fileChooser.getSelectedFILE();
}
// 在保存之前,初始化 templateID
if (StringUtils.isEmpty(this.template.getTemplateID())) {
generateTemplateId();
}
FILE finalEditingFILE = editingFILE;
CallbackSaveWorker worker = new CallbackSaveWorker(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
return saveAs(finalEditingFILE, sourceFile, oldName);
}
}, this);
worker.addSuccessCallback(new Runnable() {
@Override
public void run() {
callBackForSave();
// 当前打开的是正在保存的模板才刷新
if (ComparatorUtils.equals(JTemplate.this.template.getTemplateID(),
HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().template.getTemplateID())) {
refreshToolArea();
}
DesignerFrameFileDealerPane.getInstance().refresh();
}
});
return worker;
}
private boolean saveAs(FILE editingFILE, FILE sourceFile, String oldName) throws Exception {
boolean lockedTarget =
// 目标本地文件
!editingFILE.isEnvFile() ||
// 目标远程文件
WorkContext.getCurrent().get(TplOperator.class).saveAs(editingFILE.getPath());
if (lockedTarget) {
boolean saved = saveNewRealFile(editingFILE, oldName);
// 目标文件保存成功并且源文件不一致的情况下,把源文件锁释放掉
if (saved && !ComparatorUtils.equals(editingFILE.getPath(), sourceFile.getPath())) {
WorkContext.getCurrent().get(TplOperator.class).closeAndFreeFile(sourceFile.getPath());
}
return saved;
} else {
return false;
}
}
private boolean saveNewRealFile(FILE editingFILE, String oldName) throws Exception {
consumeTimer.setEnabled(true);
consumeTimer.start();
this.editingFILE = editingFILE;
boolean result = this.saveToNewRealFile(oldName);
if (result) {
collectInfo(this.template.getTemplateID());
}
return result;
}
private boolean saveToNewRealFile(String oldName) throws Exception {
boolean result = false;
Set<ReportSupportedFileUIProvider> providers = ExtraDesignClassManager.getInstance().getArray(ReportSupportedFileUIProvider.XML_TAG);
for (ReportSupportedFileUIProvider provider : providers) {
result = result || provider.saveToNewFile(this.editingFILE.getPath(), this);
}
if (!result) {
result = this.saveRealFile();
// 更换最近打开
DesignerEnvManager.getEnvManager().replaceRecentOpenedFilePath(oldName, this.getPath());
}
return result;
}
@Override
public CallbackSaveWorker save() {
return save(true);
}
@Override
public CallbackSaveWorker saveAs() {
return saveAs(true);
}
@Override
public void saveDirectly() {
CallbackSaveWorker worker = save();
worker.start(this.template.getTemplateID());
}
@Override
public void saveAsDirectly() {
CallbackSaveWorker worker = saveAs();
worker.start(this.template.getTemplateID());
}
public boolean isSaving() {
return saving;
}
public void setSaving(boolean saving) {
this.saving = saving;
}
public boolean isOpening() {
return opening;
}
public void setOpening(boolean opening) {
this.opening = opening;
}
public boolean checkEnable() {
return !isSaving() && !isOpening();
}
} }

40
designer-base/src/main/java/com/fr/design/mainframe/JTemplateSave.java

@ -0,0 +1,40 @@
package com.fr.design.mainframe;
import com.fr.design.worker.save.CallbackSaveWorker;
/**
* 模板保存接口
*
* @author hades
* @version 10.0
* Created by hades on 2021/4/9
*/
public interface JTemplateSave {
/**
* 直接保存后需要根据是否成功做外部回调
*
* @return
*/
CallbackSaveWorker save();
/**
* 另存为后需要根据是否成功做外部回调
*
* @return
*/
CallbackSaveWorker saveAs();
/**D
* 直接保存
*/
void saveDirectly();
/**
* 直接另存为
*/
void saveAsDirectly();
}

60
designer-base/src/main/java/com/fr/design/mainframe/OpenLoadingPane.java

@ -0,0 +1,60 @@
package com.fr.design.mainframe;
import com.fr.design.gui.ilable.UILabel;
import com.fr.general.IOUtils;
import java.awt.Color;
import java.awt.Component;
import java.awt.Container;
import java.awt.Dimension;
import java.awt.LayoutManager;
import javax.swing.ImageIcon;
import javax.swing.JPanel;
/**
* @author hades
* @version 10.0
* Created by hades on 2021/4/9
*/
public class OpenLoadingPane extends JPanel {
private UILabel loadingLabel;
public OpenLoadingPane() {
setLayout(new LayoutManager() {
@Override
public void removeLayoutComponent(Component comp) {
}
@Override
public Dimension preferredLayoutSize(Container parent) {
return parent.getPreferredSize();
}
@Override
public Dimension minimumLayoutSize(Container parent) {
return null;
}
@Override
public void layoutContainer(Container parent) {
int width = parent.getParent().getWidth();
int height = parent.getParent().getHeight();
int loadingLabelWidth = loadingLabel.getPreferredSize().width;
int loadingLabelHeight = loadingLabel.getPreferredSize().height;
int loadingLabelX = (width - loadingLabelWidth) / 2;
int loadingLabelY = (height - loadingLabelHeight) / 2;
loadingLabel.setBounds(loadingLabelX, loadingLabelY, loadingLabelWidth, loadingLabelHeight);
}
@Override
public void addLayoutComponent(String name, Component comp) {
}
});
setBackground(Color.WHITE);
loadingLabel = new UILabel(new ImageIcon(IOUtils.readImage("com/fr/plugin/chart/vanchart/export/loading.png")));
add(loadingLabel);
}
}

102
designer-base/src/main/java/com/fr/design/mainframe/TransparentPane.java

@ -0,0 +1,102 @@
package com.fr.design.mainframe;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.i18n.Toolkit;
import java.awt.AlphaComposite;
import java.awt.Color;
import java.awt.Component;
import java.awt.Composite;
import java.awt.Container;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.LayoutManager;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import javax.swing.ImageIcon;
import javax.swing.JComponent;
/**
* @author hades
* @version 10.0
* Created by hades on 2021/4/12
*/
public class TransparentPane extends JComponent {
private static final ImageIcon LOADING_ICON = new ImageIcon(TransparentPane.class.getResource("/com/fr/web/images/loading-local.gif"));
private UILabel loadingLabel;
private UILabel label;
private AlphaComposite composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3f);
public TransparentPane() {
addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
// do nothing
}
});
setLayout(getCoverLayout());
setBackground(null);
setOpaque(false);
loadingLabel = new UILabel(LOADING_ICON);
label = new UILabel(Toolkit.i18nText("Fine-Design_Saving_Template_Tip"));
add(loadingLabel);
add(label);
}
protected LayoutManager getCoverLayout() {
return new LayoutManager() {
@Override
public void removeLayoutComponent(Component comp) {
}
@Override
public Dimension preferredLayoutSize(Container parent) {
return parent.getPreferredSize();
}
@Override
public Dimension minimumLayoutSize(Container parent) {
return null;
}
@Override
public void layoutContainer(Container parent) {
int width = parent.getParent().getWidth();
int height = parent.getParent().getHeight();
int loadingLabelWidth = loadingLabel.getPreferredSize().width;
int loadingLabelHeight = loadingLabel.getPreferredSize().height;
int buttonX = (width - loadingLabelWidth) / 2;
int buttonY = (height - loadingLabelHeight) / 2;
int labelWidth = label.getPreferredSize().width;
int labelHeight = label.getPreferredSize().height;
int labelX = (width - labelWidth) / 2;
int labelY = (height - labelHeight) / 2 + loadingLabelHeight;
label.setBounds(labelX, labelY, labelWidth, labelHeight);
loadingLabel.setBounds(buttonX, buttonY, loadingLabelWidth, loadingLabelHeight);
}
@Override
public void addLayoutComponent(String name, Component comp) {
}
};
}
@Override
public void paint(Graphics g) {
Graphics2D g2d = (Graphics2D) g;
Composite oldComposite = g2d.getComposite();
g2d.setComposite(composite);
g2d.setColor(Color.BLACK);
g2d.fillRect(0, 0, getWidth(), getHeight());
g2d.setComposite(oldComposite);
super.paint(g);
}
}

37
designer-base/src/main/java/com/fr/design/menu/MenuDef.java

@ -1,12 +1,17 @@
package com.fr.design.menu; package com.fr.design.menu;
import com.fr.base.svg.IconUtils; import com.fr.base.svg.IconUtils;
import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.imenu.*; import com.fr.design.gui.imenu.*;
import com.fr.design.gui.iscrollbar.UIScrollBar; import com.fr.design.gui.iscrollbar.UIScrollBar;
import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.JTemplate;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import java.util.HashSet;
import java.util.Set;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.MenuEvent; import javax.swing.event.MenuEvent;
import javax.swing.event.MenuListener; import javax.swing.event.MenuListener;
@ -25,6 +30,17 @@ public class MenuDef extends ShortCut {
private static final int MENU_DEFAULTWDITH = 156; private static final int MENU_DEFAULTWDITH = 156;
private static final int BLANK_WIDTH = 30; private static final int BLANK_WIDTH = 30;
private static final Set<String> FORBIDDEN_SET = new HashSet<>();
{
FORBIDDEN_SET.add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Template"));
FORBIDDEN_SET.add(Toolkit.i18nText("Fine-Design_Report_M_Insert"));
FORBIDDEN_SET.add(Toolkit.i18nText("Fine-Design_Basic_Action_Add"));
FORBIDDEN_SET.add(KeySetUtils.CELL.getMenuKeySetName());
FORBIDDEN_SET.add(KeySetUtils.INSERT_FLOAT.getMenuKeySetName());
}
protected String name; protected String name;
//右侧属性表弹出框重绘 //右侧属性表弹出框重绘
protected Boolean isEastAttr = false; protected Boolean isEastAttr = false;
@ -390,6 +406,21 @@ public class MenuDef extends ShortCut {
toolBar.add(this.createUIButton()); toolBar.add(this.createUIButton());
} }
private boolean checkEnable(JComponent component) {
if (FORBIDDEN_SET.contains(component.getName())) {
JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
boolean flag = true;
if (template != null) {
flag = !template.isSaving() && !template.isOpening();
}
component.setEnabled(flag);
if (!flag) {
return false;
}
}
return true;
}
protected MenuListener createMenuListener() { protected MenuListener createMenuListener() {
return menuDefListener; return menuDefListener;
@ -411,7 +442,9 @@ public class MenuDef extends ShortCut {
if (!(source instanceof JMenu)) { if (!(source instanceof JMenu)) {
return; return;
} }
if (!checkEnable(createJMenu())) {
return;
}
MenuDef.this.updateMenu(); MenuDef.this.updateMenu();
} }
}; };
@ -421,7 +454,7 @@ public class MenuDef extends ShortCut {
public void mouseReleased(MouseEvent evt) { public void mouseReleased(MouseEvent evt) {
Object source = evt.getSource(); Object source = evt.getSource();
UIButton button = (UIButton) source; UIButton button = (UIButton) source;
if (!button.isEnabled()) { if (!checkEnable(button)) {
return; return;
} }
if (isEastAttr) { if (isEastAttr) {

49
designer-base/src/main/java/com/fr/design/worker/WorkerManager.java

@ -0,0 +1,49 @@
package com.fr.design.worker;
import java.util.HashMap;
import java.util.Map;
import javax.swing.SwingWorker;
import org.jetbrains.annotations.Nullable;
/**
* @author hades
* @version 10.0
* Created by hades on 2021/4/2
*/
public class WorkerManager {
private static final WorkerManager INSTANCE = new WorkerManager();
private Map<String, SwingWorker> workerMap = new HashMap<>();
public static WorkerManager getInstance() {
return INSTANCE;
}
@Nullable
public SwingWorker getWorker(String taskName) {
return workerMap.get(taskName);
}
public boolean isCompleted(String taskName) {
SwingWorker worker = getWorker(taskName);
return worker == null || worker.isDone();
}
public void registerWorker(String taskName, SwingWorker worker) {
workerMap.put(taskName, worker);
}
public void removeWorker(String taskName) {
workerMap.remove(taskName);
}
public void cancelWorker(String taskName) {
SwingWorker worker = getWorker(taskName);
if (worker != null && !worker.isDone()) {
worker.cancel(true);
removeWorker(taskName);
}
}
}

28
designer-base/src/main/java/com/fr/design/worker/open/OpenResult.java

@ -0,0 +1,28 @@
package com.fr.design.worker.open;
import com.fr.base.io.BaseBook;
/**
* @author hades
* @version 10.0
* Created by hades on 2021/4/13
*/
public class OpenResult<T extends BaseBook, R> {
private final T baseBook;
private final R ref;
public OpenResult(T baseBook, R r) {
this.baseBook = baseBook;
this.ref = r;
}
public T getBaseBook() {
return baseBook;
}
public R getRef() {
return ref;
}
}

115
designer-base/src/main/java/com/fr/design/worker/open/OpenWorker.java

@ -0,0 +1,115 @@
package com.fr.design.worker.open;
import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.EastRegionContainerPane;
import com.fr.design.mainframe.JTemplate;
import com.fr.design.worker.WorkerManager;
import com.fr.file.FILE;
import com.fr.general.ComparatorUtils;
import com.fr.log.FineLoggerFactory;
import java.util.concurrent.Callable;
import java.util.concurrent.CancellationException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import javax.swing.SwingWorker;
/**
* 模板打开的worker
*
* @author hades
* @version 10.0
* Created by hades on 2021/4/9
*/
public class OpenWorker<T> extends SwingWorker<T, Void> {
private static final int TIME_OUT = 400;
private final Callable<T> callable;
private final JTemplate<?, ?> template;
private Callable<JTemplate<?, ?>> templateCallable;
private boolean slowly = false;
private String taskName;
private T result;
public OpenWorker(Callable<T> callable, JTemplate<?, ?> template) {
this.callable = callable;
this.template = template;
}
@Override
protected T doInBackground() throws Exception {
return this.callable.call();
}
@Override
protected void done() {
try {
result = get();
} catch (CancellationException ignored) {
return;
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
this.template.setOpening(false);
// 后续动作
if (slowly && templateCallable != null) {
try {
JTemplate<?, ?> book = templateCallable.call();
FILE tplFile = book.getEditingFILE();
JTemplate<?, ?> currentTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
// 当前tab页是正在打开的模板
if (ComparatorUtils.equals(currentTemplate.getEditingFILE(), tplFile)) {
currentTemplate.whenClose();
DesignerContext.getDesignerFrame().addAndActivateJTemplate(book);
HistoryTemplateListCache.getInstance().replaceCurrentEditingTemplate(book);
EastRegionContainerPane.getInstance().updateAllPropertyPane();
return;
}
// 当前tab页是其他模板
for (int i = 0, len = HistoryTemplateListCache.getInstance().getHistoryCount(); i < len; i++) {
JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().get(i);
if (ComparatorUtils.equals(template.getEditingFILE(), book.getEditingFILE())) {
template.whenClose();
HistoryTemplateListCache.getInstance().getHistoryList().set(i, book);
return;
}
}
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
}
WorkerManager.getInstance().removeWorker(taskName);
}
public void addCallBack(Callable<JTemplate<?, ?>> templateCallable) {
this.templateCallable = templateCallable;
}
public void start(String taskName) {
this.taskName = taskName;
this.template.setOpening(true);
this.execute();
WorkerManager.getInstance().registerWorker(taskName, this);
}
public T getResult() {
if (result != null) {
return result;
}
try {
return this.get(TIME_OUT, TimeUnit.MILLISECONDS);
} catch (TimeoutException e) {
slowly = true;
} catch (Exception exception) {
FineLoggerFactory.getLogger().error(exception.getMessage(), exception);
WorkerManager.getInstance().removeWorker(taskName);
}
return null;
}
}

75
designer-base/src/main/java/com/fr/design/worker/save/CallbackSaveWorker.java

@ -0,0 +1,75 @@
package com.fr.design.worker.save;
import com.fr.common.util.Collections;
import com.fr.design.mainframe.JTemplate;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.Callable;
/**
* 保存之后需要做些外部回调
*
* @author hades
* @version 10.0
* Created by hades on 2021/4/8
*/
public class CallbackSaveWorker extends SaveWorker {
private List<Runnable> successRunnableList;
private List<Runnable> failRunnableList;
public CallbackSaveWorker(Callable<Boolean> callable, JTemplate<?, ?> template) {
super(callable, template);
}
@Override
protected void done() {
super.done();
if (success) {
fireRunnable(successRunnableList);
} else {
fireRunnable(failRunnableList);
}
successRunnableList = null;
failRunnableList = null;
}
private void fireRunnable(List<Runnable> list) {
if (Collections.isEmpty(list)) {
return;
}
for (Runnable runnable : list) {
runnable.run();
}
}
private void addCallback(List<Runnable> runnableList, Runnable runnable) {
if (runnableList == null) {
runnableList = new LinkedList<>();
}
if (runnable != null) {
runnableList.add(runnable);
}
}
public void addSuccessCallback(Runnable successRunnable) {
if (successRunnableList == null) {
successRunnableList = new LinkedList<>();
}
if (successRunnable != null) {
successRunnableList.add(successRunnable);
}
}
public void addFailCallback(Runnable failRunnable) {
if (failRunnableList == null) {
failRunnableList = new LinkedList<>();
}
if (failRunnable != null) {
failRunnableList.add(failRunnable);
}
}
}

37
designer-base/src/main/java/com/fr/design/worker/save/EmptyCallBackSaveWorker.java

@ -0,0 +1,37 @@
package com.fr.design.worker.save;
import com.fr.design.mainframe.JTemplate;
import java.util.concurrent.Callable;
/**
* 空实现
*
* @author hades
* @version 10.0
* Created by hades on 2021/4/9
*/
public class EmptyCallBackSaveWorker extends CallbackSaveWorker {
public EmptyCallBackSaveWorker(Callable<Boolean> callable, JTemplate<?, ?> template) {
super(callable, template);
}
public EmptyCallBackSaveWorker() {
this(null, null);
}
@Override
protected Boolean doInBackground() throws Exception {
return false;
}
@Override
protected void done() {
// do nothing
}
@Override
public void start(String taskName) {
// do nothing
}
}

82
designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java

@ -0,0 +1,82 @@
package com.fr.design.worker.save;
import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.DesignerFrame;
import com.fr.design.mainframe.DesignerFrameFileDealerPane;
import com.fr.design.mainframe.EastRegionContainerPane;
import com.fr.design.mainframe.JTemplate;
import com.fr.design.worker.WorkerManager;
import com.fr.general.ComparatorUtils;
import com.fr.log.FineLoggerFactory;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import javax.swing.SwingWorker;
/**
* 模板保存的worker
*
* @author hades
* @version 10.0
* Created by hades on 2021/4/1
*/
public class SaveWorker extends SwingWorker<Boolean, Void> {
private static final int TIME_OUT = 400;
private final Callable<Boolean> callable;
private String taskName;
private final JTemplate<?, ?> template;
protected boolean success;
public SaveWorker(Callable<Boolean> callable, JTemplate<?, ?> template) {
this.callable = callable;
this.template = template;
}
@Override
protected Boolean doInBackground() throws Exception {
return callable.call();
}
@Override
protected void done() {
try {
success = get();
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
this.template.setSaving(false);
// 恢复界面
if (ComparatorUtils.equals(this.template.getName(), HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getName())) {
EastRegionContainerPane.getInstance().updateAllPropertyPane();
DesignerContext.getDesignerFrame().refreshUIToolBar();
DesignerContext.getDesignerFrame().getCenterTemplateCardPane().hideCover();
}
DesignerFrameFileDealerPane.getInstance().stateChange();
WorkerManager.getInstance().removeWorker(taskName);
}
public void start(String taskName) {
this.taskName = taskName;
this.template.setSaving(true);
this.execute();
// worker纳入管理
WorkerManager.getInstance().registerWorker(taskName, this);
try {
this.get(TIME_OUT, TimeUnit.MILLISECONDS);
} catch (TimeoutException timeoutException) {
// 开始禁用
EastRegionContainerPane.getInstance().updateAllPropertyPane();
DesignerContext.getDesignerFrame().getCenterTemplateCardPane().showCover();
DesignerFrameFileDealerPane.getInstance().stateChange();
} catch (Exception exception) {
FineLoggerFactory.getLogger().error(exception.getMessage(), exception);
WorkerManager.getInstance().removeWorker(taskName);
}
}
}

5
designer-base/src/main/java/com/fr/file/FILEChooserPane.java

@ -892,7 +892,7 @@ public class FILEChooserPane extends BasicPane {
if (access(selectedFile) && access(currentDirectory)) { if (access(selectedFile) && access(currentDirectory)) {
if (selectedFile.exists()) { if (selectedFile.exists()) {
int selVal = FineJOptionPane.showConfirmDialog(dialog, Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Cover_The_Current_File") + " ?", int selVal = FineJOptionPane.showConfirmDialog(dialog, Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Cover_The_Current_File") + " ?",
Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
if (selVal == JOptionPane.YES_OPTION) { if (selVal == JOptionPane.YES_OPTION) {
option = JOPTIONPANE_OK_OPTION; option = JOPTIONPANE_OK_OPTION;
saveDictionary(); saveDictionary();
@ -913,9 +913,8 @@ public class FILEChooserPane extends BasicPane {
private boolean access(FILE selectedFile) { private boolean access(FILE selectedFile) {
boolean access = false; boolean access = true;
try { try {
access = FRContext.getOrganizationOperator().canAccess(selectedFile.getPath());
if (selectedFile.isEnvFile() && selectedFile instanceof FileNodeFILE) { if (selectedFile.isEnvFile() && selectedFile instanceof FileNodeFILE) {
FileNodeFILE fileNodeFILE = ((FileNodeFILE) selectedFile); FileNodeFILE fileNodeFILE = ((FileNodeFILE) selectedFile);
access = access && fileNodeFILE.hasFullAuth() && NodeAuthProcessor.getInstance().checkFileNodeAuth(new FileNode(fileNodeFILE.getPath(), fileNodeFILE.isDirectory())); access = access && fileNodeFILE.hasFullAuth() && NodeAuthProcessor.getInstance().checkFileNodeAuth(new FileNode(fileNodeFILE.getPath(), fileNodeFILE.isDirectory()));

4
designer-form/src/main/java/com/fr/design/mainframe/FormModelAdapter.java

@ -27,6 +27,10 @@ public class FormModelAdapter extends DesignModelAdapter<Form, BaseJForm<Form>>
super(jForm); super(jForm);
} }
public FormModelAdapter(BaseJForm<Form> jTemplate, Parameter[] parameters) {
super(jTemplate, parameters);
}
/** /**
* 环境改变. * 环境改变.
*/ */

8
designer-form/src/main/java/com/fr/design/mainframe/JForm.java

@ -127,6 +127,9 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
super(new Form(new WBorderLayout("form")), "Form"); super(new Form(new WBorderLayout("form")), "Form");
} }
public JForm(Form form, FILE file, Parameter[] parameters) {
super(form, file, parameters);
}
public JForm(Form form, FILE file) { public JForm(Form form, FILE file) {
super(form, file); super(form, file);
@ -679,6 +682,11 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
return new FormModelAdapter(this); return new FormModelAdapter(this);
} }
@Override
protected FormModelAdapter createDesignModel(Parameter[] parameters) {
return new FormModelAdapter(this, parameters);
}
@Override @Override
public JPanel[] toolbarPanes4Form() { public JPanel[] toolbarPanes4Form() {
return this.index == FORM_TAB ? return this.index == FORM_TAB ?

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

@ -1,12 +1,12 @@
package com.fr.design.mainframe; package com.fr.design.mainframe;
import com.fr.base.BaseUtils;
import com.fr.base.vcs.DesignerMode; import com.fr.base.vcs.DesignerMode;
import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XCreator;
import com.fr.design.form.util.FormDesignerUtils; import com.fr.design.form.util.FormDesignerUtils;
import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.core.WidgetOption; import com.fr.design.gui.core.WidgetOption;
import com.fr.design.designer.creator.XCreatorUtils; import com.fr.design.designer.creator.XCreatorUtils;
import com.fr.design.gui.ibutton.UIForbiddenButtonUI;
import com.fr.form.ui.Widget; import com.fr.form.ui.Widget;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
@ -20,6 +20,7 @@ import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener; import java.awt.event.MouseMotionListener;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
import javax.swing.plaf.ButtonUI;
/* /*
*august: 控件按钮 *august: 控件按钮
@ -73,6 +74,10 @@ public class ToolBarButton extends UIButton implements MouseListener, MouseMotio
@Override @Override
public void mouseDragged(MouseEvent e) { public void mouseDragged(MouseEvent e) {
if (!isEnabled()) {
return;
}
if (DesignerMode.isAuthorityEditing()) { if (DesignerMode.isAuthorityEditing()) {
return; return;
} }
@ -164,4 +169,9 @@ public class ToolBarButton extends UIButton implements MouseListener, MouseMotio
@Override @Override
public void mouseExited(MouseEvent e) { public void mouseExited(MouseEvent e) {
} }
@Override
public ButtonUI getUI() {
return new UIForbiddenButtonUI();
}
} }

3
designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java

@ -271,6 +271,9 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
@Override @Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
//如果没有格式刷,点击时就是想使用格式刷 //如果没有格式刷,点击时就是想使用格式刷
if (!formatBrush.isEnabled()) {
return;
}
if (e.getClickCount() == 1) { if (e.getClickCount() == 1) {
if (!formatBrush.isSelected()) { if (!formatBrush.isSelected()) {
DesignerContext.setFormatState(DesignerContext.FORMAT_STATE_ONCE); DesignerContext.setFormatState(DesignerContext.FORMAT_STATE_ONCE);

9
designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

@ -145,6 +145,10 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
super(workBook, fileName); super(workBook, fileName);
populateReportParameterAttr(); populateReportParameterAttr();
} }
public JWorkBook(WorkBook workBook, FILE file, Parameter[] parameters) {
super(workBook, file, parameters);
populateReportParameterAttr();
}
public JWorkBook(WorkBook workBook, FILE file) { public JWorkBook(WorkBook workBook, FILE file) {
super(workBook, file); super(workBook, file);
@ -871,6 +875,11 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
return new WorkBookModelAdapter(this); return new WorkBookModelAdapter(this);
} }
@Override
protected WorkBookModelAdapter createDesignModel(Parameter[] parameters) {
return new WorkBookModelAdapter(this, parameters);
}
/** /**
* 表单的工具栏 * 表单的工具栏
* *

3
designer-realize/src/main/java/com/fr/design/mainframe/WorkBookModelAdapter.java

@ -36,6 +36,9 @@ public class WorkBookModelAdapter extends DesignModelAdapter<WorkBook, JWorkBook
super(jworkbook); super(jworkbook);
} }
public WorkBookModelAdapter(JWorkBook jTemplate, Parameter[] parameters) {
super(jTemplate, parameters);
}
/** /**
* 重命名TableData后的一些操作 * 重命名TableData后的一些操作

29
designer-realize/src/main/java/com/fr/design/mainframe/app/AbstractWorkBookApp.java

@ -1,10 +1,15 @@
package com.fr.design.mainframe.app; package com.fr.design.mainframe.app;
import com.fr.base.Parameter;
import com.fr.design.mainframe.App; import com.fr.design.mainframe.App;
import com.fr.design.mainframe.JTemplate; import com.fr.design.mainframe.JTemplate;
import com.fr.design.mainframe.JWorkBook; import com.fr.design.mainframe.JWorkBook;
import com.fr.design.worker.open.OpenResult;
import com.fr.design.worker.open.OpenWorker;
import com.fr.file.FILE; import com.fr.file.FILE;
import com.fr.main.impl.WorkBook; import com.fr.main.impl.WorkBook;
import com.fr.report.worksheet.WorkSheet;
import java.util.concurrent.Callable;
/** /**
* Created by juhaoyu on 2018/6/27. * Created by juhaoyu on 2018/6/27.
@ -20,8 +25,28 @@ abstract class AbstractWorkBookApp implements App<WorkBook> {
@Override @Override
public JTemplate<WorkBook, ?> openTemplate(FILE tplFile) { public JTemplate<WorkBook, ?> openTemplate(FILE tplFile) {
JWorkBook emptyTemplate = new JWorkBook(new WorkBook(new WorkSheet()), tplFile);
return new JWorkBook(asIOFile(tplFile), tplFile); OpenWorker<OpenResult<WorkBook, Parameter[]>> worker = new OpenWorker<>(
new Callable<OpenResult<WorkBook, Parameter[]>>() {
@Override
public OpenResult<WorkBook, Parameter[]> call() {
WorkBook workBook = asIOFile(tplFile);
return new OpenResult<>(workBook, workBook.getParameters());
}
}, emptyTemplate);
worker.addCallBack(new Callable<JTemplate<?, ?>>() {
@Override
public JTemplate<?, ?> call() throws Exception {
OpenResult<WorkBook, Parameter[]> result = worker.getResult();
return new JWorkBook(result.getBaseBook(), tplFile, result.getRef());
}
});
worker.start(tplFile.getPath());
OpenResult<WorkBook, Parameter[]> result = worker.getResult();
if (result != null) {
return new JWorkBook(result.getBaseBook(), tplFile);
}
return emptyTemplate;
} }
@Override @Override

8
designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java

@ -12,6 +12,7 @@ import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.DecodeDialog; import com.fr.design.mainframe.DecodeDialog;
import com.fr.design.ui.util.UIUtil;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.exception.DecryptTemplateException; import com.fr.exception.DecryptTemplateException;
import com.fr.exception.RemoteDesignPermissionDeniedException; import com.fr.exception.RemoteDesignPermissionDeniedException;
@ -85,7 +86,12 @@ class CptApp extends AbstractWorkBookApp {
al.add((String) it.next()); al.add((String) it.next());
} }
if (!al.isEmpty()) { if (!al.isEmpty()) {
showConfirmDialog(al); UIUtil.invokeLaterIfNeeded(new Runnable() {
@Override
public void run() {
showConfirmDialog(al);
}
});
} }
} }

34
designer-realize/src/main/java/com/fr/design/mainframe/app/FormApp.java

@ -1,22 +1,28 @@
package com.fr.design.mainframe.app; package com.fr.design.mainframe.app;
import com.fr.base.Parameter;
import com.fr.base.io.XMLEncryptUtils; import com.fr.base.io.XMLEncryptUtils;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.AbstractAppProvider; import com.fr.design.mainframe.AbstractAppProvider;
import com.fr.design.mainframe.BaseJForm; import com.fr.design.mainframe.BaseJForm;
import com.fr.design.mainframe.DecodeDialog; import com.fr.design.mainframe.DecodeDialog;
import com.fr.design.mainframe.JForm;
import com.fr.design.mainframe.JTemplate; import com.fr.design.mainframe.JTemplate;
import com.fr.design.worker.open.OpenResult;
import com.fr.design.worker.open.OpenWorker;
import com.fr.exception.DecryptTemplateException; import com.fr.exception.DecryptTemplateException;
import com.fr.exception.RemoteDesignPermissionDeniedException; import com.fr.exception.RemoteDesignPermissionDeniedException;
import com.fr.exception.TplLockedException; import com.fr.exception.TplLockedException;
import com.fr.file.FILE; import com.fr.file.FILE;
import com.fr.form.main.Form; import com.fr.form.main.Form;
import com.fr.form.ui.container.WBorderLayout;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.fr.stable.Constants; import com.fr.stable.Constants;
import com.fr.stable.bridge.StableFactory; import com.fr.stable.bridge.StableFactory;
import java.util.HashMap; import java.util.HashMap;
import java.util.concurrent.Callable;
/** /**
* Created by juhaoyu on 2018/6/27. * Created by juhaoyu on 2018/6/27.
@ -36,9 +42,31 @@ class FormApp extends AbstractAppProvider {
HashMap<String, Class> classType = new HashMap<String, Class>(); HashMap<String, Class> classType = new HashMap<String, Class>();
classType.put(Constants.ARG_0, Form.class); classType.put(Constants.ARG_0, Form.class);
classType.put(Constants.ARG_1, FILE.class); classType.put(Constants.ARG_1, FILE.class);
classType.put(Constants.ARG_2, Parameter[].class);
return (JTemplate<Form, ?>) StableFactory.getMarkedInstanceObjectFromClass(BaseJForm.XML_TAG, JForm emptyForm = new JForm(new Form(new WBorderLayout("form")), tplFile);
new Object[]{asIOFile(tplFile), tplFile}, classType, BaseJForm.class); OpenWorker<OpenResult<Form, Parameter[]>> worker = new OpenWorker<>(
new Callable<OpenResult<Form, Parameter[]>>() {
@Override
public OpenResult<Form, Parameter[]> call() throws Exception {
Form form = asIOFile(tplFile);
return new OpenResult<>(form, form.getParameters());
}
}, emptyForm);
worker.addCallBack(new Callable<JTemplate<?, ?>>() {
@Override
public JTemplate<?, ?> call() throws Exception {
OpenResult<Form, Parameter[]> result = worker.getResult();
return (JTemplate<Form, ?>) StableFactory.getMarkedInstanceObjectFromClass(BaseJForm.XML_TAG,
new Object[]{result.getBaseBook(), tplFile, result.getRef()}, classType, BaseJForm.class);
}
});
worker.start(tplFile.getPath());
OpenResult<Form, Parameter[]> result = worker.getResult();
if (result != null) {
return (JTemplate<Form, ?>) StableFactory.getMarkedInstanceObjectFromClass(BaseJForm.XML_TAG,
new Object[]{result.getBaseBook(), tplFile, new Parameter[0]}, classType, BaseJForm.class);
}
return emptyForm;
} }
@Override @Override

7
designer-realize/src/main/java/com/fr/start/MainDesigner.java

@ -17,6 +17,7 @@ import com.fr.design.file.MutilTempalteTabPane;
import com.fr.design.fun.MenuHandler; import com.fr.design.fun.MenuHandler;
import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ibutton.UIPreviewButton; import com.fr.design.gui.ibutton.UIPreviewButton;
import com.fr.design.gui.ibutton.UISaveForbiddenButton;
import com.fr.design.gui.imenu.UIMenuItem; import com.fr.design.gui.imenu.UIMenuItem;
import com.fr.design.gui.imenu.UIPopupMenu; import com.fr.design.gui.imenu.UIPopupMenu;
import com.fr.design.gui.itoolbar.UILargeToolbar; import com.fr.design.gui.itoolbar.UILargeToolbar;
@ -232,7 +233,7 @@ public class MainDesigner extends BaseDesigner {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
jt.stopEditing(); jt.stopEditing();
jt.saveTemplate(); jt.saveDirectly();
jt.requestFocus(); jt.requestFocus();
} }
}); });
@ -270,12 +271,12 @@ public class MainDesigner extends BaseDesigner {
} }
private void createRunButton(UILargeToolbar largeToolbar) { private void createRunButton(UILargeToolbar largeToolbar) {
run = new UIPreviewButton(new UIButton(UIConstants.PAGE_BIG_ICON) { run = new UIPreviewButton(new UISaveForbiddenButton(UIConstants.PAGE_BIG_ICON) {
@Override @Override
public Dimension getPreferredSize() { public Dimension getPreferredSize() {
return new Dimension(34, 34); return new Dimension(34, 34);
} }
}, new UIButton(UIConstants.PREVIEW_DOWN) { }, new UISaveForbiddenButton(UIConstants.PREVIEW_DOWN) {
@Override @Override
public Dimension getPreferredSize() { public Dimension getPreferredSize() {
return new Dimension(34, 10); return new Dimension(34, 10);

2
designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java

@ -27,6 +27,7 @@ import com.fr.design.actions.insert.flot.ImageFloatAction;
import com.fr.design.actions.insert.flot.TextBoxFloatAction; import com.fr.design.actions.insert.flot.TextBoxFloatAction;
import com.fr.design.bridge.DesignToolbarProvider; import com.fr.design.bridge.DesignToolbarProvider;
import com.fr.design.constants.DesignerLaunchStatus; import com.fr.design.constants.DesignerLaunchStatus;
import com.fr.design.env.DesignerWorkspaceLoader;
import com.fr.design.form.parameter.FormParaDesigner; import com.fr.design.form.parameter.FormParaDesigner;
import com.fr.design.fun.ElementUIProvider; import com.fr.design.fun.ElementUIProvider;
import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameObjectCreator;
@ -145,6 +146,7 @@ public class DesignerActivator extends Activator {
designerModuleStart(); designerModuleStart();
loadLogAppender(); loadLogAppender();
DesignerSocketIO.update(); DesignerSocketIO.update();
DesignerWorkspaceLoader.init();
OSSupportCenter.buildAction(new OSBasedAction() { OSSupportCenter.buildAction(new OSBasedAction() {
@Override @Override
public void execute(Object... objects) { public void execute(Object... objects) {

3
designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceActivator.java

@ -2,6 +2,7 @@ package com.fr.start.module;
import com.fr.concurrent.NamedThreadFactory; import com.fr.concurrent.NamedThreadFactory;
import com.fr.design.PluginClassRefreshManager; import com.fr.design.PluginClassRefreshManager;
import com.fr.design.env.WorkspaceChangeLoadingDialog;
import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.file.HistoryTemplateListCache;
import com.fr.event.Event; import com.fr.event.Event;
import com.fr.event.Listener; import com.fr.event.Listener;
@ -51,6 +52,7 @@ public class DesignerWorkspaceActivator extends Activator {
@Override @Override
public void on(Event event, Workspace workspace) { public void on(Event event, Workspace workspace) {
WorkspaceChangeLoadingDialog.showDialog();
PluginClassRefreshManager.getInstance().removePluginListener(); PluginClassRefreshManager.getInstance().removePluginListener();
HistoryTemplateListCache.getInstance().stash(); HistoryTemplateListCache.getInstance().stash();
} }
@ -64,6 +66,7 @@ public class DesignerWorkspaceActivator extends Activator {
HistoryTemplateListCache.getInstance().load(); HistoryTemplateListCache.getInstance().load();
PluginClassRefreshManager.getInstance().addPluginListener(); PluginClassRefreshManager.getInstance().addPluginListener();
WorkspaceChangeLoadingDialog.hideDialog();
} }
}); });
} }

Loading…
Cancel
Save