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

fix: 修改mqtt属性下发也提示物模型扩展描述没有值

See merge request yunteng/thingskit-front!785

@@ -37,7 +37,8 @@
     const { name, detail, identifier, deviceDetail, extensionDesc } = record;
     const { name, detail, identifier, deviceDetail, extensionDesc } = record;
     const { dataType } = detail;
     const { dataType } = detail;
     const { type } = dataType || {};
     const { type } = dataType || {};
-    const { codeType } = deviceDetail || {};
+    const { codeType, deviceProfile } = deviceDetail || {};
+    const { transportType } = deviceProfile || {};
     const { registerAddress, actionType } = extensionDesc || {};
     const { registerAddress, actionType } = extensionDesc || {};
     formField.value = identifier;
     formField.value = identifier;
 
 
@@ -53,8 +54,8 @@
     isShowActionType.value = actionType ? true : false; //判断modBUS类型时 物模型是否填写扩展描述
     isShowActionType.value = actionType ? true : false; //判断modBUS类型时 物模型是否填写扩展描述
 
 
     //是modBUS类型的就用另外的表单
     //是modBUS类型的就用另外的表单
-    //判断是否是modBus的下发命令
-    if (codeType == TaskTypeEnum.MODBUS) {
+    //判断是否是TCP ==> modBus的下发命令
+    if (codeType == TaskTypeEnum.MODBUS && transportType == 'TCP') {
       isShowModBUS.value = true;
       isShowModBUS.value = true;
       modBUSForm.value = {
       modBUSForm.value = {
         crc: 'CRC_16_LOWER',
         crc: 'CRC_16_LOWER',
@@ -91,15 +92,17 @@
     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
       //判断tcp类型 标识符是自定义还是ModBus
       if (unref(isShowModBUS)) {
       if (unref(isShowModBUS)) {
+        if (!unref(isShowActionType)) {
+          createMessage.warning('当前物模型扩展描述没有填写');
+          return;
+        }
+        const flag = await validate();
+        if (!flag) return;
+
         const oldValue = getFieldsValue()[unref(formField)];
         const oldValue = getFieldsValue()[unref(formField)];
         modBUSForm.value.registerValues = [oldValue];
         modBUSForm.value.registerValues = [oldValue];
         modBUSForm.value.registerNumber = 1;
         modBUSForm.value.registerNumber = 1;