Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

downgrade to 5.5.0 #95

Merged
merged 2 commits into from
Oct 9, 2024
Merged

downgrade to 5.5.0 #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f887b9f
downgrade to 5.5.0
LukaOber Oct 9, 2024
8b7c8d8
fixed reference to 5.5.1
LukaOber Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 17 additions & 44 deletions charming/src/asset/charts.html.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,20 @@
<!DOCTYPE html>
<html>

<head>
<meta charset="utf-8" />
<title>{{ title }}</title>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/echarts.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/echarts-gl.min.js"></script>
<style>
.container {
display: flex;
justify-content: center;
align-items: center;
}

.item {
margin: auto;
}
</style>
</head>

<body>
<div class="container">
<div class="item" id="{{ chart_id }}" style="width: {{ width }}px; height: {{ height }}px"></div>
</div>

<script type="text/javascript">
{{#if theme_source} } {{{theme_source} } } {
{
/if}}
{{#each gep_maps} }
echarts.registerMap('{{ this.name }}', {{{this.opt}}
});
{
{
/each}}
var chart = echarts.init(document.getElementById('{{ chart_id }}'), {{#if theme}} '{{ theme }}'{{else} } null{
{
/if}}, { renderer: '{{ canvas_type }}' });
var option = {{{chart_option}
}
};
chart.setOption(option);
</script>
</body>

<head>
<meta charset="utf-8" />
<title>{{ title }}</title>
<script src="https://cdnjs.cloudflare.com/ajax/libs/echarts/5.5.0/echarts.min.js"></script>
<style> .container { display: flex; justify-content: center; align-items: center; } .item { margin: auto; } </style>
</head>
<body>
<div class="container">
<div class="item" id="{{ chart_id }}" style="width: {{ width }}px; height: {{ height }}px"></div>
</div>

<script type="text/javascript">
var chart = echarts.init(document.getElementById('{{ chart_id }}'));
var option = {{{ chart_option }}};
chart.setOption(option);
</script>
</body>
</html>
45 changes: 45 additions & 0 deletions charming/src/asset/echarts-5.5.0.min.js
View file
Open in desktop

Large diffs are not rendered by default.

45 changes: 0 additions & 45 deletions charming/src/asset/echarts-5.5.1.min.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion charming/src/renderer/image_renderer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ impl ImageRenderer {
runtime
.execute_script(
"[echarts.js]",
include_str!("../asset/echarts-5.5.1.min.js").to_string(),
include_str!("../asset/echarts-5.5.0.min.js").to_string(),
)
.unwrap();

Expand Down
2 changes: 1 addition & 1 deletion examples/dioxus-web-demo/Dioxus.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ style = []

# Javascript code file
script = [
"https://cdn.jsdelivr.net/npm/[email protected].1/dist/echarts.min.js",
"https://cdn.jsdelivr.net/npm/[email protected].0/dist/echarts.min.js",
"https://cdn.jsdelivr.net/npm/[email protected]/dist/echarts-gl.min.js",
]

Expand Down
4 changes: 2 additions & 2 deletions examples/leptos-demo/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<head>
<meta charset="utf-8" />
<title>Leptos App</title>
<script src="https://cdn.jsdelivr.net/npm/[email protected].1/dist/echarts.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected].0/dist/echarts.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/echarts-gl.min.js"></script>
</head>

<body></body>

</html>
</html>
2 changes: 1 addition & 1 deletion examples/yew-demo/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<title>Yew App</title>
<script src="https://cdn.jsdelivr.net/npm/[email protected].1/dist/echarts.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected].0/dist/echarts.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/echarts-gl.min.js"></script>
</head>

Expand Down
Loading