Merge pull request #508 from dataease/pr@dev@feat_panel-linkage-setting

frontend/src/components/DeDrag/index.vue

@@ -1631,26 +1631,26 @@ export default {
   user-select: none;
 }
 
-.mouseOn >>> .icon-shezhi{
-  z-index: 2;
-  display:block!important;
-}
-.vdr > i{
-  right: 5px;
-  color: gray;
-  position: absolute;
-}
+/*.mouseOn >>> .icon-shezhi{*/
+/*  z-index: 2;*/
+/*  display:block!important;*/
+/*}*/
+/*.vdr > i{*/
+/*  right: 5px;*/
+/*  color: gray;*/
+/*  position: absolute;*/
+/*}*/
 
-.vdr >>> i:hover {
-  color: red;
-}
+/*.vdr >>> i:hover {*/
+/*  color: red;*/
+/*}*/
 
-.vdr:hover >>> i {
-  z-index: 2;
-  display:block;
-}
+/*.vdr:hover >>> i {*/
+/*  z-index: 2;*/
+/*  display:block;*/
+/*}*/
 
-.vdr>>>.icon-shezhi {
-  display:none
-}
+/*.vdr>>>.icon-shezhi {*/
+/*  display:none*/
+/*}*/
 </style>

frontend/src/components/canvas/components/Editor/EditBar.vue

 <template>
   <div class="bar-main">
-    <div v-if="linkageSettingStatus" style="margin-right: 0px;width: 18px">
+    <div v-if="linkageSettingStatus" style="margin-right: -1px;width: 18px">
       <el-checkbox v-model="linkageActiveStatus" />
       <i v-if="linkageActiveStatus" class="icon iconfont icon-edit" @click.stop="linkageEdit" />
     </div>