forked from github/dataease
Merge pull request #13093 from dataease/refactor_filter-report
refactor(X-Pack): 定时报告默认值设置样式适配
This commit is contained in:
commit
20a561d487
@ -11,7 +11,7 @@ interface SelectConfig {
|
|||||||
const placeholder: Ref = inject('placeholder')
|
const placeholder: Ref = inject('placeholder')
|
||||||
|
|
||||||
const placeholderText = computed(() => {
|
const placeholderText = computed(() => {
|
||||||
if (placeholder.value.placeholderShow) {
|
if (placeholder?.value?.placeholderShow) {
|
||||||
return props.config.placeholder
|
return props.config.placeholder
|
||||||
}
|
}
|
||||||
return ' '
|
return ' '
|
||||||
|
@ -86,7 +86,7 @@ const cascadeList = inject('cascade-list', Function, true)
|
|||||||
const setCascadeDefault = inject('set-cascade-default', Function, true)
|
const setCascadeDefault = inject('set-cascade-default', Function, true)
|
||||||
|
|
||||||
const placeholderText = computed(() => {
|
const placeholderText = computed(() => {
|
||||||
if (placeholder.value.placeholderShow) {
|
if (placeholder?.value?.placeholderShow) {
|
||||||
return ['', undefined].includes(props.config.placeholder) ? ' ' : props.config.placeholder
|
return ['', undefined].includes(props.config.placeholder) ? ' ' : props.config.placeholder
|
||||||
}
|
}
|
||||||
return ' '
|
return ' '
|
||||||
|
@ -21,7 +21,7 @@ const placeholder: Ref = inject('placeholder')
|
|||||||
const { t } = useI18n()
|
const { t } = useI18n()
|
||||||
|
|
||||||
const placeholderText = computed(() => {
|
const placeholderText = computed(() => {
|
||||||
if (placeholder.value.placeholderShow) {
|
if (placeholder?.value?.placeholderShow) {
|
||||||
return props.config.placeholder
|
return props.config.placeholder
|
||||||
}
|
}
|
||||||
return ' '
|
return ' '
|
||||||
|
@ -67,7 +67,7 @@ const props = defineProps({
|
|||||||
})
|
})
|
||||||
const placeholder: Ref = inject('placeholder')
|
const placeholder: Ref = inject('placeholder')
|
||||||
const placeholderText = computed(() => {
|
const placeholderText = computed(() => {
|
||||||
if (placeholder.value.placeholderShow) {
|
if (placeholder?.value?.placeholderShow) {
|
||||||
return props.config.placeholder
|
return props.config.placeholder
|
||||||
}
|
}
|
||||||
return ' '
|
return ' '
|
||||||
|
@ -58,7 +58,7 @@ const props = defineProps({
|
|||||||
|
|
||||||
const placeholder: Ref = inject('placeholder')
|
const placeholder: Ref = inject('placeholder')
|
||||||
const placeholderText = computed(() => {
|
const placeholderText = computed(() => {
|
||||||
if (placeholder.value.placeholderShow) {
|
if (placeholder?.value?.placeholderShow) {
|
||||||
return ['', undefined].includes(props.config.placeholder) ? ' ' : props.config.placeholder
|
return ['', undefined].includes(props.config.placeholder) ? ' ' : props.config.placeholder
|
||||||
}
|
}
|
||||||
return ' '
|
return ' '
|
||||||
|
2
de-xpack
2
de-xpack
@ -1 +1 @@
|
|||||||
Subproject commit ab85a8d78734374edabbed747bc63b070e3fc528
|
Subproject commit 9b96136877d95f5e02477002cdbe513c9fecfc59
|
Loading…
Reference in New Issue
Block a user