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

This commit is contained in:
wangjiahao 2021-06-24 15:21:47 +08:00
commit 416d9d06aa
3 changed files with 3 additions and 3 deletions

View File

@ -46,7 +46,7 @@ export default {
setCondition() { setCondition() {
const param = { const param = {
component: this.element, component: this.element,
value: [this.options.value], value: !this.options.value ? [] : Array.isArray(this.options.value) ? this.options.value : [this.options.value],
operator: this.operator operator: this.operator
} }
this.inDraw && this.$store.commit('addViewFilter', param) this.inDraw && this.$store.commit('addViewFilter', param)

View File

@ -38,7 +38,7 @@
<lang-select class="right-menu-item hover-effect" /> <lang-select class="right-menu-item hover-effect" />
<div style="height: 100%;padding: 0 8px;" class="right-menu-item hover-effect"> <div style="height: 100%;padding: 0 8px;" class="right-menu-item hover-effect">
<a href="https://docs.dataease.io/" target="_blank" style="display: flex;height: 100%;width: 100%;justify-content: center;align-items: center;"> <a href="https://dataease.io/docs/" target="_blank" style="display: flex;height: 100%;width: 100%;justify-content: center;align-items: center;">
<svg-icon icon-class="docs" /> <svg-icon icon-class="docs" />
</a> </a>
</div> </div>

View File

@ -58,7 +58,7 @@ export function stackLineOption(chart_option, chart) {
baseLineOption(chart_option, chart) baseLineOption(chart_option, chart)
// ext // ext
chart_option.tooltip.trigger = 'axis' // chart_option.tooltip.trigger = 'axis'
chart_option.series.forEach(function(s) { chart_option.series.forEach(function(s) {
s.stack = 'stack' s.stack = 'stack'
}) })