From b97771d771839ec58572fe2c3204687e5ab60459 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Fri, 16 Aug 2024 17:12:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-130368=20=E7=89=88=E6=9C=AC=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E8=87=AA=E5=8A=A8=E6=B8=85=E7=90=86=E4=B8=8D=E4=BC=9A?= =?UTF-8?q?=E8=A7=A6=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/actions/file/PreferencePane.java | 3 +++ 1 file changed, 3 insertions(+) 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 c913d0f5df..d6bd7927c6 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 @@ -523,6 +523,9 @@ public class PreferencePane extends BasicPane { autoCleanPane.add(autoCleanRetainIntervalComboBox); autoCleanPane.add(new UILabel(i18nText("Fine-Design_Vcs_Auto_Clean_Last"))); autoCleanPane.setVisible(false); + if (WorkContext.getCurrent().isLocal()) { + return new JPanel(); + } return autoCleanPane; } From e8c6d5c2f5ff1ccbdc1ba8bd05644e9525938d25 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Fri, 16 Aug 2024 17:56:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-130872=20FBP=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E5=92=8C=E5=B9=B3=E5=8F=B0=20=E6=96=B0=E5=BB=BAsql?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=EF=BC=8C=E8=AE=BE=E7=BD=AE=E5=85=AC?= =?UTF-8?q?=E5=BC=8F=E5=8F=82=E6=95=B0=E4=BF=9D=E5=AD=98=E5=90=8E=E5=86=8D?= =?UTF-8?q?=E6=AC=A1=E6=89=93=E5=BC=80=E6=B2=A1=E6=9C=89=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boot/env/function/DesignDatasourceComponent.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/designer-realize/src/main/java/com/fanruan/boot/env/function/DesignDatasourceComponent.java b/designer-realize/src/main/java/com/fanruan/boot/env/function/DesignDatasourceComponent.java index 54d0eef1eb..89588c6430 100644 --- a/designer-realize/src/main/java/com/fanruan/boot/env/function/DesignDatasourceComponent.java +++ b/designer-realize/src/main/java/com/fanruan/boot/env/function/DesignDatasourceComponent.java @@ -12,6 +12,11 @@ import com.fanruan.config.impl.data.ConnectionConfigWriter; import com.fanruan.config.impl.data.ConnectionConfigWriterFactory; import com.fanruan.config.impl.data.TableDataConfigProviderFactory; import com.fanruan.data.ConnectionConfigWrapper; +import com.fr.base.MultiParameterParser; +import com.fr.base.ParameterType; +import com.fr.base.ParameterTypeHandler; +import com.fr.base.parameter.FormulaParameterParser; +import com.fr.base.parameter.TableColumnParameterParser; import com.fr.data.driver.classloader.DriverClassLoaderHelper; import com.fr.data.driver.classloader.impl.ChildFirstDriverClassLoader; import com.fr.data.driver.classloader.impl.ChildOnlyDriverClassLoader; @@ -65,6 +70,10 @@ public class DesignDatasourceComponent extends DatasourceComponent { registerDriverClassLoader(); ConnectionConfigWriterFactory.registerConnectionConfigWriter((ConnectionConfigWriter) ConnectionConfigProviderFactory.getConfigProvider()); Carina.getApplicationContext().singleton(ConnectionWriterShell.class).set(ConnectionConfigWriterFactory.getConfigWriter()); + ParameterTypeHandler.getInstance().addParser(ParameterType.Multi.name(), new MultiParameterParser()); + ParameterTypeHandler.getInstance().addParser(ParameterType.JSONArray.name(), new MultiParameterParser()); + ParameterTypeHandler.getInstance().addParser(ParameterType.Formula.name(), new FormulaParameterParser()); + ParameterTypeHandler.getInstance().addParser(ParameterType.TableColumn.name(), new TableColumnParameterParser()); } private void registerDriverClassLoader() {