Merge pull request #358 from WeBankFinTech/dev

fix scaffold tips
WeBankBlockchain · Jun 1, 2021 · b71f253 · b71f253
2 parents 0834c40 + f501588
commit b71f253
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 12 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.8c208cba9ba9a68578fe.js></script><script type=text/javascript src=./static/js/3.b84e0f006d2e2bdcf6ea.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.8f57dcaab63113fa0163.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) {
             var antiClickjack = document.getElementById("antiClickjack");
             antiClickjack.parentNode.removeChild(antiClickjack);
         } else {

diff --git a/dist/static/js/0.8c208cba9ba9a68578fe.js.gz b/dist/static/js/0.8c208cba9ba9a68578fe.js.gz
diff --git a/dist/static/js/0.8c208cba9ba9a68578fe.js → dist/static/js/0.8f57dcaab63113fa0163.js b/dist/static/js/0.8c208cba9ba9a68578fe.js → dist/static/js/0.8f57dcaab63113fa0163.js
diff --git a/dist/static/js/0.8f57dcaab63113fa0163.js.gz b/dist/static/js/0.8f57dcaab63113fa0163.js.gz
diff --git a/dist/static/js/3.0821fa8aa4c19fafedf3.js b/dist/static/js/3.0821fa8aa4c19fafedf3.js
diff --git a/dist/static/js/3.0821fa8aa4c19fafedf3.js.gz b/dist/static/js/3.0821fa8aa4c19fafedf3.js.gz
diff --git a/dist/static/js/3.b84e0f006d2e2bdcf6ea.js b/dist/static/js/3.b84e0f006d2e2bdcf6ea.js
diff --git a/dist/static/js/3.b84e0f006d2e2bdcf6ea.js.gz b/dist/static/js/3.b84e0f006d2e2bdcf6ea.js.gz
diff --git a/src/components/sendTransaction.vue b/src/components/sendTransaction.vue
@@ -53,7 +53,8 @@
             <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'>
                     <span>{{item.userName}}</span>
-                    <span class="font-12">{{splitString(item.address)}}...</span>
+                    <!-- <span class="font-12">{{splitString(item.address)}}...</span> -->
+                    <span class="font-12">{{item.address}}</span>
                 </el-option>
             </el-select>
         </div>

diff --git a/src/lang/en.js b/src/lang/en.js
@@ -317,7 +317,8 @@ export default {
         projectTitle: 'Project Info',
         haveAbi: 'The ABI information cannot be empty',
         haveSelectionAll: 'The contract is not compiled at all',
-        haveCertSdk: 'Failed to get SDK certificate. Please check certificate file'
+        haveCertSdk: 'Failed to get SDK certificate. Please check certificate file',
+        haveChannelPort: 'Fill it in according to the node front corresponding ChannelPort',
     },
     rule: {
         textLong: "1 to 32 characters in length",

diff --git a/src/lang/zh.js b/src/lang/zh.js
@@ -317,7 +317,8 @@ export default {
         projectTitle: '项目信息',
         haveAbi: 'abi信息不能为空',
         haveSelectionAll: '合约全未编译',
-        haveCertSdk: '获取SDK证书失败，请检查证书文件'
+        haveCertSdk: '获取SDK证书失败，请检查证书文件',
+        haveChannelPort: '根据节点前置对应channelPort填入',
     },
     rule: {
         textLong: "长度在 1 到 32 个字符",

diff --git a/src/util/errcode.js b/src/util/errcode.js
@@ -369,7 +369,10 @@ let errCode = {
         en: "Unable to create instance of type, check input params",
         zh: '输入参数格式错误'
     },
-
+    "201161": {
+        en: "Generate project failed in scaffold",
+        zh: '项目Scaffold脚手架生成失败'
+    },
     "201213": {
         en: "address is invalid",
         zh: '地址无效'

diff --git a/src/views/chaincode/dialog/exportProject.vue b/src/views/chaincode/dialog/exportProject.vue
@@ -26,6 +26,9 @@
                 </el-form-item>
                 <el-form-item label="channelPort" prop="channelPort">
                     <el-input v-model="projectFrom.channelPort" :disabled="queryPort ? true : false " style="width: 415px"></el-input>
+                    <el-tooltip effect="dark" :content="$t('text.haveChannelPort')" placement="top-start">
+                        <i class="el-icon-info"></i>
+                    </el-tooltip>
                 </el-form-item>
                 <!-- </div> -->
                 <el-form-item :label="$t('text.projectUser')">
@@ -262,15 +265,15 @@ export default {
         modelClose() {
             this.$emit('close')
         },
-        handleExpand (row){
+        handleExpand(row) {
             this.getContractList(row, 'ExpandEvent')
         },
         clickTable: function (row, column, $event) {
             this.getContractList(row, 'ExpandEvent')
             let nodeName = $event.target.nodeName;
             this.$refs.refTable.toggleRowExpansion(row);
             // this.$nextTick(() => {
-                
+
             // })
             if (nodeName === "I") {
                 return
@@ -365,7 +368,7 @@ export default {
                 }
             })
         },
-        handleSelectAll(selection){
+        handleSelectAll(selection) {
             // if(!selection.length){
             //     this.$message({
             //         type:"error",
@@ -405,6 +408,16 @@ export default {
                     } else {
                         navigator.msSaveBlob(blob, fileName)
                     }
+                    this.$message({
+                        type: 'success',
+                        message: this.$t('text.exportSuccessed')
+                    })
+                } else {
+                    this.$message({
+                        type: "error",
+                        message: this.$chooseLang(res.data.code),
+                        customClass: 'zZindex'
+                    });
                 }
             })
         },
@@ -443,9 +456,9 @@ export default {
                     if (res.data.code === 0) {
                         if (res.data.data) {
                             if (res.data.data.channelPort) {
-                                if(res.data.data.channelPort == 'null'){
+                                if (res.data.data.channelPort == 'null') {
                                     this.projectFrom.channelPort = ''
-                                }else {
+                                } else {
                                     this.queryPort = true
                                     this.projectFrom.channelPort = res.data.data.channelPort
                                 }