Commit 330cd0471407b17f4bc8fa412ac30fd6188d1f29

Authored by loveumiko
1 parent 1b5b3369

fix: 修改选择命令下发方式

@@ -114,34 +114,34 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => { @@ -114,34 +114,34 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
114 required: true, 114 required: true,
115 ifShow: ({ model }) => model[FormFieldsEnum.ACTION_TYPE] === EventActionTypeEnum.PARAMS_SETTING, 115 ifShow: ({ model }) => model[FormFieldsEnum.ACTION_TYPE] === EventActionTypeEnum.PARAMS_SETTING,
116 componentProps: ({ formActionType }) => { 116 componentProps: ({ formActionType }) => {
117 - const values = [  
118 - { label: CommandDeliveryWayNameEnum.CUSTOM, value: CommandDeliveryWayEnum.CUSTOM },  
119 - { label: CommandDeliveryWayNameEnum.SERVICE, value: CommandDeliveryWayEnum.SERVICE },  
120 - { label: CommandDeliveryWayNameEnum.MODBUS, value: CommandDeliveryWayEnum.MODBUS },  
121 - ]  
122 - let options = [...values]  
123 - if (transportType === TransportTypeEnum.TCP) { // 只有TCP类型的才有MODBUS  
124 - if (codeType === CommandDeliveryWayEnum.CUSTOM) { 117 + function getOptions() {
  118 + const options = [
  119 + { label: CommandDeliveryWayNameEnum.CUSTOM, value: CommandDeliveryWayEnum.CUSTOM },
  120 + ]
  121 +
  122 + const serviceOption = { label: CommandDeliveryWayNameEnum.SERVICE, value: CommandDeliveryWayEnum.SERVICE }
  123 + const modbusOption = { label: CommandDeliveryWayNameEnum.MODBUS, value: CommandDeliveryWayEnum.MODBUS }
  124 +
  125 + function setOptions() {
  126 + // 是模板的话选择不到设备标识符类型所以就判断为放开自定义命令
  127 + if (isTemplate)
  128 + return
  129 +
125 if (deviceType !== DeviceTypeEnum.SENSOR) 130 if (deviceType !== DeviceTypeEnum.SENSOR)
126 - options = values.filter(item => item.value !== CommandDeliveryWayEnum.MODBUS) 131 + options.push(serviceOption)
127 132
128 - else  
129 - options = values.filter(item => item.value === CommandDeliveryWayEnum.CUSTOM)  
130 - }  
131 - else {  
132 - if (deviceType === DeviceTypeEnum.SENSOR)  
133 - options = values.filter(item => item.value !== CommandDeliveryWayEnum.SERVICE) 133 + if (transportType !== TransportTypeEnum.TCP) return
  134 +
  135 + if (codeType !== CommandDeliveryWayEnum.CUSTOM)
  136 + options.push(modbusOption)
134 } 137 }
135 - }  
136 - else {  
137 - options = values.filter(item => item.value !== CommandDeliveryWayEnum.MODBUS)  
138 - }  
139 138
140 - if (isTemplate)// 是模板的话选择不到设备标识符类型所以就判断为放开自定义命令  
141 - options = values.filter(item => item.value === CommandDeliveryWayEnum.CUSTOM) 139 + setOptions()
  140 + return options
  141 + }
142 142
143 return { 143 return {
144 - options, 144 + options: getOptions(),
145 onSelect() { 145 onSelect() {
146 const { setFieldsValue } = formActionType 146 const { setFieldsValue } = formActionType
147 setFieldsValue({ 147 setFieldsValue({