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

Compare commits

base: bdware:v1.4.5
Branches Tags
bdware:master bdware:proj/nanning bdware:proj/zhizhen
bdware:v1.6.6 bdware:v1.4.5
...
compare: bdware:proj/nanning
Branches Tags
bdware:master bdware:proj/nanning bdware:proj/zhizhen
bdware:v1.6.6 bdware:v1.4.5

12 Commits
v1.4.5 ... proj/nanni

Author SHA1 Message Date
Hongwei
1d7a04933b fix Nanning SQLGenerator 2021-09-29 23:38:37 +08:00
CaiHQ
cdce5f0a9d Merge branch 'master' of https://phabricator.internetapi.cn/source/bdcontract-web-client into proj/nanning 
# Conflicts:
#	BaaSClient.html
#	bdwareclient.html
 2021-09-18 13:31:04 +08:00
hongwei
839972f77a change router 2021-09-07 10:30:48 +08:00
Frank.R.Wu
62fa349507 feat: change title 
change title when changing applications
 2021-08-09 21:34:06 +08:00
Frank.R.Wu
d0dc3f4e0b feat: change title 
change title when changing nodes or applications
 2021-08-09 21:08:23 +08:00
root
bc8a9c2df1 feat: support function permission 2021-08-06 15:45:45 +08:00
root
fe13a53e19 restore web-client 2021-07-26 16:48:22 +08:00
root
38e24d67f5 Merge branch 'proj/nanning' 2021-07-26 16:43:10 +08:00
root
3871b35652 feat: nanning ui 2021-07-26 16:38:09 +08:00
root
1797f006a7 feat:bdware ui 2021-07-26 16:33:22 +08:00
root
05ad562f1f feat: nanning ui 2021-07-26 16:23:22 +08:00
root
e973ba53f7 feat: nanning ui 2021-07-24 11:09:14 +08:00
4 changed files with 31 additions and 21 deletions
Expand all files Collapse all files

6
BaaSClient.html
View File

@@ -2,14 +2,12 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="Cache-Control" content="no-cache" /> <meta http-equiv="Cache-Control" content="no-cache" />
<title>数瑞客户端</title> <title>可信共享浏览器</title>
<script src="./js/createWS.js"></script> <script src="./js/createWS.js"></script>
<script src="./js/cryptico.js"></script> <script src="./js/cryptico.js"></script>
<script src="./js/jquery-2.1.4.js"></script> <script src="./js/jquery-2.1.4.js"></script>
<script src="./js/bootstrap.min.js"></script> <script src="./js/bootstrap.min.js"></script>
<script src="./js/commonutil.js"></script> <script src="./js/commonutil.js"></script>
<link href="./css/common.css" rel="stylesheet"> <link href="./css/common.css" rel="stylesheet">
<link href="./css/bootstrap.min.css" rel="stylesheet"> <link href="./css/bootstrap.min.css" rel="stylesheet">
<script src="./js/vue.js"></script> <script src="./js/vue.js"></script>
@@ -23,7 +21,7 @@
<div class="input-group"> <div class="input-group">
<a class="navbar-brand" href="#"> <img alt="Brand" <a class="navbar-brand" href="#"> <img alt="Brand"
src="./img/logo-1.png" style="height: 30px"> src="./img/logo-1.png" style="height: 30px">
</a><a class="navbar-brand">数瑞浏览器&nbsp;&nbsp; </a> <input id="urlInput" </a><a class="navbar-brand">可信共享浏览器&nbsp;&nbsp; </a> <input id="urlInput"
type="text" class="form-control" placeholder="输入地址" style="display: none;"> type="text" class="form-control" placeholder="输入地址" style="display: none;">
<button class="btn btn-outline-secondary" type="button" <button class="btn btn-outline-secondary" type="button"

4
bdwareclient.html
View File

@@ -2,7 +2,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="Cache-Control" content="no-cache"/> <meta http-equiv="Cache-Control" content="no-cache"/>
<title>数瑞客户端</title> <title>可信共享浏览器</title>
<script src="./js/createWS.js"></script> <script src="./js/createWS.js"></script>
<script src="./js/cryptico.js"></script> <script src="./js/cryptico.js"></script>
<script src="./js/jquery-2.1.4.js"></script> <script src="./js/jquery-2.1.4.js"></script>
@@ -23,7 +23,7 @@
<img alt="Brand" <img alt="Brand"
src="./img/logo-1.png" style="height: 30px"> src="./img/logo-1.png" style="height: 30px">
</a> </a>
<a class="navbar-brand">数瑞浏览器&nbsp;&nbsp; </a> <a class="navbar-brand">可信共享浏览器&nbsp;&nbsp; </a>
<div class="input-group-prepend"> <div class="input-group-prepend">
<input id="urlInput" style="border-top-left-radius: 5px; border-bottom-left-radius: 5px" <input id="urlInput" style="border-top-left-radius: 5px; border-bottom-left-radius: 5px"
type="text" placeholder="输入地址"> type="text" placeholder="输入地址">

BIN
img/logo-1.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 7.8 KiB

36
js/bdwareclient.js
View File

@@ -313,6 +313,7 @@ function displayOutput(obj) {
function initWSocket() { function initWSocket() {
let host = $("#urlInput")[0].value; let host = $("#urlInput")[0].value;
document.title = `数瑞浏览器（${host}）`
if (!host.startsWith("ws")) { if (!host.startsWith("ws")) {
if (location.href.startsWith("https")) { if (location.href.startsWith("https")) {
host = "wss://" + host; host = "wss://" + host;
@@ -375,6 +376,7 @@ function changeApp() {
return; return;
} }
console.log(global.currentContract); console.log(global.currentContract);
document.title = `数瑞浏览器（${global.currentContract.name} - ${$("#urlInput")[0].value}）`
changeAppInternal(needRender(global.currentContract)); changeAppInternal(needRender(global.currentContract));
} }
@@ -397,7 +399,10 @@ function changeAppInternal(requireRendering) {
+ " <div class=\"row\">\n" + " <div class=\"row\">\n"
+ " <div class=\"col-sm-12 d-flex justify-content-center\">\n" + " <div class=\"col-sm-12 d-flex justify-content-center\">\n"
+ " <div class=\"input-group mb-2\">\n" + " <div class=\"input-group mb-2\">\n"
+ " <div class=\"input-group-prepend\">\n" + " <div class=\"input-group-prepend input-group-text\">\n"
+ "<input type=\"checkbox\" id=\"showIOInput\" onchange=\"filterIOFunction()\" checked=\"on\" aria-label=\"Checkbox for ShowIO\" data-toggle=\"tooltip\" title=\"仅显示有IO函数\"></input>"
+ " </div>\n"
+ " <div class=\"input-group-append\">\n"
+ " <select id=\"selectAction\" onchange=\"showDescription()\" class=\"custom-select\" style=\"-webkit-appearance: none;\"><option value=\"-1\">选择方法</option></select> \n" + " <select id=\"selectAction\" onchange=\"showDescription()\" class=\"custom-select\" style=\"-webkit-appearance: none;\"><option value=\"-1\">选择方法</option></select> \n"
+ " </div>\n" + " </div>\n"
+ " <input type=\"text\" class=\"form-control\" id=\"argInput\" placeholder=\"填写参数\" >\n" + " <input type=\"text\" class=\"form-control\" id=\"argInput\" placeholder=\"填写参数\" >\n"
@@ -435,11 +440,17 @@ function changeAppInternal(requireRendering) {
+ " </div>\n" + " </div>\n"
+ " </div></div>\n" + ""; + " </div></div>\n" + "";
$("#mainDiv")[0].innerHTML = html; $("#mainDiv")[0].innerHTML = html;
filterIOFunction();
}
}
function filterIOFunction(){
var showIO = showIOInput.checked;
$('#selectAction').html("<option value=\"-1\">选择方法</option>");
for (const f of global.currentContract.exportedFunctions) { for (const f of global.currentContract.exportedFunctions) {
if (!showIO || f.relatedPermission.length!=0)
$('#selectAction') $('#selectAction')
.append(`<option value="${f.functionName}">${f.functionName}</option>`); .append(`<option value="${f.functionName}">${f.functionName}</option>`);
} }
}
} }
function getContractDesp() { function getContractDesp() {
@@ -474,21 +485,21 @@ function triggerExecuteCurrentContract() {
console.log(funNode); console.log(funNode);
const argInput = $("#argInput"); const argInput = $("#argInput");
var contract = global.currentContract; var contract = global.currentContract;
var gas = $("#gasInput")[0].value/1; var gas = $("#gasInput")[0].value / 1;
executeContractWithGas(contract.id, funNode.functionName, argInput[0].value,gas, executeContractWithGas(contract.id, funNode.functionName, argInput[0].value, gas,
fillResultInternal, executeContractAsDebug.checked); fillResultInternal, executeContractAsDebug.checked);
var iHtml = "/SCIDE/SCManager?action=executeContract&contractID=" var iHtml = "/SCIDE/SCManager?action=executeContract&contractID="
+ global.currentContract.name + "&operation=" + global.currentContract.name + "&operation="
+ funNode.functionName + "&arg=" + argInput[0].value; + funNode.functionName + "&arg=" + argInput[0].value;
var toSign = global.currentContract.name + "|" + funNode.functionName + "|" var toSign = global.currentContract.name + "|" + funNode.functionName + "|"
+ argInput[0].value ; + argInput[0].value;
if (gas>0){ if (gas > 0) {
toSign+="|"+gas; toSign += "|" + gas;
iHtml+="&gasLimit="+gas; iHtml += "&gasLimit=" + gas;
} }
iHtml+= "&pubkey=" + global.sm2Key.publicKey + "&signature="; iHtml += "&pubkey=" + global.sm2Key.publicKey + "&signature=";
toSign+= "|" + global.sm2Key.publicKey; toSign += "|" + 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; let urlPre = $("#urlInput")[0].value;
if (urlPre.startsWith("ws")) { if (urlPre.startsWith("ws")) {
@@ -528,8 +539,8 @@ function fillResultInternal(result, data) {
global.responseCollector[data.responseID].push(data); global.responseCollector[data.responseID].push(data);
$("#statusSpan")[0].innerHTML = result.status; $("#statusSpan")[0].innerHTML = result.status;
$("#timeSpan")[0].innerHTML = "调用耗时:" + data.executeTime + "(ms)"; $("#timeSpan")[0].innerHTML = "调用耗时:" + data.executeTime + "(ms)";
if (data.executionGas !=undefined && data.executionGas>0) if (data.executionGas != undefined && data.executionGas > 0)
$("#timeSpan")[0].innerHTML+="<br> "+data.executionGas+"(gas)"; $("#timeSpan")[0].innerHTML += "<br> " + data.executionGas + "(gas)";
$("#timeSpan")[0].innerHTML $("#timeSpan")[0].innerHTML
if (result.result instanceof Object) { if (result.result instanceof Object) {
$("#responseArea")[0].value = JSON.stringify(result.result); $("#responseArea")[0].value = JSON.stringify(result.result);
@@ -824,6 +835,7 @@ function getRequestParameters() {
} }
} }
function changeRender() { function changeRender() {
if (global.urlparam["noRender"] === "true") { if (global.urlparam["noRender"] === "true") {
global.urlparam["noRender"] = undefined; global.urlparam["noRender"] = undefined;