Merge branch 'fix/DEFECT-2122' into 'main_dev'

fix: 修改保存缩略图时先调用删除图片接口

See merge request yunteng/thingskit-view!274

 import { defHttp } from '@/utils/external/http/axios'
 import { defHttp } from '@/utils/external/http/axios'
-import {CameraRecord, ConfigurationItemType, DictItem, OrganizationListItem, UploadResponse} from './model'
+import { CameraRecord, ConfigurationItemType, DictItem, OrganizationListItem, UploadResponse } from './model'
 import { PaginationResult } from '/#/external/axios'
 import { PaginationResult } from '/#/external/axios'
 import { isShareMode } from '@/views/share/hook'
 import { isShareMode } from '@/views/share/hook'
 
 
@@ -22,6 +22,7 @@ enum Api {
   GET_DEVICE_LATEST = '/plugins/telemetry/DEVICE/',
   GET_DEVICE_LATEST = '/plugins/telemetry/DEVICE/',
   DEVICE_ATTR = '/device/attributes',
   DEVICE_ATTR = '/device/attributes',
   ALARM_LIST = '/alarm',
   ALARM_LIST = '/alarm',
+  BASE_DELETE_URL = '/oss',
 }
 }
 
 
 export const getDictItemByCode = (value: string) => {
 export const getDictItemByCode = (value: string) => {
@@ -89,7 +90,7 @@ export const getOrganizationList = (params?: OrganizationListItem) =>
 
 
 //获取视频列表
 //获取视频列表
 export const getVideoList = (params?: object) =>
 export const getVideoList = (params?: object) =>
-  defHttp.get<{data: CameraRecord[]}>({
+  defHttp.get<{ data: CameraRecord[] }>({
     url: Api.VIDEO,
     url: Api.VIDEO,
     params
     params
   })
   })
@@ -160,6 +161,17 @@ export const getAlarmList = (params?: object) =>
     url: Api.ALARM_LIST,
     url: Api.ALARM_LIST,
     params
     params
   },
   },
-  {
-    withShareToken: true
-  })
+    {
+      withShareToken: true
+    })
+
+
+/**
+ * 删除上传的图片
+ * @description deleteFilePath图片url
+ */
+export const deleteFilePath = (deleteFilePath?: string) => {
+  return defHttp.delete({
+    url: `${Api.BASE_DELETE_URL}?deleteFilePath=${deleteFilePath}`,
+  });
+};

@@ -67,5 +67,6 @@ export interface DateViewConfigurationInfoType {
     id: string
     id: string
     enabled: boolean,
     enabled: boolean,
     content: string
     content: string
-  }
+  },
+  thumbnail?: string
 }
 }

@@ -11,6 +11,7 @@ import { useSync } from '../useSync.hook'
 import { BaseUpdateContentParams, DateViewConfigurationInfoType } from '@/api/external/contentSave/model/contentModel'
 import { BaseUpdateContentParams, DateViewConfigurationInfoType } from '@/api/external/contentSave/model/contentModel'
 import { useRole } from './business/useRole'
 import { useRole } from './business/useRole'
 import { ChartEditStoreType, PageChartEditStoreType } from '@/store/modules/chartEditStore/chartEditStore.d'
 import { ChartEditStoreType, PageChartEditStoreType } from '@/store/modules/chartEditStore/chartEditStore.d'
+import { deleteFilePath } from '@/api/external/common'
 
 
 /**
 /**
  * * base64转file
  * * base64转file
@@ -180,7 +181,8 @@ export const useSyncRemote = () => {
 
 
   //thumbnailSyncUpdate 缩略图保存
   //thumbnailSyncUpdate 缩略图保存
   const thumbnailSyncUpdate = throttle(async (updateImg = true) => {
   const thumbnailSyncUpdate = throttle(async (updateImg = true) => {
-    const { state, organizationId, dataViewName } = projectInfoStore.getProjectInfo
+    console.log(projectInfoStore.getProjectInfo, 'projectInfoStore.getProjectInfo')
+    const { state, organizationId, dataViewName, thumbnail } = projectInfoStore.getProjectInfo
     if (updateImg) {
     if (updateImg) {
       // 获取缩略图片
       // 获取缩略图片
       const range = document.querySelector('.go-edit-range') as HTMLElement
       const range = document.querySelector('.go-edit-range') as HTMLElement
@@ -198,6 +200,9 @@ export const useSyncRemote = () => {
         base64toFile(canvasImage.toDataURL(), `${fetchRouteParamsLocation()}_index_preview.png`)
         base64toFile(canvasImage.toDataURL(), `${fetchRouteParamsLocation()}_index_preview.png`)
       )
       )
       const uploadRes = await uploadFile(uploadParams)
       const uploadRes = await uploadFile(uploadParams)
+      if (thumbnail) {
+        await deleteFilePath(thumbnail)
+      }
       // 保存预览图
       // 保存预览图
       if (uploadRes) {
       if (uploadRes) {
         await saveDataViewList({
         await saveDataViewList({