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

fix(图表): 修复明细表分页模式切换可能无法显示的问题

Browse Source
This commit is contained in:
ulleo 2024-06-13 16:37:57 +08:00
parent 7f04568fb8
commit 78a176e4fc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
View File

@ -734,7 +734,7 @@ onMounted(() => {
</el-radio-group>
</el-form-item>
<el-form-item
v-if="showProperty('tablePageMode')"
v-if="showProperty('tablePageMode') && state.basicStyleForm.tablePageMode !== 'pull'"
:label="t('chart.table_pager_style')"
class="form-item"
:class="'form-item-' + themes"

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

@ -181,7 +181,7 @@ const setupPage = (chart: ChartObj, resetPageInfo?: boolean) => {
}
const pageInfo = state.pageInfo
pageInfo.pageSize = customAttr.basicStyle.tablePageSize ?? 20
if (state.totalItems > state.pageInfo.pageSize) {
if (state.totalItems > state.pageInfo.pageSize || state.pageStyle !== 'general') {
pageInfo.total = state.totalItems
state.showPage = true
} else {