Merge pull request #6389 from dataease/pr@dev-v2_dzz

Pr@dev v2 dzz

core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/ComponentColorSelector.vue

@@ -311,14 +311,14 @@ span {
   font-size: 12px;
 }
 
-.color-type ::v-deep .el-radio__input {
+.color-type :deep(.el-radio__input) {
   display: none;
 }
 .ed-radio {
   margin: 0 2px 0 0 !important;
   border: 1px solid transparent;
 }
-.el-radio ::v-deep .el-radio__label {
+.el-radio :deep(.el-radio__label) {
   padding-left: 0;
 }
 

core/core-frontend/src/components/data-visualization/canvas/ContextMenuDetails.vue

@@ -197,7 +197,7 @@ const composeDivider = computed(() => {
     background-color: #292929;
     box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
     box-sizing: border-box;
-    ::v-deep(.ed-divider) {
+    :deep(.ed-divider) {
       margin: 8px 0;
     }
 

core/core-frontend/src/components/data-visualization/canvas/Shape.vue

@@ -80,7 +80,7 @@
 import eventBus from '@/utils/eventBus'
 import calculateComponentPositionAndSize from '@/utils/calculateComponentPositionAndSize'
 import { mod360 } from '@/utils/translate'
-import { deepCopy, isPreventDrop } from '@/utils/utils'
+import { deepCopy } from '@/utils/utils'
 import { computed, nextTick, onMounted, ref, toRefs, reactive } from 'vue'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot'

core/core-frontend/src/components/visualization/HyperlinksDialog.vue

@@ -100,7 +100,7 @@ const onClose = () => {
   height: 35px;
   border-radius: 3px;
 }
-::v-deep .el-popover {
+:deep(.el-popover) {
   height: 200px;
   overflow: auto;
 }

core/core-frontend/src/components/visualization/LinkJumpSet.vue

@@ -715,22 +715,6 @@ defineExpose({
 </script>
 
 <style scoped lang="less">
-.my_table ::v-deep .el-table__row > td {
-  /* 去除表格线 */
-  border: none;
-  padding: 0 0;
-}
-
-.my_table ::v-deep .el-table th.is-leaf {
-  /* 去除上边框 */
-  border: none;
-}
-
-.my_table ::v-deep .el-table::before {
-  /* 去除下边框 */
-  height: 0;
-}
-
 .root-class {
   margin: 15px 0px 5px;
   justify-content: right;
@@ -807,11 +791,11 @@ defineExpose({
   overflow-y: auto;
 }
 
-/deep/ .vue-treeselect__control {
+:deep(.vue-treeselect__control) {
   height: 28px;
 }
 
-/deep/ .vue-treeselect__single-value {
+:deep(.vue-treeselect__single-value) {
   color: #606266;
   line-height: 28px !important;
 }

core/core-frontend/src/components/visualization/LinkageSet.vue

@@ -408,22 +408,6 @@ defineExpose({
 </script>
 
 <style scoped lang="less">
-.my_table ::v-deep .el-table__row > td {
-  /* 去除表格线 */
-  border: none;
-  padding: 0 0;
-}
-
-.my_table ::v-deep .el-table th.is-leaf {
-  /* 去除上边框 */
-  border: none;
-}
-
-.my_table ::v-deep .el-table::before {
-  /* 去除下边框 */
-  height: 0;
-}
-
 .root-class {
   margin: 15px 0px 5px;
   justify-content: right;
@@ -498,11 +482,11 @@ defineExpose({
   overflow-y: auto;
 }
 
-/deep/ .vue-treeselect__control {
+:deep(.vue-treeselect__control) {
   height: 28px;
 }
 
-/deep/ .vue-treeselect__single-value {
+:deep(.vue-treeselect__single-value) {
   color: #606266;
   line-height: 28px !important;
 }

core/core-frontend/src/components/visualization/StreamMediaLinks.vue

@@ -156,7 +156,7 @@ watch(
   border-radius: 3px;
 }
 
-::v-deep .el-popover {
+:deep(.el-popover) {
   height: 200px;
   overflow: auto;
 }

core/core-frontend/src/views/workbranch/ShortcutTable.vue

@@ -399,7 +399,7 @@ const getEmptyDesc = (): string => {
     }
   }
 }
-.workbranch-grid ::v-deep(.ed-empty) {
+.workbranch-grid :deep(.ed-empty) {
   padding: 80px 0 !important;
   .ed-empty__description {
     margin-top: 0px;