Commit b4a50ab38564b51524431fc702cdc42b93807475
Merge branch 'fix/DEFECT-1784' into 'main_dev'
fix: 修复产品品类导入TCP物模型问题 See merge request yunteng/thingskit-front!1048
Showing
3 changed files
with
6 additions
and
4 deletions
| ... | ... | @@ -30,7 +30,7 @@ |
| 30 | 30 | <Attribute |
| 31 | 31 | v-if="activeKey === FunctionType.PROPERTIES" |
| 32 | 32 | :openModalMode="openModalMode" |
| 33 | - :transportType="record.transportType" | |
| 33 | + :transportType="record?.transportType" | |
| 34 | 34 | ref="AttrRef" |
| 35 | 35 | /> |
| 36 | 36 | <Service |
| ... | ... | @@ -82,7 +82,7 @@ |
| 82 | 82 | |
| 83 | 83 | const isTCPGatewaySubDevice = computed(() => { |
| 84 | 84 | const { record } = props; |
| 85 | - const { deviceType, transportType } = record; | |
| 85 | + const { deviceType, transportType } = record || {}; | |
| 86 | 86 | return deviceType === DeviceTypeEnum.SENSOR && transportType === 'TCP'; |
| 87 | 87 | }); |
| 88 | 88 | ... | ... |
| ... | ... | @@ -15,7 +15,7 @@ |
| 15 | 15 | import { formSchemas } from '/@/components/Form/src/externalCompns/components/StructForm/config'; |
| 16 | 16 | import { TransportTypeEnum } from '../../../../components/TransportDescript/const'; |
| 17 | 17 | |
| 18 | - const props = defineProps<{ openModalMode: OpenModelMode; transportType: string }>(); | |
| 18 | + const props = defineProps<{ openModalMode: OpenModelMode; transportType?: string | undefined }>(); | |
| 19 | 19 | |
| 20 | 20 | const [register, { validate, resetFields, setFieldsValue, setProps }] = useForm({ |
| 21 | 21 | labelWidth: 100, | ... | ... |
| ... | ... | @@ -18,7 +18,9 @@ |
| 18 | 18 | |
| 19 | 19 | const [register, { validate, resetFields, setFieldsValue, setProps }] = useForm({ |
| 20 | 20 | labelWidth: 100, |
| 21 | - schemas: serviceSchemas(props.record.transportType === 'TCP'), | |
| 21 | + schemas: serviceSchemas( | |
| 22 | + props.record.transportType === 'TCP' || props.record.ifShowClass === true | |
| 23 | + ), | |
| 22 | 24 | actionColOptions: { |
| 23 | 25 | span: 14, |
| 24 | 26 | }, | ... | ... |