Merge branch 'fix/object-model-service-invocation' into 'main_dev'

fix: 修复服务命令下发同步为双向异步为单向

See merge request yunteng/thingskit-front!724

@@ -876,8 +876,8 @@ export const CommandSchemas = (
             const setValues = {
             const setValues = {
               [CommandFieldsEnum.CUSTOM_TYPE]:
               [CommandFieldsEnum.CUSTOM_TYPE]:
                 options.callType === ServiceCallTypeEnum.ASYNC
                 options.callType === ServiceCallTypeEnum.ASYNC
-                  ? CommandDeliveryWayEnum.TWO_WAY
-                  : CommandDeliveryWayEnum.ONE_WAY,
+                  ? CommandDeliveryWayEnum.ONE_WAY
+                  : CommandDeliveryWayEnum.TWO_WAY,
               [CommandFieldsEnum.MODEL_INPUT]: null,
               [CommandFieldsEnum.MODEL_INPUT]: null,
             };
             };
 
 

@@ -264,6 +264,13 @@ export const trigger_condition_schema: FormSchema[] = [
             useByProductGetAttribute(res, updateSchema, options);
             useByProductGetAttribute(res, updateSchema, options);
           }
           }
         },
         },
+        filterOption: (inputValue: string, option: Record<'label' | 'value', string>) => {
+          let { label, value } = option;
+          label = label.toLowerCase();
+          value = value.toLowerCase();
+          inputValue = inputValue.toLowerCase();
+          return label.includes(inputValue) || value.includes(inputValue);
+        },
       };
       };
     },
     },
   },
   },
@@ -308,6 +315,13 @@ export const trigger_condition_schema: FormSchema[] = [
         },
         },
         placeholder: '请选择设备',
         placeholder: '请选择设备',
         getPopupContainer: () => document.body,
         getPopupContainer: () => document.body,
+        filterOption: (inputValue: string, option: Record<'label' | 'value', string>) => {
+          let { label, value } = option;
+          label = label.toLowerCase();
+          value = value.toLowerCase();
+          inputValue = inputValue.toLowerCase();
+          return label.includes(inputValue) || value.includes(inputValue);
+        },
       };
       };
     },
     },
     ifShow: ({ values }) => isPart(values.device),
     ifShow: ({ values }) => isPart(values.device),

@@ -30,7 +30,7 @@ export function useSendCommand() {
       // 如果是TCP设备从物模型中获取下发命令(TCP网关子设备无物模型服务与事件)
       // 如果是TCP设备从物模型中获取下发命令(TCP网关子设备无物模型服务与事件)
       if (customCommand?.transportType === TransportTypeEnum.TCP) {
       if (customCommand?.transportType === TransportTypeEnum.TCP) {
         params = customCommand.command!;
         params = customCommand.command!;
-        if (customCommand.callType === ServiceCallTypeEnum.ASYNC) {
+        if (customCommand.callType === ServiceCallTypeEnum.SYNC) {
           sendCommandFn = sendCommandTwoway;
           sendCommandFn = sendCommandTwoway;
         }
         }
       }
       }