Merging in latest from upstream (DESIGN/design:refs/heads/feature/10.0)

* commit 'd2e810b1b44e65cfdfdd074ce2fc48ce67e67d80':
  REPORT-20981 取消按钮不要了
  REPORT-20981 模板版本管理减少磁盘占用
  REPORT-20981 模板版本管理减少磁盘占用
  REPORT-21689 REPORT-20981 水印密度增加个最小值限制，密度设置不能小于100/50;模板版本管理减少磁盘占用

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

@@ -184,9 +184,6 @@ public class PreferencePane extends BasicPane {
     private JProgressBar gcProgressBar;
     private Timer gcProgressTimer;
     private UIButton gcOkButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_OK"));
-    private UIButton gcCancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Cancel"));
-
-
 
     public PreferencePane() {
         this.initComponents();
@@ -325,6 +322,12 @@ public class PreferencePane extends BasicPane {
                 tryGc();
             }
         });
+        gcEnableCheckBox.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                gcButton.setEnabled(gcEnableCheckBox.isSelected());
+            }
+        });
 
         //集群下禁用
         if (FineClusterConfig.getInstance().isCluster()) {
@@ -700,7 +703,7 @@ public class PreferencePane extends BasicPane {
         saveCommitCheckBox.setSelected(vcsConfigManager.isSaveCommit());
         useIntervalCheckBox.setSelected(vcsConfigManager.isUseInterval());
         gcEnableCheckBox.setSelected(GcConfig.getInstance().isGcEnable());
-
+        gcButton.setEnabled(gcEnableCheckBox.isSelected());
         supportCellEditorDefCheckBox.setSelected(designerEnvManager.isSupportCellEditorDef());
 
         isDragPermitedCheckBox.setSelected(designerEnvManager.isDragPermited());
@@ -881,14 +884,12 @@ public class PreferencePane extends BasicPane {
     }
 
     private void tryGc() {
-        //停止gc线程时使用
-        final String uuid = String.valueOf(UUID.randomUUID());
         final SwingWorker<Boolean, Void> worker = new SwingWorker<Boolean, Void>() {
             private  long size = 0;
 
             @Override
             protected Boolean doInBackground() {
-                size = WorkContext.getCurrent().get(VcsOperator.class).immediatelyGc(uuid);
+                size = WorkContext.getCurrent().get(VcsOperator.class).immediatelyGc();
                 return true;
             }
 
@@ -907,7 +908,6 @@ public class PreferencePane extends BasicPane {
                 if (null != gcDialog) {
                     gcDialog.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Joption_News"));
                 }
-                gcDialogDownPane.remove(gcCancelButton);
                 gcDialogDownPane.revalidate();
                 gcDialogDownPane.repaint();
                 gcDialogDownPane.add(gcOkButton);
@@ -921,19 +921,6 @@ public class PreferencePane extends BasicPane {
                 gcDialog.dispose();
             }
         });
-        gcCancelButton.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                stopGcProgressTimer();
-
-                //中断gc 线程
-                if (StringUtils.isNotEmpty(uuid)) {
-                    WorkContext.getCurrent().get(VcsOperator.class).cancelImmediatelyGc(uuid);
-                }
-                gcDialog.dispose();
-                worker.cancel(true);
-            }
-        });
         gcDialog.addWindowListener(new WindowAdapter() {
             @Override
             public void windowClosed(WindowEvent e) {
@@ -963,7 +950,6 @@ public class PreferencePane extends BasicPane {
         //中下
         gcDialogDownPane = new JPanel();
         gcDialogDownPane.setLayout(new FlowLayout(FlowLayout.CENTER, 6, 0));
-        gcDialogDownPane.add(gcCancelButton);
 
         jp.setLayout(new BoxLayout(jp, BoxLayout.Y_AXIS));
         jp.add(gcUpPane);

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

@@ -147,7 +147,9 @@ public class VcsHelper implements JTemplateActionListener {
                 if (needDeleteVersion(oldEntity)) {
                     operator.deleteVersion(oldEntity.getFilename(), oldEntity.getVersion());
                 }
-                operator.gc(true);
+                if (GcConfig.getInstance().isGcEnable()) {
+                    operator.gc();
+                }
 
             }
         }).start();

designer-base/src/main/java/com/fr/design/report/WatermarkPane.java

@@ -113,8 +113,8 @@ public class WatermarkPane extends BasicPane {
         formulaPane = new TinyFormulaPane();
         fontSizeComboBox = new UIComboBox(FRFontPane.FONT_SIZES);
         fontSizeComboBox.setEditable(true);
-        horizontalGapSpinner = new UnsignedIntUISpinner(0, Integer.MAX_VALUE, 1, 200);
+        horizontalGapSpinner = new UnsignedIntUISpinner(100, Integer.MAX_VALUE, 1, 200);
-        verticalGapSpinner = new UnsignedIntUISpinner(0, Integer.MAX_VALUE, 1, 100);
+        verticalGapSpinner = new UnsignedIntUISpinner(50, Integer.MAX_VALUE, 1, 100);
         horizontalGapSpinner.setPreferredSize(SPINNER_DIMENSION);
         verticalGapSpinner.setPreferredSize(SPINNER_DIMENSION);
         JPanel fontSizeTypePane = new JPanel(new BorderLayout(10,0));