From 748dadd13889cc4bd152634585615dff252d1cc5 Mon Sep 17 00:00:00 2001 From: lemon Date: Mon, 14 Oct 2024 16:34:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-137164=20fix:=20=E6=9C=80=E8=BF=91?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=A2=9C=E8=89=B2=E5=B1=95=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/style/color/NewColorSelectPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java index 771a07d1d2..fb3e589650 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java @@ -462,7 +462,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { int size = colors.length; for (int i = 1; i <= total; i++) { ColorCell cell = (ColorCell) this.pane.getComponent(i); - Color color = i < size ? colors[size - i - 1] : UsedColorPane.DEFAULT_COLOR; + Color color = i < size ? colors[size - i] : UsedColorPane.DEFAULT_COLOR; cell.setColor(color == null ? UsedColorPane.DEFAULT_COLOR : color); } } From 23334d53a72ab9b17890f5b08fdc7a9263a13d1e Mon Sep 17 00:00:00 2001 From: lemon Date: Mon, 14 Oct 2024 16:37:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-137164=20fix:=20=E6=9C=80=E8=BF=91?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=A2=9C=E8=89=B2=E5=B1=95=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/style/color/NewColorSelectPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java index fb3e589650..1e7b3394e4 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java @@ -462,7 +462,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { int size = colors.length; for (int i = 1; i <= total; i++) { ColorCell cell = (ColorCell) this.pane.getComponent(i); - Color color = i < size ? colors[size - i] : UsedColorPane.DEFAULT_COLOR; + Color color = i <= size ? colors[size - i] : UsedColorPane.DEFAULT_COLOR; cell.setColor(color == null ? UsedColorPane.DEFAULT_COLOR : color); } } From c8ffd8966f6145aa10c1dea1a019b4769d0dfa52 Mon Sep 17 00:00:00 2001 From: "Richard.Fang" Date: Mon, 14 Oct 2024 16:58:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-137231=20fix:=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=88=90=E5=8A=9F=E5=9B=BE=E6=A0=87=E6=9C=AA?= =?UTF-8?q?=E5=8F=98=E5=8C=96=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/actions/file/export/AbstractExportAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java b/designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java index f669403db5..7026a57101 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java @@ -170,7 +170,7 @@ public abstract class AbstractExportAction> extends JT this.setProgress(100); FineLoggerFactory.getLogger().info("\"" + name + "\"" + Toolkit.i18nText("Fine-Design_Report_Finish_Export") + "!"); - FineJOptionPane.showMessageDialog( + FineJOptionPane.showSuccessMessageDialog( DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Report_Exported_Successfully") + "\n" + name);