Merge pull request #141 from running-elephant/dev

Dev
Cuiyansong · Aug 8, 2022 · 45abf9f · 45abf9f
2 parents d4edf9a + fe2ab10
commit 45abf9f
Show file tree

Hide file tree

Showing 32 changed files with 345 additions and 155 deletions.
diff --git a/data-providers/data-provider-base/src/main/java/datart/data/provider/ProviderManager.java b/data-providers/data-provider-base/src/main/java/datart/data/provider/ProviderManager.java
@@ -195,7 +195,9 @@ private void excludeColumns(Dataframe data, Set<SelectColumn> include) {
             if (include
                     .stream()
                     .noneMatch(selectColumn ->
-                            column.columnKey().equals(selectColumn.getColumnKey()) || column.columnKey().equals(selectColumn.getAlias()))) {
+                            column.columnKey().equals(selectColumn.getColumnKey())
+                                    || column.columnKey().equals(selectColumn.getAlias())
+                                    || column.columnKey().contains(selectColumn.getColumnKey()))) {
                 excludeIndex.add(i);
             }
         }

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -101,6 +101,7 @@
     "antd-theme-generator": "1.2.11",
     "axios": "^0.21.1",
     "classnames": "^2.3.1",
+    "currency.js": "^2.0.4",
     "debounce-promise": "3.1.2",
     "echarts": "5.3.1",
     "echarts-wordcloud": "^2.0.0",

diff --git a/frontend/src/app/components/ChartGraph/BasicBarChart/config.ts b/frontend/src/app/components/ChartGraph/BasicBarChart/config.ts
@@ -141,6 +141,9 @@ const config: ChartConfig = {
           label: 'bar.radius',
           key: 'radius',
           comType: 'inputNumber',
+          options: {
+            min: 0,
+          },
         },
         {
           label: 'bar.width',

diff --git a/frontend/src/app/components/ChartGraph/BasicRadarChart/config.ts b/frontend/src/app/components/ChartGraph/BasicRadarChart/config.ts
@@ -143,6 +143,9 @@ const config: ChartConfig = {
           label: 'bar.radius',
           key: 'radius',
           comType: 'inputNumber',
+          options: {
+            min: 0,
+          },
         },
         {
           label: 'bar.width',

diff --git a/frontend/src/app/components/ChartGraph/BasicTableChart/BasicTableChart.tsx b/frontend/src/app/components/ChartGraph/BasicTableChart/BasicTableChart.tsx
@@ -37,8 +37,8 @@ import {
   toFormattedValue,
   transformToDataSet,
 } from 'app/utils/chartHelper';
-import { isNumber } from 'app/utils/number';
-import { DATARTSEPERATOR } from 'globalConstants';
+import { precisionCalculation } from 'app/utils/number';
+import { CalculationType, DATARTSEPERATOR } from 'globalConstants';
 import { darken, getLuminance, lighten } from 'polished';
 import { Debugger } from 'utils/debugger';
 import { CloneValueDeep, isEmptyArray, Omit } from 'utils/object';
@@ -393,15 +393,7 @@ class BasicTableChart extends ReactChart {
                   ? context?.translator?.('viz.palette.graph.summary') + ': '
                   : '') +
                 toFormattedValue(
-                  total.reduce((acc, cur) => {
-                    const num: number =
-                      !isNumber(cur) || isNaN(cur)
-                        ? typeof cur === 'string' && !isNaN(Number(cur))
-                          ? Number(cur)
-                          : 0
-                        : cur;
-                    return acc + num;
-                  }, 0),
+                  precisionCalculation(CalculationType.ADD, total),
                   currentSummaryField.format,
                 )
               );

diff --git a/frontend/src/app/components/ChartGraph/ClusterBarChart/config.ts b/frontend/src/app/components/ChartGraph/ClusterBarChart/config.ts
@@ -74,6 +74,9 @@ const config: ChartConfig = {
           label: 'bar.radius',
           key: 'radius',
           comType: 'inputNumber',
+          options: {
+            min: 0,
+          },
         },
         {
           label: 'bar.width',

diff --git a/frontend/src/app/components/ChartGraph/ClusterColumnChart/config.ts b/frontend/src/app/components/ChartGraph/ClusterColumnChart/config.ts
@@ -74,6 +74,9 @@ const config: ChartConfig = {
           label: 'bar.radius',
           key: 'radius',
           comType: 'inputNumber',
+          options: {
+            min: 0,
+          },
         },
         {
           label: 'bar.width',

diff --git a/frontend/src/app/components/ChartGraph/PercentageStackBarChart/config.ts b/frontend/src/app/components/ChartGraph/PercentageStackBarChart/config.ts
@@ -74,6 +74,9 @@ const config: ChartConfig = {
           label: 'bar.radius',
           key: 'radius',
           comType: 'inputNumber',
+          options: {
+            min: 0,
+          },
         },
         {
           label: 'bar.width',

diff --git a/frontend/src/app/components/ChartGraph/PercentageStackColumnChart/config.ts b/frontend/src/app/components/ChartGraph/PercentageStackColumnChart/config.ts
@@ -74,6 +74,9 @@ const config: ChartConfig = {
           label: 'bar.radius',
           key: 'radius',
           comType: 'inputNumber',
+          options: {
+            min: 0,
+          },
         },
         {
           label: 'bar.width',

diff --git a/frontend/src/app/components/ChartGraph/StackBarChart/config.ts b/frontend/src/app/components/ChartGraph/StackBarChart/config.ts
@@ -74,6 +74,9 @@ const config: ChartConfig = {
           label: 'bar.radius',
           key: 'radius',
           comType: 'inputNumber',
+          options: {
+            min: 0,
+          },
         },
         {
           label: 'bar.width',

diff --git a/frontend/src/app/components/ChartGraph/StackColumnChart/config.ts b/frontend/src/app/components/ChartGraph/StackColumnChart/config.ts
@@ -74,6 +74,9 @@ const config: ChartConfig = {
           label: 'bar.radius',
           key: 'radius',
           comType: 'inputNumber',
+          options: {
+            min: 0,
+          },
         },
         {
           label: 'bar.width',

diff --git a/frontend/src/app/components/ChartGraph/WaterfallChart/WaterfallChart.tsx b/frontend/src/app/components/ChartGraph/WaterfallChart/WaterfallChart.tsx
@@ -17,6 +17,8 @@
  */
 
 import { ChartDataSectionType } from 'app/constants';
+import Chart from 'app/models/Chart';
+import { ChartSelectionManager } from 'app/models/ChartSelectionManager';
 import {
   ChartConfig,
   ChartDataSectionField,
@@ -37,15 +39,15 @@ import {
   getSelectedItemStyles,
   getStyles,
   hadAxisLabelOverflowConfig,
-  round,
   setOptionsByAxisLabelOverflow,
   toFormattedValue,
   transformToDataSet,
 } from 'app/utils/chartHelper';
+import { precisionCalculation } from 'app/utils/number';
+import currency from 'currency.js';
 import { init } from 'echarts';
+import { CalculationType } from 'globalConstants';
 import { UniqArray } from 'utils/object';
-import Chart from '../../../models/Chart';
-import { ChartSelectionManager } from '../../../models/ChartSelectionManager';
 import Config from './config';
 import {
   OrderConfig,
@@ -122,6 +124,7 @@ class WaterfallChart extends Chart {
   onUnMount(options: BrokerOption, context: BrokerContext): void {
     this.selectionManager?.removeWindowListeners(context.window);
     this.selectionManager?.removeZRenderListeners(this.chart);
+    this.rowDataList = [];
     this.chart?.dispose();
   }
 
@@ -162,12 +165,12 @@ class WaterfallChart extends Chart {
     );
 
     return {
-      barWidth: this.getSerieBarWidth(styleConfigs),
+      barWidth: this.getSeriesBarWidth(styleConfigs),
       ...series,
     };
   }
 
-  private getSerieBarWidth(styles: ChartStyleConfig[]): number {
+  private getSeriesBarWidth(styles: ChartStyleConfig[]): number {
     const [width] = getStyles(styles, ['bar'], ['width']);
     return width;
   }
@@ -192,7 +195,7 @@ class WaterfallChart extends Chart {
       ['isIncrement', 'ascendColor', 'descendColor'],
     );
     const label = this.getLabel(styles, aggregateConfigs[0].format);
-
+    this.rowDataList = [];
     const dataList = chartDataSet.map(dc => {
       this.rowDataList.push(getExtraSeriesRowData(dc));
       return dc.getCell(aggregateConfigs[0]);
@@ -274,7 +277,10 @@ class WaterfallChart extends Chart {
           const text = param.map((pa, index) => {
             let data = pa.value;
             if (!index && typeof param[1].value === 'number') {
-              data += param[1].value;
+              data = precisionCalculation(CalculationType.ADD, [
+                data,
+                param[1].value,
+              ]);
             }
             return `${pa.seriesName}: ${toFormattedValue(
               data,
@@ -317,16 +323,24 @@ class WaterfallChart extends Chart {
     selectedItems?: SelectedItem[],
   ): WaterfallDataListConfig {
     const [totalColor] = getStyles(styles, ['bar'], ['totalColor']);
-    const baseData: Array<number | string> = [];
+    const baseData: Array<number> = [];
     const ascendOrder: OrderConfig[] = [];
     const descendOrder: OrderConfig[] = [];
     dataList.forEach((data, index) => {
-      const newData: number = parseFloat(data);
+      const newData: number = isNaN(currency(data).value)
+        ? 0
+        : currency(data).value;
+      const lastData: number = isNaN(currency(dataList[index - 1]).value)
+        ? 0
+        : currency(dataList[index - 1]).value;
       if (index > 0) {
         if (isIncrement) {
-          const result: number | string =
-            Number(dataList[index - 1]) >= 0
-              ? round(dataList[index - 1] + baseData[index - 1])
+          const result: number =
+            lastData >= 0
+              ? precisionCalculation(CalculationType.ADD, [
+                  lastData,
+                  baseData[index - 1],
+                ])
               : baseData[index - 1];
           if (newData >= 0) {
             baseData.push(result);
@@ -336,30 +350,38 @@ class WaterfallChart extends Chart {
             });
             descendOrder.push('-');
           } else {
-            baseData.push(round(Number(result) + newData));
+            baseData.push(
+              precisionCalculation(CalculationType.ADD, [result, newData]),
+            );
             ascendOrder.push('-');
             descendOrder.push({
               value: Math.abs(newData),
               ...getSelectedItemStyles('', index, selectedItems || []),
             });
           }
         } else {
-          const result = round(Number(data) - parseFloat(dataList[index - 1]));
+          const result: number = precisionCalculation(
+            CalculationType.SUBTRACT,
+            [newData, lastData],
+          );
           if (result >= 0) {
             ascendOrder.push({
               value: result,
               ...getSelectedItemStyles('', index, selectedItems || []),
             });
             descendOrder.push('-');
-            baseData.push(parseFloat(dataList[index - 1]));
+            baseData.push(lastData);
           } else {
             ascendOrder.push('-');
             descendOrder.push({
               value: Math.abs(result),
               ...getSelectedItemStyles('', index, selectedItems || []),
             });
             baseData.push(
-              round(parseFloat(dataList[index - 1]) - Math.abs(result)),
+              precisionCalculation(CalculationType.SUBTRACT, [
+                lastData,
+                Math.abs(result),
+              ]),
             );
           }
         }
@@ -383,9 +405,10 @@ class WaterfallChart extends Chart {
     });
     if (isIncrement && xAxisColumns?.data?.length) {
       xAxisColumns.data.push(t?.('common.total'));
-      const resultData = round(
-        dataList[dataList.length - 1] + baseData[baseData.length - 1],
-      );
+      const resultData = precisionCalculation(CalculationType.ADD, [
+        dataList[dataList.length - 1],
+        baseData[baseData.length - 1],
+      ]);
       if (resultData > 0) {
         ascendOrder.push({
           value: resultData,

diff --git a/frontend/src/app/components/ChartGraph/WaterfallChart/config.ts b/frontend/src/app/components/ChartGraph/WaterfallChart/config.ts
@@ -78,6 +78,9 @@ const config: ChartConfig = {
           label: 'bar.radius',
           key: 'radius',
           comType: 'inputNumber',
+          options: {
+            min: 0,
+          },
         },
         {
           label: 'bar.width',

diff --git a/.../DashBoardPage/components/Widgets/ControllerWidget/Controller/CheckboxGroupController.tsx b/.../DashBoardPage/components/Widgets/ControllerWidget/Controller/CheckboxGroupController.tsx
@@ -49,10 +49,11 @@ export const CheckboxGroupSetter: React.FC<CheckboxGroupControllerProps> = memo(
     const renderOptions = useCallback(() => {
       return (options || []).map(o => ({
         label: o.label ?? o.value,
-        value: o.value,
+        value: o.value || '',
         key: o.label + o.value,
       }));
     }, [options]);
+
     return (
       <Wrapper>
         <Checkbox.Group

diff --git a/frontend/src/app/pages/DashBoardPage/pages/BoardEditor/AutoEditor/index.tsx b/frontend/src/app/pages/DashBoardPage/pages/BoardEditor/AutoEditor/index.tsx
@@ -18,6 +18,7 @@
 
 import { memo, useContext } from 'react';
 import styled from 'styled-components/macro';
+import { LEVEL_1 } from 'styles/StyleConstants';
 import { WidgetActionContext } from '../../../components/ActionProvider/WidgetActionProvider';
 import { BoardToolBar } from '../components/BoardToolBar/BoardToolBar';
 import { LayerTreePanel } from '../components/LayerPanel/LayerTreePanel';
@@ -46,6 +47,7 @@ const Wrapper = styled.div`
 `;
 
 const Editor = styled.div`
+  z-index: ${LEVEL_1};
   display: flex;
   flex: 1;
   min-height: 0;

diff --git a/...nd/src/app/pages/DashBoardPage/pages/BoardEditor/components/BoardToolBar/BoardToolBar.tsx b/...nd/src/app/pages/DashBoardPage/pages/BoardEditor/components/BoardToolBar/BoardToolBar.tsx
@@ -17,9 +17,9 @@
  */
 
 import { BoardContext } from 'app/pages/DashBoardPage/components/BoardProvider/BoardProvider';
-import React, { useContext } from 'react';
+import { useContext } from 'react';
 import styled from 'styled-components/macro';
-import { LEVEL_1, SPACE, SPACE_XL } from 'styles/StyleConstants';
+import { LEVEL_5, SPACE, SPACE_XL } from 'styles/StyleConstants';
 import { BoardToolBarContext } from './context/BoardToolBarContext';
 import { ToolBar } from './ToolBar';
 
@@ -37,7 +37,7 @@ export const BoardToolBar = () => {
 };
 
 const Wrapper = styled.div`
-  z-index: ${LEVEL_1};
+  z-index: ${LEVEL_5};
   display: flex;
   flex-shrink: 0;
   align-items: center;