From a56da01141c264725ee424f4913e1d7aa2dd44d6 Mon Sep 17 00:00:00 2001
From: makejava <1353036300@qq.com>
Date: Thu, 13 Oct 2022 10:39:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=87=AA=E5=8A=A8=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=AE=BD=E5=BA=A6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/factory/CellEditorFactory.java     |  7 ------
 .../com/sjhy/plugin/ui/ConfigTableDialog.java | 24 +++++++++++++++----
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/sjhy/plugin/factory/CellEditorFactory.java b/src/main/java/com/sjhy/plugin/factory/CellEditorFactory.java
index db56296..d9e45c4 100644
--- a/src/main/java/com/sjhy/plugin/factory/CellEditorFactory.java
+++ b/src/main/java/com/sjhy/plugin/factory/CellEditorFactory.java
@@ -1,8 +1,6 @@
 package com.sjhy.plugin.factory;
 
 import com.intellij.openapi.ui.ComboBox;
-import com.intellij.ui.BooleanTableCellEditor;
-import com.intellij.ui.JBColor;
 import com.intellij.ui.components.JBTextField;
 
 import javax.swing.*;
@@ -10,7 +8,6 @@ import javax.swing.table.TableCellEditor;
 import java.awt.event.ActionListener;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
-import java.util.stream.Stream;
 
 /**
  * 表格编辑器构建工厂类
@@ -37,10 +34,6 @@ public class CellEditorFactory {
         return new DefaultCellEditor(comboBox);
     }
 
-    public static TableCellEditor createBooleanEditor() {
-        return new BooleanTableCellEditor();
-    }
-
     /**
      * 创建文本框编辑器
      *
diff --git a/src/main/java/com/sjhy/plugin/ui/ConfigTableDialog.java b/src/main/java/com/sjhy/plugin/ui/ConfigTableDialog.java
index d93841d..2d50eac 100644
--- a/src/main/java/com/sjhy/plugin/ui/ConfigTableDialog.java
+++ b/src/main/java/com/sjhy/plugin/ui/ConfigTableDialog.java
@@ -2,6 +2,7 @@ package com.sjhy.plugin.ui;
 
 import com.intellij.openapi.ui.ComboBoxTableRenderer;
 import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.ui.BooleanTableCellEditor;
 import com.intellij.ui.BooleanTableCellRenderer;
 import com.intellij.ui.ToolbarDecorator;
 import com.intellij.ui.table.JBTable;
@@ -54,19 +55,30 @@ public class ConfigTableDialog extends DialogWrapper {
         JBTable table = new JBTable(model);
         table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 
+        int totalWidth = 0;
+
         // 配置列编辑器
-        table.getColumn("name").setCellEditor(CellEditorFactory.createTextFieldEditor());
+        TableColumn nameColumn = table.getColumn("name");
+        nameColumn.setCellEditor(CellEditorFactory.createTextFieldEditor());
+        nameColumn.setMinWidth(100);
+        totalWidth+=100;
         TableColumn typeColumn = table.getColumn("type");
         typeColumn.setCellRenderer(new ComboBoxTableRenderer<>(GlobalDict.DEFAULT_JAVA_TYPE_LIST));
         typeColumn.setCellEditor(CellEditorFactory.createComboBoxEditor(true, GlobalDict.DEFAULT_JAVA_TYPE_LIST));
         typeColumn.setMinWidth(120);
-        table.getColumn("comment").setCellEditor(CellEditorFactory.createTextFieldEditor());
+        totalWidth+=120;
+        TableColumn commentColumn = table.getColumn("comment");
+        commentColumn.setCellEditor(CellEditorFactory.createTextFieldEditor());
+        commentColumn.setMinWidth(140);
+        totalWidth+=140;
         // 其他附加列
         for (ColumnConfig columnConfig : CurrGroupUtils.getCurrColumnConfigGroup().getElementList()) {
             TableColumn column = table.getColumn(columnConfig.getTitle());
             switch (columnConfig.getType()) {
                 case TEXT:
                     column.setCellEditor(CellEditorFactory.createTextFieldEditor());
+                    column.setMinWidth(120);
+                    totalWidth+=120;
                     break;
                 case SELECT:
                     if (StringUtils.isEmpty(columnConfig.getSelectValue())) {
@@ -80,10 +92,14 @@ public class ConfigTableDialog extends DialogWrapper {
                         column.setCellRenderer(new ComboBoxTableRenderer<>(split));
                         column.setCellEditor(CellEditorFactory.createComboBoxEditor(false, split));
                     }
+                    column.setMinWidth(100);
+                    totalWidth+=100;
                     break;
                 case BOOLEAN:
                     column.setCellRenderer(new BooleanTableCellRenderer());
-                    column.setCellEditor(CellEditorFactory.createBooleanEditor());
+                    column.setCellEditor(new BooleanTableCellEditor());
+                    column.setMinWidth(60);
+                    totalWidth+=60;
                     break;
                 default:
                     break;
@@ -92,7 +108,7 @@ public class ConfigTableDialog extends DialogWrapper {
 
         final ToolbarDecorator decorator = ToolbarDecorator.createDecorator(table);
         this.mainPanel.add(decorator.createPanel(), BorderLayout.CENTER);
-        this.mainPanel.setMinimumSize(new Dimension(600, 300));
+        this.mainPanel.setMinimumSize(new Dimension(totalWidth, Math.max(300, totalWidth / 3)));
     }
 
     @Override