From 0d66014eedd8d89bca423c0e3c2ac1985c6aba89 Mon Sep 17 00:00:00 2001
From: "shengzu.xue" <shengzu.xue@fanruan.com>
Date: Fri, 17 Jan 2025 10:54:22 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-144631=20=E4=BD=BF=E7=94=A8LazyIcon?=
 =?UTF-8?q?=E9=80=82=E9=85=8DIcon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/icon/insert}/auto_chart_disabled.svg                | 0
 .../m_insert => fine/theme/icon/insert}/auto_chart_normal.svg | 0
 .../resources/com/fine/theme/light/ui/fine_light.icon.json    | 4 ++++
 .../fr/van/chart/designer/type/AbstractVanChartTypePane.java  | 3 ++-
 .../fr/design/actions/insert/cell/AutoChartCellAction.java    | 3 ++-
 .../fr/design/actions/insert/flot/AutoChartFloatAction.java   | 4 ++--
 6 files changed, 10 insertions(+), 4 deletions(-)
 rename designer-base/src/main/resources/com/{fr/design/images/m_insert => fine/theme/icon/insert}/auto_chart_disabled.svg (100%)
 rename designer-base/src/main/resources/com/{fr/design/images/m_insert => fine/theme/icon/insert}/auto_chart_normal.svg (100%)

diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/auto_chart_disabled.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/auto_chart_disabled.svg
similarity index 100%
rename from designer-base/src/main/resources/com/fr/design/images/m_insert/auto_chart_disabled.svg
rename to designer-base/src/main/resources/com/fine/theme/icon/insert/auto_chart_disabled.svg
diff --git a/designer-base/src/main/resources/com/fr/design/images/m_insert/auto_chart_normal.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/auto_chart_normal.svg
similarity index 100%
rename from designer-base/src/main/resources/com/fr/design/images/m_insert/auto_chart_normal.svg
rename to designer-base/src/main/resources/com/fine/theme/icon/insert/auto_chart_normal.svg
diff --git a/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json b/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json
index 3e73413584..cce6c03234 100644
--- a/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json
+++ b/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json
@@ -511,6 +511,10 @@
       "normal": "alphafine/alphaFine_template.svg",
       "disable": "alphafine/alphaFine_template_disable.svg",
       "white": "alphafine/alphaFine_template_white.svg"
+    },
+    "auto_chart": {
+      "normal": "insert/auto_chart_normal.svg",
+      "disable": "insert/auto_chart_disabled.svg"
     }
   }
 }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java
index fcc27ee301..61668a9278 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java
@@ -1,5 +1,6 @@
 package com.fr.van.chart.designer.type;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.BaseUtils;
 import com.fr.base.chart.chartdata.TopDefinitionProvider;
 import com.fr.base.svg.IconUtils;
@@ -62,7 +63,7 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane<Van
         buttonPane.setLayout(new BorderLayout());
         if (ChartTypeManager.AUTO_CHART) {
             autoButton = new UIButton(Toolkit.i18nText("Fine-Design_Chart_Auto_Recommended_Chart"),
-                    IconUtils.readIcon("/com/fr/design/images/m_insert/auto_chart_normal.svg")) {
+                    new LazyIcon("auto_chart")) {
                 @Override
                 public Dimension getPreferredSize() {
                     return new Dimension((int) super.getPreferredSize().getWidth(), 25);
diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/AutoChartCellAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/AutoChartCellAction.java
index 5f3fc737e2..9565769966 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/AutoChartCellAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/AutoChartCellAction.java
@@ -1,5 +1,6 @@
 package com.fr.design.actions.insert.cell;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.chart.chartattr.AutoChartCollection;
 import com.fr.common.annotations.Open;
 import com.fr.design.actions.core.WorkBookSupportable;
@@ -30,7 +31,7 @@ public class AutoChartCellAction extends AbstractCellAction implements WorkBookS
         this.setMenuKeySet(INSERT_AUTO_CHART);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/auto_chart_normal.svg");
+        this.setSmallIcon(new LazyIcon("auto_chart"));
     }
 
     public static final MenuKeySet INSERT_AUTO_CHART = new MenuKeySet() {
diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/flot/AutoChartFloatAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/flot/AutoChartFloatAction.java
index 0464341789..9ab4162ef2 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/insert/flot/AutoChartFloatAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/insert/flot/AutoChartFloatAction.java
@@ -1,6 +1,6 @@
 package com.fr.design.actions.insert.flot;
 
-import com.fr.base.BaseUtils;
+import com.fine.theme.icon.LazyIcon;
 import com.fr.design.gui.chart.MiddleChartDialog;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.ElementCasePane;
@@ -28,7 +28,7 @@ public class AutoChartFloatAction extends ChartFloatAction {
         this.setMenuKeySet(FLOAT_INSERT_AUTO_CHART);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/auto_chart_normal.svg");
+        this.setSmallIcon(new LazyIcon("auto_chart"));
     }
 
     public static final MenuKeySet FLOAT_INSERT_AUTO_CHART = new MenuKeySet() {