fix Nanning SQLGenerator

Merge branch 'master' of https://phabricator.internetapi.cn/source/bdcontract-web-client into proj/nanning
# Conflicts: # BaaSClient.html # bdwareclient.html
2021-09-29 23:38:37 +08:00 · 2021-09-18 13:31:04 +08:00 · 2021-08-06 15:45:45 +08:00
6 changed files with 9232 additions and 24 deletions
--- a/BaaSClient.html
+++ b/BaaSClient.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="./js/createWS.js"></script>
 <script src="./js/cryptico.js"></script>
 <script src="./js/jquery-2.1.4.js"></script>
@ -21,8 +21,8 @@
 			<div class="input-group">
 				<a class="navbar-brand" href="#"> <img alt="Brand"
 					src="./img/logo-1.png" style="height: 30px">
-				</a><a class="navbar-brand">数瑞浏览器&nbsp;&nbsp; </a> <input id="urlInput"
-					type="text" class="form-control" placeho=lder="输入地址"  style="display: none;">
+				</a><a class="navbar-brand">可信共享浏览器&nbsp;&nbsp; </a> <input id="urlInput"
+					type="text" class="form-control" placeholder="输入地址"  style="display: none;">

 				<button class="btn btn-outline-secondary" type="button"
 					onclick="connectNode()"  style="display: none;">GO</button>
--- a/bdwareclient.html
+++ b/bdwareclient.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="./js/createWS.js"></script>
    <script src="./js/cryptico.js"></script>
    <script src="./js/jquery-2.1.4.js"></script>
@ -23,7 +23,7 @@
                <img alt="Brand"
                     src="./img/logo-1.png" style="height: 30px">
            </a>
-            <a class="navbar-brand">数瑞浏览器&nbsp;&nbsp; </a>
+            <a class="navbar-brand">可信共享浏览器&nbsp;&nbsp; </a>
            <div class="input-group-prepend">
                <input id="urlInput" style="border-top-left-radius: 5px; border-bottom-left-radius: 5px"
                       type="text" placeholder="输入地址">
--- a/img/logo-1.png
+++ b/img/logo-1.png
--- a/js/bdwareclient.js
+++ b/js/bdwareclient.js
@ -399,7 +399,10 @@ function changeAppInternal(requireRendering) {
            + "            <div class=\"row\">\n"
            + "              <div class=\"col-sm-12 d-flex justify-content-center\">\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"
            + "                  </div>\n"
            + "                  <input type=\"text\" class=\"form-control\" id=\"argInput\" placeholder=\"填写参数\" >\n"
@ -437,10 +440,16 @@ function changeAppInternal(requireRendering) {
            + "        </div>\n"
            + "      </div></div>\n" + "";
        $("#mainDiv")[0].innerHTML = html;
-        for (const f of global.currentContract.exportedFunctions) {
-            $('#selectAction')
-                .append(`<option value="${f.functionName}">${f.functionName}</option>`);
-        }
+        filterIOFunction();
+    }
+}
+function filterIOFunction(){
+    var showIO = showIOInput.checked;
+    $('#selectAction').html("<option value=\"-1\">选择方法</option>");
+    for (const f of global.currentContract.exportedFunctions) {
+       if (!showIO || f.relatedPermission.length!=0)
+           $('#selectAction')
+                    .append(`<option value="${f.functionName}">${f.functionName}</option>`);
    }
 }

@ -827,7 +836,6 @@ function getRequestParameters() {
 }


-
 function changeRender() {
    if (global.urlparam["noRender"] === "true") {
        global.urlparam["noRender"] = undefined;
@ -837,4 +845,4 @@ function changeRender() {
        switchRenderBtn.innerHTML = "加载界面";
    }
    changeApp();
-}
+}
--- a/js/commonutil.js
+++ b/js/commonutil.js
@ -49,15 +49,9 @@ var initVue = function () {
                        newKey.id = this.sm2KeyList.length;
                        newKey.title = headerVue.shortName;
                        newKey.sm2Key = this.sm2KeyStr;
-                        var exist = false;
-                        for (var i=0;i<this.sm2KeyList.length;i++){
-                            var iterKey = this.sm2KeyList[i];
-                            if (iterKey.sm2Key==newKey.sm2Key)
-                                exist = true;
-                        }
-                        if (!exist)
-                            this.sm2KeyList.push(newKey);
+                        this.sm2KeyList.push(newKey);
                        localStorage.setItem("PrivKeyList", JSON.stringify(this.sm2KeyList));
+
                        getSession();
                        listProjects("priv");
                    }
--- a/js/jquery-2.1.4.js
+++ b/js/jquery-2.1.4.js
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
root	bc8a9c2df1	feat: support function permission	2021-08-06 15:45:45 +08:00