无JIRA任务， 冲突修正

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

@@ -492,5 +492,41 @@ FR-Designer_Permissions_Edition=Permissions Edition
 FR-Designer_Export_Excel_Page=Page
 FR-Designer_Export_Excel_Simple=Simple
 FR-Designer_Export_Excel_PageToSheet=Page To Sheet
+FR-Designer_Export_failed=Export failed
+FR-Designer_Exported_successfully=Exported successfully
+FR-Designer_Exporting=Exporting
+FR-Designer_Export-PDF=PDF
 FR-Designer_Button_OK=OK
 FR-Designer_Button_Cancel=Cancel
+FR-Designer_JavaScript=
+FR-Designer_JavaScript_Form_Submit=
+FR-Designer_JavaScript_Commit_to_Database=
+FR-Designer_JavaScript_Custom=
+FR-Designer_RWA_Submit=
+FR-Designer_Event_Name=
+FR-Designer_Event_Type=
+FR-Designer_Event_Name_Type=
+FR-Designer_JavaScript_Set=
+FR-Designer_Attribute=
+FR-Designer_Form_Editing_Listeners=
+FR-Designer_Form_Basic_Properties=
+FR-Designer_DS_Dictionary=
+FR-Designer_Create_Tree=
+FR-Designer_Set_Callback_Function=
+FR-Designer_ConfirmDialog_Content=
+FR-Designer_ConfirmDialog_Title=
+
+FR-Designer_FormulaPane_Tips=Tips\:You_Can_Input_B1_To_Input_The_Data_Of_The_First_Row_Second_Column
+FR-Designer_FormulaPane_Variables=Variables
+FR-Designer_FormulaPane_Formula_Description=Formula_Description
+FR-Designer_FormulaPane_Function_Detail=Function Detail
+FR-Designer_FormulaPane_Search=Search
+FR-Designer_Tab_carousel=
+FR-Designer_setCarousel=
+FR-Designer_carouselInterval=
+
+FR-Designer_ClassName_panel=ClassName
+FR-Designer_Description_panel=Description
+FR-Designer_Edit_panel=Edit
+FR-Designer_Property_panel=Property
+FR-Designer_Select_panel=Select

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

@@ -492,5 +492,42 @@ FR-Designer_Permission_Edition=Permissions Edition
 FR-Designer_Export_Excel_Page=Page Break
 FR-Designer_Export_Excel_Simple=Original
 FR-Designer_Export_Excel_PageToSheet=One Page Per Sheet
+FR-Designer_Export_failed=Export failed
+FR-Designer_Exported_successfully=Exported successfully
+FR-Designer_Exporting=Exporting
+FR-Designer_Export-PDF=PDF
+FR-Designer_Properties_Mobile=MobileProperties
 FR-Designer_Button_OK=OK
 FR-Designer_Button_Cancel=Cancel
+FR-Designer_JavaScript=JavaScript
+FR-Designer_JavaScript_Form_Submit=Form Submit
+FR-Designer_JavaScript_Commit_to_Database=Commit to DB
+FR-Designer_JavaScript_Custom=Custom
+FR-Designer_RWA_Submit=Submit
+FR-Designer_Event_Name=Event Name
+FR-Designer_Event_Type=Event Type
+FR-Designer_Event_Name_Type=Event Name and Type
+FR-Designer_JavaScript_Set=JavaScript Set
+FR-Designer_Attribute=Attribute
+FR-Designer_Form_Editing_Listeners=Event editing
+FR-Designer_Form_Basic_Properties=Basic Property
+FR-Designer_DS_Dictionary=Data Dictionary
+FR-Designer_Create_Tree=Build Tree
+FR-Designer_Set_Callback_Function=Set Callback Function
+FR-Designer_ConfirmDialog_Content=
+FR-Designer_ConfirmDialog_Title=
+
+FR-Designer_FormulaPane_Tips=Tips\:You can input B1 to get the data in the second cell of the first row
+FR-Designer_FormulaPane_Variables=Variables
+FR-Designer_FormulaPane_Formula_Description=Formula Description
+FR-Designer_FormulaPane_Function_Detail=Function Detail
+FR-Designer_FormulaPane_Search=Search
+FR-Designer_Tab_carousel=
+FR-Designer_setCarousel=
+FR-Designer_carouselInterval=Interval
+
+FR-Designer_ClassName_panel=Class Name
+FR-Designer_Description_panel=Description
+FR-Designer_Edit_panel=Edit
+FR-Designer_Property_panel=Property
+FR-Designer_Select_panel=Sel

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

@@ -471,3 +471,33 @@ FR-Designer_Export_Excel_Simple=\u305D\u306E\u307E\u307E\u51FA\u529B
 FR-Designer_Export_Excel_PageToSheet=\u6539\u30DA\u30FC\u30B8\uFF06\u30B7\u30FC\u30C8\u5206\u3051
 FR-Designer_Button_OK=\u78BA\u5B9A
 FR-Designer_Button_Cancel=\u30AD\u30E3\u30F3\u30BB\u30EB
+FR-Designer_JavaScript=JavaScript
+FR-Designer_JavaScript_Form_Submit=\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u66F8\u304D\u8FBC\u307F
+FR-Designer_JavaScript_Commit_to_Database=DB\u306B\u66F8\u304D\u8FBC\u307F
+FR-Designer_JavaScript_Custom=\u30AB\u30B9\u30BF\u30E0
+FR-Designer_RWA_Submit=\u66F8\u304D\u8FBC\u307F
+FR-Designer_Event_Name=\u30A4\u30D9\u30F3\u30C8\u540D
+FR-Designer_Event_Type=\u30A4\u30D9\u30F3\u30C8\u30BF\u30A4\u30D7
+FR-Designer_Event_Name_Type=\u30A4\u30D9\u30F3\u30C8\u540D\u3068\u30BF\u30A4\u30D7
+FR-Designer_JavaScript_Set=JS\u8A2D\u5B9A
+FR-Designer_Attribute=\u30D7\u30ED\u30D1\u30C6\u30A3
+FR-Designer_Form_Editing_Listeners=\u30A4\u30D9\u30F3\u30C8\u7DE8\u96C6
+FR-Designer_Form_Basic_Properties=\u57FA\u672C\u30D7\u30ED\u30D1\u30C6\u30A3
+FR-Designer_DS_Dictionary=\u30C7\u30FC\u30BF\u8F9E\u66F8
+FR-Designer_Create_Tree=\u30C4\u30EA\u30FC\u69CB\u7BC9
+FR-Designer_Set_Callback_Function=\u30B3\u30FC\u30EB\u30D0\u30C3\u30AF\u95A2\u6570\u8A2D\u5B9A
+FR-Designer_ConfirmDialog_Content=tab\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8\u3092\u524A\u9664\u3057\u307E\u3059\u304B
+FR-Designer_ConfirmDialog_Title=FineReport 8.0
+FR-Designer_FormulaPane_Tips=\u30D2\u30F3\u30C8\:B1\u3092\u5165\u529B
+FR-Designer_FormulaPane_Variables=\u5909\u6570
+FR-Designer_FormulaPane_Formula_Description=\u516C\u5F0F\u8AAC\u660E
+FR-Designer_FormulaPane_Function_Detail=\u95A2\u6570\u660E\u7D30
+FR-Designer_FormulaPane_Search=\u691C\u7D22
+FR-Designer_Tab_carousel=tab\u30AB\u30EB\u30FC\u30BB\u30EB
+FR-Designer_setCarousel=\u30AB\u30EB\u30FC\u30BB\u30EB\u30AA\u30F3
+FR-Designer_carouselInterval=\u30AB\u30EB\u30FC\u30BB\u30EB\u9593\u9694
+FR-Designer_ClassName_panel=\u985E\u540D
+FR-Designer_Description_panel=\u8A18\u8FF0
+FR-Designer_Edit_panel=\u7DE8\u96C6
+FR-Designer_Property_panel=\u5C5E\u6027
+FR-Designer_Select_panel=\u9078\u629E

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

@@ -467,3 +467,35 @@ FR-Designer_Export_Excel_Simple=\uC6D0\uB798\uBAA8\uC2B5\uB0B4\uBCF4\uB0B4\uAE30
 FR-Designer_Export_Excel_PageToSheet=\uD398\uC774\uC9C0\uC640 Sheet\uB098\uB204\uC5B4\uB0B4\uBCF4\uB0B4\uAE30
 FR-Designer_Button_OK=\uD655\uC778
 FR-Designer_Button_Cancel=\uCDE8\uC18C
+FR-Designer_JavaScript=
+FR-Designer_JavaScript_Form_Submit=
+FR-Designer_JavaScript_Commit_to_Database=
+FR-Designer_JavaScript_Custom=
+FR-Designer_RWA_Submit=
+FR-Designer_Event_Name=
+FR-Designer_Event_Type=
+FR-Designer_Event_Name_Type=
+FR-Designer_JavaScript_Set=
+FR-Designer_Attribute=
+FR-Designer_Form_Editing_Listeners=
+FR-Designer_Form_Basic_Properties=
+FR-Designer_DS_Dictionary=
+FR-Designer_Create_Tree=
+FR-Designer_Set_Callback_Function=
+FR-Designer_ConfirmDialog_Content=
+FR-Designer_ConfirmDialog_Title=
+
+FR-Designer_FormulaPane_Tips=\uC54C\uB9BC\: B1\uC744\uC785\uB825\uD558\uC5EC\uCCAB\uBC88\uC9F8\uD589\uB450\uBC88\uC9F8\uC5F4\uC758\uB370\uC774\uD130\uB97C\uC785\uB825\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4.
+FR-Designer_FormulaPane_Variables=\uBCC0\uC218
+FR-Designer_FormulaPane_Formula_Description=\uC218\uC2DD\uC124\uBA85
+FR-Designer_FormulaPane_Function_Detail=\uD568\uC218\uC0C1\uC138\uC0AC\uD56D
+FR-Designer_FormulaPane_Search=\uAC80\uC0C9
+FR-Designer_Tab_carousel=
+FR-Designer_setCarousel=
+FR-Designer_carouselInterval=
+
+FR-Designer_ClassName_panel=\uD074\uB798\uC2A4\uB124\uC784
+FR-Designer_Description_panel=\uC124\uBA85
+FR-Designer_Edit_panel=\uD3B8\uC9D1
+FR-Designer_Property_panel=\uC18D\uC131
+FR-Designer_Select_panel=\uC120\uD0DD

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

@@ -497,3 +497,35 @@ FR-Designer_Export_Excel_Simple=\u539F\u6837\u5BFC\u51FA
 FR-Designer_Export_Excel_PageToSheet=\u5206\u9875\u5206Sheet\u5BFC\u51FA
 FR-Designer_Button_OK=\u786E\u5B9A
 FR-Designer_Button_Cancel=\u53D6\u6D88
+FR-Designer_JavaScript=JavaScript\u811A\u672C
+FR-Designer_JavaScript_Form_Submit=\u8868\u5355\u63D0\u4EA4
+FR-Designer_JavaScript_Commit_to_Database=\u63D0\u4EA4\u5165\u5E93
+FR-Designer_JavaScript_Custom=\u81EA\u5B9A\u4E49
+FR-Designer_RWA_Submit=\u63D0\u4EA4
+FR-Designer_Event_Name=\u4E8B\u4EF6\u540D
+FR-Designer_Event_Type=\u4E8B\u4EF6\u7C7B\u578B
+FR-Designer_Event_Name_Type=\u4E8B\u4EF6\u540D\u5B57\u548C\u7C7B\u578B
+FR-Designer_JavaScript_Set=JS\u8BBE\u7F6E
+FR-Designer_Attribute=\u5C5E\u6027
+FR-Designer_Form_Editing_Listeners=\u4E8B\u4EF6\u7F16\u8F91
+FR-Designer_Form_Basic_Properties=\u57FA\u672C\u5C5E\u6027
+FR-Designer_DS_Dictionary=\u6570\u636E\u5B57\u5178
+FR-Designer_Create_Tree=\u6784\u5EFA\u6811
+FR-Designer_Set_Callback_Function=\u8BBE\u7F6E\u56DE\u8C03\u51FD\u6570
+FR-Designer_ConfirmDialog_Content=\u662F\u5426\u786E\u5B9A\u5220\u9664tab\u63A7\u4EF6
+FR-Designer_ConfirmDialog_Title=FineReport 8.0
+
+FR-Designer_FormulaPane_Tips=\u63D0\u793A\:\u60A8\u53EF\u4EE5\u901A\u8FC7\u8F93\u5165B1\u6765\u5199\u5165\u7B2C\u4E00\u884C\u7B2C\u4E8C\u5217\u7684\u6570\u636E\u3002
+FR-Designer_FormulaPane_Variables=\u53D8\u91CF
+FR-Designer_FormulaPane_Formula_Description=\u516C\u5F0F\u8BF4\u660E
+FR-Designer_FormulaPane_Function_Detail=\u51FD\u6570\u660E\u7EC6
+FR-Designer_FormulaPane_Search=\u641C\u7D22
+FR-Designer_Tab_carousel=tab\u8F6E\u64AD
+FR-Designer_setCarousel=\u5F00\u542F\u8F6E\u64AD
+FR-Designer_carouselInterval=\u8F6E\u64AD\u95F4\u9694
+
+FR-Designer_ClassName_panel=\u7C7B\u540D
+FR-Designer_Description_panel=\u63CF\u8FF0
+FR-Designer_Edit_panel=\u7F16\u8F91
+FR-Designer_Property_panel=\u5C5E\u6027
+FR-Designer_Select_panel=\u9009\u62E9

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

@@ -485,3 +485,35 @@ FR-Designer_Export_Excel_Simple=\u539F\u6A23\u532F\u51FA
 FR-Designer_Export_Excel_PageToSheet=\u5206\u9801\u5206Sheet\u532F\u51FA
 FR-Designer_Button_OK=\u78BA\u5B9A
 FR-Designer_Button_Cancel=\u53D6\u6D88
+FR-Designer_JavaScript=
+FR-Designer_JavaScript_Form_Submit=
+FR-Designer_JavaScript_Commit_to_Database=
+FR-Designer_JavaScript_Custom=
+FR-Designer_RWA_Submit=
+FR-Designer_Event_Name=
+FR-Designer_Event_Type=
+FR-Designer_Event_Name_Type=
+FR-Designer_JavaScript_Set=
+FR-Designer_Attribute=
+FR-Designer_Form_Editing_Listeners=
+FR-Designer_Form_Basic_Properties=
+FR-Designer_DS_Dictionary=
+FR-Designer_Create_Tree=
+FR-Designer_Set_Callback_Function=
+FR-Designer_ConfirmDialog_Content=
+FR-Designer_ConfirmDialog_Title=
+
+FR-Designer_FormulaPane_Tips=\u63D0\u793A\:\u60A8\u53EF\u4EE5\u901A\u904E\u8F38\u5165B1\u4F86\u5BEB\u5165\u7B2C\u4E00\u5217\u7B2C\u4E8C\u6B04\u7684\u8CC7\u6599\u3002
+FR-Designer_FormulaPane_Variables=\u8B8A\u91CF
+FR-Designer_FormulaPane_Formula_Description=\u516C\u5F0F\u8AAA\u660E
+FR-Designer_FormulaPane_Function_Detail=\u51FD\u6578\u660E\u7D30
+FR-Designer_FormulaPane_Search=\u641C\u7D22
+FR-Designer_Tab_carousel=
+FR-Designer_setCarousel=
+FR-Designer_carouselInterval=
+
+FR-Designer_ClassName_panel=\u985E\u540D
+FR-Designer_Description_panel=\u63CF\u8FF0
+FR-Designer_Edit_panel=\u7DE8\u8F2F
+FR-Designer_Property_panel=\u5C6C\u6027
+FR-Designer_Select_panel=\u9078\u64C7

designer_base/src/com/fr/design/style/color/ColorPicker.java

@@ -7,11 +7,14 @@ package com.fr.design.style.color;
 import com.fr.base.BaseUtils;
 import com.fr.general.FRLogger;
 
+import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.awt.geom.Ellipse2D;
 import java.awt.image.BufferedImage;
-import javax.swing.*;
 
 /**
  * 取色框
@@ -32,7 +35,6 @@ public class ColorPicker extends JDialog implements ActionListener
     private ColorSelectable colorSelectable;
     private Point mousePos;  // 鼠标的绝对坐标
     private Color colorToSet;  // 暂存要设置的颜色值
-    private Color initColor;  // 保存初始颜色。实时模式下，如果取消取色操作，则重设为初始颜色
 
     private Boolean setColorRealTime;  // 实时设定颜色值
 
@@ -67,7 +69,6 @@ public class ColorPicker extends JDialog implements ActionListener
         // 如果要求实时变化，确保先关闭弹窗，再截屏
         // 主要针对"图案"选项卡中的"前景"、"背景"
         if (this.setColorRealTime) {
-            initColor = colorSelectable.getColor();
             colorSelectable.setColor(Color.WHITE);  // setColor 可以关闭弹窗
             try {
                 Thread.sleep(100);  // 等待弹窗关闭
@@ -112,10 +113,10 @@ public class ColorPicker extends JDialog implements ActionListener
         validate();    // 更新所有子控件
     }
 
-    public void pickComplete(Color color) {
+    public void pickComplete(boolean setColor) {
         timer.stop();
-        if (color != null) {
+        if (setColor) {
-            colorSelectable.setColor(color);
+            colorSelectable.setColor(colorToSet);
         }
         this.dispose();
     }
@@ -129,13 +130,8 @@ public class ColorPicker extends JDialog implements ActionListener
 
     private class MouseFunctions extends MouseAdapter
     {
-        public void mousePressed(MouseEvent e)
+        public void mousePressed(MouseEvent e) {
-        {
+            pickComplete(e.getButton() == e.BUTTON1);  // 左键确定
-            if (e.getButton() == e.BUTTON1) {  // 左键确定
-                pickComplete(colorToSet);
-            } else {
-                pickComplete(setColorRealTime ? initColor : null);
-            }
         }
     }
 }