Merge pull request #422 from WeBankBlockchain/dev

v1.5.4 dev=>master
WeBankBlockchain · Feb 22, 2022 · c54683d · c54683d
2 parents 3b0b2c2 + 3444e41
commit c54683d
Show file tree

Hide file tree

Showing 215 changed files with 9,532 additions and 6,162 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,17 @@
+### v1.5.4(2022-02-22)
+
+**Add**
+- 新增右边栏的管理台操作指引
+
+**Fix**
+- 优化合约IDE与发交易提示
+- 优化登录页“忘记密码“与”验证码加载失败“提示
+
+**兼容性**
+- 支持FISCO-BCOS v2.4.x 及以上版本
+- WeBASE-Node-Manager v1.5.4+
+
+详细了解,请阅读[**技术文档**](https://webasedoc.readthedocs.io/zh_CN/latest/)。
 
 ### v1.5.3(2021-09-27)
 

diff --git a/build/utils.js b/build/utils.js
@@ -1,7 +1,7 @@
 'use strict'
 const path = require('path')
 const config = require('../config')
-// const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const packageConfig = require('../package.json')
 
@@ -46,18 +46,15 @@ exports.cssLoaders = function (options) {
 
     // Extract CSS when that option is specified
     // (which is the case during production build)
-    // if (options.extract) {
-    //   return ExtractTextPlugin.extract({
-    //     use: loaders,
-    //     fallback: 'vue-style-loader',
-    //     publicPath: '../../'
-    //   })
-    // } else {
-    //   return ['vue-style-loader'].concat(loaders)
-    // }
-    return [
-        options.extract ? MiniCssExtractPlugin.loader : 'vue-style-loader',
-    ].concat(loaders)
+    if (options.extract) {
+      return ExtractTextPlugin.extract({
+        use: loaders,
+        fallback: 'vue-style-loader',
+        publicPath: '../../'
+      })
+    } else {
+      return ['vue-style-loader'].concat(loaders)
+    }
   }
 
   // https://vue-loader.vuejs.org/en/configurations/extract-css.html

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.377ff8612ead6e3e04f7.js></script><script type=text/javascript src=./static/js/3.720714a2acd1ca40e483.js></script><script type=text/javascript src=./static/js/runtime.27b95d0d2ae08f33bcdf.js></script><script type=text/javascript src=./static/js/5.e451c48d5b4c27d362c1.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.dd5fdfb912567481b549.js></script><script type=text/javascript src=./static/js/3.4aebb38485ee409b7066.js></script><script type=text/javascript src=./static/js/runtime.fcd0188e6e2cc5c660a6.js></script><script type=text/javascript src=./static/js/5.329ceea62d180c4a50cf.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/js/0.377ff8612ead6e3e04f7.js b/dist/static/js/0.377ff8612ead6e3e04f7.js
diff --git a/dist/static/js/0.377ff8612ead6e3e04f7.js.gz b/dist/static/js/0.377ff8612ead6e3e04f7.js.gz
diff --git a/dist/static/js/0.dd5fdfb912567481b549.js b/dist/static/js/0.dd5fdfb912567481b549.js
diff --git a/dist/static/js/0.dd5fdfb912567481b549.js.gz b/dist/static/js/0.dd5fdfb912567481b549.js.gz
diff --git a/dist/static/js/1.acbaccc3d7bcbe01ef21.js b/dist/static/js/1.acbaccc3d7bcbe01ef21.js
diff --git a/dist/static/js/1.acbaccc3d7bcbe01ef21.js.gz b/dist/static/js/1.acbaccc3d7bcbe01ef21.js.gz
diff --git a/dist/static/js/1.e3f6e6b02d4bc5342f09.js b/dist/static/js/1.e3f6e6b02d4bc5342f09.js
diff --git a/dist/static/js/1.e3f6e6b02d4bc5342f09.js.gz b/dist/static/js/1.e3f6e6b02d4bc5342f09.js.gz
diff --git a/dist/static/js/10.53420259d982044803d0.js b/dist/static/js/10.53420259d982044803d0.js
diff --git a/dist/static/js/10.c7794e4c09a71d48eaae.js b/dist/static/js/10.c7794e4c09a71d48eaae.js
diff --git a/dist/static/js/10.c7794e4c09a71d48eaae.js.gz b/dist/static/js/10.c7794e4c09a71d48eaae.js.gz
diff --git a/dist/static/js/11.51840dedba8da6cf9b45.js b/dist/static/js/11.51840dedba8da6cf9b45.js
diff --git a/dist/static/js/11.c9665689341ad5e42010.js b/dist/static/js/11.c9665689341ad5e42010.js
diff --git a/dist/static/js/11.c9665689341ad5e42010.js.gz b/dist/static/js/11.c9665689341ad5e42010.js.gz