From 4c0f83a3215430604334f4ad7c286df5aebbe2f7 Mon Sep 17 00:00:00 2001 From: Tsln Date: Tue, 2 Mar 2021 19:23:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8DSafari=E4=B8=8B=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE=E9=94=99=E4=B9=B1?= =?UTF-8?q?=20(#109)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Crud/CRUD.operation.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/Crud/CRUD.operation.vue b/src/components/Crud/CRUD.operation.vue index 20fd0db..33d2077 100644 --- a/src/components/Crud/CRUD.operation.vue +++ b/src/components/Crud/CRUD.operation.vue @@ -262,4 +262,7 @@ export default { .crud-opts .crud-opts-right { margin-left: auto; } + .crud-opts .crud-opts-right span { + float: left; + } From 2d29819461aff70d9797dcad0987f968de0ead85 Mon Sep 17 00:00:00 2001 From: rjdyx Date: Tue, 2 Mar 2021 19:23:37 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=90=8E=E6=B2=A1=E6=9C=89=E6=B8=85=E7=A9=BA?= =?UTF-8?q?form=E7=9A=84menus=E5=B1=9E=E6=80=A7=EF=BC=8C=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E5=8A=A0=E5=85=A5=E4=BA=86=E4=B8=8A?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=A7=92=E8=89=B2=E7=9A=84=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20(#108)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: rjdyx <1191200688@qq.com> --- src/views/system/role/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index c6af85b..467a37f 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -173,8 +173,9 @@ export default { this.$refs.menu.setCheckedKeys([]) }, // 新增前初始化部门信息 - [CRUD.HOOK.beforeToAdd]() { + [CRUD.HOOK.beforeToAdd](crud, form) { this.deptDatas = [] + form.menus = null }, // 编辑前初始化自定义数据权限的部门信息 [CRUD.HOOK.beforeToEdit](crud, form) { From 5942e3cc985d47c9577713262130a48ed88f0448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9A=86=E9=9D=9E?= <53246310+jiefei30@users.noreply.github.com> Date: Tue, 2 Mar 2021 19:25:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BF=AE=E5=A4=8D](v2.6?= =?UTF-8?q?)=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=9C=A8=E6=96=B0=E5=A2=9E/?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=8F=9C=E5=8D=95=E4=B8=AD=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E5=A4=96=E9=93=BE=E8=8F=9C=E5=8D=95=E6=8C=89=E9=92=AE=E6=97=B6?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=85=83=E7=B4=A0=E4=B8=8D=E5=86=8D=E5=8F=98?= =?UTF-8?q?=E5=8C=96=20(#107)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix v-show bug when switch is_external_link button in menu/index.vue * More rigorous --- src/views/system/menu/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 110077e..fe53d23 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -59,7 +59,7 @@ - + @@ -67,10 +67,10 @@ - + - + From e6081ec748db073ef8eb4cbf220c4049f83fac65 Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Tue, 2 Mar 2021 19:27:29 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2.6?= =?UTF-8?q?)=EF=BC=9Aupdate=20axios=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a315a38..dd3ee8a 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ }, "dependencies": { "@riophae/vue-treeselect": "0.4.0", - "axios": "0.18.1", + "axios": "^0.21.1", "clipboard": "2.0.4", "codemirror": "^5.49.2", "connect": "3.6.6",