Ver código fonte

修复极坐标图表保存后无法打开的BUG

master
youseries 6 anos atrás
pai
commit
b56d442d73
  1. 2
      ureport2-console/src/main/resources/ureport-asserts/js/designer.bundle.js
  2. 2
      ureport2-core/src/main/java/com/bstek/ureport/parser/impl/value/ChartValueParser.java
  3. 2
      ureport2-js/src/panel/PropertyPanel.js
  4. 2
      ureport2-js/src/tools/ChartTool.js
  5. 2
      ureport2-js/src/widget/ChartWidget.js

2
ureport2-console/src/main/resources/ureport-asserts/js/designer.bundle.js

File diff suppressed because one or more lines are too long

2
ureport2-core/src/main/java/com/bstek/ureport/parser/impl/value/ChartValueParser.java

@ -181,7 +181,7 @@ public class ChartValueParser extends ValueParser {
}else if(type.equals("pie")){
PieDataset ds=new PieDataset();
dataset=ds;
}else if(type.equals("polar")){
}else if(type.equals("polarArea")){
PolarDataset ds=new PolarDataset();
dataset=ds;
}else if(type.equals("radar")){

2
ureport2-js/src/panel/PropertyPanel.js

@ -52,7 +52,7 @@ export default class PropertyPanel{
this.chartEditorMap.set('horizontalBar',new HorizontalBarChartValueEditor(this.panel,this.context));
this.chartEditorMap.set('area',new AreaChartValueEditor(this.panel,this.context));
this.chartEditorMap.set('radar',new RadarChartValueEditor(this.panel,this.context));
this.chartEditorMap.set('polar',new PolarChartValueEditor(this.panel,this.context));
this.chartEditorMap.set('polarArea',new PolarChartValueEditor(this.panel,this.context));
this.chartEditorMap.set('scatter',new ScatterChartValueEditor(this.panel,this.context));
this.chartEditorMap.set('bubble',new BubbleChartValueEditor(this.panel,this.context));
this.chartEditorMap.set('doughnut',new DoughnutChartValueEditor(this.panel,this.context));

2
ureport2-js/src/tools/ChartTool.js

@ -88,7 +88,7 @@ export default class ChartTool extends Tool{
</li>`);
ul.append(polar);
polar.click(function(){
_this._doClick('polar');
_this._doClick('polarArea');
});
const scatter=$(`<li>
<a href="###">

2
ureport2-js/src/widget/ChartWidget.js

@ -220,7 +220,7 @@ export default class ChartWidget{
}]
};
break;
case 'polar':
case 'polarArea':
chartType='polarArea';
data={
labels: ["类型1", "类型2", "类型3", "类型4"],

Carregando…
Cancelar
Salvar