fix: BaasOnlineIDE.html hidden overflowed part

feat: nanning ui
2021-07-24 11:11:36 +08:00 · 2021-07-24 11:09:14 +08:00
20 changed files with 9310 additions and 3149 deletions
--- a/BaaSOnlineIDE.html
+++ b/BaaSOnlineIDE.html
@@ -127,14 +127,14 @@

    </style>
 </head>
-<body style="overflow-x: hidden;">
+<body>

 <header
        class="headerFooter navbar navbar-default navbar-fixed-top  navColor ">
    <div class="col-4">
        <a class="navbar-brand" href="#"> <img alt="Brand"
                                               src="./images/logo-1.png" style="height: 30px;">
-        </a> <span>数瑞智能合约在线编辑器</span><input id="uploadFileInput" type="file"
+        </a> <span>智能合约在线编辑器</span><input id="uploadFileInput" type="file"
                                            name="file" multiple onchange="uploadFile()" style="display: none;">
    </div>
    <div class="nav navbar-right userName" data-toggle="modal"
--- a/NodePortal.html
+++ b/NodePortal.html
@@ -2,7 +2,7 @@
 <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
    <meta http-equiv="Cache-Control" content="no-cache"/>
-    <title>数瑞智能合约节点管理中心</title>
+    <title>智能合约节点管理中心</title>
    <script src="./jqueryui1.12/jquery-2.1.4.js"></script>
    <script src="./js/popper.min.js"></script>

@@ -60,14 +60,14 @@
    <script src="./js/bootstrap4-toggle.min.js"></script>

 </head>
-<body style="overflow-x: hidden;">
+<body>

 <header
        class="headerFooter navbar navbar-default navbar-fixed-top  navColor ">
    <div class="col-4">
        <a class="navbar-brand" href="#"> <img alt="Brand"
                                               src="./images/logo-1.png" style="height: 30px">
-        </a> <span>数瑞智能合约节点管理中心</span>
+        </a> <span>智能合约节点管理中心</span>
    </div>

    <div class="nav navbar-right userName" data-toggle="modal"
@@ -280,9 +280,7 @@
                                                        <option value="3">RARF</option>
                                                        <option value="4">RARH</option>
                                                        <option value="5">RARA</option>
-                                                        <option value="6">Sharding</option>
-                                                        <option value="7">SASharding</option>
-                                                        <option value="8">PBFT</option>
+                                                        <option value="6">Shading</option>
                                                    </select>
                                                    <div class="btn-group mr-3" role="group"
                                                         style="margin-left: 2%">
@@ -506,8 +504,7 @@
                                                    </div>

                                                    <input type="text" class="form-control" placeholder="输入参数" id="arg">
-                                                    <input type="text" class="form-control col-2" placeholder="输入gas"
-                                                           id="gasLimit">
+                                                    <input type="text" class="form-control col-2" placeholder="输入gas" id="gasLimit">
                                                    <div class="input-group-append">
                                                        <div class="input-group-text">
                                                            <input type="checkbox" id="executeContractAsDebug"
@@ -547,75 +544,6 @@
                                                    <textarea class="form-control" id="responseArea"></textarea>
                                                </div>
                                            </div>
-
-                                            <div class="row d-flex justify-content-flex-start">
-                                                <h6 class="card-title" style="margin-top: 2%">Mask配置</h6>
-                                                <div class="input-group mb-3">
-
-                                                    <div class="input-group-append">
-                                                        <span class="input-group-text">参数</span>
-                                                    </div>
-
-                                                    <input type="text" class="form-control" placeholder="输入参数"
-                                                           id="maskArg">
-
-                                                    <div class="input-group-append">
-                                                        <button onclick="getMask()" type="button"
-                                                                class="btn btn-outline-primary">get
-                                                        </button>
-                                                    </div>
-                                                    <div class="input-group-append">
-                                                        <button onclick="setMask()"
-                                                                type="button" class="btn btn-outline-primary">set
-                                                        </button>
-                                                    </div>
-
-                                                </div>
-                                            </div>
-                                            <div class="row d-flex justify-content-flex-start">
-                                                <div class="input-group mb-3">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text" id="maskStatus">当前配置：</span>
-                                                    </div>
-
-                                                    <textarea class="form-control" id="maskResponseArea"></textarea>
-                                                </div>
-                                            </div>
-
-                                            <div class="row d-flex justify-content-flex-start">
-                                                <h6 class="card-title" style="margin-top: 2%">Mock配置</h6>
-                                                <div class="input-group mb-3">
-
-                                                    <div class="input-group-append">
-                                                        <span class="input-group-text">参数</span>
-                                                    </div>
-
-                                                    <input type="text" class="form-control" placeholder="输入参数"
-                                                           id="mockArg">
-
-                                                    <div class="input-group-append">
-                                                        <button onclick="getMock()" type="button"
-                                                                class="btn btn-outline-primary">get
-                                                        </button>
-                                                    </div>
-                                                    <div class="input-group-append">
-                                                        <button onclick="setMock()"
-                                                                type="button" class="btn btn-outline-primary">set
-                                                        </button>
-                                                    </div>
-
-                                                </div>
-                                            </div>
-                                            <div class="row d-flex justify-content-flex-start">
-                                                <div class="input-group mb-3">
-                                                    <div class="input-group-prepend">
-                                                        <span class="input-group-text" id="mockStatus">当前配置：</span>
-                                                    </div>
-
-                                                    <textarea class="form-control" id="mockResponseArea"></textarea>
-                                                </div>
-                                            </div>
-
                                            <div class="row d-flex justify-content-flex-start">
                                                <h6 class="card-title" style="margin-top: 2%">权限管理</h6>
                                            </div>
@@ -1340,7 +1268,6 @@
    //initWSocket();


-
 </script>

 </body>
--- a/NodePortal_Gateway.html
+++ b/NodePortal_Gateway.html
--- a/OnlineIDE.html
+++ b/OnlineIDE.html
@@ -132,14 +132,14 @@

    </style>
 </head>
-<body style="overflow-x: hidden;">
+<body>

 <header
        class="headerFooter navbar navbar-default navbar-fixed-top  navColor ">
    <div class="col-4">
        <a class="navbar-brand" href="#"> <img alt="Brand"
                                               src="./images/logo-1.png" style="height: 30px">
-        </a> <span>数瑞智能合约在线编辑器</span><input id="uploadFileInput" type="file"
+        </a> <span>智能合约在线编辑器</span><input id="uploadFileInput" type="file"
                                            name="file" multiple onchange="uploadFile()" style="display: none;">
    </div>
    <div class="nav navbar-right userName" data-toggle="modal"
@@ -278,7 +278,7 @@
                    </div>
                </div>

-                <div id="box" style="overflow:hidden; height:100%">
+                <div id="box" style="overflow:hide; height:100%">
                    <div id="contractCode" class="flex-grow-1" style="height:100%">
                        <div id="textareaDiv" class="col-sm-12" style="width: 100%; height: 100%; padding:0">
 							<textarea id="scriptEditor" style="width: 100%; height: 100%"
@@ -559,14 +559,14 @@
                    <div class="row">
                        <div class="col-sm-12" id="responseAreaDiv">
 								<textarea id="responseArea" class="form-control"
-                                          style="width: 100%; height: 200px;"></textarea>
+                                          style="width: 100%; height: 150px;"></textarea>
                        </div>
                    </div>
                    <div class="row">
                        <div class="col-sm-12 mt-3" id="outputStreamAreaDiv">
                            控制台输出：
                            <textarea id="outputStreamArea" class="form-control"
-                                      style="width: 100%; height: 200px;"></textarea>
+                                      style="width: 100%; height: 150px;"></textarea>
                        </div>
                    </div>
                </div>
--- a/images/logo-1.png
+++ b/images/logo-1.png
--- a/images/logo-1.svg
+++ b/images/logo-1.svg
--- a/images/logo-12.png
+++ b/images/logo-12.png
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
 <header>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
    <meta http-equiv="Cache-Control" content="no-cache"/>
-    <title>数瑞智能合约</title>
+    <title>智能合约</title>
    <script src="./jqueryui1.12/jquery-2.1.4.js"></script>


@@ -104,7 +104,7 @@
 <div
        style="width: 90%; max-width: 1000px; min-width: 850px; margin: 0 auto; margin-top: 3%;">
    <div style="width: 20%; float: right; margin-right: 0%">
-        <img src="./images/logo.png" class="logoimg"></img>
+        <img src="./images/logo-1.png" class="logoimg"></img>
    </div>
    <div
            style="width: fit-content; margin: 0; font-size: 200%; background-color: white; color: black; border-radius: 10px; float: left; padding: 10px;">
--- a/index_gate.html
+++ b/index_gate.html
--- a/index_gateway.html
+++ b/index_gateway.html
@@ -1,165 +0,0 @@
-<html>
-<header>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <meta http-equiv="Cache-Control" content="no-cache"/>
-    <title>北大数瑞数联网网关</title>
-    <script src="./jqueryui1.12/jquery-2.1.4.js"></script>
-
-
-    <style>
-        .halfDiv {
-            float: left;
-            width: 100%;
-            height: 100%;
-        }
-
-        .projectTreeDiv {
-            height: auto;
-            padding: 0;
-        }
-
-        .halfDivRight {
-            float: left;
-            width: 100%;
-            height: 100%;
-        }
-
-        .ui-tabs {
-            padding: 0;
-        }
-
-        .ui-accordion .ui-accordion-content {
-            padding: 0;
-        }
-
-        #tabs-1 {
-            display: none;
-        }
-
-        .ui-tabs .ui-tabs-panel {
-            padding: 0;
-        }
-
-        .context-menu-root {
-            z-index: 10;
-        }
-
-        #projectDiv {
-            height: 83%;
-            width: 20%;
-            border: 0px solid grey;
-            float: left;
-        }
-
-        .CodeMirror {
-            height: auto
-        }
-
-        .logoimg {
-            width: auto;
-            height: auto;
-            max-width: 100%;
-            max-height: 100%;
-        }
-
-        input {
-            height: 32px;
-        }
-
-        .sendTransInput {
-            background-color: #f0e4e4;
-            border-radius: 5px;
-            margin: 5px;
-            width: 15%;
-            margin-left: 4%;
-            border: 0px;
-        }
-
-        .normalDiv {
-            float: left;
-            text-align: center;
-            border-radius: 5px;
-            margin: 2%;
-            padding: 5px;
-            padding-top: 30px;
-            padding-bottom: 30px;
-            width: 45%;
-            cursor: hand;
-            background: #2E324C;
-            color: white;
-        }
-
-        .iconimg {
-            width: auto;
-            height: auto;
-            max-width: 48px;
-            max-height: 48px;
-            vertical-align: middle;
-            filter: invert(100%);
-        }
-    </style>
-
-</header>
-<body style="background: #2E324C; color: white;">
-<div
-        style="width: 90%; max-width: 1000px; min-width: 850px; margin: 0 auto; margin-top: 3%;">
-    <div style="width: 20%; float: right; margin-right: 0%">
-        <img src="./images/logo.png" class="logoimg"></img>
-    </div>
-    <div
-            style="width: fit-content; margin: 0; font-size: 200%; background-color: white; color: black; border-radius: 10px; float: left; padding: 10px;">
-        &nbsp;&nbsp;导航&nbsp;&nbsp;
-    </div>
-
-    <div
-            style="width: 100%; margin-top: 2%; float: left; background-color: white; border-radius: 10px;">
-
-        <div class="normalDiv" onclick="jumpTo('./OnlineIDE.html')">
-            <img src="./images/index/web.png" class="iconimg"></img><br/>
-            <span style="vertical-align: middle">网关接入管理</span>
-        </div>
-        <div class="normalDiv" onclick="jumpTo('./NodePortal_Gateway.html')">
-            <img src="./images/index/analysis.png" class="iconimg"></img><br/>
-            <span style="vertical-align: middle">网关配置管理</span>
-        </div>
-
-    </div>
-
-    <script>
-        jumpTo = function (addr) {
-            document.location.href = addr;
-        };
-    </script>
-
-    <br/>
-    <div style="width: fit-content; margin-top: 2%; float: right; border-radius: 10px; font-size: 50%">
-        Icons made by
-        <a href="https://www.flaticon.com/authors/monkik"
-           title="monkik" style="color: white;">monkik</a>
-        from
-        <a href="https://www.flaticon.com/" title="Flaticon"
-           style="color: white;">www.flaticon.com</a>
-    </div>
-</div>
-</body>
-</html>
-<!--  
-============ NodeCenter的一些链接：其中39.106.6.6监听的是1817端口。 查看节点是否启动
-http://39.106.6.6:18001/SCIDE/NodeCenter?action=ping 查看NodeCenter当前连接的节点
-http://39.106.6.6:18001/SCIDE/NodeCenter?action=listCMInfo
-
-刷新NodeCenter已连接节点的合约数据
-http://39.106.6.6:18001/SCIDE/NodeCenter?action=updateContract
-
-检查节点是否已连接，删除断开连接的节点
-http://39.106.6.6:18001/SCIDE/NodeCenter?action=checkAlive 
-
-获取某个合约的日志数量
-http://39.106.6.6:18001/SCIDE/NodeCenter?action=getLogSize&contractID=BDCoin
-
-获取某个合约的日志，从第offset条，取count条
-http://39.106.6.6:18001/SCIDE/NodeCenter?action=requestLog&contractID=BDCoin&offset=16&count=10
-
-获取某个合约的日志，取最新的count条
-http://39.106.6.6:18001/SCIDE/NodeCenter?action=requestLastLog&contractID=BDCoin&count=10
-->
--- a/jqueryui1.12/.index.html.swp
+++ b/jqueryui1.12/.index.html.swp
--- a/jqueryui1.12/jquery-2.1.4.js
+++ b/jqueryui1.12/jquery-2.1.4.js
--- a/js/NodeConfig.js
+++ b/js/NodeConfig.js
@@ -262,7 +262,7 @@ function showNodeTrustUnits(obj) {
        }
    };
    let html = "<table class='table display row-border' id='trustNodesUnitTabDivTab'>" +
-        "<thead><tr><th>序号</th><th>ID</th><th>类型</th><th>创建者</th><th>节点数目</th><th>节点列表</th></tr></thead>" +
+        "<thead><tr><th>序号</th><th>ID</th><th>类型</th><th>创建者</th><th>节点数目</th><th>节点公钥</th></tr></thead>" +
        "<tbody>";
    const tableTail = "</tbody></table>";
    if (global.nodeUnits) {
@@ -275,12 +275,12 @@ function showNodeTrustUnits(obj) {
            <td>TCP</td>
            <td>${global.nodeUnits[i].key.substring(0, at_ - 1)}</td>
            <td>${nodes.length}</td>
-            <td>${nodes.map(x => x.nodeName).sort().join(',')}</td>
+            <td>${JSON.stringify(nodes)}</td>
            </tr>`
        }
    }
    if (global.p2pNodes) {
-        html += "<tr><td>" + (i + 1) + "</td> <td>P2PUnit</td><td>P2P</td> <td>bdledger</td> <td>" + global.p2pNodes.length + "</td> <td>" + JSON.stringify(global.p2pNodes) + "</td> </tr>";
+            html += "<tr><td>" + (i+1) + "</td> <td>P2PUnit</td><td>P2P</td> <td>bdledger</td> <td>" + global.p2pNodes.length + "</td> <td>" + JSON.stringify(global.p2pNodes) + "</td> </tr>";
        }
    html += tableTail;
    $("#trustNodesUnitTabDiv").html(html);
--- a/js/NodeContractInstances.js
+++ b/js/NodeContractInstances.js
@@ -137,7 +137,7 @@ ${table[i].name}
 </tr>`
    }
    html += tableTail;
-    html = "<h5 class='card-title'>DO实例列表</h5>" + html;
+    html = "<h5 class='card-title'>合约实例列表</h5>" + html;
    ciTabDiv.html(html);

    $("#ciTabDivTab").DataTable(
@@ -398,14 +398,14 @@ function executeContract() {
    request.pubkey = global.sm2Key.publicKey;
    request.isDebug = executeContractAsDebug.checked;
    console.log(request.arg);
-    const gasLimit = $('#gasLimit').val() / 1;
+    const gasLimit = $('#gasLimit').val()/1;
    var toSign = request.contractID + "|"
-        + request.operation + "|" + request.arg;
-    if (gasLimit > 0) {
+                        + request.operation + "|" + arg ;
+    if (gasLimit>0){
      request.gasLimit = gasLimit;
-        toSign += "|" + gasLimit;
+      toSign+= "|" + gasLimit;
    }
-    toSign += "|" + global.sm2Key.publicKey;
+    toSign+= "|" + global.sm2Key.publicKey;
    request.signature = sm2.doSignature(
        toSign,
        global.sm2Key.privateKey,
@@ -431,9 +431,9 @@ function onExecuteResult(obj) {
                $("#responseArea")[0].value = result.result;
        }
        $("#responseID").html(`请求ID:${obj['responseID']}`);
-        var gasInfo = "";
-        if (obj.executionGas != undefined && obj.executionGas > 0)
-            gasInfo = "<br>" + obj.executionGas + "gas";
+        var gasInfo="";
+        if (obj.executionGas!=undefined && obj.executionGas>0)
+          gasInfo="<br>"+obj.executionGas+"gas";
        $("#responseTime").html(`响应时间:${obj['executeTime']}ms${gasInfo}${styleTail}`);
    } catch (e) {
        $("#responseStatus").html("执行状态：Failed");
@@ -443,156 +443,6 @@ function onExecuteResult(obj) {
    }
 }

-function getMask() {
-    const argDiv = $('#maskArg')[0];
-    const request = {};
-    request.action = "getMask";
-    request.requestID = new Date().getTime() + "";
-    request.contractID = global.contractInstance;
-    const operation = $("#selectContractFunction")[0].value;
-    if (operation === " " && !operation) {
-        myToast("执行合约", "请选择合约方法！");
-        return;
-    }
-    //request.operation = operation;
-    request.arg = argDiv.value;
-    request.pubkey = global.sm2Key.publicKey;
-    //request.isDebug = executeContractAsDebug.checked;
-    console.log(request.arg);
-    //const gasLimit = $('#gasLimit').val()/1;
-    var toSign = request.contractID + "|"
-        + request.operation + "|" + arg;
-    /*if (gasLimit>0){
-        request.gasLimit = gasLimit;
-        toSign+= "|" + gasLimit;
-    }*/
-    toSign += "|" + global.sm2Key.publicKey;
-    request.signature = sm2.doSignature(
-        toSign,
-        global.sm2Key.privateKey,
-        {hash: true, der: true});
-    localStorage.setItem("persisArg", JSON.stringify(request));
-    global.wssocket.send(JSON.stringify(request));
-}
-
-function setMask() {
-    const argDiv = $('#maskArg')[0];
-    const request = {};
-    request.action = "setMask";
-    request.requestID = new Date().getTime() + "";
-    request.contractID = global.contractInstance;
-    const operation = $("#selectContractFunction")[0].value;
-    if (operation === " " && !operation) {
-        myToast("执行合约", "请选择合约方法！");
-        return;
-    }
-    //request.operation = operation;
-    request.arg = argDiv.value;
-    request.pubkey = global.sm2Key.publicKey;
-    //request.isDebug = executeContractAsDebug.checked;
-    console.log(request.arg);
-    //const gasLimit = $('#gasLimit').val()/1;
-    var toSign = request.contractID + "|"
-        + request.operation + "|" + arg;
-    /*if (gasLimit>0){
-        request.gasLimit = gasLimit;
-        toSign+= "|" + gasLimit;
-    }*/
-    toSign += "|" + global.sm2Key.publicKey;
-    request.signature = sm2.doSignature(
-        toSign,
-        global.sm2Key.privateKey,
-        {hash: true, der: true});
-    localStorage.setItem("persisArg", JSON.stringify(request));
-    global.wssocket.send(JSON.stringify(request));
-}
-
-function onGetMask(obj) {
-    console.log("onGetMask obj.data", obj.data);
-    try {
-        const result = obj;
-        $("#maskResponseArea")[0].value = JSON.stringify(obj.data);
-
-    } catch (e) {
-        $("#maskResponseArea")[0].value = JSON.stringify(obj.data);
-    }
-}
-
-function getMock() {
-    const argDiv = $('#mockArg')[0];
-    const request = {};
-    request.action = "getMock";
-    request.requestID = new Date().getTime() + "";
-    request.contractID = global.contractInstance;
-    const operation = $("#selectContractFunction")[0].value;
-    if (operation === " " && !operation) {
-        myToast("执行合约", "请选择合约方法！");
-        return;
-    }
-    //request.operation = operation;
-    request.arg = argDiv.value;
-    request.pubkey = global.sm2Key.publicKey;
-    //request.isDebug = executeContractAsDebug.checked;
-    console.log(request.arg);
-    //const gasLimit = $('#gasLimit').val()/1;
-    var toSign = request.contractID + "|"
-        + request.operation + "|" + arg;
-    /*if (gasLimit>0){
-        request.gasLimit = gasLimit;
-        toSign+= "|" + gasLimit;
-    }*/
-    toSign += "|" + global.sm2Key.publicKey;
-    request.signature = sm2.doSignature(
-        toSign,
-        global.sm2Key.privateKey,
-        {hash: true, der: true});
-    localStorage.setItem("persisArg", JSON.stringify(request));
-    global.wssocket.send(JSON.stringify(request));
-}
-
-function setMock() {
-    const argDiv = $('#mockArg')[0];
-    const request = {};
-    request.action = "setMock";
-    request.requestID = new Date().getTime() + "";
-    request.contractID = global.contractInstance;
-    const operation = $("#selectContractFunction")[0].value;
-    if (operation === " " && !operation) {
-        myToast("执行合约", "请选择合约方法！");
-        return;
-    }
-    //request.operation = operation;
-    request.arg = argDiv.value;
-    request.pubkey = global.sm2Key.publicKey;
-    //request.isDebug = executeContractAsDebug.checked;
-    console.log(request.arg);
-    //const gasLimit = $('#gasLimit').val()/1;
-    var toSign = request.contractID + "|"
-        + request.operation + "|" + arg;
-    /*if (gasLimit>0){
-        request.gasLimit = gasLimit;
-        toSign+= "|" + gasLimit;
-    }*/
-    toSign += "|" + global.sm2Key.publicKey;
-    request.signature = sm2.doSignature(
-        toSign,
-        global.sm2Key.privateKey,
-        {hash: true, der: true});
-    localStorage.setItem("persisArg", JSON.stringify(request));
-    global.wssocket.send(JSON.stringify(request));
-}
-
-function onGetMock(obj) {
-    console.log("onGetMask obj.data", obj.data);
-    try {
-        const result = obj;
-        $("#mockResponseArea")[0].value = JSON.stringify(obj.data);
-
-    } catch (e) {
-        $("#mockResponseArea")[0].value = JSON.stringify(obj.data);
-    }
-}
-
 function onHashResult(obj) {
    $("#hashResult").html("数链指纹:" + obj.data);
 }
@@ -652,7 +502,7 @@ function drawCPTable(table) {
 <td>${i + 1}</td>
 <td>${table[i].pid}</td>
 <td>${table[i]['isLeak']}</td>
-<td>${new Date(table[i]['cpuStart']).toLocaleString()}</td>
+<td>${new Date(table[i]['cpuStart']).toLocaleString()}/td>
 <td>${table[i]['cpuTotal']}</td>
 <td>${table[i]['cpuSys']}</td>
 <td>${(table[i]['resident'] / (1024 * 1024)).toFixed(2)}MB</td>
--- a/js/NodePortal.js
+++ b/js/NodePortal.js
@@ -200,12 +200,6 @@ function WSHandler(event) {
            case 'onListLeakContractProcess':
                onListLeakContractProcess(obj);
                break;
-            case 'onGetMask':
-                onGetMask(obj);
-                break;
-            case 'onGetMock':
-                onGetMock(obj);
-                break;
            default:
                displayOutput(obj);
                break;
@@ -274,7 +268,7 @@ function getControlWsUrl(host) {
    }
    path += "SCExecutor";
    if (isBaaS) {
-        path = "/SCIDE/SCExecutor"
+        path = path.replace("ide/", "")
    }
    return prefix + host + path;
 }
@@ -282,7 +276,6 @@ function getControlWsUrl(host) {
 function initWSocket() {
    const host = document.location.host;
    const url = getControlWsUrl(host);
-    document.title = `数瑞智能合约节点管理中心（${host}）`;
    // console.log("connect ws:" + url);
    global.wssocket = createWssocket(url, function () {
        getSession();
@@ -316,8 +309,8 @@ function onNodeLogin(data) {
    console.log("onNodeLogin");
    pubkeyDialogVue.myRole = data.data;
    global.myRole = data.data;
-    loadNodeConfig();
    loadUserMan();
+    loadNodeConfig();
 }

 function apply() {
@@ -525,3 +518,6 @@ function addNodeUnit(obj) {
    option.value = obj.key;
    x.add(option, null);
 }
+
+
+
--- a/js/OnlineIDE.js
+++ b/js/OnlineIDE.js
@@ -127,14 +127,21 @@ function getControlWsUrl(host) {
    if (document.location.href.startsWith("https")) {
        prefix = "wss://";
    }
-    path = "/SCIDE/SCExecutor";
+    let path = document.location.pathname.lastIndexOf("/");
+    path = document.location.pathname.substr(0, path + 1);
+    if (path.indexOf("SCIDE") < 0) {
+        path += "SCIDE/";
+    }
+    path += "SCExecutor";
+    if (isBaaS) {
+        path = path.replace("ide/", "")
+    }
    return prefix + host + path;
 }

 function initWSocket() {
    console.log("[OnlineIDE.js] initWSocket : ");
    let host = document.location.host;
-    document.title = `数瑞智能合约在线编辑器（${host}）`
    let url = getControlWsUrl(
        global.urlparam && global.urlparam['nodeAddr'] ? global.urlparam['nodeAddr'] : host);
    // console.log("connect ws:" + url);
--- a/js/cm.js
+++ b/js/cm.js
@@ -75,7 +75,9 @@ var getControlWsUrl = function (host) {
    var prefix = "ws://";
    if (document.location.href.startsWith("https"))
        prefix = "wss://";
-    var path = "/SCIDE/SCExecutor";
+    var path = document.location.pathname.lastIndexOf("/");
+    path = document.location.pathname.substr(0, path + 1);
+    path += "SCExecutor";
    return prefix + host + path;
 };
 var initWSocket = function () {
--- a/js/codeManage/operManage.js
+++ b/js/codeManage/operManage.js
@@ -158,44 +158,39 @@ var onStartContract = function(obj) {
 };

 // 集群启动合约
-function startContractUnits(place) {
+var startContractUnits = function(place) {
 	// ZYX
-    const unitsID = $("#selectUnits")[0].value.split("_")[1];
-    if (!unitsID || unitsID === "选择节点集群") {
-        myToast("提示", "请选择节点集群!");
+	var unitsID = $("#selectUnits")[0].value.split("_")[1];
+	if(unitsID == undefined || unitsID == "选择节点集群"){
+		myToast("提示","请选择节点集群!");
 		return;
 	}

-    let peersID = "";
-    for (let i in global.units[unitsID]) {
+	var peersID = "";
+	for ( var i in global.units[unitsID]) {
 		peersID += global.units[unitsID][i].pubKey + ",";
 	}

-    const request = {};
+	var request = {};

 	request.action = "startContractMultiPoint";
 	request.peersID = peersID;
 	request.type  = $("#sequence")[0].value;
 	console.log(request.type);
-    if (request.type == 0) {
-        myToast("提示", "请选择集群合约模式!");
-        return;
-    }
-    request.selectUnitNum = Number($("#selectUnitNum")[0].value);
-    if (!request.selectUnitNum || isNaN(request.selectUnitNum)) {
-        myToast("提示", "请填写集群规模！");
+	if (request.type==0){
+        myToast("提示","请选择集群合约模式!");
        return;
 	}
 	request.projectName = global.ypkName;
-    if (!request.projectName || request.projectName == "请选择ypk文件") {
-        myToast("提示", "请选择合约!");
+	if (request.projectName==undefined || request.projectName == "请选择ypk文件"){
+		myToast("提示","请选择合约!");
 		return;
 	}
 	request.isPrivate = global.ypkIsPrivate;
 	request.sponsorPeerID = global.peerID;   //peerID of the node
 	console.log(request);
 	global.wssocket.send(JSON.stringify(request));
-}
+};

 var onStartTrustfulContract = function(obj) {
 	console.log(obj);
--- a/js/nodeCenter.js
+++ b/js/nodeCenter.js
@@ -176,6 +176,8 @@ var getControlWsUrl = function(host) {
 	var prefix = "ws://";
 	if (document.location.href.startsWith("https"))
 		prefix = "wss://";
-	var path = "/SCIDE/SCExecutor";
+	var path = document.location.pathname.lastIndexOf("/");
+	path = document.location.pathname.substr(0, path + 1);
+	path += "SCExecutor";
 	return prefix + host + path;
 };
--- a/js/onlineide/rightmenu.js
+++ b/js/onlineide/rightmenu.js
@@ -173,13 +173,9 @@ function importContractInstanceCodeByDOI() {
 }

 function openInClient() {
-    let path = document.location.pathname.lastIndexOf("/ide");
-    if (path > 0)
-        path = document.location.pathname.substr(0, path + 1);
-    else path = "/";
    window.open(isBaaS ?
-        `${location.origin}${path}client/BaaSClient.html${location.search}` :
-        `${location.origin}${path}client/bdwareclient.html?self=true&` +
+        `${location.origin}/client/BaaSClient.html${location.search}` :
+        `${location.origin}/client/bdwareclient.html?self=true&` +
        `contract=${mainVue.contracts[selectedContract.value].id}`);
 }

@@ -222,15 +218,15 @@ function executeContract() {
    request.contractID = contract.id;
    request.operation = contract.exportedFunctions[selectedFunction.value].functionName;
    const arg = executeContractArgInput.value;
-    const gasLimit = $('#gasLimit').val() / 1;
+    const gasLimit = $('#gasLimit').val()/1;
    request.pubkey = sm2Key.publicKey;
-    let toSign = request.contractID + "|"
-        + request.operation + "|" + arg;
-    if (gasLimit > 0) {
+    var toSign = request.contractID + "|"
+                    + request.operation + "|" + arg ;
+    if (gasLimit>0){
      request.gasLimit = gasLimit;
-        toSign += "|" + gasLimit;
+      toSign+= "|" + gasLimit;
    }
-    toSign += "|" + sm2Key.publicKey;
+    toSign+= "|" + sm2Key.publicKey;
    request.signature = sm2.doSignature(
        toSign,
        sm2Key.privateKey,
Author	SHA1	Message	Date
root	c0c19fae21	fix: BaasOnlineIDE.html hidden overflowed part	2021-07-24 11:11:36 +08:00
root	a22b1064eb	feat: nanning ui	2021-07-24 11:09:14 +08:00