Merge branch 'yuankunzhang:main' into main

yuankunzhang · Oct 10, 2024 · c6a4111 · c6a4111
2 parents 4e08023 + 371ac0e
commit c6a4111
Show file tree

Hide file tree

Showing 11 changed files with 88 additions and 82 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,3 @@
 [workspace]
 resolver = "2"
-members = [
-  "charming",
-  "gallery",
-]
+members = ["charming", "gallery"]
diff --git a/charming/src/asset/charts.html.hbs b/charming/src/asset/charts.html.hbs
@@ -3,8 +3,7 @@
   <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>
+    <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>
@@ -13,13 +12,9 @@
       </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 chart = echarts.init(document.getElementById('{{ chart_id }}'));
           var option = {{{ chart_option }}};
           chart.setOption(option);
       </script>
   </body>
-</html>
+</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.0.min.js b/charming/src/asset/echarts-5.5.0.min.js
diff --git a/charming/src/component/angle_axis.rs b/charming/src/component/angle_axis.rs
@@ -24,6 +24,9 @@ pub struct AngleAxis {
     #[serde(skip_serializing_if = "Option::is_none")]
     start_angle: Option<f64>,
 
+    #[serde(skip_serializing_if = "Option::is_none")]
+    end_angle: Option<f64>,
+
     /// Whether the direction of axis is clockwise, default to true.
     #[serde(skip_serializing_if = "Option::is_none")]
     clockwise: Option<bool>,
@@ -112,6 +115,7 @@ impl AngleAxis {
             id: None,
             polar_index: None,
             start_angle: None,
+            end_angle: None,
             clockwise: None,
             type_: None,
             zlevel: None,
@@ -158,6 +162,11 @@ impl AngleAxis {
         self
     }
 
+    pub fn end_angle<F: Into<f64>>(mut self, end_angle: F) -> Self {
+        self.end_angle = Some(end_angle.into());
+        self
+    }
+
     pub fn clockwise(mut self, clockwise: bool) -> Self {
         self.clockwise = Some(clockwise);
         self

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.0.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.0/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>
-</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>
+
+</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/Cargo.toml b/gallery/Cargo.toml
@@ -22,4 +22,4 @@ path = "src/gallery.rs"
 
 [[bin]]
 name = "generate_images"
-path = "src/images.rs"
+path = "src/images.rs"
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>