Merge branch 'ww' into 'main'

fix: BUG in teambition

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

@@ -90,6 +90,13 @@ export const deviceProfile = () => {
   });
 };
 
+export const queryDeviceProfileBy = (params: Recordable) => {
+  return defHttp.get<DeviceRecord[]>({
+    url: DeviceManagerApi.DEVICE_PROFILE_URL_ME,
+    params,
+  });
+};
+
 // 创建或编辑设备
 export const createOrEditDevice = (data) => {
   return defHttp.post({

@@ -247,7 +247,7 @@
           getSonFormValue.value,
           getNameObj,
           id,
-          additionalInfoV
+          additionalInfoV.additionalInfo.description ? additionalInfoV : {}
         );
         if (!unref(isUpdate)) {
           delete allPostForm.id;

@@ -219,14 +219,14 @@ export const modeKafkaForm: FormSchema[] = [
       return !!values.addMetadataKeyValuesAsKafkaHeaders;
     },
   },
-
   {
     field: 'description',
     label: '说明',
-    colProps: { span: 12 },
+    colProps: { span: 24 },
     component: 'InputTextArea',
     componentProps: {
       maxLength: 255,
+      rows: 4,
       placeholder: '请输入说明',
     },
   },
@@ -440,10 +440,11 @@ export const modeMqttForm: FormSchema[] = [
   {
     field: 'description',
     label: '说明',
-    colProps: { span: 12 },
+    colProps: { span: 24 },
     component: 'InputTextArea',
     componentProps: {
       maxLength: 255,
+      rows: 4,
       placeholder: '请输入说明',
     },
   },
@@ -610,10 +611,11 @@ export const modeRabbitMqForm: FormSchema[] = [
   {
     field: 'description',
     label: '说明',
-    colProps: { span: 12 },
+    colProps: { span: 24 },
     component: 'InputTextArea',
     componentProps: {
       maxLength: 255,
+      rows: 4,
       placeholder: '请输入说明',
     },
   },
@@ -957,10 +959,11 @@ export const modeApiForm: FormSchema[] = [
   {
     field: 'description',
     label: '说明',
-    colProps: { span: 12 },
+    colProps: { span: 24 },
     component: 'InputTextArea',
     componentProps: {
       maxLength: 255,
+      rows: 4,
       placeholder: '请输入说明',
     },
   },

@@ -9,7 +9,7 @@ import { scheduleOptions } from './formatData';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { numberAndNonegativeRule } from '/@/utils/rules';
 import { findDictItemByCode } from '/@/api/system/dict';
-import { deviceProfile } from '/@/api/device/deviceManager';
+import { deviceProfile, queryDeviceProfileBy } from '/@/api/device/deviceManager';
 import { getModelServices } from '/@/api/device/modelOfMatter';
 import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
 import useCommonFun from '../hooks/useCommonFun';
@@ -237,8 +237,9 @@ export const trigger_condition_schema: FormSchema[] = [
     componentProps: ({ formActionType, formModel }) => {
       const { updateSchema, setFieldsValue } = formActionType;
       const deviceType = formModel['deviceType'];
+
       return {
-        api: deviceProfile,
+        api: queryDeviceProfileBy,
         params: {
           deviceType,
         },

@@ -30,6 +30,7 @@
 
   const props = defineProps<{
     record: DataBoardLayoutInfo;
+    isEdit: boolean;
     frontId?: FrontComponent;
     defaultConfig?: Partial<ComponentInfo>;
     componentCategory?: FrontComponentCategory;
@@ -296,6 +297,7 @@
         <div class="pl-2 flex-auto">
           <component
             :frontId="$props.frontId"
+            :isEdit="isEdit"
             :is="dataSourceComponent"
             :ref="(el) => setFormEl(el, item.id)"
           />

@@ -62,7 +62,7 @@
 
   const resetForm = () => {
     isEdit.value = false;
-    frontId.value = FrontComponent.TEXT_COMPONENT_1;
+    frontId.value = undefined;
     componentRecord.value = {} as unknown as DataBoardLayoutInfo;
     componentDefaultConfig.value = {};
   };
@@ -153,6 +153,7 @@
           <BasicConfiguration
             ref="basicConfigurationEl"
             :front-id="frontId"
+            :isEdit="isEdit"
             :record="componentRecord"
             :defaultConfig="componentDefaultConfig"
             :componentCategory="getComponentCategory"

@@ -9,14 +9,16 @@
 
   const props = defineProps<{
     frontId?: FrontComponent;
+    isEdit: boolean;
   }>();
 
   defineExpose({ formActionType: formEl });
 
   const getDataSchema = computed(() => {
-    const { frontId } = props;
+    const { frontId, isEdit } = props;
+    console.log({ frontId });
     if (!frontId) return [];
-    return dataSourceSchema(frontId);
+    return dataSourceSchema(isEdit, frontId);
   });
 
   onMounted(() => {

@@ -5,6 +5,7 @@
   import { FrontComponent } from '../../../const/const';
 
   defineProps<{
+    isEdit: boolean;
     frontId?: FrontComponent;
   }>();
 
@@ -38,7 +39,7 @@
   <div class="w-full flex-1">
     <BasicForm
       :ref="(el) => setFormEl(el)"
-      :schemas="dataSourceSchema($props.frontId)"
+      :schemas="dataSourceSchema($props.isEdit, $props.frontId)"
       class="w-full flex-1 data-source-form"
       :show-action-button-group="false"
       :row-props="{

@@ -92,7 +92,7 @@ export const basicSchema: FormSchema[] = [
   },
 ];
 
-export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
+export const dataSourceSchema = (isEdit: boolean, frontId?: FrontComponent): FormSchema[] => {
   return [
     {
       field: DataSourceField.IS_GATEWAY_DEVICE,
@@ -117,6 +117,7 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
       component: 'ApiSelect',
       label: '设备类型',
       colProps: { span: 8 },
+      // defaultValue: DeviceTypeEnum.SENSOR,
       componentProps: ({ formActionType }) => {
         const { setFieldsValue } = formActionType;
         return {
@@ -147,14 +148,13 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
       rules: [{ required: true, message: '产品为必填项' }],
       componentProps: ({ formActionType, formModel }) => {
         const { setFieldsValue } = formActionType;
-        const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
         const deviceType = formModel[DataSourceField.DEVICE_TYPE];
-        if (![deviceType, deviceProfileId].every(Boolean)) return {};
         return {
           api: async () => {
             if (!deviceType) return [];
             const list = await getDeviceProfile(deviceType);
-            if (deviceProfileId) {
+            if (isEdit) {
+              const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
               const record = list.find((item) => item.id === deviceProfileId);
               setFieldsValue({ [DataSourceField.TRANSPORT_TYPE]: record?.transportType });
             }
@@ -254,7 +254,7 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
       componentProps({ formModel }) {
         const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
         const transportType = formModel[DataSourceField.TRANSPORT_TYPE];
-        if (![deviceProfileId, transportType].every(Boolean)) return {};
+        if (isEdit && ![deviceProfileId, transportType].every(Boolean)) return {};
         return {
           api: async () => {
             try {