style: 优化数据集设置里双滚动条问题

data-room-ui/packages/BigScreenDesign/index.vue

@@ -206,7 +206,6 @@ export default {
   },
   watch: {
     chartList (val) {
-      // console.log(val,this.activeCode)
       // if(val.findIndex(item=>item.code==this.activeCode)==-1){
       //   this.updateRightVisiable(false)
       // }

data-room-ui/packages/BizComponent/index.vue

@@ -350,7 +350,6 @@ export default {
       } catch (error) {
         console.info(error)
       }
-      console.log(dataUrl)
       if (dataUrl) {
         if (showSize(dataUrl) > 200) {
           const url = dataURLtoBlob(dataUrl)

data-room-ui/packages/DataSetManagement/src/index.vue

@@ -811,10 +811,12 @@ export default {
   padding-left: 16px !important;
 }
 .bs-pagination {
-  padding: 0 !important;
-  right: 16px !important;
-  bottom: 16px !important;
-  position: absolute !important;
+  margin-top: 4px;
+  padding-right: 16px;
+  // padding: 0 !important;
+  // right: 16px !important;
+  // bottom: 16px !important;
+  // position: absolute !important;
   ::v-deep .el-input__inner {
     width: 110px !important;
     border:none;

data-room-ui/packages/DataSetSetting/dataSetSetting.vue

@@ -195,13 +195,14 @@ export default {
 
 .data-set-wrap {
   ::v-deep .el-dialog__body {
-    position: relative;
+    height: 100% !important;
     padding: 0 !important;
+    min-width: 515px !important;
     // min-height: 550px;
-    overflow: hidden;
+    overflow: hidden !important;
 
     .bs-pagination {
-      position: relative !important;
+      position: none !important;
       padding-right: 16px !important;
     }
   }
@@ -245,7 +246,7 @@ export default {
     }
 
     ::v-deep .data-set-scrollbar {
-      height: 515px !important;
+      overflow-y: auto !important;
     }
   }
 }

data-room-ui/packages/DataSourceManagement/src/index.vue

@@ -325,10 +325,8 @@ export default {
 @import '../../assets/style/bsTheme.scss';
 
 .bs-pagination {
-  padding: 0 !important;
-  right: 16px !important;
-  bottom: 16px !important;
-  position: absolute !important;
+  margin-top: 4px;
+  padding-right: 16px;
   ::v-deep .el-input__inner {
 
     width: 110px !important;

data-room-ui/packages/DataSourceManagement/style/index.scss

@@ -148,7 +148,7 @@
 }
 .el-dialog {
   .bs-container {
-    max-height: calc(90vh - 236px);
+    // max-height: calc(90vh - 236px);
     .el-table {
       max-height: calc(90vh - 340px);
     }

data-room-ui/packages/assets/style/bsTheme.scss

@@ -303,7 +303,7 @@
   }
 
   ::v-deep .el-scrollbar {
-    height: 300px;
+    max-height: 440px !important;
     overflow-x: hidden !important;
 
     .el-scrollbar__view {

data-room-ui/packages/assets/style/common/index.scss

@@ -39,10 +39,10 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts";
 
     // page页样式
     .bs-pagination {
-      position: absolute;
-      right: 0;
-      bottom: 16px;
-      padding: 0 10px 0px 16px;
+      // position: absolute;
+      // right: 0;
+      // bottom: 16px;
+      padding-right: 16px;
     }
 
     //输入框样式
@@ -280,7 +280,7 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts";
 
   .el-dialog__body {
     padding: 16px !important;
-    max-height: calc(90vh - 165px) !important;
+    max-height: calc(90vh - 150px) !important;
     min-height: 200px;
     overflow-y: auto;
   }
@@ -333,5 +333,5 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts";
 }
 
 .el-dialog__footer{
-  padding: 16px !important;
+  padding: 12px 16px !important;
 }

data-room-ui/packages/assets/style/zTree/treePackUp.scss

@@ -137,5 +137,5 @@
 .right-box {
   width: 75%;
   margin-left: 16px;
-  position: relative;
+  // position: relative;
 }