Merge pull request #278 from WeBankFinTech/dev

fix 0.6 view tx
WeBankBlockchain · Dec 11, 2020 · 046895b · 046895b
2 parents 4d29d7f + cf9049a
commit 046895b
Show file tree

Hide file tree

Showing 21 changed files with 157 additions and 129 deletions.
diff --git a/dist/index.html b/dist/index.html
@@ -11,7 +11,7 @@
             vertical-align: -0.15em;
             fill: currentColor;
             overflow: hidden;
-        }</style></head><body><body><div id=app style="height: 100% !important;"></div><script type=text/javascript src=./static/js/0.adb3aa8e4aadad44b0a4.js></script><script type=text/javascript src=./static/js/3.2cba8e5c43b6f5ebcee0.js></script><script type=text/javascript src=./static/js/runtime.efd7e80af2efd105acbd.js></script><script type=text/javascript src=./static/js/5.649d1c551fbfb3b1fcbc.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 style="height: 100% !important;"></div><script type=text/javascript src=./static/js/0.773b6f7e79343f51af60.js></script><script type=text/javascript src=./static/js/3.fc50e885c80637a067a5.js></script><script type=text/javascript src=./static/js/runtime.15281bb5877ca3c43888.js></script><script type=text/javascript src=./static/js/5.0ccd1f558995098a86a8.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/release_note.txt b/dist/release_note.txt
@@ -0,0 +1 @@
+v1.4.2
diff --git a/dist/static/img/iconfont.b8f9c04.svg → dist/static/img/iconfont.7fa1e8d.svg b/dist/static/img/iconfont.b8f9c04.svg → dist/static/img/iconfont.7fa1e8d.svg
diff --git a/dist/static/js/0.773b6f7e79343f51af60.js b/dist/static/js/0.773b6f7e79343f51af60.js
diff --git a/dist/static/js/0.adb3aa8e4aadad44b0a4.js b/dist/static/js/0.adb3aa8e4aadad44b0a4.js
diff --git a/dist/static/js/1.2aa6beb5283722441d6e.js b/dist/static/js/1.2aa6beb5283722441d6e.js
diff --git a/dist/static/js/1.ddf51fbe4bc655029386.js b/dist/static/js/1.ddf51fbe4bc655029386.js
diff --git a/dist/static/js/10.4da0eca3d340dd2fc1a5.js → dist/static/js/10.e0d104bdd7a0398dcea3.js b/dist/static/js/10.4da0eca3d340dd2fc1a5.js → dist/static/js/10.e0d104bdd7a0398dcea3.js
diff --git a/dist/static/js/11.72a8d1e3bfb0fa3b56d7.js → dist/static/js/11.23ad3cfa01957e6336ab.js b/dist/static/js/11.72a8d1e3bfb0fa3b56d7.js → dist/static/js/11.23ad3cfa01957e6336ab.js
diff --git a/dist/static/js/2.c82c19f37ed853abf779.js → dist/static/js/2.b69764405c76914545fd.js b/dist/static/js/2.c82c19f37ed853abf779.js → dist/static/js/2.b69764405c76914545fd.js
diff --git a/dist/static/js/3.2cba8e5c43b6f5ebcee0.js b/dist/static/js/3.2cba8e5c43b6f5ebcee0.js
diff --git a/dist/static/js/3.fc50e885c80637a067a5.js b/dist/static/js/3.fc50e885c80637a067a5.js
diff --git a/dist/static/js/5.649d1c551fbfb3b1fcbc.js → dist/static/js/5.0ccd1f558995098a86a8.js b/dist/static/js/5.649d1c551fbfb3b1fcbc.js → dist/static/js/5.0ccd1f558995098a86a8.js
diff --git a/dist/static/js/6.9d1595993ae0d3400192.js b/dist/static/js/6.9d1595993ae0d3400192.js
diff --git a/dist/static/js/6.ebd5e53a7ab7afabb731.js b/dist/static/js/6.ebd5e53a7ab7afabb731.js
diff --git a/dist/static/js/7.e658debf1347cda0da80.js → dist/static/js/7.f2342716d2981314af5d.js b/dist/static/js/7.e658debf1347cda0da80.js → dist/static/js/7.f2342716d2981314af5d.js
diff --git a/dist/static/js/8.c7b4e2dfba6d14959fb6.js → dist/static/js/8.3f933041b1d7dbdedee3.js b/dist/static/js/8.c7b4e2dfba6d14959fb6.js → dist/static/js/8.3f933041b1d7dbdedee3.js
diff --git a/dist/static/js/9.ba7b276459a0c0f2d21d.js → dist/static/js/9.d6601babaab809262499.js b/dist/static/js/9.ba7b276459a0c0f2d21d.js → dist/static/js/9.d6601babaab809262499.js
diff --git a/dist/static/js/runtime.15281bb5877ca3c43888.js b/dist/static/js/runtime.15281bb5877ca3c43888.js
diff --git a/dist/static/js/runtime.efd7e80af2efd105acbd.js b/dist/static/js/runtime.efd7e80af2efd105acbd.js
diff --git a/src/components/sendTransaction.vue b/src/components/sendTransaction.vue
@@ -26,7 +26,7 @@
                 <i class="el-icon-info"></i>
             </el-tooltip>
         </div>
-        <div class="send-item" v-show="!constant">
+        <div class="send-item" v-show="showUser">
             <span class="send-item-title">{{this.$t('contracts.user')}}:</span>
             <el-select v-model="transation.userName" :placeholder="$t('contracts.selectUser')" style="width:260px">
                 <el-option :label="item.userName" :value="item.address" :key="item.userId" v-for='(item,index) in userList'>
@@ -88,9 +88,19 @@ export default {
             contractVersion: this.version,
             contractAddress: this.data.contractAddress || "",
             constant: false,
-            pramasObj: null
+            pramasObj: null,
+            stateMutability: ''
         };
     },
+    computed: {
+        showUser(){
+            let showUser = true;
+            if(this.constant || this.stateMutability==='view' || this.stateMutability==='pure'){
+                showUser = false
+            }
+            return showUser
+        }
+    },
     mounted: function () {
         this.getUserData();
         this.formatAbi();
@@ -143,7 +153,8 @@ export default {
                 if (value.funcId === this.transation.funcName) {
                     this.pramasData = value.inputs;
                     this.constant = value.constant;
-                    this.pramasObj = value
+                    this.pramasObj = value;
+                    this.stateMutability = value.stateMutability;
                 }
             });
             this.funcList.sort(function (a, b) {
@@ -222,7 +233,7 @@ export default {
             
             let data = {
                 groupId: localStorage.getItem("groupId"),
-                user: this.constant ? ' ' : this.transation.userName,
+                user: this.constant || this.stateMutability==='view' || this.stateMutability==='pure' ? '' : this.transation.userName,
                 contractName: this.data.contractName,
                 funcName: functionName || "",
                 funcParam: this.transation.funcValue,
@@ -252,7 +263,7 @@ export default {
                         this.$emit("success", Object.assign({},successData,{
                             constant: this.constant
                         }) );
-                        if (this.constant) {
+                        if (this.constant || this.stateMutability==='view' || this.stateMutability==='pure') {
                             this.$message({
                                 type: "success",
                                 message: this.$t("text.selectSuccess")