From 4af2e6de1df88c7ab37325ec3b8eb8e9601c2538 Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Tue, 1 Aug 2023 15:19:36 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E4=BA=86=E5=85=B3?=
 =?UTF-8?q?=E4=BA=8E=E5=88=86=E9=A1=B5=E4=BD=8D=E7=BD=AE=EF=BC=8Cztree?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=AB=98=E5=BA=A6=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/example/main.js                         |  4 ++--
 .../BasicComponents/LinkChart/iframeDialog/index.vue |  5 ++++-
 data-room-ui/packages/BigScreenList/index.vue        |  9 +--------
 data-room-ui/packages/ComponentList/index.vue        | 11 ++---------
 .../DataSetManagement/src/CustomEditForm.vue         |  7 ++++---
 .../DataSetManagement/src/OriginalEditForm.vue       |  7 ++++---
 .../packages/DataSetManagement/src/index.vue         |  7 ++++---
 .../packages/DataSetSetting/dataSetSetting.vue       | 12 +++++++++++-
 .../packages/DataSourceManagement/src/index.vue      |  4 ++++
 data-room-ui/packages/SourceList/index.vue           | 11 ++---------
 data-room-ui/packages/assets/style/common/index.scss |  4 ++++
 .../packages/assets/style/zTree/treePackUp.scss      |  1 +
 12 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/data-room-ui/example/main.js b/data-room-ui/example/main.js
index 7629b38c..42b0b885 100644
--- a/data-room-ui/example/main.js
+++ b/data-room-ui/example/main.js
@@ -52,7 +52,7 @@ registerConfig(
       '--bs-el-color-primary-active': '64, 158, 255', // 主要激活 => rgba(64, 158, 255, 1) = #409EFF
       '--bs-el-border': 'transparent' // 边框颜色
     },
-    datasetAuth: ['unAdd', 'unEdit', 'unDelete'], // 数据集按钮权限 新增 编辑 删除
+    // datasetAuth: ['unAdd', 'unEdit', 'unDelete'], // 数据集按钮权限 新增 编辑 删除
     // datasetTypeList: ['original','custom'],
     // customPlots: [],
     // 远程组件列表
@@ -65,8 +65,8 @@ registerConfig(
 promise.polyfill()
 // 自定义指令
 Vue.use(ElementUI, { size: 'mini' })
-Vue.prototype.$dataRoomAxios = $dataRoomAxios
 Vue.config.productionTip = false
+Vue.prototype.$dataRoomAxios = $dataRoomAxios
 // 兼容ie下双向绑定事件
 Vue.prototype.inputChange = function (e) {
   return e.target.value
diff --git a/data-room-ui/packages/BasicComponents/LinkChart/iframeDialog/index.vue b/data-room-ui/packages/BasicComponents/LinkChart/iframeDialog/index.vue
index b6840217..f64a86bb 100644
--- a/data-room-ui/packages/BasicComponents/LinkChart/iframeDialog/index.vue
+++ b/data-room-ui/packages/BasicComponents/LinkChart/iframeDialog/index.vue
@@ -9,7 +9,10 @@
     class="bs-dialog-wrap bs-el-dialog"
     @close="close"
   >
-    <div class="el-dialog-div" :style="{height: dialogH}">
+    <div
+      class="el-dialog-div"
+      :style="{height: dialogH}"
+    >
       <iframe
         :src="url"
         width="100%"
diff --git a/data-room-ui/packages/BigScreenList/index.vue b/data-room-ui/packages/BigScreenList/index.vue
index 07895afd..69d14d3f 100644
--- a/data-room-ui/packages/BigScreenList/index.vue
+++ b/data-room-ui/packages/BigScreenList/index.vue
@@ -535,17 +535,10 @@ export default {
   }
 
   .footer-pagination-wrap {
-    // position: absolute;
-    // bottom: 16px;
-    // right: auto;
-    // display: flex;
-    // align-items: center;
-    // justify-content: flex-end;
     width: 100%;
     position: absolute;
     bottom: 16px;
-    right: 12px;
-    // padding: 0 16px;
+    right: 16px;
   }
 }
 
diff --git a/data-room-ui/packages/ComponentList/index.vue b/data-room-ui/packages/ComponentList/index.vue
index 0b7a389d..e6e2667b 100644
--- a/data-room-ui/packages/ComponentList/index.vue
+++ b/data-room-ui/packages/ComponentList/index.vue
@@ -650,17 +650,10 @@ export default {
   }
 
   .footer-pagination-wrap {
-    // position: absolute;
-    // bottom: 16px;
-    // right: 16px;
-    // display: flex;
-    // align-items: center;
-    // justify-content: flex-end;
-    // width: 100%;
+
     position: absolute;
     bottom: 16px;
-    right: 12px;
-    // padding: 0 16px;
+    right: 16px;
   }
 
   .error-img-text {
diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
index 5e7c464d..9ba7fe34 100644
--- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
@@ -1374,9 +1374,10 @@ export default {
 }
 
 .bs-pagination {
-  position: relative !important;
-  bottom: 0 !important;
-  padding: 0 12px 16px 16px !important;
+  padding: 0 !important;
+  right: 16px !important;
+  bottom: 16px !important;
+  position: absolute !important;
   ::v-deep .el-input__inner {
     width: 110px !important;
     border: none;
diff --git a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
index 91f70b95..5560a60f 100644
--- a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
@@ -1049,9 +1049,10 @@ export default {
 }
 
 .bs-pagination {
-  position: relative !important;
-  bottom: 0 !important;
-  padding: 0 12px 16px 16px !important;
+  padding: 0px !important;
+  right: 16px !important;
+  bottom: 16px !important;
+  position: absolute !important;
   ::v-deep .el-input__inner {
     width: 110px !important;
     border: none;
diff --git a/data-room-ui/packages/DataSetManagement/src/index.vue b/data-room-ui/packages/DataSetManagement/src/index.vue
index d2ae67f3..9da78106 100644
--- a/data-room-ui/packages/DataSetManagement/src/index.vue
+++ b/data-room-ui/packages/DataSetManagement/src/index.vue
@@ -716,9 +716,10 @@ export default {
   padding-left: 16px !important;
 }
 .bs-pagination {
-  position: relative !important;
-  bottom: 0 !important;
-  padding: 0 12px 16px 16px !important;
+  padding: 0 !important;
+  right: 16px !important;
+  bottom: 16px !important;
+  position: absolute !important;
   ::v-deep .el-input__inner {
     width: 110px !important;
     border:none;
diff --git a/data-room-ui/packages/DataSetSetting/dataSetSetting.vue b/data-room-ui/packages/DataSetSetting/dataSetSetting.vue
index 43ac2b04..bcb13e5d 100644
--- a/data-room-ui/packages/DataSetSetting/dataSetSetting.vue
+++ b/data-room-ui/packages/DataSetSetting/dataSetSetting.vue
@@ -207,7 +207,7 @@ export default {
     background-color: var(--bs-background-2) !important;
 
     .el-table {
-      max-height: calc(90vh - 380px);
+      max-height: calc(90vh - 340px);
     }
 
     .bs-table-box {
@@ -245,4 +245,14 @@ export default {
     }
   }
 }
+
+::v-deep .bs-pagination {
+  bottom: 5px !important;
+}
+
+::v-deep .left-box {
+  .el-scrollbar {
+    height: calc(100vh - 405px) !important;
+  }
+}
 </style>
diff --git a/data-room-ui/packages/DataSourceManagement/src/index.vue b/data-room-ui/packages/DataSourceManagement/src/index.vue
index 16b194dd..24eb5009 100644
--- a/data-room-ui/packages/DataSourceManagement/src/index.vue
+++ b/data-room-ui/packages/DataSourceManagement/src/index.vue
@@ -323,6 +323,10 @@ export default {
 @import '../../assets/style/bsTheme.scss';
 
 .bs-pagination {
+  padding: 0 !important;
+  right: 16px !important;
+  bottom: 16px !important;
+  position: absolute !important;
   ::v-deep .el-input__inner {
 
     width: 110px !important;
diff --git a/data-room-ui/packages/SourceList/index.vue b/data-room-ui/packages/SourceList/index.vue
index 6843ca00..6e1f16d6 100644
--- a/data-room-ui/packages/SourceList/index.vue
+++ b/data-room-ui/packages/SourceList/index.vue
@@ -554,16 +554,9 @@ export default {
   }
 
   .footer-pagination-wrap {
-    // position: absolute;
-    // bottom: 10px;
-    // display: flex;
-    // align-items: center;
-    // justify-content: flex-end;
-    // width: 100%;
-    position: absolute;
+    right: 16px;
     bottom: 16px;
-    right: 12px;
-    // padding: 0 16px;
+    position: absolute;
   }
 }
 
diff --git a/data-room-ui/packages/assets/style/common/index.scss b/data-room-ui/packages/assets/style/common/index.scss
index 49867155..026dca4e 100644
--- a/data-room-ui/packages/assets/style/common/index.scss
+++ b/data-room-ui/packages/assets/style/common/index.scss
@@ -330,3 +330,7 @@ $--font-path: "~element-ui/lib/theme-chalk/fonts";
   background: rgba(144, 147, 153, 0.3) !important;
   background-color: rgba(144, 147, 153, 0.3) !important;
 }
+
+.el-dialog__footer{
+  padding: 16px !important;
+}
diff --git a/data-room-ui/packages/assets/style/zTree/treePackUp.scss b/data-room-ui/packages/assets/style/zTree/treePackUp.scss
index ff4305bc..53632f68 100644
--- a/data-room-ui/packages/assets/style/zTree/treePackUp.scss
+++ b/data-room-ui/packages/assets/style/zTree/treePackUp.scss
@@ -137,4 +137,5 @@
 .right-box {
   width: 75%;
   margin-left: 16px;
+  position: relative;
 }