Merge branch 'main' into ft_local_dev

@@ -170,7 +170,7 @@ export const getShareBoardComponentInfo = (params: { boardId: string; tenantId:
  */
 export const getAllDeviceByOrg = (organizationId: string, deviceProfileId?: string) => {
   return defHttp.get<MasterDeviceList[]>({
-    url: DeviceUrl.GET_DEVICE_MASTER,
+    url: DeviceUrl.GET_DEVICE,
     params: { deviceProfileId, organizationId },
   });
 };

@@ -135,6 +135,7 @@ export interface UpdateDataComponentParams {
 export interface MasterDeviceList {
   deviceType: 'DIRECT_CONNECTION' | 'GATEWAY';
   deviceProfileId: string;
+  tbDeviceId: string;
   id: string;
   name: string;
   label?: string;

@@ -289,7 +289,7 @@ export const trigger_condition_schema: FormSchema[] = [
             deviceProfileId,
           },
           labelField: 'name',
-          valueField: 'id',
+          valueField: 'tbDeviceId',
         };
       }
     },
@@ -483,7 +483,7 @@ export const actionSchema: FormSchema[] = [
             deviceProfileId,
           },
           labelField: 'name',
-          valueField: 'id',
+          valueField: 'tbDeviceId',
         };
       }
     },

@@ -17,7 +17,7 @@
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { Icon } from '/@/components/Icon';
   import { Tooltip } from 'ant-design-vue';
-  import { isType } from '../config/formatData.ts';
+  import { isType } from '../config/formatData';
   defineProps({
     index: {
       type: Number,

@@ -80,7 +80,7 @@
     const { organizationId, value } = record;
     try {
       const options = await getAllDeviceByOrg(organizationId);
-      const record = options.find((item) => item.id === value);
+      const record = options.find((item) => item.tbDeviceId === value);
       await getDeviceAttribute(record!);
       await nextTick();
       method.updateSchema({

@@ -225,7 +225,7 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
                   return data.map((item) => ({
                     ...item,
                     label: item.alias || item.name,
-                    value: item.id,
+                    value: item.tbDeviceId,
                     deviceType: item.deviceType,
                   }));
               } catch (error) {}