Merge remote-tracking branch 'upstream/dev' into dev

Author: SoarBlueSky

config/logback.xml

@@ -1,6 +1,7 @@
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
 
     <property name="LOG_HOME" value="./logs"/>
+    <property name ="SQL_LEVEL" value="DEBUG"/>
 
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
@@ -22,13 +23,27 @@
         </encoder>
     </appender>
 
+    <appender name="sql" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${LOG_HOME}/%d{yyyy-MM-dd}-sql.log</FileNamePattern>
+            <MaxHistory>30</MaxHistory>
+        </rollingPolicy>
+        <encoder>
+            <charset>UTF-8</charset>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} : %msg%n</pattern>
+        </encoder>
+    </appender>
+
     <root level="INFO">
         <appender-ref ref="console"/>
         <appender-ref ref="root" />
     </root>
 
-    <logger name="access" additivity="false" level="INFO">
-        <appender-ref ref="error_db_appender"/>
+    <logger name="datart.data.provider.jdbc.adapters" level="${SQL_LEVEL}">
+        <appender-ref ref="sql"/>
+    </logger>
+    <logger name="datart.data.provider.local.LocalDB" level="${SQL_LEVEL}">
+        <appender-ref ref="sql"/>
     </logger>
 
 </configuration>

data-providers/src/main/java/datart/data/provider/local/LocalDB.java

@@ -43,16 +43,12 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 @Slf4j
-public class
-LocalDB {
+public class LocalDB {
 
     private static final String MEM_URL = "jdbc:h2:mem:/";
 
     private static final String H2_PARAM = ";LOG=0;DATABASE_TO_UPPER=false;MODE=MySQL;CASE_INSENSITIVE_IDENTIFIERS=TRUE;CACHE_SIZE=65536;LOCK_MODE=0;UNDO_LOG=0";
 
-    private static String fileUrl;
-
-    private static final String TABLE_CREATE_SQL_TEMPLATE = "CREATE TABLE `%s` ( %s )";
 
     public static final SqlDialect SQL_DIALECT = new H2Dialect();
 
@@ -283,6 +279,8 @@ private static Dataframe execute(Connection connection, QueryScript queryScript,
 
         String sql = render.render(true, false, false);
 
+        log.debug(sql);
+
         ResultSet resultSet = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY).executeQuery(sql);
         PageInfo pageInfo = executeParam.getPageInfo();
         resultSet.last();
@@ -312,7 +310,7 @@ private static String getDatabaseUrl(String database) {
         } else {
             database = toDatabase(database);
         }
-        return fileUrl = String.format("jdbc:h2:file:%s/%s" + H2_PARAM, getDbFileBasePath(), database);
+        return String.format("jdbc:h2:file:%s/%s" + H2_PARAM, getDbFileBasePath(), database);
     }
 
     private static String getDbFileBasePath() {

frontend/craco.config.js

@@ -1,6 +1,5 @@
 const path = require('path');
 const fs = require('fs');
-const CracoLessPlugin = require('craco-less');
 const WebpackBar = require('webpackbar');
 const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
 // const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
@@ -32,18 +31,6 @@ module.exports = {
   babel: {
     plugins: ['babel-plugin-styled-components'],
   },
-  plugins: [
-    {
-      plugin: CracoLessPlugin,
-      options: {
-        lessLoaderOptions: {
-          lessOptions: {
-            javascriptEnabled: true,
-          },
-        },
-      },
-    },
-  ],
   webpack: {
     alias: {},
     plugins: [

server/src/main/java/datart/server/service/impl/DataProviderServiceImpl.java

@@ -19,6 +19,7 @@
 package datart.server.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -412,9 +413,32 @@ private Map<String, Column> parseSchema(String model) {
         }
 
         JSONObject jsonObject = JSON.parseObject(model);
-        for (String key : jsonObject.keySet()) {
-            ValueType type = ValueType.valueOf(jsonObject.getJSONObject(key).getString("type"));
-            schema.put(key, new Column(key, type));
+        try {
+            if (jsonObject.containsKey("hierarchy")) {
+                jsonObject = jsonObject.getJSONObject("hierarchy");
+                for (String key : jsonObject.keySet()) {
+                    JSONObject item = jsonObject.getJSONObject(key);
+                    if (item.containsKey("children")) {
+                        JSONArray children = item.getJSONArray("children");
+                        if (children != null && children.size() > 0) {
+                            for (int i = 0; i < children.size(); i++) {
+                                JSONObject child = children.getJSONObject(i);
+                                schema.put(child.getString("name"), new Column(child.getString("name"), ValueType.valueOf(child.getString("type"))));
+                            }
+                        }
+                    } else {
+                        schema.put(key, new Column(item.getString("name"), ValueType.valueOf(item.getString("type"))));
+                    }
+                }
+            } else {
+                // 兼容1.0.0-beta.1以前的版本
+                for (String key : jsonObject.keySet()) {
+                    ValueType type = ValueType.valueOf(jsonObject.getJSONObject(key).getString("type"));
+                    schema.put(key, new Column(key, type));
+                }
+            }
+        } catch (Exception e) {
+            log.error("view model parse error", e);
         }
         return schema;
     }