Merge pull request #489 from WeBankBlockchain/lab-dev

fix bool of trans
WeBankBlockchain · Apr 17, 2023 · 7cdfc8f · 7cdfc8f
2 parents 6f3eddb + d0292aa
commit 7cdfc8f
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 20 deletions.
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.ce2a76371303d3d75221.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.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) {
             var antiClickjack = document.getElementById("antiClickjack");
             antiClickjack.parentNode.removeChild(antiClickjack);
         } else {

diff --git a/dist/static/js/0.ce2a76371303d3d75221.js → dist/static/js/0.a8135dffc4f0f4b9222e.js b/dist/static/js/0.ce2a76371303d3d75221.js → dist/static/js/0.a8135dffc4f0f4b9222e.js
diff --git a/dist/static/js/0.a8135dffc4f0f4b9222e.js.gz b/dist/static/js/0.a8135dffc4f0f4b9222e.js.gz
diff --git a/dist/static/js/0.ce2a76371303d3d75221.js.gz b/dist/static/js/0.ce2a76371303d3d75221.js.gz
diff --git a/release_note.txt b/release_note.txt
@@ -1 +1 @@
-v3.0.0
+v3.0.2
diff --git a/src/components/sendTransaction.vue b/src/components/sendTransaction.vue
@@ -73,7 +73,7 @@
         </el-select>
         <el-select v-model="transation.funcName" :placeholder="$t('contracts.methodName')" filterable v-show="funcList.length > 0" @change="changeFunc" style="width: 300px" popper-class="func-name">
           <el-option :label="item.name" :key="item.funcId" :value="item.funcId" v-for="item in funcList">
-              <span :class=" {'func-color': checkFunction(item)}">{{item.name}}</span>
+            <span :class=" {'func-color': checkFunction(item)}">{{item.name}}</span>
           </el-option>
         </el-select>
       </div>
@@ -188,7 +188,7 @@ export default {
       },
       ruleForms: [],
       rules: {
-         int: [
+        int: [
           {
             required: true,
             message: this.$t("text.sendInput"),
@@ -219,7 +219,7 @@ export default {
             trigger: "blur",
           },
         ],
-          uint256: [
+        uint256: [
           {
             required: true,
             message: this.$t("text.sendInput"),
@@ -433,10 +433,14 @@ export default {
         if (value.funcId === this.transation.funcName) {
           this.pramasData = value.inputs;
           this.ruleForm.ruleForms = value.inputs;
-          console.log(value.stateMutability)
-          if(value.stateMutability=='view'||value.stateMutability=='pure'||value.stateMutability=='constant'){
+          console.log(value.stateMutability);
+          if (
+            value.stateMutability == "view" ||
+            value.stateMutability == "pure" ||
+            value.stateMutability == "constant"
+          ) {
             this.constant = true;
-          }else{
+          } else {
             this.constant = false;
           }
           this.pramasObj = value;
@@ -502,7 +506,6 @@ export default {
       if (this.transation.funcType === "constructor") {
         this.transation.funcName = this.data.contractName;
       }
-
       for (let i in this.ruleForm.ruleForms) {
         let data = this.ruleForm.ruleForms[i].value;
         if (data && isJson(data)) {
@@ -511,16 +514,19 @@ export default {
           } catch (error) {
             console.log(error);
           }
-        } else if (data === "true" || data === "false") {
-          this.transation.reqVal[i] = eval(data.toLowerCase());
-        } else {
+        }
+        //  else if (data === "true" || data === "false") {
+        //   this.transation.reqVal[i] = eval(data.toLowerCase());
+        // }
+        else {
           this.transation.reqVal[i] = data;
         }
       }
       this.ruleForm.ruleForms.map((item, index) => {
-        if (item.value == "true" || item.value == "false") {
-          this.ruleForm.ruleForms[index] = eval(item.value.toLowerCase());
-        } else if (
+        // if (item.value == "true" || item.value == "false") {
+        //   this.ruleForm.ruleForms[index] = eval(item.value.toLowerCase());
+        // } else
+        if (
           item.value.hasOwnProperty("substring") &&
           item.value.substring(0, 1) == "["
         ) {
@@ -534,7 +540,7 @@ export default {
         //     rules.push(this.transation.reqVal[i]);
         // }
         let data = this.pramasData[i].value;
-        rules.push(data)
+        rules.push(data);
       }
 
       let functionName = "";
@@ -566,7 +572,7 @@ export default {
       }
       if (this.isWasm) {
         data.isWasm = true;
-      }else{
+      } else {
         data.isWasm = false;
       }
       sendTransation(data)
@@ -620,7 +626,7 @@ export default {
               type: "error",
               duration: 2000,
             });
-            if (res.data.code === 201151||res.data.code === 201014) {
+            if (res.data.code === 201151 || res.data.code === 201014) {
               setTimeout(() => {
                 this.$notify({
                   title: "提示",
@@ -671,7 +677,11 @@ export default {
       this.getUserData();
     },
     checkFunction(item) {
-      return (item.stateMutability==='view'||item.stateMutability==='cosntant'||item.stateMutability==='pure') ? false : true;
+      return item.stateMutability === "view" ||
+        item.stateMutability === "cosntant" ||
+        item.stateMutability === "pure"
+        ? false
+        : true;
     },
   },
 };