From 3f4eca709ed8eb7a9844d3a78bcf20d46c8ac721 Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Tue, 10 Oct 2023 09:37:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20maven=E6=89=93=E5=8C=85=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=EF=BC=8C=E7=94=B1=E4=BA=8E=E7=A7=BB=E9=99=A4=E4=BA=86spring-bo?= =?UTF-8?q?ot-starter-parent=EF=BC=8C=E7=8E=B0=E5=9C=A8=E5=BF=85=E9=A1=BB?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=8C=87=E5=AE=9A=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataRoom/dataroom-server/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/DataRoom/dataroom-server/pom.xml b/DataRoom/dataroom-server/pom.xml index dad9ffdc..ea54e4d7 100644 --- a/DataRoom/dataroom-server/pom.xml +++ b/DataRoom/dataroom-server/pom.xml @@ -19,6 +19,7 @@ true + @@ -65,6 +66,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.7.16 @@ -82,16 +84,19 @@ org.apache.maven.plugins maven-surefire-plugin + 2.22.2 true maven-compiler-plugin + 3.8.1 org.apache.maven.plugins maven-source-plugin + 3.2.1 package From 636ed809a0d52a0b17fd8a6820de5e2e042b81a9 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Tue, 10 Oct 2023 09:47:43 +0800 Subject: [PATCH 2/2] refactor: /deep/ => ::v-deep --- .../BasicComponents/ThemeSelect/index.vue | 4 +-- .../BigScreenDesign/DataViewDialog/index.vue | 32 +++++++++---------- .../BigScreenDesign/PageDesignTop.vue | 6 ++-- data-room-ui/packages/Render/index.vue | 18 +++++------ 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/data-room-ui/packages/BasicComponents/ThemeSelect/index.vue b/data-room-ui/packages/BasicComponents/ThemeSelect/index.vue index 492f766b..76cdf74a 100644 --- a/data-room-ui/packages/BasicComponents/ThemeSelect/index.vue +++ b/data-room-ui/packages/BasicComponents/ThemeSelect/index.vue @@ -113,7 +113,7 @@ export default { .theme-dropdown-menu{ background-color: var(--bs-background-2)!important; border: 1px solid var(--bs-border-1); - /deep/ .popper__arrow{ + ::v-deep .popper__arrow{ //background-color: var(--bs-background-2)!important; background-color: transparent!important; border-bottom-color:transparent!important; @@ -121,7 +121,7 @@ export default { border-bottom-color: var(--bs-background-2)!important; } } - /deep/ .el-dropdown-menu__item{ + ::v-deep .el-dropdown-menu__item{ background-color: var(--bs-background-2)!important; color: rgb(188, 201, 212)!important; &:hover { diff --git a/data-room-ui/packages/BigScreenDesign/DataViewDialog/index.vue b/data-room-ui/packages/BigScreenDesign/DataViewDialog/index.vue index f9b7a86f..d538a431 100644 --- a/data-room-ui/packages/BigScreenDesign/DataViewDialog/index.vue +++ b/data-room-ui/packages/BigScreenDesign/DataViewDialog/index.vue @@ -17,8 +17,8 @@
@@ -219,7 +219,7 @@ export default {