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

feat: update param filters in listContractProcess

Browse Source 
refactor
style
This commit is contained in:
Frank.R.Wu
2021-06-30 10:39:00 +08:00
parent 10841c1b03
commit 59d54cb2b5
12 changed files with 1449 additions and 1457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
js/OnlineIDE.js
View File

@@ -28,10 +28,10 @@ function WSHandler(event) {
onDeleteFile(obj);
break;
case "onStartContract":
onStartContract(obj);
break;
// onStartContract(obj);
// break;
case "onStartContractAsDebug":
onStartContractAsDebug(obj);
onStartContract(obj);
break;
case "onListContractProcess":
onListContractProcess(obj);
@@ -140,9 +140,10 @@ function getControlWsUrl(host) {
}
function initWSocket() {
console.log("[nodecenterManagement.js] initWSocket : ");
console.log("[OnlineIDE.js] initWSocket : ");
let host = document.location.host;
let url = getControlWsUrl(global.urlparam && global.urlparam.nodeAddr ? global.urlparam.nodeAddr : host);
let url = getControlWsUrl(
global.urlparam && global.urlparam['nodeAddr'] ? global.urlparam['nodeAddr'] : host);
// console.log("connect ws:" + url);
global.wssocket = createWssocket(url, function () {
getSession();
@@ -201,7 +202,7 @@ function onStartContract(data) {
showDialog("部署合约成功", function() {
});
}*/
startResult.innerText = result.status + "(" + data.executeTime + "ms" + ")";
startResult.innerText = `${result.status}(${data['executeTime']}ms)`;
if (result.status !== "Success") {
let body = "<div class='input-group mb-3'>";
body += " <textarea id='onStartContractFailedContent' class='form-control' style='min-height:300px' ></textarea>";
@@ -213,33 +214,33 @@ function onStartContract(data) {
}
}
function onStartContractAsDebug(data) {
// console.log(data);
const result = JSON.parse(data.data);
/* if (result.isInsnLimit) {
global.withEvaluatesAnalysis = true;
$("#dialogBodyDiv").text("此合约在执行时会消耗gas,请在执行前进行预估，根据预估值给出相应的值，建议给出的值大于预估值");
showDialog("部署合约成功", function() {
});
}*/
startResult.innerText = result.status + "(" + data.executeTime + "ms" + ")";
if (result.status !== "Success") {
let body = "<div class='input-group mb-3'>";
body += " <textarea id='onStartContractFailedContent' class='form-control' style='min-height:300px' ></textarea>";
body += " </div>";
$("#dialogBodyDiv").html(body);
$("#onStartContractFailedContent")[0].value = result.result
showDialog("部署合约失败", function () {
});
}
}
// function onStartContractAsDebug(data) {
// // console.log(data);
// const result = JSON.parse(data.data);
// /* if (result.isInsnLimit) {
// global.withEvaluatesAnalysis = true;
// $("#dialogBodyDiv").text("此合约在执行时会消耗gas,请在执行前进行预估，根据预估值给出相应的值，建议给出的值大于预估值");
// showDialog("部署合约成功", function() {
// });
// }*/
// startResult.innerText = `${result.status}(${data['executeTime']}ms)`;
// if (result.status !== "Success") {
// let body = "<div class='input-group mb-3'>";
// body += " <textarea id='onStartContractFailedContent' class='form-control' style='min-height:300px' ></textarea>";
// body += " </div>";
// $("#dialogBodyDiv").html(body);
// $("#onStartContractFailedContent")[0].value = result.result
// showDialog("部署合约失败", function () {
// });
// }
// }
function onKillContractProcess(data) {
// console.log(data);
if (data.data === "success") {
listContracts();
}
stopResult.innerText = data.data + "(" + data.executeTime + "ms" + ")";
stopResult.innerText = `${data.data}(${data['executeTime']}ms)`;
}
function onKillAllContract(data) {
@@ -275,7 +276,7 @@ function onQueryContractInstanceInfoByDOI(data) {
initContractInstanceInfoArea();
// console.log(data);
$("#contractInstanceInfoTitle")
.html(" (" + data.executeTime + "ms)");
.html(` (${data['executeTime']}ms)`);
global.contractInstanceInfoEditor.setValue(data.data);
let totalLines = global.contractInstanceInfoEditor.lineCount();
@@ -292,7 +293,7 @@ function onImportContractInstanceCodeByDOI(data) {
initContractInstanceInfoArea();
// console.log(data);
$("#contractInstanceInfoTitle")
.html(" (" + data.executeTime + "ms)");
.html(` (${data['executeTime']}ms)`);
global.contractInstanceInfoEditor.setValue(data.data);
let totalLines = global.contractInstanceInfoEditor.lineCount();
@@ -307,14 +308,12 @@ function onImportContractInstanceCodeByDOI(data) {
global.wssocket.send("{\"action\":\"listProjects\",\"isPrivate\":true}");
}
function onListContractProcess(data) {
// console.log(data);
mainVue.contracts = [];
var list = JSON.parse(data.data);
for (var i = 0; i < list.length; i++) {
if (list[i].contractStatus != "KILLED") {
const list = JSON.parse(data.data);
for (let i = 0; i < list.length; i++) {
if (list[i].contractStatus !== "KILLED") {
mainVue.contracts.push(list[i]);
}
}
@@ -359,25 +358,25 @@ function initResponseAndOutputArea() {
}
function onExecuteResult(obj) {
const executeResultTitleEl = $("#executeResultTitle")
const data = obj;
$("#executeResultTitle")
.html(data.status + " (" + obj.executeTime + "ms) 未知格式");
executeResultTitleEl
.html(`${data.status} (${obj['executeTime']}ms) 未知格式`);
if (data.result instanceof Object) {
$("#executeResultTitle")
.html(data.status + " (" + obj.executeTime + "ms) JSON格式");
executeResultTitleEl
.html(`${data.status} (${obj['executeTime']}ms) JSON格式`);
global.responseEditor.setValue(JSON.stringify(data.result));
} else if (typeof data.result == 'string') {
$("#executeResultTitle")
.html(data.status + " (" + obj.executeTime + "ms) 字符串格式");
executeResultTitleEl
.html(`${data.status} (${obj['executeTime']}ms) 字符串格式`);
global.responseEditor.setValue(data.result);
} else {
if (typeof data.result == 'number') {
$("#executeResultTitle")
.html(data.status + " (" + obj.executeTime + "ms) 数值格式");
executeResultTitleEl
.html(`${data.status} (${obj['executeTime']}ms) 数值格式`);
} else if (typeof data.result == 'boolean') {
$("#executeResultTitle")
.html(data.status + " (" + obj.executeTime + "ms) 布尔型格式");
executeResultTitleEl
.html(`${data.status} (${obj['executeTime']}ms) 布尔型格式`);
}
global.responseEditor.setValue(data.result.toString());
}
@@ -391,9 +390,9 @@ function onExecuteResult(obj) {
}, {
line: totalLines
});
if (data.analysis && data.analysis.length > 0) {
// displayOutputStr(data.analysis);
}
// if (data['analysis'] && data['analysis'].length > 0) {
// displayOutputStr(data.analysis);
// }
}
function onGenerateReadme(obj) {