Merge pull request #8836 from ulleo/dev

feat(X-Pack): 数据填报左侧菜单增加宽度限制

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());

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;

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);