diff --git a/src/js/contractlist.js b/src/js/contractlist.js
index d77a745..58bb7d7 100644
--- a/src/js/contractlist.js
+++ b/src/js/contractlist.js
@@ -3,7 +3,7 @@ var loadContractList = function (e) {
param.action = "listNodes";
param.pubKey = global.sm2Key.publicKey;
global.wssocket.send(JSON.stringify(param));
- if (global.nodeInfo == undefined) {
+ if (global.nodeInfo) {
setTimeout(loadContractList, 300);
return;
}
@@ -11,7 +11,7 @@ var loadContractList = function (e) {
var list = [];
for (var i = 0; i < global.nodeInfo.online.length; i++) {
var node = global.nodeInfo.online[i];
- if (node.contracts != undefined)
+ if (node.contracts)
for (var j = 0; j < node.contracts.length; j++) {
list.push(node.contracts[j]);
}
@@ -143,24 +143,32 @@ var drawContractListTable = function (list) {
"sSortDescending": ": 以降序排列此列"
}
};
- var tableHead = "
序号 | 合约ID | 合约名称 | 运行模式 | 合约类型 | 方法数量 |
";
+ const tableHead = "" +
+ "" +
+ "序号 | " +
+ "合约ID | " +
+ "合约名称 | " +
+ "运行模式 | " +
+ "合约类型 | " +
+ "方法数量 | " +
+ "
";
var tableTail = "
";
var html = tableHead;
var count = 0;
for (var i = 0; i < list.length; i++) {
var node = list[i];
- if (node.contracts != undefined)
+ if (node.contracts)
for (var j = 0; j < node.contracts.length; j++) {
var c = node.contracts[j];
- if (c.type != undefined && c.type.startsWith("RequestAll") && !c.isMaster)
+ if (c.type && c.type.startsWith("RequestAll") && !c.isMaster)
continue;
html += "";
html += (++count);
html += " | ";
html += c.contractID;
html += " | ";
- html += ""
- html += c.contractName;
+ html += ``
+ html += c.contractName + (c.type && c.type.startsWith("SelfAdaptive") && c.isMaster ? "(M)" : "");
html += ""
html += " | ";
html += c.type;
@@ -170,9 +178,11 @@ var drawContractListTable = function (list) {
// html+=c.events.length
// else html+=0;
html += " | ";
- if (c.exportedFunctions != undefined)
+ if (c.exportedFunctions) {
html += c.exportedFunctions.length;
- else html += "-1";
+ } else {
+ html += "-1";
+ }
html += " |
";
}
}