Merge branch 'fix/device-things-model-send-command' into 'main_dev'

fix: 修复自定义TCP设备物模型界面下发命令不正确

See merge request yunteng/thingskit-front!904

@@ -121,7 +121,7 @@ export const step1Schemas: FormSchema[] = [
   {
   {
     field: 'codeType',
     field: 'codeType',
     label: '标识符类型',
     label: '标识符类型',
-    component: 'Select',
+    component: 'RadioGroup',
     dynamicRules({ values }) {
     dynamicRules({ values }) {
       return [
       return [
         {
         {

@@ -13,6 +13,7 @@
   import { genModbusCommand } from '/@/api/task';
   import { genModbusCommand } from '/@/api/task';
   import { TaskTypeEnum } from '/@/views/task/center/config';
   import { TaskTypeEnum } from '/@/views/task/center/config';
   import { SingleToHex, formSchemasConfig } from './config';
   import { SingleToHex, formSchemasConfig } from './config';
+  import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
 
 
   defineEmits(['register']);
   defineEmits(['register']);
   const props = defineProps<{ deviceId: string; deviceName: string }>();
   const props = defineProps<{ deviceId: string; deviceName: string }>();
@@ -33,6 +34,7 @@
   const formField = ref(''); //存一个表单取值的field
   const formField = ref(''); //存一个表单取值的field
   const zoomFactorValue = ref<number>(1); //缩放因子
   const zoomFactorValue = ref<number>(1); //缩放因子
   const isShowMultiply = ref<Boolean>(false); // 只有tcp --> int和double类型才相乘缩放因子
   const isShowMultiply = ref<Boolean>(false); // 只有tcp --> int和double类型才相乘缩放因子
+  const deviceTransportType = ref<string>();
 
 
   const [register] = useModalInner(async (params: ModalParamsType<DeviceModelOfMatterAttrs>) => {
   const [register] = useModalInner(async (params: ModalParamsType<DeviceModelOfMatterAttrs>) => {
     const { record } = params;
     const { record } = params;
@@ -45,6 +47,7 @@
     formField.value = identifier;
     formField.value = identifier;
     zoomFactorValue.value = zoomFactor ? Number(zoomFactor) : 1;
     zoomFactorValue.value = zoomFactor ? Number(zoomFactor) : 1;
     isShowMultiply.value = type == 'INT' || type == 'DOUBLE' ? true : false;
     isShowMultiply.value = type == 'INT' || type == 'DOUBLE' ? true : false;
+    deviceTransportType.value = transportType;
 
 
     let schemas = [{ dataType: dataType, identifier, functionName: name } as StructJSON];
     let schemas = [{ dataType: dataType, identifier, functionName: name } as StructJSON];
 
 
@@ -59,7 +62,7 @@
 
 
     //是modBUS类型的就用另外的表单
     //是modBUS类型的就用另外的表单
     //判断是否是TCP ==> modBus的下发命令
     //判断是否是TCP ==> modBus的下发命令
-    if (codeType == TaskTypeEnum.MODBUS_RTU && transportType == 'TCP') {
+    if (codeType === TaskTypeEnum.MODBUS_RTU && transportType == TransportTypeEnum.TCP) {
       isShowModBUS.value = true;
       isShowModBUS.value = true;
       modBUSForm.value = {
       modBUSForm.value = {
         crc: 'CRC_16_LOWER',
         crc: 'CRC_16_LOWER',
@@ -72,8 +75,31 @@
       setProps({ schemas: formSchemasConfig(schemas[0], actionType) });
       setProps({ schemas: formSchemasConfig(schemas[0], actionType) });
     } else {
     } else {
       isShowModBUS.value = false;
       isShowModBUS.value = false;
-      const formSchemas = genForm(schemas);
-      setProps({ schemas: formSchemas });
+      if (transportType === TransportTypeEnum.TCP) {
+        setProps({
+          schemas: [
+            {
+              field: 'command',
+              label: name,
+              component: 'Input',
+              required: true,
+              rules: [
+                {
+                  pattern: /^[\s0-9a-fA-F]+$/,
+                  required: true,
+                  message: '请输入ASCII或HEX服务命令(0~9/A~F)',
+                },
+              ],
+              componentProps: {
+                placeholder: `请输入${name}`,
+              },
+            },
+          ],
+        });
+      } else {
+        const formSchemas = genForm(schemas);
+        setProps({ schemas: formSchemas });
+      }
     }
     }
 
 
     resetFields();
     resetFields();
@@ -164,6 +190,11 @@
         sendValue.value = unref(keys).reduce((prev, next) => {
         sendValue.value = unref(keys).reduce((prev, next) => {
           return { ...prev, [next]: _value[next] };
           return { ...prev, [next]: _value[next] };
         }, {});
         }, {});
+
+        // tcp 设备下发字符串
+        if (unref(deviceTransportType) === TransportTypeEnum.TCP) {
+          sendValue.value = Object.values(_value).join('').replaceAll(/\s/g, '');
+        }
       }
       }
 
 
       await sendCommandOneway({
       await sendCommandOneway({
@@ -171,11 +202,7 @@
         value: {
         value: {
           persistent: true,
           persistent: true,
           method: 'methodThingskit',
           method: 'methodThingskit',
-          params: unref(isShowModBUS)
-            ? unref(sendValue)
-            : {
-                ...unref(sendValue),
-              },
+          params: unref(sendValue),
         },
         },
       });
       });
       createMessage.success('属性下发成功~');
       createMessage.success('属性下发成功~');