Revert "REPORT-91839 模板版本管理二期 bug修复"

This reverts commit 49cbdffd43.

designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@@ -50,12 +50,9 @@ import com.fr.io.attr.ImageExportAttr;
 import com.fr.locale.InterProviderFactory;
 import com.fr.log.FineLoggerFactory;
 import com.fr.report.ReportConfigManager;
-import com.fr.scheduler.tool.FineScheduler;
 import com.fr.stable.Constants;
 import com.fr.stable.os.OperatingSystem;
 import com.fr.third.apache.logging.log4j.Level;
-import com.fr.third.guava.collect.BiMap;
-import com.fr.third.guava.collect.HashBiMap;
 import com.fr.transaction.Configurations;
 import com.fr.transaction.Worker;
 import com.fr.transaction.WorkerAdaptor;
@@ -95,7 +92,6 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.File;
 import java.text.DecimalFormat;
-import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
@@ -228,8 +224,6 @@ public class PreferencePane extends BasicPane {
 
     private JPanel saveIntervalPane;
     private JPanel autoCleanPane;
-
-    private JPanel gcControlPane;
     private UICheckBox startupPageEnabledCheckBox;
     private IntegerEditor saveIntervalEditor;
     private UICheckBox gcEnableCheckBox;
@@ -251,15 +245,7 @@ public class PreferencePane extends BasicPane {
     private UIRadioButton previewRenderQuality;
     private static final int DPI_SCALE_S = 1;
     private static final int DPI_SCALE_M = 2;
-    private static final BiMap<Integer, Integer> INDEX_DAY_MAP = HashBiMap.create(new HashMap<Integer, Integer>() {
-        {
-            put(ONE_DAY_INDEX, ONE_DAY_INT);
-            put(ONE_WEEK_INDEX, ONE_WEEK_INT);
-            put(ONE_MONTH_INDEX, ONE_MONTH_INT);
-            put(SIX_MONTH_INDEX, SIX_MONTH_INT);
-            put(THREE_MONTH_INDEX, THREE_MONTH_INT);
-        }
-    });
+
     public PreferencePane() {
         this.initComponents();
     }
@@ -432,7 +418,7 @@ public class PreferencePane extends BasicPane {
         savePane.add(saveIntervalPane);
 
         //gc面板
-        gcControlPane = createGcControlPane();
+        JPanel gcControlPane = createGcControlPane();
 
         JPanel enableVcsPanel = new JPanel(FRGUIPaneFactory.createLeftZeroLayout());
         enableVcsPanel.add(remindVcsLabel);
@@ -484,14 +470,9 @@ public class PreferencePane extends BasicPane {
     private VcsMovePanel createMovePane(CardLayout cardLayout, JPanel parentPane) {
         return new VcsMovePanel(cardLayout, parentPane, new VcsMovePanel.MoveCallBack(){
             @Override
-            public void doCallBack(boolean useV2) {
-                saveIntervalPane.setVisible(useV2);
-                autoCleanPane.setVisible(useV2);
-                useVcsAutoCleanScheduleCheckBox.setSelected(useV2);
-                useVcsAutoSaveScheduleCheckBox.setSelected(useV2);
-                gcControlPane.setVisible(!useV2);
-                useVcsAutoCleanScheduleCheckBox.setEnabled(useV2 && FineScheduler.getInstance().isStarted());
-                useVcsAutoSaveScheduleCheckBox.setEnabled(useV2);
+            public void doCallBack(boolean visible) {
+                saveIntervalPane.setVisible(visible);
+                autoCleanPane.setVisible(visible);
             }
         });
     };
@@ -509,7 +490,7 @@ public class PreferencePane extends BasicPane {
         autoCleanPane.add(new UILabel(i18nText("Fine-Design_Vcs_Auto_Clean_Content")));
         autoCleanPane.add(autoCleanRetainIntervalComboBox);
         autoCleanPane.add(new UILabel(i18nText("Fine-Design_Vcs_Auto_Clean_Last")));
-        useVcsAutoCleanScheduleCheckBox.setEnabled(!VcsHelper.getInstance().isLegacyMode() && FineScheduler.getInstance().isStarted());
+        useVcsAutoCleanScheduleCheckBox.setEnabled(!VcsHelper.getInstance().isLegacyMode());
         autoCleanPane.setVisible(false);
         return autoCleanPane;
     }
@@ -935,8 +916,6 @@ public class PreferencePane extends BasicPane {
         useVcsAutoSaveScheduleCheckBox.setSelected(vcsConfigManager.isUseAutoSave());
         useVcsAutoCleanScheduleCheckBox.setSelected(VcsConfig.getInstance().isUseV2AutoClean());
         autoSaveIntervalEditor.setValue(vcsConfigManager.getAutoSaveInterval());
-        autoCleanIntervalComboBox.setSelectedIndex(getIndex(VcsConfig.getInstance().getV2CleanInterval()));
-        autoCleanRetainIntervalComboBox.setSelectedIndex(getIndex(VcsConfig.getInstance().getV2RetainInterval()));
 
         gridLineColorTBButton.setColor(designerEnvManager.getGridLineColor());
         paginationLineColorTBButton.setColor(designerEnvManager.getPaginationLineColor());
@@ -1026,11 +1005,18 @@ public class PreferencePane extends BasicPane {
     }
 
     private int getDay(int dateIndex) {
-        return INDEX_DAY_MAP.getOrDefault(dateIndex, THREE_MONTH_INT);
-    }
-
-    private int getIndex(int day) {
-        return INDEX_DAY_MAP.inverse().getOrDefault(day, THREE_MONTH_INDEX);
+        switch (dateIndex) {
+            case ONE_DAY_INDEX:
+                return ONE_DAY_INT;
+            case ONE_WEEK_INDEX:
+                return ONE_WEEK_INT;
+            case ONE_MONTH_INDEX:
+                return ONE_MONTH_INT;
+            case SIX_MONTH_INDEX:
+                return SIX_MONTH_INT;
+            default:
+                return THREE_MONTH_INT;
+        }
     }
 
     /**

designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java

@@ -7,7 +7,6 @@ import com.fr.design.env.DesignerWorkspaceInfo;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.file.SaveSomeTemplatePane;
 import com.fr.design.mainframe.JTemplate;
-import com.fr.design.mainframe.vcs.VcsMoveChecker;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.SeparatorDef;
@@ -61,10 +60,6 @@ public class SwitchExistEnv extends MenuDef {
          * @param e 事件
          */
         public void actionPerformed(ActionEvent e) {
-            // 检查是否正在迁移
-            if (!VcsMoveChecker.checkSwitch()) {
-                return;
-            }
             final String envName = getName();
             DesignerEnvManager envManager = DesignerEnvManager.getEnvManager();
             DesignerWorkspaceInfo selectedEnv = envManager.getWorkspaceInfo(envName);

designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java

@@ -64,19 +64,6 @@ public abstract class UITableModelAdapter<T> extends AbstractTableModel implemen
 		return null;
 	}
 
-	/**
-	 * 获取映射后的值
-	 *
-	 * @param row 行
-	 * @return    值
-	 */
-	public T getConvertRowSelectedValue(int row) {
-		if (table.getSelectedRow() >= 0) {
-			return list.get(table.convertRowIndexToModel(row));
-		}
-		return null;
-	}
-
 	public void setColumnClass(Class<?>[] classes) {
 		this.classes = classes;
 	}

designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java

@@ -33,7 +33,6 @@ import com.fr.design.lock.LockInfoDialog;
 import com.fr.design.mainframe.share.mini.MiniShopDisposingChecker;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDock;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
-import com.fr.design.mainframe.vcs.VcsMoveChecker;
 import com.fr.design.mainframe.vcs.common.VcsHelper;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.os.impl.MacOsAddListenerAction;
@@ -162,10 +161,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
 
         @Override
         public void windowClosing(WindowEvent e) {
-            // 检查是否正在迁移
-            if (!VcsMoveChecker.checkClose()) {
-                return;
-            }
             // 检查mini商城是否存在未结束的后台任务
             if (!MiniShopDisposingChecker.check()) {
                 return;

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

@@ -18,7 +18,7 @@ import java.awt.event.ActionEvent;
 public class RecycleAction extends UpdateAction {
 
     public RecycleAction() {
-        this.setSmallIcon("/com/fr/design/standard/vcslist/vcs_recycle", false);
+        this.setSmallIcon("/com/fr/design/standard/vcslist/vcs_recycle");
         this.setName(Toolkit.i18nText("Fine-Design_Vcs_Recycle"));
     }
 

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

@@ -1,54 +0,0 @@
-package com.fr.design.mainframe.vcs;
-
-import com.fr.design.dialog.FineJOptionPane;
-import com.fr.design.i18n.Toolkit;
-import com.fr.design.mainframe.DesignerContext;
-import com.fr.workspace.server.vcs.v2.move.VcsMoveService;
-
-import javax.swing.JOptionPane;
-
-/**
- * 版本管理迁移检查
- *
- * @author Destiny.Lin
- * @since 11.0
- * Created on 2023/7/18
- */
-public class VcsMoveChecker {
-
-
-    /**
-     * 关闭前的检查
-     *
-     * @return
-     */
-    public static boolean checkClose() {
-        return check(Toolkit.i18nText("Fine-Design_Vcs_Close_Tips"));
-    }
-
-
-    /**
-     * 切换环境前的检查
-     *
-     * @return
-     */
-    public static boolean checkSwitch() {
-        return check(Toolkit.i18nText("Fine-Design_Vcs_Switch_Tips"));
-    }
-
-    private static boolean check(String msg) {
-        if (VcsMoveService.getInstance().isMoving()) {
-            int result = FineJOptionPane.showConfirmDialog(
-                    DesignerContext.getDesignerFrame(),
-                    msg,
-                    Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
-                    FineJOptionPane.YES_NO_OPTION
-            );
-            return result == JOptionPane.YES_OPTION;
-        }
-        return true;
-    }
-
-
-
-}

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

@@ -19,7 +19,6 @@ import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTable;
-import javax.swing.RowSorter;
 import javax.swing.SwingConstants;
 import javax.swing.SwingWorker;
 import javax.swing.UIManager;
@@ -27,7 +26,6 @@ import javax.swing.plaf.ColorUIResource;
 import javax.swing.plaf.UIResource;
 import javax.swing.table.JTableHeader;
 import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableRowSorter;
 import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -153,13 +151,6 @@ public abstract class AbstractSupportSelectTablePane<T extends TableEntity> exte
         tablePane.add(tableTopPane, BorderLayout.NORTH);
         tablePane.add(tableContentPane, BorderLayout.CENTER);
         tableContentPane.getEditTable().getColumnModel().getColumn(0).setMaxWidth(50);
-        RowSorter<UITableModelAdapter<T>> sorter = new TableRowSorter<UITableModelAdapter<T>>(model) {
-            @Override
-            public boolean isSortable(int column) {
-                return column != 0;
-            }
-        };
-        tableContentPane.getEditTable().setRowSorter(sorter);
         return tablePane;
     }
 
@@ -180,7 +171,7 @@ public abstract class AbstractSupportSelectTablePane<T extends TableEntity> exte
                 int row = ((JTable) e.getSource()).rowAtPoint(e.getPoint());
                 int col = ((JTable) e.getSource()).columnAtPoint(e.getPoint());
                 if (col == 0) {
-                    T entity = model.getConvertRowSelectedValue(row);
+                    T entity = model.getSelectedValue();
                     //改变面板的各个状态
                     changeComponentStatus(entity, row, col, table);
                 }

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

@@ -189,9 +189,4 @@ public class VcsCenterPane extends VcsNewPane {
     protected boolean isNeedRestore() {
         return false;
     }
-
-    @Override
-    protected boolean isNeedSearch() {
-        return true;
-    }
 }

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

@@ -197,14 +197,8 @@ public class VcsMovePanel extends BasicPane {
 
     private void initTipDesc() {
         UILabel descLabel = FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Vcs_Move_Desc"));
-        UILabel firstLabel = FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Vcs_Move_Tips_First"));
-        UILabel secondLabel = FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Vcs_Move_Tips_Second"));
         descLabel.setForeground(TIP_COLOR);
-        firstLabel.setForeground(TIP_COLOR);
-        secondLabel.setForeground(TIP_COLOR);
         choosePane.add(descLabel);
-        choosePane.add(firstLabel);
-        choosePane.add(secondLabel);
     }
 
     private void initRadioButton() {
@@ -378,7 +372,7 @@ public class VcsMovePanel extends BasicPane {
     }
 
 
-    private class MoveWorker extends SwingWorker<Boolean, Integer> {
+    private class MoveWorker extends SwingWorker<Void, Integer> {
 
         private VcsMoveStrategy strategy;
 
@@ -387,7 +381,7 @@ public class VcsMovePanel extends BasicPane {
         }
 
         @Override
-        protected Boolean doInBackground() throws Exception {
+        protected Void doInBackground() throws Exception {
             try {
                 //开始迁移
                 VcsMoveService.getInstance().startMove(new VcsMoveService.BaseMoveServiceWhileMoving() {
@@ -402,10 +396,13 @@ public class VcsMovePanel extends BasicPane {
                     }
                 }, strategy);
             } catch (Exception e) {
+                this.cancel(true);
                 VcsMoveService.getInstance().stopMoving();
-                return false;
+                initFailedPane();
+                VcsMovePanel.this.getParentCard().show(getParentPane(), FAILED);
+                FineLoggerFactory.getLogger().error("[VcsV2] Vcs move failed!");
             }
-            return true;
+            return null;
         }
 
         @Override
@@ -416,19 +413,9 @@ public class VcsMovePanel extends BasicPane {
         @Override
         protected void done() {
             VcsMoveService.getInstance().stopMoving();
-            try {
-                if (get()) {
-                    initSuccessPane();
-                    VcsMovePanel.this.getParentCard().show(getParentPane(), SUCCESS);
-                    VcsHelper.getInstance().updateLegacyMode();
-                } else {
-                    initFailedPane();
-                    VcsMovePanel.this.getParentCard().show(getParentPane(), FAILED);
-                    FineLoggerFactory.getLogger().error("[VcsV2] Vcs move failed!");
-                }
-            } catch (InterruptedException | ExecutionException e) {
-                throw new RuntimeException(e);
-            }
+            initSuccessPane();
+            VcsMovePanel.this.getParentCard().show(getParentPane(), SUCCESS);
+            VcsHelper.getInstance().updateLegacyMode();
         }
     }