Commit 263238de553b09e0aaba69978bbd76e118fa8fb8

Authored by dev001
1 parent e5dcc66d

fix: 数据流转中,选择的数据源设备不是所属组织下的设备

@@ -61,7 +61,7 @@ export const modeForm = (disabled: boolean): FormSchema[] => { @@ -61,7 +61,7 @@ export const modeForm = (disabled: boolean): FormSchema[] => {
61 }, 61 },
62 { 62 {
63 required: true, 63 required: true,
64 - field: 'organizationId', 64 + field: BasicInfoFormField.ORGANIZATION_ID,
65 label: '所属组织', 65 label: '所属组织',
66 colProps: { span: 24 }, 66 colProps: { span: 24 },
67 component: 'OrgTreeSelect', 67 component: 'OrgTreeSelect',
@@ -118,9 +118,10 @@ export const modeForm = (disabled: boolean): FormSchema[] => { @@ -118,9 +118,10 @@ export const modeForm = (disabled: boolean): FormSchema[] => {
118 componentProps: ({ formModel }) => { 118 componentProps: ({ formModel }) => {
119 const convertConfigId = formModel[BasicInfoFormField.CONVERT_CONFIG_ID]; 119 const convertConfigId = formModel[BasicInfoFormField.CONVERT_CONFIG_ID];
120 const deviceProfileIds = formModel[BasicInfoFormField.DATA_SOURCE_PRODUCT]; 120 const deviceProfileIds = formModel[BasicInfoFormField.DATA_SOURCE_PRODUCT];
  121 + const organizationId = formModel[BasicInfoFormField.ORGANIZATION_ID];
121 return { 122 return {
122 disabled, 123 disabled,
123 - params: { convertConfigId, deviceProfileIds }, 124 + params: { convertConfigId, deviceProfileIds, organizationId },
124 transformValue: handleGroupDevice, 125 transformValue: handleGroupDevice,
125 openModalValidate: () => { 126 openModalValidate: () => {
126 if (!deviceProfileIds || !deviceProfileIds?.length) { 127 if (!deviceProfileIds || !deviceProfileIds?.length) {
@@ -8,6 +8,7 @@ export enum BasicInfoFormField { @@ -8,6 +8,7 @@ export enum BasicInfoFormField {
8 DATA_SOURCE_PRODUCT = 'datasourceProduct', 8 DATA_SOURCE_PRODUCT = 'datasourceProduct',
9 DATA_SOURCE_DEVICE = 'datasourceDevice', 9 DATA_SOURCE_DEVICE = 'datasourceDevice',
10 CONVERT_CONFIG_ID = 'convertConfigId', 10 CONVERT_CONFIG_ID = 'convertConfigId',
  11 + ORGANIZATION_ID = 'organizationId',
11 } 12 }
12 13
13 export enum DataSourceType { 14 export enum DataSourceType {