From 5480d73debae351591817006bb15851c7d3f3074 Mon Sep 17 00:00:00 2001 From: kuangshuai Date: Wed, 20 Oct 2021 14:39:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E6=8D=A2?= =?UTF-8?q?=E4=B8=80=E4=B8=8Bsvg=E5=9B=BE=E7=89=87=EF=BC=8C=E5=8E=9F?= =?UTF-8?q?=E6=9D=A5=E7=9A=84svg=E5=9B=BE=E7=89=87=E6=9C=89=E7=82=B9?= =?UTF-8?q?=E5=8F=98=E5=BD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/mainframe/guide/complete_all.svg | 15 ++++------- .../design/mainframe/guide/complete_none.svg | 21 ++++------------ .../design/mainframe/guide/complete_some.svg | 25 +++++++------------ 3 files changed, 19 insertions(+), 42 deletions(-) diff --git a/designer-base/src/main/resources/com/fr/design/mainframe/guide/complete_all.svg b/designer-base/src/main/resources/com/fr/design/mainframe/guide/complete_all.svg index f609eb9e58..f18c158027 100644 --- a/designer-base/src/main/resources/com/fr/design/mainframe/guide/complete_all.svg +++ b/designer-base/src/main/resources/com/fr/design/mainframe/guide/complete_all.svg @@ -1,17 +1,12 @@ - 编组 7备份 4 - - - - - + 全部完成 - - + + - - + + diff --git a/designer-base/src/main/resources/com/fr/design/mainframe/guide/complete_none.svg b/designer-base/src/main/resources/com/fr/design/mainframe/guide/complete_none.svg index 0e945f5a8b..ec078243bf 100644 --- a/designer-base/src/main/resources/com/fr/design/mainframe/guide/complete_none.svg +++ b/designer-base/src/main/resources/com/fr/design/mainframe/guide/complete_none.svg @@ -1,23 +1,12 @@ - 编组 7备份 5 - - - - - - + 未完成@2x - - + + - - - - - - - + + diff --git a/designer-base/src/main/resources/com/fr/design/mainframe/guide/complete_some.svg b/designer-base/src/main/resources/com/fr/design/mainframe/guide/complete_some.svg index 9cff96f2a9..e6151ea038 100644 --- a/designer-base/src/main/resources/com/fr/design/mainframe/guide/complete_some.svg +++ b/designer-base/src/main/resources/com/fr/design/mainframe/guide/complete_some.svg @@ -1,28 +1,21 @@ - 编组 7备份 4 + 部分完成 - - - - - + - - + + - + - - + + - - - - - + + From 0c76b726ba247cb250d3633de174b90c465a84e9 Mon Sep 17 00:00:00 2001 From: kuangshuai Date: Wed, 20 Oct 2021 15:32:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-61275=20=E9=83=A8=E5=88=86=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E9=BB=98=E8=AE=A4=E5=B7=A5=E5=85=B7=E6=A0=8F=E5=B1=95?= =?UTF-8?q?=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guide/creator/layout/UseLayoutAndComponentGuide.java | 2 ++ .../guide/creator/theme/DownloadComponentPackageGuide.java | 1 + .../design/mainframe/guide/creator/theme/ThemeToggleGuide.java | 1 + 3 files changed, 4 insertions(+) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/layout/UseLayoutAndComponentGuide.java b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/layout/UseLayoutAndComponentGuide.java index 0a8c3abae9..05f0d20be0 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/layout/UseLayoutAndComponentGuide.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/layout/UseLayoutAndComponentGuide.java @@ -89,7 +89,9 @@ public class UseLayoutAndComponentGuide { Component component = ComponentUtils.findComponentByName(NorthRegionContainerPane.getInstance(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")); fileHeadMenu = ((UIHeadMenu) component); asyncThemeFetcher.shutdown(); + EastRegionContainerPane.getInstance().showContainer(); GuideManager.getInstance().getCurrentGuide().start(); + } }); } else { diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/DownloadComponentPackageGuide.java b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/DownloadComponentPackageGuide.java index 3b6e86a8f8..f5d8bf57f4 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/DownloadComponentPackageGuide.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/DownloadComponentPackageGuide.java @@ -99,6 +99,7 @@ public class DownloadComponentPackageGuide { GuideManager.getInstance().getCurrentGuide().terminate(); return false; } + EastRegionContainerPane.getInstance().showContainer(); EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_WIDGET_SETTINGS); OnlineWidgetRepoPane onlineWidgetRepoPane = OnlineWidgetRepoPane.getInstance(); OnlineWidgetTabPane tabPane = (OnlineWidgetTabPane) ComponentUtils.findComponentByClass(onlineWidgetRepoPane, OnlineWidgetTabPane.class); diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/ThemeToggleGuide.java b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/ThemeToggleGuide.java index a61c592a30..3ab6234a3a 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/ThemeToggleGuide.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/ThemeToggleGuide.java @@ -82,6 +82,7 @@ public class ThemeToggleGuide { GuideCreateUtils.showNoFileAuthAlert(); GuideManager.getInstance().getCurrentGuide().terminate(); } else { + EastRegionContainerPane.getInstance().showContainer(); EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_WIDGET_SETTINGS); asyncThemeFetcher.shutdown(); GuideManager.getInstance().getCurrentGuide().start();