From 4943a82057fd8a67a06bd14e377a012217f97142 Mon Sep 17 00:00:00 2001
From: vito <vito@finereport.com>
Date: Fri, 13 Nov 2020 11:52:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20bugfix?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95=E6=89=93=E5=8C=85=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 3580cbae0d..617b9d0fa8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -72,7 +72,9 @@ allprojects {
         implementation 'com.fr.datasource:fine-datasource:' + frVersion
         implementation 'com.fr.decision:fine-decision:' + frVersion
         implementation 'com.fr.schedule:fine-schedule:' + frVersion
-        implementation 'com.fr.report:fine-report-engine:' + frDevVersion
+        implementation 'com.fr.report:engine-report:' + frDevVersion
+        implementation 'com.fr.report:engine-chart:' + frDevVersion
+        implementation 'com.fr.report:engine-i18n:' + frDevVersion
         implementation 'com.fr.design:design-i18n:' + frDevVersion
         testImplementation 'org.easymock:easymock:3.5.1'
         testImplementation 'org.powermock:powermock-module-junit4:1.7.1'

From 2a9061f0f11cb840f1fc06052c4534ca25fad5be Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Fri, 13 Nov 2020 15:33:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-40853=20=E6=8F=90=E4=BA=A4=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=A0=BC=E7=BB=84=E5=A4=9A=E6=AC=A1=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=8D=A1=E6=AD=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/write/submit/DBManipulationPane.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
index 590f9d1121..ccf01dd5e8 100644
--- a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
+++ b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
@@ -53,6 +53,7 @@ import javax.swing.BorderFactory;
 import javax.swing.DefaultCellEditor;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.Icon;
+import javax.swing.JFrame;
 import javax.swing.JList;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -867,13 +868,14 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 			textLabel = new UILabel();
 			textLabel.addMouseListener(new MouseAdapter() {
 				public void mousePressed(MouseEvent e) {
+					vPaneDLG.setAlwaysOnTop(true);
 					vPaneDLG.setVisible(true);
 
 				}
 			});
 
 			vPane = new ValuePane(types);
-			vPaneDLG = vPane.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+			vPaneDLG = vPane.showSmallWindow(new JFrame(), new DialogActionAdapter() {
 				public void doOk() {
 					fireEditingStopped(); // Make the renderer
 					// reappear.