Merge pull request #2248 from scottsut/master

Release 1.0.0-RC.3

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

frontend/src/app/components/ChartGraph/BasicBarChart/BasicBarChart.tsx

@@ -242,6 +242,7 @@ class BasicBarChart extends Chart implements IChartLifecycle {
     return {
       tooltip: {
         trigger: 'item',
+        confine: true,
         formatter: this.getTooltipFormatterFunc(
           chartDataSet,
           groupConfigs,

frontend/src/app/components/ChartGraph/BasicDoubleYChart/BasicDoubleYChart.tsx

@@ -180,6 +180,7 @@ class BasicDoubleYChart extends Chart {
         axisPointer: {
           type: 'cross',
         },
+        confine: true,
         formatter: this.getTooltipFormmaterFunc(
           styleConfigs,
           groupConfigs,
@@ -365,10 +366,10 @@ class BasicDoubleYChart extends Chart {
     );
 
     const _yAxisTemplate = (position, name): DoubleYChartYAxis => {
-      const [showAxis, inverse, font, showLabel] = getStyles(
+      const [showAxis, inverse, font, showLabel, showTitleAndUnit] = getStyles(
         styles,
         [`${position}Y`],
-        ['showAxis', 'inverseAxis', 'font', 'showLabel'],
+        ['showAxis', 'inverseAxis', 'font', 'showLabel', 'showTitleAndUnit'],
       );
       const [format] = getStyles(
         styles,
@@ -379,7 +380,7 @@ class BasicDoubleYChart extends Chart {
         type: 'value',
         position,
         showTitleAndUnit: true,
-        name,
+        name: showTitleAndUnit ? name : null,
         nameLocation: 'middle',
         nameGap: 50,
         nameRotate: 90,

frontend/src/app/components/ChartGraph/BasicDoubleYChart/config.ts

@@ -253,6 +253,12 @@ const config: ChartConfig = {
             color: '#495057',
           },
         },
+        {
+          label: 'common.showTitleAndUnit',
+          key: 'showTitleAndUnit',
+          default: true,
+          comType: 'checkbox',
+        },
         {
           label: 'yAxis.open',
           key: 'modal',
@@ -331,6 +337,12 @@ const config: ChartConfig = {
             color: '#495057',
           },
         },
+        {
+          label: 'common.showTitleAndUnit',
+          key: 'showTitleAndUnit',
+          default: true,
+          comType: 'checkbox',
+        },
         {
           label: 'yAxis.open',
           key: 'modal',

frontend/src/app/components/ChartGraph/BasicLineChart/BasicLineChart.tsx

@@ -212,6 +212,7 @@ class BasicLineChart extends Chart {
     return {
       tooltip: {
         trigger: 'item',
+        confine: true,
         formatter: this.getTooltipFormmaterFunc(
           chartDataSet,
           groupConfigs,

frontend/src/app/components/ChartGraph/BasicOutlineMapChart/BasicOutlineMapChart.tsx

@@ -291,14 +291,22 @@ class BasicOutlineMapChart extends Chart {
       areaEmphasisColor,
       enableFocus,
       borderStyle,
+      roam,
     ] = getStyles(
       styleConfigs,
       ['map'],
-      ['level', 'areaColor', 'areaEmphasisColor', 'focusArea', 'borderStyle'],
+      [
+        'level',
+        'areaColor',
+        'areaEmphasisColor',
+        'focusArea',
+        'borderStyle',
+        'roam',
+      ],
     );
     return {
       map: mapLevelName,
-      roam: 'move',
+      roam: roam && 'move',
       emphasis: {
         focus: enableFocus ? 'self' : 'none',
         itemStyle: {

frontend/src/app/components/ChartGraph/BasicPieChart/BasicPieChart.tsx

@@ -243,10 +243,11 @@ class BasicPieChart extends Chart {
   }
 
   private getPieSeriesImpl(styleConfigs: ChartStyleConfig[]): PieSeriesImpl {
+    const [avoidOverlap] = getStyles(styleConfigs, ['label'], ['avoidOverlap']);
     return {
       type: 'pie',
       sampling: 'average',
-      avoidLabelOverlap: false,
+      avoidLabelOverlap: avoidOverlap,
       ...this.getLabelStyle(styleConfigs),
       ...this.getSeriesStyle(styleConfigs),
       ...getGridStyle(styleConfigs),

frontend/src/app/components/ChartGraph/BasicPieChart/config.ts

@@ -111,6 +111,12 @@ const config: ChartConfig = {
           default: true,
           comType: 'checkbox',
         },
+        {
+          label: 'label.avoidOverlap',
+          key: 'avoidOverlap',
+          default: false,
+          comType: 'checkbox',
+        },
       ],
     },
     {
@@ -284,6 +290,7 @@ const config: ChartConfig = {
           showName: '维度值',
           showPercent: '百分比',
           showValue: '指标值',
+          avoidOverlap: '强制显示所有标签',
         },
         legend: {
           title: '图例',
@@ -333,6 +340,7 @@ const config: ChartConfig = {
           showName: 'Show Name',
           showPercent: 'Show Percentage',
           showValue: 'Show Value',
+          avoidOverlap: 'Force display of all labels',
         },
         legend: {
           title: 'Legend',

frontend/src/app/components/ChartGraph/BasicTableChart/AntdTableWrapper.tsx

@@ -16,8 +16,10 @@
  * limitations under the License.
  */
 
-import { Table } from 'antd';
+import { ConfigProvider, Table } from 'antd';
+import { antdLocales } from 'locales/i18n';
 import { FC, memo } from 'react';
+import { useTranslation } from 'react-i18next';
 import styled from 'styled-components/macro';
 
 interface TableStyleConfigProps {
@@ -47,6 +49,8 @@ const AntdTableWrapper: FC<{
   summaryFn?: (data) => { total: number; summarys: [] };
 }> = memo(
   ({ dataSource, columns, children, summaryFn, tableStyleConfig, ...rest }) => {
+    const { i18n } = useTranslation();
+
     const getTableSummaryRow = pageData => {
       if (!summaryFn) {
         return undefined;
@@ -68,13 +72,15 @@ const AntdTableWrapper: FC<{
     };
 
     return (
-      <StyledTable
-        {...rest}
-        tableStyleConfig={tableStyleConfig}
-        dataSource={dataSource}
-        columns={columns}
-        summary={getTableSummaryRow}
-      />
+      <ConfigProvider locale={antdLocales[i18n.language]}>
+        <StyledTable
+          {...rest}
+          tableStyleConfig={tableStyleConfig}
+          dataSource={dataSource}
+          columns={columns}
+          summary={getTableSummaryRow}
+        />
+      </ConfigProvider>
     );
   },
 );

frontend/src/app/components/ChartGraph/NormalOutlineMapChart/config.ts

@@ -97,6 +97,12 @@ const config: ChartConfig = {
             color: '#ced4da',
           },
         },
+        {
+          label: 'map.roam',
+          key: 'roam',
+          default: true,
+          comType: 'checkbox',
+        },
       ],
     },
     {
@@ -310,6 +316,7 @@ const config: ChartConfig = {
           focusArea: '聚焦选中区域',
           areaColor: '区域颜色',
           areaEmphasisColor: '选中区域高亮颜色',
+          roam: '鼠标平移',
         },
         levelType: {
           china: '中国-省级地图',
@@ -362,6 +369,7 @@ const config: ChartConfig = {
           focusArea: 'Focus Area',
           areaColor: 'Area Color',
           areaEmphasisColor: 'Area Emphasis Color',
+          roam: 'Mouse translating',
         },
         levelType: {
           china: 'China',

frontend/src/app/components/ChartGraph/ScatterOutlineMapChart/config.ts

@@ -102,6 +102,12 @@ const config: ChartConfig = {
             color: '#ced4da',
           },
         },
+        {
+          label: 'map.roam',
+          key: 'roam',
+          default: true,
+          comType: 'checkbox',
+        },
         {
           label: 'map.cycleRatio',
           key: 'cycleRatio',
@@ -319,6 +325,7 @@ const config: ChartConfig = {
           cycleRatio: '气泡大像素比',
           areaColor: '区域颜色',
           areaEmphasisColor: '选中区域高亮颜色',
+          roam: '鼠标平移',
         },
         levelType: {
           china: '中国-省级地图',
@@ -369,6 +376,7 @@ const config: ChartConfig = {
           areaColor: 'Area Color',
           areaEmphasisColor: 'Area Emphasis Color',
           cycleRatio: 'Cycle Ratio',
+          roam: 'Mouse translating',
         },
         levelType: {
           china: 'China',

frontend/src/app/components/ChartIFrameContainer/ChartIFrameEventBroker.ts

@@ -149,8 +149,8 @@ class ChartIFrameEventBroker {
 
   private registerListener(c: IChart): void {
     this.subscribe(ChartLifecycle.Mounted, c?.onMount);
-    this.subscribe(ChartLifecycle.Updated, c?.onUpdated);
     this.subscribe(ChartLifecycle.Resize, c?.onResize);
+    this.subscribe(ChartLifecycle.Updated, c?.onUpdated);
     this.subscribe(ChartLifecycle.UnMount, c?.onUnMount);
   }