Merge branch 'fix/deleteUrl/06-24' into 'main_dev'

fix: 修复之前删除图片，点击新增时，没有上传图片也会调用删除图片接口，导致新增数据终止

See merge request yunteng/thingskit-front!1388

@@ -11,8 +11,8 @@ export const upload = (file) => {
 };
 };
 
 
 export const deleteFilePath = (deleteFilePath?: string) => {
 export const deleteFilePath = (deleteFilePath?: string) => {
-  let deleteParams: string | null = null;
-  if (deleteFilePath) deleteParams = `?deleteFilePath=${deleteFilePath}`;
+  if (!deleteFilePath) return;
+  const deleteParams = `?deleteFilePath=${deleteFilePath}`;
   return defHttp.delete({
   return defHttp.delete({
     url: `${Api.BaseDeleteUrl}${deleteParams}`,
     url: `${Api.BaseDeleteUrl}${deleteParams}`,
   });
   });

@@ -163,7 +163,7 @@
             delete values.id;
             delete values.id;
           }
           }
 
 
-          if (Reflect.has(values, 'deleteUrl')) {
+          if (Reflect.has(values, 'deleteUrl') && values.deleteUrl) {
             await deleteFilePath(values?.deleteUrl);
             await deleteFilePath(values?.deleteUrl);
             Reflect.deleteProperty(values, 'deleteUrl');
             Reflect.deleteProperty(values, 'deleteUrl');
           }
           }

@@ -265,7 +265,7 @@
           }
           }
           setDrawerProps({ confirmLoading: true });
           setDrawerProps({ confirmLoading: true });
 
 
-          if (Reflect.has(values, 'deleteUrl')) {
+          if (Reflect.has(values, 'deleteUrl') && values.deleteUrl) {
             await deleteFilePath(values?.deleteUrl);
             await deleteFilePath(values?.deleteUrl);
             Reflect.deleteProperty(values, 'deleteUrl');
             Reflect.deleteProperty(values, 'deleteUrl');
           }
           }

@@ -92,7 +92,7 @@
             const file = (values.thumbnail || []).at(0) || {};
             const file = (values.thumbnail || []).at(0) || {};
             values.thumbnail = file.url || null;
             values.thumbnail = file.url || null;
           }
           }
-          if (Reflect.has(values, 'deleteUrl')) {
+          if (Reflect.has(values, 'deleteUrl') && values.deleteUrl) {
             await deleteFilePath(values?.deleteUrl);
             await deleteFilePath(values?.deleteUrl);
             Reflect.deleteProperty(values, 'deleteUrl');
             Reflect.deleteProperty(values, 'deleteUrl');
           }
           }

@@ -68,7 +68,7 @@
             const file = (values.thumbnail || []).at(0) || {};
             const file = (values.thumbnail || []).at(0) || {};
             values.thumbnail = file.url || null;
             values.thumbnail = file.url || null;
           }
           }
-          if (Reflect.has(values, 'deleteUrl')) {
+          if (Reflect.has(values, 'deleteUrl') && values.deleteUrl) {
             await deleteFilePath(values?.deleteUrl);
             await deleteFilePath(values?.deleteUrl);
             Reflect.deleteProperty(values, 'deleteUrl');
             Reflect.deleteProperty(values, 'deleteUrl');
           }
           }

@@ -189,7 +189,7 @@
     await getDeviceConfFormData();
     await getDeviceConfFormData();
     await getTransConfData();
     await getTransConfData();
     const isEmptyObj = isEmpty(transportConfData.profileData.transportConfiguration);
     const isEmptyObj = isEmpty(transportConfData.profileData.transportConfiguration);
-    if (Reflect.has(postSubmitFormData.deviceConfData, 'deleteUrl')) {
+    if (Reflect.has(postSubmitFormData.deviceConfData, 'deleteUrl') && values.deleteUrl.deleteUrl) {
       await deleteFilePath(postSubmitFormData.deviceConfData?.deleteUrl);
       await deleteFilePath(postSubmitFormData.deviceConfData?.deleteUrl);
       Reflect.deleteProperty(postSubmitFormData.deviceConfData, 'deleteUrl');
       Reflect.deleteProperty(postSubmitFormData.deviceConfData, 'deleteUrl');
     }
     }

@@ -217,11 +217,11 @@
           const rotation = homeSwiper.join(',');
           const rotation = homeSwiper.join(',');
 
 
           compState.value.loading = true;
           compState.value.loading = true;
-          if (Reflect.has(fieldValue, 'deleteLogoUrl')) {
+          if (Reflect.has(fieldValue, 'deleteLogoUrl') && fieldValue.deleteLogoUrl) {
             await deleteFilePath(fieldValue?.deleteLogoUrl);
             await deleteFilePath(fieldValue?.deleteLogoUrl);
             Reflect.deleteProperty(fieldValue, 'deleteLogoUrl');
             Reflect.deleteProperty(fieldValue, 'deleteLogoUrl');
           }
           }
-          if (Reflect.has(fieldValue, 'deleteBackgroundUrl')) {
+          if (Reflect.has(fieldValue, 'deleteBackgroundUrl') && fieldValue.deleteBackgroundUrl) {
             await deleteFilePath(fieldValue?.deleteBackgroundUrl);
             await deleteFilePath(fieldValue?.deleteBackgroundUrl);
             Reflect.deleteProperty(fieldValue, 'deleteBackgroundUrl');
             Reflect.deleteProperty(fieldValue, 'deleteBackgroundUrl');
           }
           }

@@ -182,15 +182,15 @@
             fieldValue.background = file.url || null;
             fieldValue.background = file.url || null;
           }
           }
           compState.value.loading = true;
           compState.value.loading = true;
-          if (Reflect.has(fieldValue, 'deleteLogoUrl')) {
+          if (Reflect.has(fieldValue, 'deleteLogoUrl') && fieldValue.deleteLogoUrl) {
             await deleteFilePath(fieldValue?.deleteLogoUrl);
             await deleteFilePath(fieldValue?.deleteLogoUrl);
             Reflect.deleteProperty(fieldValue, 'deleteLogoUrl');
             Reflect.deleteProperty(fieldValue, 'deleteLogoUrl');
           }
           }
-          if (Reflect.has(fieldValue, 'deleteIconUrl')) {
+          if (Reflect.has(fieldValue, 'deleteIconUrl') && fieldValue.deleteIconUrl) {
             await deleteFilePath(fieldValue?.deleteIconUrl);
             await deleteFilePath(fieldValue?.deleteIconUrl);
             Reflect.deleteProperty(fieldValue, 'deleteIconUrl');
             Reflect.deleteProperty(fieldValue, 'deleteIconUrl');
           }
           }
-          if (Reflect.has(fieldValue, 'deleteBackgroundUrl')) {
+          if (Reflect.has(fieldValue, 'deleteBackgroundUrl') && fieldValue.deleteBackgroundUrl) {
             await deleteFilePath(fieldValue?.deleteBackgroundUrl);
             await deleteFilePath(fieldValue?.deleteBackgroundUrl);
             Reflect.deleteProperty(fieldValue, 'deleteBackgroundUrl');
             Reflect.deleteProperty(fieldValue, 'deleteBackgroundUrl');
           }
           }

@@ -162,7 +162,7 @@
           const values = await validate(validateArray);
           const values = await validate(validateArray);
           if (!values) return;
           if (!values) return;
           compState.value.loading = true;
           compState.value.loading = true;
-          if (Reflect.has(newFieldValue, 'deleteUrl')) {
+          if (Reflect.has(newFieldValue, 'deleteUrl') && newFieldValue.deleteUrl) {
             await deleteFilePath(newFieldValue?.deleteUrl);
             await deleteFilePath(newFieldValue?.deleteUrl);
             Reflect.deleteProperty(newFieldValue, 'deleteUrl');
             Reflect.deleteProperty(newFieldValue, 'deleteUrl');
           }
           }

@@ -103,7 +103,7 @@
               entityType: 'TENANT_PROFILE',
               entityType: 'TENANT_PROFILE',
             },
             },
           };
           };
-          if (Reflect.has(values, 'deleteUrl')) {
+          if (Reflect.has(values, 'deleteUrl') && values.deleteUrl) {
             await deleteFilePath(values?.deleteUrl);
             await deleteFilePath(values?.deleteUrl);
             Reflect.deleteProperty(values, 'deleteUrl');
             Reflect.deleteProperty(values, 'deleteUrl');
           }
           }