diff --git a/NodePortal.html b/NodePortal.html index 0f2a21b..f6508fe 100644 --- a/NodePortal.html +++ b/NodePortal.html @@ -269,7 +269,9 @@ - + + - @@ -432,8 +436,12 @@
+
+ +
-
合约进程列表
@@ -462,12 +470,8 @@
+
- -
-
+
+
+ +
+
@@ -532,14 +534,14 @@
@@ -729,6 +731,7 @@ //initWSocket(); + \ No newline at end of file diff --git a/js/NodeContractInstances.js b/js/NodeContractInstances.js index c1a1fb0..7bd0501 100644 --- a/js/NodeContractInstances.js +++ b/js/NodeContractInstances.js @@ -35,6 +35,9 @@ var onListContractProcess1 = function(obj) { global.permissionNameMap = {}; for (var i = 0; i < table.length; i++) { + if (table[i].contractStatus=="KILLED") { + continue; + } var option = document.createElement("option"); option.text = table[i].name; console.log(table[i].name); @@ -370,6 +373,7 @@ var executeContractWithDynamicResult = function() { request.contractName = global.contractInstance; request.sequencing = global.instanceSequencing; request.useP2P = global.useP2P; + request.isDebug = executeContractAsDebug.checked; var operation = $("#selectContractFunction")[0].value; if (operation == " " && operation == undefined) { myToast("执行合约", "请选择合约方法!"); @@ -399,6 +403,7 @@ var executeContract = function() { request.operation = operation; request.arg = $("#arg")[0].value ; request.pubkey = global.sm2Key.publicKey; + request.isDebug = executeContractAsDebug.checked; console.log(request.arg); request.signature = sm2.doSignature(request.contractID + "|" + operation + "|" + $("#arg")[0].value + "|" + global.sm2Key.publicKey, diff --git a/js/commonutil.js b/js/commonutil.js index f8fa5ed..06f94b6 100644 --- a/js/commonutil.js +++ b/js/commonutil.js @@ -207,9 +207,11 @@ function initGlobal(urlParams) { global.isBaaS = true primaryColor = "#08263a" } + if (urlParams){ + global.urlparam = urlParams; + } if (urlParams && urlParams.keys) { - global.urlparam = urlParams - global.sm2Key = urlParams.keys + global.sm2Key = urlParams.keys; } else { global.sm2Key = localStorage.getItem("PrivKey"); if (!global.sm2Key || global.sm2Key.length < 100) { diff --git a/js/onlineide/rightmenu.js b/js/onlineide/rightmenu.js index 22280e0..843e51c 100644 --- a/js/onlineide/rightmenu.js +++ b/js/onlineide/rightmenu.js @@ -235,6 +235,7 @@ var executeContract = function () { } // console.log("[arg.gasLimit]"+arg.gasLimit); request.pubkey = sm2Key.publicKey; + // request.isDebug = executeContractAsDebug.checked; request.signature = sm2.doSignature(request.contractID + "|" + arg.action + "|" + arg.arg + "|" + sm2Key.publicKey, sm2Key.privateKey, {hash: true, der: true}); request.arg = JSON.stringify(arg);