From 705ad0b06bf7a2d7695d7d50e8434269c107a412 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 8 Oct 2024 11:31:04 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=90=E7=A4=BA=E8=AF=8D=E9=80=89=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=90=8D=E7=A7=B0=E6=9C=AA?=
 =?UTF-8?q?=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-component/v-query/TextSearch.vue   | 13 +++-
 .../editor/editor-style/VQueryChartStyle.vue  | 66 +++++++++++--------
 2 files changed, 50 insertions(+), 29 deletions(-)

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 d715a7e8af..9ff63e6f4a 100644
--- a/core/core-frontend/src/custom-component/v-query/TextSearch.vue
+++ b/core/core-frontend/src/custom-component/v-query/TextSearch.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { toRefs, onBeforeMount, type PropType, inject, computed, nextTick } from 'vue'
+import { toRefs, onBeforeMount, type PropType, type Ref, inject, computed, nextTick } from 'vue'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { storeToRefs } from 'pinia'
 interface SelectConfig {
@@ -9,12 +9,21 @@ interface SelectConfig {
   hideConditionSwitching: boolean
   conditionValueOperatorS: string
   conditionValueS: string
+  placeholder: string
   defaultConditionValueOperatorF: string
   defaultConditionValueF: string
   defaultConditionValueOperatorS: string
   defaultConditionValueS: string
   conditionType: number
 }
+const placeholder: Ref = inject('placeholder')
+
+const placeholderText = computed(() => {
+  if (placeholder.value.placeholderShow) {
+    return props.config.placeholder
+  }
+  return ' '
+})
 
 const operators = [
   {
@@ -103,6 +112,7 @@ const lineWidth = computed(() => {
       </el-select>
       <el-input
         :style="selectStyle"
+        :placeholder="placeholderText"
         @blur="handleValueChange"
         class="condition-value-input"
         v-model="config.conditionValueF"
@@ -125,6 +135,7 @@ const lineWidth = computed(() => {
       <el-input
         :style="selectStyle"
         @blur="handleValueChange"
+        :placeholder="placeholderText"
         class="condition-value-input"
         v-model="config.conditionValueS"
       />
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
index 675eacb261..836cef137d 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
@@ -61,6 +61,13 @@ watch(
   }
 )
 
+watch(
+  () => props.element.id,
+  () => {
+    initParams()
+  }
+)
+
 const currentPlaceholder = ref()
 const currentSearch = ref({
   placeholder: ''
@@ -141,36 +148,39 @@ const checkItalic = type => {
   chart.value.customStyle.component[type] = chart.value.customStyle.component[type] ? '' : 'italic'
 }
 const { chart, commonBackgroundPop } = toRefs(props)
-if (!chart.value.customStyle.component.hasOwnProperty('labelShow')) {
-  chart.value.customStyle.component = {
-    ...chart.value.customStyle.component,
-    labelShow: true,
-    fontWeight: '',
-    fontStyle: '',
-    fontSize: '14',
-    fontSizeBtn: '14',
-    fontWeightBtn: '',
-    fontStyleBtn: '',
-    queryConditionWidth: 227,
-    nameboxSpacing: 8,
-    queryConditionSpacing: 16,
-    labelColorBtn: '#ffffff',
-    btnColor: '#3370ff'
+const initParams = () => {
+  if (!chart.value.customStyle.component.hasOwnProperty('labelShow')) {
+    chart.value.customStyle.component = {
+      ...chart.value.customStyle.component,
+      labelShow: true,
+      fontWeight: '',
+      fontStyle: '',
+      fontSize: '14',
+      fontSizeBtn: '14',
+      fontWeightBtn: '',
+      fontStyleBtn: '',
+      queryConditionWidth: 227,
+      nameboxSpacing: 8,
+      queryConditionSpacing: 16,
+      labelColorBtn: '#ffffff',
+      btnColor: '#3370ff'
+    }
+  }
+
+  if (!chart.value.customStyle.component.hasOwnProperty('placeholderShow')) {
+    chart.value.customStyle.component = {
+      ...chart.value.customStyle.component,
+      placeholderShow: true,
+      placeholderSize: 14
+    }
+  }
+
+  if (props.element.propValue.length) {
+    currentPlaceholder.value = props.element.propValue[0].id
+    handleCurrentPlaceholder(props.element.propValue[0].id)
   }
 }
-
-if (!chart.value.customStyle.component.hasOwnProperty('placeholderShow')) {
-  chart.value.customStyle.component = {
-    ...chart.value.customStyle.component,
-    placeholderShow: true,
-    placeholderSize: 14
-  }
-}
-
-if (props.element.propValue.length) {
-  currentPlaceholder.value = props.element.propValue[0].id
-  handleCurrentPlaceholder(props.element.propValue[0].id)
-}
+initParams()
 </script>
 
 <template>