hzzz 8 years ago
parent
commit
f9b8d5c179
  1. 5
      designer_base/src/com/fr/design/file/MutilTempalteTabPane.java
  2. 1
      designer_base/src/com/fr/design/fun/TemplateTreeShortCutProvider.java
  3. 1
      designer_base/src/com/fr/design/fun/impl/AbstractTemplateTreeShortCutProvider.java
  4. 1
      designer_base/src/com/fr/design/locale/designer.properties
  5. 1
      designer_base/src/com/fr/design/locale/designer_en_US.properties
  6. 1
      designer_base/src/com/fr/design/locale/designer_ja_JP.properties
  7. 1
      designer_base/src/com/fr/design/locale/designer_ko_KR.properties
  8. 1
      designer_base/src/com/fr/design/locale/designer_zh_CN.properties
  9. 1
      designer_base/src/com/fr/design/locale/designer_zh_TW.properties
  10. 3
      designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
  11. 51
      designer_base/src/com/fr/design/mainframe/JTemplate.java
  12. 17
      designer_base/src/com/fr/design/mainframe/SiteCenterToken.java
  13. 4
      designer_base/src/com/fr/env/RemoteEnv.java

5
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;
}

1
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 {

1
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)

1
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

1
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

1
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=

1
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=

1
designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@ -2149,3 +2149,4 @@ 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
FR-Designer-Vcs_tab_click=\u8BF7\u5148\u9000\u51FA\u7248\u672C\u7BA1\u7406\u72B6\u6001\u518D\u5207\u6362\u6A21\u677F

1
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=

3
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());

51
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<T extends IOFile, U extends BaseUndoState<?>> 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<T extends IOFile, U extends BaseUndoState<?>> ex
openTime = System.currentTimeMillis();
}
}
private void collectInfo() { // 执行收集操作
if (openTime == 0) { // 旧模板,不收集数据
return;
@ -600,11 +595,11 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
* 将模板另存为可以分享出去的混淆后内置数据集模板
*
* @return 是否另存成功
*
*/
public boolean saveShareFile(){
return true;
}
public Widget getSelectElementCase(){
return new NoneWidget();
}
@ -843,7 +838,6 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
/**
* 判断是否是新版设计器
*
* @return 是返回true
*/
public boolean isNewDesigner() {
@ -906,46 +900,41 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> 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<T extends IOFile, U extends BaseUndoState<?>> ex
/**
* 返回当前支持的超链界面pane
* 没有悬浮弹窗显示为两列
*
* @return 超链连接界面
*/
public abstract HyperlinkGroupPane getHyperLinkPaneNoPop(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider);
@ -1015,6 +1003,8 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
* 创建内置sql提交的pane
*
* @return 内置sql提交的pane
*
*
* @date 2014-10-14-下午7:39:27
*/
public DBManipulationPane createDBManipulationPane(){
@ -1025,6 +1015,8 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
* 创建控件事件里内置sql提交的pane
*
* @return 内置sql提交的pane
*
*
* @date 2014-10-14-下午7:39:27
*/
public DBManipulationPane createDBManipulationPaneInWidget(){
@ -1033,14 +1025,12 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
/**
* 取小图标主要用于多TAB标签栏
*
* @return 图表
*/
public abstract Icon getIcon();
/**
* 导出菜单项
*
* @return 菜单项
*/
public ShortCut[] shortcut4ExportMenu() {
@ -1050,8 +1040,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
/**
* 复制JS代码
*/
public void copyJS() {
}
public void copyJS(){}
/**
* 系列风格改动
@ -1064,6 +1053,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
* 创建分享模板的按钮, 目前只有jworkbook实现了
*
* @return 分享模板按钮
*
*/
public UIButton[] createShareButton(){
return new UIButton[0];
@ -1071,7 +1061,6 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
/**
*
*
* @param provider 预览模式
*/
public void previewMenuActionPerformed(PreviewProvider provider) {
@ -1080,7 +1069,6 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
/**
* 支持的预览模式
*
* @return 预览模式
*/
public PreviewProvider[] supportPreview() {
@ -1089,7 +1077,6 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
/**
* 预览模式转换
*
* @param typeCode 类型
* @return 预览模式
*/
@ -1113,7 +1100,6 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
/**
* 加载插件中的按钮
*
* @return 按钮组
*/
public UIButton[] createExtraButtons() {
@ -1128,7 +1114,6 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
/**
* 由于老版本的模板没有模板ID当勾选使用参数模板时候就加一个模板ID attr
*
* @param isUseParamTemplate 是否使用参数模板
*/
public void needAddTemplateIdAttr(boolean isUseParamTemplate) {

17
designer_base/src/com/fr/design/mainframe/SiteCenterToken.java

@ -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");
}
}

4
designer_base/src/com/fr/env/RemoteEnv.java vendored

@ -1009,8 +1009,8 @@ public class RemoteEnv extends AbstractEnv {
}
try {
HashMap<String, String> para = new HashMap<String, String>();
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);

Loading…
Cancel
Save