功能变化: 导入导出优化
parent
cdb07c5c23
commit
131e73377c
|
@ -65,9 +65,7 @@ class ImportSerializerMixin:
|
||||||
for ele in data:
|
for ele in data:
|
||||||
# 获取 unique 字段
|
# 获取 unique 字段
|
||||||
filter_dic = {i: ele.get(i) for i in list(set(self.import_field_dict.keys()) & set(unique_list))}
|
filter_dic = {i: ele.get(i) for i in list(set(self.import_field_dict.keys()) & set(unique_list))}
|
||||||
print(11, ele)
|
|
||||||
instance = filter_dic and queryset.filter(**filter_dic).first()
|
instance = filter_dic and queryset.filter(**filter_dic).first()
|
||||||
print(22, instance)
|
|
||||||
if instance and not updateSupport:
|
if instance and not updateSupport:
|
||||||
continue
|
continue
|
||||||
if not filter_dic:
|
if not filter_dic:
|
||||||
|
|
|
@ -4,7 +4,7 @@ chardet==4.0.0
|
||||||
coreapi==2.3.3
|
coreapi==2.3.3
|
||||||
coreschema==0.0.4
|
coreschema==0.0.4
|
||||||
Django==3.2.3
|
Django==3.2.3
|
||||||
django-comment-migrate==0.1.1
|
django-comment-migrate==0.1.5
|
||||||
django-cors-headers==3.10.1
|
django-cors-headers==3.10.1
|
||||||
django-filter==21.1
|
django-filter==21.1
|
||||||
django-ranged-response==0.2.0
|
django-ranged-response==0.2.0
|
||||||
|
|
|
@ -42,7 +42,7 @@ export function getErrorMessage (msg) {
|
||||||
function createService () {
|
function createService () {
|
||||||
// 创建一个 axios 实例
|
// 创建一个 axios 实例
|
||||||
const service = axios.create({
|
const service = axios.create({
|
||||||
baseURL: process.env.VUE_APP_API_URL,
|
baseURL: util.baseURL(),
|
||||||
timeout: 20000,
|
timeout: 20000,
|
||||||
paramsSerializer: (params) => qs.stringify(params, { indices: false })
|
paramsSerializer: (params) => qs.stringify(params, { indices: false })
|
||||||
})
|
})
|
||||||
|
|
|
@ -78,7 +78,7 @@ export default {
|
||||||
/** 下载模板操作 */
|
/** 下载模板操作 */
|
||||||
importTemplate () {
|
importTemplate () {
|
||||||
downloadFile({
|
downloadFile({
|
||||||
url: process.env.VUE_APP_API + this.importApi,
|
url: util.baseURL() + this.importApi,
|
||||||
params: {},
|
params: {},
|
||||||
method: 'get'
|
method: 'get'
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue