Merge remote-tracking branch 'origin/master'

chuanyi_client2/src/components/CustomDialog/DataSourceItem.vue

@@ -971,5 +971,8 @@ export default {
 </script>
 
 <style scoped>
-
+.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
+    background-color: #90b9e1;
+    color: white;
+}
 </style>

chuanyi_client2/src/components/HeaderMain/index.vue

@@ -3109,4 +3109,8 @@ export default {
     left: calc(100% - 120px);
   }
 }
+.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
+  background-color: #90b9e1;
+  color:white;
+}
 </style>