Commit ab2cc5fb0c0bfa73a4748f9a3ab1a43828e10f00
1 parent
722e9352
fix: rule data flow select device use tbDeviceId
Showing
3 changed files
with
5 additions
and
3 deletions
| ... | ... | @@ -64,9 +64,9 @@ const handleGroupDevice = (options: DeviceRecord[]) => { |
| 64 | 64 | options.forEach((item) => { |
| 65 | 65 | if (map.has(item.profileId)) { |
| 66 | 66 | const deviceList = map.get(item.profileId)!; |
| 67 | - deviceList.push(item.id); | |
| 67 | + deviceList.push(item.tbDeviceId); | |
| 68 | 68 | } else { |
| 69 | - map.set(item.profileId, [item.id]); | |
| 69 | + map.set(item.profileId, [item.tbDeviceId]); | |
| 70 | 70 | } |
| 71 | 71 | }); |
| 72 | 72 | const value = Array.from(map.entries()).map(([product, devices]) => ({ product, devices })); |
| ... | ... | @@ -230,7 +230,7 @@ export const modeForm = (submitFn?: Function): FormSchema[] => { |
| 230 | 230 | |
| 231 | 231 | return { |
| 232 | 232 | labelField: 'name', |
| 233 | - valueField: 'id', | |
| 233 | + valueField: 'tbDeviceId', | |
| 234 | 234 | pendingTableProps: { |
| 235 | 235 | ...TransferTableProps, |
| 236 | 236 | api: devicePage, | ... | ... |
| ... | ... | @@ -536,6 +536,7 @@ export const actionSchema: FormSchema[] = [ |
| 536 | 536 | params: { |
| 537 | 537 | dictCode: 'custom_define', |
| 538 | 538 | }, |
| 539 | + numberToString: true, | |
| 539 | 540 | getPopupContainer: () => document.body, |
| 540 | 541 | onChange: () => { |
| 541 | 542 | setFieldsValue({ doContext: null, thingsModelId: null }); | ... | ... |