Merge pull request #372 from WeBankFinTech/dev

v1.5.2 dev=>master
WeBankBlockchain · Jul 19, 2021 · 219bb83 · 219bb83
2 parents 430848b + d1945a1
commit 219bb83
Show file tree

Hide file tree

Showing 100 changed files with 1,661 additions and 556 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,5 +11,6 @@ package-lock.json
 *.ntvs*
 *.njsproj
 *.sln
-v0.*.js
-v0.*.js.gz
+v0.*.*.js
+v0.*.*.js.gz
+dist/ace/
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,23 @@
+
+### v1.5.2(2021-07-16)
+
+**Add**
+- 优化合约Java项目导出功能，支持批量编译合约，支持多用户与channel端口检查
+- 合约仓库新增资产合约模板
+- 优化交易弹窗，支持无私钥用户时直接创建私钥
+- 支持开发者导出私钥、支持合约IDE绑定合约地址
+
+**Fix**
+- 修复异常合约列表排序
+- 修复权限管理页面切换群组问题
+
+**兼容性**
+- 支持FISCO-BCOS v2.4.x 及以上版本
+- WeBASE-Node-Manager v1.5.2+
+
+详细了解,请阅读[**技术文档**](https://webasedoc.readthedocs.io/zh_CN/latest/)。
+
+
 ### v1.5.1(2021-05-28)
 
 **Add**

diff --git a/config/index.js b/config/index.js
@@ -12,9 +12,9 @@ module.exports = {
         assetsPublicPath: '/',
         proxyTable: {
             '/mgr': {
-                target: 'http://127.0.0.1/',
+                target: 'http://127.0.0.1/', 
                 changeOrigin: true,
-                pathRewrite: {
+                pathRewrite: { 
                     '^/mgr': ''
                 }
             },

diff --git a/dist/index.html b/dist/index.html
@@ -21,7 +21,7 @@
       height: 100%;
       margin: 0px;
       padding: 0px;
-    }</style></head><body><body><div id=app></div><script type=text/javascript src=./static/js/0.78428cc43e16f2851ca0.js></script><script type=text/javascript src=./static/js/3.0821fa8aa4c19fafedf3.js></script><script type=text/javascript src=./static/js/runtime.adc4182f8a21b151e272.js></script><script type=text/javascript src=./static/js/5.9611bbb710402348985a.js></script></body><script src=./static/js/web3.min.js type=text/javascript></script><script>if (self == top) {
+    }</style></head><body><body><div id=app></div><script type=text/javascript src=./static/js/0.6eb65206cdce4a6a2093.js></script><script type=text/javascript src=./static/js/3.dbdd83d361e4dea0fc2e.js></script><script type=text/javascript src=./static/js/runtime.c82e3b96ff316d1bbab7.js></script><script type=text/javascript src=./static/js/5.d9fbb794b71bdf1a7853.js></script></body><script src=./static/js/web3.min.js type=text/javascript></script><script>if (self == top) {
             var antiClickjack = document.getElementById("antiClickjack");
             antiClickjack.parentNode.removeChild(antiClickjack);
         } else {

diff --git a/dist/static/css/reset.css b/dist/static/css/reset.css
@@ -1,39 +1,39 @@
-*{margin: 0;padding: 0;list-style: none;}
-
-
-body, h1, h2, h3, h4, h5, h6, hr, p, blockquote,
-dl, dt, dd, ul, ol, li,
-pre,
-form, fieldset, legend, button, input, textarea,
-th, td {
-  margin: 0;
-  padding: 0;
-}
-html,body{
-  height: 100%;
-}
-body,
-button, input, select, textarea /* for ie */ {
-  font: 14px/1.5 tahoma, arial, \5b8b\4f53, sans-serif;
-}
-h1, h2, h3, h4, h5, h6 { font-size: 100%; }
-address, cite, dfn, em, var { font-style: normal; }
-code, kbd, pre, samp { font-family: courier new, courier, monospace; }
-small { font-size: 14px; }
-ul, ol { list-style: none; }
-a { text-decoration: none; }
-a:hover { text-decoration: underline; }
-legend { color: #000; } /* for ie6 */
-fieldset, img { border: 0; }
-button, input, select, textarea { font-size: 100%; }
-table { border-collapse: collapse; border-spacing: 0; }
-.ks-clear:after, .clear:after {
-  content: '\20';
-  display: block;
-  height: 0;
-  clear: both;
-}
-.ks-clear, .clear {
-  *zoom: 1;
-}
-
+*{margin: 0;padding: 0;list-style: none;}
+
+
+body, h1, h2, h3, h4, h5, h6, hr, p, blockquote,
+dl, dt, dd, ul, ol, li,
+pre,
+form, fieldset, legend, button, input, textarea,
+th, td {
+  margin: 0;
+  padding: 0;
+}
+html,body{
+  height: 100%;
+}
+body,
+button, input, select, textarea /* for ie */ {
+  font: 14px/1.5 tahoma, arial, \5b8b\4f53, sans-serif;
+}
+h1, h2, h3, h4, h5, h6 { font-size: 100%; }
+address, cite, dfn, em, var { font-style: normal; }
+code, kbd, pre, samp { font-family: courier new, courier, monospace; }
+small { font-size: 14px; }
+ul, ol { list-style: none; }
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+legend { color: #000; } /* for ie6 */
+fieldset, img { border: 0; }
+button, input, select, textarea { font-size: 100%; }
+table { border-collapse: collapse; border-spacing: 0; }
+.ks-clear:after, .clear:after {
+  content: '\20';
+  display: block;
+  height: 0;
+  clear: both;
+}
+.ks-clear, .clear {
+  *zoom: 1;
+}
+
diff --git a/dist/static/font/webfont.svg b/dist/static/font/webfont.svg
diff --git a/dist/static/img/iconfont.7fa1e8d.svg → dist/static/img/iconfont.b8f9c04.svg b/dist/static/img/iconfont.7fa1e8d.svg → dist/static/img/iconfont.b8f9c04.svg
diff --git a/dist/static/js/0.6eb65206cdce4a6a2093.js b/dist/static/js/0.6eb65206cdce4a6a2093.js
diff --git a/dist/static/js/0.6eb65206cdce4a6a2093.js.gz b/dist/static/js/0.6eb65206cdce4a6a2093.js.gz
diff --git a/dist/static/js/0.78428cc43e16f2851ca0.js b/dist/static/js/0.78428cc43e16f2851ca0.js
diff --git a/dist/static/js/0.78428cc43e16f2851ca0.js.gz b/dist/static/js/0.78428cc43e16f2851ca0.js.gz
diff --git a/dist/static/js/1.5148b8123a98265a684d.js b/dist/static/js/1.5148b8123a98265a684d.js
diff --git a/dist/static/js/1.5148b8123a98265a684d.js.gz b/dist/static/js/1.5148b8123a98265a684d.js.gz
diff --git a/dist/static/js/1.78a0b8501a942bef1040.js b/dist/static/js/1.78a0b8501a942bef1040.js
diff --git a/dist/static/js/1.78a0b8501a942bef1040.js.gz b/dist/static/js/1.78a0b8501a942bef1040.js.gz
diff --git a/dist/static/js/10.8e53abfb6be8f870dcc6.js b/dist/static/js/10.8e53abfb6be8f870dcc6.js