Skip to content

bump echarts version to 0.46.0 #48

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

bump echarts version to 0.46.0 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1734771
更新echarts版本
cxk0831 Jan 3, 2020
3964d3b
添加echarts主题
cxk0831 Jan 4, 2020
d0a75b8
添加echarts主题
cxk0831 Jan 4, 2020
95c9954
删除.idea,.vscode
cxk0831 Jan 4, 2020
efa5d31
修改git忽视文件的配置
cxk0831 Jan 4, 2020
5aa978a
增加异常捕获，解决主题配置后表格不显示的bug
cxk0831 Jan 6, 2020
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
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
node_modules/
.DS_Store
coverage/
example/node_modules
example/node_modules
.idea
settings.json
35 changes: 0 additions & 35 deletions .vscode/launch.json
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/chartconfig.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { WebView } from "react-native-webview";

import { getMinifiedEChartsFramework } from "./chartconfig";
import * as jsBuilder from "./jsBuilder";
import { getTheme } from "./theme";

class ECharts extends Component {
static propTypes = {
Expand Down Expand Up @@ -53,6 +54,9 @@ class ECharts extends Component {
<script>
${getMinifiedEChartsFramework()}
</script>
<script>
${getTheme()}
</script>
</head>

<body>
Expand Down
193 changes: 99 additions & 94 deletions src/jsBuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,104 +25,109 @@ export const getJavascriptSource = props => {
const renderer = "canvas"

return `
var chart = echarts.init(document.getElementById('main'), undefined, {renderer: '${renderer}'});
chart.setOption(parse(decodeURI(\"${encodeURI(
toString(props.option)
)}\")));
setBackgroundColor("${props.backgroundColor}");

function setBackgroundColor(color) {
document.getElementById('main').style.backgroundColor = color;
}

function sendData(data) {
window.ReactNativeWebView.postMessage(JSON.stringify({"types":"DATA","payload": data}));
}

function sendCallbackData(uuid, data) {
window.ReactNativeWebView.postMessage(JSON.stringify({"types":"CALLBACK", "uuid": uuid, "payload": data}));
}

function getOS() {
return ${OS};
}

function parse (data) {
return JSON.parse(data, function (key, value) {

if (value
&& typeof value === "string"
&& value.substr(0,8) === "function") {

var startBody = value.indexOf('{') + 1;
var endBody = value.lastIndexOf('}');
var startArgs = value.indexOf('(') + 1;
var endArgs = value.indexOf(')');

return new Function(value.substring(startArgs, endArgs)
, value.substring(startBody, endBody));
try{
var chart = echarts.init(document.getElementById('main'), 'walden', {renderer: '${renderer}'});
chart.setOption(parse(decodeURI(\"${encodeURI(
toString(props.option)
)}\")));
setBackgroundColor("${props.backgroundColor}");

function setBackgroundColor(color) {
document.getElementById('main').style.backgroundColor = color;
}

function sendData(data) {
window.ReactNativeWebView.postMessage(JSON.stringify({"types":"DATA","payload": data}));
}

function sendCallbackData(uuid, data) {
window.ReactNativeWebView.postMessage(JSON.stringify({"types":"CALLBACK", "uuid": uuid, "payload": data}));
}

function getOS() {
return ${OS};
}

function parse (data) {
return JSON.parse(data, function (key, value) {

if (value
&& typeof value === "string"
&& value.substr(0,8) === "function") {

var startBody = value.indexOf('{') + 1;
var endBody = value.lastIndexOf('}');
var startArgs = value.indexOf('(') + 1;
var endArgs = value.indexOf(')');

return new Function(value.substring(startArgs, endArgs)
, value.substring(startBody, endBody));
}
return value;
});
}

function toString (obj) {
var result = JSON.stringify(obj, function (key, val) {
if (typeof val === 'function') {
return val.toString();
}
return value;
});
}

function toString (obj) {
var result = JSON.stringify(obj, function (key, val) {
if (typeof val === 'function') {
return val.toString();
}
return val;
});

return result;
};
return val;
});

return result;
};

window.onresize = function() {
chart.resize();
};

function processMessage (e) {
var req = parse(e.data);

switch(req.types) {
case "SET_OPTION":
chart.setOption(req.payload.option, req.payload.notMerge,req.payload.lazyUpate);
break;
case "CLEAR":
chart.clear();
break;
case "SET_BACKGROUND_COLOR":
setBackgroundColor(req.color);
break;
case "GET_OPTION":
var option = chart.getOption();
var data = {};

window.onresize = function() {
chart.resize();
};

function processMessage (e) {
var req = parse(e.data);
if(req.properties !== undefined) {
req.properties.forEach(function (prop) {
data[prop] = option[prop];
});
} else {
var data = {
option: option
};
}

switch(req.types) {
case "SET_OPTION":
chart.setOption(req.payload.option, req.payload.notMerge,req.payload.lazyUpate);
break;
case "CLEAR":
chart.clear();
break;
case "SET_BACKGROUND_COLOR":
setBackgroundColor(req.color);
break;
case "GET_OPTION":
var option = chart.getOption();
var data = {};

if(req.properties !== undefined) {
req.properties.forEach(function (prop) {
data[prop] = option[prop];
});
} else {
var data = {
option: option
};
}

sendCallbackData(req.uuid, data);
break;
default:
break;
sendCallbackData(req.uuid, data);
break;
default:
break;
}
}
}

window.document.addEventListener('message', function(e) {
processMessage(e);
});

window.document.addEventListener('message', function(e) {
processMessage(e);
});
window.addEventListener('message', function(e) {
processMessage(e);
});

${props.additionalCode}
window.addEventListener('message', function(e) {
processMessage(e);
});

${props.additionalCode}
}
catch (e) {
alert(e)
}
`
}
Loading