From 9e29d81145392ca37b2324f858483e36766e522b Mon Sep 17 00:00:00 2001
From: renekton <Renekton@fanruan.com>
Date: Tue, 22 Oct 2024 15:31:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E9=A2=98=E9=80=89=E4=B8=AD=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E5=A4=A7=E5=B0=8F&=E6=96=87=E6=9C=AC=E4=B8=8E?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E8=A1=8C=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/ThemedCellStyleListPane.java        |  2 +-
 .../write/submit/DBManipulationPane.java      |  1 -
 .../component/VanChartTooltipContentPane.java | 29 +++++++++++++------
 .../submit/SmartInsertDBManipulationPane.java | 22 +-------------
 4 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/ThemedCellStyleListPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/ThemedCellStyleListPane.java
index f89e4104b0..81620a64f5 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/ThemedCellStyleListPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/ThemedCellStyleListPane.java
@@ -115,7 +115,7 @@ public class ThemedCellStyleListPane extends FurtherBasicBeanPane<ThemedCellStyl
 
     private static class RadioButtonListCellRangeRenderer extends JPanel implements ListCellRenderer<ThemedCellStyle>, Serializable {
 
-        private static final Icon SELECTEDMARK_ICON = new LazyIcon("selectedMark");
+        private static final Icon SELECTEDMARK_ICON = new LazyIcon("selectedMark", 32);
         private final CellRectangleStylePreviewPane previewArea;
         private boolean selected = false;
 
diff --git a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
index 562de89f43..ed477aab2c 100644
--- a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
+++ b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
@@ -733,7 +733,6 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 
         // 设置column1的editor
         columnsComboBox = new UIComboBox(new DefaultComboBoxModel());
-
         columnsComboBox.setRenderer(new UIComboBoxRenderer() {
 
             @Override
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
index b7ac9a7265..b66916d435 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
@@ -5,6 +5,7 @@ import com.fine.theme.utils.FineLayoutBuilder;
 import com.fine.theme.utils.FineUIScale;
 import com.formdev.flatlaf.util.ScaledEmptyBorder;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.constants.LayoutConstants;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.foldablepane.UIExpandablePane;
@@ -54,6 +55,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.fine.swing.ui.layout.Layouts.cell;
+import static com.fine.swing.ui.layout.Layouts.row;
+
 /**
  * 数据点提示内容界面，含有通用设置、富文本编辑器、自定义JS界面
  */
@@ -291,14 +295,21 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     }
 
     protected JPanel createCommonFormatPanel() {
-        JPanel formatContent = FineLayoutBuilder.compatibleTableLayout(10, getPaneComponents(), new double[]{1.2, 3});
+        Component[][] paneComponents = getPaneComponents();
 
-        Component[][] components = new Component[][]{
-                new Component[]{null, null},
-                new Component[]{new UILabel(getLabelContentTitle()), formatContent}
-        };
+        Component[][] components = new Component[paneComponents.length+1][2];
+        components[0] = new Component[]{null, null};
+
+        for (int i = 0; i < paneComponents.length; i++) {
+            if (i == 0) {
+                components[i+1][0] = new UILabel(getLabelContentTitle());
+            } else {
+                components[i+1][0] = null;
+            }
+            components[i+1][1] = row(10, cell(paneComponents[i][0]).weight(LayoutConstants.LEFT_WEIGHT), cell(paneComponents[i][1]).weight(LayoutConstants.RIGHT_WEIGHT)).getComponent();
+        }
 
-        return Layouts.cell(FineLayoutBuilder.compatibleTableLayout(0, components, new double[]{1.2, 3}))
+        return cell(FineLayoutBuilder.compatibleTableLayout(0, components, new double[]{LayoutConstants.LEFT_WEIGHT, LayoutConstants.RIGHT_WEIGHT}))
                 .with(it ->it.setBorder(new ScaledEmptyBorder(0, 0, 10, 0))).getComponent();
     }
 
@@ -310,10 +321,10 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
         textAttrPane = createChartTextAttrPane();
         stylePanel = Layouts.column(10,
-                Layouts.row(
-                        Layouts.cell(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Widget_Style"))).weight(1.2), Layouts.cell(styleButton).weight(3)
+                row(
+                        cell(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Widget_Style"))).weight(1.2), cell(styleButton).weight(3)
                 ),
-                Layouts.cell(textAttrPane)
+                cell(textAttrPane)
         ).getComponent();
         initStyleButtonListener();
 
diff --git a/designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java b/designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java
index 92674958e2..819b817796 100644
--- a/designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java
+++ b/designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java
@@ -377,7 +377,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
                 ColumnRowGroupCellRenderer2 cellRenderer2 = new ColumnRowGroupCellRenderer2();
                 cellRenderer2.setHorizontalAlignment(SwingConstants.LEFT);
                 column2.setCellRenderer(cellRenderer2);
-                column2.setCellEditor(new SmartColumnValueEditor(ValueEditorPaneFactory.cellGroupEditor()));
+                column2.setCellEditor(new ColumnValueEditor(ValueEditorPaneFactory.cellGroupEditor()));
             } else {
                 SelectedColumnValueTableCellRenderer renderer = new SelectedColumnValueTableCellRenderer();
                 renderer.setHorizontalAlignment(SwingConstants.LEFT);
@@ -615,24 +615,4 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
             }
         }
     }
-
-    protected class SmartColumnValueEditor extends ColumnValueEditor {
-
-        protected SmartColumnValueEditor(Editor<?>[] types) {
-            super(types);
-        }
-
-        /**
-         * 双击修改
-         * @param anEvent 事件
-         * @return 是否可编辑
-         */
-        @Override
-        public boolean isCellEditable(EventObject anEvent) {
-            if (anEvent instanceof MouseEvent) {
-                return ((MouseEvent) anEvent).getClickCount() >= 2;
-            }
-            return true;
-        }
-    }
 }