From 46b8e06a1335153c287a7ee23d807e24c91caedd Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Wed, 5 Jul 2023 10:46:43 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E4=BF=AE=E6=94=B9=E6=95=B4=E4=BD=93?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=EF=BC=8C=E5=B9=B6=E4=BF=AE=E5=A4=8D=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=BA=93=E6=90=9C=E7=B4=A2=E5=A4=B1=E6=95=88=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/package.json                       |  2 +-
 .../BigScreenComponentMag/MenuContent.vue       |  2 +-
 .../packages/BigScreenComponentMag/index.vue    |  6 ++++--
 data-room-ui/packages/BigScreenList/index.vue   |  3 ++-
 .../packages/BigScreenMag/MenuContent.vue       |  2 +-
 data-room-ui/packages/BigScreenMag/index.vue    |  4 +++-
 .../packages/BigScreenTempMag/index.vue         |  2 ++
 data-room-ui/packages/ComponentList/index.vue   | 17 +++++++++++------
 .../Layout/BigScreenHomeLayout/index.vue        |  4 +---
 data-room-ui/packages/SourceList/index.vue      |  4 +++-
 data-room-ui/packages/SourceMag/MenuContent.vue |  2 +-
 data-room-ui/packages/SourceMag/index.vue       |  4 +++-
 .../packages/SourceManagement/index.vue         |  4 +++-
 13 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/data-room-ui/package.json b/data-room-ui/package.json
index 045ff907..0d9df1ca 100644
--- a/data-room-ui/package.json
+++ b/data-room-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gcpaas/data-room-ui",
-  "version": "0.0.1-2023070402-Alpha",
+  "version": "0.0.1-2023070501-Alpha",
   "description": "自定义大屏",
   "author": "gc-starter",
   "license": "MIT",
diff --git a/data-room-ui/packages/BigScreenComponentMag/MenuContent.vue b/data-room-ui/packages/BigScreenComponentMag/MenuContent.vue
index 87266cdf..daf66ef6 100644
--- a/data-room-ui/packages/BigScreenComponentMag/MenuContent.vue
+++ b/data-room-ui/packages/BigScreenComponentMag/MenuContent.vue
@@ -27,6 +27,6 @@ export default {
 <style lang="scss" scoped>
 .right-screen-list-wrap {
   width: 100%;
-  // padding-bottom: 16px;
+  height: 100%;
 }
 </style>
diff --git a/data-room-ui/packages/BigScreenComponentMag/index.vue b/data-room-ui/packages/BigScreenComponentMag/index.vue
index c70f670d..18e6b943 100644
--- a/data-room-ui/packages/BigScreenComponentMag/index.vue
+++ b/data-room-ui/packages/BigScreenComponentMag/index.vue
@@ -17,14 +17,16 @@ export default {
     }
   },
   mounted () { },
-  methods: {}
+  methods: { }
 }
 </script>
 
 <style lang="scss" scoped>
 .bs-manage-main-wrap {
-  display: flex;
+  position: relative;
+  width: 100%;
   height: 100%;
+  display: flex;
   background-color: var(--bs-background-1);
   // padding-top: 16px;
 }
diff --git a/data-room-ui/packages/BigScreenList/index.vue b/data-room-ui/packages/BigScreenList/index.vue
index 1a8a67b5..66c72107 100644
--- a/data-room-ui/packages/BigScreenList/index.vue
+++ b/data-room-ui/packages/BigScreenList/index.vue
@@ -341,7 +341,8 @@ export default {
     overflow: auto;
     // 间隙自适应
     justify-content: space-around;
-    max-height: calc(100vh - 304px);
+    // max-height: calc(100vh - 304px);
+    height: calc(100% - 96px);
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
     grid-gap: 15px;
diff --git a/data-room-ui/packages/BigScreenMag/MenuContent.vue b/data-room-ui/packages/BigScreenMag/MenuContent.vue
index 2ec73b49..6e39960a 100644
--- a/data-room-ui/packages/BigScreenMag/MenuContent.vue
+++ b/data-room-ui/packages/BigScreenMag/MenuContent.vue
@@ -35,6 +35,6 @@ export default {
 <style lang="scss" scoped>
 .right-screen-list-wrap {
   width: 100%;
-  // padding-bottom: 16px;
+  height: 100%;
 }
 </style>
diff --git a/data-room-ui/packages/BigScreenMag/index.vue b/data-room-ui/packages/BigScreenMag/index.vue
index 03d20275..3e88487c 100644
--- a/data-room-ui/packages/BigScreenMag/index.vue
+++ b/data-room-ui/packages/BigScreenMag/index.vue
@@ -45,8 +45,10 @@ export default {
 
 <style lang="scss" scoped>
 .bs-manage-main-wrap {
-  display: flex;
+  position: relative;
+  width: 100%;
   height: 100%;
+  display: flex;
   background-color: var(--bs-background-1);
   // padding-top: 16px;
 }
diff --git a/data-room-ui/packages/BigScreenTempMag/index.vue b/data-room-ui/packages/BigScreenTempMag/index.vue
index 5fff77bd..ff08d76b 100644
--- a/data-room-ui/packages/BigScreenTempMag/index.vue
+++ b/data-room-ui/packages/BigScreenTempMag/index.vue
@@ -26,5 +26,7 @@ export default {
 <style lang="scss" scoped>
   .bs-template-mag-wrap{
     height: 100%;
+    width: 100%;
+    position: relative;
   }
 </style>
diff --git a/data-room-ui/packages/ComponentList/index.vue b/data-room-ui/packages/ComponentList/index.vue
index e2185dff..72bd8382 100644
--- a/data-room-ui/packages/ComponentList/index.vue
+++ b/data-room-ui/packages/ComponentList/index.vue
@@ -18,7 +18,7 @@
         />
       </el-select>
       <el-input
-        v-model="name"
+        v-model="searchKey"
         class="bs-el-input"
         placeholder="请输入组件名称"
         prefix-icon="el-icon-search"
@@ -248,7 +248,11 @@ export default {
   },
   methods: {
     reset () {
-      this.name = ''
+      this.searchKey = ''
+      this.current = 1
+      this.size = 10
+      this.catalogCode = ''
+      this.init()
     },
     init () {
       if (this.catalogInfo !== 'system') {
@@ -268,7 +272,7 @@ export default {
         this.getDataList()
       } else {
         const arr = [...innerRemoteComponents, ...getRemoteComponents()]
-        this.list = arr?.filter((item) => item.title.indexOf(this.name) !== -1)
+        this.list = arr?.filter((item) => item.title.indexOf(this.searchKey) !== -1)
       }
     },
     catalogManage () {
@@ -303,8 +307,8 @@ export default {
         get('/bigScreen/bizComponent/page', {
           current: this.current,
           size: this.size,
-          searchKey: this.searchKey,
-          name: this.name,
+          // searchKey: this.searchKey,
+          name: this.searchKey,
           type: this.catalogCode || null
         })
           .then((data) => {
@@ -453,7 +457,8 @@ export default {
     overflow: auto;
     // 间隙自适应
     justify-content: space-around;
-    max-height: calc(100vh - 304px);
+    // max-height: calc(100vh - 304px);
+    height: calc(100% - 96px);
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
     grid-gap: 15px;
diff --git a/data-room-ui/packages/Layout/BigScreenHomeLayout/index.vue b/data-room-ui/packages/Layout/BigScreenHomeLayout/index.vue
index 78b8c920..23fb7638 100644
--- a/data-room-ui/packages/Layout/BigScreenHomeLayout/index.vue
+++ b/data-room-ui/packages/Layout/BigScreenHomeLayout/index.vue
@@ -103,9 +103,7 @@ export default {
   box-sizing: border-box;
 }
 .big-screen-home-wrap {
-  position: relative;
-  overflow: hidden;
-  height: 100vh;
+  height: 100%;
 
   .big-screen-home-wrap-top {
     position: absolute;
diff --git a/data-room-ui/packages/SourceList/index.vue b/data-room-ui/packages/SourceList/index.vue
index 8dcf732f..51e9c811 100644
--- a/data-room-ui/packages/SourceList/index.vue
+++ b/data-room-ui/packages/SourceList/index.vue
@@ -328,6 +328,7 @@ export default {
 .big-screen-list-wrap {
   position: relative;
   height: 100%;
+  // height: calc(100% - 16px);
   padding: 16px;
   color: #9ea9b2;
   // margin:0 16px;
@@ -361,7 +362,8 @@ export default {
     overflow: auto;
     // 间隙自适应
     justify-content: space-around;
-    max-height: calc(100vh - 304px);
+    // max-height: calc(100vh - 304px);
+    height: calc(100% - 96px);
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
     grid-gap: 15px;
diff --git a/data-room-ui/packages/SourceMag/MenuContent.vue b/data-room-ui/packages/SourceMag/MenuContent.vue
index c35bec19..7aabf341 100644
--- a/data-room-ui/packages/SourceMag/MenuContent.vue
+++ b/data-room-ui/packages/SourceMag/MenuContent.vue
@@ -33,6 +33,6 @@ export default {
 <style lang="scss" scoped>
 .right-screen-list-wrap {
   width: 100%;
-  // padding-bottom: 16px;
+  height: 100%;
 }
 </style>
diff --git a/data-room-ui/packages/SourceMag/index.vue b/data-room-ui/packages/SourceMag/index.vue
index 1a8b5e7a..0db12775 100644
--- a/data-room-ui/packages/SourceMag/index.vue
+++ b/data-room-ui/packages/SourceMag/index.vue
@@ -42,8 +42,10 @@ export default {
 
 <style lang="scss" scoped>
 .bs-manage-main-wrap {
-  display: flex;
+  position: relative;
+  width: 100%;
   height: 100%;
+  display: flex;
   background-color: var(--bs-background-1);
   // padding-top: 16px;
 }
diff --git a/data-room-ui/packages/SourceManagement/index.vue b/data-room-ui/packages/SourceManagement/index.vue
index 00bad8d0..126acf3a 100644
--- a/data-room-ui/packages/SourceManagement/index.vue
+++ b/data-room-ui/packages/SourceManagement/index.vue
@@ -14,7 +14,7 @@ export default {
   data () {
     return {}
   },
-  mounted () {},
+  mounted () { },
   methods: {}
 }
 </script>
@@ -22,5 +22,7 @@ export default {
 <style lang="scss" scoped>
 .bs-template-mag-wrap {
   height: 100%;
+  width: 100%;
+  position: relative;
 }
 </style>