Merge branch 'dev' of github.com:dataease/dataease into dev

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

@@ -104,6 +104,9 @@ export default {
     position: absolute;
 }
 
+.component:hover {
+  box-shadow:0px 0px 7px #0a7be0;
+}
 .gap_class{
   padding:3px;
 }

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

@@ -4,6 +4,7 @@
       <el-dropdown trigger="click" @mouseup="handleMouseUp">
         <slot name="icon" />
         <el-dropdown-menu>
+          this is test
           <el-dropdown-item v-if="curComponent&&editFilter.includes(curComponent.type)" icon="el-icon-edit-outline" @click.native="edit">{{ $t('panel.edit') }}</el-dropdown-item>
           <el-dropdown-item icon="el-icon-document-copy" @click.native="copy">{{ $t('panel.copy') }}</el-dropdown-item>
           <el-dropdown-item icon="el-icon-delete" @click.native="deleteComponent">{{ $t('panel.delete') }}</el-dropdown-item>
@@ -11,6 +12,7 @@
           <el-dropdown-item icon="el-icon-download" @click.native="bottomComponent">{{ $t('panel.bottomComponent') }}</el-dropdown-item>
           <el-dropdown-item icon="el-icon-arrow-up" @click.native="upComponent">{{ $t('panel.upComponent') }}</el-dropdown-item>
           <el-dropdown-item icon="el-icon-arrow-down" @click.native="downComponent">{{ $t('panel.downComponent') }}</el-dropdown-item>
+          <el-dropdown-item icon="el-icon-link" @click.native="linkageSetting">联动设置</el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
     </div>
@@ -119,6 +121,9 @@ export default {
     bottomComponent() {
       this.$store.commit('bottomComponent')
       this.$store.commit('recordSnapshot')
+    },
+    linkageSetting() {
+      this.$store.commit('setLinkageSettingStatus', true)
     }
   }
 }

frontend/src/store/index.js

@@ -48,7 +48,9 @@ const data = {
     // 点击画布时是否点中组件，主要用于取消选中组件用。
     // 如果没点中组件，并且在画布空白处弹起鼠标，则取消当前组件的选中状态
     isClickComponent: false,
-    canvasCommonStyleData: DEFAULT_COMMON_CANVAS_STYLE_STRING
+    canvasCommonStyleData: DEFAULT_COMMON_CANVAS_STYLE_STRING,
+    // 联动设置状态
+    linkageSettingStatus: false
   },
   mutations: {
     ...animation.mutations,
@@ -173,6 +175,10 @@ const data = {
         index = state.curComponentIndex
       }
       state.componentData.splice(index, 1)
+    },
+    setLinkageSettingStatus(state, status) {
+      state.linkageSettingStatus = status
+      console.log('linkageSettingStatus:', state.linkageSettingStatus)
     }
   },
   modules: {