ios 兼容问题
This commit is contained in:
parent
aea8c0f0bd
commit
72449c7705
File diff suppressed because one or more lines are too long
|
|
@ -1,39 +1,43 @@
|
||||||
import React, {Component} from 'react';
|
import React, { Component } from "react";
|
||||||
import {WebView, View, StyleSheet, Platform} from 'react-native';
|
import { WebView, View } from "react-native";
|
||||||
import renderChart from './renderChart';
|
import renderChart from "./renderChart";
|
||||||
|
|
||||||
export default class App extends Component {
|
export default class App extends Component {
|
||||||
|
// 预防过渡渲染
|
||||||
constructor(props) {
|
shouldComponentUpdate(nextProps = {}, nextState) {
|
||||||
super(props);
|
const thisProps = this.props || {};
|
||||||
this.setNewOption = this.setNewOption.bind(this);
|
if (Object.keys(thisProps).length !== Object.keys(nextProps).length) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
for (const key in nextProps) {
|
||||||
|
if (JSON.stringify(thisProps[key]) !== JSON.stringify(nextProps[key])) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
componentWillReceiveProps(nextProps) {
|
componentWillReceiveProps(nextProps) {
|
||||||
if (nextProps.option !== this.props.option) {
|
if (nextProps.option !== this.props.option) {
|
||||||
this.refs.chart.reload();
|
// 解决数据改变时页面闪烁的问题
|
||||||
|
this.refs.chart.injectJavaScript(renderChart(nextProps, false));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
setNewOption(option) {
|
|
||||||
this.refs.chart.postMessage(JSON.stringify(option));
|
|
||||||
}
|
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
|
const messageFn = this.props.onMessage || null;
|
||||||
return (
|
return (
|
||||||
<View style={{flex: 1, height: this.props.height || 400,}}>
|
<View style={{ flex: 1, height: this.props.height || 400 }}>
|
||||||
<WebView
|
<WebView
|
||||||
ref="chart"
|
ref="chart"
|
||||||
scrollEnabled={false}
|
scrollEnabled={false}
|
||||||
injectedJavaScript={renderChart(this.props)}
|
scalesPageToFit={false}
|
||||||
|
injectedJavaScript={renderChart(this.props, true)}
|
||||||
style={{
|
style={{
|
||||||
height: this.props.height || 400,
|
height: this.props.height || 400,
|
||||||
backgroundColor: this.props.backgroundColor || 'transparent'
|
|
||||||
}}
|
}}
|
||||||
scalesPageToFit={Platform.OS !== 'ios'}
|
onMessage={messageFn}
|
||||||
source={require('./tpl.html')}
|
source={require("./tpl.html")}
|
||||||
onMessage={event => this.props.onPress ? this.props.onPress(JSON.parse(event.nativeEvent.data)) : null}
|
|
||||||
/>
|
/>
|
||||||
</View>
|
</View>
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -1,29 +1,21 @@
|
||||||
import toString from '../../util/toString';
|
import toString from "../../util/toString";
|
||||||
|
export default function renderChart(props, isFirst) {
|
||||||
|
const height = `${props.height || 400}px`;
|
||||||
|
const width = props.width ? `${props.width}px` : "auto";
|
||||||
|
|
||||||
export default function renderChart(props) {
|
if (isFirst) {
|
||||||
const height = `${props.height || 400}px`;
|
return `
|
||||||
const width = props.width ? `${props.width}px` : 'auto';
|
|
||||||
return `
|
|
||||||
document.getElementById('main').style.height = "${height}";
|
document.getElementById('main').style.height = "${height}";
|
||||||
document.getElementById('main').style.width = "${width}";
|
document.getElementById('main').style.width = "${width}";
|
||||||
var myChart = echarts.init(document.getElementById('main'));
|
myChart = echarts.init(document.getElementById('main'));
|
||||||
myChart.setOption(${toString(props.option)});
|
myChart.setOption(${toString(props.option)});
|
||||||
window.document.addEventListener('message', function(e) {
|
`;
|
||||||
var option = JSON.parse(e.data);
|
}
|
||||||
myChart.setOption(option);
|
return `
|
||||||
});
|
document.getElementById('main').style.height = "${height}";
|
||||||
myChart.on('click', function(params) {
|
document.getElementById('main').style.width = "${width}";
|
||||||
var seen = [];
|
myChart.clear();
|
||||||
var paramsString = JSON.stringify(params, function(key, val) {
|
myChart.resize();
|
||||||
if (val != null && typeof val == "object") {
|
myChart.setOption(${toString(props.option)});
|
||||||
if (seen.indexOf(val) >= 0) {
|
`;
|
||||||
return;
|
|
||||||
}
|
|
||||||
seen.push(val);
|
|
||||||
}
|
|
||||||
return val;
|
|
||||||
});
|
|
||||||
window.postMessage(paramsString);
|
|
||||||
});
|
|
||||||
`
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue