Skip to content

Commit abcf81c

Browse files
authored
Merge pull request #261 from AAChartModel/dev
Dev
2 parents 961b4ac + 2863fc0 commit abcf81c

File tree

25 files changed

+515
-1047
lines changed

25 files changed

+515
-1047
lines changed
Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,34 @@
11
<html>
2-
<head>
3-
<meta charset="UTF-8"/>
4-
<meta content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=3.0,user-scalable = no"
5-
name="viewport">
6-
<title>AAChartKit-Swift</title>
2+
<head>
3+
<meta charset="UTF-8"/>
4+
<meta content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=3.0,user-scalable = no"
5+
name="viewport">
6+
<title>AAChartCore-Kotlin</title>
77

8-
<script src="AAChartView.js" ></script>
9-
<script src="AAHighcharts.js"></script>
10-
<script src="AAHighcharts-More.js"></script>
11-
<script src="AAFunnel.js"></script>
12-
<script src="AAEasing.js"></script>
13-
<script src="AARounded-Corners.js"></script>
8+
<script src="AAChartView.js" ></script>
9+
<script src="AAHighcharts.js"></script>
10+
<script src="AAHighcharts-More.js"></script>
11+
<script src="AAFunnel.js"></script>
12+
<script src="AAEasing.js"></script>
13+
<script src="AARounded-Corners.js"></script>
1414

15-
<!--<script src = "https://img.hcharts.cn/highcharts/themes/dark-unica.js">-->
16-
<!--</script>-->
15+
<!-- <script src="https://code.highcharts.com/highcharts.js"></script>-->
16+
<!-- <script src="https://code.highcharts.com/highcharts-more.js"></script>-->
17+
<!-- <script src="https://code.highcharts.com/modules/funnel.js"></script>-->
1718

18-
<!--&lt;!&ndash;若介意本地js代码体积(250KB左右)过大,可换用加载网络js代码 &ndash;&gt;-->
19-
<!--<script src="https://img.hcharts.cn/highcharts/highcharts.js">-->
20-
<!--</script>-->
21-
<!--<script src="https://img.hcharts.cn/highcharts/highcharts-more.js">-->
22-
<!--</script>-->
19+
<style>
20+
* {-webkit-user-select: none;
21+
user-select: none;
22+
}
2323

24-
<style>
25-
*{
26-
-webkit-user-select: none;
27-
user-select: none;
28-
}
29-
</style>
30-
</head>
31-
<body style="margin:0px 0px 0px 0px;">
32-
<div id="container" style="width:100%; height: 100%;"></div>
33-
</div>
34-
</body>
35-
</html>
24+
#container {
25+
height: 100%;
26+
width: 100%;
27+
position: absolute;
28+
}
29+
</style>
30+
</head>
31+
<body style="margin:0px 0px 0px 0px;">
32+
<div id="container"></div>
33+
</body>
34+
</html>

charts/src/main/assets/AAChartView.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ function loadTheHighChartView (sender,receivedWidth, receivedHeight) {
77
&& value.indexOf('function') != -1) {
88
return eval(value)
99
}
10+
11+
//判断 key 如果是 lineColor , 并且 value 为 "AANull", 则将其转换为 null
12+
if (key === 'lineColor' && value === 'AANull') {
13+
return null;
14+
}
1015
return value;
1116
});
1217

charts/src/main/assets/AAFunnel.js

Lines changed: 11 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)