Merge branch 'fix/DEFECT-2118' into 'main_dev'

fix: 修复设备填写设备地址

See merge request yunteng/thingskit-front!1384

@@ -202,6 +202,13 @@ export const step1Schemas: FormSchema[] = [
     },
     },
   },
   },
   {
   {
+    field: 'addressType',
+    label: '',
+    component: 'Input',
+    show: false,
+    defaultValue: 'HEX',
+  },
+  {
     field: 'addressCode',
     field: 'addressCode',
     label: '地址码',
     label: '地址码',
     dynamicRules({ values }) {
     dynamicRules({ values }) {
@@ -211,7 +218,7 @@ export const step1Schemas: FormSchema[] = [
             values?.transportType === TransportTypeEnum.TCP &&
             values?.transportType === TransportTypeEnum.TCP &&
             values?.tcpDeviceProtocol === TCPProtocolTypeEnum.MODBUS_RTU,
             values?.tcpDeviceProtocol === TCPProtocolTypeEnum.MODBUS_RTU,
           message: '地址码范围为00~FF',
           message: '地址码范围为00~FF',
-          pattern: /^[0-9A-Fa-f]{1,2}$/,
+          pattern: values?.addressType === 'HEX' ? /^[0-9A-Fa-f]{2}$/ : /^[0-9A-Fa-f]{1,2}$/,
         },
         },
       ];
       ];
     },
     },
@@ -219,10 +226,15 @@ export const step1Schemas: FormSchema[] = [
     component: 'HexInput',
     component: 'HexInput',
     changeEvent: 'update:value',
     changeEvent: 'update:value',
     valueField: 'value',
     valueField: 'value',
-    componentProps: {
-      type: InputTypeEnum.HEX,
-      maxValue: parseInt('FF', 16),
-      placeholder: '请输入寄存器地址',
+    componentProps: ({ formModel }) => {
+      return {
+        type: InputTypeEnum.HEX,
+        maxValue: parseInt('FF', 16),
+        placeholder: '请输入寄存器地址',
+        onHexChange: (e) => {
+          formModel.addressType = e;
+        },
+      };
     },
     },
     ifShow: ({ values }) => {
     ifShow: ({ values }) => {
       return (
       return (

@@ -23,7 +23,7 @@
     }
     }
   );
   );
 
 
-  const emits = defineEmits(['update:value', 'change']);
+  const emits = defineEmits(['update:value', 'change', 'hexChange']);
 
 
   const typOptions = Object.values(InputTypeEnum).map((value) => ({ label: value, value }));
   const typOptions = Object.values(InputTypeEnum).map((value) => ({ label: value, value }));
 
 
@@ -114,6 +114,10 @@
       ? getHexToDec(unref(getInputValue)!)
       ? getHexToDec(unref(getInputValue)!)
       : `${hexWithPrefix ? '0x' : ''}${Number(unref(getInputValue)).toString(16).toUpperCase()}`;
       : `${hexWithPrefix ? '0x' : ''}${Number(unref(getInputValue)).toString(16).toUpperCase()}`;
   });
   });
+
+  const handleInputTypeChange = (e) => {
+    emits('hexChange', e);
+  };
 </script>
 </script>
 
 
 <template>
 <template>
@@ -124,6 +128,7 @@
       class="min-w-20"
       class="min-w-20"
       :options="typOptions"
       :options="typOptions"
       :disabled="disabled"
       :disabled="disabled"
+      @change="handleInputTypeChange"
     />
     />
     <Input v-bind="$attrs" v-model:value="getInputValue" class="!w-full" :disabled="disabled" />
     <Input v-bind="$attrs" v-model:value="getInputValue" class="!w-full" :disabled="disabled" />
     <div class="min-w-14 h-full px-2 flex-grow flex-shrink-0 text-center leading-8 bg-gray-200">
     <div class="min-w-14 h-full px-2 flex-grow flex-shrink-0 text-center leading-8 bg-gray-200">