Merge pull request #2248 from scottsut/master

Release 1.0.0-RC.3

Author: scottsut

core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datart-parent</artifactId>
         <groupId>datart</groupId>
-        <version>1.0.0-rc.2</version>
+        <version>1.0.0-rc.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

data-providers/data-provider-base/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datart-data-provider</artifactId>
         <groupId>datart</groupId>
-        <version>1.0.0-rc.2</version>
+        <version>1.0.0-rc.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

data-providers/file-data-provider/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datart-data-provider</artifactId>
         <groupId>datart</groupId>
-        <version>1.0.0-rc.2</version>
+        <version>1.0.0-rc.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

data-providers/http-data-provider/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datart-data-provider</artifactId>
         <groupId>datart</groupId>
-        <version>1.0.0-rc.2</version>
+        <version>1.0.0-rc.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

data-providers/jdbc-data-provider/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datart-data-provider</artifactId>
         <groupId>datart</groupId>
-        <version>1.0.0-rc.2</version>
+        <version>1.0.0-rc.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

data-providers/jdbc-data-provider/src/main/java/datart/data/provider/jdbc/adapters/JdbcDataProviderAdapter.java

@@ -18,6 +18,7 @@
 
 package datart.data.provider.jdbc.adapters;
 
+import com.alibaba.fastjson.JSON;
 import datart.core.base.PageInfo;
 import datart.core.base.consts.ValueType;
 import datart.core.base.exception.Exceptions;
@@ -183,7 +184,7 @@ public Set<Column> readTableColumn(String database, String table) throws SQLExce
 
     public String getQueryKey(QueryScript script, ExecuteParam executeParam) throws SqlParseException {
         SqlScriptRender render = new SqlScriptRender(script, executeParam, getSqlDialect(), jdbcProperties.isEnableSpecialSql(), driverInfo.getQuoteIdentifiers());
-        return "Q" + DigestUtils.md5Hex(render.render(true, supportPaging(), true));
+        return "Q" + DigestUtils.md5Hex(render.render(true, supportPaging(), true) + ";includeColumns:" + JSON.toJSONString(executeParam.getIncludeColumns()) + ";viewId:" + script.getViewId() + ";pageInfo:" + JSON.toJSONString(executeParam.getPageInfo()));
     }
 
     protected Column readTableColumn(ResultSet columnMetadata) throws SQLException {
@@ -484,4 +485,4 @@ protected Object getObjFromResultSet(ResultSet rs, int columnIndex) throws SQLEx
         }
         return obj;
     }
-}
+}

data-providers/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>datart-parent</artifactId>
         <groupId>datart</groupId>
-        <version>1.0.0-rc.2</version>
+        <version>1.0.0-rc.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

frontend/craco.config.js

@@ -61,7 +61,7 @@ module.exports = {
           chunkFilename: 'static/js/[name].[contenthash:8].js',
         },
         // path: path.resolve(__dirname, 'dist'), // 修改输出文件目录
-        publicPath: '/',
+        publicPath: `${process.env.PUBLIC_URL || ''}/`,
       };
       /**
        * webpack split chunks

frontend/src/app/AppRouter.tsx

@@ -19,7 +19,7 @@
 import { ConfigProvider, message } from 'antd';
 import echartsDefaultTheme from 'app/assets/theme/echarts_default_theme.json';
 import { registerTheme } from 'echarts';
-import { StorageKeys } from 'globalConstants';
+import { PUBLIC_URL, StorageKeys } from 'globalConstants';
 import { antdLocales } from 'locales/i18n';
 import { useEffect, useLayoutEffect } from 'react';
 import { Helmet } from 'react-helmet-async';
@@ -65,7 +65,7 @@ export function AppRouter() {
 
   return (
     <ConfigProvider locale={antdLocales[i18n.language]}>
-      <BrowserRouter>
+      <BrowserRouter basename={PUBLIC_URL}>
         <Helmet
           titleTemplate="%s - Datart"
           defaultTitle="Datart"

frontend/src/app/components/ChartDrill/ChartDrillContextMenu.tsx

@@ -80,6 +80,7 @@ const ChartDrillContextMenu: FC<{
     } else {
       rows = groupSection?.rows?.filter(v => v.uid === allFields[0].uid);
     }
+    rows = rows?.filter(row => row.type === DataViewFieldType.DATE);
     return getRuntimeDateLevelFields(rows);
   }, [drillOption, chartConfig?.datas, currentFields]);