Skip to content

Commit

Permalink
Merge pull request #191 from WeBankFinTech/dev
Browse files Browse the repository at this point in the history 
fix en-cn bug
  • Loading branch information
@mingzhenliu
mingzhenliu authored Jun 10, 2020
2 parents f2d6ac2 + 4728d1b commit 7d8fbc1
Show file tree
Hide file tree
Showing 15 changed files with 79 additions and 755 deletions.
2 changes: 1 addition & 1 deletion dist/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.7036d34321dc137cdb73.js></script><script type=text/javascript src=./static/js/3.5ca481722493ea96287e.js></script><script type=text/javascript src=./static/js/runtime.d6f9ad6760c818fb3c25.js></script><script type=text/javascript src=./static/js/5.39fa7a9735c0620c0fc2.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.4c22d4d55839a3ce8b74.js></script><script type=text/javascript src=./static/js/3.2538f45f64ed10c5ae1a.js></script><script type=text/javascript src=./static/js/runtime.d6f9ad6760c818fb3c25.js></script><script type=text/javascript src=./static/js/5.39fa7a9735c0620c0fc2.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 {
Expand Down
53 changes: 53 additions & 0 deletions dist/static/js/0.4c22d4d55839a3ce8b74.js
View file

Large diffs are not rendered by default.

53 changes: 0 additions & 53 deletions dist/static/js/0.7036d34321dc137cdb73.js
View file

This file was deleted.

1 change: 1 addition & 0 deletions dist/static/js/3.2538f45f64ed10c5ae1a.js
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dist/static/js/3.5ca481722493ea96287e.js
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/components/changePasswordDialog.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
<template>
<div>
<el-form :model="rulePasswordForm" status-icon :rules="rules2" ref="rulePasswordForm" label-width="130px" class="demo-ruleForm">
<el-form :model="rulePasswordForm" status-icon :rules="rules2" ref="rulePasswordForm" label-width="135px" class="demo-ruleForm">
<el-form-item :label="$t('main.oldPassword')" prop="oldPass">
<el-input type="password" v-model="rulePasswordForm.oldPass" autocomplete="off"></el-input>
</el-form-item>
Expand Down
6 changes: 1 addition & 5 deletions src/components/contentHead.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,11 @@
</template>

<script>
import dialog from "./groupDialog";
import changePasswordDialog from "./changePasswordDialog";
import router from "@/router";
import { loginOut, groupStatus4, getGroupsInvalidIncluded } from "@/util/api";
import { delCookie } from '@/util/util'
import Bus from "@/bus"
import langSelect from "@/components/LangSelect"
export default {
name: "conetnt-head",
props: {
Expand Down Expand Up @@ -113,9 +111,7 @@ export default {
}
},
components: {
"v-dialog": dialog,
changePasswordDialog,
"lang-select": langSelect
changePasswordDialog
},
watch: {
headTitle: function (val) {
Expand Down
67 changes: 16 additions & 51 deletions src/components/editor.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* limitations under the License.
*/
<template>
<el-dialog v-dialogDrag :title="'交易内容'" :visible.sync="editorDialog" @close="modelClose" width="650px" top="10vh">
<div v-if='!transationData'>无数据</div>
<el-dialog v-dialogDrag :title="$t('contracts.txResult')" :visible.sync="editorDialog" @close="modelClose" width="650px" top="10vh">
<div v-if='!transationData'>{{$t('text.noData')}}</div>
<div v-if='transationData && !transationData.logs' slot :style="{'height':editorHeight + 'px'}" style="overflow-y:auto">
<json-viewer :value="transationData" :expand-depth='5' copyable></json-viewer>
</div>
Expand Down Expand Up @@ -44,7 +44,7 @@
<el-table-column prop="type" label="type" align="left"></el-table-column>
<el-table-column prop="data" label="data" align="left" :show-overflow-tooltip="true">
<template slot-scope="scope">
<i class="wbs-icon-baocun font-12 copy-public-key" @click="copyPubilcKey(scope.row.data)" title="复制"></i>
<i class="wbs-icon-baocun font-12 copy-public-key" @click="copyPubilcKey(scope.row.data)" :title="$t('text.copy')"></i>
<span>{{scope.row.data}}</span>
</template>
</el-table-column>
Expand Down Expand Up @@ -113,7 +113,7 @@
<el-table-column prop="name" width="150" label="name" align="left"></el-table-column>
<el-table-column prop="data" label="data" align="left" :show-overflow-tooltip="true">
<template slot-scope="scope">
<i class="wbs-icon-baocun font-12 copy-public-key" @click="copyPubilcKey(scope.row.data)" title="复制"></i>
<i class="wbs-icon-baocun font-12 copy-public-key" @click="copyPubilcKey(scope.row.data)" :title="$t('text.copy')"></i>
<span>{{scope.row.data}}</span>
</template>
</el-table-column>
Expand Down Expand Up @@ -154,7 +154,6 @@
</template>
<script>
import { getFunctionAbi } from "@/util/api"
import errcode from "@/util/errcode";
import { debuglog } from 'util';
export default {
name: 'editor',
Expand All @@ -167,14 +166,14 @@ export default {
modePath: 'ace/mode/solidity',
editorDialog: this.show || false,
eventSHow: false,
eventTitle: "还原",
eventTitle: this.$t('transaction.reduction'),
funcData: "",
methodId: "",
abiType: "",
inputData: [],
decodeData: "",
showDecode: true,
buttonTitle: "解码",
buttonTitle: this.$t('transaction.decode'),
typesArray: this.input,
inputButtonShow: true,
editorHeight: ''
Expand All @@ -199,19 +198,15 @@ export default {
decodeOutput: function () {
if (this.showDecode) {
this.showDecode = false;
this.buttonTitle = '还原'
this.buttonTitle = this.$t('transaction.reduction')
} else {
this.showDecode = true;
this.buttonTitle = '解码'
this.buttonTitle = this.$t('transaction.decode')
}
},
decodefun: function () {
let web3 = new Web3(Web3.givenProvider);
// this.methodId = input.substring(0, 10);
// this.methodId = data;
// let inputDatas = "0x" + input.substring(10);
if (this.typesArray) {
// abiData.abiInfo = JSON.parse(abiData.abiInfo)
this.typesArray.inputs.forEach((val, index) => {
if (val && index < this.typesArray.inputs.length - 1) {
this.abiType = this.abiType + val.type + " " + val.name + ",";
Expand All @@ -232,39 +227,11 @@ export default {
this.inputData[index].data = this.decodeData[index];
}
// this.editorOutput.forEach((val, index) => {
// this.inputData[index] = {};
// this.inputData[index].name = val.name;
// this.inputData[index].type = val.type;
// console.log('========',this.decodeData[key].toString())
// this.inputData[index].data = this.decodeData[key].toString();
// if (val && val.name && val.type) {
// if (key === val.name) {
// this.inputData[index] = {};
// this.inputData[index].name = val.name;
// this.inputData[index].type = val.type;
// this.inputData[index].data = this.decodeData[key];
// }
// }else if (val && val.type) {
// if (index == key) {
// this.inputData[index] = {};
// this.inputData[index].name = val.name;
// this.inputData[index].type = val.type;
// this.inputData[index].data = this.decodeData[key];
// }
// }else if (val) {
// if (index == key) {
// this.inputData[index] = {};
// this.inputData[index].type = val;
// this.inputData[index].data = this.decodeData[key];
// }
// }
// });
}
}
}
this.showDecode = false;
this.buttonTitle = "还原";
this.buttonTitle = this.$t('transaction.reduction');
}
},
decodeEvent: function () {
Expand All @@ -279,17 +246,16 @@ export default {
setTimeout(() => {
this.eventSHow = true;
}, 200)
// console.log(this.transationData.logs[i])
} else if (res.data.code !== 0) {
this.$message({
type: "error",
message: errcode.errCode[res.data.code].cn
message: this.$chooseLang(res.data.code)
});
}
}).catch(err => {
this.$message({
type: "error",
message: "系统错误！"
message: this.$t("text.systemError"),
});
})
}
Expand All @@ -299,7 +265,7 @@ export default {
let abi = "";
eventData.abiInfo = JSON.parse(eventData.abiInfo)
let list = data;
list.eventTitle = '还原'
list.eventTitle = this.$t('transaction.reduction')
list.eventDataShow = true;
list.eventButtonShow = true;
list.eventName = eventData.abiInfo.name + "(";
Expand Down Expand Up @@ -337,15 +303,15 @@ export default {
this.$message({
type: "fail",
showClose: true,
message: "key为空，不复制。",
message: this.$t("text.copyErrorMsg"),
duration: 2000
});
} else {
this.$copyText(val).then(e => {
this.$message({
type: "success",
showClose: true,
message: "复制成功",
message: this.$t("text.copySuccessMsg"),
duration: 2000
});
});
Expand All @@ -357,10 +323,10 @@ export default {
decode: function (val) {
if (val.eventDataShow) {
this.$set(val, 'eventDataShow', false);
this.eventTitle = '解码'
this.eventTitle = this.$t('transaction.decode')
} else {
this.$set(val, 'eventDataShow', true);
this.eventTitle = '还原'
this.eventTitle = this.$t('transaction.reduction')
}
}
Expand All @@ -369,7 +335,6 @@ export default {
</script>
<style>
.transation-content {
/* width:200px; */
word-wrap: break-word;
word-break: break-all;
}
Expand Down
126 changes: 0 additions & 126 deletions src/components/groupDialog.vue
View file

This file was deleted.

Loading

0 comments on commit 7d8fbc1

Please sign in to comment.