Merge branch 'fix/rule-scene-add-params' into 'main_dev'

fix: 场景联动创建的时候添加参数isSceneLinkage

See merge request yunteng/thingskit-front!1439

@@ -5,10 +5,13 @@ import { isString } from '/@/utils/is';
 import { OrderByEnum } from '/@/views/device/localtion/cpns/TimePeriodForm/config';
 import { OrderByEnum } from '/@/views/device/localtion/cpns/TimePeriodForm/config';
 
 
 // 获取设备配置，很多地方使用，不能修改这里
 // 获取设备配置，很多地方使用，不能修改这里
-export const getDeviceProfile = (deviceType?: string) => {
+export const getDeviceProfile = (deviceType?: string, isSceneLinkage?: Boolean) => {
   return defHttp.get<DeviceProfileModel[]>({
   return defHttp.get<DeviceProfileModel[]>({
     url: '/device_profile/me/list',
     url: '/device_profile/me/list',
-    params: { deviceType: isString(deviceType) ? deviceType : undefined },
+    params: {
+      deviceType: isString(deviceType) ? deviceType : undefined,
+      isSceneLinkage: isSceneLinkage ? isSceneLinkage : undefined,
+    },
   });
   });
 };
 };
 
 

@@ -125,11 +125,16 @@ export const getAttribute = (orgId) => {
 export const byOrganizationIdGetMasterDevice = (params: {
 export const byOrganizationIdGetMasterDevice = (params: {
   organizationId: string;
   organizationId: string;
   deviceProfileId?: string;
   deviceProfileId?: string;
+  isSceneLinkage?: Boolean;
 }) => {
 }) => {
-  const { organizationId, deviceProfileId } = params;
+  const { organizationId, deviceProfileId, isSceneLinkage } = params;
   return defHttp.get<DeviceModel[]>({
   return defHttp.get<DeviceModel[]>({
     url: `${ScreenManagerApi.MASTER_GET_DEVICE}`,
     url: `${ScreenManagerApi.MASTER_GET_DEVICE}`,
-    params: { deviceProfileId, organizationId },
+    params: {
+      deviceProfileId,
+      organizationId,
+      isSceneLinkage: isSceneLinkage ? isSceneLinkage : undefined,
+    },
   });
   });
 };
 };
 //TODO-fengtao
 //TODO-fengtao

@@ -217,7 +217,7 @@ export const getFormSchemas = (hasAlarmNotify: Ref<boolean>): FormSchema[] => {
         const { setFieldsValue } = formActionType;
         const { setFieldsValue } = formActionType;
         return {
         return {
           api: async () => {
           api: async () => {
-            return await getDeviceProfile(deviceType);
+            return await getDeviceProfile(deviceType, true);
           },
           },
           labelField: 'name',
           labelField: 'name',
           valueField: 'id',
           valueField: 'id',
@@ -283,7 +283,10 @@ export const getFormSchemas = (hasAlarmNotify: Ref<boolean>): FormSchema[] => {
         return {
         return {
           api: async (params: Record<'organizationId' | 'deviceProfileId', string>) => {
           api: async (params: Record<'organizationId' | 'deviceProfileId', string>) => {
             if (params.deviceProfileId && params.organizationId) {
             if (params.deviceProfileId && params.organizationId) {
-              const result = await byOrganizationIdGetMasterDevice(params);
+              const result = await byOrganizationIdGetMasterDevice({
+                ...params,
+                isSceneLinkage: true,
+              });
               if (result) {
               if (result) {
                 return result.map((item) => ({
                 return result.map((item) => ({
                   ...item,
                   ...item,

@@ -147,7 +147,7 @@ export const getFormSchemas = (
         const { setFieldsValue } = formActionType;
         const { setFieldsValue } = formActionType;
         return {
         return {
           api: async () => {
           api: async () => {
-            return await getDeviceProfile(deviceType);
+            return await getDeviceProfile(deviceType, true);
           },
           },
           labelField: 'name',
           labelField: 'name',
           valueField: 'id',
           valueField: 'id',
@@ -251,7 +251,10 @@ export const getFormSchemas = (
         return {
         return {
           api: async (params: Record<'organizationId' | 'deviceProfileId', string>) => {
           api: async (params: Record<'organizationId' | 'deviceProfileId', string>) => {
             if (params.deviceProfileId && params.organizationId) {
             if (params.deviceProfileId && params.organizationId) {
-              const result = await byOrganizationIdGetMasterDevice(params);
+              const result = await byOrganizationIdGetMasterDevice({
+                ...params,
+                isSceneLinkage: true,
+              });
               if (result) {
               if (result) {
                 return result.map((item) => ({
                 return result.map((item) => ({
                   ...item,
                   ...item,

@@ -17,4 +17,5 @@ export interface SceneLinkageDataType {
   name: string;
   name: string;
   description?: string;
   description?: string;
   organizationId: string;
   organizationId: string;
+  isSceneLinkage?: Boolean;
 }
 }