Commit 9f0a9231af7b6d8875a134a38e130226a0cda7d1
1 parent
d6d5b9a6
fix: 修复之前删除图片,点击新增时,没有上传图片也会调用删除图片接口,导致新增数据终止
Showing
10 changed files
with
14 additions
and
14 deletions
@@ -11,8 +11,8 @@ export const upload = (file) => { | @@ -11,8 +11,8 @@ export const upload = (file) => { | ||
11 | }; | 11 | }; |
12 | 12 | ||
13 | export const deleteFilePath = (deleteFilePath?: string) => { | 13 | export const deleteFilePath = (deleteFilePath?: string) => { |
14 | - let deleteParams: string | null = null; | ||
15 | - if (deleteFilePath) deleteParams = `?deleteFilePath=${deleteFilePath}`; | 14 | + if (!deleteFilePath) return; |
15 | + const deleteParams = `?deleteFilePath=${deleteFilePath}`; | ||
16 | return defHttp.delete({ | 16 | return defHttp.delete({ |
17 | url: `${Api.BaseDeleteUrl}${deleteParams}`, | 17 | url: `${Api.BaseDeleteUrl}${deleteParams}`, |
18 | }); | 18 | }); |
@@ -163,7 +163,7 @@ | @@ -163,7 +163,7 @@ | ||
163 | delete values.id; | 163 | delete values.id; |
164 | } | 164 | } |
165 | 165 | ||
166 | - if (Reflect.has(values, 'deleteUrl')) { | 166 | + if (Reflect.has(values, 'deleteUrl') && values.deleteUrl) { |
167 | await deleteFilePath(values?.deleteUrl); | 167 | await deleteFilePath(values?.deleteUrl); |
168 | Reflect.deleteProperty(values, 'deleteUrl'); | 168 | Reflect.deleteProperty(values, 'deleteUrl'); |
169 | } | 169 | } |
@@ -265,7 +265,7 @@ | @@ -265,7 +265,7 @@ | ||
265 | } | 265 | } |
266 | setDrawerProps({ confirmLoading: true }); | 266 | setDrawerProps({ confirmLoading: true }); |
267 | 267 | ||
268 | - if (Reflect.has(values, 'deleteUrl')) { | 268 | + if (Reflect.has(values, 'deleteUrl') && values.deleteUrl) { |
269 | await deleteFilePath(values?.deleteUrl); | 269 | await deleteFilePath(values?.deleteUrl); |
270 | Reflect.deleteProperty(values, 'deleteUrl'); | 270 | Reflect.deleteProperty(values, 'deleteUrl'); |
271 | } | 271 | } |
@@ -92,7 +92,7 @@ | @@ -92,7 +92,7 @@ | ||
92 | const file = (values.thumbnail || []).at(0) || {}; | 92 | const file = (values.thumbnail || []).at(0) || {}; |
93 | values.thumbnail = file.url || null; | 93 | values.thumbnail = file.url || null; |
94 | } | 94 | } |
95 | - if (Reflect.has(values, 'deleteUrl')) { | 95 | + if (Reflect.has(values, 'deleteUrl') && values.deleteUrl) { |
96 | await deleteFilePath(values?.deleteUrl); | 96 | await deleteFilePath(values?.deleteUrl); |
97 | Reflect.deleteProperty(values, 'deleteUrl'); | 97 | Reflect.deleteProperty(values, 'deleteUrl'); |
98 | } | 98 | } |
@@ -68,7 +68,7 @@ | @@ -68,7 +68,7 @@ | ||
68 | const file = (values.thumbnail || []).at(0) || {}; | 68 | const file = (values.thumbnail || []).at(0) || {}; |
69 | values.thumbnail = file.url || null; | 69 | values.thumbnail = file.url || null; |
70 | } | 70 | } |
71 | - if (Reflect.has(values, 'deleteUrl')) { | 71 | + if (Reflect.has(values, 'deleteUrl') && values.deleteUrl) { |
72 | await deleteFilePath(values?.deleteUrl); | 72 | await deleteFilePath(values?.deleteUrl); |
73 | Reflect.deleteProperty(values, 'deleteUrl'); | 73 | Reflect.deleteProperty(values, 'deleteUrl'); |
74 | } | 74 | } |
@@ -189,7 +189,7 @@ | @@ -189,7 +189,7 @@ | ||
189 | await getDeviceConfFormData(); | 189 | await getDeviceConfFormData(); |
190 | await getTransConfData(); | 190 | await getTransConfData(); |
191 | const isEmptyObj = isEmpty(transportConfData.profileData.transportConfiguration); | 191 | const isEmptyObj = isEmpty(transportConfData.profileData.transportConfiguration); |
192 | - if (Reflect.has(postSubmitFormData.deviceConfData, 'deleteUrl')) { | 192 | + if (Reflect.has(postSubmitFormData.deviceConfData, 'deleteUrl') && values.deleteUrl.deleteUrl) { |
193 | await deleteFilePath(postSubmitFormData.deviceConfData?.deleteUrl); | 193 | await deleteFilePath(postSubmitFormData.deviceConfData?.deleteUrl); |
194 | Reflect.deleteProperty(postSubmitFormData.deviceConfData, 'deleteUrl'); | 194 | Reflect.deleteProperty(postSubmitFormData.deviceConfData, 'deleteUrl'); |
195 | } | 195 | } |
@@ -217,11 +217,11 @@ | @@ -217,11 +217,11 @@ | ||
217 | const rotation = homeSwiper.join(','); | 217 | const rotation = homeSwiper.join(','); |
218 | 218 | ||
219 | compState.value.loading = true; | 219 | compState.value.loading = true; |
220 | - if (Reflect.has(fieldValue, 'deleteLogoUrl')) { | 220 | + if (Reflect.has(fieldValue, 'deleteLogoUrl') && fieldValue.deleteLogoUrl) { |
221 | await deleteFilePath(fieldValue?.deleteLogoUrl); | 221 | await deleteFilePath(fieldValue?.deleteLogoUrl); |
222 | Reflect.deleteProperty(fieldValue, 'deleteLogoUrl'); | 222 | Reflect.deleteProperty(fieldValue, 'deleteLogoUrl'); |
223 | } | 223 | } |
224 | - if (Reflect.has(fieldValue, 'deleteBackgroundUrl')) { | 224 | + if (Reflect.has(fieldValue, 'deleteBackgroundUrl') && fieldValue.deleteBackgroundUrl) { |
225 | await deleteFilePath(fieldValue?.deleteBackgroundUrl); | 225 | await deleteFilePath(fieldValue?.deleteBackgroundUrl); |
226 | Reflect.deleteProperty(fieldValue, 'deleteBackgroundUrl'); | 226 | Reflect.deleteProperty(fieldValue, 'deleteBackgroundUrl'); |
227 | } | 227 | } |
@@ -182,15 +182,15 @@ | @@ -182,15 +182,15 @@ | ||
182 | fieldValue.background = file.url || null; | 182 | fieldValue.background = file.url || null; |
183 | } | 183 | } |
184 | compState.value.loading = true; | 184 | compState.value.loading = true; |
185 | - if (Reflect.has(fieldValue, 'deleteLogoUrl')) { | 185 | + if (Reflect.has(fieldValue, 'deleteLogoUrl') && fieldValue.deleteLogoUrl) { |
186 | await deleteFilePath(fieldValue?.deleteLogoUrl); | 186 | await deleteFilePath(fieldValue?.deleteLogoUrl); |
187 | Reflect.deleteProperty(fieldValue, 'deleteLogoUrl'); | 187 | Reflect.deleteProperty(fieldValue, 'deleteLogoUrl'); |
188 | } | 188 | } |
189 | - if (Reflect.has(fieldValue, 'deleteIconUrl')) { | 189 | + if (Reflect.has(fieldValue, 'deleteIconUrl') && fieldValue.deleteIconUrl) { |
190 | await deleteFilePath(fieldValue?.deleteIconUrl); | 190 | await deleteFilePath(fieldValue?.deleteIconUrl); |
191 | Reflect.deleteProperty(fieldValue, 'deleteIconUrl'); | 191 | Reflect.deleteProperty(fieldValue, 'deleteIconUrl'); |
192 | } | 192 | } |
193 | - if (Reflect.has(fieldValue, 'deleteBackgroundUrl')) { | 193 | + if (Reflect.has(fieldValue, 'deleteBackgroundUrl') && fieldValue.deleteBackgroundUrl) { |
194 | await deleteFilePath(fieldValue?.deleteBackgroundUrl); | 194 | await deleteFilePath(fieldValue?.deleteBackgroundUrl); |
195 | Reflect.deleteProperty(fieldValue, 'deleteBackgroundUrl'); | 195 | Reflect.deleteProperty(fieldValue, 'deleteBackgroundUrl'); |
196 | } | 196 | } |
@@ -162,7 +162,7 @@ | @@ -162,7 +162,7 @@ | ||
162 | const values = await validate(validateArray); | 162 | const values = await validate(validateArray); |
163 | if (!values) return; | 163 | if (!values) return; |
164 | compState.value.loading = true; | 164 | compState.value.loading = true; |
165 | - if (Reflect.has(newFieldValue, 'deleteUrl')) { | 165 | + if (Reflect.has(newFieldValue, 'deleteUrl') && newFieldValue.deleteUrl) { |
166 | await deleteFilePath(newFieldValue?.deleteUrl); | 166 | await deleteFilePath(newFieldValue?.deleteUrl); |
167 | Reflect.deleteProperty(newFieldValue, 'deleteUrl'); | 167 | Reflect.deleteProperty(newFieldValue, 'deleteUrl'); |
168 | } | 168 | } |
@@ -103,7 +103,7 @@ | @@ -103,7 +103,7 @@ | ||
103 | entityType: 'TENANT_PROFILE', | 103 | entityType: 'TENANT_PROFILE', |
104 | }, | 104 | }, |
105 | }; | 105 | }; |
106 | - if (Reflect.has(values, 'deleteUrl')) { | 106 | + if (Reflect.has(values, 'deleteUrl') && values.deleteUrl) { |
107 | await deleteFilePath(values?.deleteUrl); | 107 | await deleteFilePath(values?.deleteUrl); |
108 | Reflect.deleteProperty(values, 'deleteUrl'); | 108 | Reflect.deleteProperty(values, 'deleteUrl'); |
109 | } | 109 | } |