From f77035cc76e02bce40a8a424e55d5cc680970db4 Mon Sep 17 00:00:00 2001
From: JohnYan <84345999@qq.com>
Date: Sun, 24 Jan 2021 22:26:37 +0800
Subject: [PATCH] v3.9.8.21

---
 README.md                  | 18 ++++++++++++++++--
 templates/echart/base.html |  4 ++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 4b49947..dcf9950 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@
 也可以直接下载[WINDOWS64位安装版](https://npm.taobao.org/mirrors/python/3.9.0/python-3.9.0-amd64.exe "WINDOWS64位安装版")
 [MAC电脑安装版](http://npm.taobao.org/mirrors/python/3.9.0/python-3.9.0rc2-macosx10.9.pkg "MAC电脑安装版")
 - [Window平台安装视屏介绍](https://www.ixigua.com/6910413586208653837?id=6901867671193649668 "Window平台安装视屏介绍")
-**注意: Windows安装Python时需选中"Add to Path", 否则无法用命令直接启动; 安装路径不要带空格**
+**注意: Windows安装Python时需选中"Add to Path"**
 
 #### 安装SmartChart
 ```shell script
@@ -121,12 +121,26 @@ mysmart.set(1,dataset,embed=1,height=200,editor='')
 dataset.append([35,44,67]) #追加数据
  #随意命名数据集, 不一定需要smartchart中数据集已有的
 mysmart.set('DD', dataset)
+mysmart.set('barxxx', dataset)  #显示柱形数, 另外还有linexxx, piexxx
 
-#你也可以全局初始化设定
+####### dateset也可以直接是pandas的df ########
+import pandas as pd
+# 从数据集1中获取数据直接转成pandas df
+df = pddf(1)
+# 读取excel数据
+df = pd.read_excel('manual_smartdemo.xlsx', 'sheet1')
+#sample = df.sample(10)
+#mysmart.set('df0', sample)
+df1 = df.groupby('province').agg({'qty':'sum'}).reset_index()
+mysmart.set('pie', df1)
+
+####### 你也可以全局初始化设定 #######
 mychart = Smart(width=xx, height=xx, embed=1, editor='')
 # width, height指定图形嵌入显示的宽高
 # embed 默认不嵌入, embed=1 嵌入, embed='' 不嵌入
 # editor 是否显示图形菜单
+# push 是否持久化数据集  push=1, 无则新建有则保存数据
+
 
 ```
 -------------------------------------------------------------------------------
diff --git a/templates/echart/base.html b/templates/echart/base.html
index 4940976..4a85286 100644
--- a/templates/echart/base.html
+++ b/templates/echart/base.html
@@ -29,13 +29,13 @@ font-size:10px;
 {% block body %}{% endblock %}
 </html><script src="/static/js/jquery-2.2.3.min.js"></script><script type="text/javascript" src="/static/echart/dist/echarts.min.js"></script><script src="/static/echart/dist/china.js"></script><script src="/static/js/fun.js"></script><script src="/static/echart/theme/{{theme}}"></script><script type="text/javascript" src="/static/bootstrap/js/bootstrap.min.js"></script>
 {{footer|safe}}{% block javascript %}{% endblock %}
-<script>{% if dv %}var vapp = new Vue({el: '#vue_app', data: {d0:0,d1:0,d2:0,d3:0,d4:0,d5:0,d6:0,d7:0,d8:0,d9:0,d10:0,d11:0,d12:0,d13:0,d14:0,d15:0,d16:0}});{% endif %}var app = {};var charts = [];{{echart_main|safe}}window.onresize = function(){for(var i = 0; i < charts.length; i++){charts[i].resize();}};
+<script>{% if dv %}var vapp = new Vue({el: '#vue_app', data: {d0:'',d1:'',d2:'',d3:'',d4:'',d5:'',d6:'',d7:'',d8:'',d9:'',d10:'',d11:'',d12:'',d13:'',d14:'',d15:'',d16:''}});{% endif %}var app = {};var charts = [];{{echart_main|safe}}window.onresize = function(){for(var i = 0; i < charts.length; i++){charts[i].resize();}};
 $(function(){
     $("#fullScreen").on("click",function(){
       var isFull=!!(document.webkitIsFullScreen || document.mozFullScreen ||
         document.msFullscreenElement || document.fullscreenElement
     );
-    if (isFull==false) {fullScreen();
+    if (isFull===false) {fullScreen();
     }else{exitFullscreen();}
     })
 })