Merge pull request #503 from WeBankBlockchain/lab-dev

merge 3.1.0 into master of scaffold
WeBankBlockchain · Jul 24, 2023 · b02e1ca · b02e1ca
2 parents 7cdfc8f + ac7acf6
commit b02e1ca
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,18 @@
+### v3.1.0(2023-07-20)
+
+**Add**
+- 支持合约IDE的Java项目导出功能，并支持struct格式参数
+
+**Fix**
+- 修复合约IDE使用solidity v0.6.10-gm时版本判断问题
+- 修复一些已知的bug如合约参数判断问题等
+
+**兼容性**
+- 支持FISCO-BCOS v3.0.0 及以上版本
+- WeBASE-Node-Manager v3.1.0及以上版本
+- WeBASE-Front v3.1.0及以上版本
+- WeBASE-Sign v3.0.0
+
 ### v3.0.2(2023-03-31)
 
 **Fix**

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.a8135dffc4f0f4b9222e.js></script><script type=text/javascript src=./static/js/4.1e68a47808b0c77ac992.js></script><script type=text/javascript src=./static/js/runtime.bb37252c90fcce12574a.js></script><script type=text/javascript src=./static/js/6.79ad17ade2027bc30fc6.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.e85ae800cf5029745c88.js></script><script type=text/javascript src=./static/js/4.1e68a47808b0c77ac992.js></script><script type=text/javascript src=./static/js/runtime.bb37252c90fcce12574a.js></script><script type=text/javascript src=./static/js/6.79ad17ade2027bc30fc6.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.a8135dffc4f0f4b9222e.js → dist/static/js/0.e85ae800cf5029745c88.js b/dist/static/js/0.a8135dffc4f0f4b9222e.js → dist/static/js/0.e85ae800cf5029745c88.js
diff --git a/dist/static/js/0.a8135dffc4f0f4b9222e.js.gz → dist/static/js/0.e85ae800cf5029745c88.js.gz b/dist/static/js/0.a8135dffc4f0f4b9222e.js.gz → dist/static/js/0.e85ae800cf5029745c88.js.gz
diff --git a/package.json b/package.json
@@ -5,9 +5,9 @@
   "author": "",
   "private": true,
   "scripts": {
-    "dev": "set NODE_OPTIONS=--openssl-legacy-provider&&webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
+    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
     "start": "npm run dev",
-    "build": "set NODE_OPTIONS=--openssl-legacy-provider&&node build/build.js",
+    "build": "node build/build.js",
     "update": "node build/update_module.js"
   },
   "dependencies": {

diff --git a/src/views/chaincode/components/code.vue b/src/views/chaincode/components/code.vue
@@ -43,10 +43,10 @@
           <i class="wbs-icon-send font-16"></i>
           <span>{{this.$t("text.send")}}</span>
         </span>
-        <!-- <span class="contract-code-done" @click="exportJava" v-if="(!contractAddress && abiFile && bin && !disabled)|| (contractAddress && !disabled)">
+        <span class="contract-code-done" @click="exportJava" v-if="(!contractAddress && abiFile && bin && !disabled)|| (contractAddress && !disabled)">
                     <i class="el-icon-download contract-icon-style font-16"></i>
                     <span>{{this.$t("text.exportJavaProject")}}</span>
-                </span> -->
+                </span>
       </span>
     </div>
     <div class="contract-code-content" :class="{infoHide: !successHide}">