From 50f34f8b6b1c4bad8f8d5b1d071cdf9bac7a0cf7 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Mon, 1 Apr 2024 16:37:00 +0800
Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20=E6=95=B0=E6=8D=AE=E5=A1=AB?=
 =?UTF-8?q?=E6=8A=A5=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/provider/datasource/JdbcProvider.java | 3 +--
 core/frontend/src/views/dataFilling/form/index.vue         | 7 +++++++
 core/frontend/src/views/dataFilling/myTask/index.vue       | 6 ++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
index 9d8bc1b4dd..ffba6a3762 100644
--- a/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
+++ b/core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
@@ -428,9 +428,8 @@ public class JdbcProvider extends DefaultJdbcProvider {
         JdbcConfiguration jdbcConfiguration = new Gson().fromJson(dsr.getDatasource().getConfiguration(), JdbcConfiguration.class);
         int queryTimeout = jdbcConfiguration.getQueryTimeout() > 0 ? jdbcConfiguration.getQueryTimeout() : 0;
         try (Connection connection = getConnectionFromPool(dsr); PreparedStatement stat = getPreparedStatement(connection, queryTimeout, dsr.getQuery())) {
-
+            LogUtil.info("getData sql: " + dsr.getQuery());
             if (CollectionUtils.isNotEmpty(dsr.getTableFieldWithValues())) {
-                LogUtil.info("getData sql: " + dsr.getQuery());
                 for (int i = 0; i < dsr.getTableFieldWithValues().size(); i++) {
                     stat.setObject(i + 1, dsr.getTableFieldWithValues().get(i).getValue(), dsr.getTableFieldWithValues().get(i).getType());
                     LogUtil.info("getData param[" + (i + 1) + "]: " + dsr.getTableFieldWithValues().get(i).getValue());
diff --git a/core/frontend/src/views/dataFilling/form/index.vue b/core/frontend/src/views/dataFilling/form/index.vue
index 45380067e9..bad6a293cb 100644
--- a/core/frontend/src/views/dataFilling/form/index.vue
+++ b/core/frontend/src/views/dataFilling/form/index.vue
@@ -482,6 +482,13 @@ export default {
 </template>
 
 <style  lang="scss" scoped>
+.ms-aside-container {
+  height: calc(100vh - 56px);
+  padding: 0px;
+  min-width: 260px;
+  max-width: 460px;
+}
+
 .tab-panel {
   height: 100%;
   overflow-y: auto;
diff --git a/core/frontend/src/views/dataFilling/myTask/index.vue b/core/frontend/src/views/dataFilling/myTask/index.vue
index 6a213f9aee..47a88cca1f 100644
--- a/core/frontend/src/views/dataFilling/myTask/index.vue
+++ b/core/frontend/src/views/dataFilling/myTask/index.vue
@@ -611,6 +611,12 @@ export default {
 </template>
 
 <style  lang="scss" scoped>
+.ms-aside-container {
+  height: calc(100vh - 56px);
+  padding: 0px;
+  min-width: 260px;
+  max-width: 460px;
+}
 
 .view-table {
   background: rgba(255, 255, 255, 1);