Skip to content

Commit

Permalink
Merge pull request #614 from xyzshen/dev
Browse files Browse the repository at this point in the history
modify bug
  • Loading branch information
CodingCattwo authored Jun 1, 2021
2 parents d25b7df + 80e7b2d commit 94c45e7
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 24 deletions.
2 changes: 1 addition & 1 deletion src/main/resources/static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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.4d4a477ef48dc123a34c.js></script><script type=text/javascript src=./static/js/2.bec323e5d4ad37e1c1c6.js></script><script type=text/javascript src=./static/js/runtime.6243b5bdc7afd5db4132.js></script><script type=text/javascript src=./static/js/4.1d1bffd57756b3936b5e.js></script></body><script>if (self == top) {
}</style></head><body><body><div id=app style="height: 100% !important;"></div><script type=text/javascript src=./static/js/0.ed97be9a882e9819fc6d.js></script><script type=text/javascript src=./static/js/2.bec323e5d4ad37e1c1c6.js></script><script type=text/javascript src=./static/js/runtime.6243b5bdc7afd5db4132.js></script><script type=text/javascript src=./static/js/4.1d1bffd57756b3936b5e.js></script></body><script>if (self == top) {
var antiClickjack = document.getElementById("antiClickjack");
antiClickjack.parentNode.removeChild(antiClickjack);
} else {
Expand Down

Large diffs are not rendered by default.

Binary file not shown.
44 changes: 23 additions & 21 deletions web/src/views/chaincode/dialog/exportProject.vue
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ export default {
modelClose() {
this.$emit('close')
},
handleExpand (row){
handleExpand(row) {
this.getContractList(row, 'ExpandEvent')
},
clickTable: function (row, column, $event) {
Expand Down Expand Up @@ -333,22 +333,24 @@ export default {
this.multipleSelectedId = Array.from(new Set(this.multipleSelectedId))
},
submit(formName) {
if (this.multipleSelection.length === 0) {
if (this.multipleSelectedId.length === 0) {
this.$message({
type: "error",
message: this.$t('rule.checkContract'),
customClass:'zZindex'
customClass: 'zZindex'
});
} else {
this.$refs[formName].validate((valid) => {
if (valid) {
this.export()
} else {
return false;
}
})
}
this.$refs[formName].validate((valid) => {
if (valid) {
this.export()
} else {
return false;
}
})
},
handleSelectAll(selection){
handleSelectAll(selection) {
// console.log(selection);
// if(!selection.length){
// this.$message({
Expand Down Expand Up @@ -391,13 +393,13 @@ export default {
this.$message({
type: 'success',
message: this.$t('text.exportSuccessed'),
customClass:'zZindex'
customClass: 'zZindex'
})
} else {
this.$message({
type: "error",
message: this.$chooseLang(res.data.code),
customClass:'zZindex'
customClass: 'zZindex'
});
}
})
Expand All @@ -407,13 +409,13 @@ export default {
.then(res => {
const { data, status } = res;
if (status === 200) {
if(data.channelPort == "null"){
if (data.channelPort == "null") {
this.projectFrom.channelPort = ""
}else {
this.queryPort = true
} else {
this.queryPort = true
this.projectFrom.channelPort = data.channelPort
}
} else {
this.$message({
type: "error",
Expand All @@ -436,11 +438,11 @@ export default {
cursor: pointer;
}
.zZindex {
z-index:3000 !important;
z-index: 3000 !important;
}
</style>
<style>
.zZindex {
z-index:3000 !important;
}
.zZindex {
z-index: 3000 !important;
}
</style>

0 comments on commit 94c45e7

Please sign in to comment.