release 1.01 修复chart图的一些bug
This commit is contained in:
+64
-62
@@ -1,6 +1,7 @@
|
||||
///Create by Tinysoft.
|
||||
///自动生成 TSDocxFile 帮助文件
|
||||
mtic;SetProfiler(7);
|
||||
mtic;
|
||||
//SetProfiler(7);
|
||||
docx := new TSDocxFile();
|
||||
[err, errmsg] := docx.NewFile();
|
||||
if err then
|
||||
@@ -63,11 +64,11 @@ _Faq(docx);
|
||||
///目录
|
||||
docx.AddTableContent(paragraphTitle, 1, 3);
|
||||
|
||||
v := docx.SaveAs('', 'D:/temp/help.docx');
|
||||
println('Test Over!\n Save {}: {},time={}', file, v, mtoc);
|
||||
v := docx.SaveAs('', 'TSDocFile-Help.docx');
|
||||
println('Test Over!\n Save {}: {},time={}秒', file, v, mtoc);
|
||||
|
||||
info := GetProfilerInfo(true);
|
||||
exportfile(ftstream(),'','f:\\temp\\ProfilerInfo.stm',info);
|
||||
//info := GetProfilerInfo(true);
|
||||
//exportfile(ftstream(),'','f:\\temp\\ProfilerInfo.stm',info);
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////
|
||||
///子函数
|
||||
@@ -695,6 +696,7 @@ Begin
|
||||
docx.AddChart(chart, -1);
|
||||
|
||||
_AddTitle(docx, '案例二：广东省2019——2021年GDP（折线图）', 2);
|
||||
chart.Name := 'GD-GDP-2';
|
||||
chart.Type := 'line';
|
||||
chart.ShowBubbleSize := false;
|
||||
chart.ShowPercent := false;
|
||||
@@ -707,6 +709,7 @@ Begin
|
||||
docx.AddChart(chart, -1);
|
||||
|
||||
_AddTitle(docx, '案例三：广东省2021年GDP（饼状图）', 2);
|
||||
chart.Name := 'GD-GDP-3';
|
||||
chart.Title := '广东省2021年GDP(单位：亿元)';
|
||||
chart.Type := 'pie';
|
||||
chart.ShowCatName := true;
|
||||
@@ -714,67 +717,66 @@ Begin
|
||||
chart.AddSeries('广东省', names, (tmpData[2])[1:]);
|
||||
docx.AddChart(chart, -1);
|
||||
|
||||
charts := array(("Type":"area","图表类型":"面积图"),
|
||||
("Type":"areastacked","图表类型":""),
|
||||
("Type":"areapercentstacked","图表类型":""),
|
||||
("Type":"area3d","图表类型":""),
|
||||
("Type":"area3dstacked","图表类型":""),
|
||||
("Type":"area3dpercentstacked","图表类型":""),
|
||||
("Type":"bar","图表类型":""),
|
||||
("Type":"barstacked","图表类型":""),
|
||||
("Type":"barpercentstacked","图表类型":""),
|
||||
("Type":"bar3dclustered","图表类型":""),
|
||||
("Type":"bar3dstacked","图表类型":""),
|
||||
("Type":"bar3dpercentstacked","图表类型":""),
|
||||
("Type":"bar3dconeclustered","图表类型":""),
|
||||
("Type":"bar3dconestacked","图表类型":""),
|
||||
("Type":"bar3dconepercentstacked","图表类型":""),
|
||||
("Type":"bar3dpyramidclustered","图表类型":""),
|
||||
("Type":"bar3dpyramidstacked","图表类型":""),
|
||||
("Type":"bar3dpyramidpercentstacked","图表类型":""),
|
||||
("Type":"bar3dcylinderclustered","图表类型":""),
|
||||
("Type":"bar3dcylinderstacked","图表类型":""),
|
||||
("Type":"bar3dcylinderpercentstacked","图表类型":""),
|
||||
("Type":"col","图表类型":""),
|
||||
("Type":"colstacked","图表类型":""),
|
||||
("Type":"colpercentstacked","图表类型":""),
|
||||
("Type":"col3d","图表类型":""),
|
||||
("Type":"col3dclustered","图表类型":""),
|
||||
("Type":"col3dstacked","图表类型":""),
|
||||
("Type":"col3dpercentstacked","图表类型":""),
|
||||
("Type":"col3dcone","图表类型":""),
|
||||
("Type":"col3dconeclustered","图表类型":""),
|
||||
("Type":"col3dconestacked","图表类型":""),
|
||||
("Type":"col3dconepercentstacked","图表类型":""),
|
||||
("Type":"col3dpyramid","图表类型":""),
|
||||
("Type":"col3dpyramidclustered","图表类型":""),
|
||||
("Type":"col3dpyramidstacked","图表类型":""),
|
||||
("Type":"col3dpyramidpercentstacked","图表类型":""),
|
||||
("Type":"col3dcylinder","图表类型":""),
|
||||
("Type":"col3dcylinderclustered","图表类型":""),
|
||||
("Type":"col3dcylinderstacked","图表类型":""),
|
||||
("Type":"col3dcylinderpercentstacked","图表类型":""),
|
||||
("Type":"bubble","图表类型":""),
|
||||
("Type":"bubble3d","图表类型":""),
|
||||
("Type":"doughnut","图表类型":""),
|
||||
("Type":"line","图表类型":""),
|
||||
("Type":"pie3d","图表类型":""),
|
||||
("Type":"pie","图表类型":""),
|
||||
("Type":"pieofpiechart","图表类型":""),
|
||||
("Type":"barofpiechart","图表类型":""),
|
||||
("Type":"radar","图表类型":""),
|
||||
("Type":"scatter","图表类型":""),
|
||||
("Type":"surface3d","图表类型":""),
|
||||
("Type":"wireframesurface3d","图表类型":""),
|
||||
("Type":"contour","图表类型":""),
|
||||
("Type":"wireframecontour","图表类型":""));
|
||||
charts := array(("Type":"area","图表类型":"标准二维面积图"),
|
||||
("Type":"areastacked","图表类型":"二维堆积面积图"),
|
||||
("Type":"areapercentstacked","图表类型":"二维百分比堆积面积图"),
|
||||
("Type":"area3d","图表类型":"标准三维面积图"),
|
||||
("Type":"area3dstacked","图表类型":"三维堆积面积图"),
|
||||
("Type":"area3dpercentstacked","图表类型":"三维百分比堆积面积图"),
|
||||
("Type":"bar","图表类型":"二维簇状条形图"),
|
||||
("Type":"barstacked","图表类型":"二维堆积条形图"),
|
||||
("Type":"barpercentstacked","图表类型":"二维百分比堆积条形图"),
|
||||
("Type":"bar3dclustered","图表类型":"三维簇状条形图"),
|
||||
("Type":"bar3dstacked","图表类型":"三维堆积条形图"),
|
||||
("Type":"bar3dpercentstacked","图表类型":"三维百分比堆积条形图"),
|
||||
("Type":"bar3dconeclustered","图表类型":"三维簇状水平圆锥图"),
|
||||
("Type":"bar3dconestacked","图表类型":"三维堆积水平圆锥图"),
|
||||
("Type":"bar3dconepercentstacked","图表类型":"三维堆积百分比水平圆锥图"),
|
||||
("Type":"bar3dpyramidclustered","图表类型":"三维簇状水平棱锥图"),
|
||||
("Type":"bar3dpyramidstacked","图表类型":"三维堆积水平棱锥图"),
|
||||
("Type":"bar3dpyramidpercentstacked","图表类型":"三维堆积百分比水平棱锥图"),
|
||||
("Type":"bar3dcylinderclustered","图表类型":"三维簇状水平圆柱图"),
|
||||
("Type":"bar3dcylinderstacked","图表类型":"三维堆积水平圆柱图"),
|
||||
("Type":"bar3dcylinderpercentstacked","图表类型":"三维堆积百分比水平圆柱图"),
|
||||
("Type":"col","图表类型":"二维簇状柱形图"),
|
||||
("Type":"colstacked","图表类型":"二维堆积柱形图"),
|
||||
("Type":"colpercentstacked","图表类型":"二维百分比堆积柱形图"),
|
||||
("Type":"col3d","图表类型":"三维簇状柱形图"),
|
||||
("Type":"col3dclustered","图表类型":"三维柱形图"),
|
||||
("Type":"col3dstacked","图表类型":"三维堆积柱形图"),
|
||||
("Type":"col3dpercentstacked","图表类型":"三维百分比堆积柱形图"),
|
||||
("Type":"col3dcone","图表类型":"三维圆锥图"),
|
||||
("Type":"col3dconeclustered","图表类型":"三维簇状圆锥图"),
|
||||
("Type":"col3dconestacked","图表类型":"三维堆积圆锥图"),
|
||||
("Type":"col3dconepercentstacked","图表类型":"三维百分比堆积圆锥图"),
|
||||
("Type":"col3dpyramid","图表类型":"三维棱锥图"),
|
||||
("Type":"col3dpyramidclustered","图表类型":"三维簇状棱锥图"),
|
||||
("Type":"col3dpyramidstacked","图表类型":"三维堆积棱锥图"),
|
||||
("Type":"col3dpyramidpercentstacked","图表类型":"三维百分比堆积棱锥图"),
|
||||
("Type":"col3dcylinder","图表类型":"三维圆柱图"),
|
||||
("Type":"col3dcylinderclustered","图表类型":"三维簇状圆柱图"),
|
||||
("Type":"col3dcylinderstacked","图表类型":"三维堆积圆柱图"),
|
||||
("Type":"col3dcylinderpercentstacked","图表类型":"三维百分比堆积圆柱图"),
|
||||
("Type":"bubble","图表类型":"气泡图"),
|
||||
("Type":"bubble3d","图表类型":"3D气泡图"),
|
||||
("Type":"doughnut","图表类型":"圆环图"),
|
||||
("Type":"line","图表类型":"折线图"),
|
||||
("Type":"pie3d","图表类型":"三维饼图"),
|
||||
("Type":"pie","图表类型":"饼图"),
|
||||
("Type":"radar","图表类型":"雷达图"),
|
||||
("Type":"scatter","图表类型":"散点图"),
|
||||
("Type":"surface3d","图表类型":"三维曲面图"),
|
||||
("Type":"wireframesurface3d","图表类型":"三维曲面图（框架图）"),
|
||||
("Type":"contour","图表类型":"曲面图"),
|
||||
("Type":"wireframecontour","图表类型":"曲面图（俯视框架图）"));
|
||||
_AddTitle(docx, '系统支持的图表类型', 2);
|
||||
tbl := docx.CreateTable(charts);
|
||||
tbl := docx.CreateTable(charts, true, true);
|
||||
tbl.Format.Indent := 500;
|
||||
tbl.format.IndentType := 'dxa';
|
||||
//设置列宽
|
||||
tbl.ColumnWidth(1, 2000);
|
||||
tbl.ColumnWidth(2, 12000);
|
||||
tbl.ColumnWidth(2, 6000);
|
||||
tbl.ColumnWidth(3, 8000);
|
||||
tbl := docx.InsertTable(tbl, -1);
|
||||
|
||||
println(' >>OK\n');
|
||||
@@ -973,12 +975,12 @@ Begin
|
||||
if istable(sysparams[f]) then Begin
|
||||
return sysParams[f, className];
|
||||
End;
|
||||
sysparams[f] := array();
|
||||
[err,fh] := io_open(f);
|
||||
if err then return array();
|
||||
[err, data] := io_read(fh);
|
||||
io_close(fh);
|
||||
if err then return array();
|
||||
sysparams[f] := array();
|
||||
|
||||
comment := '';
|
||||
cName := '';
|
||||
|
||||
Reference in New Issue
Block a user