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 { 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: { } } 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 { 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 @@ /> 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 { 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 {