Merge branch 'fix/attribute-distribution' into 'main_dev'

fix: 修改物模型属性下发

See merge request yunteng/thingskit-front!782

@@ -17,7 +17,7 @@
   defineEmits(['register']);
   defineEmits(['register']);
   const props = defineProps<{ deviceId: string; deviceName: string }>();
   const props = defineProps<{ deviceId: string; deviceName: string }>();
 
 
-  const [registerForm, { setProps, getFieldsValue, resetFields }] = useForm({
+  const [registerForm, { setProps, getFieldsValue, resetFields, validate }] = useForm({
     schemas: [],
     schemas: [],
     showActionButtonGroup: false,
     showActionButtonGroup: false,
     layout: 'vertical',
     layout: 'vertical',
@@ -28,7 +28,8 @@
   const keys = ref<string[]>([]);
   const keys = ref<string[]>([]);
 
 
   const modBUSForm = ref<any>({});
   const modBUSForm = ref<any>({});
-  const isShowModBUS = ref<Boolean>(false);
+  const isShowModBUS = ref<Boolean>(false); //用于判断标识符类型是否时自定义还是modBUS
+  const isShowActionType = ref<Boolean>(true); //判断设备属性标识符为modBus时没有填写扩展描述
   const formField = ref('');
   const formField = ref('');
 
 
   const [register] = useModalInner(async (params: ModalParamsType<DeviceModelOfMatterAttrs>) => {
   const [register] = useModalInner(async (params: ModalParamsType<DeviceModelOfMatterAttrs>) => {
@@ -45,6 +46,14 @@
     if (type === DataTypeEnum.IS_STRUCT) {
     if (type === DataTypeEnum.IS_STRUCT) {
       schemas = dataType?.specs as StructJSON[];
       schemas = dataType?.specs as StructJSON[];
     }
     }
+
+    keys.value = schemas.map((item) => {
+      return item.identifier!;
+    });
+    isShowActionType.value = actionType ? true : false; //判断modBUS类型时 物模型是否填写扩展描述
+
+    //是modBUS类型的就用另外的表单
+    //判断是否是modBus的下发命令
     if (codeType == TaskTypeEnum.MODBUS) {
     if (codeType == TaskTypeEnum.MODBUS) {
       isShowModBUS.value = true;
       isShowModBUS.value = true;
       modBUSForm.value = {
       modBUSForm.value = {
@@ -59,9 +68,6 @@
     } else {
     } else {
       isShowModBUS.value = false;
       isShowModBUS.value = false;
       const formSchemas = genForm(schemas);
       const formSchemas = genForm(schemas);
-      keys.value = schemas.map((item) => {
-        return item.identifier!;
-      });
       setProps({ schemas: formSchemas });
       setProps({ schemas: formSchemas });
     }
     }
 
 
@@ -85,15 +91,25 @@
     try {
     try {
       loading.value = true;
       loading.value = true;
       if (!props.deviceId) return;
       if (!props.deviceId) return;
+      if (!unref(isShowActionType)) {
+        createMessage.warning('当前物模型扩展描述没有填写');
+        return;
+      }
+      const flag = await validate();
+      if (!flag) return;
       const sendValue = ref({});
       const sendValue = ref({});
+      //判断tcp类型 标识符是自定义还是ModBus
       if (unref(isShowModBUS)) {
       if (unref(isShowModBUS)) {
-        //判断tcp类型 标识符是自定义还是ModBus
         const oldValue = getFieldsValue()[unref(formField)];
         const oldValue = getFieldsValue()[unref(formField)];
-        const newValue = getArray(SingleToHex(oldValue));
-
-        modBUSForm.value.registerValues =
-          unref(modBUSForm).method != '16' ? [newValue[0]] : newValue;
-        modBUSForm.value.registerNumber = unref(modBUSForm).method != '16' ? 1 : 2;
+        modBUSForm.value.registerValues = [oldValue];
+        modBUSForm.value.registerNumber = 1;
+
+        if (unref(modBUSForm).method == '16') {
+          const newValue = getArray(SingleToHex(oldValue));
+          modBUSForm.value.registerValues = newValue;
+          modBUSForm.value.registerNumber = 2;
+          modBUSForm.value.method = '10';
+        }
 
 
         sendValue.value = await genModbusCommand(unref(modBUSForm));
         sendValue.value = await genModbusCommand(unref(modBUSForm));
       } else {
       } else {