Merge branch 'dev-fix-ww' into 'main_dev'

fix: 修复teambition bug

See merge request yunteng/thingskit-front!544

@@ -86,6 +86,12 @@ export interface DataSource {
   deviceName: string;
   deviceProfileId: string;
   tbDeviceId: string;
+  customCommand: {
+    transportType?: string;
+    commandType?: string;
+    command?: string;
+    service?: string;
+  };
 
   // front usage
   uuid?: string;
@@ -93,6 +99,7 @@ export interface DataSource {
   height?: number;
   radio?: RadioRecord;
   deviceType?: DeviceTypeEnum;
+  [key: string]: any;
 }
 
 export interface DataComponentRecord {

 <script lang="ts" setup>
-  import { ref } from 'vue';
+  import { ref, watch } from 'vue';
   import JSONEditor, { JSONEditorOptions } from 'jsoneditor';
   import 'jsoneditor/dist/jsoneditor.min.css';
   import { unref } from 'vue';
@@ -40,6 +40,8 @@
 
   const editoreRef = ref<JSONEditor>();
 
+  const isFocus = ref(false);
+
   const handleChange = (value: any) => {
     emit(EventEnum.UPDATE_VALUE, value, unref(editoreRef));
     emit(EventEnum.CHANGE, value, unref(editoreRef));
@@ -54,8 +56,14 @@
     return {
       ...options,
       onChangeText: handleChange,
-      onBlur: (event: Event) => handleEmit(event, EventEnum.BLUR),
-      onFocus: (event: Event) => handleEmit(event, EventEnum.FOCUS),
+      onBlur: (event: Event) => {
+        isFocus.value = false;
+        handleEmit(event, EventEnum.BLUR);
+      },
+      onFocus: (event: Event) => {
+        isFocus.value = true;
+        handleEmit(event, EventEnum.FOCUS);
+      },
     } as JSONEditorOptions;
   });
 
@@ -63,15 +71,16 @@
     editoreRef.value = new JSONEditor(unref(jsonEditorElRef), unref(getOptions));
   };
 
-  // watch(
-  //   () => props.value,
-  //   (target) => {
-  //     unref(editoreRef)?.setText(target || '');
-  //   },
-  //   {
-  //     immediate: true,
-  //   }
-  // );
+  watch(
+    () => props.value,
+    (target) => {
+      if (unref(isFocus)) return;
+      unref(editoreRef)?.setText(target || '');
+    },
+    {
+      immediate: true,
+    }
+  );
 
   const get = (): string => {
     return unref(editoreRef)?.getText() || '';

@@ -60,7 +60,7 @@
   });
 
   const validateRepeat = (value: StructRecord, valueList: StructRecord[]) => {
-    return valueList.filter((item) => item.identifier === value.identifier).length >= 1;
+    return valueList.filter((item) => item.identifier === value.identifier).length > 1;
   };
 
   const handleSubmit = async () => {

@@ -20,7 +20,7 @@ export const validateValueRange = (_rule, value: Record<'min' | 'max', number>,
   return Promise.resolve();
 };
 
-export const validateJSON = (_rule, value: ModelOfMatterParams[], _callback) => {
+export const validateJSON = (_rule, value = [] as ModelOfMatterParams[], _callback) => {
   if (value.length) {
     return Promise.resolve();
   }

@@ -127,4 +127,5 @@ export type ComponentType =
   | 'ProductPicker'
   | 'PollCommandInput'
   | 'RegisterAddressInput'
-  | 'ControlGroup';
+  | 'ControlGroup'
+  | 'JSONEditor';

@@ -10,6 +10,8 @@
   import { onMounted } from 'vue';
   import { getBoundingClientRect } from '/@/utils/domUtils';
   import { TaskRecordType } from '/@/api/task/model';
+  import { RunTaskModal } from '/@/views/task/center/components/RunTaskModal';
+  import { useModal } from '/@/components/Modal';
 
   const props = defineProps<{
     tbDeviceId: string;
@@ -17,6 +19,8 @@
 
   const listElRef = ref<Nullable<ComponentElRef>>(null);
 
+  const [registerRunTaskModal, { openModal }] = useModal();
+
   const [registerForm, { getFieldsValue }] = useForm({
     schemas: formSchemas,
     baseColProps: { span: 8 },
@@ -24,19 +28,25 @@
     showAdvancedButton: true,
     labelWidth: 100,
     submitFunc: async () => {
-      pagination.params = getFieldsValue();
       getDataSource();
     },
   });
 
+  const paginationChange = (page: number, pageSize: number) => {
+    pagination.current = page - 1 * pageSize > pagination.total ? 1 : page;
+    pagination.pageSize = pageSize;
+    getDataSource();
+  };
+
   const pagination = reactive({
-    total: 10,
     current: 1,
     pageSize: 10,
+    total: 0,
     showQuickJumper: true,
     size: 'small',
     showTotal: (total: number) => `共 ${total} 条数据`,
-    params: {} as Recordable,
+    onChange: paginationChange,
+    onShowSizeChange: paginationChange,
   });
 
   const dataSource = ref<TaskRecordType[]>([]);
@@ -45,12 +55,14 @@
   const getDataSource = async () => {
     try {
       loading.value = true;
-      const { items } = await getTaskCenterList({
+      const params = getFieldsValue() || {};
+      const { items, total } = await getTaskCenterList({
         page: pagination.current,
         pageSize: pagination.pageSize,
         tbDeviceId: props.tbDeviceId,
-        ...pagination.params,
+        ...params,
       });
+      pagination.total = total;
       dataSource.value = items;
     } catch (error) {
       throw error;
@@ -79,6 +91,10 @@
       (listContainerEl.style.overflowX = 'hidden');
   };
 
+  const handleRunTask = (record: TaskRecordType) => {
+    openModal(true, record);
+  };
+
   onMounted(() => {
     setListHeight();
     getDataSource();
@@ -119,10 +135,12 @@
               :reload="reload"
               :tbDeviceId="tbDeviceId"
               :deviceTaskCardMode="true"
+              @runTask="handleRunTask"
             />
           </List.Item>
         </template>
       </List>
+      <RunTaskModal :reload="reload" @register="registerRunTaskModal" />
     </section>
   </PageWrapper>
 </template>

@@ -13,6 +13,8 @@ import { queryDeviceProfileBy } from '/@/api/device/deviceManager';
 import { getModelServices } from '/@/api/device/modelOfMatter';
 import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
 import useCommonFun from '../hooks/useCommonFun';
+import { DeviceProfileModel } from '/@/api/device/model/deviceModel';
+import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
 
 const { useByProductGetAttribute } = useCommonFun();
 export type TOption = {
@@ -443,6 +445,12 @@ export const actionSchema: FormSchema[] = [
     ifShow: ({ values }) => isDeviceOut(values.outTarget),
   },
   {
+    field: 'transportType',
+    label: '',
+    component: 'Input',
+    show: false,
+  },
+  {
     field: 'deviceProfileId',
     label: '',
     component: 'ApiSelect',
@@ -459,8 +467,28 @@ export const actionSchema: FormSchema[] = [
         labelField: 'name',
         valueField: 'id',
         getPopupContainer: () => document.body,
-        onChange: () => {
-          setFieldsValue({ thingsModelId: '', deviceId: [] });
+        onChange: (_value: string, options = {} as DeviceProfileModel) => {
+          const oldType = formModel['transportType'];
+
+          const updateFlag =
+            oldType === TransportTypeEnum.TCP || options.transportType === TransportTypeEnum.TCP;
+
+          setFieldsValue({
+            thingsModelId: '',
+            deviceId: [],
+            transportType: options.transportType,
+            ...(updateFlag ? { doContext: null } : {}),
+          });
+        },
+        onOptionsChange(options: DeviceProfileModel[]) {
+          const deviceProfileId = formModel['deviceProfileId'];
+          if (deviceProfileId) {
+            const index = options.findIndex(
+              (item) => (item as Recordable).value === deviceProfileId
+            );
+
+            ~index && setFieldsValue({ transportType: options[index].transportType });
+          }
         },
       };
     },

@@ -156,7 +156,7 @@ export const genActionData = (actionData) => {
             clearRule,
           }
         : {
-            ...doContext,
+            params: doContext,
             alarmLevel: outTarget === 'MSG_NOTIFY' ? alarm_level : undefined,
           },
     },

@@ -39,8 +39,15 @@
           </template>
         </a-select>
       </template>
-      <template #doContext>
-        <div class="flex" style="align-items: center">
+      <template #doContext="{ model, field }">
+        <div v-if="model['transportType'] === TransportTypeEnum.TCP">
+          <Input v-model:value="model[field]" placeholder="请输入自定义命令" />
+        </div>
+        <div
+          v-show="model['transportType'] !== TransportTypeEnum.TCP"
+          class="flex"
+          style="align-items: center"
+        >
           <div ref="jsoneditorRef" style="height: 100%; width: 100%"></div>
           <a-button style="margin: -5px 0" type="text" @click="handlePremitter">格式化</a-button>
           <Tooltip
@@ -88,11 +95,13 @@
 <script lang="ts">
   import { defineComponent } from 'vue';
   import { isNumber } from '/@/utils/is';
+  import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
   export default defineComponent({
     components: {
       VNodes: (_, { attrs }) => {
         return attrs.vnodes;
       },
+      Input,
     },
     inheritAttrs: false,
   });
@@ -101,7 +110,7 @@
   import { ref, onMounted, nextTick, unref, computed, provide } from 'vue';
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
-  import { Tooltip, Select, Checkbox, Card } from 'ant-design-vue';
+  import { Tooltip, Select, Checkbox, Card, Input } from 'ant-design-vue';
   import { Icon } from '/@/components/Icon';
   import { actionSchema, CommandTypeEnum } from '../config/config.data';
   import jsoneditor from 'jsoneditor';
@@ -260,13 +269,14 @@
     //ft-add-2022-11-22
     //TODO-fengtao-设备验证
     const value = getFieldsValue();
+    const isTCPTransportType = value.transportType === TransportTypeEnum.TCP;
     const doContext = unref(jsonInstance)?.get() || {};
     const serviceInputValue = Reflect.get(value, 'serviceInputValue');
 
     return {
       ...value,
       ...(Number(value.commandType) === CommandTypeEnum.CUSTOM
-        ? { doContext }
+        ? { doContext: isTCPTransportType ? value.doContext : doContext }
         : { doContext: serviceInputValue }),
       clearRule,
     };
@@ -280,7 +290,9 @@
       ...(isNumber(fieldsValue.commandType)
         ? { commandType: String(fieldsValue.commandType) }
         : {}),
-      serviceInputValue: commandType === CommandTypeEnum.SERVICE ? doContext.params || {} : {},
+      ...(commandType === CommandTypeEnum.SERVICE
+        ? { serviceInputValue: doContext.params || {} }
+        : { doContext: doContext.params }),
     });
   };
   //ft-add

@@ -91,6 +91,7 @@ export const formSchemas: FormSchema[] = [
     rules: [{ required: true, message: '请填写任务名称' }],
     componentProps: {
       placeholder: '请输入任务名称',
+      maxlength: 64,
     },
   },
   {

@@ -21,8 +21,8 @@ export const genPollCronExpression = (value: number, type: TimeUnitEnum) => {
   const placeholder = 'placeholder';
   const expression = {
     [TimeUnitEnum.SECOND]: `${placeholder} * * * * ? *`,
-    [TimeUnitEnum.MINUTE]: `* ${placeholder} * * * ? *`,
-    [TimeUnitEnum.HOUR]: `* * ${placeholder} * * ? *`,
+    [TimeUnitEnum.MINUTE]: `0 ${placeholder} * * * ? *`,
+    [TimeUnitEnum.HOUR]: `0 0 ${placeholder} * * ? *`,
   };
   const newExpression = expression[type];
   return newExpression.replace(placeholder, `0/${value}`);

@@ -35,12 +35,21 @@
     },
   });
 
+  const paginationChange = (page: number, pageSize: number) => {
+    pagination.current = page - 1 * pageSize > pagination.total ? 1 : page;
+    pagination.pageSize = pageSize;
+    getDataSource();
+  };
+
   const pagination = reactive({
-    total: 10,
     current: 1,
+    pageSize: 10,
+    total: 0,
     showQuickJumper: true,
     size: 'small',
     showTotal: (total: number) => `共 ${total} 条数据`,
+    onChange: paginationChange,
+    onShowSizeChange: paginationChange,
   });
 
   const dataSource = ref<TaskRecordType[]>([]);
@@ -49,8 +58,13 @@
     try {
       loading.value = true;
       const params = getFieldsValue();
-      const { items } = await getTaskCenterList({ page: 1, pageSize: 10, ...params });
+      const { items, total } = await getTaskCenterList({
+        page: pagination.current,
+        pageSize: pagination.pageSize,
+        ...params,
+      });
       dataSource.value = items;
+      pagination.total = total;
     } catch (error) {
       throw error;
     } finally {

@@ -17,6 +17,9 @@ export interface ControlComponentValue {
   deviceProfileId?: string;
   deviceType?: DeviceTypeEnum;
   organizationId?: string;
+
+  dataSource?: DataSource;
+  [key: string]: any;
 }
 
 export const ControlComponentDefaultConfig: ControlComponentValue = {
@@ -40,6 +43,7 @@ export const transformControlConfig = (
       deviceType: dataSourceRecord.deviceType,
       slaveDeviceId: dataSourceRecord.slaveDeviceId,
       organizationId: dataSourceRecord.organizationId,
+      dataSource: dataSourceRecord,
     } as ControlComponentValue,
   };
 };

 import { ControlComponentValue } from './control.config';
-import { getDeviceProfile } from '/@/api/alarm/position';
-import { getDeviceRelation, sendCommandOneway } from '/@/api/dataBoard';
-import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
-import { getModelServices } from '/@/api/device/modelOfMatter';
+import { sendCommandOneway } from '/@/api/dataBoard';
 import { useMessage } from '/@/hooks/web/useMessage';
-import { isString } from '/@/utils/is';
 import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
 
 const { createMessage } = useMessage();
@@ -15,31 +11,20 @@ export function useSendCommand() {
   };
   const sendCommand = async (record: ControlComponentValue, value: any) => {
     if (!record) return error();
-    const { deviceProfileId, attribute, deviceType } = record;
-    let { deviceId } = record;
+    const { attribute } = record;
+    const { dataSource } = record;
+    const { customCommand } = dataSource || {};
+
+    const { deviceId } = record;
     if (!deviceId) return error();
     try {
-      const list = await getDeviceProfile();
-      const deviceProfile = list.find((item) => item.id === deviceProfileId);
-      if (!deviceProfile) return error();
-
       let params: string | Recordable = {
         [attribute!]: Number(value),
       };
 
       // 如果是TCP设备从物模型中获取下发命令(TCP网关子设备无物模型服务与事件)
-      if (deviceProfile!.transportType === TransportTypeEnum.TCP) {
-        const serviceList = (await getModelServices({ deviceProfileId: deviceProfileId! })) || [];
-        const record = serviceList.find((item) => item.identifier === attribute);
-        const sendCommand = record?.functionJson.inputData?.at(0)?.serviceCommand || '';
-        params = isString(sendCommand) ? sendCommand : JSON.stringify(sendCommand);
-      }
-
-      if (deviceType === DeviceTypeEnum.SENSOR) {
-        deviceId = await getDeviceRelation({
-          deviceId,
-          isSlave: deviceType === DeviceTypeEnum.SENSOR,
-        });
+      if (customCommand?.transportType === TransportTypeEnum.TCP) {
+        params = customCommand.command!;
       }
 
       // 控制按钮下发命令为0 或 1
@@ -57,7 +42,6 @@ export function useSendCommand() {
       createMessage.success('命令下发成功');
       return true;
     } catch (msg) {
-      console.log('enter');
       return error();
     }
   };

@@ -61,7 +61,13 @@
     const hasExistEl = Object.keys(dataSourceEl).filter((key) => dataSourceEl[key]);
     for (const id of hasExistEl) {
       const oldValues = dataSourceEl[id]?.getFieldsValue();
-      dataSourceEl[id]?.setFieldsValue({ ...oldValues, [DataSourceField.ATTRIBUTE]: null });
+      dataSourceEl[id]?.setFieldsValue({
+        ...oldValues,
+        [DataSourceField.ATTRIBUTE]: null,
+        [DataSourceField.COMMAND_TYPE]: null,
+        [DataSourceField.SERVICE]: null,
+      });
+      dataSourceEl[id]?.clearValidate();
     }
   };
 
@@ -125,6 +131,12 @@
       _dataSource[index] = {
         ...value,
         componentInfo: { ...(props.defaultConfig || {}), ...componentInfo },
+        customCommand: {
+          transportType: value.transportType,
+          service: value.service,
+          command: value.command,
+          commandType: value.commandType,
+        },
       };
     }
 
@@ -197,13 +209,26 @@
     dataSource.value = props.record.record.dataSource.map((item) => {
       const id = buildUUID();
 
+      const customCommand = item.customCommand || {};
+
       nextTick(() => {
-        (dataSourceEl[id] as FormActionType).setFieldsValue(item);
+        (dataSourceEl[id] as FormActionType).setFieldsValue({
+          ...item,
+          transportType: customCommand.transportType,
+          command: customCommand?.command,
+          commandType: customCommand.commandType,
+          service: customCommand.service,
+        });
         (dataSourceEl[id] as FormActionType).clearValidate();
       });
+
       return {
         id,
         ...item,
+        transportType: customCommand.transportType,
+        command: customCommand?.command,
+        commandType: customCommand.commandType,
+        service: customCommand.service,
       };
     });
   };

@@ -72,7 +72,6 @@
       const { getAllDataSourceFieldValue, validate } = unref(basicConfigurationEl)!;
       await validate();
       const value = getAllDataSourceFieldValue();
-
       unref(isEdit) ? handleUpdateComponent(value) : handleAddComponent(value);
       resetForm();
     } catch (error: unknown) {

@@ -4,11 +4,11 @@
   const props = defineProps({
     controlId: {
       type: String,
-      required: true,
+      // required: true,
     },
     checkedId: {
       type: String,
-      required: true,
+      // required: true,
     },
   });
   const emit = defineEmits(['change']);

 import { getDeviceAttributes, getMeetTheConditionsDevice } from '/@/api/dataBoard';
 import { getOrganizationList } from '/@/api/system/system';
-import { FormSchema } from '/@/components/Form';
+import { FormSchema, useComponentRegister } from '/@/components/Form';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { DeviceAttributeParams, MasterDeviceList } from '/@/api/dataBoard/model';
 import { FrontComponent } from '../../const/const';
@@ -10,6 +10,11 @@ import { findDictItemByCode } from '/@/api/system/dict';
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { DataTypeEnum } from '/@/components/Form/src/externalCompns/components/StructForm/config';
 import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
+import { JSONEditor } from '/@/components/CodeEditor';
+import { CommandTypeEnum } from '/@/views/rule/linkedge/config/config.data';
+import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
+
+useComponentRegister('JSONEditor', JSONEditor);
 
 export enum BasicConfigField {
   NAME = 'name',
@@ -47,6 +52,10 @@ export enum DataSourceField {
   DEVICE_RENAME = 'deviceRename',
   LONGITUDE_ATTRIBUTE = 'longitudeAttribute',
   LATITUDE_ATTRIBUTE = 'latitudeAttribute',
+
+  COMMAND = 'command',
+  COMMAND_TYPE = 'commandType',
+  SERVICE = 'service',
 }
 
 export const isControlComponent = (frontId: FrontComponent) => {
@@ -139,6 +148,7 @@ export const dataSourceSchema = (isEdit: boolean, frontId?: FrontComponent): For
               [DataSourceField.TRANSPORT_TYPE]: null,
             });
           },
+          getPopupContainer: () => document.body,
         };
       },
     },
@@ -172,6 +182,7 @@ export const dataSourceSchema = (isEdit: boolean, frontId?: FrontComponent): For
               [DataSourceField.TRANSPORT_TYPE]: option[DataSourceField.TRANSPORT_TYPE],
             });
           },
+          getPopupContainer: () => document.body,
         };
       },
     },
@@ -252,31 +263,14 @@ export const dataSourceSchema = (isEdit: boolean, frontId?: FrontComponent): For
       component: 'ApiSelect',
       label: '属性',
       colProps: { span: 8 },
-      dynamicRules: ({ model }) => {
-        const transportType = model[DataSourceField.TRANSPORT_TYPE];
-        return [
-          {
-            required: true,
-            message: `${
-              isControlComponent(frontId as FrontComponent) && isTcpProfile(transportType)
-                ? '服务'
-                : '属性'
-            }为必填项`,
-          },
-        ];
-      },
+      rules: [{ required: true, message: '请选择属性' }],
+      ifShow: ({ model }) =>
+        !(isTcpProfile(model[DataSourceField.TRANSPORT_TYPE]) && isControlComponent(frontId!)),
       componentProps({ formModel }) {
         const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
-        const transportType = formModel[DataSourceField.TRANSPORT_TYPE];
-        if (isEdit && ![deviceProfileId, transportType].every(Boolean))
-          return { placeholder: '请选择属性', getPopupContainer: () => document.body };
         return {
           api: async () => {
             try {
-              if (isControlComponent(frontId as FrontComponent) && isTcpProfile(transportType)) {
-                return await getDeviceService(deviceProfileId);
-              }
-
               if (deviceProfileId) {
                 return await getDeviceAttribute({
                   deviceProfileId,
@@ -284,18 +278,87 @@ export const dataSourceSchema = (isEdit: boolean, frontId?: FrontComponent): For
                 });
               }
             } catch (error) {}
-
             return [];
           },
-          placeholder:
-            isControlComponent(frontId as FrontComponent) && isTcpProfile(transportType)
-              ? '请选择服务'
-              : '请选择属性',
+          placeholder: '请选择属性',
+          getPopupContainer: () => document.body,
+        };
+      },
+    },
+    {
+      field: DataSourceField.COMMAND_TYPE,
+      component: 'ApiSelect',
+      label: '命令类型',
+      defaultValue: CommandTypeEnum.CUSTOM.toString(),
+      colProps: { span: 8 },
+      ifShow: ({ model }) =>
+        isControlComponent(frontId!) && isTcpProfile(model[DataSourceField.TRANSPORT_TYPE]),
+      componentProps: ({ formActionType }) => {
+        const { setFieldsValue } = formActionType;
+        return {
+          api: findDictItemByCode,
+          params: {
+            dictCode: 'custom_define',
+          },
+          labelField: 'itemText',
+          valueField: 'itemValue',
+          placeholder: '请选择命令类型',
+          onChange() {
+            setFieldsValue({ [DataSourceField.COMMAND]: null, [DataSourceField.SERVICE]: null });
+          },
+        };
+      },
+    },
+    {
+      field: DataSourceField.SERVICE,
+      component: 'ApiSelect',
+      label: '服务',
+      colProps: { span: 8 },
+      rules: [{ required: true, message: '请选择服务' }],
+      ifShow: ({ model }) =>
+        isControlComponent(frontId as FrontComponent) &&
+        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 (isEdit && ![deviceProfileId, transportType].every(Boolean))
+          return { placeholder: '请选择服务', getPopupContainer: () => document.body };
+        return {
+          api: async () => {
+            try {
+              if (deviceProfileId) {
+                return await getDeviceService(deviceProfileId);
+              }
+            } catch (error) {}
+            return [];
+          },
+          placeholder: '请选择服务',
           getPopupContainer: () => document.body,
+          onChange(value: string, options: ModelOfMatterParams) {
+            const command = value ? (options.functionJson.inputData || [])[0].serviceCommand : null;
+            setFieldsValue({ [DataSourceField.COMMAND]: command });
+          },
         };
       },
     },
     {
+      field: DataSourceField.COMMAND,
+      component: 'Input',
+      label: '命令',
+      colProps: { span: 8 },
+      // 是控制组件  && 自定义命令  && 传输协议为TCP
+      ifShow: ({ model }) =>
+        isControlComponent(frontId!) &&
+        model[DataSourceField.COMMAND_TYPE] === CommandTypeEnum.CUSTOM.toString() &&
+        model[DataSourceField.TRANSPORT_TYPE] &&
+        isTcpProfile(model[DataSourceField.TRANSPORT_TYPE]),
+      componentProps: {
+        placeholder: '请输入下发命令',
+      },
+    },
+    {
       field: DataSourceField.DEVICE_RENAME,
       component: 'Input',
       label: '设备名',

@@ -127,13 +127,15 @@ export function useSocketConnect(dataSourceRef: Ref<DataBoardLayoutInfo[]>) {
         if (isNullAndUnDef(subscriptionId)) return;
         const mappingRecord = cmdIdMapping.get(subscriptionId);
         if (!mappingRecord || !data) return;
-        mappingRecord.forEach((item) => {
+
+        for (const item of mappingRecord) {
           const { attribute, recordIndex, dataSourceIndex } = item;
+          if (!attribute) continue;
           const [[timespan, value]] = data[attribute];
           const record = getNeedUpdateValueByIndex(recordIndex, dataSourceIndex);
           record.componentInfo.value = value;
           record.componentInfo.updateTime = timespan;
-        });
+        }
         return;
       } catch (error) {
         throw Error(error as string);