Merge pull request #13086 from dataease/pr@dev-v2_st

Pr@dev v2 st

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"

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.filter(
-      ? componentObj?.fields?.dimensionList
+      ele => ele.deType === +curComponent.value.field.deType
-      : curComponent.value.dataset?.fields
+    ),
-    ).filter(ele => ele.deType === +curComponent.value.field.deType),
     curComponent.value.treeFieldList
   )
 }

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>