Merge branch 'ft' into 'main_dev'

fix: 修复产品编辑上传图片时,第一次编辑显示出图片,再去点编辑，图片消失，编辑确定后没有图片显示了（新增也是一样）

See merge request yunteng/thingskit-front!1199

@@ -69,6 +69,7 @@
       const streamConfigOptions: any = ref([]);
       const streamConfigOptions: any = ref([]);
       const isUpdate = ref(true);
       const isUpdate = ref(true);
       const editId = ref('');
       const editId = ref('');
+      const avatarStr = ref('');
       const [registerForm, { validate, setFieldsValue, resetFields }] = useForm({
       const [registerForm, { validate, setFieldsValue, resetFields }] = useForm({
         labelWidth: 120,
         labelWidth: 120,
         schemas: formSchema,
         schemas: formSchema,
@@ -111,11 +112,12 @@
           editId.value = data.record.id;
           editId.value = data.record.id;
 
 
           if (data.record.avatar) {
           if (data.record.avatar) {
-            Object.assign(record, {
-              avatar: [{ uid: buildUUID(), name: 'name', url: record.avatar } as FileItem],
+            setFieldsValue({
+              avatar: [{ uid: buildUUID(), name: 'name', url: data.record.avatar } as FileItem],
             });
             });
           }
           }
-
+          const { avatar, ...params } = data.record;
+          avatarStr.value = avatar;
           if (
           if (
             record?.accessMode === AccessMode.Streaming &&
             record?.accessMode === AccessMode.Streaming &&
             record.videoPlatformDTO?.type === VideoPlatformEnum.FLUORITE
             record.videoPlatformDTO?.type === VideoPlatformEnum.FLUORITE
@@ -125,11 +127,10 @@
               videoFormat: record.playProtocol,
               videoFormat: record.playProtocol,
             });
             });
           }
           }
-
-          setFieldsValue({
-            ...record,
+          // 不能把avatar字段回显进去，页面会显示大量警告
+          await setFieldsValue({
             videoType: record.videoPlatformDTO?.type,
             videoType: record.videoPlatformDTO?.type,
-            ...(record?.params || {}),
+            ...params,
           });
           });
         } else {
         } else {
           editId.value = '';
           editId.value = '';

@@ -79,6 +79,7 @@
     emits('next', true, null);
     emits('next', true, null);
     emits('emitDeviceType', values?.deviceType);
     emits('emitDeviceType', values?.deviceType);
   }
   }
+  const imageUrl = ref('');
   //回显数据
   //回显数据
   const setFormData = async (v) => {
   const setFormData = async (v) => {
     if (v.image) {
     if (v.image) {
@@ -86,7 +87,9 @@
         image: [{ uid: buildUUID(), name: 'name', url: v.image } as FileItem],
         image: [{ uid: buildUUID(), name: 'name', url: v.image } as FileItem],
       });
       });
     }
     }
-    const { ...params } = v;
+    // 不能把image字段回显进去，页面会显示大量警告
+    const { image, ...params } = v;
+    imageUrl.value = image;
     setFieldsValue({ ...params, category: params?.categoryId ? 1 : 2 });
     setFieldsValue({ ...params, category: params?.categoryId ? 1 : 2 });
   };
   };
   //获取数据
   //获取数据