From 7ca66ff67907181ada372208e7700ce5a99aee25 Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Fri, 11 Feb 2022 13:45:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?KERNEL-9267=20feat:=20=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=8F=90=E4=BE=9B=E7=9A=84CBB=E7=BB=84=E4=BB=B6=E7=9B=AE?= =?UTF-8?q?=E5=89=8D=E8=BF=87=E4=BA=8E=E5=86=97=E6=9D=82=EF=BC=8C=E6=B2=A1?= =?UTF-8?q?=E6=B3=95=E7=B2=BE=E7=AE=80=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.gradle b/build.gradle index ee08bdeeac..4a634b11d4 100644 --- a/build.gradle +++ b/build.gradle @@ -9,6 +9,7 @@ plugins { // 模块参数 ext { frVersion = "" + cbbVersion = "" outputPath = "build" ignoreTestFailureSetting = true languageLevelSetting = 1.8 @@ -75,6 +76,8 @@ allprojects { implementation 'org.apache.tomcat:tomcat-catalina:8.5.72' implementation 'org.apache.tomcat:tomcat-websocket:8.5.72' implementation 'io.socket:socket.io-client:0.7.0' + implementation 'com.fr.essential:fine-essential:' + cbbVersion + implementation 'com.fr.cbb:fine-universal-skeleton:' + cbbVersion implementation 'com.fr.third:fine-third:' + frVersion implementation 'com.fr.core:fine-core:' + frDevVersion implementation 'com.fr.activator:fine-activator:' + frVersion From b077f84d04caeb52353fc1cf4274e14f204fc4b5 Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Thu, 15 Jun 2023 11:46:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-86153=E3=80=90=E4=BF=A1=E5=88=9B?= =?UTF-8?q?=E3=80=91=E8=BE=BE=E6=A2=A6=E6=95=B0=E6=8D=AE=E5=BA=93=E9=80=82?= =?UTF-8?q?=E9=85=8D=E5=AD=98=E5=82=A8=E8=BF=87=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/data/tabledata/tabledatapane/ProcedureDataPane.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java index d2a1918d4f..a71f883194 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java @@ -59,7 +59,8 @@ public class ProcedureDataPane extends AbstractTableDataPane imp "com.microsoft.sqlserver.jdbc.SQLServerDriver", "com.ibm.db2.jcc.DB2Driver", "com.mysql.jdbc.Driver", - "org.gjt.mm.mysql.Driver" + "org.gjt.mm.mysql.Driver", + "dm.jdbc.driver.DmDriver" }; // 需要隐藏面板的数据库的驱动 private static final String PREVIEW_BUTTON = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"); private ConnectionTableProcedurePane connectionTableProcedurePane; From b06b2416055469c5711e4bc8d065f96ce591afe8 Mon Sep 17 00:00:00 2001 From: lidongy <1879087903@qq.com> Date: Thu, 15 Jun 2023 11:49:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-86153=20=E8=AF=AF=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/build.gradle b/build.gradle index 4a634b11d4..ee08bdeeac 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,6 @@ plugins { // 模块参数 ext { frVersion = "" - cbbVersion = "" outputPath = "build" ignoreTestFailureSetting = true languageLevelSetting = 1.8 @@ -76,8 +75,6 @@ allprojects { implementation 'org.apache.tomcat:tomcat-catalina:8.5.72' implementation 'org.apache.tomcat:tomcat-websocket:8.5.72' implementation 'io.socket:socket.io-client:0.7.0' - implementation 'com.fr.essential:fine-essential:' + cbbVersion - implementation 'com.fr.cbb:fine-universal-skeleton:' + cbbVersion implementation 'com.fr.third:fine-third:' + frVersion implementation 'com.fr.core:fine-core:' + frDevVersion implementation 'com.fr.activator:fine-activator:' + frVersion