From 65708eb37761f4ae53b57311e4a36036366f53e5 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 24 Sep 2021 16:06:46 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=B0=83=E6=95=B4menu=E5=92=8C=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/form/index.vue | 22 +- src/views/form/preview/ProjectForm.vue | 530 ++++++++++++------------- src/views/form/write/index.vue | 8 +- 3 files changed, 286 insertions(+), 274 deletions(-) diff --git a/src/views/form/index.vue b/src/views/form/index.vue index c724178..78090ca 100644 --- a/src/views/form/index.vue +++ b/src/views/form/index.vue @@ -18,13 +18,16 @@ - - - {{ menuItem.title }} + + {{ menuItem.title }} @@ -36,6 +39,7 @@ @click="collapseHandle" />
+
@@ -105,7 +109,7 @@ export default { }, { key: 'save', - title: '保存', + title: '存为模板', icon: 'el-icon-folder-add' }, { @@ -170,7 +174,8 @@ export default { } else if (key === 'save') { this.saveProjectAsTemplateHandle() } else if (key === 'back') { - this.$router.back(-1) + // this.$router.back(-1) + this.$router.push('/home') } else { this.$router.replace({ path: route, query: { key: this.projectKey } }) } }, @@ -253,11 +258,18 @@ export default { flex-direction: column; justify-content: space-between; border-right: solid 1px #e6e6e6; + .el-menu-vertical { + margin-top: 20px; + } .el-menu-vertical:not(.el-menu--collapse) { width: 100px; min-height: 400px; } + .el-menu-item-per { + display: flex; + line-height: 20px; + } .el-icon-d-arrow-left, .el-icon-d-arrow-right { diff --git a/src/views/form/preview/ProjectForm.vue b/src/views/form/preview/ProjectForm.vue index 738827f..e45a202 100644 --- a/src/views/form/preview/ProjectForm.vue +++ b/src/views/form/preview/ProjectForm.vue @@ -1,41 +1,35 @@ diff --git a/src/views/form/write/index.vue b/src/views/form/write/index.vue index f79fada..310e78d 100644 --- a/src/views/form/write/index.vue +++ b/src/views/form/write/index.vue @@ -15,6 +15,7 @@
{ this.writeStatus = 2 if (this.userProjectSetting.submitJumpUrl) { From 4906db6ea4d825357d8a74d87aa56d9daa2781d7 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 24 Sep 2021 16:07:58 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BC=A0=E5=85=A5token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/form/write/index.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/form/write/index.vue b/src/views/form/write/index.vue index 310e78d..b37c78c 100644 --- a/src/views/form/write/index.vue +++ b/src/views/form/write/index.vue @@ -102,8 +102,6 @@ export default { this.orgType = this.$route.query.orgType this.realName = this.$route.query.realName this.accessKey = this.$route.query.accessKey - // const token = this.$route.query.token - // this.$store.dispatch('user/setTokens', token) let key = this.$route.query.key || this.$route.params.key this.projectConfig.projectKey = key @@ -111,6 +109,11 @@ export default { if (wxCode) { this.wxAuthorizationCode = wxCode await this.getWxAuthorizationUserInfo() + } else { + console.log('微信传入token') + const token = this.$route.query.token + this.$store.dispatch('user/setTokens', token) + } this.getWxAuthorizationUrl() this.queryProjectSettingStatus() From 94711172196bcce043f2ed97d34a12272d92cea9 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 24 Sep 2021 16:09:20 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E4=BC=A0=E5=85=A5token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/form/write/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/form/write/index.vue b/src/views/form/write/index.vue index b37c78c..d45aa50 100644 --- a/src/views/form/write/index.vue +++ b/src/views/form/write/index.vue @@ -109,10 +109,11 @@ export default { if (wxCode) { this.wxAuthorizationCode = wxCode await this.getWxAuthorizationUserInfo() - } else { console.log('微信传入token') const token = this.$route.query.token this.$store.dispatch('user/setTokens', token) + } else { + } this.getWxAuthorizationUrl() From b65bf144a77715175a2e13edc01b712858fa60de Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 24 Sep 2021 16:22:46 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=8A=A0=E4=B8=8Adebugger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 1 + src/views/form/write/index.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/src/api/index.js b/src/api/index.js index 5c66f46..0443cbb 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -27,6 +27,7 @@ const api = axios.create({ api.interceptors.request.use( request => { + debugger /** * 全局拦截请求发送前提交的参数 * 以下代码为示例，在登录状态下，分别对 post 和 get 请求加上 token 参数 diff --git a/src/views/form/write/index.vue b/src/views/form/write/index.vue index d45aa50..8575917 100644 --- a/src/views/form/write/index.vue +++ b/src/views/form/write/index.vue @@ -96,6 +96,7 @@ export default { ] }, async created () { + debugger this.clientType = this.$route.query.clientType this.orgId = this.$route.query.orgId this.orgName = this.$route.query.orgName From 4992820ab0bbaca5f7ef13b5ca813651faf589a8 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 24 Sep 2021 16:25:03 +0800 Subject: [PATCH 5/9] token --- src/views/form/write/index.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/form/write/index.vue b/src/views/form/write/index.vue index 8575917..b3f8979 100644 --- a/src/views/form/write/index.vue +++ b/src/views/form/write/index.vue @@ -114,7 +114,9 @@ export default { const token = this.$route.query.token this.$store.dispatch('user/setTokens', token) } else { - + console.log('微信传入token') + const token = this.$route.query.token + this.$store.dispatch('user/setTokens', token) } this.getWxAuthorizationUrl() From 21f1ba1d3552277d79dc99fd8d047418611626c0 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 24 Sep 2021 16:31:16 +0800 Subject: [PATCH 6/9] accessKey --- src/views/form/preview/ProjectForm.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/views/form/preview/ProjectForm.vue b/src/views/form/preview/ProjectForm.vue index e45a202..0e6be65 100644 --- a/src/views/form/preview/ProjectForm.vue +++ b/src/views/form/preview/ProjectForm.vue @@ -62,6 +62,10 @@ export default { projectKind: 1 } + }, + accessKey: { + type: String, + default: '' } }, metaInfo: { From 10c0ef4b0b9796b7bafa10527b33aeb37d855248 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 24 Sep 2021 16:39:37 +0800 Subject: [PATCH 7/9] =?UTF-8?q?token=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/form/write/index.vue | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/views/form/write/index.vue b/src/views/form/write/index.vue index b3f8979..2a8a612 100644 --- a/src/views/form/write/index.vue +++ b/src/views/form/write/index.vue @@ -104,21 +104,22 @@ export default { this.realName = this.$route.query.realName this.accessKey = this.$route.query.accessKey + console.log('微信传入token') + const token = this.$route.query.token + if (token) { + this.$store.dispatch('user/setTokens', token) + } + + let key = this.$route.query.key || this.$route.params.key this.projectConfig.projectKey = key let wxCode = getQueryString('code') if (wxCode) { this.wxAuthorizationCode = wxCode await this.getWxAuthorizationUserInfo() - console.log('微信传入token') - const token = this.$route.query.token - this.$store.dispatch('user/setTokens', token) - } else { - console.log('微信传入token') - const token = this.$route.query.token - this.$store.dispatch('user/setTokens', token) } + this.getWxAuthorizationUrl() this.queryProjectSettingStatus() this.queryProjectSetting() From e60a74350dd88b2dc040b24ee4a162a5c8be3fd3 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 24 Sep 2021 16:41:35 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=8E=BB=E6=8E=89debugger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 2 +- src/views/form/write/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index 0443cbb..1a88c99 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -27,7 +27,7 @@ const api = axios.create({ api.interceptors.request.use( request => { - debugger + /** * 全局拦截请求发送前提交的参数 * 以下代码为示例，在登录状态下，分别对 post 和 get 请求加上 token 参数 diff --git a/src/views/form/write/index.vue b/src/views/form/write/index.vue index 2a8a612..f974c9d 100644 --- a/src/views/form/write/index.vue +++ b/src/views/form/write/index.vue @@ -96,7 +96,7 @@ export default { ] }, async created () { - debugger + this.clientType = this.$route.query.clientType this.orgId = this.$route.query.orgId this.orgName = this.$route.query.orgName From 5936614b7ede08875cad52e353156f48fe304c64 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Sun, 26 Sep 2021 13:38:38 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E7=BA=A7=E8=81=94=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E9=BB=98=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/generator/config.js | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/components/generator/config.js b/src/components/generator/config.js index d28f7e8..ee71fd5 100644 --- a/src/components/generator/config.js +++ b/src/components/generator/config.js @@ -170,16 +170,18 @@ export const selectComponents = [ changeTag: true, document: 'https://element.eleme.cn/#/zh-CN/component/cascader' }, - options: [{ - id: 1, - value: 1, - label: '选项1', - children: [{ - id: 2, - value: 2, - label: '选项1-1' - }] - }], + options: [ + // { + // id: 1, + // value: 1, + // label: '选项1', + // children: [{ + // id: 2, + // value: 2, + // label: '选项1-1' + // }] + // } + ], placeholder: '请选择', style: {width: '100%'}, props: {