更新

Author: yiliuyan161

chartspy/charts.py

@@ -248,7 +248,7 @@ def json_type_convert(o: object):
         return json_encoder.default(o)
 
 
-ECHARTS_JS_URL = "https://cdn.staticfile.org/echarts/5.3.2/echarts.min.js"
+ECHARTS_JS_URL = "https://cdn.staticfile.org/echarts/5.4.3/echarts.min.js"
 ECHARTS_GL_JS_URL = "https://cdn.staticfile.org/echarts-gl/2.0.8/echarts-gl.min.js"
 
 

chartspy/g2plot.py

@@ -87,6 +87,20 @@ def render_notebook(self) -> Html:
             var plot_{plot.plot_id} = new G2Plot.{plot.plot_type}("{plot.plot_id}", {plot.js_options}) 
             plot_{plot.plot_id}.render();
           }});
+        // 确保DOM加载完成后再初始化
+          if (document.readyState === 'loading') {{
+            document.addEventListener('DOMContentLoaded', function() {{
+              require(['G2Plot'], function (G2Plot) {{
+                var plot_{plot.plot_id} = new G2Plot.{plot.plot_type}("{plot.plot_id}", {plot.js_options}) 
+                plot_{plot.plot_id}.render();
+              }});
+            }});
+          }} else {{
+            require(['G2Plot'], function (G2Plot) {{
+              var plot_{plot.plot_id} = new G2Plot.{plot.plot_type}("{plot.plot_id}", {plot.js_options}) 
+              plot_{plot.plot_id}.render();
+            }});
+          }}
         </script>
         """
 
@@ -111,16 +125,25 @@ def render_jupyterlab(self) -> Html:
             // load javascript
             
             {plot.extra_js}
-            new Promise(function(resolve, reject) {{
-              var script = document.createElement("script");
-              script.onload = resolve;
-              script.onerror = reject;
-              script.src = "{plot.js_url}";
-              document.head.appendChild(script);
-            }}).then(() => {{
-              var plot_{plot.plot_id} = new G2Plot.{plot.plot_type}("{plot.plot_id}", {plot.js_options}) 
-              plot_{plot.plot_id}.render();
-            }});
+            function initChart_{plot.plot_id}() {{
+              new Promise(function(resolve, reject) {{
+                var script = document.createElement("script");
+                script.onload = resolve;
+                script.onerror = reject;
+                script.src = "{plot.js_url}";
+                document.head.appendChild(script);
+              }}).then(() => {{
+                var plot_{plot.plot_id} = new G2Plot.{plot.plot_type}("{plot.plot_id}", {plot.js_options}) 
+                plot_{plot.plot_id}.render();
+              }});
+            }}
+            
+            // 确保DOM加载完成后再初始化
+            if (document.readyState === 'loading') {{
+              document.addEventListener('DOMContentLoaded', initChart_{plot.plot_id});
+            }} else {{
+              initChart_{plot.plot_id}();
+            }}
             </script>
             """
         return Html(html)