Merge branch 'fix/zfl' into 'perf/main_dev'

fix: 修复设备选择是网关子时命令下发方式没有服务调用

See merge request yunteng/thingskit-scada!159

@@ -41,7 +41,7 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
   // transportType:判断是什么类型的设备 code:设备地址码  deviceType:设备类型
   let codeType: string | null = ''
   const { transportType, deviceType, codeType: deviceCodeType } = deviceInfo || {}
-  codeType = deviceCodeType || (deviceId ? contentDataStore.diveceDetailMap?.[deviceId].codeType : null)
+  codeType = deviceCodeType || (deviceId ? contentDataStore.diveceDetailMap?.[deviceId]?.codeType : null)
   const isTemplate = contentDataStore.isTemplate // 判断是否是模板
   return [
     {
@@ -124,8 +124,17 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
 
           function setOptions() {
             // 是模板的话选择不到设备标识符类型所以就判断为放开自定义命令
-            if (isTemplate)
+            if (isTemplate) {
+              if (transportType !== TransportTypeEnum.TCP)
+                options.push(serviceOption)
               return
+            }
+
+            if (transportType !== TransportTypeEnum.TCP && deviceType === DeviceTypeEnum.SENSOR) {
+              // 判断不是TCP但是是网关子
+              options.push(serviceOption)
+              return
+            }
 
             if (deviceType !== DeviceTypeEnum.SENSOR)
               options.push(serviceOption)