Merge branch 'main_dev' of http://git.yunteng.com/yunteng/thingskit-front into p…

…erf/add-board-fontsize-field

 <script lang="ts" setup>
 <script lang="ts" setup>
   import { Button } from 'ant-design-vue';
   import { Button } from 'ant-design-vue';
-  import { nextTick, ref, unref, watch } from 'vue';
+  import { nextTick, ref, watch } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicModal } from '/@/components/Modal';
   import { BasicModal } from '/@/components/Modal';
   import { PlusCircleOutlined } from '@ant-design/icons-vue';
   import { PlusCircleOutlined } from '@ant-design/icons-vue';
@@ -19,8 +19,6 @@
     }
     }
   );
   );
 
 
-  const dataType = ref(props.dataType); //获取数据类型
-
   const emit = defineEmits(['update:value']);
   const emit = defineEmits(['update:value']);
 
 
   const [
   const [
@@ -46,15 +44,17 @@
     show.value = false;
     show.value = false;
   };
   };
 
 
-  watch(
-    () => props.dataType,
-    (value) => {
-      dataType.value = value;
+  watch(show, async (value) => {
+    if (value) {
+      await nextTick();
       updateSchema([
       updateSchema([
-        { field: FormFieldsEnum.ZOOM_FACTOR, ifShow: unref(dataType) == 'BOOL' ? false : true },
+        {
+          field: FormFieldsEnum.ZOOM_FACTOR,
+          ifShow: props.dataType == DataTypeEnum.IS_BOOL ? false : true,
+        },
       ]);
       ]);
     }
     }
-  );
+  });
 
 
   watch(
   watch(
     () => props.value,
     () => props.value,

@@ -89,7 +89,9 @@
       functionJson: {
       functionJson: {
         inputData,
         inputData,
         outputData,
         outputData,
-        ...(serviceCommand ? { inputData: [{ serviceCommand }] } : {}),
+        ...(serviceCommand
+          ? { inputData: [{ serviceCommand: serviceCommand.replaceAll(/\s/g, '').toUpperCase() }] }
+          : {}),
       },
       },
     } as ModelOfMatterParams;
     } as ModelOfMatterParams;
 
 

@@ -117,7 +117,18 @@ export const serviceSchemas = (tcpDeviceFlag: boolean): FormSchema[] => {
       field: FormField.SERVICE_COMMAND,
       field: FormField.SERVICE_COMMAND,
       label: '输入参数',
       label: '输入参数',
       component: 'Input',
       component: 'Input',
-      rules: [{ message: '输入参数为必填项', required: true }],
+      rules: [
+        { message: '输入参数为必填项', required: true },
+        {
+          message: '请输入ASCII或HEX服务命令(0~9/A~F)',
+          validator(_rule, value, _callback) {
+            const reg = /^[\s0-9a-fA-F]+$/;
+
+            if (reg.test(value)) return Promise.resolve();
+            return Promise.reject('请输入ASCII或HEX服务命令(0~9/A~F)');
+          },
+        },
+      ],
       ifShow: tcpDeviceFlag,
       ifShow: tcpDeviceFlag,
       componentProps: {
       componentProps: {
         placeholder: '请输入ASCII或HEX服务命令',
         placeholder: '请输入ASCII或HEX服务命令',

@@ -35,6 +35,9 @@ export const getSendValues = async (option, getDesign, checked) => {
       commandType == CommandTypeEnum.SERVICE.toString()
       commandType == CommandTypeEnum.SERVICE.toString()
     ) {
     ) {
       values.customCommand.command = checked ? openCommand : closeCommand;
       values.customCommand.command = checked ? openCommand : closeCommand;
+      values.customCommand.command = values.customCommand.command
+        .replaceAll(/\s/g, '')
+        .toUpperCase();
     }
     }
     if (
     if (
       //判断命令下发类型是不是属性 且是modbus
       //判断命令下发类型是不是属性 且是modbus