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

perf: 优化自定义TCP网关与网关子设备物模型属性应为只读

See merge request yunteng/thingskit-front!1512

@@ -19,7 +19,12 @@
   import { ModeSwitchButton, EnumTableCardMode } from '/@/components/Widget';
   import { ModeSwitchButton, EnumTableCardMode } from '/@/components/Widget';
   import { toRaw } from 'vue';
   import { toRaw } from 'vue';
   import { DataActionModeEnum } from '/@/enums/toolEnum';
   import { DataActionModeEnum } from '/@/enums/toolEnum';
-  import { ReadAndWriteEnum, TCPProtocolTypeEnum, TransportTypeEnum } from '/@/enums/deviceEnum';
+  import {
+    DeviceTypeEnum,
+    ReadAndWriteEnum,
+    TCPProtocolTypeEnum,
+    TransportTypeEnum,
+  } from '/@/enums/deviceEnum';
   import { ObjectModelCommandDeliveryModal } from './ObjectModelCommandDeliveryModal';
   import { ObjectModelCommandDeliveryModal } from './ObjectModelCommandDeliveryModal';
   import { ModalParamsType } from '/#/utils';
   import { ModalParamsType } from '/#/utils';
   import { AreaChartOutlined } from '@ant-design/icons-vue';
   import { AreaChartOutlined } from '@ant-design/icons-vue';
@@ -312,7 +317,7 @@
 
 
     switch (item.type) {
     switch (item.type) {
       case DataTypeEnum.BOOL:
       case DataTypeEnum.BOOL:
-        return !!Number(item.value) ? item.boolOpen : item.boolClose;
+        return !!Number(item.value) ? item.boolOpen! : item.boolClose!;
       case DataTypeEnum.ENUM:
       case DataTypeEnum.ENUM:
         return item.enum?.[item.value as string];
         return item.enum?.[item.value as string];
       default:
       default:
@@ -328,6 +333,24 @@
     } as ModalParamsType);
     } as ModalParamsType);
   };
   };
 
 
+  const isTCPCustomProtocolType = computed(() => {
+    const isTCPType = props.deviceDetail.transportType === TransportTypeEnum.TCP;
+
+    return (
+      isTCPType &&
+      props.deviceDetail.deviceProfile?.profileData?.transportConfiguration?.protocol ===
+        TCPProtocolTypeEnum.CUSTOM
+    );
+  });
+
+  const isGatewayOrSensorTCPCustomDevice = computed(
+    () =>
+      unref(isTCPCustomProtocolType) &&
+      [DeviceTypeEnum.GATEWAY, DeviceTypeEnum.SENSOR].includes(
+        props.deviceDetail.deviceType as DeviceTypeEnum
+      )
+  );
+
   onMounted(() => {
   onMounted(() => {
     const element = unref(listElRef)?.$el;
     const element = unref(listElRef)?.$el;
     if (!element) return;
     if (!element) return;
@@ -391,7 +414,10 @@
                     <SvgIcon
                     <SvgIcon
                       name="send-command"
                       name="send-command"
                       prefix="iconfont"
                       prefix="iconfont"
-                      v-if="ReadAndWriteEnum.READ_AND_WRITE === item.accessMode"
+                      v-if="
+                        ReadAndWriteEnum.READ_AND_WRITE === item.accessMode &&
+                        !isGatewayOrSensorTCPCustomDevice
+                      "
                       class="cursor-pointer text-lg text-blue-500"
                       class="cursor-pointer text-lg text-blue-500"
                       @click="handleSendCommandModal(item)"
                       @click="handleSendCommandModal(item)"
                     />
                     />

@@ -87,6 +87,12 @@ export const getFormSchemas = ({
     isTCPTransport &&
     isTCPTransport &&
     deviceRecord?.profileData.transportConfiguration.protocol === TCPProtocolTypeEnum.MODBUS_RTU;
     deviceRecord?.profileData.transportConfiguration.protocol === TCPProtocolTypeEnum.MODBUS_RTU;
 
 
+  const isTCPCustomProdcut =
+    isTCPTransport &&
+    deviceRecord?.profileData.transportConfiguration.protocol === TCPProtocolTypeEnum.CUSTOM;
+
+  const deviceType = deviceRecord?.deviceType;
+
   return [
   return [
     {
     {
       field: FormFieldsEnum.FUNCTION_TYPE,
       field: FormFieldsEnum.FUNCTION_TYPE,
@@ -160,9 +166,20 @@ export const getFormSchemas = ({
         ![FunctionTypeEnum.SERVICE, FunctionTypeEnum.EVENTS].includes(
         ![FunctionTypeEnum.SERVICE, FunctionTypeEnum.EVENTS].includes(
           model[FormFieldsEnum.FUNCTION_TYPE]
           model[FormFieldsEnum.FUNCTION_TYPE]
         ) && !isTCPModbusProduct,
         ) && !isTCPModbusProduct,
-      defaultValue: ObjectModelAccessModeEnum.READ_AND_WRITE,
+      defaultValue:
+        isTCPCustomProdcut && deviceType !== DeviceTypeEnum.DIRECT_CONNECTION
+          ? ObjectModelAccessModeEnum.READ
+          : ObjectModelAccessModeEnum.READ_AND_WRITE,
       componentProps: {
       componentProps: {
-        api: findDictItemByCode,
+        api: async (params) => {
+          const res = await findDictItemByCode(params);
+
+          // if (isTCPCustomProdcut && deviceType !== DeviceTypeEnum.DIRECT_CONNECTION) {
+          //   res = res.filter((item) => item.itemValue === ObjectModelAccessModeEnum.READ);
+          // }
+
+          return res;
+        },
         params: {
         params: {
           dictCode: DictEnum.READ_WRITE_TYP,
           dictCode: DictEnum.READ_WRITE_TYP,
         },
         },