fixed #2

somonus · Nov 1, 2016 · 1aa33b9 · 1aa33b9
1 parent 40752bb
commit 1aa33b9
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 37 deletions.
diff --git a/example/package.json b/example/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "react": "15.3.2",
     "react-native": "0.35.0",
-    "native-echarts": "0.1.0"
+    "native-echarts": "0.2.0"
   },
   "jest": {
     "preset": "jest-react-native"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "native-echarts",
-  "version": "0.1.2",
+  "version": "0.2.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
@@ -8,10 +8,11 @@ export default class App extends Component {
     return (
       <WebView
         scrollEnabled = {false}
+        injectedJavaScript = {renderChart(this.props)}
         style={{
           height: this.props.height || 400,
         }}
-        source={{html: renderChart(this.props.option)}}
+        source={require('./tpl.html')}
       />
     );
   }

diff --git a/src/components/Echarts/renderChart.js b/src/components/Echarts/renderChart.js
@@ -1,39 +1,11 @@
 import echarts from './echarts.min';
 import toString from '../../util/toString';
 
-export default function renderChart(option) {
+export default function renderChart(props) {
+  const height = props.height || 400;
   return `
-    <!DOCTYPE html>\n
-    <html>
-      <head>
-        <title>echarts</title>
-        <meta http-equiv="content-type" content="text/html; charset=utf-8">
-        <style type="text/css">
-          html,body {
-            height: 100%;
-            width: 100%;
-            margin: 0;
-            padding: 0;
-            overflow: hidden;
-          }
-          #main {
-            height: 100%;
-          }
-        </style>
-        <script>
-          ${echarts}
-        </script>
-      </head>
-      
-      <body>
-        <div id="main" ></div>
-        <script>
-          // 基于准备好的dom，初始化echarts实例
-            var myChart = echarts.init(document.getElementById('main'));
-            // 使用刚指定的配置项和数据显示图表。
-            myChart.setOption(${toString(option)});
-        </script>
-      <body>
-    <html>
-    `
+    document.getElementById('main').style.height = "${height}px";
+    var myChart = echarts.init(document.getElementById('main'));
+    myChart.setOption(${toString(props.option)});
+  `
 }
diff --git a/src/components/Echarts/tpl.html b/src/components/Echarts/tpl.html