From 308a0b9c3db9913a1a09a8484b9937e89aa1a549 Mon Sep 17 00:00:00 2001
From: sgellar <1216181067@qq.com>
Date: Sat, 17 Aug 2019 13:29:01 +0800
Subject: [PATCH 1/4] fixed RN 0.64
---
src/components/Echarts/index.js | 6 ++--
src/components/Echarts/tpl.html | 63 ---------------------------------
src/components/Echarts/tpl.js | 28 +++++++++++++++
3 files changed, 32 insertions(+), 65 deletions(-)
delete mode 100644 src/components/Echarts/tpl.html
create mode 100644 src/components/Echarts/tpl.js
diff --git a/src/components/Echarts/index.js b/src/components/Echarts/index.js
index fe86c8c..ce74756 100644
--- a/src/components/Echarts/index.js
+++ b/src/components/Echarts/index.js
@@ -1,7 +1,9 @@
import React, { Component } from 'react';
-import { WebView, View, StyleSheet, Platform } from 'react-native';
+import { View, StyleSheet, Platform } from 'react-native';
import renderChart from './renderChart';
import echarts from './echarts.min';
+import WebView from "react-native-webview";
+import getTpl from "./tpl" ;
export default class App extends Component {
@@ -34,7 +36,7 @@ export default class App extends Component {
}}
scalesPageToFit={Platform.OS !== 'ios'}
originWhitelist={['*']}
- source={require('./tpl.html')}
+ source={{ html:getTpl() }}
onMessage={event => this.props.onPress ? this.props.onPress(JSON.parse(event.nativeEvent.data)) : null}
/>
diff --git a/src/components/Echarts/tpl.html b/src/components/Echarts/tpl.html
deleted file mode 100644
index ca20a31..0000000
--- a/src/components/Echarts/tpl.html
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
- echarts
-
-
-
-
-
-
-
-
-
-
diff --git a/src/components/Echarts/tpl.js b/src/components/Echarts/tpl.js
new file mode 100644
index 0000000..485bf1c
--- /dev/null
+++ b/src/components/Echarts/tpl.js
@@ -0,0 +1,28 @@
+export default ()=>`
+
+
+
+ echarts
+
+
+
+
+
+
+
+
+
+
+` ;
\ No newline at end of file
From 819233e4bb8b3241c21df4717c68cd44ab440981 Mon Sep 17 00:00:00 2001
From: sgellar <1216181067@qq.com>
Date: Sat, 17 Aug 2019 13:29:33 +0800
Subject: [PATCH 2/4] bump version 0.6
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 2fb8ee5..9f891a3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "native-echarts",
- "version": "0.5.0",
+ "version": "0.6.0",
"description": "echarts for react-native",
"main": "src/index.js",
"directories": {
From 9ef48beaaa2141c4f814ffbef678e50d68eab8a5 Mon Sep 17 00:00:00 2001
From: sgellar <1216181067@qq.com>
Date: Sat, 21 Sep 2019 18:44:55 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +-
src/components/Echarts/index.js | 41 +++++++++++++++++++--------------
2 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/package.json b/package.json
index 9f891a3..588581b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "native-echarts",
- "version": "0.6.0",
+ "version": "0.7.0",
"description": "echarts for react-native",
"main": "src/index.js",
"directories": {
diff --git a/src/components/Echarts/index.js b/src/components/Echarts/index.js
index ce74756..8f5f446 100644
--- a/src/components/Echarts/index.js
+++ b/src/components/Echarts/index.js
@@ -11,13 +11,21 @@ export default class App extends Component {
super(props);
this.setNewOption = this.setNewOption.bind(this);
}
-
+
componentWillReceiveProps(nextProps) {
if(nextProps.option !== this.props.option) {
- this.refs.chart.reload();
+ // this.refs.chart.reload();
+ if(Platform.OS === 'android'){
+ this.refs.chart.reload();
+ }else {
+ this.setNewOption(nextProps.option) ;
+ }
}
}
+ shouldComponentUpdate() {
+ return false ;
+ }
setNewOption(option) {
this.refs.chart.postMessage(JSON.stringify(option));
@@ -25,21 +33,20 @@ export default class App extends Component {
render() {
return (
-
- this.props.onPress ? this.props.onPress(JSON.parse(event.nativeEvent.data)) : null}
- />
-
+
+ this.props.onPress ? this.props.onPress(JSON.parse(event.nativeEvent.data)) : null}
+ />
+
);
}
}
From 042b96aad4efc0d53228a08f3ebac4bb5fe58402 Mon Sep 17 00:00:00 2001
From: superscore <1216181067@qq.com>
Date: Thu, 10 Oct 2019 15:02:35 +0800
Subject: [PATCH 4/4] Update index.js
---
src/components/Echarts/index.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/Echarts/index.js b/src/components/Echarts/index.js
index 8f5f446..50ad89a 100644
--- a/src/components/Echarts/index.js
+++ b/src/components/Echarts/index.js
@@ -43,7 +43,7 @@ export default class App extends Component {
backgroundColor: this.props.backgroundColor || 'transparent'
}}
originWhitelist={['*']}
- source={{ html:getTpl() }}
+ source={Platform.OS === "ios"?{ html:getTpl() }:{uri:'file:///android_asset/tpl.html'}}
onMessage={event => this.props.onPress ? this.props.onPress(JSON.parse(event.nativeEvent.data)) : null}
/>