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:
junjun 2022-12-28 12:49:31 +08:00
parent 92044889c2
commit f64ebd65ab
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,8 +67,8 @@
> >
{{ $t('chart.total') }} {{ $t('chart.total') }}
<span>{{ <span>{{
(chart.datasetMode === 0 && !not_support_page_dataset.includes(chart.datasourceType)) ? 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>
<de-pagination <de-pagination
@ -351,9 +351,9 @@ export default {
dimensionList.push({ id: nameIdMap[key], value: rowData[key] }) dimensionList.push({ id: nameIdMap[key], value: rowData[key] })
} }
} }
this.antVActionPost(dimensionList, nameIdMap[meta.valueField] || 'null') this.antVActionPost(dimensionList, nameIdMap[meta.valueField] || 'null', param)
}, },
antVActionPost(dimensionList, name) { antVActionPost(dimensionList, name, param) {
this.pointParam = { this.pointParam = {
data: { data: {
dimensionList: dimensionList, dimensionList: dimensionList,
@ -385,7 +385,7 @@ export default {
dimensionList.push({ id: nameIdMap[key], value: rowData[key] }) dimensionList.push({ id: nameIdMap[key], value: rowData[key] })
} }
} }
this.antVActionPost(dimensionList, nameIdMap[meta.field] || 'null') this.antVActionPost(dimensionList, nameIdMap[meta.field] || 'null', param)
}, },
setBackGroundBorder() { setBackGroundBorder() {
if (this.chart.customStyle) { if (this.chart.customStyle) {

1
frontend/src/views/chart/components/dragItem/DimensionExtItem.vue
View File

@ -222,6 +222,7 @@ export default {
}, },
mounted() { mounted() {
bus.$on('reset-change-table', this.getItemTagType) bus.$on('reset-change-table', this.getItemTagType)
this.getDateExtStatus()
}, },
beforeDestroy() { beforeDestroy() {
bus.$off('reset-change-table', this.getItemTagType) bus.$off('reset-change-table', this.getItemTagType)

1
frontend/src/views/chart/components/dragItem/DimensionItem.vue
View File

@ -241,6 +241,7 @@ export default {
mounted() { mounted() {
bus.$on('reset-change-table', this.getItemTagType) bus.$on('reset-change-table', this.getItemTagType)
this.init() this.init()
this.getDateExtStatus()
}, },
beforeDestroy() { beforeDestroy() {
bus.$off('reset-change-table', this.getItemTagType) bus.$off('reset-change-table', this.getItemTagType)