public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-19 02:08:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into main

Browse Source
This commit is contained in:
wangjiahao
2021-06-11 16:53:40 +08:00
parent 698f12fcad dbf671c4f7
commit a31b783ab0
5 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/src/components/widget/DeWidget/DeSelect.vue
View File

@@ -48,13 +48,14 @@ export default {
watch: {
'options.attrs.multiple': function(value) {
const sourceValue = this.options.value
const sourceValid = !!sourceValue && Object.keys(sourceValue).length > 0
if (value) {
!sourceValue && (this.options.value = [])
sourceValue && !Array.isArray(sourceValue) && (this.options.value = sourceValue.split(','))
!sourceValid && (this.options.value = [])
sourceValid && !Array.isArray(sourceValue) && (this.options.value = sourceValue.split(','))
!this.inDraw && (this.options.value = [])
} else {
!sourceValue && (this.options.value = null)
sourceValue && Array.isArray(sourceValue) && (this.options.value = sourceValue[0])
!sourceValid && (this.options.value = null)
sourceValid && Array.isArray(sourceValue) && (this.options.value = sourceValue[0])
!this.inDraw && (this.options.value = null)
}
}
@@ -68,7 +69,7 @@ export default {
// this.$nextTick(() => {
// this.options && this.options.value && this.changeValue(this.options.value)
// })
this.options && this.options.value && this.changeValue(this.options.value)
this.options && this.options.value && Object.keys(this.options.value).length > 0 && this.changeValue(this.options.value)
},
methods: {
changeValue(value) {

10
frontend/src/views/chart/components/normal/LabelNormal.vue
View File

@@ -6,13 +6,13 @@
id="label-content"
:style="content_class"
>
<p v-if="dimensionShow" :style="label_class">
<!-- {{ chart.data.x[0] }}-->
{{ chart.data.series[0].name }}
<p v-for="item in chart.data.series" :key="item.name" :style="label_content_class">
{{ item.data[0] }}
</p>
<span v-if="quotaShow" :style="label_space">
<p v-for="item in chart.data.series" :key="item.name" :style="label_content_class">
{{ item.data[0] }}
<p v-if="dimensionShow" :style="label_class">
<!-- {{ chart.data.x[0] }}-->
{{ chart.data.series[0].name }}
</p>
</span>
</div>