REPORT-100954 【版本管理三期】版本中心弹窗交互问题

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

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.vcs.ui;
 
+import com.fr.base.svg.IconUtils;
 import com.fr.design.data.tabledata.tabledatapane.loading.TipsPane;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
@@ -242,6 +243,7 @@ public abstract class AbstractSupportSelectTablePane<T extends TableEntity> exte
 
         public HeaderRenderer(JTable table) {
             this.tableHeader = table.getTableHeader();
+            tableHeader.setCursor(new Cursor(Cursor.HAND_CURSOR));
             selectBox = new UICheckBox();
             selectBox.setSelected(false);
             tableHeader.addMouseListener(new MouseAdapter() {
@@ -290,8 +292,12 @@ public abstract class AbstractSupportSelectTablePane<T extends TableEntity> exte
             tableHeader = table.getTableHeader();
             tableHeader.setReorderingAllowed(false);
             String valueStr = (String) value;
-            JLabel label = new JLabel(valueStr);
+            UILabel label = new UILabel(valueStr);
+            if (needIcon4Head(column)) {
+                label.setIcon(IconUtils.readIcon("/com/fr/design/standard/vcslist/vcs_sort"));
+                label.setHorizontalTextPosition(JLabel.LEFT);
                 label.setHorizontalAlignment(SwingConstants.LEFT);
+            }
             selectBox.setHorizontalAlignment(SwingConstants.CENTER);
             selectBox.setBorderPainted(true);
             JComponent component = (column == 0) ? selectBox : label;
@@ -320,6 +326,7 @@ public abstract class AbstractSupportSelectTablePane<T extends TableEntity> exte
             setColumnClass(classes);
             this.setDefaultEditor(Boolean.class, new BooleanEditor());
             this.setDefaultRenderer(Boolean.class, new BooleanRenderer());
+            this.setDefaultRenderer(UILabel.class, new ToolTipTableCellRenderer());
         }
 
         @Override
@@ -375,5 +382,14 @@ public abstract class AbstractSupportSelectTablePane<T extends TableEntity> exte
     }
 
 
+    /**
+     * 表头的某列是否需要icon
+     *
+     * @param col 列
+     * @return
+     */
+    protected boolean needIcon4Head(int col) {
+        return col != 0;
+    }
 }
 

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

@@ -0,0 +1,28 @@
+package com.fr.design.mainframe.vcs.ui;
+
+import com.fr.general.GeneralUtils;
+import com.fr.stable.StringUtils;
+
+import javax.swing.*;
+import javax.swing.table.DefaultTableCellRenderer;
+import java.awt.*;
+
+
+/**
+ * 带ToolTip的UILabel的表格渲染类
+ *
+ */
+public class ToolTipTableCellRenderer extends DefaultTableCellRenderer {
+
+    @Override
+    public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
+        Component component = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+        if(component instanceof JLabel) {
+            String toolTipText = GeneralUtils.objectToString(value);
+            if (StringUtils.isNotEmpty(toolTipText)) {
+                ((JLabel) component).setToolTipText(toolTipText);
+            }
+        }
+        return component;
+    }
+}

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

@@ -125,6 +125,12 @@ public class VcsCenterPane extends VcsNewPane {
         });
     }
 
+
+    @Override
+    protected boolean needIcon4Head(int col) {
+        return col != 0 && col != OPERATOR_COL;
+    }
+
     private void initOpenListener() {
         open.addMouseListener(new MouseAdapter() {
             @Override

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

@@ -113,6 +113,7 @@ public class VcsNewPane extends RecyclePane {
         this.operatorPane = createOperatorPane();
         this.model.setDefaultEditor(VcsOperatorPane.class, new VcsCellEditor(createOperatorPane()));
         this.model.setDefaultRenderer(VcsOperatorPane.class, new VcsCellRender(createOperatorPane()));
+        this.model.setDefaultRenderer(UILabel.class, new ToolTipTableCellRenderer());
     }
 
 
@@ -339,4 +340,9 @@ public class VcsNewPane extends RecyclePane {
         };
         dialog.setVisible(true);
     }
+
+    @Override
+    protected boolean needIcon4Head(int col) {
+        return col != 0 && col != OPERATOR_COL;
+    }
 }

designer-base/src/main/resources/com/fr/design/standard/vcslist/vcs_sort_normal.svg

@@ -0,0 +1,4 @@
+<svg width="16" height="17" viewBox="0 0 16 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.2462 6.17654C14.3492 6.30778 14.2557 6.5 14.0889 6.5H11.9999V13.9768C11.9999 14.0873 11.9104 14.1768 11.7999 14.1768H11.1999C11.0895 14.1768 10.9999 14.0873 10.9999 13.9768V6.5H8.91119C8.74436 6.5 8.65086 6.30779 8.75384 6.17654L11.3426 2.87732C11.4227 2.77527 11.5772 2.77527 11.6573 2.87731L14.2462 6.17654Z" fill="#333334"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.04297 10.801C2.93999 10.6698 3.03349 10.4775 3.20032 10.4775H5.28927V3.00074C5.28927 2.89028 5.37881 2.80074 5.48927 2.80074H6.08927C6.19972 2.80074 6.28927 2.89028 6.28927 3.00074V10.4775H8.378C8.54482 10.4775 8.63832 10.6698 8.53534 10.801L5.94661 14.1002C5.86653 14.2023 5.712 14.2023 5.63192 14.1002L3.04297 10.801Z" fill="#333334"/>
+</svg>