Merge pull request #95 from jumpserver/dev

v4.10.0

Author: baijiangjie

frontend/src/components/Main/Explore/DataView/DataView.vue

@@ -1,8 +1,14 @@
 <template>
-  <div id="doc" v-loading="state.loading" class="data-view" @contextmenu.prevent="preventDefaultContextMenu">
-    <RightMenu ref="rightMenu" :menus="menus" />
-    <ExportDataDialog :visible.sync="exportDataDialogVisible" @submit="onExportSubmit" />
-    <Toolbar :items="iToolBarItems" />
+  <div
+    id="doc"
+    v-loading="state.loading"
+    class="data-view"
+    @contextmenu.prevent="preventDefaultContextMenu"
+    style="z-index: 99;position: relative"
+  >
+    <RightMenu ref="rightMenu" :menus="menus"/>
+    <ExportDataDialog :visible.sync="exportDataDialogVisible" @submit="onExportSubmit"/>
+    <Toolbar :items="iToolBarItems"/>
     <AgGridVue
       :rowData="rowData"
       :columnDefs="colDefs"

frontend/src/components/Main/Explore/QueryConsole/CodeEditor.vue

@@ -133,7 +133,7 @@ export default {
           'Ctrl-Enter': (cm) => {
             this.onRun()
           },
-          'Ctrl-C': (cm) => {
+          'Ctrl-D': (cm) => {
             this.onStop()
           },
           'Ctrl-S': (cm) => {

frontend/src/components/Main/ResourceManage/index.vue

@@ -1,12 +1,12 @@
 <template>
-  <div class="container">
+  <div class="container" style="z-index: 99;position: relative">
     <div class="toolbar-panel">
       <TreeNavbar
         :title="$tc('DatabaseExplorer')"
       />
     </div>
     <div class="tree-panel">
-      <tree />
+      <tree/>
     </div>
   </div>
 </template>

frontend/src/styles/index.scss

@@ -27,6 +27,7 @@ body {
 .splitter-pane-resizer {
   opacity: 1;
   background-color: $framework-border-color;
+  z-index: 1 !important;
 }
 
 .icon-chen-first_page,
@@ -138,7 +139,7 @@ body {
     border-right: none;
   }
 
-  & >  .el-cascader-menu__wrap {
+  & > .el-cascader-menu__wrap {
     height: initial !important;
   }
 
@@ -453,6 +454,7 @@ body {
 
     & > .relative {
       font-weight: 600;
+
       & > .colHeader.columnSorting.ascending::before,
       & > .colHeader.columnSorting.descending::before {
         filter: invert(35%) sepia(67%) saturate(1363%) hue-rotate(197deg) brightness(85%) contrast(92%);
@@ -505,6 +507,7 @@ body {
 .text-danger {
   color: #FF0000;
 }
+
 .text-warning {
   color: #FFFF00
 }