Commit ccaadc2b724d31c658a392f0a0d70366b116cc3a

Authored by loveumiko
2 parents c08613db 3e05e086

Merge branch 'fix/zfl' of http://git.yunteng.com/yunteng/thingskit-scada into fix/zfl

@@ -25,10 +25,11 @@ export const formSchemas = (componentKey?: string): FormSchema[] => { @@ -25,10 +25,11 @@ export const formSchemas = (componentKey?: string): FormSchema[] => {
25 required: !!isTemplate, 25 required: !!isTemplate,
26 componentProps: ({ formModel }) => { 26 componentProps: ({ formModel }) => {
27 return { 27 return {
28 - options: (unref(contentDataStore.getProductAndDevice) || []).map((item: ProductAndDevice) => ({ label: item.profileName || item.name, value: item.profileId })), 28 + options: (unref(contentDataStore.getProductAndDevice) || []).map((item: ProductAndDevice) => ({ label: item.profileName || item.name, value: item.profileId, transportType: item?.transportType, deviceType: item?.deviceType })),
29 placeholder: '请选择产品', 29 placeholder: '请选择产品',
30 - onSelect(value: string) { 30 + onSelect(value: string, option: any) {
31 formModel[ContentDataFieldsEnum.DEVICE_PROFILE_ID] = value 31 formModel[ContentDataFieldsEnum.DEVICE_PROFILE_ID] = value
  32 + formModel[ContentDataFieldsEnum.DEVICE_INFO] = value && option ? { transportType: option.transportType, deviceType: option.deviceType } : null
32 }, 33 },
33 getPopupContainer: () => document.body, 34 getPopupContainer: () => document.body,
34 } 35 }