From f88d095ce665ea4828fb88393deb404fae1b5347 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 4 Nov 2024 11:07:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=83=8C=E6=99=AF-=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2-=E8=AE=BE=E7=BD=AE=E7=99=BE=E5=88=86=E6=AF=94?=
 =?UTF-8?q?=E5=90=8E=E4=BF=9D=E5=AD=98=E5=9C=A8=E6=AD=A4=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=81=A2=E5=A4=8D=E9=BB=98=E8=AE=A4=EF=BC=88?=
 =?UTF-8?q?100%=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component-background/BackgroundOverallCommon.vue             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/core-frontend/src/components/visualization/component-background/BackgroundOverallCommon.vue b/core/core-frontend/src/components/visualization/component-background/BackgroundOverallCommon.vue
index 71eaf8b3d9..57570f42e6 100644
--- a/core/core-frontend/src/components/visualization/component-background/BackgroundOverallCommon.vue
+++ b/core/core-frontend/src/components/visualization/component-background/BackgroundOverallCommon.vue
@@ -68,6 +68,7 @@
         <div class="indented-item">
           <el-form-item class="form-item" :class="'form-item-' + themes">
             <el-color-picker
+              v-if="state.commonBackground.backgroundColor"
               v-model="state.commonBackground.backgroundColor"
               :effect="themes"
               :disabled="!state.commonBackground.backgroundColorSelect"

From ca46b9d2d9547f68243313004512b411f5592345 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 4 Nov 2024 11:08:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):?=
 =?UTF-8?q?=20=E6=96=87=E6=9C=AC=E4=B8=8B=E6=8B=89=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=95=B0=E6=8D=AE=E9=9B=86=E5=90=8E=E5=86=8D?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=E4=B8=BA=E4=B8=8B=E6=8B=89=E6=A0=91=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20#12990?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/QueryConditionConfiguration.vue                | 7 +++----
 .../src/custom-component/v-query/TreeFieldDialog.vue       | 6 ++++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
index c6178d58fc..f2b707c578 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -1734,10 +1734,9 @@ const startTreeDesign = () => {
   const [comId] = curComponent.value.checkedFields
   const componentObj = fields.value.find(ele => ele.componentId === comId)
   treeDialog.value.init(
-    (curComponent.value.optionValueSource === 0
-      ? componentObj?.fields?.dimensionList
-      : curComponent.value.dataset?.fields
-    ).filter(ele => ele.deType === +curComponent.value.field.deType),
+    componentObj?.fields?.dimensionList.filter(
+      ele => ele.deType === +curComponent.value.field.deType
+    ),
     curComponent.value.treeFieldList
   )
 }
diff --git a/core/core-frontend/src/custom-component/v-query/TreeFieldDialog.vue b/core/core-frontend/src/custom-component/v-query/TreeFieldDialog.vue
index eba9938914..8d297a5f61 100644
--- a/core/core-frontend/src/custom-component/v-query/TreeFieldDialog.vue
+++ b/core/core-frontend/src/custom-component/v-query/TreeFieldDialog.vue
@@ -14,7 +14,9 @@ const emits = defineEmits(['saveTree'])
 const { t } = useI18n()
 const addCascadeItem = () => {
   treeList.value.push({
-    field: null,
+    field: {
+      id: ''
+    },
     id: guid()
   })
 }
@@ -127,7 +129,7 @@ defineExpose({
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <el-button secondary @click="cancelClick">{{ t('v_query.cancel') }}</el-button>
+        <el-button secondary @click="cancelClick">{{ t('common.cancel') }}</el-button>
         <el-button type="primary" @click="confirmClick"> {{ t('pblink.sure_bt') }} </el-button>
       </div>
     </template>