update to echarts version 5.5.1

yuankunzhang · Oct 8, 2024 · 438fbd4 · 438fbd4
1 parent 8def462
commit 438fbd4
Show file tree

Hide file tree

Showing 8 changed files with 118 additions and 91 deletions.
diff --git a/charming/src/asset/charts.html.hbs b/charming/src/asset/charts.html.hbs
@@ -1,25 +1,47 @@
 <!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>
-</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>
+
+</html>
diff --git a/charming/src/asset/echarts-5.4.2.min.js b/charming/src/asset/echarts-5.4.2.min.js
diff --git a/charming/src/asset/echarts-5.5.1.min.js b/charming/src/asset/echarts-5.5.1.min.js
diff --git a/charming/src/renderer/image_renderer.rs b/charming/src/renderer/image_renderer.rs
@@ -46,7 +46,7 @@ impl ImageRenderer {
         runtime
             .execute_script(
                 "[echarts.js]",
-                include_str!("../asset/echarts-5.4.2.min.js").to_string(),
+                include_str!("../asset/echarts-5.5.1.min.js").to_string(),
             )
             .unwrap();
 

diff --git a/examples/dioxus-web-demo/Dioxus.toml b/examples/dioxus-web-demo/Dioxus.toml
@@ -34,8 +34,8 @@ style = []
 
 # Javascript code file
 script = [
-    "https://cdn.jsdelivr.net/npm/echarts@5.4.3/dist/echarts.min.js",
-    "https://cdn.jsdelivr.net/npm/[email protected]/dist/echarts-gl.min.js"
+  "https://cdn.jsdelivr.net/npm/echarts@5.5.1/dist/echarts.min.js",
+  "https://cdn.jsdelivr.net/npm/[email protected]/dist/echarts-gl.min.js",
 ]
 
 [web.resource.dev]

diff --git a/examples/leptos-demo/index.html b/examples/leptos-demo/index.html
@@ -1,10 +1,13 @@
 <!DOCTYPE html>
 <html>
-    <head>
-        <meta charset="utf-8" />
-        <title>Leptos App</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>
-    </head>
-    <body></body>
+
+<head>
+  <meta charset="utf-8" />
+  <title>Leptos App</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>
+</head>
+
+<body></body>
+
 </html>
diff --git a/examples/yew-demo/index.html b/examples/yew-demo/index.html
@@ -1,9 +1,11 @@
 <!DOCTYPE html>
 <html>
-    <head>
-        <meta charset="utf-8" />
-        <title>Yew App</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>
-    </head>
+
+<head>
+  <meta charset="utf-8" />
+  <title>Yew App</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>
+</head>
+
 </html>
diff --git a/gallery/templates/index.html b/gallery/templates/index.html
@@ -1,10 +1,10 @@
 <div>
-    {% for (type, charts) in collections %}
-    <h2>{{ type|capitalize }} Charts</h2>
-    <ul>
-        {% for chart in charts %}
-        <li><a href="/{{ type }}/{{ chart }}">{{ chart }}</a></li>
-        {% endfor %}
-    </ul>
+  {% for (type, charts) in collections %}
+  <h2>{{ type|capitalize }} Charts</h2>
+  <ul>
+    {% for chart in charts %}
+    <li><a href="/{{ type }}/{{ chart }}">{{ chart }}</a></li>
     {% endfor %}
+  </ul>
+  {% endfor %}
 </div>