Merge remote-tracking branch 'origin/fix/zfl' into perf/main_dev

@@ -114,34 +114,34 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
       required: true,
       required: true,
       ifShow: ({ model }) => model[FormFieldsEnum.ACTION_TYPE] === EventActionTypeEnum.PARAMS_SETTING,
       ifShow: ({ model }) => model[FormFieldsEnum.ACTION_TYPE] === EventActionTypeEnum.PARAMS_SETTING,
       componentProps: ({ formActionType }) => {
       componentProps: ({ formActionType }) => {
-        const values = [
-          { label: CommandDeliveryWayNameEnum.CUSTOM, value: CommandDeliveryWayEnum.CUSTOM },
-          { label: CommandDeliveryWayNameEnum.SERVICE, value: CommandDeliveryWayEnum.SERVICE },
-          { label: CommandDeliveryWayNameEnum.MODBUS, value: CommandDeliveryWayEnum.MODBUS },
-        ]
-        let options = [...values]
-        if (transportType === TransportTypeEnum.TCP) { // 只有TCP类型的才有MODBUS
-          if (codeType === CommandDeliveryWayEnum.CUSTOM) {
+        function getOptions() {
+          const options = [
+            { label: CommandDeliveryWayNameEnum.CUSTOM, value: CommandDeliveryWayEnum.CUSTOM },
+          ]
+
+          const serviceOption = { label: CommandDeliveryWayNameEnum.SERVICE, value: CommandDeliveryWayEnum.SERVICE }
+          const modbusOption = { label: CommandDeliveryWayNameEnum.MODBUS, value: CommandDeliveryWayEnum.MODBUS }
+
+          function setOptions() {
+            // 是模板的话选择不到设备标识符类型所以就判断为放开自定义命令
+            if (isTemplate)
+              return
+
             if (deviceType !== DeviceTypeEnum.SENSOR)
             if (deviceType !== DeviceTypeEnum.SENSOR)
-              options = values.filter(item => item.value !== CommandDeliveryWayEnum.MODBUS)
+              options.push(serviceOption)
 
 
-            else
-              options = values.filter(item => item.value === CommandDeliveryWayEnum.CUSTOM)
-          }
-          else {
-            if (deviceType === DeviceTypeEnum.SENSOR)
-              options = values.filter(item => item.value !== CommandDeliveryWayEnum.SERVICE)
+            if (transportType !== TransportTypeEnum.TCP) return
+
+            if (codeType !== CommandDeliveryWayEnum.CUSTOM)
+              options.push(modbusOption)
           }
           }
-        }
-        else {
-          options = values.filter(item => item.value !== CommandDeliveryWayEnum.MODBUS)
-        }
 
 
-        if (isTemplate)// 是模板的话选择不到设备标识符类型所以就判断为放开自定义命令
-          options = values.filter(item => item.value === CommandDeliveryWayEnum.CUSTOM)
+          setOptions()
+          return options
+        }
 
 
         return {
         return {
-          options,
+          options: getOptions(),
           onSelect() {
           onSelect() {
             const { setFieldsValue } = formActionType
             const { setFieldsValue } = formActionType
             setFieldsValue({
             setFieldsValue({