From aa15ed8aa5227dc4c47c2c0d7bd48bd687469417 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Thu, 20 Jul 2023 14:30:16 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-100984=20=E3=80=90=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BA=8C=E6=9C=9F=E3=80=91=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=9B=B4=E6=8E=A5=E8=BF=9B=E5=85=A5=E6=96=B0?= =?UTF-8?q?=E7=89=88=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86=EF=BC=8C=E4=BC=9A?= =?UTF-8?q?=E6=9C=89=E6=9B=B4=E6=96=B0=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/mainframe/vcs/ui/VcsMovePanel.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java index 5dacb65e91..f9d362ad8d 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java @@ -16,6 +16,7 @@ import com.fr.design.layout.VerticalFlowLayout; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.vcs.common.VcsHelper; import com.fr.design.utils.DesignUtils; +import com.fr.design.utils.ThemeUtils; import com.fr.design.widget.FRWidgetFactory; import com.fr.general.FRFont; import com.fr.log.FineLoggerFactory; @@ -37,6 +38,9 @@ import java.awt.event.MouseEvent; import java.util.List; import java.util.concurrent.ExecutionException; +import static javax.swing.JOptionPane.YES_NO_CANCEL_OPTION; +import static javax.swing.JOptionPane.YES_OPTION; + /** * 迁移面板 @@ -238,7 +242,9 @@ public class VcsMovePanel extends BasicPane { } private void initVcsLabel(JPanel parent) { + parent.removeAll(); if (!VcsHelper.getInstance().isLegacyMode()) { + parent.setBackground(ThemeUtils.BACK_COLOR); centerButton = new UIButton(Toolkit.i18nText("Fine-Design_Vcs_Center")); parent.add(centerButton); initVcsCenterListener(); @@ -324,11 +330,8 @@ public class VcsMovePanel extends BasicPane { private void doAfterMove() { visible = !VcsHelper.getInstance().isLegacyMode(); - if (visible) { - updatePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); - updatePane.add(new UIButton(Toolkit.i18nText("Fine-Design_Vcs_Center"))); - } - updatePane.setVisible(!visible); + initVcsLabel(updatePane); + updatePane.setVisible(visible); callBack.doCallBack(visible); parentCard.show(parentPane, SETTING); }