From 47bb397682cb9e44bd60d907a4748eb04173461c Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Thu, 24 Oct 2024 14:17:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?REPORT-138572=20=E3=80=90fr-fbp=E5=86=92?= =?UTF-8?q?=E7=83=9F=E3=80=91=E3=80=90=E6=95=B0=E6=8D=AE=E6=BA=90=E3=80=91?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=B7=A6=E4=B8=8B=E8=A7=92=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=8A=A0=E5=8F=B7=E6=96=B0=E5=BB=BA=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=EF=BC=8C=E5=90=8D=E7=A7=B0=E4=B8=8D=E4=BC=9A=E5=92=8C=E5=B7=B2?= =?UTF-8?q?=E6=9C=89=E7=9A=84=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/data/DesignTableDataManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java index dcde4716b0..9c932f0370 100644 --- a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java +++ b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java @@ -1,7 +1,6 @@ package com.fr.design.data; import com.fanruan.ComponentUtils; -import com.fanruan.config.impl.data.TableDataConfigProviderFactory; import com.fr.base.StoreProcedureParameter; import com.fr.base.TableData; import com.fr.concurrent.NamedThreadFactory; @@ -20,6 +19,7 @@ import com.fr.data.impl.storeproc.StoreProcedureHelper; import com.fr.data.operator.DataOperator; import com.fr.design.DesignModelAdapter; import com.fr.design.data.datapane.preview.PreviewTablePane; +import com.fr.design.data.datapane.preview.TableDataBeanHelper; import com.fr.design.data.tabledata.wrapper.MultiResultTableDataNameWrapper; import com.fr.design.data.tabledata.wrapper.MultiResultTableDataWrapper; import com.fr.design.data.tabledata.wrapper.ServerTableDataWrapper; @@ -316,7 +316,7 @@ public abstract class DesignTableDataManager { names.add(entry.getKey()); } //服务器数据集 - Map tableDatas = TableDataConfigProviderFactory.getInstance().getTableDatas(); + Map tableDatas = TableDataBeanHelper.getServerTableDatas(); for (Map.Entry entry : tableDatas.entrySet()) { names.add(entry.getKey()); } From eb76f2348777bfbace045a9aef72f1b43c3cdadd Mon Sep 17 00:00:00 2001 From: lemon Date: Thu, 24 Oct 2024 14:43:35 +0800 Subject: [PATCH 2/5] =?UTF-8?q?REPORT-138440=20=20fix:=20=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E5=A4=A7=E5=B0=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/nx/app/designer/menu/CalculateAttrPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/nx/app/designer/menu/CalculateAttrPane.java b/designer-realize/src/main/java/com/fr/nx/app/designer/menu/CalculateAttrPane.java index cf720b37b0..280ec9d06b 100644 --- a/designer-realize/src/main/java/com/fr/nx/app/designer/menu/CalculateAttrPane.java +++ b/designer-realize/src/main/java/com/fr/nx/app/designer/menu/CalculateAttrPane.java @@ -64,7 +64,7 @@ public class CalculateAttrPane extends BasicBeanPane { JPanel featureFlagPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); ActionLabel featureLabel = new ActionLabel(InterProviderFactory.getProvider().getLocText("Fine-Plugin_Engine_Experimental_Feature")); - featureLabel.setFont(new Font(null, Font.PLAIN, 10)); + FineUIStyle.setStyle(featureLabel, FineUIStyle.HYPER_LINK_LABEL); featureLabel.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { From 08068d56e7dca2791daa3960f9e297f82f8c3307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Thu, 24 Oct 2024 14:57:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?REPORT-138579=20fix:=20ComboBox=E5=AE=BD?= =?UTF-8?q?=E5=BA=A6=E9=87=8D=E5=A4=8D=E7=BC=A9=E6=94=BE=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/tabledata/tabledatapane/MaxMemRowCountPanel.java | 4 +++- .../src/main/java/com/fr/design/gui/icombobox/UIComboBox.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java index d3e43724a9..9fa9a85738 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java @@ -17,6 +17,7 @@ import com.fr.stable.StringUtils; import static com.fine.theme.utils.FineClientProperties.ADAPTIVE_COMBO_BOX; import static com.fine.theme.utils.FineClientProperties.COMBO_BOX_TYPE; +import static com.fine.theme.utils.FineUIScale.scale; public class MaxMemRowCountPanel extends UIToolbar { @@ -24,7 +25,7 @@ public class MaxMemRowCountPanel extends UIToolbar { private static final int MAX_IN_MEMORY = 1; private static final String[] CACHE_LIST = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save_All_Records_In_Memory"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Max_Mem_Row_Count") }; - private static final int MAX_WIDTH = getMaxComBoBoxWidth() > 200 ? 350 : 280; + private static final int MAX_WIDTH = getMaxComBoBoxWidth(); private static final int MAX_COMPONENT_COUNT_OF_MAX_MEMORY = 4; private static int getMaxComBoBoxWidth() { int maxWidth = GraphHelper.getWidth(CACHE_LIST[0]); @@ -34,6 +35,7 @@ public class MaxMemRowCountPanel extends UIToolbar { maxWidth = width; } } + maxWidth = maxWidth > scale(200) ? scale(350) : scale(280); return maxWidth; } diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBox.java index 27dea24e21..6b3903ee5a 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/UIComboBox.java @@ -162,7 +162,7 @@ public class UIComboBox extends JComboBox implements UIObserver, GlobalNameObser int renderFix = FineUIScale.scale(5); int comboHeight = FineUIUtils.getAndScaleInt("ComboBox.comboHeight", 24); //renderFix的原因在于:render里,每一个项前面了空了一格,要多几像素 - return new Dimension(FineUIScale.scale(super.getPreferredSize().width) + renderFix, comboHeight); + return new Dimension(super.getPreferredSize().width + renderFix, comboHeight); } public void refreshBoxItems(List list) { From 15d8625836eaef2aa8b64903a26ecd71d54a0638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Thu, 24 Oct 2024 14:59:02 +0800 Subject: [PATCH 4/5] =?UTF-8?q?REPORT-138579=20fix:=20ComboBox=E5=AE=BD?= =?UTF-8?q?=E5=BA=A6=E9=87=8D=E5=A4=8D=E7=BC=A9=E6=94=BE=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/tabledata/tabledatapane/MaxMemRowCountPanel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java index 9fa9a85738..3d2ee413e4 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java @@ -25,9 +25,9 @@ public class MaxMemRowCountPanel extends UIToolbar { private static final int MAX_IN_MEMORY = 1; private static final String[] CACHE_LIST = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save_All_Records_In_Memory"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Max_Mem_Row_Count") }; - private static final int MAX_WIDTH = getMaxComBoBoxWidth(); + private static final int MAX_WIDTH = getMaxWidth(); private static final int MAX_COMPONENT_COUNT_OF_MAX_MEMORY = 4; - private static int getMaxComBoBoxWidth() { + private static int getMaxWidth() { int maxWidth = GraphHelper.getWidth(CACHE_LIST[0]); for (int i = 1; i < CACHE_LIST.length; i++) { int width = GraphHelper.getWidth(CACHE_LIST[i]); From 5668d56e552948b4a1ab95d2b5b629bd548a86fd Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Thu, 24 Oct 2024 15:08:02 +0800 Subject: [PATCH 5/5] =?UTF-8?q?REPORT-138544=20=E3=80=90fr-fbp=E5=86=92?= =?UTF-8?q?=E7=83=9F=E3=80=91=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E7=9A=84=E6=9D=83=E9=99=90=EF=BC=8C=E5=BC=82=E5=B8=B8=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E4=B8=8D=E7=AC=A6=E5=90=88=E9=A2=84=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/data/datapane/preview/TableDataBeanHelper.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java index 5efe1c8908..29750d1294 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java @@ -198,9 +198,8 @@ public class TableDataBeanHelper { tableData.setPageQuerySql(DataEncryptionHelper.decrypt(bean.getPageQuery())); } Connection connection = connectionMap.get(bean.getDatabase()); - if (connection != null) { - tableData.setDatabase(new NameDatabaseConnection(bean.getDatabase())); - } else { + tableData.setDatabase(new NameDatabaseConnection(bean.getDatabase())); + if (connection == null) { FineLoggerFactory.getLogger().info("not find conn by {}", bean.getDatabase()); } String sql = SqlUtils.clearSqlComments(DataEncryptionHelper.decrypt(bean.getQuery()));