Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

timeline onClick事件点击无打印输出 #103

Closed
wants to merge 5 commits into from
Closed

timeline onClick事件点击无打印输出 #103

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
483e409
ECharts-JSX 重写地图图表
ziwu7 Dec 13, 2024
d0ff320
【完善】ECharts-JSX 重写地图图表，已修正。
ziwu7 Dec 18, 2024
88a9d29
【完善】ECharts-JSX 重写地图图表，已完成修正。
ziwu7 Dec 18, 2024
1d01856
【完善】ECharts-JSX 重写地图图表,已修正代码
ziwu7 Dec 18, 2024
f0f9cf7
timeline onClick事件点击无打印输出
ziwu7 Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 107 additions & 22 deletions source/page/Map/component/EChartsMap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
import 'echarts-jsx/dist/renderers/SVG';
import 'echarts-jsx/dist/components/geo';
import 'echarts-jsx/dist/components/timeline';

import { DataObject } from 'dom-renderer';
import { EChartsOption, EChartsType, init, registerMap } from 'echarts';
import { observable } from 'mobx';
import { observable , runInAction} from 'mobx';
import { attribute, component, observer,WebCell } from 'web-cell';
import { formatDate } from 'web-utility';

import { getHistory, Province } from '../../../service/Epidemic';
import { long2short } from '../adapter';
import { json } from 'stream/consumers';

export interface EChartsMapProps {
/**
Expand Down Expand Up @@ -50,10 +55,15 @@ export class EChartsMap
@attribute
@observable
accessor mapName = 'map';

@attribute
@observable
accessor hovered = '';

@observable
accessor chartOptions: EChartsOption = {};


chart: EChartsType;

mountedCallback() {
Expand All @@ -64,11 +74,11 @@ export class EChartsMap
this.listen();
this.loadData();

self.addEventListener('resize', () => {
this.chart.resize();
// self.addEventListener('resize', () => {
// this.chart.resize();

this.adjustLabel();
});
// this.adjustLabel();
// });
}

adjustLabel() {
Expand All @@ -81,50 +91,123 @@ export class EChartsMap
// implement hover-then-click on mobile devices
let hovered = '';



chart
.on('mouseover', 'series', ({ name }) => {
console.log('mouseover-event');
// prevent click event to trigger immediately
setTimeout(() => (hovered = name));
})
.on('mouseout', 'series', () => {
console.log('mouseout-event');

hovered = '';
})
.on('click', 'series', params => {
console.log('click-seriesevent');
if (hovered) {
this.emit('seriesclick', params);
hovered = '';
}
})
.on('click', 'timeline', ({ dataIndex }) => {
const formattedDate = formatDate(dataIndex, 'YYYY-MM-DD');
chart.dispatchAction({
type: 'timelineChange',
// index of time point
currentIndex: data.findIndex(d => d === dataIndex)
});
getHistory(formattedDate).then(this.updateChartData);
});
// .on('click', 'timeline', ({ dataIndex }) => {
// console.log('click-timelineevent');
// const formattedDate = formatDate(dataIndex, 'YYYY-MM-DD');
// chart.dispatchAction({
// type: 'timelineChange',
// // index of time point
// currentIndex: data.findIndex(d => d === dataIndex)
// });
// getHistory(formattedDate).then(this.updateChartData);
// });
}

// handleSeriesClick = (event: any) => {
// console.log('Series Click Event:', event);
// // 使用原生 ECharts 事件对象
// const params = event.detail || event;
// console.log('Click params:', params);

// if (this.hovered) {
// this.props.onSeriesClick?.(new CustomEvent('seriesclick', {
// detail: params
// }));
// this.hovered = '';
// }
// };

// handleMouseOver = (event: any) => {
// console.log('handleMouseOver Event:', event);
// const eventDetail = event.detail;
// if (eventDetail?.componentType === 'series') {
// const name = eventDetail.name;
// if (name) {
// setTimeout(() => {
// this.hovered = name;
// });
// }
// }
// };



handleTimelineClick = (event: any) => {
console.log('Timeline Click Event:', event);

// const eventDetail = event.detail;
// if (eventDetail?.componentType === 'timeline') {
// const dataIndex = eventDetail.dataIndex;
// const { data } = this.chartOptions.baseOption.timeline;

// const formattedDate = formatDate(dataIndex, 'YYYY-MM-DD');
// getHistory(formattedDate).then(this.updateChartData);
// }
};



async loadData() {
const { chart, mapUrl, mapName, chartOptions } = this;
const { chart, mapUrl, mapName,chartOptions } = this;

chart.showLoading();

const data = await (await fetch(mapUrl)).json();

console.log('data',data)
console.log('chartOptions',chartOptions)
for (const { properties } of data.features)
properties.name = long2short(properties.name);

registerMap(mapName, data);

chart.setOption(chartOptions);

this.adjustLabel();

chart.hideLoading();
this.emit('chartlabeladjust');

}
render() {
const options = this.chartOptions;
console.log('xuanran',options)
const timelineData = options.baseOption?.timeline?.data || [];
console.log('timelineData',timelineData)
return (
<>
<ec-svg-renderer>
<ec-geo
map={this.mapName}
data={options.options[0].series[0]?.data}
// onClick={this.handleSeriesClick}
// onMouseover={this.handleMouseOver}
// onMouseout={() => this.hovered = ''}
/>

<ec-timeline data={timelineData}
onClick={this.handleTimelineClick}
/>

</ec-svg-renderer>
</>
);
}

updateChartData = (newData: Province[]) =>
this.chart.setOption({
series: [
Expand All @@ -136,4 +219,6 @@ export class EChartsMap
}
]
});


}
Loading