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

Merge pull request #4022 from dataease/pr@dev@fix_table

Browse Source 
fix(视图): 修复明细表总数
This commit is contained in:
dataeaseShu 2022-12-06 14:55:05 +08:00 committed by GitHub
commit f27d46405a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,7 +67,7 @@
> >
{{ $t('chart.total') }} {{ $t('chart.total') }}
<span>{{ <span>{{
chart.datasetMode === 0 ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0) (chart.datasetMode === 0 && !not_support_page_dataset.includes(chart.datasourceType)) ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0)
}}</span> }}</span>
{{ $t('chart.items') }} {{ $t('chart.items') }}
</span> </span>
@ -173,7 +173,8 @@ export default {
}, },
totalStyle: { totalStyle: {
color: '#606266' color: '#606266'
} },
not_support_page_dataset: NOT_SUPPORT_PAGE_DATASET
} }
}, },

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

@ -55,7 +55,7 @@
> >
{{ $t('chart.total') }} {{ $t('chart.total') }}
<span>{{ <span>{{
chart.datasetMode === 0 ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0) (chart.datasetMode === 0 && !not_support_page_dataset.includes(chart.datasourceType)) ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0)
}}</span> }}</span>
{{ $t('chart.items') }} {{ $t('chart.items') }}
</span> </span>
@ -166,7 +166,8 @@ export default {
scrollBarHoverColor: DEFAULT_COLOR_CASE.tableScrollBarHoverColor, scrollBarHoverColor: DEFAULT_COLOR_CASE.tableScrollBarHoverColor,
totalStyle: { totalStyle: {
color: '#606266' color: '#606266'
} },
not_support_page_dataset: NOT_SUPPORT_PAGE_DATASET
} }
}, },
computed: { computed: {