Commit 2e56c11259b4c1b080642e85e748600e03f4b569
1 parent
ed0cd4c6
fix: map component history model not setting model name
Showing
2 changed files
with
12 additions
and
4 deletions
| @@ -111,7 +111,12 @@ | @@ -111,7 +111,12 @@ | ||
| 111 | </script> | 111 | </script> |
| 112 | 112 | ||
| 113 | <template> | 113 | <template> |
| 114 | - <BasicModal @register="registerModal" @ok="handleOk" :ok-button-props="{ loading }"> | 114 | + <BasicModal |
| 115 | + title="历史轨迹" | ||
| 116 | + @register="registerModal" | ||
| 117 | + @ok="handleOk" | ||
| 118 | + :ok-button-props="{ loading }" | ||
| 119 | + > | ||
| 115 | <BasicForm @register="registerForm" /> | 120 | <BasicForm @register="registerForm" /> |
| 116 | </BasicModal> | 121 | </BasicModal> |
| 117 | </template> | 122 | </template> |
| @@ -24,10 +24,13 @@ export const MapRealTrackConfig: Config = { | @@ -24,10 +24,13 @@ export const MapRealTrackConfig: Config = { | ||
| 24 | componentType: FrontComponent.MAP_COMPONENT_TRACK_REAL, | 24 | componentType: FrontComponent.MAP_COMPONENT_TRACK_REAL, |
| 25 | }; | 25 | }; |
| 26 | 26 | ||
| 27 | -const getTrack = (dataSource: DataSource[]) => { | 27 | +const getTrack = (dataSource: DataSource[], config: Config) => { |
| 28 | if (dataSource.length >= 2) { | 28 | if (dataSource.length >= 2) { |
| 29 | const trackRecord = dataSource.slice(0, 2); | 29 | const trackRecord = dataSource.slice(0, 2); |
| 30 | - if (!trackRecord.every((item) => item.componentInfo.value)) | 30 | + if ( |
| 31 | + !trackRecord.every((item) => item.componentInfo.value) && | ||
| 32 | + config.componentType === FrontComponent.MAP_COMPONENT_TRACK_REAL | ||
| 33 | + ) | ||
| 31 | return { track: [], dataSource: [] }; | 34 | return { track: [], dataSource: [] }; |
| 32 | 35 | ||
| 33 | const track = trackRecord.map((item) => { | 36 | const track = trackRecord.map((item) => { |
| @@ -46,7 +49,7 @@ export const transfromMapComponentConfig: ComponentConfig['transformConfig'] = ( | @@ -46,7 +49,7 @@ export const transfromMapComponentConfig: ComponentConfig['transformConfig'] = ( | ||
| 46 | _record, | 49 | _record, |
| 47 | dataSourceRecord | 50 | dataSourceRecord |
| 48 | ) => { | 51 | ) => { |
| 49 | - const { track, dataSource } = getTrack(dataSourceRecord as DataSource[]); | 52 | + const { track, dataSource } = getTrack(dataSourceRecord as DataSource[], componentConfig); |
| 50 | return { | 53 | return { |
| 51 | layout: { | 54 | layout: { |
| 52 | ...componentConfig, | 55 | ...componentConfig, |