Merge branch 'master' of github.com:gcpaas/DataRoom

DataRoom/dataroom-server/pom.xml

@@ -19,6 +19,7 @@
         <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
 
+
     <dependencies>
         <!--h2database-->
         <dependency>
@@ -65,6 +66,7 @@
                     <plugin>
                         <groupId>org.springframework.boot</groupId>
                         <artifactId>spring-boot-maven-plugin</artifactId>
+                        <version>2.7.16</version>
                         <!--下面的代码可以将依赖的第三方jar包通过maven插件打入工程的lib中-->
                         <executions>
                             <execution>
@@ -82,16 +84,19 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
+                        <version>2.22.2</version>
                         <configuration>
                             <skipTests>true</skipTests>
                         </configuration>
                     </plugin>
                     <plugin>
                         <artifactId>maven-compiler-plugin</artifactId>
+                        <version>3.8.1</version>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
+                        <version>3.2.1</version>
                         <executions>
                             <execution>
                                 <phase>package</phase>

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 {

data-room-ui/packages/BigScreenDesign/DataViewDialog/index.vue

@@ -17,8 +17,8 @@
       <div class="table-box">
         <el-table
           ref="table"
-          max-height="500"
           v-loading="loading"
+          max-height="500"
           class="bs-table bs-el-table fixed-header-table"
           :data="dataList"
         >
@@ -219,7 +219,7 @@ export default {
 
 <style lang="scss" scoped>
 .bs-data-view-dialog{
-  /deep/.el-dialog__body{
+  ::v-deep .el-dialog__body{
     background-color: var(--bs-background-2) !important;
     overflow: hidden;
     max-height: 540px!important;
@@ -236,62 +236,62 @@ export default {
       overflow-y: hidden;
     }
   }
-  /deep/ .el-table__body-wrapper{
+  ::v-deep  .el-table__body-wrapper{
     min-height: 200px !important;
   }
- .el-table th.el-table__cell.is-leaf, .el-table /deep/td.el-table__cell{
+ .el-table th.el-table__cell.is-leaf, .el-table ::v-deep td.el-table__cell{
     border-bottom:none;
   }
-  /deep/.el-loading-mask{
+  ::v-deep .el-loading-mask{
     background-color: var(--bs-background-2) !important;
   }
-  .el-table /deep/thead{
+  .el-table ::v-deep thead{
     color: var(--bs-el-title);
   }
-  .bs-el-table /deep/td.el-table__cell{
+  .bs-el-table ::v-deep td.el-table__cell{
     color: #bcc9d4;
   }
-  .el-table--scrollable-y /deep/.el-table__body-wrapper{
+  .el-table--scrollable-y ::v-deep .el-table__body-wrapper{
     overflow: auto!important;
   }
   /* 修改滚动条的样式 */
-  /deep/.el-dialog__body::-webkit-scrollbar {
+  ::v-deep .el-dialog__body::-webkit-scrollbar {
     width: 8px; /* 滚动条宽度 */
   }
 
- /deep/.el-dialog__body::-webkit-scrollbar-thumb {
+ ::v-deep .el-dialog__body::-webkit-scrollbar-thumb {
     background-color: #888; /* 滚动条拖动块颜色 */
     height: 6px;
     border-radius: 5px;
   }
 
-  /deep/.el-dialog__body::-webkit-scrollbar-track {
+  ::v-deep .el-dialog__body::-webkit-scrollbar-track {
     background-color: transparent; /* 滚动条轨道颜色 */
   }
 
   /* 鼠标悬停在滚动条上时的样式 */
-  /deep/.el-dialog__body::-webkit-scrollbar-thumb:hover {
+  ::v-deep .el-dialog__body::-webkit-scrollbar-thumb:hover {
     background-color: #555;
   }
 }
 /* 自定义滚动条样式 */
-/deep/.el-table__body-wrapper::-webkit-scrollbar {
+::v-deep .el-table__body-wrapper::-webkit-scrollbar {
   width: 6px; /* 滚动条宽度 */
   height: 6px;
 }
 
-/deep/.el-table__body-wrapper::-webkit-scrollbar-thumb {
+::v-deep .el-table__body-wrapper::-webkit-scrollbar-thumb {
   background-color: #888; /* 滚动条拖动块颜色 */
   height: 100px;
   border-radius: 5px;
 }
 
-/deep/.el-table__body-wrapper::-webkit-scrollbar-track {
+::v-deep .el-table__body-wrapper::-webkit-scrollbar-track {
   background-color: transparent; /* 滚动条轨道颜色 */
 }
 
 /* 鼠标悬停在滚动条上时的样式 */
-/deep/.el-table__body-wrapper::-webkit-scrollbar-thumb:hover {
+::v-deep .el-table__body-wrapper::-webkit-scrollbar-thumb:hover {
   background-color: #555;
   cursor: pointer;
 }

data-room-ui/packages/BigScreenDesign/PageDesignTop.vue

@@ -664,11 +664,11 @@ export default {
   .theme-switch {
     margin-right: 10px;
 
-    /deep/.el-switch__label {
+    ::v-deep .el-switch__label {
       color: #bcc9d4 !important;
     }
 
-    /deep/.el-switch__label.is-active {
+    ::v-deep .el-switch__label.is-active {
       color: var(--bs-el-color-primary) !important;
     }
   }
@@ -685,7 +685,7 @@ export default {
   background-color: var(--bs-background-2) !important;
   border: 1px solid var(--bs-border-1);
 
-  /deep/ .el-dropdown-menu__item {
+  ::v-deep  .el-dropdown-menu__item {
     background-color: var(--bs-background-2) !important;
 
     &:hover {

data-room-ui/packages/Render/index.vue

@@ -485,7 +485,7 @@ export default {
 }
 //调整拖拽插件的句柄样式
 //句柄公共样式
-/deep/.bs-handle-class{
+::v-deep .bs-handle-class{
   width: 16px!important;
   height: 16px!important;
   position: absolute;
@@ -494,7 +494,7 @@ export default {
   border: 3px solid #c8ff00;
 }
 // 每个句柄不同样式
-/deep/.bs-handle-class-tl{
+::v-deep .bs-handle-class-tl{
   top: -2px!important;
   left: -2px!important;
   display: block;
@@ -502,7 +502,7 @@ export default {
   border-right: none;
   border-bottom: none;
 }
-/deep/.bs-handle-class-tm{
+::v-deep .bs-handle-class-tm{
   top: -2px!important;
   left: calc(50% - 8px)!important;
   display: block;
@@ -511,7 +511,7 @@ export default {
   border-right: none;
   border-bottom: none;
 }
-/deep/.bs-handle-class-tr{
+::v-deep .bs-handle-class-tr{
   top: -2px!important;
   right: -2px!important;
   display: block;
@@ -519,7 +519,7 @@ export default {
   border-left: none;
   border-bottom: none;
 }
-/deep/.bs-handle-class-mr{
+::v-deep .bs-handle-class-mr{
   top: calc(50% - 8px)!important;
   right: -2px!important;
   display: block;
@@ -528,7 +528,7 @@ export default {
   border-top: none;
   border-bottom: none;
 }
-/deep/.bs-handle-class-br{
+::v-deep .bs-handle-class-br{
   right: -2px!important;
   bottom: -2px!important;
   display: block;
@@ -536,7 +536,7 @@ export default {
   border-left: none;
   border-top: none;
 }
-/deep/.bs-handle-class-bm{
+::v-deep .bs-handle-class-bm{
   right: calc(50% - 8px)!important;
   bottom: -2px!important;
   display: block;
@@ -545,7 +545,7 @@ export default {
   border-right: none;
   border-top: none;
 }
-/deep/.bs-handle-class-bl{
+::v-deep .bs-handle-class-bl{
   left: -2px!important;
   bottom: -2px!important;
   display: block;
@@ -553,7 +553,7 @@ export default {
   border-right: none;
   border-top: none;
 }
-/deep/.bs-handle-class-ml{
+::v-deep .bs-handle-class-ml{
   top: calc(50% - 8px)!important;
   left: -2px!important;
   display: block;