v1.3.2 代码结构调整

Author: yiliuyan161

chartspy/base.py

@@ -138,7 +138,8 @@ def df2tree(df: pd.DataFrame = None, category_cols=[], value_col="") -> list:
     @staticmethod
     def convert_js_to_dict(js_code: str, print_dict: bool = True) -> dict:
         """
-        true、false替换，字段名单引号，函数变Js函数包裹
+        转换JavaScript Object 成 python dict
+        基础类常量替换,去除注释，字段名加单引号，函数变Js函数包裹
         :param js_code:
         :param print_dict: 是否控制台打印
         :return: dict
@@ -193,6 +194,33 @@ def rep1(match_obj):
         dict_options = eval(dict_str)
         return dict_options
 
+    @staticmethod
+    def convert_dict_to_js(options):
+        """
+        转换 python dict 成 JavaScript Object
+        先simplejson序列化,再特殊处理函数
+        :return: JavaScript 对象的字符串表示
+        """
+        json_str = simplejson.dumps(options, indent=2, default=json_type_convert, ignore_nan=True)
+        segs = []
+        function_start = 0
+        # 找到所有函数声明的起止位置,处理双引号转移，再把包裹函数的特征串删除
+        mask_length = len(FUNCTION_BOUNDARY_MARK)
+        for i in range(mask_length, len(json_str)):
+            if json_str[i - mask_length - 1:i] == '"' + FUNCTION_BOUNDARY_MARK:
+                function_start = i - mask_length
+            elif json_str[i - mask_length - 1:i] == FUNCTION_BOUNDARY_MARK + '"':
+                segs.append([function_start, i])
+        left_index = 0
+        parts = []
+        for seg in segs:
+            parts.append(json_str[left_index:seg[0]])
+            parts.append(json_str[seg[0]:(seg[1] + 1)].replace('\\"', '"'))
+            left_index = seg[1] + 1
+        parts.append(json_str[left_index:])
+        dict_str = "".join(parts)
+        return re.sub('"?' + FUNCTION_BOUNDARY_MARK + '"?', "", dict_str)
+
 
 json_encoder = simplejson.JSONEncoder()
 

chartspy/echarts.py

@@ -265,22 +265,22 @@ def print_options(self, drop_data=False):
             series_count = len(dict_options['series'])
             for i in range(0, series_count):
                 dict_options['series'][i]['data'] = []
-        Tools.convert_js_to_dict(self.convert_to_js_options(dict_options), print_dict=True)
+        Tools.convert_js_to_dict(Tools.convert_dict_to_js(dict_options), print_dict=True)
 
     def dump_options(self):
         """
          导出 js option字符串表示
         :return:
         """
-        self.js_options = self.convert_to_js_options(self.options)
+        self.js_options = Tools.convert_dict_to_js(self.options)
         return self.js_options
 
     def render_notebook(self) -> Html:
         """
         在jupyter notebook 环境输出
         :return:
         """
-        self.js_options = self.convert_to_js_options(self.options)
+        self.js_options = Tools.convert_dict_to_js(self.options)
         html = GLOBAL_ENV.from_string(JUPYTER_NOTEBOOK_TEMPLATE).render(plot=self)
         return Html(html)
 
@@ -289,7 +289,7 @@ def render_jupyterlab(self) -> Html:
         在jupyterlab 环境输出
         :return:
         """
-        self.js_options = self.convert_to_js_options(self.options)
+        self.js_options = Tools.convert_dict_to_js(self.options)
         html = GLOBAL_ENV.from_string(JUPYTER_LAB_TEMPLATE).render(plot=self)
         return Html(html)
 
@@ -299,40 +299,20 @@ def render_file(self, path: str = "plot.html") -> Html:
         :param path:
         :return: 文件路径
         """
-        self.js_options = self.convert_to_js_options(self.options)
+        self.js_options = Tools.convert_dict_to_js(self.options)
         html = GLOBAL_ENV.from_string(HTML_TEMPLATE).render(plot=self)
         with open(path, "w+", encoding="utf-8") as html_file:
             html_file.write(html)
         abs_path = os.path.abspath(path)
         return Html("<p>{path}</p>".format(path=abs_path))
-
-    @staticmethod
-    def convert_to_js_options(options):
-        json_str = simplejson.dumps(options, indent=2, default=json_type_convert, ignore_nan=True)
-        segs = []
-        function_start = 0
-        mask_length = len(FUNCTION_BOUNDARY_MARK)
-        for i in range(mask_length, len(json_str)):
-            if json_str[i - mask_length - 1:i] == '"' + FUNCTION_BOUNDARY_MARK:
-                function_start = i - mask_length
-            elif json_str[i - mask_length - 1:i] == FUNCTION_BOUNDARY_MARK + '"':
-                segs.append([function_start, i])
-        left_index = 0
-        parts = []
-        for seg in segs:
-            parts.append(json_str[left_index:seg[0]])
-            parts.append(json_str[seg[0]:(seg[1] + 1)].replace('\\"', '"'))
-            left_index = seg[1] + 1
-        parts.append(json_str[left_index:])
-        dict_str = "".join(parts)
-        return re.sub('"?' + FUNCTION_BOUNDARY_MARK + '"?', "", dict_str)
+   
 
     def render_html(self) -> str:
         """
         渲染html字符串，可以用于 streamlit
         :return:
         """
-        self.js_options = self.convert_to_js_options(self.options)
+        self.js_options = Tools.convert_dict_to_js(self.options)
         html = GLOBAL_ENV.from_string(HTML_TEMPLATE).render(plot=self)
         return html
 
@@ -341,7 +321,7 @@ def render_html_fragment(self):
         渲染html 片段，方便一个网页输出多个图表
         :return:
         """
-        self.js_options = self.convert_to_js_options(self.options)
+        self.js_options = Tools.convert_dict_to_js(self.options)
         html = GLOBAL_ENV.from_string(HTML_FRAGMENT_TEMPLATE).render(plot=self)
         return html
 
@@ -350,6 +330,6 @@ def _repr_html_(self):
         jupyter 环境，直接输出
         :return:
         """
-        self.js_options = self.convert_to_js_options(self.options)
+        self.js_options = Tools.convert_dict_to_js(self.options)
         html = GLOBAL_ENV.from_string(JUPYTER_ALL_TEMPLATE).render(plot=self)
         return Html(html).data

chartspy/g2plot.py

@@ -187,22 +187,22 @@ def print_options(self, drop_data=False):
             series_count = len(dict_options['series'])
             for i in range(0, series_count):
                 dict_options['series'][i]['data'] = []
-        Tools.convert_js_to_dict(self.convert_to_js_options(dict_options), print_dict=True)
+        Tools.convert_js_to_dict(Tools.convert_dict_to_js(dict_options), print_dict=True)
 
     def dump_options(self):
         """
          导出 js option字符串表示
         :return:
         """
-        self.js_options = self.convert_to_js_options(self.options)
+        self.js_options = Tools.convert_dict_to_js(self.options)
         return self.js_options
 
     def render_notebook(self) -> Html:
         """
         在jupyter notebook 环境输出
         :return:
         """
-        self.js_options = self.convert_to_js_options(self.options)
+        self.js_options = Tools.convert_dict_to_js(self.options)
         html = GLOBAL_ENV.from_string(JUPYTER_NOTEBOOK_TEMPLATE).render(plot=self)
         return Html(html)
 
@@ -211,7 +211,7 @@ def render_jupyterlab(self) -> Html:
         在jupyterlab 环境输出
         :return:
         """
-        self.js_options = self.convert_to_js_options(self.options)
+        self.js_options = Tools.convert_dict_to_js(self.options)
         html = GLOBAL_ENV.from_string(JUPYTER_LAB_TEMPLATE).render(plot=self)
         return Html(html)
 
@@ -221,7 +221,7 @@ def render_file(self, path: str = "plot.html") -> Html:
         :param path:
         :return: 文件路径
         """
-        self.js_options = self.convert_to_js_options(self.options)
+        self.js_options = Tools.convert_dict_to_js(self.options)
         html = GLOBAL_ENV.from_string(HTML_TEMPLATE).render(plot=self)
         with open(path, "w+", encoding="utf-8") as html_file:
             html_file.write(html)
@@ -254,7 +254,7 @@ def render_html(self) -> str:
         渲染html字符串，可以用于 streamlit
         :return:
         """
-        self.js_options = self.convert_to_js_options(self.options)
+        self.js_options = Tools.convert_dict_to_js(self.options)
         html = GLOBAL_ENV.from_string(HTML_TEMPLATE).render(plot=self)
         return html
 
@@ -263,7 +263,7 @@ def render_html_fragment(self):
         渲染html 片段，方便一个网页输出多个图表
         :return:
         """
-        self.js_options = self.convert_to_js_options(self.options)
+        self.js_options = Tools.convert_dict_to_js(self.options)
         html = GLOBAL_ENV.from_string(HTML_FRAGMENT_TEMPLATE).render(plot=self)
         return html
 
@@ -272,6 +272,6 @@ def _repr_html_(self):
         jupyter 环境，直接输出
         :return:
         """
-        self.js_options = self.convert_to_js_options(self.options)
+        self.js_options = Tools.convert_dict_to_js(self.options)
         html = GLOBAL_ENV.from_string(JUPYTER_ALL_TEMPLATE).render(plot=self)
         return Html(html).data

setup.py

@@ -23,7 +23,7 @@ def get_install_requires():
 
 setup(
     name="chartspy",
-    version="1.3.1",
+    version="1.3.2",
     url="https://chartspy.icopy.site/",
     description="echarts&g2plot python wrapper",
     keywords='echarts g2plot python ',