From 899bb1f172f34da54fc1233d9f3f491f008888ed Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 4 Nov 2024 15:48:18 +0800 Subject: [PATCH] =?UTF-8?q?refactor(X-Pack):=20=E5=AE=9A=E6=97=B6=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E9=BB=98=E8=AE=A4=E5=80=BC=E8=AE=BE=E7=BD=AE=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/custom-component/v-query/NumberInput.vue | 2 +- core/core-frontend/src/custom-component/v-query/Select.vue | 2 +- core/core-frontend/src/custom-component/v-query/TextSearch.vue | 2 +- core/core-frontend/src/custom-component/v-query/Time.vue | 2 +- core/core-frontend/src/custom-component/v-query/Tree.vue | 2 +- de-xpack | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/core-frontend/src/custom-component/v-query/NumberInput.vue b/core/core-frontend/src/custom-component/v-query/NumberInput.vue index c217250aba..b103b6a9f7 100644 --- a/core/core-frontend/src/custom-component/v-query/NumberInput.vue +++ b/core/core-frontend/src/custom-component/v-query/NumberInput.vue @@ -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 ' ' diff --git a/core/core-frontend/src/custom-component/v-query/Select.vue b/core/core-frontend/src/custom-component/v-query/Select.vue index bf46b881b9..0e474a85b4 100644 --- a/core/core-frontend/src/custom-component/v-query/Select.vue +++ b/core/core-frontend/src/custom-component/v-query/Select.vue @@ -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 ' ' diff --git a/core/core-frontend/src/custom-component/v-query/TextSearch.vue b/core/core-frontend/src/custom-component/v-query/TextSearch.vue index 1f3c9b190d..3018f661b0 100644 --- a/core/core-frontend/src/custom-component/v-query/TextSearch.vue +++ b/core/core-frontend/src/custom-component/v-query/TextSearch.vue @@ -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 ' ' diff --git a/core/core-frontend/src/custom-component/v-query/Time.vue b/core/core-frontend/src/custom-component/v-query/Time.vue index 04b246b15e..3d826e11ab 100644 --- a/core/core-frontend/src/custom-component/v-query/Time.vue +++ b/core/core-frontend/src/custom-component/v-query/Time.vue @@ -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 ' ' diff --git a/core/core-frontend/src/custom-component/v-query/Tree.vue b/core/core-frontend/src/custom-component/v-query/Tree.vue index 77ffb8235a..7e1268cf29 100644 --- a/core/core-frontend/src/custom-component/v-query/Tree.vue +++ b/core/core-frontend/src/custom-component/v-query/Tree.vue @@ -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 ' ' diff --git a/de-xpack b/de-xpack index ab85a8d787..9b96136877 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit ab85a8d78734374edabbed747bc63b070e3fc528 +Subproject commit 9b96136877d95f5e02477002cdbe513c9fecfc59