Merge branch 'fix/board-control-ordres' into 'main_dev'

fix: 修改看板控制组件选择tcp时的逻辑问题

See merge request yunteng/thingskit-front!803

@@ -127,6 +127,9 @@ export interface MasterDeviceList {
   label?: string;
   value?: string;
   alias?: string;
+  codeType?: string;
+  code?: string;
+  [key: string]: string | undefined;
 }
 
 export interface ComponentInfoDetail {

@@ -125,23 +125,25 @@ export const step1Schemas: FormSchema[] = [
     dynamicRules({ values }) {
       return [
         {
-          required:
-            (values?.transportType === TransportTypeEnum.TCP &&
-              values?.deviceType === DeviceTypeEnum.SENSOR) ||
-            values?.deviceType === DeviceTypeEnum.GATEWAY,
+          required: values?.transportType === TransportTypeEnum.TCP,
           message: '请输入设备标识符',
         },
       ];
     },
-    ifShow: ({ values }) =>
-      values?.transportType === TransportTypeEnum.TCP &&
-      (values.deviceType === DeviceTypeEnum.SENSOR || values.deviceType === DeviceTypeEnum.GATEWAY),
-    componentProps: ({}) => {
+    // ifShow: ({ values }) =>
+    //   values?.transportType === TransportTypeEnum.TCP &&
+    //   (values.deviceType === DeviceTypeEnum.SENSOR || values.deviceType === DeviceTypeEnum.GATEWAY),
+    ifShow: ({ values }) => values?.transportType === TransportTypeEnum.TCP,
+    componentProps: ({ formActionType }) => {
+      const { setFieldsValue } = formActionType;
       return {
         options: [
           { label: '自定义', value: TaskTypeEnum.CUSTOM },
           { label: 'ModBus', value: TaskTypeEnum.MODBUS_RTU },
         ],
+        onChange() {
+          setFieldsValue({ addressCode: null });
+        },
       };
     },
   },
@@ -167,11 +169,17 @@ export const step1Schemas: FormSchema[] = [
       minValue: 0,
       disabledSwitch: true,
     },
+    // ifShow: ({ values }) => {
+    //   return (
+    //     values?.transportType === TransportTypeEnum.TCP &&
+    //     (values.deviceType === DeviceTypeEnum.SENSOR ||
+    //       values.deviceType === DeviceTypeEnum.GATEWAY) &&
+    //     values?.codeType === TaskTypeEnum.MODBUS_RTU
+    //   );
+    // },
     ifShow: ({ values }) => {
       return (
         values?.transportType === TransportTypeEnum.TCP &&
-        (values.deviceType === DeviceTypeEnum.SENSOR ||
-          values.deviceType === DeviceTypeEnum.GATEWAY) &&
         values?.codeType === TaskTypeEnum.MODBUS_RTU
       );
     },

@@ -31,6 +31,7 @@ export type TOption = {
 export enum CommandTypeEnum {
   CUSTOM = 0,
   SERVICE = 1,
+  ATTRIBUTE = 2,
 }
 
 /**

@@ -122,7 +122,7 @@
     });
   };
 
-  const handleCopy = (record: DataSourceType) => {
+  const handleCopy = async (record: DataSourceType) => {
     const { key } = props.componentConfig || {};
     if (key == 'HumidityComponent2' && props.dataSource.length >= 6) {
       createMessage.warning('绑定的数据源不能超过6条~');
@@ -134,11 +134,12 @@
       return;
     }
 
-    const allValues = getFormValues();
+    const allValues = await getFormValues();
     const currentRecord = getFormValueByUUID(record.uuid);
     const uuid = trackUpdate();
     const raw = toRaw(record);
 
+    console.log(currentRecord, 'currentRecord');
     emit('update:dataSource', [
       ...allValues,
       { componentInfo: raw.componentInfo, ...currentRecord, uuid },

@@ -32,6 +32,10 @@
         transportType: value.transportType,
         service: value.service,
         command: value.command,
+        openService: value.openService,
+        closeService: value.closeService,
+        openCommand: value.openCommand,
+        closeCommand: value.closeCommand,
         commandType: value.commandType,
         callType: value.callType,
       },
@@ -45,6 +49,10 @@
       ...record,
       transportType: customCommand?.transportType || (record as Recordable).transportType,
       service: customCommand?.service || (record as Recordable).service,
+      openService: customCommand?.openService || (record as Recordable).openService,
+      closeService: customCommand?.closeService || (record as Recordable).closeService,
+      openCommand: customCommand?.openCommand || (record as Recordable).openCommand,
+      closeCommand: customCommand?.closeCommand || (record as Recordable).closeCommand,
       command: customCommand?.command || (record as Recordable).command,
       commandType: customCommand?.commandType || (record as Recordable).commandType,
       callType: customCommand?.callType || (record as Recordable).callType,

@@ -2,12 +2,13 @@
   import { ComponentPropsConfigType } from '/@/views/visual/packages/index.type';
   import { option } from './config';
   import { Spin } from 'ant-design-vue';
-  import { computed, ref } from 'vue';
+  import { computed, ref, unref } from 'vue';
   import { useComponentScale } from '../../../hook/useComponentScale';
   import { useSendCommand } from '../../../hook/useSendCommand';
   import { DeviceName } from '/@/views/visual/commonComponents/DeviceName';
   import { DataFetchUpdateFn } from '../../../hook/socket/useSocket.type';
   import { useDataFetch } from '../../../hook/socket/useSocket';
+  import { getSendValues } from '../config';
 
   const props = defineProps<{
     config: ComponentPropsConfigType<typeof option>;
@@ -19,9 +20,23 @@
 
   const getDesign = computed(() => {
     const { option } = props.config;
-    const { attribute, attributeRename, attributeName } = option;
+    const {
+      attribute,
+      attributeRename,
+      attributeName,
+      commandType,
+      extensionDesc,
+      codeType,
+      deviceCode,
+      customCommand,
+    } = option;
     return {
       attribute: attributeRename || attributeName || attribute,
+      extensionDesc: extensionDesc ? JSON.parse(extensionDesc) : {},
+      commandType,
+      codeType,
+      deviceCode,
+      customCommand,
     };
   });
 
@@ -29,8 +44,15 @@
   const handleChange = async (event: Event) => {
     const target = event.target as HTMLInputElement;
     const value = target.checked;
+    const { option } = props.config || {};
 
-    const flag = await sendCommand(props.config.option, value);
+    const { values, isModbusCommand, sendValue } = await getSendValues(
+      option,
+      unref(getDesign),
+      value
+    );
+
+    const flag = await sendCommand(values, isModbusCommand ? sendValue : value, isModbusCommand);
     if (flag) currentValue.value = value;
     flag ? (currentValue.value = value) : (target.checked = !value);
   };

@@ -32,6 +32,10 @@
         transportType: value.transportType,
         service: value.service,
         command: value.command,
+        openService: value.openService,
+        closeService: value.closeService,
+        openCommand: value.openCommand,
+        closeCommand: value.closeCommand,
         commandType: value.commandType,
         callType: value.callType,
       },
@@ -41,14 +45,20 @@
 
   const setFormValues = (record: DataSource) => {
     const { customCommand } = record;
-    return setFieldsValue({
+    const values = {
       ...record,
       transportType: customCommand?.transportType || (record as Recordable).transportType,
       service: customCommand?.service || (record as Recordable).service,
       command: customCommand?.command || (record as Recordable).command,
+      openService: customCommand?.openService || (record as Recordable).openService,
+      closeService: customCommand?.closeService || (record as Recordable).closeService,
+      openCommand: customCommand?.openCommand || (record as Recordable).openCommand,
+      closeCommand: customCommand?.closeCommand || (record as Recordable).closeCommand,
       commandType: customCommand?.commandType || (record as Recordable).commandType,
       callType: customCommand?.callType || (record as Recordable).callType,
-    } as unknown as Partial<CommonDataSourceBindValueType>);
+    } as unknown as Partial<CommonDataSourceBindValueType>;
+
+    return setFieldsValue(values);
   };
 
   defineExpose({

@@ -10,6 +10,7 @@
   import { DeviceName } from '/@/views/visual/commonComponents/DeviceName';
   import { DataFetchUpdateFn } from '../../../hook/socket/useSocket.type';
   import { useDataFetch } from '../../../hook/socket/useSocket';
+  import { getSendValues } from '../config';
 
   const props = defineProps<{
     config: ComponentPropsConfigType<typeof option>;
@@ -19,19 +20,88 @@
 
   const getDesign = computed(() => {
     const { option, persetOption } = props.config;
-    const { componentInfo, attribute, attributeRename, attributeName } = option;
+    const {
+      componentInfo,
+      attribute,
+      attributeRename,
+      attributeName,
+      commandType,
+      extensionDesc,
+      codeType,
+      deviceCode,
+      customCommand,
+    } = option;
     const { icon: presetIcon, iconColor: presetIconColor } = persetOption || {};
     const { icon, iconColor } = componentInfo || {};
+
     return {
       icon: icon ?? presetIcon,
       iconColor: iconColor || presetIconColor,
       attribute: attributeRename || attributeName || attribute,
+      extensionDesc: extensionDesc ? JSON.parse(extensionDesc) : {},
+      commandType,
+      codeType,
+      deviceCode,
+      customCommand,
     };
   });
 
   const { sendCommand, loading } = useSendCommand();
+
   const handleChange = async () => {
-    const flag = await sendCommand(props.config.option, unref(checked));
+    const { option } = props.config || {};
+
+    const { values, isModbusCommand, sendValue } = await getSendValues(
+      option,
+      unref(getDesign),
+      unref(checked)
+    );
+
+    // const { values, sendValue, isModbusCommand } = getSendValues(
+    //   values,
+    //   unref(getDesign),
+    //   unref(checked)
+    // );
+    // const isModbusCommand = ref<boolean>(false); //判断是否是TCP设备-> 且设备标识符是modeBUs，切选择是下发命令类型是属性
+    // const { extensionDesc, commandType, codeType, deviceCode, customCommand } =
+    //   unref(getDesign) || {};
+    // const { registerAddress, actionType } = extensionDesc || {};
+    // const { openCommand, closeCommand, transportType } = customCommand || {};
+    // const modBUS = ref<any>({});
+    // const sendValue = ref();
+    // console.log(transportType, 'transportType', codeType, 'codeType');
+    // //判断是不是TCP类型设备
+    // if (transportType === TransportTypeEnum.TCP) {
+    //   if (
+    //     //判断TCP下发类型是否是自定义还是服务
+    //     commandType === CommandTypeEnum.CUSTOM.toString() ||
+    //     commandType == CommandTypeEnum.SERVICE.toString()
+    //   ) {
+    //     values.customCommand.command = unref(checked) ? openCommand : closeCommand;
+    //   }
+    //   if (
+    //     //判断命令下发类型是不是属性
+    //     commandType === CommandTypeEnum.ATTRIBUTE.toString() &&
+    //     codeType === TaskTypeEnum.MODBUS_RTU
+    //   ) {
+    //     isModbusCommand.value = true;
+    //     modBUS.value = {
+    //       crc: 'CRC_16_LOWER',
+    //       deviceCode: deviceCode,
+    //       method: actionType == '16' ? '10' : actionType,
+    //       registerAddress,
+    //       registerNumber: 1,
+    //       registerValues: [Number(unref(checked))],
+    //     };
+    //     sendValue.value = await genModbusCommand(unref(modBUS));
+    //   }
+    // }
+
+    const flag = await sendCommand(
+      values,
+      isModbusCommand ? sendValue : unref(checked),
+      isModbusCommand
+    );
     if (!flag) checked.value = !unref(checked);
   };
 

@@ -32,6 +32,10 @@
         transportType: value.transportType,
         service: value.service,
         command: value.command,
+        openService: value.openService,
+        closeService: value.closeService,
+        openCommand: value.openCommand,
+        closeCommand: value.closeCommand,
         commandType: value.commandType,
         callType: value.callType,
       },
@@ -45,6 +49,10 @@
       ...record,
       transportType: customCommand?.transportType || (record as Recordable).transportType,
       service: customCommand?.service || (record as Recordable).service,
+      openService: customCommand?.openService || (record as Recordable).openService,
+      closeService: customCommand?.closeService || (record as Recordable).closeService,
+      openCommand: customCommand?.openCommand || (record as Recordable).openCommand,
+      closeCommand: customCommand?.closeCommand || (record as Recordable).closeCommand,
       command: customCommand?.command || (record as Recordable).command,
       commandType: customCommand?.commandType || (record as Recordable).commandType,
       callType: customCommand?.callType || (record as Recordable).callType,

@@ -2,12 +2,13 @@
   import { ComponentPropsConfigType } from '/@/views/visual/packages/index.type';
   import { option } from './config';
   import { Spin } from 'ant-design-vue';
-  import { computed, ref } from 'vue';
+  import { computed, ref, unref } from 'vue';
   import { useComponentScale } from '../../../hook/useComponentScale';
   import { useSendCommand } from '../../../hook/useSendCommand';
   import { DeviceName } from '/@/views/visual/commonComponents/DeviceName';
   import { DataFetchUpdateFn } from '../../../hook/socket/useSocket.type';
   import { useDataFetch } from '../../../hook/socket/useSocket';
+  import { getSendValues } from '../config';
 
   const props = defineProps<{
     config: ComponentPropsConfigType<typeof option>;
@@ -19,9 +20,23 @@
 
   const getDesign = computed(() => {
     const { option } = props.config;
-    const { attribute, attributeRename, attributeName } = option;
+    const {
+      attribute,
+      attributeRename,
+      attributeName,
+      commandType,
+      extensionDesc,
+      codeType,
+      deviceCode,
+      customCommand,
+    } = option;
     return {
       attribute: attributeRename || attributeName || attribute,
+      extensionDesc: extensionDesc ? JSON.parse(extensionDesc) : {},
+      commandType,
+      codeType,
+      deviceCode,
+      customCommand,
     };
   });
 
@@ -29,7 +44,15 @@
   const handleChange = async (event: Event) => {
     const target = event.target as HTMLInputElement;
     const value = target.checked;
-    const flag = await sendCommand(props.config.option, value);
+    const { option } = props.config || {};
+
+    const { values, isModbusCommand, sendValue } = await getSendValues(
+      option,
+      unref(getDesign),
+      value
+    );
+
+    const flag = await sendCommand(values, isModbusCommand ? sendValue : value, isModbusCommand);
     flag ? (currentValue.value = value) : (target.checked = !value);
   };
 

@@ -42,10 +42,10 @@
     const { customCommand } = record;
     return setFieldsValue({
       ...record,
-      transportType: customCommand?.transportType,
-      service: customCommand?.service,
-      command: customCommand?.command,
-      commandType: customCommand?.commandType,
+      transportType: customCommand?.transportType || (record as Recordable).transportType,
+      service: customCommand?.service || (record as Recordable).service,
+      command: customCommand?.command || (record as Recordable).command,
+      commandType: customCommand?.commandType || (record as Recordable).command,
     } as unknown as Partial<CommonDataSourceBindValueType>);
   };
 

@@ -32,6 +32,10 @@
         transportType: value.transportType,
         service: value.service,
         command: value.command,
+        openService: value.openService,
+        closeService: value.closeService,
+        openCommand: value.openCommand,
+        closeCommand: value.closeCommand,
         commandType: value.commandType,
         callType: value.callType,
       },
@@ -45,6 +49,10 @@
       ...record,
       transportType: customCommand?.transportType || (record as Recordable).transportType,
       service: customCommand?.service || (record as Recordable).service,
+      openService: customCommand?.openService || (record as Recordable).openService,
+      closeService: customCommand?.closeService || (record as Recordable).closeService,
+      openCommand: customCommand?.openCommand || (record as Recordable).openCommand,
+      closeCommand: customCommand?.closeCommand || (record as Recordable).closeCommand,
       command: customCommand?.command || (record as Recordable).command,
       commandType: customCommand?.commandType || (record as Recordable).commandType,
       callType: customCommand?.callType || (record as Recordable).callType,

@@ -13,6 +13,7 @@
   import { useReceiveMessage } from '../../../hook/useReceiveMessage';
   import { useReceiveValue } from '../../../hook/useReceiveValue';
   import { DataSource } from '/@/views/visual/palette/types';
+  import { getSendValues, CommandTypeEnumLIst } from '../config';
 
   const props = defineProps<{
     config: ComponentPropsConfigType<typeof option>;
@@ -55,8 +56,19 @@
     return {
       dataSource: dataSource.map((item) => {
         const { fontColor, icon, iconColor, unit, showDeviceName } = item.componentInfo;
-        const { attribute, attributeRename, attributeName, deviceId, deviceName, deviceRename } =
-          item;
+        const {
+          attribute,
+          attributeRename,
+          attributeName,
+          deviceId,
+          deviceName,
+          deviceRename,
+          commandType,
+          extensionDesc,
+          codeType,
+          deviceCode,
+          customCommand,
+        } = item;
         return {
           unit: unit ?? persetUnit,
           fontColor: fontColor ?? persetFontColor,
@@ -67,6 +79,11 @@
           showDeviceName,
           deviceName: deviceRename || deviceName,
           id: deviceId,
+          extensionDesc: extensionDesc ? JSON.parse(extensionDesc) : {},
+          commandType,
+          codeType,
+          deviceCode,
+          customCommand,
         };
       }),
     };
@@ -76,7 +93,6 @@
   const handleChange = async (index: number, checked: Boolean) => {
     const { heightPx, itemHeightRatio, itemWidthRatio, mode, widthPx, dataSource } =
       props.config.option;
-
     const data = {
       ...dataSource?.[index],
       heightPx,
@@ -85,8 +101,13 @@
       mode,
       widthPx,
     } as DataSource;
+    const { values, isModbusCommand, sendValue } = await getSendValues(
+      data,
+      unref(getDesign).dataSource[index],
+      checked
+    );
 
-    const flag = await sendCommand(data, checked);
+    const flag = await sendCommand(values, isModbusCommand ? sendValue : checked, isModbusCommand);
     if (!flag) controlList.value[index].checked = !checked;
   };
 
@@ -135,7 +156,11 @@
         <div
           class="text-gray-500 truncate ml-6"
           :style="{ fontSize: getRatio ? '18px' : getRatio * 18 + 'px' }"
-          >{{ `${item.deviceName} - ${item.attributeName}` }}</div
+          >{{
+            `${item.deviceName} - ${
+              item.commandType ? CommandTypeEnumLIst[item.commandType].name : item.attributeName
+            }`
+          }}</div
         >
       </div>
 

+import { ref, unref } from 'vue';
+import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
+import { CommandTypeEnum } from '/@/views/rule/linkedge/config/config.data';
+import { TaskTypeEnum } from '/@/views/task/center/config';
+import { genModbusCommand } from '/@/api/task';
+
+export const getSendValues = async (option, getDesign, checked) => {
+  const values: any = option;
+  const isModbusCommand = ref<boolean>(false); //判断是否是TCP设备-> 且设备标识符是modeBUs，切选择是下发命令类型是属性
+  const { extensionDesc, commandType, codeType, deviceCode, customCommand } = getDesign || {};
+  const { registerAddress, actionType } = extensionDesc || {};
+  const { openCommand, closeCommand, transportType } = customCommand || {};
+  const modBUS = ref<any>({});
+  const sendValue = ref();
+  //判断是不是TCP类型设备
+  if (transportType === TransportTypeEnum.TCP) {
+    if (
+      //判断TCP下发类型是否是自定义还是服务
+      commandType === CommandTypeEnum.CUSTOM.toString() ||
+      commandType == CommandTypeEnum.SERVICE.toString()
+    ) {
+      values.customCommand.command = checked ? openCommand : closeCommand;
+    }
+    if (
+      //判断命令下发类型是不是属性
+      commandType === CommandTypeEnum.ATTRIBUTE.toString() &&
+      codeType === TaskTypeEnum.MODBUS_RTU
+    ) {
+      isModbusCommand.value = true;
+      modBUS.value = {
+        crc: 'CRC_16_LOWER',
+        deviceCode: deviceCode,
+        method: actionType == '16' ? '10' : actionType,
+        registerAddress,
+        registerNumber: 1,
+        registerValues: [Number(checked)],
+      };
+      sendValue.value = await genModbusCommand(unref(modBUS));
+    }
+  }
+
+  return { values, sendValue: unref(sendValue), isModbusCommand: unref(isModbusCommand) };
+};
+
+export const CommandTypeEnumLIst = {
+  '0': { CUSTOM: 0, name: '自定义' },
+  '1': { CUSTOM: 0, name: '服务' },
+  '2': { CUSTOM: 0, name: '属性' },
+};

@@ -14,6 +14,7 @@ import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
 import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
 import { CommandTypeEnum } from '/@/views/rule/linkedge/config/config.data';
 import { DataActionModeEnum } from '/@/enums/toolEnum';
+import { TaskTypeEnum } from '/@/views/task/center/config';
 
 useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 
@@ -24,6 +25,7 @@ export interface CommonDataSourceBindValueType extends Record<DataSourceField, s
     command?: string;
     commandType?: string;
     callType?: string;
+    [ksy: string]: string | undefined;
   };
 }
 
@@ -33,6 +35,7 @@ export enum DataSourceField {
   TRANSPORT_TYPE = 'transportType',
   ORIGINATION_ID = 'organizationId',
   DEVICE_ID = 'deviceId',
+  DEVICE_CODE = 'deviceCode', //设备地址码
   DEVICE_PROFILE_ID = 'deviceProfileId',
   ATTRIBUTE = 'attribute',
   ATTRIBUTE_NAME = 'attributeName',
@@ -41,10 +44,15 @@ export enum DataSourceField {
   DEVICE_RENAME = 'deviceRename',
   LONGITUDE_ATTRIBUTE = 'longitudeAttribute',
   LATITUDE_ATTRIBUTE = 'latitudeAttribute',
-
+  CODE_TYPE = 'codeType',
   COMMAND = 'command',
+  OPEN_COMMAND = 'openCommand',
+  CLOSE_COMMAND = 'closeCommand',
   COMMAND_TYPE = 'commandType',
   SERVICE = 'service',
+  OPEN_SERVICE = 'openService',
+  CLOSE_SERVICE = 'closeService',
+  EXTENSION_DESC = 'extensionDesc',
   CALL_TYPE = 'callType',
 }
 
@@ -72,7 +80,7 @@ const getDeviceService = async (deviceProfileId: string) => {
 const getDeviceAttribute = async (params: DeviceAttributeParams) => {
   try {
     const data = await getDeviceAttributes(params);
-    if (data) return data.map((item) => ({ label: item.name, value: item.identifier }));
+    if (data) return data.map((item) => ({ ...item, label: item.name, value: item.identifier }));
   } catch (error) {}
   return [];
 };
@@ -82,7 +90,6 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
   const isUpdate = unref(mode) === DataActionModeEnum.UPDATE;
   const selectWidgetKeys = useSelectWidgetKeys();
   const category = unref(selectWidgetKeys).categoryKey;
-
   return [
     {
       field: DataSourceField.IS_GATEWAY_DEVICE,
@@ -161,6 +168,7 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
               [DataSourceField.ATTRIBUTE]: null,
               [DataSourceField.ATTRIBUTE_NAME]: null,
               [DataSourceField.TRANSPORT_TYPE]: option[DataSourceField.TRANSPORT_TYPE],
+              [DataSourceField.COMMAND_TYPE]: null,
             });
           },
           getPopupContainer: () => document.body,
@@ -228,6 +236,9 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
           onChange(_value, record: MasterDeviceList) {
             setFieldsValue({
               [DataSourceField.DEVICE_NAME]: record?.label,
+              [DataSourceField.CODE_TYPE]: record?.codeType,
+              [DataSourceField.DEVICE_CODE]: record?.code,
+              [DataSourceField.COMMAND_TYPE]: null,
             });
           },
           placeholder: '请选择设备',
@@ -236,19 +247,94 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
       },
     },
     {
+      field: DataSourceField.CODE_TYPE,
+      component: 'Input',
+      label: '设备标识符',
+      show: false,
+    },
+
+    {
+      field: DataSourceField.DEVICE_CODE,
+      component: 'Input',
+      show: false,
+      label: '设备地址码',
+    },
+
+    {
       field: DataSourceField.ATTRIBUTE_NAME,
       component: 'Input',
       label: '属性名',
       show: false,
     },
     {
+      field: DataSourceField.COMMAND_TYPE,
+      component: 'ApiSelect',
+      label: '命令类型',
+      defaultValue: CommandTypeEnum.CUSTOM.toString(),
+      rules: [{ required: true, message: '请选择命令类型' }],
+      colProps: { span: 8 },
+      ifShow: ({ model }) => {
+        return isControlComponent(category!) && isTcpProfile(model[DataSourceField.TRANSPORT_TYPE]);
+      },
+      componentProps: ({ formActionType, formModel }) => {
+        const { setFieldsValue } = formActionType;
+        const { codeType } = formModel || {};
+        return {
+          // api: findDictItemByCode,
+          api: async (params: Recordable) => {
+            try {
+              const record = await findDictItemByCode(params);
+              if (unref(selectWidgetKeys).componentKey == 'LateralNumericalControl') {
+                return record.filter(
+                  (item) => item.itemValue == CommandTypeEnum.ATTRIBUTE.toString()
+                );
+              }
+              if (codeType == TaskTypeEnum.MODBUS_RTU) {
+                // setFieldsValue({ [DataSourceField.COMMAND_TYPE]: undefined });
+                return record.filter(
+                  (item) => item.itemValue !== CommandTypeEnum.CUSTOM.toString()
+                );
+              } else {
+                return record.filter(
+                  (item) => item.itemValue !== CommandTypeEnum.ATTRIBUTE.toString()
+                );
+              }
+            } catch (error) {
+              console.log(error);
+              return [];
+            }
+          },
+          params: {
+            dictCode: 'custom_define',
+          },
+          labelField: 'itemText',
+          valueField: 'itemValue',
+          placeholder: '请选择命令类型',
+          getPopupContainer: () => document.body,
+          onChange() {
+            setFieldsValue({
+              [DataSourceField.COMMAND]: null,
+              [DataSourceField.SERVICE]: null,
+              [DataSourceField.OPEN_COMMAND]: null,
+              [DataSourceField.CLOSE_COMMAND]: null,
+              [DataSourceField.OPEN_SERVICE]: null,
+              [DataSourceField.CLOSE_SERVICE]: null,
+              [DataSourceField.CALL_TYPE]: null,
+              [DataSourceField.ATTRIBUTE]: null,
+            });
+          },
+        };
+      },
+    },
+    {
       field: DataSourceField.ATTRIBUTE,
       component: 'ApiSelect',
       label: '属性',
       colProps: { span: 8 },
       rules: [{ required: true, message: '请选择属性' }],
       ifShow: ({ model }) =>
-        !(isTcpProfile(model[DataSourceField.TRANSPORT_TYPE]) && isControlComponent(category!)),
+        !(isTcpProfile(model[DataSourceField.TRANSPORT_TYPE]) && isControlComponent(category!)) ||
+        model[DataSourceField.COMMAND_TYPE] == 2,
       componentProps({ formModel, formActionType }) {
         const { setFieldsValue } = formActionType;
         const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
@@ -277,6 +363,16 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
                     [DataSourceField.ATTRIBUTE]: null,
                   });
                 }
+
+                if (unref(selectWidgetKeys).componentKey == 'LateralNumericalControl') {
+                  setFieldsValue({
+                    [DataSourceField.COMMAND_TYPE]: 2,
+                  });
+                  return option.filter(
+                    (item) =>
+                      item.detail.dataType.type == 'INT' || item.detail.dataType.type == 'DOUBLE'
+                  );
+                }
                 return option;
               }
             } catch (error) {}
@@ -284,53 +380,79 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
           },
           placeholder: '请选择属性',
           getPopupContainer: () => document.body,
-          onChange(value: string, option: Record<'label' | 'value', string>) {
-            setFieldsValue({ [DataSourceField.ATTRIBUTE_NAME]: value ? option.label : null });
+          onChange(value: string, option: Record<'label' | 'value' | any, string>) {
+            setFieldsValue({
+              [DataSourceField.ATTRIBUTE_NAME]: value ? option.label : null,
+              [DataSourceField.EXTENSION_DESC]: value ? JSON.stringify(option.extensionDesc) : '',
+            });
           },
         };
       },
     },
     {
-      field: DataSourceField.COMMAND_TYPE,
+      field: DataSourceField.EXTENSION_DESC,
+      component: 'Input',
+      show: false,
+      label: '扩展描述符',
+    },
+
+    {
+      field: DataSourceField.CALL_TYPE,
+      component: 'Input',
+      ifShow: false,
+      label: 'callType',
+    },
+    {
+      field: DataSourceField.OPEN_SERVICE,
       component: 'ApiSelect',
-      label: '命令类型',
-      defaultValue: CommandTypeEnum.CUSTOM.toString(),
-      rules: [{ required: true, message: '请选择命令类型' }],
+      label: '开服务',
       colProps: { span: 8 },
+      rules: [{ required: true, message: '请选择开服务' }],
       ifShow: ({ model }) =>
-        isControlComponent(category!) && isTcpProfile(model[DataSourceField.TRANSPORT_TYPE]),
-      componentProps: ({ formActionType }) => {
+        isControlComponent(category!) &&
+        model[DataSourceField.COMMAND_TYPE] === CommandTypeEnum.SERVICE.toString() &&
+        isTcpProfile(model[DataSourceField.TRANSPORT_TYPE]),
+      componentProps({ formModel, formActionType }) {
         const { setFieldsValue } = formActionType;
+        const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
+        const transportType = formModel[DataSourceField.TRANSPORT_TYPE];
+        if (isUpdate && ![deviceProfileId, transportType].every(Boolean))
+          return { placeholder: '请选择开服务', getPopupContainer: () => document.body };
         return {
-          api: findDictItemByCode,
-          params: {
-            dictCode: 'custom_define',
+          api: async () => {
+            try {
+              if (deviceProfileId) {
+                const services = await getDeviceService(deviceProfileId);
+                const value = formModel[DataSourceField.SERVICE];
+                if (value) {
+                  const selected = services.find((item) => item.value === value);
+                  selected && setFieldsValue({ [DataSourceField.CALL_TYPE]: selected.callType });
+                }
+                return services;
+              }
+            } catch (error) {}
+            return [];
           },
-          labelField: 'itemText',
-          valueField: 'itemValue',
-          placeholder: '请选择命令类型',
-          onChange() {
+          placeholder: '请选择开服务',
+          getPopupContainer: () => document.body,
+          onChange(value: string, options: ModelOfMatterParams) {
+            const command = value
+              ? (options.functionJson.inputData || [])[0]?.serviceCommand
+              : null;
             setFieldsValue({
-              [DataSourceField.COMMAND]: null,
-              [DataSourceField.SERVICE]: null,
-              [DataSourceField.CALL_TYPE]: null,
+              [DataSourceField.OPEN_COMMAND]: command,
+              [DataSourceField.CALL_TYPE]: value ? options.callType : null,
             });
           },
         };
       },
     },
     {
-      field: DataSourceField.CALL_TYPE,
-      component: 'Input',
-      ifShow: false,
-      label: 'callType',
-    },
-    {
-      field: DataSourceField.SERVICE,
+      field: DataSourceField.CLOSE_SERVICE,
       component: 'ApiSelect',
-      label: '服务',
+      label: '关服务',
       colProps: { span: 8 },
-      rules: [{ required: true, message: '请选择服务' }],
+      rules: [{ required: true, message: '请选择关服务' }],
       ifShow: ({ model }) =>
         isControlComponent(category!) &&
         model[DataSourceField.COMMAND_TYPE] === CommandTypeEnum.SERVICE.toString() &&
@@ -340,7 +462,7 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
         const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
         const transportType = formModel[DataSourceField.TRANSPORT_TYPE];
         if (isUpdate && ![deviceProfileId, transportType].every(Boolean))
-          return { placeholder: '请选择服务', getPopupContainer: () => document.body };
+          return { placeholder: '请选择关服务', getPopupContainer: () => document.body };
         return {
           api: async () => {
             try {
@@ -356,14 +478,14 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
             } catch (error) {}
             return [];
           },
-          placeholder: '请选择服务',
+          placeholder: '请选择关服务',
           getPopupContainer: () => document.body,
           onChange(value: string, options: ModelOfMatterParams) {
             const command = value
               ? (options.functionJson.inputData || [])[0]?.serviceCommand
               : null;
             setFieldsValue({
-              [DataSourceField.COMMAND]: command,
+              [DataSourceField.CLOSE_COMMAND]: command,
               [DataSourceField.CALL_TYPE]: value ? options.callType : null,
             });
           },
@@ -371,11 +493,27 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
       },
     },
     {
-      field: DataSourceField.COMMAND,
+      field: DataSourceField.OPEN_COMMAND,
+      component: 'Input',
+      label: '命令',
+      colProps: { span: 8 },
+      rules: [{ required: true, message: '请输入开下发命令' }],
+      // 是控制组件  && 自定义命令  && 传输协议为TCP
+      ifShow: ({ model }) =>
+        isControlComponent(category!) &&
+        model[DataSourceField.COMMAND_TYPE] === CommandTypeEnum.CUSTOM.toString() &&
+        model[DataSourceField.TRANSPORT_TYPE] &&
+        isTcpProfile(model[DataSourceField.TRANSPORT_TYPE]),
+      componentProps: {
+        placeholder: '请输入开下发命令',
+      },
+    },
+    {
+      field: DataSourceField.CLOSE_COMMAND,
       component: 'Input',
       label: '命令',
       colProps: { span: 8 },
-      rules: [{ required: true, message: '请输入下发命令' }],
+      rules: [{ required: true, message: '请输入关下发命令' }],
       // 是控制组件  && 自定义命令  && 传输协议为TCP
       ifShow: ({ model }) =>
         isControlComponent(category!) &&
@@ -383,7 +521,7 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
         model[DataSourceField.TRANSPORT_TYPE] &&
         isTcpProfile(model[DataSourceField.TRANSPORT_TYPE]),
       componentProps: {
-        placeholder: '请输入下发命令',
+        placeholder: '请输入关下发命令',
       },
     },
     {

@@ -14,7 +14,7 @@ export function useSendCommand() {
     return false;
   };
 
-  const sendCommand = async (record: DataSource, value: any) => {
+  const sendCommand = async (record: DataSource, value: any, isModbusCommand = false) => {
     if (!record) return false;
     const { customCommand, attribute } = record || {};
     const { deviceId } = record;
@@ -25,16 +25,18 @@ export function useSendCommand() {
       let params: string | Recordable = {
         [attribute!]: Number(value),
       };
+      if (isModbusCommand) {
+        params = value;
+      }
 
       let sendCommandFn = sendCommandOneway;
       // 如果是TCP设备从物模型中获取下发命令(TCP网关子设备无物模型服务与事件)
-      if (customCommand?.transportType === TransportTypeEnum.TCP) {
+      if (customCommand?.transportType === TransportTypeEnum.TCP && !isModbusCommand) {
         params = customCommand.command!;
         if (customCommand.callType === ServiceCallTypeEnum.SYNC) {
           sendCommandFn = sendCommandTwoway;
         }
       }
-
       // 控制按钮下发命令为0 或 1
       await sendCommandFn({
         deviceId,

@@ -28,6 +28,7 @@ export interface DataSource {
   componentInfo: ComponentInfo;
   customCommand: CustomCommand;
   videoConfig?: VideoConfigType;
+  [key: string]: any;
 }
 
 export interface ExtraDataSource extends DataSource, PublicComponentOptions {
@@ -71,6 +72,7 @@ export interface CustomCommand {
   command: string;
   service: string;
   callType: string;
+  [key: string]: string | undefined;
 }
 
 export interface ComponentLayoutType {