Commit 6263c0b2edef91b6a7807e82874acc6560c6c36c

Authored by xp.Huang
2 parents 8b97697e ece6fef1

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

fix: 修复DEFECT-1771 场景联动选择TCP服务校验不通过

See merge request yunteng/thingskit-front!1028
@@ -116,18 +116,15 @@ export const getFormSchemas = ({ @@ -116,18 +116,15 @@ export const getFormSchemas = ({
116 }; 116 };
117 }; 117 };
118 118
119 - const createTCPServiceCommandInput = ({  
120 - serviceCommand,  
121 - functionName,  
122 - }: StructJSON): FormSchema => { 119 + const createTCPServiceCommandInput = ({ serviceCommand }: StructJSON): FormSchema => {
123 return { 120 return {
124 field: 'serviceCommand', 121 field: 'serviceCommand',
125 label: '服务命令', 122 label: '服务命令',
126 component: 'Input', 123 component: 'Input',
127 required, 124 required,
  125 + defaultValue: serviceCommand,
128 componentProps: { 126 componentProps: {
129 - defaultValue: serviceCommand,  
130 - placeholder: `请输入${functionName}`, 127 + placeholder: `请输入服务命令`,
131 }, 128 },
132 }; 129 };
133 }; 130 };
@@ -219,6 +219,10 @@ export const getFormSchemas = (hasAlarmNotify: Ref<boolean>): FormSchema[] => { @@ -219,6 +219,10 @@ export const getFormSchemas = (hasAlarmNotify: Ref<boolean>): FormSchema[] => {
219 setFieldsValue({ 219 setFieldsValue({
220 [FormFieldsEnum.ENTITY_ID]: [], 220 [FormFieldsEnum.ENTITY_ID]: [],
221 [FormFieldsEnum.TRANSPORT_TYPE]: option?.transportType, 221 [FormFieldsEnum.TRANSPORT_TYPE]: option?.transportType,
  222 + [FormFieldsEnum.SERVICE_ID]: null,
  223 + [FormFieldsEnum.CALL_SERVICE]: null,
  224 + [FormFieldsEnum.CALL_SERVICE_IDENTIFIER]: null,
  225 + [FormFieldsEnum.SERVICE_COMMAND]: null,
222 }); 226 });
223 }, 227 },
224 onOptionsChange(options: (DeviceProfileModel & Record<'label' | 'value', string>)[]) { 228 onOptionsChange(options: (DeviceProfileModel & Record<'label' | 'value', string>)[]) {