From 5632bac3e45d5e472d4aeb887e62b83119e63f41 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 21 Aug 2025 10:37:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(=20=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):?=
 =?UTF-8?q?=20=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=BA=86=E9=BB=98=E8=AE=A4=E5=80=BC=E3=80=81=E5=BF=85=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E5=92=8C=E5=8E=BB=E9=99=A4=E6=9F=A5=E8=AF=A2=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=90=8E,=E4=B8=8D=E7=AE=A1=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E4=BB=80=E4=B9=88=E5=80=BC=E5=9B=9E=E8=BD=A6=E5=90=8E=E9=83=BD?=
 =?UTF-8?q?=E4=BC=9A=E5=8F=98=E5=9B=9E=E9=BB=98=E8=AE=A4=E5=80=BC=E3=80=82?=
 =?UTF-8?q?=20#16750?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-component/v-query/Component.vue    | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/Component.vue b/core/core-frontend/src/custom-component/v-query/Component.vue
index e41c497dbf..e5d768fcf8 100644
--- a/core/core-frontend/src/custom-component/v-query/Component.vue
+++ b/core/core-frontend/src/custom-component/v-query/Component.vue
@@ -65,8 +65,7 @@ const { element, view, scale } = toRefs(props)
 const { t } = useI18n()
 const vQueryRef = ref()
 const dvMainStore = dvMainStoreWithOut()
-const { curComponent, canvasViewInfo, mobileInPc, firstLoadMap, editMode } =
-  storeToRefs(dvMainStore)
+const { curComponent, canvasViewInfo, mobileInPc, firstLoadMap } = storeToRefs(dvMainStore)
 const canEdit = ref(false)
 const queryConfig = ref()
 const defaultStyle = {
@@ -99,9 +98,6 @@ const defaultStyle = {
 }
 const customStyle = reactive({ ...defaultStyle })
 const snapshotStore = snapshotStoreWithOut()
-const userAgent = navigator.userAgent.toLowerCase()
-// 判断是否为飞书内置浏览器
-const isFeiShu = /lark/i.test(userAgent)
 
 const btnStyle = computed(() => {
   const style = {
@@ -359,22 +355,26 @@ const getKeyList = next => {
 }
 
 const fillRequireVal = arr => {
-  element.value.propValue.forEach(next => {
+  element.value.propValue?.forEach(next => {
     if (arr.some(itx => next.checkedFields.includes(itx)) && next.required) {
       if (next.displayType === '8') {
         const { conditionValueF, conditionValueS, conditionType } = next
         if (conditionType === 0 && conditionValueF === '') {
           next.conditionValueF = next.defaultConditionValueF
-        } else if (conditionValueF === '' || conditionValueS === '') {
-          next.conditionValueF = next.defaultConditionValueF
-          next.conditionValueS = next.defaultConditionValueS
+        } else {
+          if (conditionValueF === '') {
+            next.conditionValueF = next.defaultConditionValueF
+          }
+          if (conditionValueS === '') {
+            next.conditionValueS = next.defaultConditionValueS
+          }
         }
       } else if (next.displayType === '22') {
-        if (
-          (next.numValueStart !== 0 && !next.numValueStart) ||
-          (next.numValueEnd !== 0 && !next.numValueEnd)
-        ) {
+        if (next.numValueStart !== 0 && !next.numValueStart) {
           next.numValueStart = next.defaultNumValueStart
+        }
+
+        if (next.numValueEnd !== 0 && !next.numValueEnd) {
           next.numValueEnd = next.defaultNumValueEnd
         }
       } else if (
@@ -502,7 +502,7 @@ onBeforeUnmount(() => {
 const updateQueryCriteria = () => {
   if (dvMainStore.mobileInPc && !isMobile()) return
   Array.isArray(element.value.propValue) &&
-    element.value.propValue.forEach(ele => {
+    element.value.propValue?.forEach(ele => {
       if (ele.auto) {
         const componentInfo = {
           datasetId: ele.dataset.id,
@@ -827,7 +827,7 @@ const marginRight = computed<CSSProperties>(() => {
 })
 
 const autoStyle = computed(() => {
-  if (isISOMobile() || isFeiShu) {
+  if (isISOMobile()) {
     return {
       position: 'absolute',
       height: 100 / scale.value + '%!important',
@@ -856,7 +856,7 @@ const autoStyle = computed(() => {
         <div class="container flex-align-center">
           {{ t('v_query.here_or_click') }}
           <el-button
-            :disabled="showPosition === 'preview' || mobileInPc || editMode === 'preview'"
+            :disabled="showPosition === 'preview' || mobileInPc"
             @click="addCriteriaConfigOut"
             style="font-family: inherit"
             text
@@ -890,9 +890,7 @@ const autoStyle = computed(() => {
               </div>
               <div
                 class="label-wrapper-tooltip"
-                v-if="
-                  showPosition !== 'preview' && !dvMainStore.mobileInPc && editMode !== 'preview'
-                "
+                v-if="showPosition !== 'preview' && !dvMainStore.mobileInPc"
               >
                 <el-tooltip
                   effect="dark"