修复解析的json中存在空数组时导致的数组越界问题，此时生成的代码将用List<dynamic>方式处理；优化当数组中的元素为基本数据类型时生成的代码

Author: debuggerx01

formater.py

@@ -133,18 +133,25 @@ def update_list(json_str):
 
     ui.tv_fields.setRowCount(len(res))
 
+    pre_type_combobox = None
+    ii = 0
     for i in range(len(res)):
         line = res[i]
         assert isinstance(line, str)
         index = line.find('<')
-
-        ui.tv_fields.setCellWidget(i, 1, get_type_combobox(line))
+        temp_type_combobox = get_type_combobox(line)
+        ui.tv_fields.setCellWidget(ii, 1, temp_type_combobox)
+        if temp_type_combobox.count() > 1 and pre_type_combobox is not None and pre_type_combobox.currentText().startswith('List'):
+            ui.tv_fields.setRowCount(ui.tv_fields.rowCount() - 1)
+            pre_type_combobox = temp_type_combobox
+            continue
+        pre_type_combobox = temp_type_combobox
         if line.strip() == '<[dict]>8':
             label = QtWidgets.QLabel("")
             label.setStyleSheet("background-color: rgb(200,200,200);")
-            ui.tv_fields.setCellWidget(i, 2, label)
+            ui.tv_fields.setCellWidget(ii, 2, label)
         else:
-            ui.tv_fields.setCellWidget(i, 2, get_name_text_edit(line))
+            ui.tv_fields.setCellWidget(ii, 2, get_name_text_edit(line))
 
         if index == 0:
             field = line.replace('<', '').replace('>', '')
@@ -155,7 +162,8 @@ def update_list(json_str):
         label.setText(field[0:60] + '...' if len(field) > 60 else field[0:-1])
         label.setToolTip(field[0:-1])
 
-        ui.tv_fields.setCellWidget(i, 0, label)
+        ui.tv_fields.setCellWidget(ii, 0, label)
+        ii += 1
 
     ui.tv_fields.resizeColumnToContents(0)
 
@@ -184,6 +192,7 @@ def generate_bean():
 
         bean.append([var_field, var_type, var_name])
 
+    check_and_generate_code(bean)
     try:
         res = check_and_generate_code(bean)
     except IndexError as e:

tools.py

@@ -15,10 +15,12 @@
 # 验证json字符串是否合法
 def is_json(myjson):
     try:
-        json.loads(myjson)
+        j = json.loads(myjson)
     except ValueError:
         return False
-    return True
+    if type(j) in (list, dict):
+        return True
+    return False
 
 
 # 传入未格式化的单行json字符串，返回指定缩进的多行json字符串
@@ -75,7 +77,10 @@ def build_list_construction(f, t, n):
         code = list_code_loop(code, i, total, n, class_type)
 
     # 嵌套模板的后续处理
-    code = code.replace('%s%s' % (n, 'Child' * total), 'new %s(%s%s)' % (class_type, n, ('Item' * total)))
+    if check_level_type(class_type) not in (1, 2) and class_type != '':
+        code = code.replace('%s%s' % (n, 'Child' * total), 'new %s(%s%s)' % (class_type, n, ('Item' * total)))
+    else:
+        code = code.replace('%s' % ('Child' * total), '%s' % ('Item' * total))
     code = code[code.find(';') + 1:]
     code = code.replace('%s){' % n, 'jsonRes[\'%s\']){' % n).replace('${loop}', '')
 
@@ -140,10 +145,10 @@ def build_level_code(level_bean):
                     child_bean.append(level_bean.pop(0))
                 build_level_code(child_bean)
             # 数据类型为数组时
-            if check_level_type(t) == 3:
+            if check_level_type(t) == 3 and len(level_bean) > 0:
                 generic_type = level_bean[0][2].replace('List<', '').replace('>', '')
                 # 如果List的里层数据为dict则对其去壳后处理
-                if check_level_type(generic_type) == 4:
+                if check_level_type(generic_type) == 4 and generic_type != '':
                     while check_level_type(level_bean[0][2]) == 3:
                         work_level = level_bean[0][0]
                         level_bean.pop(0)
@@ -183,6 +188,8 @@ def generate_code(work_bean):
     if is_list_top:
         res = res.replace('jsonRes[\'list\']', 'jsonRes', 1)
 
+    # 如果json中存在空list这种操蛋情况，将list类型从list<>修改成list<dynamic>
+    res = res.replace('List<>', 'List<dynamic>')
     # 最终修改，添加jsonStr解析为jsonRes代码
     bp = res.find('(jsonRes) {')
     return 'import \'dart:convert\' show json;\n' + res[:bp] + '(jsonStr) {\n  var jsonRes = json.decode(jsonStr);\n' + res[bp + 11:]