REPORT-1344 表单报表块翻页改进并增加局部导出

designer_base/src/com/fr/design/locale/designer.properties

@@ -91,6 +91,7 @@ FR-Designer_DS-Dictionary=
 FR-Designer_Data-confusion=
 FR-Designer_Data_Type=
 FR-Designer_Double_Click_Edit_OR_Clear=
+FR-Designer_Edit_Button_ToolBar=
 FR-Designer_Email=
 FR-Designer_Enabled=
 FR-Designer_End-Date=
@@ -161,6 +162,7 @@ FR-Designer_Refresh_Parameter_In_SQL=
 FR-Designer_Reg_Expressions=
 FR-Designer_Reg_Max_Length=
 FR-Designer_Reg_Min_Length=
+FR-Designer_Remove_Button_ToolBar=
 FR-Designer_ReportColumns-Columns=
 FR-Designer_Return-Date=
 FR-Designer_RichText=

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -91,6 +91,7 @@ FR-Designer_DS-Dictionary=Data Dictionary
 FR-Designer_Data-confusion=Data Confusion
 FR-Designer_Data_Type=Data type
 FR-Designer_Double_Click_Edit_OR_Clear=Double Click to Edit or Clear
+FR-Designer_Edit_Button_ToolBar=Edit Button ToolBar
 FR-Designer_Email=Mail
 FR-Designer_Enabled=Enabled
 FR-Designer_End-Date=End Date
@@ -163,6 +164,7 @@ FR-Designer_Refresh_Parameter_In_SQL=Whether to refresh parameters in the SQL
 FR-Designer_Reg_Expressions=Regular expressions
 FR-Designer_Reg_Max_Length=max length
 FR-Designer_Reg_Min_Length=min length
+FR-Designer_Remove_Button_ToolBar=Remove Button ToolBar
 FR-Designer_ReportColumns-Columns=Multi-columns/lines
 FR-Designer_Return-Date=Return Date
 FR-Designer_RichText=Insert Rich Text

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -91,6 +91,7 @@ FR-Designer_DS-Dictionary=\u30C7\u30FC\u30BF\u5B57\u5178
 FR-Designer_Data-confusion=\u30C7\u30FC\u30BF\u6DF7\u4EA4
 FR-Designer_Data_Type=\u30C7\u30FC\u30BF\u30BF\u30A4\u30D7
 FR-Designer_Double_Click_Edit_OR_Clear=\u30C0\u30D6\u30EB\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u7DE8\u96C6\u307E\u305F\u306F\u30AF\u30EA\u30A2\u3059\u308B
+FR-Designer_Edit_Button_ToolBar=\u30DC\u30BF\u30F3\u306B\u3042\u308B\u30C4\u30FC\u30EB\u6B04\u7DE8\u96C6
 FR-Designer_Email=\u30E1\u30FC\u30EB
 FR-Designer_Enabled=\u4F7F\u7528\u53EF\u80FD
 FR-Designer_End-Date=\u7D42\u4E86\u65E5\u671F
@@ -162,6 +163,7 @@ FR-Designer_Refresh_Parameter_In_SQL=SQL\u4E2D\u306E\u30D1\u30E9\u30E1\u30FC\u30
 FR-Designer_Reg_Expressions=\u6B63\u5247\u8868\u73FE\u5F0F
 FR-Designer_Reg_Max_Length=\u6700\u5927\u9577\u3055
 FR-Designer_Reg_Min_Length=\u6700\u5C0F\u9577\u3055
+FR-Designer_Remove_Button_ToolBar=\u30DC\u30BF\u30F3\u304C\u3042\u308B\u30C4\u30FC\u30EB\u30D0\u30FC\u3092\u30EA\u30E0\u30FC\u30D6
 FR-Designer_ReportColumns-Columns=\u6BB5\u7D44\u307F
 FR-Designer_Return-Date=\u65E5\u671F\u306B\u623B\u308B
 FR-Designer_RichText=\u30EA\u30C3\u30C1\u6587\u66F8\u633F\u5165

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -91,6 +91,7 @@ FR-Designer_DS-Dictionary=\uB370\uC774\uD130\uC0AC\uC804
 FR-Designer_Data-confusion=\uB370\uC774\uD130\uD63C\uD569
 FR-Designer_Data_Type=\uB370\uC774\uD130\uC720\uD615
 FR-Designer_Double_Click_Edit_OR_Clear=\uB354\uBE14\uD074\uB9AD\uD558\uC5EC\uD3B8\uC9D1\uB610\uB294\uD074\uB9AC\uC5B4\uC2E4\uD589
+FR-Designer_Edit_Button_ToolBar=\uD0A4\uAC00\uC788\uB294\uD234\uBC14\uD3B8\uC9D1
 FR-Designer_Email=\uBA54\uC77C
 FR-Designer_Enabled=\uC0AC\uC6A9\uAC00\uB2A5
 FR-Designer_End-Date=\uC885\uB8CC\uB0A0\uC9DC
@@ -162,6 +163,7 @@ FR-Designer_Refresh_Parameter_In_SQL=SQL\uC758\uB9E4\uAC1C\uBCC0\uC218\uB97C\uC0
 FR-Designer_Reg_Expressions=\uC815\uADDC\uD45C\uD604\uC2DD
 FR-Designer_Reg_Max_Length=\uCD5C\uB300\uAE38\uC774
 FR-Designer_Reg_Min_Length=\uCD5C\uC18C\uAE38\uC774
+FR-Designer_Remove_Button_ToolBar=\uD0A4\uAC00\uC788\uB294\uD234\uBC14\uC81C\uAC70
 FR-Designer_ReportColumns-Columns=\uC140\uB098\uB204\uAE30
 FR-Designer_Return-Date=\uB0A0\uC9DC\uB3CC\uC544\uAC00\uAE30
 FR-Designer_RichText=\uB9AC\uCE58\uD14D\uC2A4\uD2B8\uBC15\uC2A4\uC0BD\uC785

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

@@ -91,6 +91,7 @@ FR-Designer_DS-Dictionary=\u6570\u636E\u5B57\u5178
 FR-Designer_Data-confusion=\u6570\u636E\u6DF7\u6DC6
 FR-Designer_Data_Type=\u6570\u636E\u7C7B\u578B
 FR-Designer_Double_Click_Edit_OR_Clear=\u53CC\u51FB\u8FDB\u884C\u7F16\u8F91\u6216\u6E05\u9664
+FR-Designer_Edit_Button_ToolBar=\u7F16\u8F91\u6309\u94AE\u6240\u5728\u5DE5\u5177\u680F
 FR-Designer_Email=\u90AE\u4EF6
 FR-Designer_Enabled=\u53EF\u7528
 FR-Designer_End-Date=\u7ED3\u675F\u65E5\u671F
@@ -163,6 +164,7 @@ FR-Designer_Refresh_Parameter_In_SQL=\u662F\u5426\u5237\u65B0SQL\u4E2D\u7684\u53
 FR-Designer_Reg_Expressions=\u6B63\u5219\u8868\u8FBE\u5F0F
 FR-Designer_Reg_Max_Length=\u6700\u5927\u957F\u5EA6
 FR-Designer_Reg_Min_Length=\u6700\u5C0F\u957F\u5EA6
+FR-Designer_Remove_Button_ToolBar=\u79FB\u9664\u6309\u94AE\u6240\u5728\u5DE5\u5177\u680F
 FR-Designer_ReportColumns-Columns=\u5206\u680F
 FR-Designer_Return-Date=\u8FD4\u56DE\u65E5\u671F
 FR-Designer_RichText=\u63D2\u5165\u5BCC\u6587\u672C

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -91,6 +91,7 @@ FR-Designer_DS-Dictionary=\u8CC7\u6599\u5B57\u5178
 FR-Designer_Data-confusion=\u8CC7\u6599\u6DF7\u6DC6
 FR-Designer_Data_Type=\u8CC7\u6599\u985E\u578B
 FR-Designer_Double_Click_Edit_OR_Clear=\u96D9\u64CA\u9032\u884C\u7DE8\u8F2F\u6216\u6E05\u9664
+FR-Designer_Edit_Button_ToolBar=\u7DE8\u8F2F\u6309\u9215\u6240\u5728\u5DE5\u5177\u6B04
 FR-Designer_Email=\u90F5\u4EF6
 FR-Designer_Enabled=\u53EF\u7528
 FR-Designer_End-Date=\u7D50\u675F\u65E5\u671F
@@ -162,6 +163,7 @@ FR-Designer_Refresh_Parameter_In_SQL=\u5728SQL\u4E2D\u91CD\u65B0\u6574\u7406\u76
 FR-Designer_Reg_Expressions=\u6B63\u5247\u8868\u9054\u5F0F
 FR-Designer_Reg_Max_Length=\u6700\u5927\u9577\u5EA6
 FR-Designer_Reg_Min_Length=\u6700\u5C0F\u9577\u5EA6
+FR-Designer_Remove_Button_ToolBar=\u79FB\u9664\u6309\u9215\u6240\u5728\u5DE5\u5177\u6B04
 FR-Designer_ReportColumns-Columns=\u5831\u8868\u6B04\u4F4D
 FR-Designer_Return-Date=\u8FD4\u56DE\u65E5\u671F
 FR-Designer_RichText= RTF

designer_form/src/com/fr/design/mainframe/FSettingToolBar.java

@@ -29,10 +29,10 @@ public class FSettingToolBar extends JPanel {
         this.add(new UILabel(name));
         this.toolBarPane = toolBarPane;
         setButton = GUICoreUtils.createTransparentButton(setIcon, setIcon, setIcon);
-        setButton.setToolTipText(Inter.getLocText("Edit_Button_ToolBar"));
+        setButton.setToolTipText(Inter.getLocText("FR-Designer_Edit_Button_ToolBar"));
         setButton.setAction(new SetAction());
         delButton = GUICoreUtils.createTransparentButton(delIcon, delIcon, delIcon);
-        delButton.setToolTipText(Inter.getLocText("Remove_Button_ToolBar"));
+        delButton.setToolTipText(Inter.getLocText("FR-Designer_Remove_Button_ToolBar"));
         delButton.setAction(new DelAction());
         this.add(setButton);
         this.add(delButton);

designer_form/src/com/fr/design/mainframe/FToolBarButton.java

@@ -1,12 +1,15 @@
 package com.fr.design.mainframe;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.GraphHelper;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.gui.core.WidgetOption;
-import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.roleAuthority.ReportAndFSManagePane;
+import com.fr.design.utils.gui.GUIPaintUtils;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.WidgetManager;
+import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
 
 import javax.swing.*;
@@ -17,7 +20,7 @@ import java.awt.event.MouseListener;
 /**
  * Created by harry on 2017-3-2.
  */
-public class FToolBarButton extends UIButton implements MouseListener {
+public class FToolBarButton extends JButton implements MouseListener {
     private Widget widget;
     private WidgetOption no;
 
@@ -27,6 +30,7 @@ public class FToolBarButton extends UIButton implements MouseListener {
 
     public FToolBarButton(String text, Icon icon, Widget widget) {
         super(text, icon);
+        init();
         this.widget = widget;
         if (widget instanceof com.fr.form.ui.Button) {
             com.fr.form.ui.Button button = (com.fr.form.ui.Button) widget;
@@ -42,6 +46,11 @@ public class FToolBarButton extends UIButton implements MouseListener {
         setMargin(new Insets(0, 0, 0, 0));
     }
 
+    private void init() {
+        setBackground(null);
+        setRolloverEnabled(true);
+    }
+
 
     /**
      * 改变按钮的权限细粒度状态
@@ -82,8 +91,12 @@ public class FToolBarButton extends UIButton implements MouseListener {
 
 
     protected void paintBorder(Graphics g) {
-        this.setBorderType(UIButton.NORMAL_BORDER);
-        super.paintBorder(g);
+        paintBorder(g, this);
+    }
+
+    protected void paintBorder(Graphics g, FToolBarButton b) {
+        String selectedRoles = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName();
+        GUIPaintUtils.drawBorder((Graphics2D) g, 0, 0, b.getWidth(), b.getHeight(), true, Constants.NULL, b.isDoneAuthorityEdited(selectedRoles));
     }
 
     /**