bdware/bdcontract-web-client
21
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge: merge changes in BaaS

Browse Source
This commit is contained in:
Frank.R.Wu
2021-06-15 21:52:53 +08:00
parent 4379b1745e
commit 43b79ffffc
3 changed files with 453 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
js/bdwareclient.js
View File

@@ -248,14 +248,14 @@ function showContractResult(requestID) {
result = data;
$("#statusSpan")[0].innerHTML = result.status;
$("#timeSpan")[0].innerHTML = "调用耗时:" + data.executeTime + "(ms)";
if (result.result instanceof Object){
$("#responseArea")[0].value = JSON.stringify(result.result);
$("#timeSpan")[0].innerHTML +="<br> JSON格式";
}else{
$("#timeSpan")[0].innerHTML +="<br> 字符串格式";
$("#responseArea")[0].value = result.result;
if (result.result instanceof Object) {
$("#responseArea")[0].value = JSON.stringify(result.result);
$("#timeSpan")[0].innerHTML += "<br> JSON格式";
} else {
$("#timeSpan")[0].innerHTML += "<br> 字符串格式";
$("#responseArea")[0].value = result.result;
}
if (global.responseCollector[requestID].hashCode!=undefined)
if (global.responseCollector[requestID].hashCode != undefined)
$("#hashDisplayDiv").html("溯源指纹:" + global.responseCollector[requestID].hashCode);
}
@@ -344,7 +344,7 @@ function onGetNodeSessionID(data) {
global.session = data.session;
const loginParam = {
pubKey: global.sm2Key.publicKey,
signature: sm2.doSignature(global.session, global.sm2Key.privateKey,{hash:true,der:true}),
signature: sm2.doSignature(global.session, global.sm2Key.privateKey, {hash: true, der: true}),
action: "login"
};
global.wssocket.send(JSON.stringify(loginParam));
@@ -450,8 +450,8 @@ function triggerExecuteCurrentContract() {
return;
}
var funNode;
for(var i = 0;i < global.currentContract.exportedFunctions.length;i++){
if(global.currentContract.exportedFunctions[i].functionName == funPos){
for (var i = 0; i < global.currentContract.exportedFunctions.length; i++) {
if (global.currentContract.exportedFunctions[i].functionName == funPos) {
funNode = global.currentContract.exportedFunctions[i];
break;
}
@@ -466,7 +466,7 @@ function triggerExecuteCurrentContract() {
+ "&pubkey=" + global.sm2Key.publicKey + "&signature=";
const toSign = global.currentContract.name + "|" + funNode.functionName + "|"
+ argInput[0].value + "|" + global.sm2Key.publicKey;
const signature = sm2.doSignature(toSign, global.sm2Key.privateKey,{hash:true,der:true});
const signature = sm2.doSignature(toSign, global.sm2Key.privateKey, {hash: true, der: true});
let urlPre = $("#urlInput")[0].value;
if (urlPre.startsWith("ws")) {
urlPre = urlPre.replace("ws", "http");
@@ -480,8 +480,8 @@ function showDescription() {
console.log(funPos);
console.log(global.currentContract.exportedFunctions);
var funNode;
for(var i = 0;i < global.currentContract.exportedFunctions.length;i++){
if(global.currentContract.exportedFunctions[i].functionName == funPos){
for (var i = 0; i < global.currentContract.exportedFunctions.length; i++) {
if (global.currentContract.exportedFunctions[i].functionName == funPos) {
funNode = global.currentContract.exportedFunctions[i];
break;
}
@@ -496,8 +496,8 @@ function showDescription() {
}
function fillResultInternal(result, data) {
if (global.responseCollector[data.responseID]==undefined){
global.responseCollector[data.responseID]=[];
if (global.responseCollector[data.responseID] == undefined) {
global.responseCollector[data.responseID] = [];
const reqIDSpan = $("#reqIDSpan");
reqIDSpan.append("<option value='" + data.responseID + "'>" + data.responseID + "</option>");
reqIDSpan[0].value = data.responseID;
@@ -505,11 +505,11 @@ function fillResultInternal(result, data) {
global.responseCollector[data.responseID].push(data);
$("#statusSpan")[0].innerHTML = result.status;
$("#timeSpan")[0].innerHTML = "调用耗时:" + data.executeTime + "(ms)";
if (result.result instanceof Object){
$("#responseArea")[0].value = JSON.stringify(result.result);
$("#timeSpan")[0].innerHTML +="<br> JSON格式";
}else{
$("#timeSpan")[0].innerHTML +="<br> 字符串格式";
if (result.result instanceof Object) {
$("#responseArea")[0].value = JSON.stringify(result.result);
$("#timeSpan")[0].innerHTML += "<br> JSON格式";
} else {
$("#timeSpan")[0].innerHTML += "<br> 字符串格式";
$("#responseArea")[0].value = result.result;
}
}
@@ -531,7 +531,7 @@ function loadMain(data) {
global.scriptList = [];
global.scriptOrder = 0;
console.log("listSize:" + scriptList.length);
for (var i=0;i<scriptList.length;i++) {
for (var i = 0; i < scriptList.length; i++) {
const script = scriptList[i];
const re = script.getAttribute("fromContract");
if (!re) {
@@ -543,7 +543,7 @@ function loadMain(data) {
executeCurrentContract("loadResource", global.scriptList[0], loadScript);
}
const linkList = $("#mainDiv link");
for (var i=0; i<linkList.length;i++) {
for (var i = 0; i < linkList.length; i++) {
const link = linkList[i];
const re = link.getAttribute("fromContract");
executeCurrentContract("loadResource", re, loadCss);
@@ -723,10 +723,9 @@ function killAllContract() {
}
function init() {
const urlParams = getRequestParameters();
initVue();
initGlobal();
global.urlparam = getRequestParameters();
initGlobal(urlParams);
if (global.urlparam["noRender"] === "true") {
switchRenderBtn.innerHTML = "加载界面";
@@ -763,15 +762,39 @@ function connectNode() {
}
function getRequestParameters() {
const arr = (location.search || "").replace(/^\?/, '').split("&");
const params = {};
for (const a of arr) {
const data = a.split("=");
if (data.length === 2) {
params[data[0]] = data[1];
if (location.href.indexOf("BaaSClient") !== -1) {
let params = location.href.replace(/[^#]*(#(\/)?|\?)/, '')
let url = location.href.replace(params, '')
while (!params) {
url = url.replace(/(#(\/)?|\?)$/, '')
params = url.replace(/[^#]*(#(\/)?|\?)/, '')
url = url.replace(params, '')
}
if (url.endsWith('#') || url.endsWith('#\/')) {
let sKey = Math.random().toString()
localStorage.setItem(sKey, params)
location.href = url.replace(/#(\/)?/, '?' + sKey)
} else {
let json = atob(localStorage.getItem(params))
try {
return JSON.parse(json);
} catch (e) {
localStorage.removeItem(params)
alert('链接失效！')
location.href = location.origin
}
}
} else {
const arr = (location.search || "").replace(/^\?/, '').split("&");
const params = {};
for (const a of arr) {
const data = a.split("=");
if (data.length === 2) {
params[data[0]] = data[1];
}
}
return params;
}
return params;
}
function changeRender() {