REPORT-91839 模板版本管理二期 优化迁移面板

designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java

@@ -5,6 +5,7 @@ import com.fr.base.svg.IconUtils;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.ilable.UILabel;
@@ -26,6 +27,7 @@ import com.fr.workspace.server.vcs.v2.move.VcsMoveStrategy;
 
 import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JProgressBar;
 import javax.swing.SwingUtilities;
@@ -277,6 +279,35 @@ public class VcsMovePanel extends BasicPane {
                 BasicDialog dlg = choosePane.showMediumWindow(SwingUtilities.getWindowAncestor(VcsMovePanel.this), new DialogActionAdapter() {
                     @Override
                     public void doOk() {
+                        createConfirmPane(VcsMovePanel.this);
+                    }
+                });
+                dlg.setVisible(true);
+            }
+        });
+    }
+
+    private void createConfirmPane(Component parent) {
+        VerticalFlowLayout layout = new VerticalFlowLayout(VerticalFlowLayout.TOP);
+        layout.setAlignLeft(true);
+        JPanel panel = new JPanel();
+        panel.setLayout(layout);
+        UILabel titleLabel = new UILabel(Toolkit.i18nText("Fine-Design_Vcs_Move_Tip_Title"));
+        UILabel firstLabel = new UILabel(Toolkit.i18nText("Fine-Design_Vcs_Move_Tip_First"));
+        UILabel secondLabel = new UILabel(Toolkit.i18nText("Fine-Design_Vcs_Move_Tip_Second"));
+        titleLabel.setForeground(TIP_COLOR);
+        firstLabel.setForeground(TIP_COLOR);
+        secondLabel.setForeground(TIP_COLOR);
+        panel.add(new UILabel(Toolkit.i18nText("Fine-Design_Vcs_Move_Right_Now")));
+        panel.add(titleLabel);
+        panel.add(firstLabel);
+        panel.add(secondLabel);
+        int value = FineJOptionPane.showConfirmDialog(parent, panel, Toolkit.i18nText("Fine-Design_Vcs_Move_Title"), JOptionPane.YES_NO_OPTION);
+        processMove(value);
+    }
+
+    private void processMove(int value) {
+        if (value == YES_OPTION) {
             //进度条面板
             initProcessPane();
             VcsMovePanel.this.getParentCard().next(getParentPane());
@@ -290,10 +321,6 @@ public class VcsMovePanel extends BasicPane {
             }
             new MoveWorker(strategy).execute();
         }
-                });
-                dlg.setVisible(true);
-            }
-        });
     }
 
     private void initSuccessPane() {