diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/g2/line/line.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/g2/line/line.ts index 1770228ad6..19ed935ebd 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/g2/line/line.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/g2/line/line.ts @@ -391,15 +391,7 @@ export class Line extends G2ChartView { gridStrokeOpacity: 1, gridLineWidth: yAxis.splitLine.lineStyle.width, gridLineDash, - transform: yAxis.axisLabel.rotate - ? [ - { - type: 'rotate', - optionalAngles: [yAxis.axisLabel.rotate], - recoverWhenFailed: false - } - ] - : [], + labelTransform: `rotate(${yAxis.axisLabel.rotate || 0})`, labelFormatter: d => { return valueFormatter(d, yAxis.axisLabelFormatter) } diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/TableHeader.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/TableHeader.java index 33c2aced25..2812082fa2 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/TableHeader.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/TableHeader.java @@ -24,6 +24,8 @@ public class TableHeader { public class ColumnInfo { @Getter private String field; + @Getter + private String title; private List children = new ArrayList<>(); private Integer width; }