lizhijie429
/
tiny-engine
forked from opentiny/tiny-engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(pluginMaterial): fix block list can't scroll when visible in canvas (#77)

This commit is contained in:
chilingling 2023-11-14 03:41:16 -08:00 committed by GitHub
parent aaa83ba162
commit ed0b8a3073
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/canvas/src/components/container/CanvasContainer.vue
View File

@ -223,16 +223,19 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.insert-panel { .insert-panel {
z-index: 1; z-index: 4;
position: fixed; position: fixed;
top: 200px; top: 200px;
left: 400px; left: 400px;
width: 480px; width: 480px;
:deep(.components-wrap) { :deep(.components-wrap) {
& > .tiny-collapse { & > .tiny-collapse {
height: 300px; max-height: 300px;
} }
} }
:deep(#pane-blocks) {
max-height: 400px;
}
} }
.datainit-tip { .datainit-tip {
display: flex; display: flex;

10
packages/plugins/materials/src/Main.vue
View File

@ -90,7 +90,10 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.tiny-tabs { .tiny-tabs {
height: calc(100% - 48px); display: flex;
flex-direction: column;
flex: 1;
overflow-y: auto;
} }
:deep(.tiny-tabs__header) { :deep(.tiny-tabs__header) {
@ -98,7 +101,8 @@ export default {
} }
:deep(.tiny-tabs__content) { :deep(.tiny-tabs__content) {
height: calc(100% - 48px); flex: 1;
overflow-y: scroll;
padding: 0; padding: 0;
& > div { & > div {
height: 100%; height: 100%;
@ -106,7 +110,7 @@ export default {
} }
.tiny-collapse { .tiny-collapse {
height: calc(100% - 56px); flex: 1;
overflow-y: scroll; overflow-y: scroll;
} }
</style> </style>

4
packages/plugins/materials/src/component/Main.vue
View File

@ -117,6 +117,8 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.components-wrap { .components-wrap {
height: 100%; height: 100%;
display: flex;
flex-direction: column;
.tiny-search { .tiny-search {
padding: 12px 8px; padding: 12px 8px;
@ -164,7 +166,7 @@ export default {
} }
.tiny-collapse { .tiny-collapse {
height: calc(100% - 56px); flex: 1;
overflow-y: scroll; overflow-y: scroll;
.tiny-collapse-item.is-active + .tiny-collapse-item { .tiny-collapse-item.is-active + .tiny-collapse-item {
margin-top: 0; margin-top: 0;