Merge pull request #9882 from dataease/pr@dev-v2@fix_scrollbar

fix(仪表板): 修复div方式嵌入,滚动条样式设置和集成站点冲突,导致所有滚动条隐藏了
This commit is contained in:
王嘉豪 2024-05-27 14:20:25 +08:00 committed by GitHub
commit a798d7d50b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 18 additions and 22 deletions

View File

@ -322,11 +322,6 @@ defineExpose({
</template>
<style lang="less" scoped>
::-webkit-scrollbar {
width: 0px !important;
height: 0px !important;
}
.canvas-container {
background-size: 100% 100% !important;
width: 100%;
@ -334,6 +329,10 @@ defineExpose({
overflow-x: hidden;
overflow-y: auto;
position: relative;
::-webkit-scrollbar {
width: 0px !important;
height: 0px !important;
}
}
.fix-button {

View File

@ -467,11 +467,10 @@ defineExpose({
height: 100%;
overflow-y: auto !important;
position: relative;
}
::-webkit-scrollbar {
width: 0px !important;
height: 0px !important;
::-webkit-scrollbar {
width: 0px !important;
height: 0px !important;
}
}
:deep(.ol) {

View File

@ -1898,7 +1898,7 @@ export default {
yes: '是',
no: '否',
live_tips: '优先HTTPS链接',
stream_media_add_tips: '在右侧添加流媒体信息...',
stream_media_add_tips: '添加流媒体信息...',
stream_mobile_tips: 'IOS终端可能无法显示',
json_params_error: '第三方参数解析失败请检查参数格式是否正确',
inner_padding: '内边距',
@ -2136,8 +2136,8 @@ export default {
play_circle: '循环播放',
video_links: '视频链接',
web_url: '网页地址',
video_add_tips: '在右侧添加视频信息...',
link_add_tips_pre: '在右侧配置网页信息..',
video_add_tips: '配置视频信息...',
link_add_tips_pre: '配置网页信息..',
web_add_tips_suf: '添加网页信息...',
panel_view_result_show: '图表结果',
panel_view_result_tips: '选择{0}会覆盖图表的结果展示数量取值范围1~10000',

View File

@ -289,10 +289,9 @@ defineExpose({
width: 100%;
height: 100%;
}
}
&::-webkit-scrollbar {
display: none;
::-webkit-scrollbar {
display: none;
}
}
.render-active {

View File

@ -140,11 +140,6 @@ defineExpose({
</template>
<style lang="less">
::-webkit-scrollbar {
width: 0px !important;
height: 0px !important;
}
.content {
background-color: #ffffff;
width: 100%;
@ -152,5 +147,9 @@ defineExpose({
align-items: center;
overflow-x: hidden;
overflow-y: auto;
::-webkit-scrollbar {
width: 0px !important;
height: 0px !important;
}
}
</style>