From 812429f698ec78d9621b2cc3d3cd700b09d8b389 Mon Sep 17 00:00:00 2001 From: yjx Date: Sun, 16 Apr 2023 09:25:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?vue3=E7=89=88=E6=9C=AC=E5=A2=9E=E5=8A=A0.en?= =?UTF-8?q?v=E6=96=87=E4=BB=B6=EF=BC=8C=E9=85=8D=E7=BD=AEVUE=5FAPP=5FNAME?= =?UTF-8?q?=3D'Vol.Vue3'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 使得同时跑多个框架时，缓存生成页面路径冲突 Signed-off-by: iamyjx --- "Vol.Vue3\347\211\210\346\234\254/.env" | 1 + .../.env.development" | 0 .../.env.production" | 0 .../src/views/builder/coder.vue" | 22 +++++++++++++------ 4 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 "Vol.Vue3\347\211\210\346\234\254/.env" create mode 100644 "Vol.Vue3\347\211\210\346\234\254/.env.development" create mode 100644 "Vol.Vue3\347\211\210\346\234\254/.env.production" diff --git "a/Vol.Vue3\347\211\210\346\234\254/.env" "b/Vol.Vue3\347\211\210\346\234\254/.env" new file mode 100644 index 000000000..5a121e39c --- /dev/null +++ "b/Vol.Vue3\347\211\210\346\234\254/.env" @@ -0,0 +1 @@ +VUE_APP_NAME='Vol_Template' \ No newline at end of file diff --git "a/Vol.Vue3\347\211\210\346\234\254/.env.development" "b/Vol.Vue3\347\211\210\346\234\254/.env.development" new file mode 100644 index 000000000..e69de29bb diff --git "a/Vol.Vue3\347\211\210\346\234\254/.env.production" "b/Vol.Vue3\347\211\210\346\234\254/.env.production" new file mode 100644 index 000000000..e69de29bb diff --git "a/Vol.Vue3\347\211\210\346\234\254/src/views/builder/coder.vue" "b/Vol.Vue3\347\211\210\346\234\254/src/views/builder/coder.vue" index 9ade78282..686190f8a 100644 --- "a/Vol.Vue3\347\211\210\346\234\254/src/views/builder/coder.vue" +++ "b/Vol.Vue3\347\211\210\346\234\254/src/views/builder/coder.vue" @@ -151,6 +151,7 @@ export default { }, data() { return { + appName: process.env.VUE_APP_NAME, more: { addChild: 'addChild', ceateController: 'ceateController', @@ -174,7 +175,8 @@ export default { }, watch: { 'layOutOptins.fields.vuePath'(val) { - localStorage.setItem('vuePath', val); + // localStorage.setItem('vuePath', val); + localStorage.setItem(this.appName+'_vuePath', val); }, deep: true //localStorage.setItem("vuePath", this.layOutOptins.fields.vuePath || ""); @@ -335,14 +337,16 @@ export default { this.validateTableInfo(() => { let vuePath; if (!isApp) { - vuePath = localStorage.getItem('vuePath'); + // vuePath = localStorage.getItem('vuePath'); + vuePath = localStorage.getItem(this.appName+'_vuePath'); if (!vuePath) { return this.$message.error( '请先设置Vue项目对应Views的绝对路径,然后再保存!' ); } } else { - vuePath = localStorage.getItem('appPath'); + // vuePath = localStorage.getItem('appPath'); + vuePath = localStorage.getItem(this.appName+'_appPath'); if (!vuePath) { return this.$message.error('请先设置app路径,然后再保存!'); } @@ -406,8 +410,10 @@ export default { ceateController() {}, checkSortName() {}, save() { - localStorage.setItem('vuePath', this.layOutOptins.fields.vuePath || ''); - localStorage.setItem('appPath', this.layOutOptins.fields.appPath || ''); + // localStorage.setItem('vuePath', this.layOutOptins.fields.vuePath || ''); + // localStorage.setItem('appPath', this.layOutOptins.fields.appPath || ''); + localStorage.setItem(this.appName+'__vuePath', this.layOutOptins.fields.vuePath || ''); + localStorage.setItem(this.appName+'_appPath', this.layOutOptins.fields.appPath || ''); if ( this.tableInfo && @@ -508,8 +514,10 @@ export default { column.bind.data = data; }); - builderData.form.fields.vuePath = this.getVuePath('vuePath'); - builderData.form.fields.appPath = this.getVuePath('appPath'); + // builderData.form.fields.vuePath = this.getVuePath('vuePath'); + // builderData.form.fields.appPath = this.getVuePath('appPath'); + builderData.form.fields.vuePath = this.getVuePath(this.appName+'_vuePath'); + builderData.form.fields.appPath = this.getVuePath(this.appName+'_appPath'); this.http.post('/api/builder/GetTableTree', {}, false).then((x) => { this.tree = JSON.parse(x.list); if (!x.nameSpace) { From 2b30f7f619dcadc1d532ce2c23ea093845b2655a Mon Sep 17 00:00:00 2001 From: yjx Date: Sun, 16 Apr 2023 09:33:45 +0800 Subject: [PATCH 2/2] delet comments Signed-off-by: iamyjx --- .../src/views/builder/coder.vue" | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git "a/Vol.Vue3\347\211\210\346\234\254/src/views/builder/coder.vue" "b/Vol.Vue3\347\211\210\346\234\254/src/views/builder/coder.vue" index 686190f8a..5f6d863e1 100644 --- "a/Vol.Vue3\347\211\210\346\234\254/src/views/builder/coder.vue" +++ "b/Vol.Vue3\347\211\210\346\234\254/src/views/builder/coder.vue" @@ -175,7 +175,6 @@ export default { }, watch: { 'layOutOptins.fields.vuePath'(val) { - // localStorage.setItem('vuePath', val); localStorage.setItem(this.appName+'_vuePath', val); }, deep: true @@ -336,16 +335,14 @@ export default { ceateVuePage(isApp) { this.validateTableInfo(() => { let vuePath; - if (!isApp) { - // vuePath = localStorage.getItem('vuePath'); + if (!isApp) { vuePath = localStorage.getItem(this.appName+'_vuePath'); if (!vuePath) { return this.$message.error( '请先设置Vue项目对应Views的绝对路径,然后再保存!' ); } - } else { - // vuePath = localStorage.getItem('appPath'); + } else { vuePath = localStorage.getItem(this.appName+'_appPath'); if (!vuePath) { return this.$message.error('请先设置app路径,然后再保存!'); @@ -410,8 +407,6 @@ export default { ceateController() {}, checkSortName() {}, save() { - // localStorage.setItem('vuePath', this.layOutOptins.fields.vuePath || ''); - // localStorage.setItem('appPath', this.layOutOptins.fields.appPath || ''); localStorage.setItem(this.appName+'__vuePath', this.layOutOptins.fields.vuePath || ''); localStorage.setItem(this.appName+'_appPath', this.layOutOptins.fields.appPath || ''); @@ -514,8 +509,6 @@ export default { column.bind.data = data; }); - // builderData.form.fields.vuePath = this.getVuePath('vuePath'); - // builderData.form.fields.appPath = this.getVuePath('appPath'); builderData.form.fields.vuePath = this.getVuePath(this.appName+'_vuePath'); builderData.form.fields.appPath = this.getVuePath(this.appName+'_appPath'); this.http.post('/api/builder/GetTableTree', {}, false).then((x) => {