From f9b8d5c17942df8fcaefb2def075b5ada813ad1e Mon Sep 17 00:00:00 2001 From: hzzz Date: Wed, 27 Dec 2017 16:57:12 +0800 Subject: [PATCH] 1227 --- .../fr/design/file/MutilTempalteTabPane.java | 5 +- .../fun/TemplateTreeShortCutProvider.java | 1 + .../AbstractTemplateTreeShortCutProvider.java | 1 + .../com/fr/design/locale/designer.properties | 1 + .../design/locale/designer_en_US.properties | 1 + .../design/locale/designer_ja_JP.properties | 1 + .../design/locale/designer_ko_KR.properties | 1 + .../design/locale/designer_zh_CN.properties | 3 +- .../design/locale/designer_zh_TW.properties | 1 + .../DesignerFrameFileDealerPane.java | 3 +- .../com/fr/design/mainframe/JTemplate.java | 87 ++++++++----------- .../fr/design/mainframe/SiteCenterToken.java | 17 ---- designer_base/src/com/fr/env/RemoteEnv.java | 20 ++--- 13 files changed, 57 insertions(+), 85 deletions(-) delete mode 100644 designer_base/src/com/fr/design/mainframe/SiteCenterToken.java diff --git a/designer_base/src/com/fr/design/file/MutilTempalteTabPane.java b/designer_base/src/com/fr/design/file/MutilTempalteTabPane.java index 6bdfe711ee..f3d62601d9 100644 --- a/designer_base/src/com/fr/design/file/MutilTempalteTabPane.java +++ b/designer_base/src/com/fr/design/file/MutilTempalteTabPane.java @@ -102,8 +102,6 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M // 模板时，模板B会自动关闭 private JTemplate temTemplate = null; - //版本管理时候不允许切换tab - private boolean isVcsMode = false; private AWTEventListener awt = new AWTEventListener() { public void eventDispatched(AWTEvent event) { @@ -636,8 +634,7 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M public void mousePressed(MouseEvent e) { //如果在版本管理情况下，不允许切换tab if (DesignerMode.isVcsMode()) { - //TODO hzzz 国际化 - JOptionPane.showMessageDialog(null, "版本管理不允许切换", Inter.getLocText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Vcs_tab_click"), Inter.getLocText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE); return; } diff --git a/designer_base/src/com/fr/design/fun/TemplateTreeShortCutProvider.java b/designer_base/src/com/fr/design/fun/TemplateTreeShortCutProvider.java index 661dad64ce..f5c9e09c6a 100644 --- a/designer_base/src/com/fr/design/fun/TemplateTreeShortCutProvider.java +++ b/designer_base/src/com/fr/design/fun/TemplateTreeShortCutProvider.java @@ -4,6 +4,7 @@ import com.fr.stable.fun.mark.Aftermath; import com.fr.stable.fun.mark.Mutable; /** + * 左上角目录树上边工具条的插件接口 * Created by hzzz on 2017/11/30. */ public interface TemplateTreeShortCutProvider extends Mutable, Aftermath { diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractTemplateTreeShortCutProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractTemplateTreeShortCutProvider.java index f23f7f8d3f..b8568dd615 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractTemplateTreeShortCutProvider.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractTemplateTreeShortCutProvider.java @@ -5,6 +5,7 @@ import com.fr.design.fun.TemplateTreeShortCutProvider; import com.fr.stable.fun.mark.API; /** + * 左上角目录树上边工具条的插件接口 * Created by hzzz on 2017/11/30. */ @API(level = TemplateTreeShortCutProvider.CURRENT_LEVEL) diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index bbed62b646..db4c469eec 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -2149,3 +2149,4 @@ FR-Designer_Provide_Choose_All= FR-Designer_Decimal_Places= FR-Designer_Env_Des_Https=If HTTPS is enabled or the HTTPS configuration (certificate path, HTTPS key) is modified, you must restart the designer to take effect. FR-Designer_Format_JavaScript=Format Code +FR-Designer-Vcs_tab_click=Please exit the version management status and then switch the template diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties index e5608bf896..4f8e68c121 100644 --- a/designer_base/src/com/fr/design/locale/designer_en_US.properties +++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties @@ -2148,3 +2148,4 @@ FR-Designer_Provide_Choose_All= FR-Designer_Decimal_Places= FR-Designer_Env_Des_Https=If HTTPS is enabled or the HTTPS configuration (certificate path, HTTPS key) is modified, you must restart the designer to take effect. FR-Designer_Format_JavaScript=Format Code +FR-Designer-Vcs_tab_click=Please exit the version management status and then switch the template diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties index bb5cfc1712..4814712b69 100644 --- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties +++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties @@ -2149,3 +2149,4 @@ FR-Designer_Decimal_Places=\u5C0F\u6570\u67A0\u6570: FR-Base-Load_Resource_File=\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u30ED\u30FC\u30C9 FR-Designer_Env_Des_Https= FR-Designer_Format_JavaScript=Format Code +FR-Designer-Vcs_tab_click= diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties index d25124d98e..a159de118c 100644 --- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties +++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties @@ -2149,3 +2149,4 @@ FR-Designer_Export_Background= FR-Designer_Print_Background= FR-Designer_Env_Des_Https= FR-Designer_Format_JavaScript=Format Code +FR-Designer-Vcs_tab_click= diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index f7b8d3a3cd..67a7b7ec5f 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -2148,4 +2148,5 @@ FR-Designer_Sheet_Label_Page_Display_Position= FR-Designer_Provide_Choose_All= FR-Designer_Decimal_Places= FR-Designer_Env_Des_Https=\u82E5\u542F\u7528https\u6216\u4FEE\u6539https\u914D\u7F6E\uFF08\u8BC1\u4E66\u8DEF\u5F84\u3001https\u79D8\u94A5\uFF09\uFF0C\u5FC5\u987B\u91CD\u542F\u8BBE\u8BA1\u5668\u624D\u80FD\u751F\u6548\u3002 -FR-Designer_Format_JavaScript=\u683C\u5F0F\u5316\u4EE3\u7801 \ No newline at end of file +FR-Designer_Format_JavaScript=\u683C\u5F0F\u5316\u4EE3\u7801 +FR-Designer-Vcs_tab_click=\u8BF7\u5148\u9000\u51FA\u7248\u672C\u7BA1\u7406\u72B6\u6001\u518D\u5207\u6362\u6A21\u677F \ No newline at end of file diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties index 42817879ea..c83ca01dba 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties @@ -2148,3 +2148,4 @@ FR-Designer_Provide_Choose_All= FR-Designer_Decimal_Places= FR-Designer_Env_Des_Https=\u82E5\u555F\u7528https\u6216\u4FEE\u6539https\u914D\u7F6E\uFF08\u8B49\u66F8\u8DEF\u5F91\u3001https\u7955\u9470\uFF09\uFF0C\u5FC5\u9808\u91CD\u555F\u8A2D\u8A08\u5668\u624D\u80FD\u751F\u6548\u3002 FR-Designer_Format_JavaScript=Format Code +FR-Designer-Vcs_tab_click= diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java index 701f5c85d0..175463b1d4 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java @@ -174,8 +174,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt /* * Open Report Action */ - private class - OpenReportAction extends UpdateAction { + private class OpenReportAction extends UpdateAction { public OpenReportAction() { this.setName(KeySetUtils.OPEN_TEMPLATE.getMenuKeySetName()); diff --git a/designer_base/src/com/fr/design/mainframe/JTemplate.java b/designer_base/src/com/fr/design/mainframe/JTemplate.java index e9790ab23b..9afe6d802e 100644 --- a/designer_base/src/com/fr/design/mainframe/JTemplate.java +++ b/designer_base/src/com/fr/design/mainframe/JTemplate.java @@ -1,10 +1,6 @@ package com.fr.design.mainframe; -import com.fr.base.BaseUtils; -import com.fr.base.ConfigManager; -import com.fr.base.FRContext; -import com.fr.base.Parameter; -import com.fr.base.ScreenResolution; +import com.fr.base.*; import com.fr.base.io.IOFile; import com.fr.base.iofileattr.TemplateIdAttrMark; import com.fr.base.vcs.DesignerMode; @@ -57,6 +53,7 @@ import com.fr.stable.core.UUID; import com.fr.stable.project.ProjectConstants; import javax.swing.*; +import javax.swing.Icon; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.undo.UndoManager; import java.awt.*; @@ -90,8 +87,7 @@ public abstract class JTemplate> ex private StringBuilder process = new StringBuilder(""); // 制作模板的过程 public int resolution = ScreenResolution.getScreenResolution(); - public JTemplate() { - } + public JTemplate() {} public JTemplate(T t, String defaultFileName) { this(t, new MemFILE(newTemplateNameByIndex(defaultFileName)), true); @@ -133,7 +129,6 @@ public abstract class JTemplate> ex openTime = System.currentTimeMillis(); } } - private void collectInfo() { // 执行收集操作 if (openTime == 0) { // 旧模板，不收集数据 return; @@ -416,7 +411,7 @@ public abstract class JTemplate> ex fireSuperTargetModified(); } - protected boolean accept(Object o) { + protected boolean accept(Object o){ return true; } @@ -526,7 +521,7 @@ public abstract class JTemplate> ex if (!editingFILE.exists()) { return saveAsTemplate(isShowLoc); } - if (!FRContext.getCurrentEnv().hasFileFolderAllow(this.getEditingFILE().getPath())) { + if (!FRContext.getCurrentEnv().hasFileFolderAllow(this.getEditingFILE().getPath()) ) { JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_No-Privilege") + "!", Inter.getLocText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE); return false; } @@ -534,12 +529,12 @@ public abstract class JTemplate> ex return this.saveFile(); } - private boolean isCancelOperation(int operation) { + private boolean isCancelOperation(int operation){ return operation == FILEChooserPane.CANCEL_OPTION || operation == FILEChooserPane.JOPTIONPANE_CANCEL_OPTION; } - private boolean isOkOperation(int operation) { + private boolean isOkOperation(int operation){ return operation == FILEChooserPane.JOPTIONPANE_OK_OPTION || operation == FILEChooserPane.OK_OPTION; } @@ -561,7 +556,7 @@ public abstract class JTemplate> ex } if (isOkOperation(chooseResult)) { - if (!FRContext.getCurrentEnv().hasFileFolderAllow(fileChooser.getSelectedFILE().getPath())) { + if (!FRContext.getCurrentEnv().hasFileFolderAllow(fileChooser.getSelectedFILE().getPath()) ) { JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_No-Privilege") + "!", Inter.getLocText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE); return false; } @@ -573,7 +568,7 @@ public abstract class JTemplate> ex return saveNewFile(editingFILE, oldName); } - protected boolean saveNewFile(FILE editingFILE, String oldName) { + protected boolean saveNewFile(FILE editingFILE, String oldName){ // 在保存之前，初始化 templateID initForCollect(); // 如果保存新模板（新建模板直接保存，或者另存为），则添加 templateID @@ -588,7 +583,7 @@ public abstract class JTemplate> ex return result; } - protected void mkNewFile(FILE file) { + protected void mkNewFile(FILE file){ try { file.mkfile(); } catch (Exception e) { @@ -600,16 +595,16 @@ public abstract class JTemplate> ex * 将模板另存为可以分享出去的混淆后内置数据集模板 * * @return 是否另存成功 + * */ - public boolean saveShareFile() { + public boolean saveShareFile(){ return true; } - - public Widget getSelectElementCase() { + public Widget getSelectElementCase(){ return new NoneWidget(); } - protected FILEChooserPane getFILEChooserPane(boolean isShowLoc) { + protected FILEChooserPane getFILEChooserPane(boolean isShowLoc){ return new FILEChooserPane(true, isShowLoc); } @@ -811,7 +806,7 @@ public abstract class JTemplate> ex } - private int getVersionCompare(String versionString) { + private int getVersionCompare(String versionString){ if (StringUtils.isBlank(versionString)) { return 0; } @@ -821,7 +816,7 @@ public abstract class JTemplate> ex } - private int getVersionCompareHBB(String versionString) { + private int getVersionCompareHBB(String versionString){ if (StringUtils.isBlank(versionString)) { return 0; } @@ -843,8 +838,7 @@ public abstract class JTemplate> ex /** * 判断是否是新版设计器 - * - * @return 是返回true + * @return 是返回true */ public boolean isNewDesigner() { String xmlDesignerVersion = getTarget().getXMLDesignerVersion(); @@ -906,46 +900,41 @@ public abstract class JTemplate> ex /** * 激活指定的template + * */ public void activeJTemplate(int index, JTemplate jt) { DesignerContext.getDesignerFrame().activateJTemplate(this); - } - - ; + }; /** * 激活已存在的模板 + * */ public void activeOldJTemplate() { DesignerContext.getDesignerFrame().activateJTemplate(this); - } - - ; + }; /** * 激活新的模板 + * */ public void activeNewJTemplate() { DesignerContext.getDesignerFrame().addAndActivateJTemplate(this); - } - - ; + }; /** * 后台关闭template + * */ public void closeOverLineTemplate(int index) { JTemplate overTemplate = HistoryTemplateListPane.getInstance().getHistoryList().get(index); HistoryTemplateListPane.getInstance().closeVirtualSelectedReport(overTemplate); HistoryTemplateListPane.getInstance().getHistoryList().set(index, new JVirtualTemplate(overTemplate.getEditingFILE())); - } - - ; + }; /** * 返回当前支持的超链界面pane - * * @return 超链连接界面 */ public abstract HyperlinkGroupPane getHyperLinkPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider); @@ -953,7 +942,6 @@ public abstract class JTemplate> ex /** * 返回当前支持的超链界面pane * 没有悬浮弹窗，显示为两列 - * * @return 超链连接界面 */ public abstract HyperlinkGroupPane getHyperLinkPaneNoPop(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider); @@ -963,7 +951,7 @@ public abstract class JTemplate> ex * * @return 默认不是 */ - public boolean isChartBook() { + public boolean isChartBook(){ return false; } @@ -1015,9 +1003,11 @@ public abstract class JTemplate> ex * 创建内置sql提交的pane * * @return 内置sql提交的pane + * + * * @date 2014-10-14-下午7:39:27 */ - public DBManipulationPane createDBManipulationPane() { + public DBManipulationPane createDBManipulationPane(){ return new DBManipulationPane(); } @@ -1025,22 +1015,22 @@ public abstract class JTemplate> ex * 创建控件事件里内置sql提交的pane * * @return 内置sql提交的pane + * + * * @date 2014-10-14-下午7:39:27 */ - public DBManipulationPane createDBManipulationPaneInWidget() { + public DBManipulationPane createDBManipulationPaneInWidget(){ return new DBManipulationInWidgetEventPane(); } /** * 取小图标，主要用于多TAB标签栏 - * * @return 图表 */ public abstract Icon getIcon(); /** * 导出菜单项 - * * @return 菜单项 */ public ShortCut[] shortcut4ExportMenu() { @@ -1050,13 +1040,12 @@ public abstract class JTemplate> ex /** * 复制JS代码 */ - public void copyJS() { - } + public void copyJS(){} /** * 系列风格改动 */ - public void styleChange() { + public void styleChange(){ } @@ -1064,14 +1053,14 @@ public abstract class JTemplate> ex * 创建分享模板的按钮, 目前只有jworkbook实现了 * * @return 分享模板按钮 + * */ - public UIButton[] createShareButton() { + public UIButton[] createShareButton(){ return new UIButton[0]; } /** * 略 - * * @param provider 预览模式 */ public void previewMenuActionPerformed(PreviewProvider provider) { @@ -1080,7 +1069,6 @@ public abstract class JTemplate> ex /** * 支持的预览模式 - * * @return 预览模式 */ public PreviewProvider[] supportPreview() { @@ -1089,7 +1077,6 @@ public abstract class JTemplate> ex /** * 预览模式转换 - * * @param typeCode 类型 * @return 预览模式 */ @@ -1113,7 +1100,6 @@ public abstract class JTemplate> ex /** * 加载插件中的按钮 - * * @return 按钮组 */ public UIButton[] createExtraButtons() { @@ -1128,7 +1114,6 @@ public abstract class JTemplate> ex /** * 由于老版本的模板没有模板ID，当勾选使用参数模板时候，就加一个模板ID attr - * * @param isUseParamTemplate 是否使用参数模板 */ public void needAddTemplateIdAttr(boolean isUseParamTemplate) { diff --git a/designer_base/src/com/fr/design/mainframe/SiteCenterToken.java b/designer_base/src/com/fr/design/mainframe/SiteCenterToken.java deleted file mode 100644 index 16af4c3654..0000000000 --- a/designer_base/src/com/fr/design/mainframe/SiteCenterToken.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.fr.design.mainframe; - -import com.fr.stable.CodeUtils; - -import java.text.SimpleDateFormat; -import java.util.Calendar; - -/** - * Created by hzzz on 2017/12/4. - */ -public class SiteCenterToken { - - public static String generateToken() { - String date = new SimpleDateFormat("yyyy-MM-dd").format(Calendar.getInstance().getTime()); - return CodeUtils.md5Encode(date, "", "MD5"); - } -} diff --git a/designer_base/src/com/fr/env/RemoteEnv.java b/designer_base/src/com/fr/env/RemoteEnv.java index 05737e7c35..84ebdcec85 100644 --- a/designer_base/src/com/fr/env/RemoteEnv.java +++ b/designer_base/src/com/fr/env/RemoteEnv.java @@ -1009,8 +1009,8 @@ public class RemoteEnv extends AbstractEnv { } try { HashMap para = new HashMap(); - para.put("op", "fs_remote_vcs"); - para.put("cmd", "hzzz"); + para.put("op", "fr_remote_design"); + para.put("cmd", "delete_file"); para.put("file_path", filePath); HttpClient client = createHttpMethod(para); @@ -2075,8 +2075,8 @@ public class RemoteEnv extends AbstractEnv { info.parseJSON(jo); return info; } - - + + @Override public String pluginServiceAction(String serviceID, String req) throws Exception { @@ -2216,29 +2216,29 @@ public class RemoteEnv extends AbstractEnv { public void doWhenServerShutDown() { } - + @Override public boolean isLocalEnv() { - + return false; } - + @Override public boolean hasPluginServiceStarted(String key) { return true; } - + @Override public JSONArray getPluginStatus() { - + try { HashMap para = new HashMap(); para.put("op", "plugin"); para.put("cmd", "get_status"); para.put("current_uid", this.createUserID()); para.put("currentUsername", this.getUser()); - + HttpClient client = createHttpMethod(para); InputStream input = execute4InputStream(client); return new JSONArray(stream2String(input));