Merge branch 'ww' into 'main'

fix: DEFECT-981 update product profile happend error

See merge request huang/yun-teng-iot-front!442

@@ -162,10 +162,10 @@
       ...postSubmitFormData.deviceConfData,
       ...postSubmitFormData.deviceConfData,
       ...{ transportType: !isEmptyObj ? transportTypeStr.value : 'DEFAULT' },
       ...{ transportType: !isEmptyObj ? transportTypeStr.value : 'DEFAULT' },
       ...{ profileData: !isEmptyObj ? transportConfData.profileData : null },
       ...{ profileData: !isEmptyObj ? transportConfData.profileData : null },
-      ...{ id: isUpdate.value ? null : isEditId.value },
-      ...{ createTime: isUpdate.value ? null : isEditCreatTime.value },
+      ...{ id: isUpdate.value ? isEditId.value : null },
+      ...{ createTime: isUpdate.value ? isEditCreatTime.value : null },
     });
     });
-    createMessage.success(isUpdate.value ? `新增成功` : `编辑成功`);
+    createMessage.success(isUpdate.value ? `编辑成功` : `新增成功`);
     handleCancel();
     handleCancel();
     emits('success');
     emits('success');
   };
   };

@@ -517,7 +517,7 @@ export const actionSchema: FormSchema[] = [
     colProps: {
     colProps: {
       span: 6,
       span: 6,
     },
     },
-    defaultValue: 0,
+    defaultValue: '0',
     componentProps: ({ formActionType }) => {
     componentProps: ({ formActionType }) => {
       const { setFieldsValue } = formActionType;
       const { setFieldsValue } = formActionType;
       return {
       return {

 <script lang="ts" setup>
 <script lang="ts" setup>
-  import { ref } from 'vue';
+  import { ref, onMounted, unref } from 'vue';
   import { FrontComponent } from '../../../const/const';
   import { FrontComponent } from '../../../const/const';
-  import { dataSourceSchema } from '../../config/basicConfiguration';
+  import { DataSourceField, dataSourceSchema } from '../../config/basicConfiguration';
+  import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
   import { FormActionType } from '/@/components/Form';
   import { FormActionType } from '/@/components/Form';
   import BasicForm from '/@/components/Form/src/BasicForm.vue';
   import BasicForm from '/@/components/Form/src/BasicForm.vue';
   const formEl = ref<Nullable<FormActionType>>(null);
   const formEl = ref<Nullable<FormActionType>>(null);
@@ -11,6 +12,10 @@
   }>();
   }>();
 
 
   defineExpose({ formActionType: formEl });
   defineExpose({ formActionType: formEl });
+
+  onMounted(() => {
+    unref(formEl)?.setFieldsValue({ [DataSourceField.DEVICE_TYPE]: DeviceTypeEnum.SENSOR });
+  });
 </script>
 </script>
 
 
 <template>
 <template>

@@ -117,7 +117,6 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
       component: 'ApiSelect',
       component: 'ApiSelect',
       label: '设备类型',
       label: '设备类型',
       colProps: { span: 8 },
       colProps: { span: 8 },
-      defaultValue: DeviceTypeEnum.SENSOR,
       componentProps: ({ formActionType }) => {
       componentProps: ({ formActionType }) => {
         const { setFieldsValue } = formActionType;
         const { setFieldsValue } = formActionType;
         return {
         return {