gitee
/
django-vue-admin
mirror of https://gitee.com/liqianglog/django-vue-admin
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor(import): 批量更新模板优化

dev
Angelo 2023-09-30 02:15:59 +08:00
parent 58831b2480
commit 9a811c4fcb
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/dvadmin/utils/filters.py
View File

@ -425,9 +425,9 @@ def next_layer_data(qs_filter, qs_node):
parent_ids.add(node.parent.id) parent_ids.add(node.parent.id)
break break
node = node.parent node = node.parent
# print(f"过滤查询集 ==> {qs_filter}", flush=True) # print(f"过滤查询集 ==> {qs_filter}", flush=True)
# print(f"待渲染节点的id ==> {parent_nodes=}", flush=True) # print(f"待渲染节点的id ==> {parent_nodes=}", flush=True)
# print(f"过滤查询集的父节点id ==> {parent_ids=}", flush=True) # print(f"过滤查询集的父节点id ==> {parent_ids=}", flush=True)
return parent_ids return parent_ids

22
backend/dvadmin/utils/import_export_mixin.py
View File

@ -184,7 +184,7 @@ class ImportSerializerMixin:
value = items[1] value = items[1]
if isinstance(value, dict): if isinstance(value, dict):
header_data.append(value.get("title")) header_data.append(value.get("title"))
hidden_header.append(value.get('display')) hidden_header.append(value.get('display') or key)
choices = value.get("choices", {}) choices = value.get("choices", {})
if choices.get("data"): if choices.get("data"):
data_list = [] data_list = []
@ -213,7 +213,7 @@ class ImportSerializerMixin:
ws1[f"{get_column_letter(index + 1)}{inx + 2}"] = ele ws1[f"{get_column_letter(index + 1)}{inx + 2}"] = ele
#-------- #--------
df_len_max = [self.get_string_len(ele) for ele in header_data] df_len_max = [self.get_string_len(ele) for ele in header_data]
row = get_column_letter(len(hidden_header) + 1) row = get_column_letter(len(hidden_header))
column = 1 column = 1
ws.append(header_data) ws.append(header_data)
for index, results in enumerate(data): for index, results in enumerate(data):
@ -221,6 +221,24 @@ class ImportSerializerMixin:
for h_index, h_item in enumerate(hidden_header): for h_index, h_item in enumerate(hidden_header):
for key, val in results.items(): for key, val in results.items():
if key == h_item: if key == h_item:
select_field = self.import_field_dict.get(key) if key in self.import_field_dict.keys() else None
choices = (
select_field.get("choices", {}) if select_field and isinstance(select_field, dict) else {}
)
if choices.get("data"):
for k, v in choices.get("data").items():
if v == val:
val = k
elif choices.get("queryset") and choices.get("values_name"):
data_list = choices.get("queryset").values(choices.get("values_name"), "id")
join_vals = []
for ele in data_list:
if ele.get("id") == val or (isinstance(val, list) and ele.get("id") in val):
join_vals.append(ele.get(choices.get("values_name")))
val = ",".join(join_vals)
if val is None or val == "": if val is None or val == "":
results_list.append("") results_list.append("")
elif isinstance(val,list): elif isinstance(val,list):