From 38ab2d46119568edb00b81f63c9e66b2db395d68 Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <Destiny.Lin@fanruan.com>
Date: Tue, 21 Mar 2023 09:51:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?REPORT-91743=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=85=B3=E9=97=AD=E6=A8=A1=E6=9D=BFA?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E5=BC=8F=E8=A7=A6=E5=8F=91=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E8=AE=A1=E5=99=A8=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=BF=98=E6=98=AF=E6=A8=A1=E6=9D=BFA=E7=9A=84?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=20=E5=90=8C=E6=AD=A510.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/file/MutilTempalteTabPane.java   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java b/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java
index 047420294a..08fb3a8689 100644
--- a/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java
+++ b/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java
@@ -766,8 +766,8 @@ public class MutilTempalteTabPane extends JComponent {
             // 如果关闭的模板是当前选中的模板，则重新激活当前 selectIndex 的模板；
             // selectIndex 没有变化，但是对应的模板已经变成了前一张模板
             if (closeIconIndex == selectedIndex || isCloseCurrent) {
-                // 如果 closeIconIndex 是最后一个被渲染画出的，那么预览上一个，防止数组越界
-                if (closeIconIndex >= maxPaintIndex) {
+                // 如果当前关闭的模板在最右侧，那么预览上一个，防止数组越界
+                if (selectedIndex >= maxPaintIndex) {
                     // selectIndex 不会 <0 因为如果关闭的是打开的最后一个模板，那么关闭之后 openedTemplate.isEmpty() = true
                     selectedIndex--;
                 }
@@ -953,6 +953,10 @@ public class MutilTempalteTabPane extends JComponent {
                         return;
                     }
                 }
+                //参考CloseCurrentTemplateAction，在closeFormat与closeSpecifiedTemplate之前要先设定isCloseCurrent，这样关闭之后才会自动切换tab
+                if (checkCurrentClose(template)) {
+                    setIsCloseCurrent(true);
+                }
                 closeFormat(template);
                 closeSpecifiedTemplate(template);
                 DesignerContext.getDesignerFrame().getContentFrame().repaint();
@@ -985,6 +989,12 @@ public class MutilTempalteTabPane extends JComponent {
 
 
     }
+    private boolean checkCurrentClose(JTemplate template) {
+        JTemplate currentTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        //10.0无JTemplate.isValid
+        return currentTemplate != null && ComparatorUtils.equals(template.getPath(), currentTemplate.getPath());
+    }
+
 
     private class MultiTemplateTabMouseMotionListener implements MouseMotionListener {
         /**

From 8c6b1de9112dd53188da0a962d13d7ece471d9fd Mon Sep 17 00:00:00 2001
From: obo <Obo@fanruan.com>
Date: Wed, 22 Mar 2023 19:49:18 +0800
Subject: [PATCH 2/3] =?UTF-8?q?REPORT-82787=20=E5=9B=BE=E8=A1=A8=E7=A9=BA?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8F=90=E7=A4=BA=E9=85=8D=E7=BD=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=9B=BE=E7=89=87=E9=9C=80?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=B9=81=E4=B8=AD=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/locale/impl/EmptyDataMark.java  |  37 ++++++++++++++++++
 .../module/ChartEmptyDataStylePane.java       |  26 +++++-------
 .../images/zh_traditional_emptydata.png       | Bin 0 -> 18659 bytes
 3 files changed, 46 insertions(+), 17 deletions(-)
 create mode 100644 designer-chart/src/main/java/com/fr/design/locale/impl/EmptyDataMark.java
 create mode 100644 designer-chart/src/main/resources/com/fr/design/images/zh_traditional_emptydata.png

diff --git a/designer-chart/src/main/java/com/fr/design/locale/impl/EmptyDataMark.java b/designer-chart/src/main/java/com/fr/design/locale/impl/EmptyDataMark.java
new file mode 100644
index 0000000000..6b7a2f5fbd
--- /dev/null
+++ b/designer-chart/src/main/java/com/fr/design/locale/impl/EmptyDataMark.java
@@ -0,0 +1,37 @@
+package com.fr.design.locale.impl;
+
+import com.fr.general.GeneralContext;
+import com.fr.general.IOUtils;
+import com.fr.general.locale.LocaleMark;
+
+import java.awt.image.BufferedImage;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * 根据本地化信息设置服务器图表空数据提示图标
+ *
+ * @author obo
+ * @version 11.0
+ * Created by obo on 2023/3/22
+ */
+public class EmptyDataMark implements LocaleMark<BufferedImage> {
+
+    private Map<Locale, BufferedImage> map = new HashMap<>();
+
+    private static final BufferedImage ZH_EMPTY_DATA = IOUtils.readImage("com/fr/design/images/zh_emptydata.png");
+    private static final BufferedImage US_EMPTY_DATA = IOUtils.readImage("/com/fr/design/images/us_emptydata.png");
+    private static final BufferedImage ZH_TRADITIONAL_EMPTY_DATA = IOUtils.readImage("/com/fr/design/images/zh_traditional_emptydata.png");
+
+    public EmptyDataMark() {
+        map.put(Locale.CHINA, ZH_EMPTY_DATA);
+        map.put(Locale.US, US_EMPTY_DATA);
+        map.put(Locale.TAIWAN, ZH_TRADITIONAL_EMPTY_DATA);
+    }
+    @Override
+    public BufferedImage getValue() {
+        BufferedImage result = map.get(GeneralContext.getLocale());
+        return result == null ? US_EMPTY_DATA : result;
+    }
+}
diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java
index 31718fda82..b4d1100d9f 100644
--- a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java
+++ b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java
@@ -10,31 +10,23 @@ import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.locale.impl.EmptyDataMark;
 import com.fr.design.style.background.image.ImageFileChooser;
 import com.fr.design.style.background.image.ImagePreviewPane;
 import com.fr.design.utils.ImageUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.general.GeneralContext;
-import com.fr.general.IOUtils;
+import com.fr.general.locale.LocaleCenter;
+import com.fr.general.locale.LocaleMark;
 import com.fr.stable.Constants;
 import com.fr.stable.CoreGraphHelper;
 import com.fr.stable.StringUtils;
 
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.JFileChooser;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.SwingWorker;
-import java.io.File;
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.GridLayout;
-import java.awt.Image;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.image.BufferedImage;
+import java.io.File;
 
 /**
  * Created by mengao on 2017/11/23.
@@ -63,8 +55,8 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane {
 
 
     static {
-        DEFAULT_EMPTY_DATA_IMAGE = GeneralContext.isChineseEnv() ? IOUtils.readImage("com/fr/design/images/zh_emptydata.png")
-                : IOUtils.readImage("com/fr/design/images/us_emptydata.png");
+        LocaleMark<BufferedImage> localeMark = LocaleCenter.getMark(EmptyDataMark.class);
+        DEFAULT_EMPTY_DATA_IMAGE = localeMark.getValue();
     }
 
     @Override
diff --git a/designer-chart/src/main/resources/com/fr/design/images/zh_traditional_emptydata.png b/designer-chart/src/main/resources/com/fr/design/images/zh_traditional_emptydata.png
new file mode 100644
index 0000000000000000000000000000000000000000..738fa685adb223d384edfe6310251f31365a6830
GIT binary patch
literal 18659
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

literal 0
HcmV?d00001


From 09eac6f6afc8e602ce99bbdc753cfc645863047d Mon Sep 17 00:00:00 2001
From: obo <Obo@fanruan.com>
Date: Wed, 22 Mar 2023 19:57:25 +0800
Subject: [PATCH 3/3] =?UTF-8?q?REPORT-82787=20=E5=9B=BE=E8=A1=A8=E7=A9=BA?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8F=90=E7=A4=BA=E9=85=8D=E7=BD=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=9B=BE=E7=89=87=E9=9C=80?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=B9=81=E4=B8=AD=E7=89=88=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?import?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/module/ChartEmptyDataStylePane.java  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java
index b4d1100d9f..e73bae010e 100644
--- a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java
+++ b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java
@@ -21,8 +21,18 @@ import com.fr.stable.Constants;
 import com.fr.stable.CoreGraphHelper;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
+import javax.swing.JFileChooser;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.SwingWorker;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
+import java.awt.Image;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.image.BufferedImage;