From d20e7bac17fb769f90fe7d26ba2ec69d81f8ea4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Mon, 19 Aug 2024 16:42:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-131211=20=E5=8E=BB=E9=99=A4=E5=86=85?= =?UTF-8?q?=E7=BD=AE=E6=95=B0=E6=8D=AE=E9=9B=86=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/actions/file/PreferencePane.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index 649258b58c..33770634d7 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java +++ b/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; @@ -370,12 +369,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")); @@ -1093,7 +1086,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); From bf8115189a29a73f349b8f5cf10c3fc25279395a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Mon, 19 Aug 2024 16:44:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-131194=20=E6=99=BA=E8=83=BD=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E8=A1=A8=E5=A4=B4UI=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/cell/smartaction/SmartJTablePane.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/cell/smartaction/SmartJTablePane.java b/designer-realize/src/main/java/com/fr/design/cell/smartaction/SmartJTablePane.java index df63556e9f..b59e3d6ead 100644 --- a/designer-realize/src/main/java/com/fr/design/cell/smartaction/SmartJTablePane.java +++ b/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; - } - } From f06a63c573a903e500c1848e58d21107610e44f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Mon, 19 Aug 2024 16:44:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-131211=20=E5=8E=BB=E9=99=A4=E5=86=85?= =?UTF-8?q?=E7=BD=AE=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/actions/file/PreferencePane.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index 33770634d7..6324f32b9f 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java @@ -320,9 +320,6 @@ public class PreferencePane extends BasicPane { cell(createMemoryPane()), // 产品改良 cell(createImprovePane()), - // 内置服务器 - /// 暂时不支持跟随启动 -// cell(createEmbeddedServerPane()), // 模板预览性能 cell(createTplPreviewPane()), // 设计器启动选项 @@ -987,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());