From d4237897f02932c641c232ef6428a199528b2037 Mon Sep 17 00:00:00 2001 From: v_wbfglai Date: Tue, 6 Jul 2021 10:17:07 +0800 Subject: [PATCH 01/41] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=88=E7=BA=A6?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=EF=BC=8C=E7=A7=81=E9=92=A5=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 2 +- dist/index.html | 2 +- dist/static/js/0.38f32e8290dc5fecc175.js | 53 ++++ dist/static/js/0.78428cc43e16f2851ca0.js | 53 ---- dist/static/js/0.78428cc43e16f2851ca0.js.gz | Bin 240878 -> 0 bytes dist/static/js/1.1b74f3f20ec6e369a930.js | 51 ++++ dist/static/js/1.78a0b8501a942bef1040.js | 51 ---- dist/static/js/1.78a0b8501a942bef1040.js.gz | Bin 323069 -> 0 bytes dist/static/js/10.6f817964d67d23dd5676.js | 1 - dist/static/js/10.f31ecb773417e9ae704e.js | 1 + dist/static/js/11.6e7010f97664c183e535.js | 1 + dist/static/js/11.780ef6ad5c4a00f42321.js | 1 - dist/static/js/11.780ef6ad5c4a00f42321.js.gz | Bin 10245 -> 0 bytes dist/static/js/12.2246720b02105b9cb598.js | 1 + dist/static/js/12.29ad4eca1db362a22d9a.js | 1 - dist/static/js/13.3b5af24b63e50a913b3f.js | 1 - dist/static/js/13.b663dc80ebac4ac92cb8.js | 1 + dist/static/js/14.29a6746805f62c8d6b8a.js | 1 + dist/static/js/14.7b87e6cc82953fb1e70c.js | 1 - dist/static/js/15.467bfa3380af2cb23277.js | 1 + dist/static/js/16.7ae80cd66650be1b9cd1.js | 1 - dist/static/js/16.b7dacf7328beafcfdd52.js | 1 + dist/static/js/17.c924dd6d7925f6eae9ec.js | 1 + ...e8e878b8.js => 18.db7ad76816625795c227.js} | 2 +- dist/static/js/19.35e12d3ba0d8493b7cae.js | 1 + ...49611e33f.js => 2.628f4697cd2e2afac6db.js} | 2 +- dist/static/js/2.7ea692805ea49611e33f.js.gz | Bin 3725 -> 0 bytes ...5652aee5.js => 20.7d14fa61bffee653d042.js} | 2 +- dist/static/js/20.d0a86930e37db0332140.js | 1 - dist/static/js/21.64af1dea9453e31f1b44.js | 1 - ...0aaae7d7.js => 21.9c6ba9adc529e992117c.js} | 2 +- dist/static/js/22.6a7ed065abafbb141c99.js | 1 - ...71b29352.js => 22.83cd3540846ed54723a2.js} | 2 +- dist/static/js/23.5827245f5fe678a05768.js | 1 + dist/static/js/3.0821fa8aa4c19fafedf3.js | 1 - dist/static/js/3.0821fa8aa4c19fafedf3.js.gz | Bin 96152 -> 0 bytes dist/static/js/3.b172b027aa3594a83e6a.js | 1 + ...02348985a.js => 5.5a59c98e4d15b1dba682.js} | 6 +- dist/static/js/5.9611bbb710402348985a.js.gz | Bin 470504 -> 0 bytes dist/static/js/6.8d13089d878d9ed16835.js | 12 - dist/static/js/6.8d13089d878d9ed16835.js.gz | Bin 33865 -> 0 bytes dist/static/js/6.d1803ae8f6bd14633ffe.js | 22 ++ dist/static/js/7.27c45dda7b34598e69c6.js | 12 + dist/static/js/7.50cc2c28bd8a19afca06.js | 1 - dist/static/js/7.50cc2c28bd8a19afca06.js.gz | Bin 4524 -> 0 bytes dist/static/js/8.0abad7ca4275fe761d13.js | 1 - dist/static/js/8.0abad7ca4275fe761d13.js.gz | Bin 10294 -> 0 bytes dist/static/js/8.1571b94d2d9589a5789f.js | 1 + dist/static/js/9.934e9d91398410ab0df3.js | 1 + dist/static/js/9.a2ae8d3970f94292e576.js | 1 - .../static/js/runtime.68bca238c3d797b0c307.js | 1 + .../static/js/runtime.adc4182f8a21b151e272.js | 1 - src/components/transactionDetail.vue | 30 +- src/lang/en.js | 3 +- src/lang/zh.js | 4 + src/router/index.js | 3 +- src/util/SM2Sign.js | 269 +++++++++++++++++- src/util/api.js | 14 +- src/util/compile.js | 179 ++++++++++++ src/views/CRUDServiceManagement/index.vue | 21 +- src/views/abiList/components/importAbi.vue | 1 + src/views/chaincode/components/code.vue | 36 ++- .../chaincode/components/contractCatalog.vue | 9 +- src/views/chaincode/contract.vue | 9 +- src/views/chaincode/dialog/addFile.vue | 45 +++ src/views/chaincode/dialog/addFolder.vue | 22 +- src/views/chaincode/dialog/changeUser.vue | 30 +- src/views/chaincode/dialog/exportProject.vue | 81 +++++- src/views/chaincode/dialog/mgmtCns.vue | 28 +- src/views/chaincode/dialog/selectCatalog.vue | 31 +- .../components/systemConfig.vue | 20 +- src/views/configManagement/index.vue | 2 +- .../components/developerDialog.vue | 32 ++- src/views/onlineTools/index.vue | 105 +++++-- src/views/parseAbi/index.vue | 2 +- src/views/unusualContract/unusualContract.vue | 40 ++- 76 files changed, 1092 insertions(+), 226 deletions(-) create mode 100644 dist/static/js/0.38f32e8290dc5fecc175.js delete mode 100644 dist/static/js/0.78428cc43e16f2851ca0.js delete mode 100644 dist/static/js/0.78428cc43e16f2851ca0.js.gz create mode 100644 dist/static/js/1.1b74f3f20ec6e369a930.js delete mode 100644 dist/static/js/1.78a0b8501a942bef1040.js delete mode 100644 dist/static/js/1.78a0b8501a942bef1040.js.gz delete mode 100644 dist/static/js/10.6f817964d67d23dd5676.js create mode 100644 dist/static/js/10.f31ecb773417e9ae704e.js create mode 100644 dist/static/js/11.6e7010f97664c183e535.js delete mode 100644 dist/static/js/11.780ef6ad5c4a00f42321.js delete mode 100644 dist/static/js/11.780ef6ad5c4a00f42321.js.gz create mode 100644 dist/static/js/12.2246720b02105b9cb598.js delete mode 100644 dist/static/js/12.29ad4eca1db362a22d9a.js delete mode 100644 dist/static/js/13.3b5af24b63e50a913b3f.js create mode 100644 dist/static/js/13.b663dc80ebac4ac92cb8.js create mode 100644 dist/static/js/14.29a6746805f62c8d6b8a.js delete mode 100644 dist/static/js/14.7b87e6cc82953fb1e70c.js create mode 100644 dist/static/js/15.467bfa3380af2cb23277.js delete mode 100644 dist/static/js/16.7ae80cd66650be1b9cd1.js create mode 100644 dist/static/js/16.b7dacf7328beafcfdd52.js create mode 100644 dist/static/js/17.c924dd6d7925f6eae9ec.js rename dist/static/js/{15.e7d7763fb6f7e8e878b8.js => 18.db7ad76816625795c227.js} (98%) create mode 100644 dist/static/js/19.35e12d3ba0d8493b7cae.js rename dist/static/js/{2.7ea692805ea49611e33f.js => 2.628f4697cd2e2afac6db.js} (79%) delete mode 100644 dist/static/js/2.7ea692805ea49611e33f.js.gz rename dist/static/js/{17.316d3c85a2425652aee5.js => 20.7d14fa61bffee653d042.js} (96%) delete mode 100644 dist/static/js/20.d0a86930e37db0332140.js delete mode 100644 dist/static/js/21.64af1dea9453e31f1b44.js rename dist/static/js/{18.81e1d7b1c37d0aaae7d7.js => 21.9c6ba9adc529e992117c.js} (90%) delete mode 100644 dist/static/js/22.6a7ed065abafbb141c99.js rename dist/static/js/{19.e470d925676871b29352.js => 22.83cd3540846ed54723a2.js} (53%) create mode 100644 dist/static/js/23.5827245f5fe678a05768.js delete mode 100644 dist/static/js/3.0821fa8aa4c19fafedf3.js delete mode 100644 dist/static/js/3.0821fa8aa4c19fafedf3.js.gz create mode 100644 dist/static/js/3.b172b027aa3594a83e6a.js rename dist/static/js/{5.9611bbb710402348985a.js => 5.5a59c98e4d15b1dba682.js} (67%) delete mode 100644 dist/static/js/5.9611bbb710402348985a.js.gz delete mode 100644 dist/static/js/6.8d13089d878d9ed16835.js delete mode 100644 dist/static/js/6.8d13089d878d9ed16835.js.gz create mode 100644 dist/static/js/6.d1803ae8f6bd14633ffe.js create mode 100644 dist/static/js/7.27c45dda7b34598e69c6.js delete mode 100644 dist/static/js/7.50cc2c28bd8a19afca06.js delete mode 100644 dist/static/js/7.50cc2c28bd8a19afca06.js.gz delete mode 100644 dist/static/js/8.0abad7ca4275fe761d13.js delete mode 100644 dist/static/js/8.0abad7ca4275fe761d13.js.gz create mode 100644 dist/static/js/8.1571b94d2d9589a5789f.js create mode 100644 dist/static/js/9.934e9d91398410ab0df3.js delete mode 100644 dist/static/js/9.a2ae8d3970f94292e576.js create mode 100644 dist/static/js/runtime.68bca238c3d797b0c307.js delete mode 100644 dist/static/js/runtime.adc4182f8a21b151e272.js create mode 100644 src/util/compile.js diff --git a/config/index.js b/config/index.js index 07d6f112..56bcbfd7 100755 --- a/config/index.js +++ b/config/index.js @@ -12,7 +12,7 @@ module.exports = { assetsPublicPath: '/', proxyTable: { '/mgr': { - target: 'http://127.0.0.1/', + target: 'http://127.0.0.1:5001', changeOrigin: true, pathRewrite: { '^/mgr': '' diff --git a/dist/index.html b/dist/index.html index 5948c326..b86dfd0b 100644 --- a/dist/index.html +++ b/dist/index.html @@ -21,7 +21,7 @@ height: 100%; margin: 0px; padding: 0px; - }
diff --git a/src/views/abiList/components/importAbi.vue b/src/views/abiList/components/importAbi.vue index 43512a5a..e276b40b 100644 --- a/src/views/abiList/components/importAbi.vue +++ b/src/views/abiList/components/importAbi.vue @@ -159,6 +159,7 @@ export default { }) }, setMethod() { + debugger; let Web3EthAbi = web3; let arry = []; if (this.abiForm.contractAbi) { diff --git a/src/views/chaincode/components/code.vue b/src/views/chaincode/components/code.vue index e50c682d..31ef642b 100755 --- a/src/views/chaincode/components/code.vue +++ b/src/views/chaincode/components/code.vue @@ -235,12 +235,14 @@ export default { mgmtCnsVisible: false, mgmtCnsItem: {}, activeNames: ['0'], - isDeployedModifyEnable: false + isDeployedModifyEnable: false, + isFinishComplie: false }; }, beforeDestroy: function () { Bus.$off("select") Bus.$off("noData") + Bus.$off("javaProjectComplie") }, beforeMount() { @@ -297,6 +299,24 @@ export default { this.content = ""; this.bin = ""; }) + Bus.$on('javaProjectComplie', data=>{ + this.contractName = data.contractName + this.content = Base64.decode(data.contractSource); + console.log(this.code) + this.abiFile = data.contractAbi; + this.bin = data.contractBin; + this.data.contractVersion = data.contractVersion; + this.data.contractAddress = data.contractAddress; + this.data.contractName = data.contractName; + this.data.contractAbi = data.contractAbi; + this.data.bytecodeBin = data.bytecodeBin; + this.data.contractBin = data.contractBin; + this.data.contractId = data.contractId; + this.data.contractPath = data.contractPath; + this.data.contractSource = data.contractSource; + localStorage.setItem("isFinishCompile", "no") + this.compile() + }) }, watch: { content: function (val) { @@ -549,11 +569,11 @@ export default { } } }, - compile() { + compile() { this.loading = true; let version = this.$store.state.versionData; if (version && version.net !== 0) { - this.compileHighVersion() + this.compileHighVersion() } else { setTimeout(() => { this.compileLowVersion() @@ -561,7 +581,7 @@ export default { } }, - compileHighVersion() { + compileHighVersion(callback) { let that = this this.refreshMessage(); this.contractList = this.$store.state.contractDataList @@ -605,7 +625,8 @@ export default { that.errorMessage = output.errors; that.errorInfo = that.$t("contracts.contractCompileFail"); that.loading = false; - } + } + } else { console.log(ev.data); console.log(JSON.parse(ev.data.data)) @@ -616,7 +637,7 @@ export default { that.errorMessage = ev; that.compileShow = true; that.loading = false; - }) + }) console.log('wwww:', w) }, compileLowVersion: function () { @@ -694,6 +715,7 @@ export default { this.loading = false; Bus.$emit("compile", this.data); this.setMethod(); + localStorage.setItem("isFinishCompile", "yes") } else { this.$message({ type: "error", @@ -1037,7 +1059,7 @@ export default { }, handleChange(val) { console.log(val); - } + } } }; diff --git a/src/views/chaincode/components/contractCatalog.vue b/src/views/chaincode/components/contractCatalog.vue index 63652888..bd7c17c2 100644 --- a/src/views/chaincode/components/contractCatalog.vue +++ b/src/views/chaincode/components/contractCatalog.vue @@ -87,7 +87,7 @@ - + diff --git a/src/views/chaincode/contract.vue b/src/views/chaincode/contract.vue index b090badd..65eb364c 100755 --- a/src/views/chaincode/contract.vue +++ b/src/views/chaincode/contract.vue @@ -97,6 +97,13 @@ export default { } }, mounted: function () { + if(localStorage.getItem("dataFrom") === "transactionDetail"){ + localStorage.setItem("dataFrom","") + this.$message({ + type: "warning", + message: this.$t('text.importContractTip') + }); + } this.allVersion = [ { solcName: "v0.4.25", @@ -142,7 +149,7 @@ export default { } ]; this.initWorker() - this.getEncryption(this.querySolcList); + this.getEncryption(this.querySolcList); }, methods: { initWorker() { diff --git a/src/views/chaincode/dialog/addFile.vue b/src/views/chaincode/dialog/addFile.vue index 1f7f1cac..b8468bcc 100644 --- a/src/views/chaincode/dialog/addFile.vue +++ b/src/views/chaincode/dialog/addFile.vue @@ -26,6 +26,9 @@ + + {{this.$t('contracts.createFolder')}} + @@ -38,14 +41,19 @@ }} + diff --git a/src/views/chaincode/dialog/addFolder.vue b/src/views/chaincode/dialog/addFolder.vue index 7844e29d..17776b82 100644 --- a/src/views/chaincode/dialog/addFolder.vue +++ b/src/views/chaincode/dialog/addFolder.vue @@ -36,7 +36,7 @@ import { addContractPath } from "@/util/api" export default { name: "addFolder", - props: ['foldershow'], + props: ['foldershow','isAddFile'], computed: { rules() { let data = { @@ -70,7 +70,7 @@ export default { dialogVisible: this.foldershow, folderList: [], userFolader: "", - pathList: [] + pathList: [], } }, mounted: function () { @@ -99,7 +99,8 @@ export default { } addContractPath(reqData).then(res => { if (res.data.code === 0) { - this.$emit("success") + // this.$emit("success") + this.modelClose(); } else { this.$message({ type: "error", @@ -114,8 +115,19 @@ export default { }); }); }, - modelClose: function () { - this.$emit("close") + // modelClose: function () { + // // this.$emit("close") + // }, + modelClose: function () { + this.folderFrom ={ + folderName: "" + } + if(this.isAddFile == 'isAddFile'){ + this.$emit("folderClose"); + }else{ + this.$emit("close"); + } + // this.dialogVisible = false; }, handleFolder() { console.log('enter') diff --git a/src/views/chaincode/dialog/changeUser.vue b/src/views/chaincode/dialog/changeUser.vue index 49b97dd1..fc7b56e5 100755 --- a/src/views/chaincode/dialog/changeUser.vue +++ b/src/views/chaincode/dialog/changeUser.vue @@ -17,7 +17,7 @@
- + + - + @@ -84,17 +90,26 @@ {{this.$t("text.cancel")}}{{this.$t("text.sure")}} + + + diff --git a/src/views/chaincode/dialog/exportProject.vue b/src/views/chaincode/dialog/exportProject.vue index 0939b66b..ff6e1750 100644 --- a/src/views/chaincode/dialog/exportProject.vue +++ b/src/views/chaincode/dialog/exportProject.vue @@ -1,6 +1,6 @@ diff --git a/src/views/chaincode/dialog/selectCatalog.vue b/src/views/chaincode/dialog/selectCatalog.vue index f82de2a5..b3a87248 100644 --- a/src/views/chaincode/dialog/selectCatalog.vue +++ b/src/views/chaincode/dialog/selectCatalog.vue @@ -23,6 +23,9 @@ + + {{this.$t('contracts.createFolder')}} + @@ -31,19 +34,24 @@ 确 定 + diff --git a/src/views/configManagement/components/systemConfig.vue b/src/views/configManagement/components/systemConfig.vue index 12bf8808..83bf6c02 100644 --- a/src/views/configManagement/components/systemConfig.vue +++ b/src/views/configManagement/components/systemConfig.vue @@ -11,6 +11,9 @@ {{item.address | splitString}}... + + {{this.$t("privateKey.addUser")}} + @@ -20,15 +23,21 @@ {{this.$t('text.cancel')}} {{this.$t('text.sure')}} + + + + diff --git a/src/views/configManagement/index.vue b/src/views/configManagement/index.vue index 22a667e7..5dc52a82 100644 --- a/src/views/configManagement/index.vue +++ b/src/views/configManagement/index.vue @@ -32,7 +32,7 @@ - + diff --git a/src/views/developerMgmt/components/developerDialog.vue b/src/views/developerMgmt/components/developerDialog.vue index 5f024400..8ffb9e4f 100644 --- a/src/views/developerMgmt/components/developerDialog.vue +++ b/src/views/developerMgmt/components/developerDialog.vue @@ -8,14 +8,17 @@ {{item.address | splitString}}... - + + {{this.$t("privateKey.addUser")}} + + {{item.userName}} {{item.address | splitString}}... - - + + @@ -26,15 +29,20 @@ {{this.$t('text.cancel')}} {{this.$t('text.sure')}} + + + diff --git a/src/views/onlineTools/index.vue b/src/views/onlineTools/index.vue index ba5408ee..66c920db 100644 --- a/src/views/onlineTools/index.vue +++ b/src/views/onlineTools/index.vue @@ -7,7 +7,7 @@
- +
@@ -23,7 +23,7 @@
- +
@@ -54,28 +54,31 @@
- - + + {{$t('onlineTools.sign')}}

{{$t('onlineTools.result')}}

-
    -
  • +
      +
    • - {{key}}: + {{value}}: - {{value}} - + {{inputSign[value]}} +
+ + +
@@ -83,14 +86,16 @@ diff --git a/src/views/parseAbi/index.vue b/src/views/parseAbi/index.vue index d57dadb3..b9ac0842 100644 --- a/src/views/parseAbi/index.vue +++ b/src/views/parseAbi/index.vue @@ -1,6 +1,6 @@ @@ -93,13 +97,15 @@ import contentHead from "@/components/contentHead"; import transactionDetail from "@/components/transactionDetail"; import { unusualContractList, getAllContractList } from "@/util/api"; import importAbi from "../abiList/components/importAbi" +import freezeThaw from "../chaincode/dialog/freezeThaw" import { getDate } from "@/util/util" export default { - name: "unusualContract", + name: "unusualContract", components: { contentHead, transactionDetail, - importAbi + importAbi, + freezeThaw }, data() { return { @@ -126,7 +132,8 @@ export default { } ], type: 1, - importVisibility: false + importVisibility: false, + freezeThawVisible: false }; }, computed: { @@ -304,7 +311,32 @@ export default { contractAddress: val.contractAddress } }) - } + }, + // freezeThawBtn(val) { + // switch (val.handleType) { + // case '0': + // return this.$t('contracts.freeze') + // break; + // case '1': + // return this.$t('contracts.unfreeze') + // break; + // } + // }, + + handleStatusBtn(val) { + this.freezeThawVisible = true + this.contractInfo = val + // if (val.handleType == 0) { + this.handleFreezeThawType = 'freeze' + // } + // else if (val.handleType == 1) { + // this.handleFreezeThawType = 'unfreeze' + // } + + }, + freezeThawClose() { + this.freezeThawVisible = false + }, } }; From af1aee9dd392869170489bd34faf83e0d91caaa6 Mon Sep 17 00:00:00 2001 From: v_wbfglai Date: Tue, 6 Jul 2021 11:36:01 +0800 Subject: [PATCH 02/41] =?UTF-8?q?=E8=BF=98=E5=8E=9Fconfig/index.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/index.js b/config/index.js index 56bcbfd7..46c3751f 100755 --- a/config/index.js +++ b/config/index.js @@ -12,9 +12,9 @@ module.exports = { assetsPublicPath: '/', proxyTable: { '/mgr': { - target: 'http://127.0.0.1:5001', + target: 'http://127.0.0.1', changeOrigin: true, - pathRewrite: { + pathRewrite: { '^/mgr': '' } }, From e7f36c5e38bdf04390a6297b67891658f33b81a5 Mon Sep 17 00:00:00 2001 From: v_wbfglai Date: Tue, 6 Jul 2021 11:43:06 +0800 Subject: [PATCH 03/41] =?UTF-8?q?=E8=BF=98=E5=8E=9Fconf/index.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/index.js b/config/index.js index 46c3751f..0e97035d 100755 --- a/config/index.js +++ b/config/index.js @@ -12,7 +12,7 @@ module.exports = { assetsPublicPath: '/', proxyTable: { '/mgr': { - target: 'http://127.0.0.1', + target: 'http://127.0.0.1/', changeOrigin: true, pathRewrite: { '^/mgr': '' From 2ebe6f2b32be30e065882fc3413f78d741a735a4 Mon Sep 17 00:00:00 2001 From: v_wbfglai Date: Tue, 6 Jul 2021 15:50:20 +0800 Subject: [PATCH 04/41] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BAjava?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=88=E5=90=8C=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/index.html | 2 +- .../{0.38f32e8290dc5fecc175.js => 0.1cd3d25dc95cedaa824c.js} | 2 +- src/views/chaincode/dialog/exportProject.vue | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename dist/static/js/{0.38f32e8290dc5fecc175.js => 0.1cd3d25dc95cedaa824c.js} (96%) diff --git a/dist/index.html b/dist/index.html index b86dfd0b..6574b941 100644 --- a/dist/index.html +++ b/dist/index.html @@ -21,7 +21,7 @@ height: 100%; margin: 0px; padding: 0px; - }
diff --git a/src/views/chaincode/dialog/mgmtCns.vue b/src/views/chaincode/dialog/mgmtCns.vue index ffcdc6cd..c5316574 100644 --- a/src/views/chaincode/dialog/mgmtCns.vue +++ b/src/views/chaincode/dialog/mgmtCns.vue @@ -9,7 +9,7 @@ - + {{this.$t("privateKey.addUser")}} diff --git a/src/views/chaincode/dialog/selectCatalog.vue b/src/views/chaincode/dialog/selectCatalog.vue index b3a87248..6ab0716a 100644 --- a/src/views/chaincode/dialog/selectCatalog.vue +++ b/src/views/chaincode/dialog/selectCatalog.vue @@ -23,7 +23,7 @@ - + {{this.$t('contracts.createFolder')}} @@ -65,8 +65,7 @@ export default { dialogVisible: this.show, pathList: [], folderList: [], - userFolader: "", - isAddFloderShow: false, + userFolader: "", foldershow: false, isAddFile:"" }; @@ -142,10 +141,7 @@ export default { // if (num == 0 && localStorage.getItem("root") === "developer") { // console.log(11111); // this.addPath(); - // } - if(this.pathList.length ===0){ - this.isAddFloderShow = true; - } + // } this.changeOptions(); } else { this.$message({ diff --git a/src/views/chaincode/oldContract.vue b/src/views/chaincode/oldContract.vue index e9443397..8db0b492 100644 --- a/src/views/chaincode/oldContract.vue +++ b/src/views/chaincode/oldContract.vue @@ -618,7 +618,7 @@ export default { }, contractStatusZh(val) { switch (val) { - case '0': + case '0': return this.$t('contracts.normal') break; case '1': diff --git a/src/views/committeeMgmt/index.vue b/src/views/committeeMgmt/index.vue index 340d9355..0081c6ac 100644 --- a/src/views/committeeMgmt/index.vue +++ b/src/views/committeeMgmt/index.vue @@ -39,7 +39,7 @@ {{item.userName}}{{item.address | splitString}}... - + @@ -210,17 +215,22 @@ + + + diff --git a/src/views/onlineTools/index.vue b/src/views/onlineTools/index.vue index 66c920db..22045486 100644 --- a/src/views/onlineTools/index.vue +++ b/src/views/onlineTools/index.vue @@ -114,11 +114,12 @@ export default { { label: "sha256", value: "sha256", - }, - { - label: "sm3", - value: "sm3", } + // , + // { + // label: "sm3", + // value: "sm3", + // } ], privateKeyList: [], signUserId: "", @@ -160,17 +161,17 @@ export default { let result = CryptoJS.SHA256(content).toString(); this.inputHash = `0x${result}` } - - } else if (this.algorithm === 'sm3') { - let content; - if (this.inputText) { - content = this.inputText; - } else { - content = this.inputFile; - } - let result = gm.sm3Digest(content); - this.inputHash = `0x${result}`; - } + } + // else if (this.algorithm === 'sm3') { + // let content; + // if (this.inputText) { + // content = this.inputText; + // } else { + // content = this.inputFile; + // } + // let result = gm.sm3Digest(content); + // this.inputHash = `0x${result}`; + // } }, getLocalKeyStores() { queryUserInfo() diff --git a/src/views/unusualContract/unusualContract.vue b/src/views/unusualContract/unusualContract.vue index 17f1ccb0..65280455 100755 --- a/src/views/unusualContract/unusualContract.vue +++ b/src/views/unusualContract/unusualContract.vue @@ -70,8 +70,9 @@ @@ -86,9 +87,9 @@ - + @@ -312,31 +313,34 @@ export default { } }) }, - // freezeThawBtn(val) { - // switch (val.handleType) { - // case '0': - // return this.$t('contracts.freeze') - // break; - // case '1': - // return this.$t('contracts.unfreeze') - // break; - // } - // }, + freezeThawBtn(val) { + switch (val.handleType) { + case '0': + return this.$t('contracts.freeze') + break; + case '1': + return this.$t('contracts.unfreeze') + break; + } + }, - handleStatusBtn(val) { - this.freezeThawVisible = true - this.contractInfo = val - // if (val.handleType == 0) { - this.handleFreezeThawType = 'freeze' - // } - // else if (val.handleType == 1) { - // this.handleFreezeThawType = 'unfreeze' - // } + // handleStatusBtn(val) { + // this.freezeThawVisible = true + // this.contractInfo = val + // if (val.handleType == 0) { + // this.handleFreezeThawType = 'freeze' + // } + // else if (val.handleType == 1) { + // this.handleFreezeThawType = 'unfreeze' + // } - }, - freezeThawClose() { - this.freezeThawVisible = false - }, + // }, + // freezeThawClose() { + // this.freezeThawVisible = false + // }, + generateContract(){ + this.$router.push("/contract") + } } }; From fdef5f10c2b35733110595437c193ad14c36fe80 Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Mon, 12 Jul 2021 19:56:21 +0800 Subject: [PATCH 06/41] update new user btn style --- src/views/CRUDServiceManagement/index.vue | 2 +- src/views/chaincode/dialog/addFile.vue | 5 ++--- src/views/chaincode/dialog/changeUser.vue | 4 ++-- src/views/chaincode/dialog/mgmtCns.vue | 2 +- src/views/committeeMgmt/index.vue | 4 ++-- src/views/configManagement/components/systemConfig.vue | 2 +- src/views/developerMgmt/components/developerDialog.vue | 2 +- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/views/CRUDServiceManagement/index.vue b/src/views/CRUDServiceManagement/index.vue index 4dec0299..d0505053 100644 --- a/src/views/CRUDServiceManagement/index.vue +++ b/src/views/CRUDServiceManagement/index.vue @@ -11,7 +11,7 @@ - {{this.$t("privateKey.addUser")}} + {{this.$t("privateKey.addUser")}} diff --git a/src/views/chaincode/dialog/addFile.vue b/src/views/chaincode/dialog/addFile.vue index bf9c5d5a..5de1ea4c 100644 --- a/src/views/chaincode/dialog/addFile.vue +++ b/src/views/chaincode/dialog/addFile.vue @@ -26,8 +26,8 @@ - - {{this.$t('contracts.createFolder')}} + + {{this.$t('dialog.newFile')}} @@ -309,4 +309,3 @@ export default { }, }; - diff --git a/src/views/chaincode/dialog/changeUser.vue b/src/views/chaincode/dialog/changeUser.vue index 034b01f5..67a13900 100755 --- a/src/views/chaincode/dialog/changeUser.vue +++ b/src/views/chaincode/dialog/changeUser.vue @@ -27,8 +27,8 @@ diff --git a/src/views/chaincode/dialog/mgmtCns.vue b/src/views/chaincode/dialog/mgmtCns.vue index c5316574..38b7e6ff 100644 --- a/src/views/chaincode/dialog/mgmtCns.vue +++ b/src/views/chaincode/dialog/mgmtCns.vue @@ -10,7 +10,7 @@ - {{this.$t("privateKey.addUser")}} + {{this.$t("privateKey.addUser")}} diff --git a/src/views/committeeMgmt/index.vue b/src/views/committeeMgmt/index.vue index 0081c6ac..9a010404 100644 --- a/src/views/committeeMgmt/index.vue +++ b/src/views/committeeMgmt/index.vue @@ -49,8 +49,8 @@ - - {{this.$t("privateKey.addUser")}} + + {{this.$t("privateKey.addUser")}} diff --git a/src/views/configManagement/components/systemConfig.vue b/src/views/configManagement/components/systemConfig.vue index 83bf6c02..0cd3f51f 100644 --- a/src/views/configManagement/components/systemConfig.vue +++ b/src/views/configManagement/components/systemConfig.vue @@ -12,7 +12,7 @@ - {{this.$t("privateKey.addUser")}} + {{this.$t("privateKey.addUser")}} diff --git a/src/views/developerMgmt/components/developerDialog.vue b/src/views/developerMgmt/components/developerDialog.vue index 8ffb9e4f..e5e8e248 100644 --- a/src/views/developerMgmt/components/developerDialog.vue +++ b/src/views/developerMgmt/components/developerDialog.vue @@ -9,7 +9,7 @@ - {{this.$t("privateKey.addUser")}} + {{this.$t("privateKey.addUser")}} From a82bdd68fb711d3d9f2eff38830120e65f8c5d4b Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Tue, 13 Jul 2021 10:56:41 +0800 Subject: [PATCH 07/41] add deploy/send new user --- src/components/sendTransaction.vue | 19 +++++++++++++++++-- src/views/chaincode/dialog/changeUser.vue | 16 +++++++++------- src/views/chaincode/dialog/mgmtCns.vue | 6 +++--- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/src/components/sendTransaction.vue b/src/components/sendTransaction.vue index 8b32b3b9..85dbced2 100644 --- a/src/components/sendTransaction.vue +++ b/src/components/sendTransaction.vue @@ -57,7 +57,13 @@ {{item.address}} + + {{this.$t("privateKey.addUser")}} + + + +
{{this.$t('contracts.method')}}: @@ -100,8 +106,13 @@ From 0df279be9086af8681e5ee79d330d789f1dd5d55 Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Thu, 15 Jul 2021 17:33:55 +0800 Subject: [PATCH 32/41] update 4s compile --- src/views/chaincode/dialog/exportProject.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/chaincode/dialog/exportProject.vue b/src/views/chaincode/dialog/exportProject.vue index ac002825..21a96004 100644 --- a/src/views/chaincode/dialog/exportProject.vue +++ b/src/views/chaincode/dialog/exportProject.vue @@ -369,7 +369,7 @@ export default { setTimeout(() => { num =0; this.getContractList(val,true); - }, 3000) + }, 4000) } this.multipleSelectedId = Array.from(new Set(this.multipleSelectedId)) }, From 351ee187897997794c78e095e3221ae57dd4f34f Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Thu, 15 Jul 2021 17:34:25 +0800 Subject: [PATCH 33/41] update bind --- src/lang/en.js | 2 +- src/lang/zh.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lang/en.js b/src/lang/en.js index 98b1bb05..683ff6b0 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -320,7 +320,7 @@ export default { haveSelectionAll: 'The contract is not compiled at all', haveCertSdk: 'Failed to get SDK certificate. Please check certificate file', haveChannelPort: 'Fill it in according to the node front corresponding ChannelPort', - addContractAddress: 'add', + addContractAddress: 'Bind', importContractTip: 'Decoding transaction output requires compiling contract in IDE or import abi of contract', nodeActive:'Node active', nodeNotActive:'Node not active', diff --git a/src/lang/zh.js b/src/lang/zh.js index d60461f8..34b99066 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -1056,7 +1056,7 @@ export default { cnsVersionPattern: "数字字母和英文字母'.'组成", cnsName: '请输入CNS名称', length1_10: '长度在 1 到 10 个字符', - addContractAddress: '绑定合约地址', + addContractAddress: '绑定', }, onlineTools: { onlineHashCalculator: 'Hash计算器', From bd3ff159d8adbe92d2e158bf58edc005bad691b2 Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Thu, 15 Jul 2021 17:34:41 +0800 Subject: [PATCH 34/41] update release note --- release_note.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release_note.txt b/release_note.txt index 53b5bbb1..a503124b 100644 --- a/release_note.txt +++ b/release_note.txt @@ -1 +1 @@ -v1.5.1 +v1.5.2 From db9f09b53c2e4046385c33de5c9a78faf67a7ccd Mon Sep 17 00:00:00 2001 From: CodingCattwo <847701726@qq.com> Date: Thu, 15 Jul 2021 18:22:19 +0800 Subject: [PATCH 35/41] fix refresh --- src/views/abiList/components/importAbi.vue | 1 - src/views/committeeMgmt/index.vue | 1 - src/views/permission/newPermission.vue | 1 - src/views/privateKeyManagement/components/creatUser.vue | 6 +++--- src/views/privateKeyManagement/privateKeyManagement.vue | 7 ++----- src/views/privateKeyManagement/totalPrivateKey.vue | 9 +++++---- src/views/unusualUser/unusualUser.vue | 2 +- 7 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/views/abiList/components/importAbi.vue b/src/views/abiList/components/importAbi.vue index e40366a4..43512a5a 100644 --- a/src/views/abiList/components/importAbi.vue +++ b/src/views/abiList/components/importAbi.vue @@ -136,7 +136,6 @@ export default { importAbi(data) .then(res => { this.loading = false; - // debugger if (res.data.code === 0) { this.setMethod() this.$emit('importSuccess') diff --git a/src/views/committeeMgmt/index.vue b/src/views/committeeMgmt/index.vue index aa111036..f5a952dc 100644 --- a/src/views/committeeMgmt/index.vue +++ b/src/views/committeeMgmt/index.vue @@ -431,7 +431,6 @@ export default { this.queryCommitteeList() this.queryVoteRecordList() this.getUserData() - this.produceCommittee() } }, diff --git a/src/views/permission/newPermission.vue b/src/views/permission/newPermission.vue index 7a841748..a4f2f8a7 100644 --- a/src/views/permission/newPermission.vue +++ b/src/views/permission/newPermission.vue @@ -68,7 +68,6 @@ export default { } }, changGroup() { - debugger if (this.activeName == 0) { if (localStorage.getItem("groupId")) { this.$refs.committeeMgmt.adminRivateKeyList = []; diff --git a/src/views/privateKeyManagement/components/creatUser.vue b/src/views/privateKeyManagement/components/creatUser.vue index c73d6ecf..cacb438c 100644 --- a/src/views/privateKeyManagement/components/creatUser.vue +++ b/src/views/privateKeyManagement/components/creatUser.vue @@ -166,7 +166,7 @@ export default { } }); }, - addUser: function () { + addUser() { let reqData = { groupId: this.groupId, userName: this.userForm.name, @@ -178,11 +178,11 @@ export default { this.loading = false; if (res.data.code === 0) { this.$emit("success"); + this.$emit("creatUserClose"); this.$message({ type: "success", message: this.$t("privateKey.addUserSuccess") }); - this.$emit("creatUserClose"); this.modelClose(); } else { this.modelClose(); @@ -214,11 +214,11 @@ export default { .then(res => { this.loading = false; if (res.data.code == 0) { + this.$emit("bindUserClose"); this.$message({ type: "success", message: this.$t("privateKey.addUserSuccess") }); - this.$emit("bindUserClose"); this.modelClose(); } else { this.modelClose(); diff --git a/src/views/privateKeyManagement/privateKeyManagement.vue b/src/views/privateKeyManagement/privateKeyManagement.vue index 44d31cb2..7431841b 100644 --- a/src/views/privateKeyManagement/privateKeyManagement.vue +++ b/src/views/privateKeyManagement/privateKeyManagement.vue @@ -205,12 +205,12 @@ export default { this.currentPage = 1; this.getUserInfoData(); }, - handleSizeChange: function (val) { + handleSizeChange(val) { this.pageSize = val; this.currentPage = 1; this.getUserInfoData(); }, - handleCurrentChange: function (val) { + handleCurrentChange(val) { this.currentPage = val; this.getUserInfoData(); }, @@ -221,9 +221,6 @@ export default { importPrivateKeySuccess() { this.getUserInfoData(); }, - bindUserClose() { - this.getUserInfoData(); - }, handleClose: function () { this.$refs.creatUser.modelClose(); }, diff --git a/src/views/privateKeyManagement/totalPrivateKey.vue b/src/views/privateKeyManagement/totalPrivateKey.vue index cdda6233..c4545a82 100644 --- a/src/views/privateKeyManagement/totalPrivateKey.vue +++ b/src/views/privateKeyManagement/totalPrivateKey.vue @@ -41,7 +41,7 @@
{{this.$t('contracts.user')}}：{{this.$t('contracts.user')}}： @@ -26,9 +26,15 @@ + + {{this.$t("privateKey.addUser")}} + + +
CNS：CNS： - - {{this.$t("privateKey.addUser")}} + + {{this.$t("privateKey.addUser")}}