github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

[Update] 修改parsers，处理dict字段值；解决remote-app csv导入时异常

pull/4104/head
Bai 2020-06-15 16:34:51 +08:00
parent 583d295fd1
commit f26f7ca1e7
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/common/drf/parsers/csv.py
View File

@ -58,6 +58,12 @@ class JMSCSVParser(BaseParser):
col = col.replace("“", '"').replace("”", '"').\ col = col.replace("“", '"').replace("”", '"').\
replace("‘", '"').replace('’', '"').replace("'", '"') replace("‘", '"').replace('’', '"').replace("'", '"')
col = json.loads(col) col = json.loads(col)
# 字典转换
if isinstance(col, str) and col.find("{") != -1 and col.find("}") != -1:
# 替换中文格式引号
col = col.replace("“", '"').replace("”", '"'). \
replace("‘", '"').replace('’', '"').replace("'", '"')
col = json.loads(col)
_row.append(col) _row.append(col)
return _row return _row
@ -68,7 +74,7 @@ class JMSCSVParser(BaseParser):
""" """
_row_data = {} _row_data = {}
for k, v in row_data.items(): for k, v in row_data.items():
if isinstance(v, list) \ if isinstance(v, list) or isinstance(v, dict)\
or isinstance(v, str) and k.strip() and v.strip(): or isinstance(v, str) and k.strip() and v.strip():
_row_data[k] = v _row_data[k] = v
return _row_data return _row_data