稍微修改模板代码位置;修正顶层结构为List时解析的错误取值

Author: debuggerx01

formater.py

@@ -7,9 +7,9 @@
 
 from mainwindow import *
 
-# 定义显示的json格式化字符串的缩进量为4个空格
 from tools import *
 
+# 定义显示的json格式化字符串的缩进量为4个空格
 indent = '    '
 
 # 临时存储
@@ -211,7 +211,7 @@ def init_view():
     init_table()
 
 
-def customUI():
+def custom_ui():
     init_view()
     init_event()
 
@@ -224,6 +224,6 @@ def customUI():
     ui = Ui_MainWindow()
     ui.setupUi(widget)
     # 在生成代码的基础上再修改UI以及添加逻辑
-    customUI()
+    custom_ui()
     widget.show()
     sys.exit(app.exec_())

template_code.py

@@ -23,6 +23,26 @@ class ${type} {
 
 """
 
+template_list = r"""   
+${list_count}${class_type}${>count} ${name}${current_child} = [];
+for (var ${name}${current_items} in ${name}${parent_items}){
+    ${loop}
+    ${name}${current_child}.add(${name}${child_child});
+}
+"""
+
 
 def get_top_code_dict(t):
     return template_dict.replace('${type}', t)
+
+
+def get_list_code_loop(list_count, ct, ab_count, n, current_child, child_child, current_items, parent_items):
+    return template_list \
+        .replace('${list_count}', list_count) \
+        .replace('${class_type}', ct) \
+        .replace('${>count}', ab_count) \
+        .replace('${name}', n) \
+        .replace('${current_child}', current_child) \
+        .replace('${child_child}', child_child) \
+        .replace('${current_items}', current_items) \
+        .replace('${parent_items}', parent_items)

tools.py

@@ -8,7 +8,7 @@
 from PyQt5.QtWidgets import QLabel, QComboBox, QMessageBox
 
 # 验证json字符串是否合法
-from template_code import get_top_code_dict
+from template_code import get_top_code_dict, get_list_code_loop
 
 msg_box_ui = None
 
@@ -44,14 +44,6 @@ def check_level_type(t):
 
 
 def list_code_loop(code, count, total, n, ct):
-    template = r"""   
-${list_count}${class_type}${>count} ${name}${current_child} = [];
-for (var ${name}${current_items} in ${name}${parent_items}){
-    ${loop}
-    ${name}${current_child}.add(${name}${child_child});
-}
-"""
-
     list_count = 'List<' * (total - count)
     ab_count = '>' * (total - count)
 
@@ -61,15 +53,7 @@ def list_code_loop(code, count, total, n, ct):
     current_items = 'Item' * (count + 1)
     parent_items = 'Item' * count
 
-    fragment = template \
-        .replace('${list_count}', list_count) \
-        .replace('${class_type}', ct) \
-        .replace('${>count}', ab_count) \
-        .replace('${name}', n) \
-        .replace('${current_child}', current_child) \
-        .replace('${child_child}', child_child) \
-        .replace('${current_items}', current_items) \
-        .replace('${parent_items}', parent_items)
+    fragment = get_list_code_loop(list_count, ct, ab_count, n, current_child, child_child, current_items, parent_items)
 
     if code == '':
         return fragment
@@ -175,12 +159,15 @@ def build_level_code(level_bean):
 
 
 def generate_code(work_bean):
-    # 如果顶级容器为list而不是dict，则先在外面包一层dict，并将list的别名传递为dict的类型，list则重命名为'list'，
+    is_list_top = False
+
+    # 如果顶级容器为list而不是dict，则先在外面包一层dict，并将list的别名传递为dict的类型，list则重命名为'list'，并修改标志位供后面修改使用
     (l, f, t, n) = work_bean[0]
     if t.startswith('List<'):
         work_bean[0][3] = 'list'
         work_bean[0][1] = 'json_list'
         work_bean.insert(0, (-2, "", n, ""))
+        is_list_top = True
 
     build_level_code(work_bean)
 
@@ -192,13 +179,15 @@ def generate_code(work_bean):
 
     codes.clear()
 
-    # 最终修改，添加jsonStr解析为jsonRes代码
+    # 如果顶级容器为list,需要修改第一次获取JSON对象的方式为直接获取
+    if is_list_top:
+        res = res.replace('jsonRes[\'list\']', 'jsonRes', 1)
 
+    # 最终修改，添加jsonStr解析为jsonRes代码
     bp = res.find('(jsonRes) {')
     return 'import \'dart:convert\';\n' + res[:bp] + '(jsonStr) {\n  var jsonRes = JSON.decode(jsonStr);\n' + res[bp + 11:]
 
 
-
 def check_and_generate_code(bean):
     work_bean = []
     global msg_box_ui