From f31c729569ff0be6d10c039d2ae62b937f999914 Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Fri, 22 Sep 2023 13:51:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=86=E7=BB=84=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=AF=94=E4=BE=8B=E6=BB=9A=E8=BD=AE=E7=BC=A9?= =?UTF-8?q?=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 分组删除提示优化,新增大屏比例滚轮缩放 --- .../packages/BigScreenDesign/PageDesignTop.vue | 16 ++++++++++++++++ data-room-ui/packages/BigScreenMag/SideMenu.vue | 2 +- .../packages/ComponentList/CatalogEditForm.vue | 2 +- data-room-ui/packages/SourceMag/SideMenu.vue | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue b/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue index 5dd64b9e..94383bc5 100644 --- a/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue +++ b/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue @@ -13,10 +13,12 @@ 缩放 0) return; + event.preventDefault(); + let zoom1 = this.zoom - delta + this.$emit('changeZoom', zoom1) + }, changeZoom (val) { this.$emit('changeZoom', val) }, diff --git a/data-room-ui/packages/BigScreenMag/SideMenu.vue b/data-room-ui/packages/BigScreenMag/SideMenu.vue index ff66e1e0..3a78bd1b 100644 --- a/data-room-ui/packages/BigScreenMag/SideMenu.vue +++ b/data-room-ui/packages/BigScreenMag/SideMenu.vue @@ -235,7 +235,7 @@ export default { }, // 删除目录 catalogDel (catalog) { - this.$confirm('确定删除该目录?', '提示', { + this.$confirm('分组删除后,分组下的大屏会被归纳至全部中,确定删除该分组?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', diff --git a/data-room-ui/packages/ComponentList/CatalogEditForm.vue b/data-room-ui/packages/ComponentList/CatalogEditForm.vue index d6de0cbb..48b8760d 100644 --- a/data-room-ui/packages/ComponentList/CatalogEditForm.vue +++ b/data-room-ui/packages/ComponentList/CatalogEditForm.vue @@ -246,7 +246,7 @@ export default { }, // 删除目录 catalogDel (catalog) { - this.$confirm('确定删除该分组?', '提示', { + this.$confirm('分组删除后,分组下的组件会被归纳至全部中,确定删除该分组?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', diff --git a/data-room-ui/packages/SourceMag/SideMenu.vue b/data-room-ui/packages/SourceMag/SideMenu.vue index 36f1b3f0..18dc3ea2 100644 --- a/data-room-ui/packages/SourceMag/SideMenu.vue +++ b/data-room-ui/packages/SourceMag/SideMenu.vue @@ -265,7 +265,7 @@ export default { }, // 删除目录 catalogDel (catalog) { - this.$confirm('确定删除该分组?', '提示', { + this.$confirm('分组删除后,分组下的资源会被归纳至全部中,确定删除该分组?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning',