无JIRA任务，解决冲突

designer/src/com/fr/design/mainframe/AuthorityEditToolBarPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe;
 
+import com.fr.base.FRContext;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.file.HistoryTemplateListPane;
@@ -14,12 +15,14 @@ import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
 import com.fr.design.webattr.ToolBarButton;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
+import com.fr.stable.StringUtils;
 
 import javax.swing.*;
 import javax.swing.tree.TreePath;
 import java.awt.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -36,8 +39,12 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane {
     private AuthorityToolBarPane authorityToolBarPane;
     private String[] selectedPathArray;
 
-    public AuthorityEditToolBarPane(List<ToolBarButton> buttonlists) {
+    public AuthorityEditToolBarPane(List<ToolBarButton> buttonList) {
         super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
+        this.init(buttonList);
+    }
+
+    private void init(List<ToolBarButton> buttonList) {
         this.setLayout(new BorderLayout());
         this.setBorder(null);
         UILabel authorityTitle = new UILabel(Inter.getLocText(new String[]{"FR-Designer_Permissions",
@@ -53,7 +60,7 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane {
         northPane.add(authorityTitle, BorderLayout.CENTER);
         northPane.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIConstants.LINE_COLOR));
 //        this.add(northPane, BorderLayout.NORTH);
-        authorityEditPane = new AuthorityEditPane(buttonlists);
+        authorityEditPane = new AuthorityEditPane(buttonList);
         this.add(authorityEditPane, BorderLayout.CENTER);
     }
 
@@ -95,27 +102,25 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane {
             public void itemStateChanged(ItemEvent e) {
                 String selectedRole = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName();
                 initSelectedPathArray();
-                if (ComparatorUtils.equals(selectedRole, Inter.getLocText("FR-Designer_Role")) || selectedRole ==
+                if (ComparatorUtils.equals(selectedRole, Inter.getLocText("FR-Designer_Role")) || selectedRole == null || selectedPathArray == null) {
-                        null || selectedPathArray == null) {
                     return;
                 }
-                for (int t = 0; t < selectedPathArray.length; t++) {
+                ToolBarButton selectedButton = null;
-                    for (int i = 0; i < buttonlists.size(); i++) {
+                //是否可见的checkbox
-                        if (buttonlists.get(i).isSelected()) {
+                UICheckBox checkbox = (UICheckBox) e.getSource();
-                            buttonlists.get(i).changeAuthorityState(selectedPathArray[t], buttonVisible.isSelected());
+                for (int i = 0; i < buttonlists.size(); i++) {
-                            authorityToolBarPane.repaint();
+                    if (buttonlists.get(i).isSelected()) {
-                        }
+                        selectedButton = buttonlists.get(i);
                     }
-                    HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().fireTargetModified();
+                }
-                    RolesAlreadyEditedPane.getInstance().refreshDockingView();
+                if (selectedButton != null) {
-                    UICheckBox checkbox = (UICheckBox) e.getSource();
+                    for (int t = 0; t < selectedPathArray.length; t++) {
-                    List<ToolBarButton> btns = AuthorityEditPane.this.buttonlists;
+                        selectedButton.changeAuthorityState(selectedPathArray[t], buttonVisible.isSelected());
-                    for (int j = 0; j < btns.size(); j++) {
+                        authorityToolBarPane.repaint();
-                        if (btns.get(j).isSelected()) {
+                        authorityToolBarPane.setAuthorityWebAttr(selectedButton.getWidget(), checkbox.isSelected(), selectedPathArray[t]);
-                            //由引擎实现保存进模板报表
-                            authorityToolBarPane.setAuthorityWebAttr(btns.get(j).getWidget(), checkbox.isSelected(), selectedPathArray[t]);
-                        }
                     }
+                    HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().fireTargetModified();//模版更新
+                    RolesAlreadyEditedPane.getInstance().refreshDockingView();//已配置角色视图刷新
                 }
             }
         };
@@ -205,29 +210,29 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane {
 
 
         public void populateType() {
-            if (name.getText() == "") {
+            if (StringUtils.EMPTY.equals(name.getText())) {
-                type.setText("");
+                type.setText(StringUtils.EMPTY);
             } else {
                 type.setText(Inter.getLocText(new String[]{"ReportServerP-Toolbar", "FR-Designer_Form_Button"}));
             }
         }
 
         public void populateName() {
-            String names = "";
+            StringBuilder names = new StringBuilder();
             for (int i = 0; i < buttonlists.size(); i++) {
                 if (buttonlists.get(i).isSelected()) {
-                    names += "," + buttonlists.get(i).getNameOption().optionName();
+                    names.append(",").append(buttonlists.get(i).getNameOption().optionName());
                 }
             }
-            if (names != "") {
+            if (names.length() > 0) {
-                names = names.substring(1);
+                names.deleteCharAt(0);
             }
-            name.setText(names);
+            name.setText(names.toString());
         }
 
         public void populateCheckPane() {
             checkPane.removeAll();
-            if (name.getText() == "") {
+            if (StringUtils.EMPTY.equals(name.getText())) {
                 return;
             }
             double f = TableLayout.FILL;

designer/src/com/fr/design/mainframe/AuthorityToolBarPane.java

@@ -218,27 +218,23 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
         ReportWebAttr rw = wbTpl.getReportWebAttr();
         ConfigManagerProvider cm = ConfigManager.getProviderInstance();
         ReportWebAttr webAttr = ((ReportWebAttr) cm.getGlobalAttribute(ReportWebAttr.class));
+        if (webAttr == null || rw == null || rw.getWebPage() == null) {
+            return;
+        }
 
         //wbTpl.clear先清空
         //再将所有的保存进去
         //看是存在服务器还存在模板里面
         if (choseComboBox.getSelectedIndex() == 0) {
             //分页
-            if (rw == null || rw.getWebPage() == null) {
+            dealWithWebContent(webAttr.getWebPage(), widget, isSelected, selectedRole);
-                dealWithWebContent(webAttr.getWebPage(), widget, isSelected, selectedRole);
-            }
         } else if (choseComboBox.getSelectedIndex() == 1) {
             //填报
-            if (rw == null || rw.getWebPage() == null) {
+            dealWithWebContent(webAttr.getWebWrite(), widget, isSelected, selectedRole);
-                dealWithWebContent(webAttr.getWebWrite(), widget, isSelected, selectedRole);
-            }
         } else {
             //view
-            if (rw == null || rw.getWebPage() == null) {
+            dealWithWebContent(webAttr.getWebView(), widget, isSelected, selectedRole);
-                dealWithWebContent(webAttr.getWebView(), widget, isSelected, selectedRole);
-            }
         }
-        
     }
 
     private void dealWithWebContent(WebContent wc, Widget widget, boolean isSelected, String selectedRole) {
@@ -249,14 +245,11 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
         for (int i = 0; i < managers.length; i++) {
             ToolBar tb = managers[i].getToolBar();
             for (int j = 0; j < tb.getWidgetSize(); j++) {
-                if (widget instanceof Button && tb.getWidget(j) instanceof Button) {
+                if (widget instanceof Button && tb.getWidget(j) instanceof Button && ComparatorUtils.equals(((Button) widget).getIconName(), ((Button) tb.getWidget(j)).getIconName())) {
-                    if (ComparatorUtils.equals(((Button) widget).getIconName(),
+                    if (!isSelected) {
-                            ((Button) tb.getWidget(j)).getIconName())) {
+                        tb.getWidget(j).getWidgetPrivilegeControl().addInvisibleRole(selectedRole);
-                        if (!isSelected) {
+                    } else {
-                            tb.getWidget(j).getWidgetPrivilegeControl().addInvisibleRole(selectedRole);
+                        tb.getWidget(j).getWidgetPrivilegeControl().removeInvisibleRole(selectedRole);
-                        } else {
-                            tb.getWidget(j).getWidgetPrivilegeControl().removeInvisibleRole(selectedRole);
-                        }
                     }
                 }
             }

designer/src/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java

@@ -36,7 +36,7 @@ public class CheckBoxGroupDefinePane extends FieldEditorDefinePane<CheckBoxGroup
 	@Override
 	protected JPanel setFirstContentPane() {
 		JPanel advancePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-		checkbox = new UICheckBox(Inter.getLocText(new String[]{"Provide", "Choose_All"}));
+		checkbox = new UICheckBox(Inter.getLocText("FR-Designer_Advanced"));
 		checkbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 		buttonGroupDictPane = new ButtonGroupDictPane();
 		checkBoxDictPane = new CheckBoxDictPane();

designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java

@@ -74,7 +74,6 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
         return content;
     }
 
-
     public JPanel setValidatePane() {
         initListeners();
 
@@ -101,7 +100,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
         this.setMinValueCheckBox.addActionListener(setMinListener);
         this.minValueSpinner.addChangeListener(minValueChangeListener);
 
-        UILabel numberLabel = new UILabel(Inter.getLocText(new String[]{"FR-Designer_Double", "Numbers"}));
+        UILabel numberLabel = new UILabel(Inter.getLocText("FR-Designer_Decimal_Places"));
         limitNumberPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{numberLabel, decimalLength}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;

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

@@ -1344,6 +1344,8 @@ Remove_All_Button=Remove_All_Button
 FR-Designer_Component_Interval=Components Interval
 ReportColumns-Columns_vertically=Columns vertically
 ReportGUI-Print_Background=Print Background
+FR-Designer_Print_Background=Print Background
+FR-Designer_Export_Background=Export Background
 Export-CSV=CSV
 M_Edit-Paste=Paste
 FR-Designer-Basic_Restart_Designer=Restart designer
@@ -2021,6 +2023,9 @@ FR-Product_Demo=Demo
 FR-Designer_Tree_Data_Field=Tree Data Field
 FR-Designer_Data_Filter=Data Filter
 Default=Default
+FR-Designer_Sheet_Label_Page_Display_Position=Sheet tab display location:
+FR-Designer_Provide_Choose_All=Provide Select All
+FR-Designer_Decimal_Places=Decimal Places:
 FR-Base-Load_Resource_File=Load resource file
 FR-Designer_Cell_Element=Cell Element
 FR-Designer_Cell_Attributes=Cell Attributes

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

@@ -1346,6 +1346,8 @@ Remove_All_Button=Remove all buttons
 FR-Designer_Component_Interval=Component Interval
 ReportColumns-Columns_vertically=Fixed columns per line
 ReportGUI-Print_Background=Print/export background
+FR-Designer_Print_Background=Print Background
+FR-Designer_Export_Background=Export Background
 Export-CSV=CSV
 M_Edit-Paste=Paste
 FR-Designer-Basic_Restart_Designer=Restart designer
@@ -2023,6 +2025,9 @@ FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=Build Tree according to the pa
 FR-Product_Demo=Demo
 FR-Designer_Data_Filter=Data Filter
 Default=Default
+FR-Designer_Sheet_Label_Page_Display_Position=Sheet tab display location:
+FR-Designer_Provide_Choose_All=Provide Select All
+FR-Designer_Decimal_Places=Decimal Places:
 FR-Base-Load_Resource_File=Load Configuration File
 FR-Designer_Cell_Element=Cell Element
 FR-Designer_Cell_Attributes=Cell Attributes

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

@@ -229,16 +229,16 @@ FR-Designer-Collect_Information_free=\u7121\u6599
 FR-Designer-Collect_Information_Description=\u8A18\u8FF0
 FR-Designer-Collect_Information_Successfully=\u53CE\u96C6\u6210\u529F
 FR-Designer_Event_Set=\u30A4\u30D9\u30F3\u30C8\u8A2D\u5B9A
-FR-Designer_Blow_set=\u4EE5\u4E0B\u8A2D\u5B9A
+FR-Designer_Blow_set=\u6B21\u306E\u8A2D\u5B9A
-FR-Designer_I_Want_To_Set_Single=\u5F53\u8A72\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u5358\u72EC\u8A2D\u5B9A
+FR-Designer_I_Want_To_Set_Single=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u500B\u5225\u8A2D\u5B9A
-FR-Designer_Using_Server_Report_View_Settings=\u30B5\u30FC\u30D0\u30FC\u8A2D\u5B9A\u63A1\u7528
+FR-Designer_Using_Server_Report_View_Settings=\u30B5\u30FC\u30D0\u8A2D\u5B9A
-FR-Designer_ErrorHandlerTemplate=\u51FA\u9519\u6A21\u677F\u5B9A\u4E49
+FR-Designer_ErrorHandlerTemplate=\u30A8\u30E9\u30FC\u60C5\u5831\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u5B9A\u7FA9
-FR-Designer_Save_Path=\u4FDD\u5B58\u8DEF\u5F84
+FR-Designer_Save_Path=\u4FDD\u5B58\u30D1\u30B9
-FR-Designer_Chart_Acc_Set=\u7CBE\u78BA\u8A2D\u5B9A
+FR-Designer_Chart_Acc_Set=\u500B\u5225\u8A2D\u5B9A
-FR-Designer_Gradient-Color=\u8272\u3092\u5F90\u3005\u306B\u5909\u5316
+FR-Designer_Gradient-Color=\u30B0\u30E9\u30C7\u30FC\u30B7\u30E7\u30F3
-FR-Designer_DEFAULT=\u30C7\u30D5\u30A9\u30EB\u30C8
+FR-Designer_DEFAULT=\u65E2\u5B9A
-FR-Designer_chart-PreStyle=\u30C1\u30E3\u30FC\u30C8\u306E\u5B9A\u7FA9\u3055\u308C\u305F\u30AB\u30E9\u30FC
+FR-Designer_chart-PreStyle=\u30B0\u30E9\u30D5\u4E8B\u524D\u5B9A\u7FA9\u914D\u8272
-FR-Designer_Chart-PreStyle=\u4E8B\u524D\u306B\u5B9A\u7FA9\u3055\u308C\u305F\u30AB\u30E9\u30FC\u30C1\u30E3\u30FC\u30C8
+FR-Designer_Chart-PreStyle=\u30B0\u30E9\u30D5\u4E8B\u524D\u5B9A\u7FA9\u914D\u8272
 FR-Designer_Already_exist=\u73FE\u5728\u306E\u74B0\u5883\u306B\u306F\u5B58\u5728\u3057\u3066\u3044\u307E\u3059\:
 FR-Designer_Database=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
 FR-Designer_Model=\u30E2\u30C7\u30EB
@@ -507,8 +507,8 @@ FR-Designer_Edit_panel=\u7DE8\u96C6
 FR-Designer_Property_panel=\u5C5E\u6027
 FR-Designer_Select_panel=\u9078\u629E
 FR-Designer_LayoutTable_Column_Width=160
-FR-Designer_Set_BG_Of_Current_Row=\u5831\u544A\u30AB\u30EC\u30F3\u30C8\u7DE8\u96C6\u884C\u80CC\u666F\u8A2D\u5B9A
+FR-Designer_Set_BG_Of_Current_Row=\u7DE8\u96C6\u884C\u80CC\u666F\u8A2D\u5B9A
-FR-Designer_Unload_Check=\u63D0\u51FA\u305B\u305A\u306B\u30D2\u30F3\u30C8
+FR-Designer_Unload_Check=\u672A\u30B3\u30DF\u30C3\u30C8\u30D2\u30F3\u30C8
 FR-Designer_ReportColumns_Columns_Optional=\u6BB5\u7D44\u307F
 FR-Designer_Row_Icon_File_Name=row.png
 FR-Designer_Center_Display=\u4E2D\u592E\u63C3\u3048\u8868\u793A
@@ -1337,14 +1337,16 @@ Utils-File_name=\u30D5\u30A1\u30A4\u30EB\u540D
 NOT_NULL_Des=\u3053\u3053\u306F\u7A7A\u6B04\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093
 Right_Border_Line=\u53F3\u30D5\u30EC\u30FC\u30E0\u30E9\u30A4\u30F3
 EditRC-Entire_column=\u5217(C)
-PageSetup-Top_to_bottom=\u4E0A\u304B\u3089\u4E0B\u3078
+PageSetup-Top_to_bottom=\u5DE6\u304B\u3089\u53F3
-Click-Get_Default_URL=\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u30C7\u30D5\u30A9\u30EB\u30C8\u306EURL\u3092\u53D6\u5F97
+Click-Get_Default_URL=\u3053\u306E\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u65E2\u5B9A\u306EURL\u3092\u53D6\u5F97
-StyleAlignment-Wrap_Text=\u81EA\u52D5\u6298\u308A\u8FD4\u3057
+StyleAlignment-Wrap_Text=\u81EA\u52D5\u6539\u884C
-Remove_All_Button=\u5168\u3066\u306E\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30A2
+Remove_All_Button=\u3059\u3079\u3066\u306E\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30A2
-FR-Designer_Component_Interval=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u9593\u9694
+FR-Designer_Component_Interval=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u9593\u9694
-ReportColumns-Columns_vertically=\u5782\u76F4\u65B9\u5411\u5217
+ReportColumns-Columns_vertically=\u5217\u306E\u6BB5\u7D44\u307F
-ReportGUI-Print_Background=\u5370\u5237\u80CC\u666F
+ReportGUI-Print_Background=\u5E33\u7968\u80CC\u666F\u306E\u5370\u5237/\u51FA\u529B
-Export-CSV=CSV (\u30AB\u30F3\u30DE\u533A\u5207\u308A)
+FR-Designer_Print_Background=\u5E33\u7968\u80CC\u666F\u306E\u5370\u5237
+FR-Designer_Export_Background=\u5E33\u7968\u80CC\u666F\u306E\u51FA\u529B
+Export-CSV=CSV(\u30AB\u30F3\u30DE\u533A\u5207\u308A)
 M_Edit-Paste=\u8CBC\u308A\u4ED8\u3051(P)
 FR-Designer-Basic_Restart_Designer=\u30C7\u30B6\u30A4\u30CA\u30FC\u3092\u518D\u8D77\u52D5\u3059\u308B
 ReportServerP-PDF2-INFO=LINUX/UNIX\u306B\u4E2D\u56FD\u8A9E\u30D5\u30A9\u30F3\u30C8\u304C\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u305F\u6642\u306E\u307F\u4F7F\u7528
@@ -1369,7 +1371,7 @@ Not_Exsit=\u5E33\u7968\u306B\u5B58\u5728\u3057\u307E\u305B\u3093
 Utils-Insert_Row=\u884C\u633F\u5165
 Utils-Delete_Row=\u884C\u524A\u9664
 not_support_authority_edit=\u8BE5\u5143\u7D20\u4E0D\u652F\u6301\u6743\u9650\u63A7\u5236
-Formula_Tips=\u5F0F\u306F "\
+Formula_Tips=\u5F0F\u306F "
 FR-Action_Copy=\u30B3\u30D4\u30FC
 Compile_Success=\u7DE8\u96C6\u7FFB\u8A33\u306B\u6210\u529F\u3057\u307E\u3057\u305F
 BackgroundTexture-RecycledPaper=\u518D\u751F\u7D19
@@ -2001,7 +2003,6 @@ FR-Product_Demo=\u88FD\u54C1\u30C7\u30E2
 FR-Designer_Data_Filter=\u30C7\u30FC\u30BF\u30D5\u30A3\u30EB\u30BF
 FR-Designer_Can_not_use_FormatBursh=\u9023\u7D9A\u3057\u306A\u3044\u8907\u6570\u9818\u57DF\u3067\u306F\u66F8\u5F0F\u30B3\u30D4\u30FC\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
 Default=\u65E2\u5B9A
-FR-Base-Load_Resource_File=\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u30ED\u30FC\u30C9
 FR-Designer_Cell_Element=\u30BB\u30EB\u8981\u7D20
 FR-Designer_Cell_Attributes=\u30BB\u30EB\u5C5E\u6027
 FR-Designer_Float_Element=\u30D5\u30ED\u30FC\u30C8\u8981\u7D20
@@ -2141,3 +2142,7 @@ FR-Designer_Widget_String=
 FR-Designer_Widget_Field=
 FR-Designer_Add_Event=
 FR-Designer_Widget_Enabled=
+FR-Designer_Sheet_Label_Page_Display_Position=Sheet\u30E9\u30D9\u30EB\u30DA\u30FC\u30B8\u306E\u8868\u793A\u4F4D\u7F6E
+FR-Designer_Provide_Choose_All=\u5168\u9078\u629E\u53EF\u80FD
+FR-Designer_Decimal_Places=\u5C0F\u6570\u67A0\u6570:
+FR-Base-Load_Resource_File=\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u30ED\u30FC\u30C9

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

@@ -1345,6 +1345,8 @@ Remove_All_Button=\uBAA8\uB4E0\uD0A4\uD074\uB9AC\uC5B4
 FR-Designer_Component_Interval=\uC5B4\uC148\uBE14\uB9AC\uAC04\uACA9
 ReportColumns-Columns_vertically=\uC5F4\uC140\uB098\uB204\uAE30
 ReportGUI-Print_Background=\uC778\uC1C4/\uB0B4\uBCF4\uB0B4\uAE30\uBB38\uC11C\uBC30\uACBD
+FR-Designer_Print_Background=\uC778\uC1C4\uBB38\uC11C\uBC30\uACBD
+FR-Designer_Export_Background=\uB0B4\uBCF4\uB0B4\uAE30\uBB38\uC11C\uBC30\uACBD
 Export-CSV=CSV\uC11C\uC2DD(\uC27C\uD45C\uAD6C\uBD84)
 M_Edit-Paste=\uBD99\uC5EC\uB123\uAE30(P)
 FR-Designer-Basic_Restart_Designer=\uC7AC\uBD80\uD305\uC124\uACC4\uAE30
@@ -2002,7 +2004,6 @@ FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\uC120\uD0DD\uD55C\uB370\uC774
 FR-Product_Demo=\uC81C\uD488\uC2DC\uC5F0
 FR-Designer_Data_Filter=\uB370\uC774\uD130\uC120\uBCC4
 Default=\uAE30\uBCF8
-FR-Base-Load_Resource_File=\uB85C\uB529\uAD6C\uC131\uD30C\uC77C
 FR-Designer_Cell_Element=\uC140\uC694\uC18C
 FR-Designer_Cell_Attributes=\uC140\uC18D\uC131
 FR-Designer_Float_Element=\uD638\uBC84\uC694\uC18C
@@ -2141,3 +2142,7 @@ FR-Designer_Float_Visible=
 FR-Designer_Widget_String=
 FR-Designer_Widget_Field=
 FR-Designer_Widget_Enabled=
+FR-Designer_Sheet_Label_Page_Display_Position=
+FR-Designer_Provide_Choose_All=\uC81C\uACF5\uBAA8\uB450\uC120\uD0DD
+FR-Designer_Decimal_Places=\uC18C\uC218\uC218\uB7C9:
+FR-Base-Load_Resource_File=\uB85C\uB529\uAD6C\uC131\uD30C\uC77C

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

@@ -1347,6 +1347,8 @@ Remove_All_Button=\u6E05\u9664\u6240\u6709\u6309\u94AE
 FR-Designer_Component_Interval=\u7EC4\u4EF6\u95F4\u9694
 ReportColumns-Columns_vertically=\u5217\u5206\u680F
 ReportGUI-Print_Background=\u6253\u5370/\u5BFC\u51FA\u62A5\u8868\u80CC\u666F
+FR-Designer_Print_Background=\u6253\u5370\u62A5\u8868\u80CC\u666F
+FR-Designer_Export_Background=\u5BFC\u51FA\u62A5\u8868\u80CC\u666F
 Export-CSV=CSV\u683C\u5F0F(\u9017\u53F7\u5206\u9694)
 M_Edit-Paste=\u7C98\u8D34(P)
 FR-Designer-Basic_Restart_Designer=\u91CD\u542F\u8BBE\u8BA1\u5668
@@ -2023,6 +2025,9 @@ FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\u4F9D\u8D56\u6240\u9009\u6570
 FR-Product_Demo=\u4EA7\u54C1\u6F14\u793A
 FR-Designer_Data_Filter=\u6570\u636E\u7B5B\u9009
 Default=\u9ED8\u8BA4
+FR-Designer_Sheet_Label_Page_Display_Position=sheet\u6807\u7B7E\u9875\u663E\u793A\u4F4D\u7F6E\uFF1A
+FR-Designer_Provide_Choose_All=\u63D0\u4F9B\u5168\u9009
+FR-Designer_Decimal_Places=\u5C0F\u6570\u6570\u76EE\uFF1A
 FR-Base-Load_Resource_File=\u52A0\u8F7D\u914D\u7F6E\u6587\u4EF6
 FR-Designer_Cell_Element=\u5355\u5143\u683C\u5143\u7D20
 FR-Designer_Cell_Attributes=\u5355\u5143\u683C\u5C5E\u6027

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

@@ -1346,6 +1346,8 @@ Remove_All_Button=\u6E05\u9664\u6240\u6709\u6309\u9215
 FR-Designer_Component_Interval=\u5143\u4EF6\u9593\u9694
 ReportColumns-Columns_vertically=\u6B04\u5206\u6B04
 ReportGUI-Print_Background=\u5217\u5370/\u532F\u51FA\u5831\u8868\u80CC\u666F
+FR-Designer_Print_Background=\u5217\u5370\u5831\u8868\u80CC\u666F
+FR-Designer_Export_Background=\u532F\u51FA\u5831\u8868\u80CC\u666F
 Export-CSV=CSV\u683C\u5F0F(\u9017\u865F\u5206\u9694)
 M_Edit-Paste=\u8CBC\u4E0A(P)
 FR-Designer-Basic_Restart_Designer=Restart designer
@@ -2022,6 +2024,9 @@ FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\u4F9D\u8CF4\u6240\u9078\u8CC7
 FR-Product_Demo=\u529F\u80FD\u5C55\u793A
 FR-Designer_Data_Filter=\u8CC7\u6599\u7BE9\u9078
 Default=\u9810\u8A2D
+FR-Designer_Sheet_Label_Page_Display_Position=sheet\u6A19\u7C64\u9801\u986F\u793A\u4F4D\u7F6E\uFF1A
+FR-Designer_Provide_Choose_All=\u63D0\u4F9B\u5168\u9078
+FR-Designer_Decimal_Places=\u5C0F\u6578\u6578\u76EE\uFF1A
 FR-Base-Load_Resource_File=\u52A0\u8F09\u914D\u7F6E\u6A94\u6848
 FR-Designer_Cell_Element=\u5132\u5B58\u683C\u5143\u7D20
 FR-Designer_Cell_Attributes=\u5132\u5B58\u683C\u5C6C\u6027

designer_base/src/com/fr/design/mainframe/loghandler/LogHandlerBar.java

@@ -77,7 +77,6 @@ public class LogHandlerBar extends JPanel implements ItemSelectable {
 	public void errorAdd() {
 		ERRORNUM++;
 		timerPaint();
-
 	}
 
 	public void serverAdd() {
@@ -85,7 +84,6 @@ public class LogHandlerBar extends JPanel implements ItemSelectable {
 		timerPaint();
 	}
 
-
 	private AtomicBoolean painting = new AtomicBoolean(false);
 
 	public  void timerPaint() {

designer_base/src/com/fr/design/roleAuthority/ReportAndFSManagePane.java

@@ -184,7 +184,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo
     }
 
     private void initbuttonGroup() {
-        isSupportFS = VT4FR.isLicAvailable(FRCoreContext.getBytes()) && VT4FR.FS_BI.support();
+        isSupportFS = supportFineDecision();
         Icon[] iconArray = null;
         String[] textArray = null;
         if (isSupportFS) {
@@ -212,6 +212,11 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo
         buttonGroup.setNeedLeftRightOutLine(false);
     }
 
+    private boolean supportFineDecision() {
+        byte[] bytes = FRCoreContext.getBytes();
+        return VT4FR.isLicAvailable(bytes) && VT4FR.FS_BI.support();
+    }
+
     private int getMode(){
         return isSupportFS?FS_MANAGE: REPORT_PLATEFORM_MANAGE;
     }
@@ -544,4 +549,4 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo
         }
     }
 
-}
+}

designer_base/src/com/fr/start/StartServer.java

@@ -14,10 +14,7 @@ import com.fr.env.SignIn;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
-import com.fr.stable.EnvChangedListener;
+import com.fr.stable.*;
-import com.fr.stable.ProductConstants;
-import com.fr.stable.StableUtils;
-import com.fr.stable.StringUtils;
 import com.fr.stable.project.ProjectConstants;
 import com.fr.start.server.JettyHost;
 
@@ -154,8 +151,7 @@ public class StartServer {
             Desktop.getDesktop().browse(new URI(uri));
 
         } catch (IOException e) {
-            JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer_Set_default_browser"));
+            startBrowserFromCommand(uri, e);
-            FRContext.getLogger().errorWithServerLevel(e.getMessage(), e);
         } catch (URISyntaxException e) {
             FRContext.getLogger().errorWithServerLevel(e.getMessage(), e);
         } catch (Exception e) {
@@ -164,6 +160,20 @@ public class StartServer {
         }
     }
 
+    private static void startBrowserFromCommand(String uri, IOException e) {
+        if (OperatingSystem.isWindows()) {
+            try {
+                // win10 内存用到到80%左右的时候, Desktop.browser经常提示"存储空间不足, 无法处理改命令", 用rundll32可以打开.
+                Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + uri);
+            } catch (IOException ee) {
+                JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer_Set_default_browser"));
+                FRContext.getLogger().errorWithServerLevel(e.getMessage(), e);
+            }
+        } else {
+            FRContext.getLogger().errorWithServerLevel(e.getMessage(), e);
+        }
+    }
+
     private static class InformationPane extends BasicPane {
         private static final long serialVersionUID = 1L;