From 31c67cebb6f44edaae9ae8820556f70588df812b Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Wed, 19 Jul 2023 14:26:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=BA=E5=AE=9A=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=9D=A1=E7=9A=84=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BigScreenComponentMag/SideMenu.vue        |   2 +-
 .../packages/BigScreenMag/SideMenu.vue        |   2 +-
 .../src/StoredProcedureEditForm.vue           |  11 +-
 data-room-ui/packages/SourceMag/SideMenu.vue  |   2 +-
 .../packages/assets/style/common/index.scss   | 318 +++++++++---------
 5 files changed, 167 insertions(+), 168 deletions(-)

diff --git a/data-room-ui/packages/BigScreenComponentMag/SideMenu.vue b/data-room-ui/packages/BigScreenComponentMag/SideMenu.vue
index 5b8c24bd..99ec3c37 100644
--- a/data-room-ui/packages/BigScreenComponentMag/SideMenu.vue
+++ b/data-room-ui/packages/BigScreenComponentMag/SideMenu.vue
@@ -117,7 +117,7 @@ export default {
         position: relative;
         background-color: rgba(var(--bs-el-color-primary-active), 0.4);
         color: var(--bs-el-text);
-        &::after{
+        &::before{
           content: '';
           position: absolute;
           left: 0;
diff --git a/data-room-ui/packages/BigScreenMag/SideMenu.vue b/data-room-ui/packages/BigScreenMag/SideMenu.vue
index 96c572f7..0dc7f22b 100644
--- a/data-room-ui/packages/BigScreenMag/SideMenu.vue
+++ b/data-room-ui/packages/BigScreenMag/SideMenu.vue
@@ -314,7 +314,7 @@ export default {
         position: relative;
         background-color: rgba(var(--bs-el-color-primary-active), 0.4);
         color: var(--bs-el-text);
-        &::after{
+        &::before{
           content: '';
           position: absolute;
           left: 0;
diff --git a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
index 66b8cced..beb58b47 100644
--- a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue
@@ -159,7 +159,7 @@
                   <label-select
                     :dataset-id="datasetId"
                     :id-list="dataForm.labelIds"
-                    @commit="(ids) =>{dataForm.labelIds = ids}"
+                    @commit="(ids) => { dataForm.labelIds = ids }"
                   />
                 </el-form-item>
               </el-col>
@@ -178,9 +178,7 @@
               />
               <div class="bs-codemirror-bottom-text">
                 示例：
-                <strong>call 存储过程名称(<span
-                  style="color: red;"
-                >${参数名称}</span>,?)</strong>
+                <strong>call 存储过程名称(<span style="color: red;">${参数名称}</span>,?)</strong>
               </div>
             </div>
             <div style="text-align: center; padding: 16px 0;">
@@ -219,8 +217,9 @@
                   <span>{{ param.name }}</span>&nbsp;<span
                     v-show="param.remark"
                     style="color: #909399;"
-                  >({{ param.remark
-                  }})</span>
+                  >
+                    ({{ param.remark }})
+                  </span>
                   <el-button
                     class="edit_field"
                     type="text"
diff --git a/data-room-ui/packages/SourceMag/SideMenu.vue b/data-room-ui/packages/SourceMag/SideMenu.vue
index e58c1f06..c510b4a8 100644
--- a/data-room-ui/packages/SourceMag/SideMenu.vue
+++ b/data-room-ui/packages/SourceMag/SideMenu.vue
@@ -345,7 +345,7 @@ export default {
       position: relative;
       background-color: rgba(var(--bs-el-color-primary-active), 0.4);
       color: var(--bs-el-text);
-      &::after{
+      &::before{
           content: '';
           position: absolute;
           left: 0;
diff --git a/data-room-ui/packages/assets/style/common/index.scss b/data-room-ui/packages/assets/style/common/index.scss
index b49b847f..6ecca7d1 100644
--- a/data-room-ui/packages/assets/style/common/index.scss
+++ b/data-room-ui/packages/assets/style/common/index.scss
@@ -1,7 +1,7 @@
 /* theme color */
 
 /* icon font path, required */
-$--font-path: '~element-ui/lib/theme-chalk/fonts';
+$--font-path: "~element-ui/lib/theme-chalk/fonts";
 
 @import "~element-ui/packages/theme-chalk/src/index";
 // 布局样式
@@ -85,7 +85,6 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts';
       font-size: 12px;
     }
   }
-
 }
 //表格样式
 
@@ -99,7 +98,6 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts';
     background-color: transparent !important;
     border: 1px solid #e4e4e4 !important;
 
-
     th > .cell {
       padding-left: 14px !important;
     }
@@ -141,188 +139,190 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts';
       background: #f5f5f5;
     }
 
-    .el-table th, .el-table td {
+    .el-table th,
+    .el-table td {
       padding: 8px 0 !important;
     }
 
-        // th.is-leaf {
-        //   border-bottom: 2px solid var(--bs-el-color-primary) !important;
-        // }
-
-        /* 滚动条样式设置*/
-        .el-table__body-wrapper::-webkit-scrollbar {
-          width: 12px !important;
-          height: 12px !important;
-        }
+    // th.is-leaf {
+    //   border-bottom: 2px solid var(--bs-el-color-primary) !important;
+    // }
 
-        .el-table__body-wrapper::-webkit-scrollbar-corner {
-          background: transparent !important;
-        }
+    /* 滚动条样式设置*/
+    .el-table__body-wrapper::-webkit-scrollbar {
+      width: 12px !important;
+      height: 12px !important;
+    }
 
-        .el-table__body-wrapper::-webkit-scrollbar-track {
-          border-radius: 10px !important;
-        }
+    .el-table__body-wrapper::-webkit-scrollbar-corner {
+      background: transparent !important;
+    }
 
-        .el-table__body-wrapper::-webkit-scrollbar-thumb {
-          min-height: 20px !important;
-          background-clip: content-box !important;
-          border: 2px solid transparent !important;
-          border-radius: 10px !important;
-          // background-color: #ddd;
-        }
+    .el-table__body-wrapper::-webkit-scrollbar-track {
+      border-radius: 10px !important;
+    }
 
-        .el-table__fixed::before,
-        .el-table__fixed-right::before {
-          display: none !important;
-        }
-      }
+    .el-table__body-wrapper::-webkit-scrollbar-thumb {
+      min-height: 20px !important;
+      background-clip: content-box !important;
+      border: 2px solid transparent !important;
+      border-radius: 10px !important;
+      // background-color: #ddd;
+    }
 
-      // 全局表格内部button行样式
+    .el-table__fixed::before,
+    .el-table__fixed-right::before {
+      display: none !important;
+    }
+  }
 
-      .el-table .cell {
-        line-height: 22px;
-      }
+  // 全局表格内部button行样式
 
-      .cell .el-button {
-        padding: 5px 8px !important;
-      }
+  .el-table .cell {
+    line-height: 22px;
+  }
 
+  .cell .el-button {
+    padding: 5px 8px !important;
+  }
+}
+//分页样式
+.bs-pagination {
+  .el-pagination.is-background .btn-prev,
+  .el-pagination.is-background .btn-next,
+  .el-pagination.is-background .el-pager li {
+    color: #bfbfbf;
+    background-color: var(--bs-el-background-2);
+
+    &:hover {
+      color: var(--bs-el-text);
+      background-color: var(--bs-el-color-primary);
     }
-    //分页样式
-    .bs-pagination {
-      .el-pagination.is-background .btn-prev,
-      .el-pagination.is-background .btn-next,
-      .el-pagination.is-background .el-pager li {
-        color: #bfbfbf;
-        background-color: var(--bs-el-background-2);
-
-        &:hover {
-          color: var(--bs-el-text);
-          background-color: var(--bs-el-color-primary);
-        }
-      }
-
-      .el-pagination.is-background .btn-prev:disabled,
-      .el-pagination.is-background .btn-next:disabled {
-        color: #bfbfbf;
-        background-color: var(--bs-el-background-2);
-      }
-
-      .el-pagination__total {
-        color: #bfbfbf;
-      }
+  }
 
-      .el-pagination .el-select .el-input .el-input__inner {
-        color: #bfbfbf;
+  .el-pagination.is-background .btn-prev:disabled,
+  .el-pagination.is-background .btn-next:disabled {
+    color: #bfbfbf;
+    background-color: var(--bs-el-background-2);
+  }
 
-        &:hover {
-          color: var(--bs-el-color-primary);
-        }
-      }
+  .el-pagination__total {
+    color: #bfbfbf;
+  }
 
-      .el-pagination {
-        text-align: right !important;
-        font-weight: normal !important;
-      }
+  .el-pagination .el-select .el-input .el-input__inner {
+    color: #bfbfbf;
 
-      .el-pager li {
-        padding: 0 !important;
-        min-width: 32px !important;
-        height: 32px !important;
-        line-height: 32px !important;
-        border-radius: 2px !important;
-      }
+    &:hover {
+      color: var(--bs-el-color-primary);
+    }
+  }
 
-      .el-pager li:not(.disabled).active {
-        background-color: var(--bs-el-color-primary) !important;
-      }
+  .el-pagination {
+    text-align: right !important;
+    font-weight: normal !important;
+  }
 
-      .el-pagination span:not([class*=suffix]), .el-pagination button {
-        font-size: 14px !important;
-        min-width: 0 !important;
-        height: 32px !important;
-        line-height: 32px !important;
-      }
+  .el-pager li {
+    padding: 0 !important;
+    min-width: 32px !important;
+    height: 32px !important;
+    line-height: 32px !important;
+    border-radius: 2px !important;
+  }
 
-      .el-pagination .el-input--mini .el-input__inner {
-        height: 32px !important;
-        line-height: 32px !important;
-      }
+  .el-pager li:not(.disabled).active {
+    background-color: var(--bs-el-color-primary) !important;
+  }
 
-      .el-pagination__editor.el-input .el-input__inner {
-        height: 32px !important;
-      }
+  .el-pagination span:not([class*="suffix"]),
+  .el-pagination button {
+    font-size: 14px !important;
+    min-width: 0 !important;
+    height: 32px !important;
+    line-height: 32px !important;
+  }
 
-    }
+  .el-pagination .el-input--mini .el-input__inner {
+    height: 32px !important;
+    line-height: 32px !important;
+  }
 
-    /*解决el-scroll底部出现空白滚动条*/
-    .el-scrollbar__wrap {
-      overflow-x: hidden !important;
-    }
+  .el-pagination__editor.el-input .el-input__inner {
+    height: 32px !important;
+  }
+}
 
+/*解决el-scroll底部出现空白滚动条*/
+.el-scrollbar__wrap {
+  overflow-x: hidden !important;
+}
 
+// dialog设置
+.bs-dialog-wrap {
+  .el-select {
+    display: inline-block !important;
+    position: relative !important;
+    width: auto !important;
+  }
+  .el-dialog {
+    margin-top: 13vh !important;
+    margin-bottom: 0 !important;
+  }
+  .el-dialog__wrapper {
+    overflow: hidden !important;
+  }
 
-    // dialog设置
-    .bs-dialog-wrap {
-      .el-select{
-        display: inline-block !important;
-        position: relative !important;
-        width: auto !important;
-      }
-      .el-dialog{
-        margin-top: 13vh !important;
-        margin-bottom: 0 !important;
-      }
-      .el-dialog__wrapper {
-        overflow: hidden !important;
-      }
+  .el-dialog__body {
+    padding: 18px 24px !important;
+    max-height: calc(90vh - 170px) !important;
+    min-height: 200px;
+    overflow-y: auto;
+  }
 
-      .el-dialog__body {
-        padding: 18px 24px !important;
-        max-height: calc(90vh - 170px) !important;
-        min-height: 200px;
-        overflow-y: auto;
-      }
+  // dialog头部
+  .el-dialog__header {
+    background: #f5f5f5;
+    background-color: #f5f5f5;
+    padding: 0 !important;
+    height: 40px;
+    line-height: 40px;
+    font-size: 15px;
+    font-weight: 700;
+
+    .el-dialog__headerbtn {
+      position: absolute;
+      top: 10px;
+      right: 20px;
+      padding: 0;
+      background: 0 0;
+      border: none;
+      outline: 0;
+      cursor: pointer;
+      font-size: 16px;
+    }
+  }
 
-      // dialog头部
-      .el-dialog__header {
-        background: #f5f5f5;
-        background-color: #F5F5F5;
-        padding: 0 !important;
-        height: 40px;
-        line-height: 40px;
-        font-size: 15px;
-        font-weight: 700;
-
-        .el-dialog__headerbtn {
-          position: absolute;
-          top: 10px;
-          right: 20px;
-          padding: 0;
-          background: 0 0;
-          border: none;
-          outline: 0;
-          cursor: pointer;
-          font-size: 16px;
-        }
-      }
+  .el-dialog__title {
+    display: inline-block;
+    font-size: 16px;
+    position: relative;
+    padding-left: 20px;
+    border-left: none !important;
+  }
 
-      .el-dialog__title {
-        display: inline-block;
-        font-size: 16px;
-        position: relative;
-        padding-left: 20px;
-        border-left: none !important;
-      }
-      
-      .el-dialog__title::before {
-          content: "" !important;
-          height: 16px !important;
-          position: absolute !important;
-          left: 0 !important;
-          top: 50% !important;
-          transform: translateY(-50%) !important;
-          border-left: 4px solid var(--bs-el-color-primary) !important;
-        }
-    }
+  .el-dialog__title::before {
+    content: "" !important;
+    height: 16px !important;
+    position: absolute !important;
+    left: 0 !important;
+    top: 50% !important;
+    transform: translateY(-50%) !important;
+    border-left: 4px solid var(--bs-el-color-primary) !important;
+  }
+}
 
+.el-scrollbar__thumb {
+  background: rgba(144, 147, 153, 0.3) !important;
+  background-color: rgba(144, 147, 153, 0.3) !important;
+}