Merge branch 'dev-v2' into pr@dev-v2@perf_report_ws_refresh

core/core-backend/pom.xml

@@ -48,6 +48,10 @@
                     <groupId>com.google.guava</groupId>
                     <artifactId>guava</artifactId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>commons-io</artifactId>
+                    <groupId>commons-io</groupId>
+                </exclusion>
             </exclusions>
             <classifier>de</classifier>
         </dependency>

core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java

@@ -207,7 +207,7 @@ public class DatasetDataManage {
         Order2SQLObj.getOrders(sqlMeta, fields, datasetGroupInfoDTO.getSortFields(), crossDs, dsMap);
         String querySQL;
         if (start == null || count == null) {
-            querySQL = SQLProvider.createQuerySQL(sqlMeta, false, false, needOrder);
+            querySQL = SQLProvider.createQuerySQL(sqlMeta, false, needOrder, false);
         } else {
             querySQL = SQLProvider.createQuerySQLWithLimit(sqlMeta, false, needOrder, false, start, count);
         }
@@ -231,7 +231,7 @@ public class DatasetDataManage {
             map.put("allFields", fieldList);
         }
         map.put("sql", Base64.getEncoder().encodeToString(querySQL.getBytes()));
-        String replaceSql = SqlUtils.rebuildSQL(SQLProvider.createQuerySQL(sqlMeta, false, false, needOrder), sqlMeta, crossDs, dsMap);
+        String replaceSql = SqlUtils.rebuildSQL(SQLProvider.createQuerySQL(sqlMeta, false, false, false), sqlMeta, crossDs, dsMap);
         map.put("total", getDatasetTotal(datasetGroupInfoDTO, replaceSql, null));
         return map;
     }

core/core-frontend/src/components/visualization/CanvasCacheDialog.vue

@@ -4,6 +4,7 @@
     :append-to-body="true"
     v-model="dialogShow"
     width="340px"
+    :show-close="false"
     trigger="click"
   >
     <el-row style="height: 20px">

core/core-frontend/src/locales/zh-CN.ts

@@ -322,6 +322,7 @@ export default {
     please_input_host: '请输入主机',
     please_input_url: '请输入URL地址',
     please_input_port: '请输入端口',
+    please_input_be_port: '请输入BE端口',
     modify: '编辑数据源',
     copy: '复制数据源',
     validate_success: '校验成功',
@@ -686,6 +687,7 @@ export default {
     table_show_row_tooltip: '开启行头提示',
     table_show_col_tooltip: '开启列头提示',
     table_show_cell_tooltip: '开启单元格提示',
+    table_show_header_tooltip: '开启表头提示',
     stripe: '斑马纹',
     start_angle: '起始角度',
     end_angle: '结束角度',

core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue

@@ -354,13 +354,14 @@ watch(
             />
           </collapse-switch-item>
           <collapse-switch-item
-            :themes="themes"
             v-if="showProperties('tooltip-selector')"
             v-model="chart.customAttr.tooltip.show"
+            :themes="themes"
             :change-model="chart.customAttr.tooltip"
-            @modelChange="val => onTooltipChange({ data: val }, 'show')"
-            name="tooltip"
             :title="$t('chart.tooltip')"
+            :show-switch="propertyInnerAll['tooltip-selector'].includes('show')"
+            name="tooltip"
+            @modelChange="val => onTooltipChange({ data: val }, 'show')"
           >
             <tooltip-selector
               class="attr-selector"
@@ -438,7 +439,7 @@ watch(
             :change-model="chart.customStyle.xAxis"
             @modelChange="val => onChangeXAxisForm(val, 'show')"
             name="xAxis"
-            :title="chart.type === 'bidirectional-bar' ? $t('chart.yAxis') : t('chart.xAxis')"
+            :title="selectorSpec['x-axis-selector']?.title"
           >
             <x-axis-selector
               class="attr-selector"
@@ -473,7 +474,7 @@ watch(
             :change-model="chart.customStyle.yAxis"
             @modelChange="val => onChangeYAxisForm(val, 'show')"
             name="yAxis"
-            :title="chart.type === 'bidirectional-bar' ? $t('chart.xAxis') : $t('chart.yAxis')"
+            :title="selectorSpec['dual-y-axis-selector']?.title"
           >
             <dual-y-axis-selector
               class="attr-selector"

core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue

@@ -261,7 +261,11 @@ onMounted(() => {
         v-model="state.tableHeaderForm.showColTooltip"
         @change="changeTableHeader('showColTooltip')"
       >
-        {{ t('chart.table_show_col_tooltip') }}
+        {{
+          chart.type === 'table-pivot'
+            ? t('chart.table_show_col_tooltip')
+            : t('chart.table_show_header_tooltip')
+        }}
       </el-checkbox>
     </el-form-item>
     <el-form-item

core/core-frontend/src/views/chart/components/js/panel/charts/bar/bar.ts

@@ -26,7 +26,7 @@ export class Bar extends G2PlotChartView<ColumnOptions, Column> {
   propertyInner = {
     ...BAR_EDITOR_PROPERTY_INNER,
     'label-selector': ['vPosition', 'seriesLabelFormatter'],
-    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'seriesTooltipFormatter'],
+    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'seriesTooltipFormatter', 'show'],
     'y-axis-selector': [...BAR_EDITOR_PROPERTY_INNER['y-axis-selector'], 'axisLabelFormatter']
   }
   protected baseOptions: ColumnOptions = {
@@ -236,7 +236,7 @@ export class StackBar extends Bar {
   propertyInner = {
     ...this['propertyInner'],
     'label-selector': [...BAR_EDITOR_PROPERTY_INNER['label-selector'], 'vPosition'],
-    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'tooltipFormatter']
+    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'tooltipFormatter', 'show']
   }
   protected configLabel(chart: Chart, options: ColumnOptions): ColumnOptions {
     const baseOptions = super.configLabel(chart, options)
@@ -372,7 +372,7 @@ export class PercentageStackBar extends GroupStackBar {
   propertyInner = {
     ...this['propertyInner'],
     'label-selector': ['color', 'fontSize', 'vPosition', 'reserveDecimalCount'],
-    'tooltip-selector': ['color', 'fontSize']
+    'tooltip-selector': ['color', 'fontSize', 'backgroundColor', 'show']
   }
   protected configLabel(chart: Chart, options: ColumnOptions): ColumnOptions {
     const baseOptions = super.configLabel(chart, options)

core/core-frontend/src/views/chart/components/js/panel/charts/bar/bidirectional-bar.ts

@@ -88,7 +88,17 @@ export class BidirectionalHorizontalBar extends G2PlotChartView<
     'legend-selector': ['icon', 'orient', 'fontSize', 'color', 'hPosition', 'vPosition'],
     'function-cfg': ['emptyDataStrategy'],
     'label-selector': ['hPosition', 'seriesLabelFormatter'],
-    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'seriesTooltipFormatter']
+    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'seriesTooltipFormatter', 'show']
+  }
+
+  selectorSpec: EditorSelectorSpec = {
+    ...this['selectorSpec'],
+    'dual-y-axis-selector': {
+      title: `${t('chart.xAxis')}`
+    },
+    'x-axis-selector': {
+      title: `${t('chart.yAxis')}`
+    }
   }
 
   drawChart(drawOptions: G2PlotDrawOptions<G2BidirectionalBar>): G2BidirectionalBar {

core/core-frontend/src/views/chart/components/js/panel/charts/bar/common.ts

@@ -30,7 +30,7 @@ export const BAR_EDITOR_PROPERTY_INNER: EditorPropertyInner = {
   'background-overall-component': ['all'],
   'basic-style-selector': ['colors', 'alpha', 'gradient'],
   'label-selector': ['fontSize', 'color', 'labelFormatter'],
-  'tooltip-selector': ['fontSize', 'color', 'tooltipFormatter'],
+  'tooltip-selector': ['fontSize', 'color', 'tooltipFormatter', 'show'],
   'x-axis-selector': [
     'name',
     'color',

core/core-frontend/src/views/chart/components/js/panel/charts/bar/horizontal-bar.ts

@@ -34,7 +34,7 @@ export class HorizontalBar extends G2PlotChartView<BarOptions, Bar> {
   propertyInner = {
     ...BAR_EDITOR_PROPERTY_INNER,
     'label-selector': ['hPosition', 'seriesLabelFormatter'],
-    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'seriesTooltipFormatter'],
+    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'seriesTooltipFormatter', 'show'],
     'x-axis-selector': [...BAR_EDITOR_PROPERTY_INNER['x-axis-selector'], 'axisLabelFormatter']
   }
   axis: AxisType[] = [...BAR_AXIS_TYPE]
@@ -267,7 +267,7 @@ export class HorizontalStackBar extends HorizontalBar {
   propertyInner = {
     ...this['propertyInner'],
     'label-selector': ['color', 'fontSize', 'hPosition', 'labelFormatter'],
-    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'tooltipFormatter']
+    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'tooltipFormatter', 'show']
   }
   protected configLabel(chart: Chart, options: BarOptions): BarOptions {
     const baseOptions = super.configLabel(chart, options)
@@ -328,7 +328,7 @@ export class HorizontalPercentageStackBar extends HorizontalStackBar {
   propertyInner = {
     ...this['propertyInner'],
     'label-selector': ['color', 'fontSize', 'hPosition', 'reserveDecimalCount'],
-    'tooltip-selector': ['color', 'fontSize']
+    'tooltip-selector': ['color', 'fontSize', 'backgroundColor', 'show']
   }
   protected configLabel(chart: Chart, options: BarOptions): BarOptions {
     const baseOptions = super.configLabel(chart, options)

core/core-frontend/src/views/chart/components/js/panel/charts/bar/progress-bar.ts

@@ -49,7 +49,7 @@ export class ProgressBar extends G2PlotChartView<BarOptions, G2Progress> {
     'background-overall-component': ['all'],
     'basic-style-selector': ['colors', 'alpha', 'gradient'],
     'label-selector': ['hPosition', 'color', 'fontSize'],
-    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'tooltipFormatter'],
+    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'tooltipFormatter', 'show'],
     'y-axis-selector': ['name', 'color', 'fontSize', 'axisForm', 'axisLabel', 'position'],
     'function-cfg': ['emptyDataStrategy']
   }

core/core-frontend/src/views/chart/components/js/panel/charts/bar/range-bar.ts

@@ -39,7 +39,14 @@ export class RangeBar extends G2PlotChartView<BarOptions, Bar> {
   propertyInner = {
     ...BAR_EDITOR_PROPERTY_INNER,
     'label-selector': ['hPosition', 'color', 'fontSize', 'labelFormatter', 'showGap'],
-    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'tooltipFormatter', 'showGap'],
+    'tooltip-selector': [
+      'fontSize',
+      'color',
+      'backgroundColor',
+      'tooltipFormatter',
+      'showGap',
+      'show'
+    ],
     'x-axis-selector': [...BAR_EDITOR_PROPERTY_INNER['x-axis-selector'], 'axisLabelFormatter']
   }
   axis: AxisType[] = [...BAR_AXIS_TYPE, 'yAxisExt']
@@ -47,7 +54,7 @@ export class RangeBar extends G2PlotChartView<BarOptions, Bar> {
     data: [],
     xField: 'values',
     yField: 'field',
-    colorFiled: 'category',
+    colorField: 'category',
     isGroup: true,
     interactions: [
       {

core/core-frontend/src/views/chart/components/js/panel/charts/bar/waterfall.ts

@@ -23,7 +23,7 @@ export class Waterfall extends G2PlotChartView<WaterfallOptions, G2Waterfall> {
     'background-overall-component': ['all'],
     'basic-style-selector': ['colors', 'alpha', 'gradient'],
     'label-selector': ['fontSize', 'color', 'vPosition', 'labelFormatter'],
-    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'seriesTooltipFormatter'],
+    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'seriesTooltipFormatter', 'show'],
     'title-selector': [
       'title',
       'fontSize',

core/core-frontend/src/views/chart/components/js/panel/charts/line/area.ts

@@ -261,7 +261,7 @@ export class StackArea extends Area {
   propertyInner = {
     ...this['propertyInner'],
     'label-selector': ['fontSize', 'color', 'labelFormatter'],
-    'tooltip-selector': ['fontSize', 'color', 'tooltipFormatter']
+    'tooltip-selector': ['fontSize', 'color', 'tooltipFormatter', 'show']
   }
   protected configLabel(chart: Chart, options: AreaOptions): AreaOptions {
     const customAttr = parseJson(chart.customAttr)

core/core-frontend/src/views/chart/components/js/panel/charts/line/common.ts

@@ -15,7 +15,7 @@ export const LINE_EDITOR_PROPERTY: EditorProperty[] = [
 export const LINE_EDITOR_PROPERTY_INNER: EditorPropertyInner = {
   'background-overall-component': ['all'],
   'label-selector': ['fontSize', 'color'],
-  'tooltip-selector': ['fontSize', 'color', 'backgroundColor'],
+  'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'show'],
   'basic-style-selector': [
     'colors',
     'alpha',

core/core-frontend/src/views/chart/components/js/panel/charts/map/common.ts

@@ -34,7 +34,7 @@ export const MAP_EDITOR_PROPERTY_INNER: EditorPropertyInner = {
     'showDimension',
     'showQuota'
   ],
-  'tooltip-selector': ['color', 'fontSize', 'backgroundColor', 'tooltipFormatter'],
+  'tooltip-selector': ['color', 'fontSize', 'backgroundColor', 'tooltipFormatter', 'show'],
   'function-cfg': ['emptyDataStrategy'],
   'map-mapping': ['']
 }

core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix-common.ts

@@ -15,7 +15,7 @@ export const CHART_MIX_EDITOR_PROPERTY: EditorProperty[] = [
 export const CHART_MIX_EDITOR_PROPERTY_INNER: EditorPropertyInner = {
   'background-overall-component': ['all'],
   'label-selector': ['fontSize', 'color'],
-  'tooltip-selector': ['fontSize', 'color', 'backgroundColor'],
+  'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'show'],
   'basic-style-selector': [
     'colors',
     'alpha',

core/core-frontend/src/views/chart/components/js/panel/charts/others/funnel.ts

@@ -24,7 +24,7 @@ export class Funnel extends G2PlotChartView<FunnelOptions, G2Funnel> {
     'background-overall-component': ['all'],
     'basic-style-selector': ['colors', 'alpha'],
     'label-selector': ['fontSize', 'color', 'hPosition', 'labelFormatter'],
-    'tooltip-selector': ['color', 'fontSize', 'backgroundColor', 'seriesTooltipFormatter'],
+    'tooltip-selector': ['color', 'fontSize', 'backgroundColor', 'seriesTooltipFormatter', 'show'],
     'title-selector': [
       'show',
       'title',

core/core-frontend/src/views/chart/components/js/panel/charts/others/quadrant.ts

@@ -30,7 +30,7 @@ export class Quadrant extends G2PlotChartView<ScatterOptions, G2Scatter> {
   propertyInner: EditorPropertyInner = {
     'basic-style-selector': ['colors', 'alpha', 'scatterSymbol', 'scatterSymbolSize'],
     'label-selector': ['fontSize', 'color'],
-    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'seriesTooltipFormatter'],
+    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'seriesTooltipFormatter', 'show'],
     'x-axis-selector': [
       'position',
       'name',

core/core-frontend/src/views/chart/components/js/panel/charts/others/radar.ts

@@ -24,7 +24,7 @@ export class Radar extends G2PlotChartView<RadarOptions, G2Radar> {
   propertyInner: EditorPropertyInner = {
     'basic-style-selector': ['colors', 'alpha', 'radarShape'],
     'label-selector': ['seriesLabelFormatter'],
-    'tooltip-selector': ['color', 'fontSize', 'backgroundColor', 'seriesTooltipFormatter'],
+    'tooltip-selector': ['color', 'fontSize', 'backgroundColor', 'seriesTooltipFormatter', 'show'],
     'misc-style-selector': ['showName', 'color', 'fontSize', 'axisColor'],
     'title-selector': [
       'show',
@@ -42,6 +42,7 @@ export class Radar extends G2PlotChartView<RadarOptions, G2Radar> {
     'legend-selector': ['icon', 'orient', 'color', 'fontSize', 'hPosition', 'vPosition']
   }
   selectorSpec: EditorSelectorSpec = {
+    ...this['selectorSpec'],
     'misc-style-selector': {
       title: `${t('chart.tooltip_axis')}`
     }

core/core-frontend/src/views/chart/components/js/panel/charts/others/sankey.ts

@@ -45,7 +45,7 @@ export class RangeBar extends G2PlotChartView<SankeyOptions, Sankey> {
   propertyInner = {
     ...SANKEY_EDITOR_PROPERTY_INNER,
     'label-selector': ['color', 'fontSize'],
-    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'tooltipFormatter']
+    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'tooltipFormatter', 'show']
   }
   axis: AxisType[] = [...SANKEY_AXIS_TYPE]
   protected baseOptions: SankeyOptions = {

core/core-frontend/src/views/chart/components/js/panel/charts/others/scatter.ts

@@ -29,7 +29,7 @@ export class Scatter extends G2PlotChartView<ScatterOptions, G2Scatter> {
   propertyInner: EditorPropertyInner = {
     'basic-style-selector': ['colors', 'alpha', 'scatterSymbol', 'scatterSymbolSize'],
     'label-selector': ['fontSize', 'color', 'labelFormatter'],
-    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'seriesTooltipFormatter'],
+    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'seriesTooltipFormatter', 'show'],
     'x-axis-selector': [
       'position',
       'name',

core/core-frontend/src/views/chart/components/js/panel/charts/others/treemap.ts

@@ -29,7 +29,7 @@ export class Treemap extends G2PlotChartView<TreemapOptions, G2Treemap> {
     'basic-style-selector': ['colors', 'alpha'],
     'label-selector': ['fontSize', 'color', 'showDimension', 'showQuota', 'showProportion'],
     'legend-selector': ['icon', 'orient', 'fontSize', 'color', 'hPosition', 'vPosition'],
-    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'seriesTooltipFormatter'],
+    'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'seriesTooltipFormatter', 'show'],
     'title-selector': [
       'title',
       'fontSize',

core/core-frontend/src/views/chart/components/js/panel/charts/others/word-cloud.ts

@@ -41,7 +41,7 @@ export class WordCloud extends G2PlotChartView<WordCloudOptions, G2WordCloud> {
       'fontShadow'
     ],
     'misc-selector': ['wordSizeRange', 'wordSpacing'],
-    'tooltip-selector': ['color', 'fontSize', 'backgroundColor', 'seriesTooltipFormatter']
+    'tooltip-selector': ['color', 'fontSize', 'backgroundColor', 'seriesTooltipFormatter', 'show']
   }
   axis: AxisType[] = ['xAxis', 'yAxis', 'filter']
   axisConfig: AxisConfig = {

core/core-frontend/src/views/chart/components/js/panel/charts/pie/common.ts

@@ -22,7 +22,7 @@ export const PIE_EDITOR_PROPERTY_INNER: EditorPropertyInner = {
     'showQuota',
     'showProportion'
   ],
-  'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'seriesTooltipFormatter'],
+  'tooltip-selector': ['fontSize', 'color', 'backgroundColor', 'seriesTooltipFormatter', 'show'],
   'basic-style-selector': ['colors', 'alpha', 'radius'],
   'title-selector': [
     'title',

core/core-frontend/src/views/chart/components/js/panel/charts/table/common.ts

@@ -4,6 +4,7 @@ export const TABLE_EDITOR_PROPERTY: EditorProperty[] = [
   'table-header-selector',
   'table-cell-selector',
   'title-selector',
+  'tooltip-selector',
   'function-cfg',
   'threshold',
   'scroll-cfg',
@@ -45,6 +46,7 @@ export const TABLE_EDITOR_PROPERTY_INNER: EditorPropertyInner = {
     'letterSpace',
     'fontShadow'
   ],
+  'tooltip-selector': ['fontSize', 'color', 'backgroundColor'],
   'function-cfg': ['emptyDataStrategy'],
   threshold: ['tableThreshold']
 }

core/core-frontend/src/views/chart/components/js/panel/charts/table/table-info.ts

@@ -5,7 +5,7 @@ import { S2ChartView, S2DrawOptions } from '../../types/impl/s2'
 import { TABLE_EDITOR_PROPERTY, TABLE_EDITOR_PROPERTY_INNER } from './common'
 import { useI18n } from '@/hooks/web/useI18n'
 import { isNumber } from 'lodash-es'
-import { copyContent } from '@/views/chart/components/js/panel/common/common_table'
+import { copyContent, SortTooltip } from '@/views/chart/components/js/panel/common/common_table'
 
 const { t } = useI18n()
 
@@ -108,7 +108,8 @@ export class TableInfo extends S2ChartView<TableSheet> {
       style: this.configStyle(chart),
       conditions: this.configConditions(chart),
       tooltip: {
-        getContainer: () => containerDom
+        getContainer: () => containerDom,
+        renderTooltip: sheet => new SortTooltip(sheet)
       }
     }
     // 开启序号之后，第一列就是序号列，修改 label 即可
@@ -135,7 +136,7 @@ export class TableInfo extends S2ChartView<TableSheet> {
       }
     }
     // tooltip
-    this.configTooltip(s2Options)
+    this.configTooltip(chart, s2Options)
     // 隐藏表头，保留顶部的分割线, 禁用表头横向 resize
     if (customAttr.tableHeader.showTableHeader === false) {
       s2Options.style.colCfg.height = 1

core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts

@@ -2,7 +2,11 @@ import { S2ChartView, S2DrawOptions } from '@/views/chart/components/js/panel/ty
 import { S2Event, S2Options, TableSheet, TableColCell, ViewMeta, TableDataCell } from '@antv/s2'
 import { parseJson } from '@/views/chart/components/js/util'
 import { formatterItem, valueFormatter } from '@/views/chart/components/js/formatter'
-import { copyContent, getCurrentField } from '@/views/chart/components/js/panel/common/common_table'
+import {
+  copyContent,
+  getCurrentField,
+  SortTooltip
+} from '@/views/chart/components/js/panel/common/common_table'
 import { TABLE_EDITOR_PROPERTY, TABLE_EDITOR_PROPERTY_INNER } from './common'
 import { useI18n } from '@/hooks/web/useI18n'
 import { isNumber } from 'lodash-es'
@@ -111,7 +115,8 @@ export class TableNormal extends S2ChartView<TableSheet> {
       style: this.configStyle(chart),
       conditions: this.configConditions(chart),
       tooltip: {
-        getContainer: () => containerDom
+        getContainer: () => containerDom,
+        renderTooltip: sheet => new SortTooltip(sheet)
       }
     }
     // 开启序号之后，第一列就是序号列，修改 label 即可
@@ -134,7 +139,7 @@ export class TableNormal extends S2ChartView<TableSheet> {
       }
     }
     // tooltip
-    this.configTooltip(s2Options)
+    this.configTooltip(chart, s2Options)
     // 隐藏表头，保留顶部的分割线, 禁用表头横向 resize
     if (customAttr.tableHeader.showTableHeader === false) {
       s2Options.style.colCfg.height = 1

core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts

@@ -1,4 +1,4 @@
-import { EXTRA_FIELD, PivotSheet, S2Event, S2Options, TOTAL_VALUE, S2Theme } from '@antv/s2'
+import { EXTRA_FIELD, PivotSheet, S2Event, S2Options, TOTAL_VALUE, S2Theme, Totals } from '@antv/s2'
 import { formatterItem, valueFormatter } from '../../../formatter'
 import { hexColorToRGBA, parseJson } from '../../../util'
 import { S2ChartView, S2DrawOptions } from '../../types/impl/s2'
@@ -20,6 +20,7 @@ export class TablePivot extends S2ChartView<PivotSheet> {
     'table-cell-selector',
     'table-total-selector',
     'title-selector',
+    'tooltip-selector',
     'function-cfg',
     'threshold',
     'linkage',
@@ -183,15 +184,20 @@ export class TablePivot extends S2ChartView<PivotSheet> {
       sortParams: sortParams
     }
     // options
-    const s2Options = {
+    const s2Options: S2Options = {
       width: containerDom.offsetWidth,
       height: containerDom.offsetHeight,
       style: this.configStyle(chart),
-      totals: tableTotal,
+      totals: tableTotal as Totals,
       conditions: this.configConditions(chart),
+      tooltip: {
+        getContainer: () => containerDom
+      },
       hierarchyType: basicStyle.tableLayoutMode ?? 'grid'
     }
 
+    // tooltip
+    this.configTooltip(chart, s2Options)
     // 开始渲染
     const s2 = new PivotSheet(containerDom, s2DataConfig, s2Options as unknown as S2Options)
     // hover

core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts

@@ -611,7 +611,7 @@ export function handleTableEmptyStrategy(chart: Chart) {
   }
   return newData
 }
-class SortTooltip extends BaseTooltip {
+export class SortTooltip extends BaseTooltip {
   show(showOptions) {
     const { iconName } = showOptions
     if (iconName) {
@@ -656,7 +656,10 @@ class SortTooltip extends BaseTooltip {
         top: `${this.position?.y}px`,
         pointerEvents: enterable ? 'all' : 'none',
         zIndex: 9999,
-        position: 'absolute'
+        position: 'absolute',
+        color: 'black',
+        background: 'white',
+        fontSize: '16px'
       },
       visible: true
     })
@@ -736,13 +739,22 @@ export function configHeaderInteraction(chart: Chart, option: S2Options) {
   ]
 }
 
-export function configTooltip(option: S2Options) {
+export function configTooltip(chart: Chart, option: S2Options) {
+  const { tooltip } = parseJson(chart.customAttr)
   option.tooltip = {
     ...option.tooltip,
+    style: {
+      background: tooltip.backgroundColor,
+      fontSize: tooltip.fontSize + 'px',
+      color: tooltip.color,
+      boxShadow: 'rgba(0, 0, 0, 0.1) 0px 4px 8px 0px',
+      borderRadius: '3px',
+      padding: '4px 12px',
+      opacity: 0.95
+    },
     adjustPosition: ({ event }) => {
       return getTooltipPosition(event)
-    },
+    }
-    renderTooltip: sheet => new SortTooltip(sheet)
   }
 }
 

core/core-frontend/src/views/chart/components/js/panel/types/impl/s2.ts

@@ -3,7 +3,7 @@ import {
   AntVDrawOptions,
   ChartLibraryType
 } from '@/views/chart/components/js/panel/types'
-import { S2Theme, SpreadSheet, Style, S2Options, Meta } from '@antv/s2'
+import { S2Theme, SpreadSheet, Style, S2Options, Meta, SERIES_NUMBER_FIELD } from '@antv/s2'
 import {
   configHeaderInteraction,
   configTooltip,
@@ -42,8 +42,8 @@ export abstract class S2ChartView<P extends SpreadSheet> extends AntVAbstractCha
     return handleTableEmptyStrategy(chart)
   }
 
-  protected configTooltip(option: S2Options) {
+  protected configTooltip(chart: Chart, option: S2Options) {
-    configTooltip(option)
+    configTooltip(chart, option)
   }
 
   protected configHeaderInteraction(chart: Chart, option: S2Options) {
@@ -62,12 +62,19 @@ export abstract class S2ChartView<P extends SpreadSheet> extends AntVAbstractCha
     switch (cell.cellType) {
       case 'dataCell':
         field = find(metaConfig, item => item.field === meta.valueField)
+        if (meta.fieldValue === 0) {
+          content = '0'
+        }
         if (meta.fieldValue) {
           content = field?.formatter?.(meta.fieldValue)
         }
         break
       case 'rowCell':
       case 'colCell':
+        if (meta.field === SERIES_NUMBER_FIELD) {
+          content = cell.getTextShape()['attrs'].text
+          break
+        }
         content = meta.label
         field = find(metaConfig, item => item.field === content)
         if (field) {

core/core-frontend/src/views/chart/components/js/panel/types/index.ts

@@ -100,6 +100,12 @@ export abstract class AntVAbstractChartView extends AbstractChartView {
   selectorSpec: EditorSelectorSpec = {
     'misc-style-selector': {
       title: `${t('chart.size')}`
+    },
+    'dual-y-axis-selector': {
+      title: `${t('chart.yAxis')}`
+    },
+    'x-axis-selector': {
+      title: `${t('chart.xAxis')}`
     }
   }
   protected constructor(library: ChartLibraryType, name: string, defaultData?: any[]) {

pom.xml

@@ -19,7 +19,7 @@
     </parent>
 
     <properties>
-        <dataease.version>2.6.1</dataease.version>
+        <dataease.version>2.7.0</dataease.version>
         <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring-cloud-alibaba.version>2023.0.1.0</spring-cloud-alibaba.version>
@@ -30,7 +30,7 @@
         <mybatis-plus.version>3.5.6</mybatis-plus.version>
         <h2.version>2.2.220</h2.version>
         <knife4j.version>4.4.0</knife4j.version>
-        <calcite-core.version>1.35.9</calcite-core.version>
+        <calcite-core.version>1.35.10</calcite-core.version>
         <commons-dbcp2.version>2.6.0</commons-dbcp2.version>
         <antlr.version>3.5.2</antlr.version>
         <java-jwt.version>3.12.1</java-jwt.version>
@@ -41,6 +41,7 @@
         <httpclient.version>4.5.14</httpclient.version>
         <httpcore.version>4.4.16</httpcore.version>
         <easyexcel.version>3.3.4</easyexcel.version>
+        <commons-io.version>2.16.1</commons-io.version>
         <flatten-maven.version>1.3.0</flatten-maven.version>
         <maven.exec.version>3.1.0</maven.exec.version>
         <guava.version>33.0.0-jre</guava.version>
@@ -50,7 +51,7 @@
         <itextpdf.version>8.0.4</itextpdf.version>
         <flexmark.version>0.62.2</flexmark.version>
         <mybatis-spring.version>3.0.3</mybatis-spring.version>
-        <commons-compress.version>1.19</commons-compress.version>
+        <commons-compress.version>1.26.2</commons-compress.version>
     </properties>
 
     <dependencyManagement>
@@ -127,6 +128,11 @@
                 <artifactId>commons-compress</artifactId>
                 <version>${commons-compress.version}</version>
             </dependency>
+            <dependency>
+                <artifactId>commons-io</artifactId>
+                <groupId>commons-io</groupId>
+                <version>${commons-io.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>easyexcel</artifactId>

sdk/api/api-sync/src/main/java/io/dataease/api/sync/datasource/api/SyncDatasourceApi.java

@@ -36,7 +36,7 @@ public interface SyncDatasourceApi {
     void save(@RequestBody SyncDatasourceDTO dataSourceDTO) throws DEException;
 
     @PostMapping("/update")
-    void update(@RequestBody SyncDatasourceDTO dataSourceDTO) throws DEException;
+    Map<String,Object> update(@RequestBody SyncDatasourceDTO dataSourceDTO) throws DEException;
 
     @PostMapping("/delete/{datasourceId}")
     void delete(@PathVariable("datasourceId") String datasourceId) throws DEException;

sdk/common/pom.xml

@@ -85,6 +85,17 @@
             <groupId>org.ehcache</groupId>
             <artifactId>ehcache</artifactId>
             <classifier>jakarta</classifier>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-io</artifactId>
+                    <groupId>commons-io</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <artifactId>commons-io</artifactId>
+            <groupId>commons-io</groupId>
         </dependency>
 
         <dependency>
@@ -105,6 +116,12 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-io</artifactId>
+                    <groupId>commons-io</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
     </dependencies>