center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

refactor(视图): 优化符号地图对公共组件样式的适配 (#2588)

Browse Source 
Co-authored-by: wangjiahao <1522128093@qq.com>
This commit is contained in:
fit2cloudrd 2022-07-05 17:23:11 +08:00 committed by GitHub
parent 94fecaafa1
commit bb51c676d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
View File

@ -24,6 +24,7 @@
:is="config.component" :is="config.component"
v-else v-else
ref="wrapperChild" ref="wrapperChild"
class="component"
:out-style="config.style" :out-style="config.style"
:style="getComponentStyleDefault(config.style)" :style="getComponentStyleDefault(config.style)"
:prop-value="config.propValue" :prop-value="config.propValue"
@ -268,4 +269,7 @@ export default {
.main_view{ .main_view{
background-size: 100% 100%!important; background-size: 100% 100%!important;
} }
.component{
position: relative;
}
</style> </style>

1
frontend/src/components/canvas/components/Editor/index.vue
View File

@ -1681,6 +1681,7 @@ export default {
outline: none; outline: none;
width: 100%; width: 100%;
height: 100%; height: 100%;
position: relative;
} }
} }

2
frontend/src/views/background/index.vue
View File

@ -12,7 +12,7 @@
<span class="params-title">{{ $t('panel.inner_padding') }}</span> <span class="params-title">{{ $t('panel.inner_padding') }}</span>
</el-col> </el-col>
<el-col :span="15"> <el-col :span="15">
<el-slider v-model="curComponent.commonBackground.innerPadding" show-input :show-input-controls="false" input-size="mini" :max="15" /> <el-slider v-model="curComponent.commonBackground.innerPadding" show-input :show-input-controls="false" input-size="mini" :max="50" />
</el-col> </el-col>
</el-row> </el-row>
<el-row style="height: 50px;overflow: hidden"> <el-row style="height: 50px;overflow: hidden">

2
frontend/src/views/chart/components/ChartComponentS2.vue
View File

@ -389,7 +389,7 @@ export default {
this.myChart.store.set('scrollY', this.scrollTop) this.myChart.store.set('scrollY', this.scrollTop)
this.myChart.render() this.myChart.render()
if (senior.scrollCfg && senior.scrollCfg.open && (this.chart.type === 'table-normal' || (this.chart.type === 'table-info' && !this.showPage))) { if (senior && senior.scrollCfg && senior.scrollCfg.open && (this.chart.type === 'table-normal' || (this.chart.type === 'table-info' && !this.showPage))) {
const rowHeight = customAttr.size.tableItemHeight const rowHeight = customAttr.size.tableItemHeight
const headerHeight = customAttr.size.tableTitleHeight const headerHeight = customAttr.size.tableTitleHeight

2
frontend/src/views/chart/components/table/TableNormal.vue
View File

@ -387,7 +387,7 @@ export default {
}) })
}, 0) }, 0)
if (senior.scrollCfg && senior.scrollCfg.open && (this.chart.type === 'table-normal' || (this.chart.type === 'table-info' && !this.showPage))) { if (senior && senior.scrollCfg && senior.scrollCfg.open && (this.chart.type === 'table-normal' || (this.chart.type === 'table-info' && !this.showPage))) {
let rowHeight = customAttr.size.tableItemHeight let rowHeight = customAttr.size.tableItemHeight
if (rowHeight < 36) { if (rowHeight < 36) {
rowHeight = 36 rowHeight = 36