Merge pull request #13093 from dataease/refactor_filter-report

refactor(X-Pack): 定时报告默认值设置样式适配
This commit is contained in:
王嘉豪 2024-11-04 16:00:39 +08:00 committed by GitHub
commit 20a561d487
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 6 additions and 6 deletions

View File

@ -11,7 +11,7 @@ interface SelectConfig {
const placeholder: Ref = inject('placeholder')
const placeholderText = computed(() => {
if (placeholder.value.placeholderShow) {
if (placeholder?.value?.placeholderShow) {
return props.config.placeholder
}
return ' '

View File

@ -86,7 +86,7 @@ const cascadeList = inject('cascade-list', Function, true)
const setCascadeDefault = inject('set-cascade-default', Function, true)
const placeholderText = computed(() => {
if (placeholder.value.placeholderShow) {
if (placeholder?.value?.placeholderShow) {
return ['', undefined].includes(props.config.placeholder) ? ' ' : props.config.placeholder
}
return ' '

View File

@ -21,7 +21,7 @@ const placeholder: Ref = inject('placeholder')
const { t } = useI18n()
const placeholderText = computed(() => {
if (placeholder.value.placeholderShow) {
if (placeholder?.value?.placeholderShow) {
return props.config.placeholder
}
return ' '

View File

@ -67,7 +67,7 @@ const props = defineProps({
})
const placeholder: Ref = inject('placeholder')
const placeholderText = computed(() => {
if (placeholder.value.placeholderShow) {
if (placeholder?.value?.placeholderShow) {
return props.config.placeholder
}
return ' '

View File

@ -58,7 +58,7 @@ const props = defineProps({
const placeholder: Ref = inject('placeholder')
const placeholderText = computed(() => {
if (placeholder.value.placeholderShow) {
if (placeholder?.value?.placeholderShow) {
return ['', undefined].includes(props.config.placeholder) ? ' ' : props.config.placeholder
}
return ' '

@ -1 +1 @@
Subproject commit ab85a8d78734374edabbed747bc63b070e3fc528
Subproject commit 9b96136877d95f5e02477002cdbe513c9fecfc59