center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix(图表): 修复地图区域选择框丢失

Browse Source
This commit is contained in:
wisonic-s 2024-03-14 15:39:05 +08:00
parent a455851608
commit 650101652d
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/core-frontend/src/views/chart/components/editor/index.vue
View File

@ -205,17 +205,17 @@ watch(
if (showAxis('area')) {
if (!state.worldTree?.length) {
getWorldTree().then(res => {
state.worldTree = [res.data]
state.worldTree.splice(0, state.worldTree.length, res.data)
state.areaId = view.value?.customAttr?.map?.id
})
} else {
state.areaId = view.value?.customAttr?.map?.id
}
areaSelect.value?.blur()
expandKeys.value = []
areaSelect.value?.setCurrentKey(state.areaId, state.areaId)
expandKeys.value.splice(0)
areaSelect.value?.setCurrentKey(state.areaId)
}
state.chartTypeOptions = [getViewConfig(newVal[0])]
state.chartTypeOptions.splice(0, state.chartTypeOptions.length, getViewConfig(newVal[0]))
state.useless = newVal[0]
},
{ immediate: true, deep: false }

5
core/core-frontend/src/views/chart/components/js/panel/charts/map/bubble-map.ts
View File

@ -104,7 +104,6 @@ export class BubbleMap extends L7PlotChartView<ChoroplethOptions, Choropleth> {
view.once('loaded', () => {
view.addLayer(dotLayer)
view.on('fillAreaLayer:click', (ev: MapMouseEvent) => {
console.log(view)
const data = ev.feature.properties
action({
x: ev.x,
@ -120,14 +119,14 @@ export class BubbleMap extends L7PlotChartView<ChoroplethOptions, Choropleth> {
}
private getDotLayer(chart: Chart, data: any[], geoJson: FeatureCollection): IPlotLayer {
const areaMap = data.reduce((obj, value) => {
const areaMap = data?.reduce((obj, value) => {
obj[value['field']] = value.value
return obj
}, {})
const dotData = []
geoJson.features.forEach(item => {
const name = item.properties['name']
if (areaMap[name]) {
if (areaMap?.[name]) {
dotData.push({
x: item.properties['centroid'][0],
y: item.properties['centroid'][1],

1
core/core-frontend/src/views/chart/components/js/panel/charts/map/common.ts
View File

@ -41,6 +41,7 @@ export const MAP_EDITOR_PROPERTY_INNER: EditorPropertyInner = {
export const MAP_AXIS_TYPE: AxisType[] = [
'xAxis',
'yAxis',
'area',
'drill',
'filter',
'extLabel',

6
core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue
View File

@ -150,6 +150,7 @@ const country = ref('')
const appStore = useAppStoreWithOut()
const isDataEaseBi = computed(() => appStore.getIsDataEaseBi)
let mapTimer
const chartContainer = ref<HTMLElement>(null)
const renderL7Plot = (chart, chartView: L7PlotChartView<any, any>, callback?) => {
const map = parseJson(chart.customAttr).map
let areaId = map.id
@ -160,6 +161,9 @@ const renderL7Plot = (chart, chartView: L7PlotChartView<any, any>, callback?) =>
mapTimer && clearTimeout(mapTimer)
mapTimer = setTimeout(async () => {
myChart?.destroy()
if (chartContainer.value) {
chartContainer.value.textContent = ''
}
myChart = await chartView.drawChart({
chartObj: myChart,
container: containerId,
@ -301,7 +305,7 @@ onBeforeUnmount(() => {
:style="state.trackBarStyle"
@trackClick="trackClick"
/>
<div v-if="!isError" class="canvas-content" :id="containerId"></div>
<div v-if="!isError" ref="chartContainer" class="canvas-content" :id="containerId"></div>
<chart-error v-else :err-msg="errMsg" />
</div>
</template>