perf: data component create component add deviceType field

@@ -3,9 +3,10 @@ import { HistoryData } from './model';
 import { defHttp } from '/@/utils/http/axios';
 
 // 获取设备配置
-export const getDeviceProfile = () => {
+export const getDeviceProfile = (deviceType?: string) => {
   return defHttp.get<DeviceProfileModel[]>({
     url: '/device_profile/me/list',
+    params: { deviceType },
   });
 };
 

@@ -7,6 +7,7 @@ import {
   DeviceAttributeParams,
   DeviceAttributeRecord,
   GetDataBoardParams,
+  GetMeetTheConditionsDeviceParams,
   MasterDeviceList,
   SendCommandParams,
   UpdateDataBoardLayoutParams,
@@ -39,9 +40,10 @@ enum SendCommand {
 }
 
 enum DeviceUrl {
-  GET_DEVICE = '/device/list/master',
+  GET_DEVICE_MASTER = '/device/list/master',
   GET_SLAVE_DEVICE = '/device/list/slave',
   GET_DEVICE_ATTRIBUTE = '/device/attributes',
+  GET_DEVICE = '/device/list',
 }
 
 /**
@@ -168,12 +170,24 @@ export const getShareBoardComponentInfo = (params: { boardId: string; tenantId:
  */
 export const getAllDeviceByOrg = (organizationId: string, deviceProfileId?: string) => {
   return defHttp.get<MasterDeviceList[]>({
-    url: `${DeviceUrl.GET_DEVICE}/${organizationId}`,
+    url: `${DeviceUrl.GET_DEVICE_MASTER}/${organizationId}`,
     params: { deviceProfileId },
   });
 };
 
 /**
+ * @description 获取满足条件的设备
+ * @param params
+ * @returns
+ */
+export const getMeetTheConditionsDevice = (params: GetMeetTheConditionsDeviceParams) => {
+  return defHttp.get({
+    url: DeviceUrl.GET_DEVICE,
+    params,
+  });
+};
+
+/**
  * @description 获取网关子设备
  * @param params
  * @returns

@@ -162,3 +162,10 @@ export interface SendCommandParams {
   deviceId: string;
   value: any;
 }
+
+export interface GetMeetTheConditionsDeviceParams {
+  deviceLabel?: string;
+  deviceType?: string;
+  organizationId?: string;
+  deviceProfileId?: string;
+}

-import { getAllDeviceByOrg, getDeviceAttributes, getGatewaySlaveDevice } from '/@/api/dataBoard';
+import { getDeviceAttributes, getMeetTheConditionsDevice } from '/@/api/dataBoard';
 import { getOrganizationList } from '/@/api/system/system';
 import { FormSchema } from '/@/components/Form';
 import { copyTransFun } from '/@/utils/fnUtils';
@@ -6,6 +6,8 @@ import { DeviceAttributeParams, MasterDeviceList } from '/@/api/dataBoard/model'
 import { FrontComponent } from '../../const/const';
 import { getDeviceProfile } from '/@/api/alarm/position';
 import { getModelServices } from '/@/api/device/modelOfMatter';
+import { findDictItemByCode } from '/@/api/system/dict';
+import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 
 export enum BasicConfigField {
   NAME = 'name',
@@ -31,10 +33,11 @@ const getDeviceService = async (deviceProfileId: string) => {
 
 export enum DataSourceField {
   IS_GATEWAY_DEVICE = 'gatewayDevice',
+  DEVICE_TYPE = 'deviceType',
   TRANSPORT_TYPE = 'transportType',
   ORIGINATION_ID = 'organizationId',
   DEVICE_ID = 'deviceId',
-  SLAVE_DEVICE_ID = 'slaveDeviceId',
+  // SLAVE_DEVICE_ID = 'slaveDeviceId',
   DEVICE_PROFILE_ID = 'deviceProfileId',
   ATTRIBUTE = 'attribute',
   ATTRIBUTE_RENAME = 'attributeRename',
@@ -107,6 +110,34 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
       show: false,
     },
     {
+      field: DataSourceField.DEVICE_TYPE,
+      component: 'ApiSelect',
+      label: '设备类型',
+      colProps: { span: 8 },
+      defaultValue: DeviceTypeEnum.SENSOR,
+      componentProps: ({ formActionType }) => {
+        const { setFieldsValue } = formActionType;
+        return {
+          api: findDictItemByCode,
+          params: {
+            dictCode: 'device_type',
+          },
+          valueField: 'itemValue',
+          labelField: 'itemText',
+          placeholder: '请选择设备类型',
+          onChange: (value: DeviceTypeEnum) => {
+            setFieldsValue({
+              [DataSourceField.IS_GATEWAY_DEVICE]: value === DeviceTypeEnum.GATEWAY,
+              [DataSourceField.DEVICE_PROFILE_ID]: null,
+              [DataSourceField.DEVICE_ID]: null,
+              [DataSourceField.ATTRIBUTE]: null,
+              [DataSourceField.TRANSPORT_TYPE]: null,
+            });
+          },
+        };
+      },
+    },
+    {
       field: DataSourceField.DEVICE_PROFILE_ID,
       component: 'ApiSelect',
       label: '产品',
@@ -115,9 +146,11 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
       componentProps: ({ formActionType, formModel }) => {
         const { setFieldsValue } = formActionType;
         const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
+        const deviceType = formModel[DataSourceField.DEVICE_TYPE];
         return {
           api: async () => {
-            const list = await getDeviceProfile();
+            if (!deviceType) return [];
+            const list = await getDeviceProfile(deviceType);
             if (deviceProfileId) {
               const record = list.find((item) => item.id === deviceProfileId);
               setFieldsValue({ [DataSourceField.TRANSPORT_TYPE]: record?.transportType });
@@ -126,14 +159,12 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
           },
           labelField: 'name',
           valueField: 'id',
-          onChange: (_, option: Record<'transportType', string>) => {
-            console.log(option);
+          placeholder: '请选择产品',
+          onChange: (_, option = {} as Record<'transportType', string>) => {
             setFieldsValue({
               [DataSourceField.DEVICE_ID]: null,
               [DataSourceField.ATTRIBUTE]: null,
-              [DataSourceField.SLAVE_DEVICE_ID]: null,
-              [DataSourceField.IS_GATEWAY_DEVICE]: false,
-              [DataSourceField.TRANSPORT_TYPE]: option.transportType,
+              [DataSourceField.TRANSPORT_TYPE]: option[DataSourceField.TRANSPORT_TYPE],
             });
           },
         };
@@ -157,9 +188,6 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
           onChange() {
             setFieldsValue({
               [DataSourceField.DEVICE_ID]: null,
-              [DataSourceField.ATTRIBUTE]: null,
-              [DataSourceField.SLAVE_DEVICE_ID]: null,
-              [DataSourceField.IS_GATEWAY_DEVICE]: false,
             });
           },
           getPopupContainer: () => document.body,
@@ -182,12 +210,17 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
         const { setFieldsValue } = formActionType;
         const organizationId = formModel[DataSourceField.ORIGINATION_ID];
         const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
+        const deviceType = formModel[DataSourceField.DEVICE_TYPE];
 
         return {
           api: async () => {
             if (organizationId) {
               try {
-                const data = await getAllDeviceByOrg(organizationId, deviceProfileId);
+                const data = await getMeetTheConditionsDevice({
+                  organizationId,
+                  deviceProfileId,
+                  deviceType,
+                });
                 if (data)
                   return data.map((item) => ({
                     ...item,
@@ -202,9 +235,6 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
 
           onChange(_value, record: MasterDeviceList) {
             setFieldsValue({
-              [DataSourceField.ATTRIBUTE]: null,
-              [DataSourceField.IS_GATEWAY_DEVICE]: record?.deviceType === 'GATEWAY',
-              [DataSourceField.SLAVE_DEVICE_ID]: null,
               [DataSourceField.DEVICE_NAME]: record?.label,
             });
           },
@@ -214,58 +244,6 @@ export const dataSourceSchema = (frontId?: FrontComponent): FormSchema[] => {
       },
     },
     {
-      field: DataSourceField.SLAVE_DEVICE_ID,
-      label: '网关子设备',
-      component: 'ApiSelect',
-      colProps: { span: 8 },
-      rules: [{ required: true, message: '网关子设备为必填项' }],
-      show: false,
-      ifShow({ model }) {
-        const transportType = model[DataSourceField.TRANSPORT_TYPE];
-        return (
-          !(isControlComponent(frontId as FrontComponent) && isTcpProfile(transportType)) &&
-          model[DataSourceField.IS_GATEWAY_DEVICE]
-        );
-      },
-      dynamicRules({ model }) {
-        return [
-          { required: model[DataSourceField.IS_GATEWAY_DEVICE], message: '请选择网关子设备' },
-        ];
-      },
-      componentProps({ formModel, formActionType }) {
-        const { setFieldsValue } = formActionType;
-        const organizationId = formModel[DataSourceField.ORIGINATION_ID];
-        const isGatewayDevice = formModel[DataSourceField.IS_GATEWAY_DEVICE];
-        const deviceId = formModel[DataSourceField.DEVICE_ID];
-
-        return {
-          api: async () => {
-            if (organizationId && isGatewayDevice) {
-              try {
-                const data = await getGatewaySlaveDevice({ organizationId, masterId: deviceId });
-                if (data)
-                  return data.map((item) => ({
-                    ...item,
-                    label: item.name,
-                    value: item.id,
-                    deviceType: item.deviceType,
-                  }));
-              } catch (error) {}
-            }
-            return [];
-          },
-          onChange(_value, record: MasterDeviceList) {
-            setFieldsValue({
-              [DataSourceField.ATTRIBUTE]: null,
-              [DataSourceField.DEVICE_NAME]: record?.label,
-            });
-          },
-          placeholder: '请选择网关子设备',
-          getPopupContainer: () => document.body,
-        };
-      },
-    },
-    {
       field: DataSourceField.ATTRIBUTE,
       component: 'ApiSelect',
       label: '属性',