Pull request #15877: REPORT-144262 & REPORT-139239 & REPORT-143955 & REPORT-144196 fix: FBP ui问题修复

Merge in DESIGN/design from ~LEVY.XIE/design:fbp/release to fbp/release

* commit '7977d20b9b525f4869b327dd28cc57c2ff5a054e':
  REPORT-144196 fix:多选删除模板UI死锁问题修复
  REPORT-143955 fix:进度条面板问题修复
  REPORT-139239 fix:图表缩略图缩放优化
  REPORT-144262 fix:数据中心面板注入语言属性

designer-base/src/main/java/com/fr/design/data/tabledata/datacenter/DCTableDataPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.data.tabledata.datacenter;
 
+import com.fanruan.workplace.conetxt.WorkplaceContext;
 import com.fanruan.workplace.http.ServiceType;
 import com.fr.datacenters.tabledata.DCTableData;
 import com.fr.datacenters.tabledata.bean.DCNameBean;
@@ -34,6 +35,7 @@ public class DCTableDataPane extends AbstractTableDataPane<DCTableData> {
     private static final JxEngine JX_ENGINE = JxEngine.newInstance(true);
 
     private static final String DATA_CENTER = "dc";
+    private static final String LANGUAGE = "language";
     private static final String DATA_CENTER_HELPER = "dcHelper";
     private static final String DATA_CENTER_INJECT_URL = "fineServletURL";
     private static final String DC_INDEX_HTML = "com/fr/design/data/tabledata/datacenter/web/data-choose.prod.html";
@@ -70,6 +72,7 @@ public class DCTableDataPane extends AbstractTableDataPane<DCTableData> {
                     .engine(JX_ENGINE)
                     .namespace(DATA_CENTER)
                     .bindWindow(DATA_CENTER_HELPER, DCTableDataJSBridge::getBridge)
+                    .bindNamespace(LANGUAGE, WorkplaceContext.getLocale().toString())
                     .withURL(DATACENTERS_URL, ImmutableMap.of(DATA_CENTER_INJECT_URL, getDatacentersUrl()))
                     .build();
         } else {
@@ -77,6 +80,7 @@ public class DCTableDataPane extends AbstractTableDataPane<DCTableData> {
                     .engine(JX_ENGINE)
                     .namespace(DATA_CENTER)
                     .bindWindow(DATA_CENTER_HELPER, DCTableDataJSBridge::getBridge)
+                    .bindNamespace(LANGUAGE, WorkplaceContext.getLocale().toString())
                     .withEMB(DC_INDEX_HTML, ImmutableMap.of(DATA_CENTER_INJECT_URL, getDatacentersUrl()))
                     .build();
         }

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/MultiResultTableDataWrapper.java

@@ -14,6 +14,7 @@ import com.fr.design.gui.iprogressbar.AutoProgressBar;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.ui.util.UIUtil;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.workspace.server.repository.connection.ConnectionRepository;
@@ -200,7 +201,7 @@ public final class MultiResultTableDataWrapper implements TableDataWrapper {
                         FineLoggerFactory.getLogger().error(e.getMessage(), e);
                         throw new Exception(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
                     } finally {
-                        connectionBar.close();
+                        UIUtil.invokeLaterIfNeeded(() -> connectionBar.close());
                     }
                 }
 

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java

@@ -13,6 +13,7 @@ import com.fr.design.gui.iprogressbar.AutoProgressBar;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.ui.util.UIUtil;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.workspace.server.entity.connection.ConnectionBean;
@@ -185,10 +186,10 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
                     ConnectionRepository.getInstance().testConnection(ConnectionInfoBeanHelper.createConnectionInfoBean(((StoreProcedure) getTableData()).getDatabaseConnection()));
                 } catch (Exception e) {
                     FineLoggerFactory.getLogger().error(e.getMessage(), e);
-                    connectionBar.close();
                     throw new Exception(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
+                } finally {
+                    UIUtil.invokeLaterIfNeeded(() -> connectionBar.close());
                 }
-                connectionBar.close();
                 storeProcedure.resetDataModelList();
                 createStore(true);
                 return null;

designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java

@@ -385,8 +385,10 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     }
 
     private void initContentPane() {
-        initRightPane();
-        initLeftPane();
+        UIUtil.invokeLaterIfNeeded(() -> {
+            initRightPane();
+            initLeftPane();
+        });
     }
 
     // 右侧属性面板

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ChartImagePane.java

@@ -1,6 +1,5 @@
 package com.fr.design.mainframe.chart.gui.type;
 
-import com.fine.theme.utils.FineUIStyle;
 import com.fine.theme.utils.FineUIUtils;
 import com.fr.design.chart.series.PlotStyle.ChartSelectDemoPane;
 import com.fr.design.constants.UIConstants;
@@ -9,9 +8,9 @@ import com.fr.general.IOUtils;
 
 import javax.swing.BorderFactory;
 import java.awt.BorderLayout;
-import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
+import java.awt.Image;
 import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
 
@@ -47,9 +46,10 @@ public class ChartImagePane extends ChartSelectDemoPane {
             public void paint(Graphics g) {
                 super.paint(g);
 
-                BufferedImage image1 = IOUtils.readImageWithCache(fullIconPath);
+                BufferedImage bufferedImage = IOUtils.readImageWithCache(fullIconPath);
+                Image scaledImage = bufferedImage.getScaledInstance(scale(IMAGE_WIDTH), scale(IMAGE_HIGTH), Image.SCALE_SMOOTH);
                 int x = (this.getWidth() - scale(IMAGE_WIDTH)) / 2;
-                g.drawImage(image1, x, 0, scale(IMAGE_WIDTH), scale(IMAGE_HIGTH), null);
+                g.drawImage(scaledImage, x, 0, null);
             }
         };