Merge branch 'fix/device-send-command' into 'main_dev'

fix: 修复服务未区分单双向

See merge request yunteng/thingskit-scada!171

@@ -262,7 +262,6 @@ const handleSubmit = async () => {
         sendValue.value = values
         sendValue.value = values
       }
       }
     }
     }
-
     await sendRpcOneway({
     await sendRpcOneway({
       additionalInfo: {
       additionalInfo: {
         cmdType:
         cmdType:
@@ -273,7 +272,7 @@ const handleSubmit = async () => {
       persistent: true,
       persistent: true,
       method: 'methodThingskit',
       method: 'methodThingskit',
       params: serviceInfo.transportType !== TransportTypeEnum.TCP && unref(isCommandWay) === CommandDeliveryWayEnum.SERVICE ? { service: unref(sendValue) } : unref(sendValue),
       params: serviceInfo.transportType !== TransportTypeEnum.TCP && unref(isCommandWay) === CommandDeliveryWayEnum.SERVICE ? { service: unref(sendValue) } : unref(sendValue),
-    }, dataSourceJson.value.deviceId, serviceInfo.way)
+    }, dataSourceJson.value.deviceId, serviceInfo.callType ? serviceInfo.callType === 'SYNC' ? 'twoway' : 'oneway' : serviceInfo.way)
     createMessage.success('命令下发成功')
     createMessage.success('命令下发成功')
     visible.value = false
     visible.value = false
     isInputData.value = false
     isInputData.value = false

@@ -69,7 +69,8 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
           { label: EventActionTypeNameEnum.OPEN_PAGE, value: EventActionTypeEnum.OPEN_PAGE, disbaled: false },
           { label: EventActionTypeNameEnum.OPEN_PAGE, value: EventActionTypeEnum.OPEN_PAGE, disbaled: false },
 
 
         ] as any
         ] as any
-        if (unref(getCellInfo).category === PackageCategoryEnum.CONTROL)
+
+        if (unref(getCellInfo).category.toUpperCase() === PackageCategoryEnum.CONTROL)
           options.push({ label: EventActionTypeNameEnum.PARAMS_SETTING, value: EventActionTypeEnum.PARAMS_SETTING, disabled: !deviceProfileId })
           options.push({ label: EventActionTypeNameEnum.PARAMS_SETTING, value: EventActionTypeEnum.PARAMS_SETTING, disabled: !deviceProfileId })
 
 
         return {
         return {

@@ -13,6 +13,7 @@ import { useMessage } from '@/hooks/web/useMessage'
 import type { NodeDataActJsonType, NodeDataEventJsonType } from '@/api/node/model'
 import type { NodeDataActJsonType, NodeDataEventJsonType } from '@/api/node/model'
 import { PackageCategoryEnum } from '@/core/Library/enum'
 import { PackageCategoryEnum } from '@/core/Library/enum'
 import { useContentDataStoreWithOut } from '@/store/modules/contentData'
 import { useContentDataStoreWithOut } from '@/store/modules/contentData'
+import { BasicHelp } from '@/components/Basic'
 
 
 const props = defineProps<ConfigComponentProps>()
 const props = defineProps<ConfigComponentProps>()
 
 
@@ -83,6 +84,11 @@ const validatePassword = () => {
   return operationPassword.value ? Promise.resolve(operationPassword) : Promise.reject(new Error('请输入操作密码'))
   return operationPassword.value ? Promise.resolve(operationPassword) : Promise.reject(new Error('请输入操作密码'))
 }
 }
 
 
+const getSetPasswordStatus = computed(() => {
+  const data = unref(getNodeData)?.eventJson?.SINGLE
+  return !data
+})
+
 const { savePageContent } = useSavePageContent()
 const { savePageContent } = useSavePageContent()
 const handleSave = async () => {
 const handleSave = async () => {
   loading.value = true
   loading.value = true
@@ -161,8 +167,11 @@ createPublicFormContext(nodeDataActinType)
       </Divider>
       </Divider>
       <DataEvents ref="dataEventsElRef" :before-click="handleBeforeOpenEventOrActModal" :form-setting="getFormSetting" />
       <DataEvents ref="dataEventsElRef" :before-click="handleBeforeOpenEventOrActModal" :form-setting="getFormSetting" />
       <div v-if="getCellInfo.category === PackageCategoryEnum.CONTROL" class="flex flex-col justify-center passwordInput" :class="getFormSetting?.actSetting === false && 'mb-4'">
       <div v-if="getCellInfo.category === PackageCategoryEnum.CONTROL" class="flex flex-col justify-center passwordInput" :class="getFormSetting?.actSetting === false && 'mb-4'">
-        <Checkbox v-model:checked="operationPassword.checked">
-          {{ operationPassword.label }}
+        <Checkbox v-model:checked="operationPassword.checked" :disabled="getSetPasswordStatus">
+          <div class="flex">
+            {{ operationPassword.label }}
+            <BasicHelp class="ml-1" text="操作密码: 需完成单击事件交互。" />
+          </div>
         </Checkbox>
         </Checkbox>
         <Form>
         <Form>
           <FormItem :validate-status="getValidateStatus(operationPassword.value)">
           <FormItem :validate-status="getValidateStatus(operationPassword.value)">