|
@@ -1,4 +1,4 @@
|
|
|
-
|
|
|
+import json
|
|
|
|
|
|
def check_grid_upright(model_list, grid_data_dict):
|
|
|
grid_data_dict = dict(grid_data_dict)
|
|
@@ -42,8 +42,14 @@ def insert_group(group, model_id, calc_dict):
|
|
|
for single_group in group:
|
|
|
conflict = False
|
|
|
base_data = calc_dict.get(model_id)
|
|
|
+ if isinstance(base_data, str):
|
|
|
+ base_data = json.loads(base_data)
|
|
|
+ calc_dict[model_id] = base_data
|
|
|
for compare_model_id in single_group:
|
|
|
compare_data = calc_dict.get(compare_model_id)
|
|
|
+ if isinstance(compare_data, str):
|
|
|
+ compare_data = json.loads(compare_data)
|
|
|
+ calc_dict[compare_model_id] = compare_data
|
|
|
if has_conflict(base_data, compare_data):
|
|
|
conflict = True
|
|
|
break
|