Pull request #14636: REPORT-131211 & REPORT-131194 智能提交表头UI问题 & 去除内置服务器配置项

Merge in DESIGN/design from ~LEVY.XIE/design:fbp-1.0 to fbp-1.0

* commit 'f06a63c573a903e500c1848e58d21107610e44f3':
  REPORT-131211 去除内置服务器配置项
  REPORT-131194 智能提交表头UI问题
  REPORT-131211 去除内置数据集配置项

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

@@ -229,7 +229,6 @@ public class PreferencePane extends BasicPane {
     private UICheckBox useUniverseDBMCheckbox;
     private UICheckBox joinProductImproveCheckBox;
     private UICheckBox autoPushUpdateCheckBox;
-    private UICheckBox embedServerLazyStartupCheckBox;
     private UICheckBox imageCompressPanelCheckBox;
     private UICheckBox cloudAnalyticsDelayCheckBox;
 
@@ -321,9 +320,6 @@ public class PreferencePane extends BasicPane {
                 cell(createMemoryPane()),
                 // 产品改良
                 cell(createImprovePane()),
-                // 内置服务器
-                /// 暂时不支持跟随启动
-//                cell(createEmbeddedServerPane()),
                 // 模板预览性能
                 cell(createTplPreviewPane()),
                 // 设计器启动选项
@@ -370,12 +366,6 @@ public class PreferencePane extends BasicPane {
                 i18nText("Fine-Design_Template_Preview_Performance"));
     }
 
-    private Component createEmbeddedServerPane() {
-        embedServerLazyStartupCheckBox = new UICheckBox(i18nText("Fine-Design_Startup_When_Needed"));
-        return FineUIUtils.wrapComponentWithTitle(column(10, cell(embedServerLazyStartupCheckBox)).getComponent(),
-                i18nText("Fine-Design_Embed_Server"));
-    }
-
     private Component createImprovePane() {
         joinProductImproveCheckBox = new UICheckBox(i18nText("Fine-Design_Basic_Join_Product_Improve"));
         autoPushUpdateCheckBox = new UICheckBox(i18nText("Fine-Design_Automatic_Push_Update"));
@@ -994,7 +984,6 @@ public class PreferencePane extends BasicPane {
             this.autoPushUpdateCheckBox.setSelected(designerEnvManager.isAutoPushUpdateEnabled());
         }
 
-//        this.embedServerLazyStartupCheckBox.setSelected(designerEnvManager.isEmbedServerLazyStartup());
         this.startWithEmptyFile.setSelected(designerEnvManager.isStartWithEmptyFile());
 
         this.imageCompressPanelCheckBox.setSelected(designerEnvManager.isImageCompress());
@@ -1093,7 +1082,6 @@ public class PreferencePane extends BasicPane {
         designerEnvManager.setOracleSystemSpace(this.oracleSpace.isSelected());
         designerEnvManager.setCachingTemplateLimit((int) this.cachingTemplateSpinner.getValue());
         designerEnvManager.setJoinProductImprove(this.joinProductImproveCheckBox.isSelected());
-        designerEnvManager.setEmbedServerLazyStartup(this.embedServerLazyStartupCheckBox.isSelected());
         designerEnvManager.setImageCompress(this.imageCompressPanelCheckBox.isSelected());
         boolean optimizedUPMFlag = this.useOptimizedUPMCheckbox != null && this.useOptimizedUPMCheckbox.isSelected();
         designerEnvManager.setUseOptimizedUPM4Adapter(optimizedUPMFlag);

designer-realize/src/main/java/com/fr/design/cell/smartaction/SmartJTablePane.java

@@ -12,6 +12,7 @@ import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.table.AbstractTableModel;
 
+import com.fr.design.gui.itable.FineUITable;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
@@ -24,8 +25,7 @@ import com.fr.design.selection.SelectionListener;
  * SmartJTablePane用于在Grid上面选单元格时编辑JTable
  */
 public abstract class SmartJTablePane extends BasicPane {
-	private static final String UI_CLASS_ID = "TableHeaderUI";
-	
+
 	public static final int OK = 0;
 	public static final int CANCEL = 1;
 	
@@ -35,7 +35,7 @@ public abstract class SmartJTablePane extends BasicPane {
 	protected SelectionListener gridSelectionChangeL;
 	protected SmartJTablePaneAction action;
 	
-	protected JTable table;
+	protected FineUITable table;
 	protected JScrollPane scrollPane;
 
 	protected boolean old_editable = true;
@@ -58,7 +58,7 @@ public abstract class SmartJTablePane extends BasicPane {
 		this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_RWA_Click_Cell_To_Edit_Value")), BorderLayout.NORTH);
 
 		// BasicPane的center放JTable
-		table = new JTable(model);
+		table = new FineUITable(model);
 		this.add(scrollPane = new UITableScrollPane(table), BorderLayout.CENTER);
 
 		// 鼠标切换选中项时,editingRowIndex也要跟着变
@@ -117,9 +117,4 @@ public abstract class SmartJTablePane extends BasicPane {
 		return dlg;
 	}
 
-	@Override
-	public String getUIClassID() {
-		return UI_CLASS_ID;
-	}
-	
 }