fix: 图片删除时先调用接口

@@ -3,8 +3,15 @@ import { FileUploadResponse } from '/@/api/oss/FileUploadResponse';
 
 enum Api {
   BaseUploadUrl = '/oss/upload',
+  BaseDeleteUrl = '/oss',
 }
 
 export const upload = (file) => {
   return defHttp.post<FileUploadResponse>({ url: Api.BaseUploadUrl, params: file });
 };
+
+export const deleteFilePath = (deleteFilePath?: string) => {
+  return defHttp.delete({
+    url: `${Api.BaseDeleteUrl}?deleteFilePath=${deleteFilePath}`,
+  });
+};

@@ -21,7 +21,7 @@
   }
 
   const { prefixCls } = useDesign('api-upload');
-  const emit = defineEmits(['update:fileList', 'preview', 'download']);
+  const emit = defineEmits(['update:fileList', 'preview', 'download', 'delete']);
 
   const { createMessage } = useMessage();
 
@@ -129,6 +129,7 @@
     const index = _fileList.findIndex((item) => item.uid === file.uid);
     ~index && _fileList.splice(index, 1);
     emit('update:fileList', _fileList);
+    emit('delete', file.url);
   };
 
   const handlePreview = (file: FileItem) => {

@@ -51,6 +51,7 @@
   import { useDrawer } from '/@/components/Drawer';
   import { FileItem } from '/@/components/Form/src/components/ApiUpload.vue';
   import { buildUUID } from '/@/utils/uuid';
+  import { deleteFilePath } from '/@/api/oss/ossFileUploader';
 
   export default defineComponent({
     name: 'ContactDrawer',
@@ -161,6 +162,11 @@
           } else {
             delete values.id;
           }
+
+          if (Reflect.has(values, 'deleteUrl')) {
+            await deleteFilePath(values?.deleteUrl);
+            Reflect.deleteProperty(values, 'deleteUrl');
+          }
           let saveMessage = '添加成功';
           let updateMessage = '修改成功';
 

@@ -192,7 +192,7 @@ export const formSchema: QFormSchema[] = [
     component: 'ApiUpload',
     changeEvent: 'update:fileList',
     valueField: 'fileList',
-    componentProps: () => {
+    componentProps: ({ formModel }) => {
       return {
         listType: 'picture-card',
         maxFileLimit: 1,
@@ -214,10 +214,19 @@ export const formSchema: QFormSchema[] = [
         onPreview: (fileList: FileItem) => {
           createImgPreview({ imageList: [fileList.url!] });
         },
+        onDelete(url: string) {
+          formModel.deleteUrl = url!;
+        },
       };
     },
   },
   {
+    field: 'deleteUrl',
+    label: '',
+    component: 'Input',
+    show: false,
+  },
+  {
     field: 'name',
     label: '视频名字',
     required: true,

@@ -52,6 +52,7 @@
   import { createPickerSearch } from '/@/utils/pickerSearch';
   import type { queryPageParams } from '/@/api/configuration/center/model/configurationCenterModal';
   import { getDeviceProfile } from '/@/api/alarm/position';
+  import { deleteFilePath } from '/@/api/oss/ossFileUploader';
 
   export default defineComponent({
     name: 'ConfigurationDrawer',
@@ -263,6 +264,11 @@
             values.thumbnail = file.url || null;
           }
           setDrawerProps({ confirmLoading: true });
+
+          if (Reflect.has(values, 'deleteUrl')) {
+            await deleteFilePath(values?.deleteUrl);
+            Reflect.deleteProperty(values, 'deleteUrl');
+          }
           let saveMessage = '添加成功';
           let updateMessage = '修改成功';
           values.defaultContent = getDefaultContent(values.platform);

@@ -90,7 +90,7 @@ export const formSchema: FormSchema[] = [
     component: 'ApiUpload',
     changeEvent: 'update:fileList',
     valueField: 'fileList',
-    componentProps: () => {
+    componentProps: ({ formModel }) => {
       return {
         listType: 'picture-card',
         maxFileLimit: 1,
@@ -112,10 +112,19 @@ export const formSchema: FormSchema[] = [
         onPreview: (fileList: FileItem) => {
           createImgPreview({ imageList: [fileList.url!] });
         },
+        onDelete(url: string) {
+          formModel.deleteUrl = url!;
+        },
       };
     },
   },
   {
+    field: 'deleteUrl',
+    label: '',
+    component: 'Input',
+    show: false,
+  },
+  {
     field: 'name',
     label: '组态名称',
     required: true,

@@ -21,6 +21,7 @@
   import { buildUUID } from '/@/utils/uuid';
   import { getDeviceProfile } from '/@/api/alarm/position';
   import { PC_DEFAULT_CONTENT, PHONE_DEFAULT_CONTENT, Platform } from '../center/center.data';
+  import { deleteFilePath } from '/@/api/oss/ossFileUploader';
 
   export default defineComponent({
     name: 'ConfigurationDrawer',
@@ -91,6 +92,10 @@
             const file = (values.thumbnail || []).at(0) || {};
             values.thumbnail = file.url || null;
           }
+          if (Reflect.has(values, 'deleteUrl')) {
+            await deleteFilePath(values?.deleteUrl);
+            Reflect.deleteProperty(values, 'deleteUrl');
+          }
           setDrawerProps({ confirmLoading: true });
           let saveMessage = '添加成功';
           let updateMessage = '修改成功';

@@ -79,7 +79,7 @@ export const formSchema: FormSchema[] = [
     component: 'ApiUpload',
     changeEvent: 'update:fileList',
     valueField: 'fileList',
-    componentProps: () => {
+    componentProps: ({ formModel }) => {
       return {
         listType: 'picture-card',
         maxFileLimit: 1,
@@ -101,9 +101,18 @@ export const formSchema: FormSchema[] = [
         onPreview: (fileList: FileItem) => {
           createImgPreview({ imageList: [fileList.url!] });
         },
+        onDelete(url: string) {
+          formModel.deleteUrl = url!;
+        },
       };
     },
   },
+  {
+    field: 'deleteUrl',
+    label: '',
+    component: 'Input',
+    show: false,
+  },
 
   {
     field: 'name',

@@ -19,6 +19,7 @@
   import { saveOrUpdateBigScreenCenter } from '/@/api/bigscreen/center/bigscreenCenter';
   import { FileItem } from '/@/components/Form/src/components/ApiUpload.vue';
   import { buildUUID } from '/@/utils/uuid';
+  import { deleteFilePath } from '/@/api/oss/ossFileUploader';
 
   export default defineComponent({
     name: 'BigScreenDrawer',
@@ -67,6 +68,10 @@
             const file = (values.thumbnail || []).at(0) || {};
             values.thumbnail = file.url || null;
           }
+          if (Reflect.has(values, 'deleteUrl')) {
+            await deleteFilePath(values?.deleteUrl);
+            Reflect.deleteProperty(values, 'deleteUrl');
+          }
           setDrawerProps({ confirmLoading: true });
           let saveMessage = '添加成功';
           let updateMessage = '修改成功';

@@ -56,7 +56,7 @@ export const formSchema: FormSchema[] = [
     component: 'ApiUpload',
     changeEvent: 'update:fileList',
     valueField: 'fileList',
-    componentProps: () => {
+    componentProps: ({ formModel }) => {
       return {
         listType: 'picture-card',
         maxFileLimit: 1,
@@ -80,9 +80,18 @@ export const formSchema: FormSchema[] = [
         onPreview: (fileList: FileItem) => {
           createImgPreview({ imageList: [fileList.url!] });
         },
+        onDelete(url: string) {
+          formModel.deleteUrl = url!;
+        },
       };
     },
   },
+  {
+    field: 'deleteUrl',
+    label: '',
+    component: 'Input',
+    show: false,
+  },
 
   {
     field: 'name',

@@ -49,7 +49,7 @@ export const step1Schemas: FormSchema[] = [
     component: 'ApiUpload',
     changeEvent: 'update:fileList',
     valueField: 'fileList',
-    componentProps: () => {
+    componentProps: ({ formModel }) => {
       return {
         listType: 'picture-card',
         maxFileLimit: 1,
@@ -71,10 +71,19 @@ export const step1Schemas: FormSchema[] = [
         onPreview: (fileList: FileItem) => {
           createImgPreview({ imageList: [fileList.url!] });
         },
+        onDelete(url: string) {
+          formModel.deleteUrl = url!;
+        },
       };
     },
   },
   {
+    field: 'deleteUrl',
+    label: '',
+    component: 'Input',
+    show: false,
+  },
+  {
     field: 'alias',
     label: '别名 ',
     component: 'Input',

@@ -41,6 +41,7 @@
   import { Steps } from 'ant-design-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { credentialTypeEnum } from '../../config/data';
+  import { deleteFilePath } from '/@/api/oss/ossFileUploader';
 
   export default defineComponent({
     name: 'DeviceModal',
@@ -163,6 +164,10 @@
               },
             };
             validateNameLength(stepRecord.name);
+            if (Reflect.has(editData, 'deleteUrl')) {
+              await deleteFilePath(editData?.deleteUrl);
+              Reflect.deleteProperty(editData, 'deleteUrl');
+            }
             await createOrEditDevice(editData);
           } else {
             const stepRecord = unref(stepState);

@@ -86,6 +86,7 @@
   import TransportConfigurationStep from './step/TransportConfigurationStep.vue';
   import PhysicalModelManagementStep from './step/PhysicalModelManagementStep.vue';
   import { DeviceProfileDetail } from '/@/api/device/model/deviceConfigModel';
+  import { deleteFilePath } from '/@/api/oss/ossFileUploader';
 
   const emits = defineEmits(['success', 'register']);
   const activeKey = ref('1');
@@ -188,6 +189,10 @@
     await getDeviceConfFormData();
     await getTransConfData();
     const isEmptyObj = isEmpty(transportConfData.profileData.transportConfiguration);
+    if (Reflect.has(postSubmitFormData.deviceConfData, 'deleteUrl')) {
+      await deleteFilePath(postSubmitFormData.deviceConfData?.deleteUrl);
+      Reflect.deleteProperty(postSubmitFormData.deviceConfData, 'deleteUrl');
+    }
     await deviceConfigAddOrEdit({
       ...postSubmitFormData.deviceConfData,
       ...{ transportType: !isEmptyObj ? transportTypeStr.value : 'DEFAULT' },

@@ -182,7 +182,7 @@ export const step1Schemas: FormSchema[] = [
     component: 'ApiUpload',
     changeEvent: 'update:fileList',
     valueField: 'fileList',
-    componentProps: () => {
+    componentProps: ({ formModel }) => {
       return {
         listType: 'picture-card',
         maxFileLimit: 1,
@@ -204,10 +204,19 @@ export const step1Schemas: FormSchema[] = [
         onPreview: (fileList: FileItem) => {
           createImgPreview({ imageList: [fileList.url!] });
         },
+        onDelete(url: string) {
+          formModel.deleteUrl = url!;
+        },
       };
     },
   },
   {
+    field: 'deleteUrl',
+    label: '',
+    component: 'Input',
+    show: false,
+  },
+  {
     field: 'deviceType',
     component: 'ApiRadioGroup',
     label: '设备类型',

+import { FileItem } from '../types';
+import { uploadThumbnail } from '/@/api/configuration/center/configurationCenter';
 import type { FormSchema } from '/@/components/Form/index';
+import { createImgPreview } from '/@/components/Preview';
 export const schemas: FormSchema[] = [
   {
     field: 'name',
@@ -27,21 +30,99 @@ export const schemas: FormSchema[] = [
   },
   {
     field: 'logo',
-    component: 'Upload',
     label: 'APP Logo',
-    colProps: {
-      span: 24,
+    // component: 'Upload',
+    // colProps: {
+    //   span: 24,
+    // },
+    // slot: 'logoUpload',
+    helpMessage: ['支持.PNG、.JPG格式，建议尺寸为32*32px，大小不超过5M '],
+    component: 'ApiUpload',
+    changeEvent: 'update:fileList',
+    valueField: 'fileList',
+    componentProps: ({ formModel }) => {
+      return {
+        listType: 'picture-card',
+        maxFileLimit: 1,
+        accept: '.png,.jpg,.jpeg,.gif',
+        api: async (file: File) => {
+          try {
+            const formData = new FormData();
+            formData.set('file', file);
+            const { fileStaticUri, fileName } = await uploadThumbnail(formData);
+            return {
+              uid: fileStaticUri,
+              name: fileName,
+              url: fileStaticUri,
+            } as FileItem;
+          } catch (error) {
+            return {};
+          }
+        },
+        // showUploadList: true,
+        onDownload() {},
+        onPreview: (fileList: FileItem) => {
+          createImgPreview({ imageList: [fileList.url!] });
+        },
+        onDelete(url: string) {
+          formModel.deleteLogoUrl = url!;
+        },
+      };
     },
-    slot: 'logoUpload',
   },
   {
-    field: 'background',
+    field: 'deleteLogoUrl',
+    label: '',
     component: 'Input',
+    show: false,
+  },
+  {
+    field: 'background',
     label: '登录页背景图片',
-    colProps: {
-      span: 24,
+    // component: 'Input',
+    // colProps: {
+    //   span: 24,
+    // },
+    // slot: 'bgUpload',
+    helpMessage: ['支持.PNG、.JPG格式，建议尺寸为1920*1080px，大小不超过5M'],
+    component: 'ApiUpload',
+    changeEvent: 'update:fileList',
+    valueField: 'fileList',
+    componentProps: ({ formModel }) => {
+      return {
+        listType: 'picture-card',
+        maxFileLimit: 1,
+        accept: '.png,.jpg,.jpeg,.gif,',
+        api: async (file: File) => {
+          try {
+            const formData = new FormData();
+            formData.set('file', file);
+            const { fileStaticUri, fileName } = await uploadThumbnail(formData);
+            return {
+              uid: fileStaticUri,
+              name: fileName,
+              url: fileStaticUri,
+            } as FileItem;
+          } catch (error) {
+            return {};
+          }
+        },
+        // showUploadList: true,
+        onDownload() {},
+        onPreview: (fileList: FileItem) => {
+          createImgPreview({ imageList: [fileList.url!] });
+        },
+        onDelete(url: string) {
+          formModel.deleteBackgroundUrl = url!;
+        },
+      };
     },
-    slot: 'bgUpload',
+  },
+  {
+    field: 'deleteBackgroundUrl',
+    label: '',
+    component: 'Input',
+    show: false,
   },
   {
     field: 'backgroundColor',

+import { FileItem } from '../types';
+import { uploadThumbnail } from '/@/api/configuration/center/configurationCenter';
 import type { FormSchema } from '/@/components/Form/index';
+import { createImgPreview } from '/@/components/Preview';
 
 export const schemas: FormSchema[] = [
   {
@@ -28,30 +31,148 @@ export const schemas: FormSchema[] = [
   },
   {
     field: 'logo',
-    component: 'Upload',
     label: '平台Logo',
-    colProps: {
-      span: 24,
+    // component: 'Upload',
+    // colProps: {
+    //   span: 24,
+    // },
+    // slot: 'logoUpload',
+    helpMessage: ['支持.PNG、.JPG格式，建议尺寸为32*32px，大小不超过5M '],
+    component: 'ApiUpload',
+    changeEvent: 'update:fileList',
+    valueField: 'fileList',
+    componentProps: ({ formModel }) => {
+      return {
+        listType: 'picture-card',
+        maxFileLimit: 1,
+        accept: '.png,.jpg,.jpeg,.gif',
+        api: async (file: File) => {
+          try {
+            const formData = new FormData();
+            formData.set('file', file);
+            const { fileStaticUri, fileName } = await uploadThumbnail(formData);
+            return {
+              uid: fileStaticUri,
+              name: fileName,
+              url: fileStaticUri,
+            } as FileItem;
+          } catch (error) {
+            return {};
+          }
+        },
+        // showUploadList: true,
+        onDownload() {},
+        onPreview: (fileList: FileItem) => {
+          createImgPreview({ imageList: [fileList.url!] });
+        },
+        onDelete(url: string) {
+          formModel.deleteLogoUrl = url!;
+        },
+      };
     },
-    slot: 'logoUpload',
+  },
+  {
+    field: 'deleteLogoUrl',
+    label: '',
+    component: 'Input',
+    show: false,
   },
   {
     field: 'icon',
-    component: 'Upload',
     label: '浏览器ico图标',
-    colProps: {
-      span: 24,
+    // component: 'Upload',
+    // colProps: {
+    //   span: 24,
+    // },
+    // slot: 'iconUpload',
+    helpMessage: ['支持.ICO格式，建议尺寸为16*16px '],
+    component: 'ApiUpload',
+    changeEvent: 'update:fileList',
+    valueField: 'fileList',
+    componentProps: ({ formModel }) => {
+      return {
+        listType: 'picture-card',
+        maxFileLimit: 1,
+        maxSize: 500 * 1024,
+        accept: '.icon,.ico',
+        api: async (file: File) => {
+          try {
+            const formData = new FormData();
+            formData.set('file', file);
+            const { fileStaticUri, fileName } = await uploadThumbnail(formData);
+            return {
+              uid: fileStaticUri,
+              name: fileName,
+              url: fileStaticUri,
+            } as FileItem;
+          } catch (error) {
+            return {};
+          }
+        },
+        // showUploadList: true,
+        onDownload() {},
+        onPreview: (fileList: FileItem) => {
+          createImgPreview({ imageList: [fileList.url!] });
+        },
+        onDelete(url: string) {
+          formModel.deleteIconUrl = url!;
+        },
+      };
     },
-    slot: 'iconUpload',
   },
   {
-    field: 'background',
+    field: 'deleteIconUrl',
+    label: '',
     component: 'Input',
+    show: false,
+  },
+  {
+    field: 'background',
     label: '登录页背景图片',
-    colProps: {
-      span: 24,
+    // component: 'Input',
+    // colProps: {
+    //   span: 24,
+    // },
+    // slot: 'bgUpload',
+    helpMessage: ['支持.PNG、.JPG格式，建议尺寸为1920*1080px以上，大小不超过5M'],
+    component: 'ApiUpload',
+    changeEvent: 'update:fileList',
+    valueField: 'fileList',
+    componentProps: ({ formModel }) => {
+      return {
+        listType: 'picture-card',
+        maxFileLimit: 1,
+        accept: '.png,.jpg,.jpeg,.gif,.jfif',
+        api: async (file: File) => {
+          try {
+            const formData = new FormData();
+            formData.set('file', file);
+            const { fileStaticUri, fileName } = await uploadThumbnail(formData);
+            return {
+              uid: fileStaticUri,
+              name: fileName,
+              url: fileStaticUri,
+            } as FileItem;
+          } catch (error) {
+            return {};
+          }
+        },
+        // showUploadList: true,
+        onDownload() {},
+        onPreview: (fileList: FileItem) => {
+          createImgPreview({ imageList: [fileList.url!] });
+        },
+        onDelete(url: string) {
+          formModel.deleteBackgroundUrl = url!;
+        },
+      };
     },
-    slot: 'bgUpload',
+  },
+  {
+    field: 'deleteBackgroundUrl',
+    label: '',
+    component: 'Input',
+    show: false,
   },
   {
     field: 'backgroundColor',

 import type { FormSchema } from '/@/components/Form/index';
 import { getAreaList } from '/@/api/oem/index';
 import { emailRule, phoneRule } from '/@/utils/rules';
+import { uploadThumbnail } from '/@/api/configuration/center/configurationCenter';
+import { FileItem } from '../types';
+import { createImgPreview } from '/@/components/Preview';
 
 export enum Level {
   PROVINCE = 'PROVINCE',
@@ -179,14 +182,53 @@ export const schemas: FormSchema[] = [
     rules: phoneRule,
   },
   {
-    field: 'qrcode',
+    field: 'qrCode',
     label: '联系我们',
     required: true,
-    component: 'Select',
+    // component: 'Select',
+    // slot: 'qrcode',
+    component: 'ApiUpload',
+    changeEvent: 'update:fileList',
+    valueField: 'fileList',
     colProps: {
       span: 24,
     },
-    slot: 'qrcode',
+    helpMessage: ['支持.PNG、.JPG格式，建议尺寸为300*300px，大小不超过5M '],
+    componentProps: ({ formModel }) => {
+      return {
+        listType: 'picture-card',
+        maxFileLimit: 1,
+        accept: '.png,.jpg,.jpeg,.gif',
+        api: async (file: File) => {
+          try {
+            const formData = new FormData();
+            formData.set('file', file);
+            const { fileStaticUri, fileName } = await uploadThumbnail(formData);
+            return {
+              uid: fileStaticUri,
+              name: fileName,
+              url: fileStaticUri,
+            } as FileItem;
+          } catch (error) {
+            return {};
+          }
+        },
+        // showUploadList: true,
+        onDownload() {},
+        onPreview: (fileList: FileItem) => {
+          createImgPreview({ imageList: [fileList.url!] });
+        },
+        onDelete(url: string) {
+          formModel.deleteUrl = url!;
+        },
+      };
+    },
+  },
+  {
+    field: 'deleteUrl',
+    label: '',
+    component: 'Input',
+    show: false,
   },
   {
     field: 'id',

@@ -3,7 +3,7 @@
     <Card :bordered="false" class="card">
       <div style="margin-left: -40px">
         <BasicForm @register="registerForm">
-          <template #logoUpload>
+          <!-- <template #logoUpload>
             <ContentUploadText>
               <template #uploadImg>
                 <CustomUploadComp :imgUrl="logoPic" @setImg="handleSetLogoImgUrl" />
@@ -24,7 +24,7 @@
                 </div>
               </template>
             </ContentUploadText>
-          </template>
+          </template> -->
           <template #colorInput="{ model, field }"
             ><Input disabled v-model:value="model[field]">
               <template #prefix> <input type="color" v-model="model[field]" /> </template
@@ -41,6 +41,7 @@
                   :customRequest="customUploadHomeSwiper"
                   :before-upload="beforeUploadHomeSwiper"
                   @change="handleChange"
+                  :remove="handleRemove"
                 >
                   <div v-if="fileList.length < 5">
                     <div>
@@ -74,7 +75,7 @@
 </template>
 
 <script lang="ts">
-  import { defineComponent, ref, unref, onMounted } from 'vue';
+  import { defineComponent, ref, onMounted, unref } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { Loading } from '/@/components/Loading/index';
   import { Card, Upload, Input, Modal } from 'ant-design-vue';
@@ -86,7 +87,9 @@
   import { getAppDesign, updateAppDesign } from '/@/api/oem/index';
   import { Authority } from '/@/components/Authority';
   import ContentUploadText from './ContentUploadText.vue';
-  import { CustomUploadComp } from './customUplaod/index';
+  // import { CustomUploadComp } from './customUplaod/index';
+  import { buildUUID } from '/@/utils/uuid';
+  import { deleteFilePath } from '/@/api/oss/ossFileUploader';
 
   export default defineComponent({
     components: {
@@ -99,7 +102,7 @@
       Modal,
       Authority,
       ContentUploadText,
-      CustomUploadComp,
+      // CustomUploadComp,
     },
     setup() {
       const loading = ref(false);
@@ -193,19 +196,42 @@
         }
       };
 
+      const deleteHomeUrl = ref<any[]>([]);
+      const handleRemove = (file: FileItem) => {
+        deleteHomeUrl.value.push(file.url);
+      };
+
       const handleUpdateInfo = async () => {
         try {
           const fieldValue = getFieldsValue();
+          if (Reflect.has(fieldValue, 'logo')) {
+            const file = (fieldValue.logo || []).at(0) || {};
+            fieldValue.logo = file.url || '';
+          }
+          if (Reflect.has(fieldValue, 'background')) {
+            const file = (fieldValue.background || []).at(0) || {};
+            fieldValue.background = file.url || '';
+          }
           // 做换字段
           const homeSwiper = fileList.value.map((item) => item.url);
           const rotation = homeSwiper.join(',');
 
           compState.value.loading = true;
+          if (Reflect.has(fieldValue, 'deleteLogoUrl')) {
+            await deleteFilePath(fieldValue?.deleteLogoUrl);
+            Reflect.deleteProperty(fieldValue, 'deleteLogoUrl');
+          }
+          if (Reflect.has(fieldValue, 'deleteBackgroundUrl')) {
+            await deleteFilePath(fieldValue?.deleteBackgroundUrl);
+            Reflect.deleteProperty(fieldValue, 'deleteBackgroundUrl');
+          }
+          if (unref(deleteHomeUrl)?.length) {
+            await Promise.all(unref(deleteHomeUrl).map((item) => deleteFilePath(item)));
+          }
           await updateAppDesign({
             ...fieldValue,
-            background: unref(bgPic),
-            icon: unref(bgPic),
-            logo: unref(logoPic),
+            background: fieldValue.background || '',
+            logo: fieldValue.logo || '',
             rotation,
           });
           compState.value.loading = false;
@@ -227,9 +253,15 @@
             status: 'done',
           });
         }
+        if (res.logo) {
+          res.logo = [{ uid: buildUUID(), name: 'name', url: res.logo } as FileItem];
+        }
+        if (res.background) {
+          res.background = [{ uid: buildUUID(), name: 'name', url: res.background } as FileItem];
+        }
         setFieldsValue(res);
-        logoPic.value = res.logo;
-        bgPic.value = res.background;
+        // logoPic.value = res.logo;
+        // bgPic.value = res.background;
         if (arr[0]?.url === '') return;
         fileList.value = arr;
       });
@@ -252,8 +284,8 @@
             });
           }
           setFieldsValue(res);
-          logoPic.value = res.logo;
-          bgPic.value = res.background;
+          // logoPic.value = res.logo;
+          // bgPic.value = res.background;
           if (arr[0]?.url === '') return;
           fileList.value = arr;
         } catch (e) {
@@ -271,8 +303,8 @@
         customUploadHomeSwiper,
         beforeUploadHomeSwiper,
         handleChange,
-        logoPic,
-        bgPic,
+        // logoPic,
+        // bgPic,
         previewVisible,
         previewImage,
         loading,
@@ -280,6 +312,7 @@
         handleResetInfo,
         handleSetBgImgUrl,
         handleSetLogoImgUrl,
+        handleRemove,
       };
     },
   });

@@ -74,13 +74,13 @@
 </template>
 
 <script lang="ts">
-  import { defineComponent, ref, onMounted, unref } from 'vue';
+  import { defineComponent, ref, onMounted } from 'vue';
   import { Card, Upload, Input, Spin } from 'ant-design-vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { schemas } from '../config/CVIDraw.config';
   import { Loading } from '/@/components/Loading/index';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import type { FileItem } from '/@/components/Upload/src/typing';
+  // import type { FileItem } from '/@/components/Upload/src/typing';
   import { iconUpload, getPlatForm, updatePlatForm, resetPlateInfo } from '/@/api/oem/index';
   import { PlusOutlined, CloseCircleOutlined } from '@ant-design/icons-vue';
   import { useUserStore } from '/@/store/modules/user';
@@ -88,6 +88,9 @@
   import { Authority } from '/@/components/Authority';
   import ContentUploadText from './ContentUploadText.vue';
   import { CustomUploadComp } from './customUplaod/index';
+  import { buildUUID } from '/@/utils/uuid';
+  import { FileItem } from '../types';
+  import { deleteFilePath } from '/@/api/oss/ossFileUploader';
 
   export default defineComponent({
     components: {
@@ -166,18 +169,42 @@
       const handleUpdateInfo = async () => {
         try {
           const fieldValue = getFieldsValue();
+          if (Reflect.has(fieldValue, 'logo')) {
+            const file = (fieldValue.logo || []).at(0) || {};
+            fieldValue.logo = file.url || null;
+          }
+          if (Reflect.has(fieldValue, 'icon')) {
+            const file = (fieldValue.icon || []).at(0) || {};
+            fieldValue.icon = file.url || null;
+          }
+          if (Reflect.has(fieldValue, 'background')) {
+            const file = (fieldValue.background || []).at(0) || {};
+            fieldValue.background = file.url || null;
+          }
           compState.value.loading = true;
-          const newFieldValue = {
+          if (Reflect.has(fieldValue, 'deleteLogoUrl')) {
+            await deleteFilePath(fieldValue?.deleteLogoUrl);
+            Reflect.deleteProperty(fieldValue, 'deleteLogoUrl');
+          }
+          if (Reflect.has(fieldValue, 'deleteIconUrl')) {
+            await deleteFilePath(fieldValue?.deleteIconUrl);
+            Reflect.deleteProperty(fieldValue, 'deleteIconUrl');
+          }
+          if (Reflect.has(fieldValue, 'deleteBackgroundUrl')) {
+            await deleteFilePath(fieldValue?.deleteBackgroundUrl);
+            Reflect.deleteProperty(fieldValue, 'deleteBackgroundUrl');
+          }
+
+          await updatePlatForm({
             ...fieldValue,
-            logo: unref(logoPic),
-            icon: unref(iconPic),
-            background: unref(bgPic),
-          };
-          await updatePlatForm(newFieldValue);
+            logo: fieldValue.logo || '',
+            icon: fieldValue.icon || '',
+            background: fieldValue.background || '',
+          });
           compState.value.loading = false;
           createMessage.success('保存信息成功');
 
-          setPlatFormInfo(newFieldValue);
+          setPlatFormInfo(fieldValue);
         } catch (e) {
           createMessage.error('保存信息失败');
         }
@@ -197,6 +224,15 @@
 
       onMounted(async () => {
         const res = await getPlatForm();
+        if (res.logo) {
+          res.logo = [{ uid: buildUUID(), name: 'name', url: res.logo }] as any;
+        }
+        if (res.icon) {
+          res.icon = [{ uid: buildUUID(), name: 'name', url: res.icon }] as any;
+        }
+        if (res.background) {
+          res.background = [{ uid: buildUUID(), name: 'name', url: res.background }] as any;
+        }
         setFieldsValue(res);
         logoPic.value = res.logo;
         iconPic.value = res.icon;

@@ -2,7 +2,7 @@
   <div class="card">
     <Card :bordered="false" class="card">
       <BasicForm @register="registerForm">
-        <template #qrcode>
+        <!-- <template #qrcode>
           <ContentUploadText>
             <template #uploadImg>
               <CustomUploadComp :imgUrl="qrcodePic" @setImg="handleSetCodeImgUrl" />
@@ -11,7 +11,7 @@
               <div class="box-outline"> 支持.PNG、.JPG格式，建议尺寸为300*300px，大小不超过5M </div>
             </template>
           </ContentUploadText>
-        </template>
+        </template> -->
         <template #customProv>
           <BasicForm @register="registerCustomForm" />
         </template>
@@ -31,7 +31,7 @@
 </template>
 
 <script lang="ts">
-  import { defineComponent, onMounted, ref, computed, watch } from 'vue';
+  import { defineComponent, onMounted, ref, computed } from 'vue';
   import { Card } from 'ant-design-vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { schemas, provSchemas } from '../config/enterPriseInfo.config';
@@ -43,8 +43,11 @@
   import { Authority } from '/@/components/Authority';
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
   import { getAuthCache } from '/@/utils/auth';
-  import ContentUploadText from './ContentUploadText.vue';
-  import { CustomUploadComp } from './customUplaod/index';
+  // import ContentUploadText from './ContentUploadText.vue';
+  // import { CustomUploadComp } from './customUplaod/index';
+  import { buildUUID } from '/@/utils/uuid';
+  import { FileItem } from '../types';
+  import { deleteFilePath } from '/@/api/oss/ossFileUploader';
 
   export default defineComponent({
     components: {
@@ -52,8 +55,8 @@
       BasicForm,
       Loading,
       Authority,
-      ContentUploadText,
-      CustomUploadComp,
+      // ContentUploadText,
+      // CustomUploadComp,
     },
     setup() {
       const userInfo: any = getAuthCache(USER_INFO_KEY);
@@ -73,11 +76,8 @@
         loading: false,
         tip: '拼命加载中...',
       });
-      const [
-        registerForm,
-        { getFieldsValue, setFieldsValue, validate, clearValidate, validateFields },
-      ] = useForm({
-        labelWidth: 80,
+      const [registerForm, { getFieldsValue, setFieldsValue, validate, clearValidate }] = useForm({
+        labelWidth: 90,
         schemas,
         showResetButton: false,
         showSubmitButton: false,
@@ -100,26 +100,30 @@
 
       const { createMessage } = useMessage();
 
-      const qrcodePic = ref();
-      const handleSetCodeImgUrl = (d) => {
-        qrcodePic.value = d;
-      };
-      watch(
-        () => qrcodePic.value,
-        (newValue) => {
-          if (!newValue) validateFields(['qrcode']);
-          else clearValidate('qrcode');
-        }
-      );
+      // const qrcodePic = ref();
+      // const handleSetCodeImgUrl = (d) => {
+      //   qrcodePic.value = d;
+      // };
+      // watch(
+      //   () => qrcodePic.value,
+      //   (newValue) => {
+      //     if (!newValue) validateFields(['qrcode']);
+      //     else clearValidate('qrcode');
+      //   }
+      // );
       // 更新
       const handleUpdateInfo = async () => {
         try {
           const fieldsValue = getFieldsValue();
           const { nameTown } = getNameTown();
+          if (Reflect.has(fieldsValue, 'qrCode')) {
+            const file = (fieldsValue.qrCode || []).at(0) || {};
+            fieldsValue.qrCode = file.url || null;
+          }
           const newFieldValue: any = {
             ...fieldsValue,
             codeTown: nameTown,
-            qrCode: qrcodePic.value,
+            // qrCode: qrcodePic.value,
           };
           delete newFieldValue.nameProv;
           delete newFieldValue.nameCity;
@@ -139,9 +143,9 @@
             'id',
           ];
           if (newFieldValue.qrCode == undefined || newFieldValue.qrCode == '') {
-            validateArray.push('qrcode');
+            validateArray.push('qrCode');
           } else {
-            const findExistIndex = validateArray.findIndex((o) => o == 'qrcode');
+            const findExistIndex = validateArray.findIndex((o) => o == 'qrCode');
             if (findExistIndex !== -1) {
               validateArray.splice(findExistIndex, 1);
             }
@@ -158,6 +162,10 @@
           const values = await validate(validateArray);
           if (!values) return;
           compState.value.loading = true;
+          if (Reflect.has(newFieldValue, 'deleteUrl')) {
+            await deleteFilePath(newFieldValue?.deleteUrl);
+            Reflect.deleteProperty(newFieldValue, 'deleteUrl');
+          }
           await updateEnterPriseDetail(newFieldValue);
           createMessage.success('更新信息成功');
           setEnterPriseInfo(newFieldValue);
@@ -189,19 +197,22 @@
           });
           setFieldsValue({ nameCountry: codeCountry });
         }
-        setFieldsValue(res);
-        qrcodePic.value = res.qrCode;
+        if (res.qrCode) {
+          res.qrCode = [{ uid: buildUUID(), name: 'name', url: res.qrCode } as FileItem];
+        }
+        setFieldsValue({ ...res, qrcode: res.qrCode });
+        // qrcodePic.value = res.qrCode;
       });
 
       return {
         registerForm,
         compState,
-        qrcodePic,
         handleUpdateInfo,
         registerCustomForm,
         loading,
         isWhereAdmin,
-        handleSetCodeImgUrl,
+        // qrcodePic,
+        // handleSetCodeImgUrl,
       };
     },
   });

 export interface FileItem {
+  size: number;
   uid: string;
   name?: string;
   status?: string;

@@ -20,6 +20,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { FileItem } from '/@/components/Form/src/components/ApiUpload.vue';
   import { buildUUID } from '/@/utils/uuid';
+  import { deleteFilePath } from '/@/api/oss/ossFileUploader';
 
   export default defineComponent({
     name: 'TenantDrawer',
@@ -102,6 +103,10 @@
               entityType: 'TENANT_PROFILE',
             },
           };
+          if (Reflect.has(values, 'deleteUrl')) {
+            await deleteFilePath(values?.deleteUrl);
+            Reflect.deleteProperty(values, 'deleteUrl');
+          }
           await updateOrCreateTenant(req);
           emit('success');
           createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);

@@ -83,7 +83,7 @@ export const tenantFormSchema: FormSchema[] = [
     component: 'ApiUpload',
     changeEvent: 'update:fileList',
     valueField: 'fileList',
-    componentProps: () => {
+    componentProps: ({ formModel }) => {
       return {
         listType: 'picture-card',
         maxFileLimit: 1,
@@ -105,10 +105,19 @@ export const tenantFormSchema: FormSchema[] = [
         onPreview: (fileList: FileItem) => {
           createImgPreview({ imageList: [fileList.url!] });
         },
+        onDelete(url: string) {
+          formModel.deleteUrl = url!;
+        },
       };
     },
   },
   {
+    field: 'deleteUrl',
+    label: '',
+    component: 'Input',
+    show: false,
+  },
+  {
     field: 'name',
     label: '租户名称',
     required: true,