From d79837717dce599d845f39a277b3c9df45555dce Mon Sep 17 00:00:00 2001
From: obo <Obo@fanruan.com>
Date: Thu, 23 Nov 2023 14:48:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-109802=20=E3=80=90=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=A2=9E=E5=BC=BA=E3=80=91=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AbstractMobileStyleDefinePaneCreator.java | 23 +++++++++++
 .../MobileStyleDefinePaneCreator.java         | 40 +++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 designer-base/src/main/java/com/fr/design/mainframe/mobile/processor/AbstractMobileStyleDefinePaneCreator.java
 create mode 100644 designer-base/src/main/java/com/fr/design/mainframe/mobile/processor/MobileStyleDefinePaneCreator.java

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/processor/AbstractMobileStyleDefinePaneCreator.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/processor/AbstractMobileStyleDefinePaneCreator.java
new file mode 100644
index 000000000..203a83f13
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/processor/AbstractMobileStyleDefinePaneCreator.java
@@ -0,0 +1,23 @@
+package com.fr.design.mainframe.mobile.processor;
+
+import com.fr.stable.fun.mark.API;
+
+/**
+ * 移动端Form控件，样式模板，通用属性替换接口
+ *
+ * @author Coral.Chen
+ * @since 11.0
+ * Created on 2023/4/11
+ */
+@API(level = MobileStyleDefinePaneCreator.CURRENT_LEVEL)
+public abstract class AbstractMobileStyleDefinePaneCreator implements MobileStyleDefinePaneCreator {
+    @Override
+    public int currentAPILevel() {
+        return CURRENT_LEVEL;
+    }
+
+    @Override
+    public int layerIndex() {
+        return DEFAULT_LAYER_INDEX;
+    }
+}
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/processor/MobileStyleDefinePaneCreator.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/processor/MobileStyleDefinePaneCreator.java
new file mode 100644
index 000000000..3b5e2cb86
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/processor/MobileStyleDefinePaneCreator.java
@@ -0,0 +1,40 @@
+package com.fr.design.mainframe.mobile.processor;
+
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.mainframe.mobile.ui.MobileStyleCustomDefinePane;
+import com.fr.form.ui.Widget;
+import com.fr.form.ui.mobile.MobileCommonExtraStyle;
+import com.fr.form.ui.mobile.MobileStyle;
+import com.fr.stable.fun.mark.Immutable;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * 移动端Form控件，样式模板，通用属性替换接口
+ *
+ * @author Coral.Chen
+ * @since 11.0
+ * Created on 2023/4/11
+ */
+public interface MobileStyleDefinePaneCreator extends Immutable {
+    String XML_TAG = "MobileStyleDefinePaneCreator";
+
+    int CURRENT_LEVEL = 1;
+
+    /**
+     * <p> 创建通用属性样式界面，可替换{@link com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane}
+     * <p> 每种样式的通用属性面板是一样的
+     *
+     * @param widget           控件
+     * @param customDefinePane 自定义面板
+     * @param mobileStyle      移动端样式
+     * @return
+     */
+    @Nullable BasicBeanPane<MobileStyle> createBaseBeanPane(Widget widget, Class<? extends MobileStyleCustomDefinePane> customDefinePane, Class<? extends MobileStyle> mobileStyle);
+
+    /**
+     * 替换通用属性面板，注册额外属性
+     *
+     * @return 属性类
+     */
+    @Nullable Class<? extends MobileCommonExtraStyle> classForCommonExtraStyle(Widget widget);
+}
\ No newline at end of file

From d1ff52c45394dd308bc10de303f7c13a8fa48434 Mon Sep 17 00:00:00 2001
From: xiqiu <xiqiu@fanruan.com>
Date: Thu, 23 Nov 2023 16:51:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0jira=20=E8=A1=A5=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/data/datapane/connect/DatabaseConnectionPane.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
index 3c5c2b82a..11c3f64d6 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
@@ -462,6 +462,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
             } catch (InterruptedException e) {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             } catch (ExecutionException e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
                 dealWithException(e);
             }
         }