Merge pull request #6414 from dataease/pr@dev-v2_dzz

Pr@dev v2 dzz

core/core-frontend/src/components/data-visualization/DvToolbar.vue

@@ -152,8 +152,8 @@ eventBus.on('clearCanvas', clearCanvas)
         </div>
         <div class="middle-area"></div>
       </template>
-      <template v-else-if="!isDataEaseBi">
-        <el-icon class="custom-el-icon back-icon" @click="backToMain()">
+      <template v-else>
+        <el-icon v-if="!isDataEaseBi" class="custom-el-icon back-icon" @click="backToMain()">
           <Icon class="toolbar-icon" name="icon_left_outlined" />
         </el-icon>
         <div class="left-area">

core/core-frontend/src/custom-component/v-query/Component.vue

@@ -184,6 +184,7 @@ onMounted(() => {
   emitter.on(`addQueryCriteria${element.value.id}`, addCriteriaConfigOut)
   emitter.on(`editQueryCriteria${element.value.id}`, editQueryCriteria)
   emitter.on(`updateQueryCriteria${element.value.id}`, updateQueryCriteria)
+  updateQueryCriteria()
 })
 
 const dragover = () => {

core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue

@@ -729,10 +729,17 @@ defineExpose({
                   value="0"
                 />
                 <el-option
+                  v-if="curComponent.displayType === '2'"
                   :disabled="curComponent.displayType !== '2'"
                   label="数字下拉"
                   value="2"
                 />
+                <el-option
+                  v-else
+                  :disabled="curComponent.displayType !== '5'"
+                  label="数字下拉"
+                  value="5"
+                />
                 <el-option
                   :disabled="!['1', '7'].includes(curComponent.displayType)"
                   label="时间"