From 6b96269aac8d1999813f920c9131b1ed35695210 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 16 Oct 2024 18:16:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):?=
 =?UTF-8?q?=20=E6=95=B0=E5=80=BC=E5=8C=BA=E9=97=B4=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/ConditionDefaultConfiguration.vue |  43 +-
 .../custom-component/v-query/NumberInput.vue  |  95 ++++
 .../v-query/QueryConditionConfiguration.vue   | 405 +++++++++++++++++-
 .../custom-component/v-query/StyleInject.vue  |   4 +
 4 files changed, 524 insertions(+), 23 deletions(-)
 create mode 100644 core/core-frontend/src/custom-component/v-query/NumberInput.vue

diff --git a/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue b/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue
index 810cf0c467..2460beb0e3 100644
--- a/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue
@@ -320,6 +320,13 @@ defineExpose({
   mult,
   single
 })
+const handleInputStart = value => {
+  curComponent.value.defaultNumValueStart = value.replace(/[^\d.]/g, '')
+}
+
+const handleInputEnd = value => {
+  curComponent.value.defaultNumValueEnd = value.replace(/[^\d.]/g, '')
+}
 </script>
 
 <template>
@@ -365,7 +372,32 @@ defineExpose({
       </div>
     </div>
   </div>
-  <div v-if="!['1', '7', '8'].includes(curComponent.displayType) && showFlag" class="list-item">
+  <div class="list-item top-item" v-if="curComponent.displayType === '22'" @click.stop>
+    <div class="label">
+      <el-checkbox v-model="curComponent.defaultValueCheck" label="设置默认值" />
+    </div>
+    <div class="setting-content" style="display: flex; align-items: center">
+      <el-input-number
+        :disabled="!curComponent.defaultValueCheck"
+        placeholder="请输入最小值"
+        style="width: 192.5px"
+        controls-position="right"
+        v-model="curComponent.defaultNumValueStart"
+      />
+      <div class="num-value_line"></div>
+      <el-input-number
+        placeholder="请输入最大值"
+        style="width: 192.5px"
+        controls-position="right"
+        :disabled="!curComponent.defaultValueCheck"
+        v-model="curComponent.defaultNumValueEnd"
+      />
+    </div>
+  </div>
+  <div
+    v-if="!['1', '7', '8', '22'].includes(curComponent.displayType) && showFlag"
+    class="list-item"
+  >
     <div class="label">选项类型</div>
     <div class="value">
       <el-radio-group
@@ -437,7 +469,7 @@ defineExpose({
       </el-tooltip>
     </div>
   </div>
-  <div v-if="!['8'].includes(curComponent.displayType)" class="list-item">
+  <div v-if="!['8', '22'].includes(curComponent.displayType)" class="list-item">
     <div class="label">
       <el-checkbox v-model="curComponent.defaultValueCheck" label="设置默认值" />
     </div>
@@ -607,6 +639,13 @@ defineExpose({
   .setting-content {
     width: 100%;
     padding-left: 24px;
+
+    .num-value_line {
+      background: #1f2329;
+      width: 12px;
+      height: 1px;
+      margin: 0 8px;
+    }
   }
 
   &.top-item {
diff --git a/core/core-frontend/src/custom-component/v-query/NumberInput.vue b/core/core-frontend/src/custom-component/v-query/NumberInput.vue
new file mode 100644
index 0000000000..c217250aba
--- /dev/null
+++ b/core/core-frontend/src/custom-component/v-query/NumberInput.vue
@@ -0,0 +1,95 @@
+<script lang="ts" setup>
+import { toRefs, onBeforeMount, type PropType, type Ref, inject, computed, nextTick } from 'vue'
+interface SelectConfig {
+  id: string
+  defaultNumValueEnd: number
+  numValueEnd: number
+  numValueStart: number
+  defaultNumValueStart: number
+  placeholder: string
+}
+const placeholder: Ref = inject('placeholder')
+
+const placeholderText = computed(() => {
+  if (placeholder.value.placeholderShow) {
+    return props.config.placeholder
+  }
+  return ' '
+})
+
+const props = defineProps({
+  config: {
+    type: Object as PropType<SelectConfig>,
+    default: () => {
+      return {
+        id: '',
+        defaultNumValueEnd: '',
+        defaultNumValueStart: '',
+        numValueEnd: '',
+        numValueStart: ''
+      }
+    }
+  },
+  isConfig: {
+    type: Boolean,
+    default: false
+  }
+})
+
+const { config } = toRefs(props)
+const setParams = () => {
+  const { defaultNumValueEnd, defaultNumValueStart } = config.value
+  config.value.numValueEnd = defaultNumValueEnd
+  config.value.numValueStart = defaultNumValueStart
+}
+onBeforeMount(() => {
+  setParams()
+})
+const queryConditionWidth = inject('com-width', Function, true)
+const customStyle = inject<{ background: string }>('$custom-style-filter')
+const isConfirmSearch = inject('is-confirm-search', Function, true)
+const selectStyle = computed(() => {
+  return { width: queryConditionWidth() + 'px' }
+})
+const handleValueChange = () => {
+  if (!props.isConfig) {
+    nextTick(() => {
+      isConfirmSearch(config.value.id)
+    })
+    return
+  }
+}
+</script>
+
+<template>
+  <div class="num-search-select" :style="{ background: customStyle.background }">
+    <el-input-number
+      :placeholder="placeholderText"
+      @change="handleValueChange"
+      :style="selectStyle"
+      controls-position="right"
+      v-model="config.numValueStart"
+    />
+    <div class="num-value_line"></div>
+    <el-input-number
+      :placeholder="placeholderText"
+      :style="selectStyle"
+      @change="handleValueChange"
+      controls-position="right"
+      v-model="config.numValueEnd"
+    />
+  </div>
+</template>
+
+<style lang="less" scoped>
+.num-search-select {
+  display: flex;
+  align-items: center;
+  .num-value_line {
+    background: #1f2329;
+    width: 12px;
+    height: 1px;
+    margin: 0 8px;
+  }
+}
+</style>
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 a36e3fa234..def609dde2 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -193,7 +193,44 @@ const showTypeError = computed(() => {
   }
   let displayTypeField = null
   let hasParameterTimeArrType = 0
+  let hasParameterNumArrType = 0
+  let allNum =
+    curComponent.value.checkedFields.every(id => {
+      return curComponent.value.checkedFieldsMapArrNum?.[id]?.length
+    }) && ['22'].includes(curComponent.value.displayType)
   return curComponent.value.checkedFields.some(id => {
+    if (allNum) {
+      return false
+    }
+
+    if (
+      curComponent.value.checkedFieldsMapArrNum?.[id]?.length &&
+      ['22', '2'].includes(curComponent.value.displayType)
+    ) {
+      if (hasParameterNumArrType === 0) {
+        hasParameterNumArrType = 1
+      }
+
+      if (hasParameterNumArrType === 2) {
+        return true
+      }
+    }
+
+    if (
+      !curComponent.value.checkedFieldsMapArrNum?.[id]?.length &&
+      ['22', '2'].includes(curComponent.value.displayType) &&
+      curComponent.value.parameters.some(ele => [2, 3].includes(ele.deType)) &&
+      curComponent.value.checkedFieldsMap[id]
+    ) {
+      if (hasParameterNumArrType === 0) {
+        hasParameterNumArrType = 2
+      }
+
+      if (hasParameterNumArrType === 1) {
+        return true
+      }
+    }
+
     if (
       curComponent.value.checkedFieldsMapArr?.[id]?.length &&
       ['7', '1'].includes(curComponent.value.displayType)
@@ -243,7 +280,9 @@ const showTypeError = computed(() => {
         }
       }
     }
-    return displayTypeField.deType !== field?.deType
+    return [2, 3].includes(field?.deType) && [2, 3].includes(displayTypeField.deType)
+      ? false
+      : displayTypeField.deType !== field?.deType
   })
 })
 
@@ -344,18 +383,54 @@ const handleCheckedFieldsChangeTree = (value: string[]) => {
 
 const isParametersDisable = item => {
   let isDisabled = false
-  for (let index = 0; index < notTimeRangeType.value.length; index++) {
-    if (notTimeRangeType.value[index] !== item.type?.[index]) {
+  if (!isNumParameter.value) {
+    for (let index = 0; index < notTimeRangeType.value.length; index++) {
+      if (notTimeRangeType.value[index] !== item.type?.[index]) {
+        isDisabled = true
+      }
+    }
+    if (notTimeRangeType.value.length && item.deType !== 1) {
       isDisabled = true
     }
   }
-  if (notTimeRangeType.value.length && item.deType !== 1) {
-    isDisabled = true
-  }
   return isDisabled
 }
 
+const setParametersArrNum = (val, componentId) => {
+  if (curComponent.value.checkedFieldsMapArr?.[componentId]?.length) {
+    curComponent.value.checkedFieldsMapArr[componentId] = []
+    curComponent.value.checkedFieldsMapEnd[componentId] = ''
+    curComponent.value.checkedFieldsMapStart[componentId] = ''
+  }
+  const timeStartId = curComponent.value.checkedFieldsMapStartNum[componentId]
+  const timeEndId = curComponent.value.checkedFieldsMapEndNum[componentId]
+  if (timeStartId) {
+    curComponent.value.checkedFieldsMapEndNum[componentId] = val.find(ele => ele !== timeStartId)
+  }
+
+  if (timeEndId) {
+    curComponent.value.checkedFieldsMapStartNum[componentId] = val.find(ele => ele !== timeEndId)
+  }
+
+  if (!val.length) {
+    curComponent.value.checkedFieldsMap[componentId] = ''
+    curComponent.value.checkedFieldsMapEndNum[componentId] = ''
+    curComponent.value.checkedFieldsMapStartNum[componentId] = ''
+    curComponent.value.parametersArrNum[componentId] = []
+  }
+
+  if (curComponent.value.checkedFieldsMapArrNum[componentId].length) {
+    setParametersNumType(componentId)
+  }
+  setTypeChange()
+}
+
 const setParametersArr = (val, componentId) => {
+  if (curComponent.value.checkedFieldsMapArrNum?.[componentId]?.length) {
+    curComponent.value.checkedFieldsMapArrNum[componentId] = []
+    curComponent.value.checkedFieldsMapEndNum[componentId] = ''
+    curComponent.value.checkedFieldsMapStartNum[componentId] = ''
+  }
   const timeStartId = curComponent.value.checkedFieldsMapStart[componentId]
   const timeEndId = curComponent.value.checkedFieldsMapEnd[componentId]
   if (timeStartId) {
@@ -388,6 +463,10 @@ const timeDialogShow = ref(false)
 const timeParameterType = ref(0)
 const timeName = ref('')
 
+const numDialogShow = ref(false)
+const numParameterType = ref(0)
+const numName = ref('')
+
 const timeTypeChange = () => {
   if (!curComponent.value.checkedFieldsMapArr[currentComponentId]) {
     curComponent.value.checkedFieldsMapArr[currentComponentId] = []
@@ -451,6 +530,88 @@ const timeTypeChange = () => {
   timeDialogShow.value = false
 }
 
+const numTypeChange = () => {
+  if (!curComponent.value.checkedFieldsMapArrNum[currentComponentId]) {
+    curComponent.value.checkedFieldsMapArrNum[currentComponentId] = []
+  }
+
+  if (numParameterType.value === 0) {
+    curComponent.value.checkedFieldsMap[currentComponentId] = currentParameterId
+    curComponent.value.checkedFieldsMapArrNum[currentComponentId] = []
+    curComponent.value.checkedFieldsMapStartNum[currentComponentId] = ''
+    curComponent.value.checkedFieldsMapEndNum[currentComponentId] = ''
+  }
+
+  if (numParameterType.value === 1) {
+    curComponent.value.checkedFieldsMapStartNum[currentComponentId] = currentParameterId
+    curComponent.value.checkedFieldsMapArrNum[currentComponentId] = [
+      ...new Set([
+        ...curComponent.value.checkedFieldsMapArrNum[currentComponentId],
+        currentParameterId
+      ])
+    ]
+
+    if (curComponent.value.checkedFieldsMapArrNum[currentComponentId].length === 1) {
+      curComponent.value.checkedFieldsMapEndNum[currentComponentId] = ''
+    } else {
+      curComponent.value.checkedFieldsMapEndNum[currentComponentId] =
+        curComponent.value.checkedFieldsMapArrNum[currentComponentId].length === 2
+          ? curComponent.value.checkedFieldsMapArrNum[currentComponentId].find(
+              ele => ele !== currentParameterId
+            )
+          : currentParameterId
+    }
+  }
+
+  if (numParameterType.value === 2) {
+    curComponent.value.checkedFieldsMapArrNum[currentComponentId] = [
+      ...new Set([
+        ...curComponent.value.checkedFieldsMapArrNum[currentComponentId],
+        currentParameterId
+      ])
+    ]
+
+    curComponent.value.checkedFieldsMapEndNum[currentComponentId] = currentParameterId
+
+    if (curComponent.value.checkedFieldsMapArrNum[currentComponentId].length === 1) {
+      curComponent.value.checkedFieldsMapStartNum[currentComponentId] = ''
+    } else {
+      curComponent.value.checkedFieldsMapStartNum[currentComponentId] =
+        curComponent.value.checkedFieldsMapArrNum[currentComponentId].length === 2
+          ? curComponent.value.checkedFieldsMapArrNum[currentComponentId].find(
+              ele => ele !== currentParameterId
+            )
+          : currentParameterId
+    }
+  }
+
+  curComponent.value.displayType = curComponent.value.checkedFieldsMapArrNum[currentComponentId]
+    .length
+    ? '22'
+    : '2'
+  setParametersNumType(currentComponentId)
+  setTypeChange()
+  numDialogShow.value = false
+}
+
+const setParametersNumType = componentId => {
+  curComponent.value.parametersArr[componentId] = duplicateRemoval(
+    unref(fields)
+      .filter(ele => ele.componentId === componentId)
+      .map(ele => Object.values(ele?.fields || {}).flat())
+      .flat()
+      .filter(
+        ele =>
+          [
+            curComponent.value.checkedFieldsMapEndNum[componentId],
+            curComponent.value.checkedFieldsMapStartNum[componentId]
+          ]
+            .filter(ele => !!ele)
+            .includes(ele.id) && !!ele.variableName
+      )
+  )
+}
+
 const setParametersTimeType = componentId => {
   curComponent.value.parametersArr[componentId] = duplicateRemoval(
     unref(fields)
@@ -474,6 +635,19 @@ const setParametersTimeType = componentId => {
   curComponent.value.timeGranularity = typeTimeMap[v2 || v1]
 }
 
+const numClick = (componentId, timeVal) => {
+  numParameterType.value =
+    timeVal.id === curComponent.value.checkedFieldsMapStartNum[componentId]
+      ? 1
+      : timeVal.id === curComponent.value.checkedFieldsMapEndNum[componentId]
+      ? 2
+      : 0
+  currentComponentId = componentId
+  currentParameterId = timeVal.id
+  numName.value = timeVal.variableName
+  numDialogShow.value = true
+}
+
 const timeClick = (componentId, timeVal) => {
   timeParameterType.value =
     timeVal.id === curComponent.value.checkedFieldsMapStart[componentId]
@@ -542,7 +716,7 @@ const setType = () => {
 
     if (field?.deType !== undefined) {
       let displayType = curComponent.value.displayType
-      if (curComponent.value.displayType === '9') {
+      if (['9', '22'].includes(curComponent.value.displayType)) {
         return
       }
       if (!(field?.deType === 1 && curComponent.value.displayType === '7')) {
@@ -586,6 +760,30 @@ const isTimeParameter = computed(() => {
   return curComponent.value.parameters?.some(ele => ele.deType === 1 && !!ele.variableName)
 })
 
+const isNumParameter = computed(() => {
+  return curComponent.value.parameters?.some(
+    ele => [2, 3].includes(ele.deType) && !!ele.variableName
+  )
+})
+
+const notNumRange = computed(() => {
+  return Object.values(curComponent.value.checkedFieldsMapArrNum || {}).some(
+    ele => ele?.length !== 0
+  )
+})
+
+const canNotNumRange = computed(() => {
+  if (
+    curComponent.value.checkedFields.every(id => {
+      return curComponent.value.checkedFieldsMapArrNum?.[id]?.length
+    })
+  ) {
+    return false
+  } else {
+    return curComponent.value.parameters?.some(ele => [2, 3].includes(ele.deType))
+  }
+})
+
 const notTimeRange = computed(() => {
   return Object.values(curComponent.value.checkedFieldsMapArr || {}).some(ele => ele?.length !== 0)
 })
@@ -918,8 +1116,38 @@ const validate = () => {
     let displayTypeField = null
     let errorTips = '所选字段类型不一致，无法进行查询配置'
     let hasParameterTimeArrType = 0
+    let hasParameterNumArrType = 0
     if (
       ele.checkedFields.some(id => {
+        if (ele.checkedFieldsMapArrNum?.[id]?.length) {
+          if (hasParameterNumArrType === 0) {
+            hasParameterNumArrType = 1
+          }
+
+          if (hasParameterNumArrType === 2) {
+            return true
+          }
+        }
+
+        if (
+          !ele.checkedFieldsMapArrNum?.[id]?.length &&
+          ['22'].includes(ele.displayType) &&
+          !!ele.parameters.length
+        ) {
+          if (hasParameterNumArrType === 0) {
+            hasParameterNumArrType = 2
+          }
+
+          if (hasParameterNumArrType === 1) {
+            return true
+          }
+        }
+
+        if (ele.checkedFieldsMapArrNum?.[id]?.length === 1 && ele.displayType === '22') {
+          errorTips = '数值参数配置必须配置最大值和最小值'
+          return true
+        }
+
         if (ele.checkedFieldsMapArr?.[id]?.length && ['7', '1'].includes(ele.displayType)) {
           if (hasParameterTimeArrType === 0) {
             hasParameterTimeArrType = 1
@@ -1112,7 +1340,7 @@ const validate = () => {
       return true
     }
 
-    if (ele.displayType !== '9' && ele.optionValueSource === 1 && !ele.field.id) {
+    if (!['9', '22'].includes(ele.displayType) && ele.optionValueSource === 1 && !ele.field.id) {
       ElMessage.error(!ele.dataset?.id ? '请选择数据集及选项值字段' : '请选择数据集的选项值字段')
       return true
     }
@@ -1314,6 +1542,10 @@ const parameterCompletion = () => {
     arbitraryTimeRange: new Date(),
     setTimeRange: false,
     showEmpty: false,
+    defaultNumValueStart: null,
+    defaultNumValueEnd: null,
+    numValueEnd: null,
+    numValueStart: null,
     timeRange: {
       intervalType: 'none',
       dynamicWindow: false,
@@ -1346,8 +1578,11 @@ const handleCondition = item => {
   const obj = conditions.value.find(ele => ele.id === item.id)
   if (!obj.checkedFieldsMapArr) {
     obj.checkedFieldsMapArr = {}
+    obj.checkedFieldsMapArrNum = {}
     obj.checkedFieldsMapStart = {}
+    obj.checkedFieldsMapStartNum = {}
     obj.checkedFieldsMapEnd = {}
+    obj.checkedFieldsMapEndNum = {}
     obj.parametersArr = {}
   }
   curComponent.value = obj
@@ -1364,8 +1599,11 @@ const handleCondition = item => {
     if (!curComponent.value.checkedFieldsMap[ele.id]) {
       curComponent.value.checkedFieldsMap[ele.id] = ''
       curComponent.value.checkedFieldsMapStart[ele.id] = ''
+      curComponent.value.checkedFieldsMapStartNum[ele.id] = ''
       curComponent.value.checkedFieldsMapEnd[ele.id] = ''
+      curComponent.value.checkedFieldsMapEndNum[ele.id] = ''
       curComponent.value.checkedFieldsMapArr[ele.id] = []
+      curComponent.value.checkedFieldsMapArrNum[ele.id] = []
       curComponent.value.parametersArr[ele.id] = []
     }
   })
@@ -1425,7 +1663,7 @@ const showError = computed(() => {
   if (!checkedFields.length || !arr.length) {
     return true
   }
-  if ([1, 7, 8].includes(+displayType)) {
+  if ([1, 7, 8, 22].includes(+displayType)) {
     return false
   }
 
@@ -1862,7 +2100,7 @@ defineExpose({
                 multiple
                 collapse-tags
                 collapse-tags-tooltip
-                key="checkedFieldsMapArr"
+                key="checkedFieldsMapArrTime"
                 :multiple-limit="2"
                 class="field-select--input"
                 style="margin-left: 12px"
@@ -1953,7 +2191,103 @@ defineExpose({
                 </el-option>
               </el-select>
               <el-select
-                key="checkedFieldsMap"
+                @change="val => setParametersArrNum(val, field.componentId)"
+                @focus="handleDialogClick"
+                multiple
+                collapse-tags
+                collapse-tags-tooltip
+                key="checkedFieldsMapArr"
+                :multiple-limit="2"
+                class="field-select--input"
+                style="margin-left: 12px"
+                popper-class="field-select--dqp"
+                v-if="
+                  curComponent.checkedFields.includes(field.componentId) &&
+                  curComponent.checkedFieldsMapArrNum &&
+                  curComponent.checkedFieldsMapArrNum[field.componentId] &&
+                  curComponent.checkedFieldsMapArrNum[field.componentId].length
+                "
+                v-model="curComponent.checkedFieldsMapArrNum[field.componentId]"
+                clearable
+              >
+                <template v-if="curComponent.checkedFieldsMap[field.componentId]" #prefix>
+                  <el-icon>
+                    <Icon
+                      ><component
+                        :class="`field-icon-${
+                          fieldType[
+                            getDetype(
+                              curComponent.checkedFieldsMap[field.componentId],
+                              Object.values(field.fields)
+                            )
+                          ]
+                        }`"
+                        :is="
+                          iconFieldMap[
+                            fieldType[
+                              getDetype(
+                                curComponent.checkedFieldsMap[field.componentId],
+                                Object.values(field.fields)
+                              )
+                            ]
+                          ]
+                        "
+                      ></component
+                    ></Icon>
+                  </el-icon>
+                </template>
+                <template #header>
+                  <el-tabs stretch class="params-select--header" v-model="field.activelist">
+                    <el-tab-pane disabled label="维度" name="dimensionList"></el-tab-pane>
+                    <el-tab-pane disabled label="指标" name="quotaList"></el-tab-pane>
+                    <el-tab-pane label="参数" name="parameterList"></el-tab-pane>
+                  </el-tabs>
+                </template>
+                <el-option
+                  v-for="ele in field.fields[field.activelist]"
+                  :key="ele.id"
+                  :label="ele.name || ele.variableName"
+                  :value="ele.id"
+                  :disabled="![2, 3].includes(ele.deType)"
+                >
+                  <div class="flex-align-center icon">
+                    <el-icon>
+                      <Icon :className="`field-icon-${fieldType[ele.deType]}`"
+                        ><component
+                          class="svg-icon"
+                          :class="`field-icon-${fieldType[ele.deType]}`"
+                          :is="iconFieldMap[fieldType[ele.deType]]"
+                        ></component
+                      ></Icon>
+                    </el-icon>
+                    <span :title="ele.name || ele.variableName" class="ellipsis">
+                      {{ ele.name || ele.variableName }}
+                    </span>
+                    <span
+                      v-if="
+                        curComponent.checkedFieldsMapArrNum[field.componentId].includes(ele.id) &&
+                        field.activelist === 'parameterList'
+                      "
+                      class="range-time_setting"
+                    >
+                      {{
+                        curComponent.checkedFieldsMapStartNum[field.componentId] === ele.id
+                          ? '最小值'
+                          : curComponent.checkedFieldsMapEndNum[field.componentId] === ele.id
+                          ? '最大值'
+                          : ''
+                      }}
+                      <el-icon @click.stop="numClick(field.componentId, ele)">
+                        <Icon>
+                          <icon_edit_outlined class="svg-icon"></icon_edit_outlined>
+                        </Icon>
+                      </el-icon>
+                    </span>
+                  </div>
+                </el-option>
+              </el-select>
+              <el-select
+                key="checkedFieldsMapNum"
                 @change="setParameters(field)"
                 @focus="handleDialogClick"
                 style="margin-left: 12px"
@@ -2035,12 +2369,19 @@ defineExpose({
                       v-if="
                         curComponent.checkedFieldsMap[field.componentId] === ele.id &&
                         field.activelist === 'parameterList' &&
-                        isTimeParameter
+                        (isTimeParameter || isNumParameter)
                       "
                       class="range-time_setting"
                     >
-                      时间
-                      <el-icon @click.stop="timeClick(field.componentId, ele)">
+                      {{ isNumParameter ? '数值' : '时间' }}
+                      <el-icon
+                        @click.stop="
+                          () =>
+                            isNumParameter
+                              ? numClick(field.componentId, ele)
+                              : timeClick(field.componentId, ele)
+                        "
+                      >
                         <Icon>
                           <icon_edit_outlined class="svg-icon"></icon_edit_outlined>
                         </Icon>
@@ -2094,12 +2435,19 @@ defineExpose({
                   label="下拉树"
                   value="9"
                 />
-                <el-option
-                  v-if="curComponent.displayType === '2'"
-                  :disabled="curComponent.displayType !== '2'"
-                  label="数字下拉"
-                  value="2"
-                />
+
+                <template v-if="['2', '22'].includes(curComponent.displayType)">
+                  <el-option
+                    :disabled="!['2', '22'].includes(curComponent.displayType) || notNumRange"
+                    label="数字下拉"
+                    value="2"
+                  />
+                  <el-option
+                    :disabled="!['2', '22'].includes(curComponent.displayType) || canNotNumRange"
+                    label="数值区间"
+                    value="22"
+                  />
+                </template>
                 <el-option
                   v-else
                   :disabled="curComponent.displayType !== '5'"
@@ -2211,7 +2559,7 @@ defineExpose({
           </div>
           <div
             class="list-item top-item"
-            v-if="!['1', '7', '8', '9'].includes(curComponent.displayType)"
+            v-if="!['1', '7', '8', '9', '22'].includes(curComponent.displayType)"
           >
             <div class="label">选项值来源</div>
             <div class="value">
@@ -2576,6 +2924,21 @@ defineExpose({
       <el-button type="primary" @click="timeTypeChange">确认</el-button>
     </template>
   </el-dialog>
+  <el-dialog :title="numName" v-model="numDialogShow" width="420px">
+    <el-form label-position="top">
+      <el-form-item label="类型" class="form-item" prop="name">
+        <el-radio-group v-model="numParameterType">
+          <el-radio :label="0">数值</el-radio>
+          <el-radio :label="1">最小值</el-radio>
+          <el-radio :label="2">最大值</el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button secondary @click="numDialogShow = false">取消</el-button>
+      <el-button type="primary" @click="numTypeChange">确认</el-button>
+    </template>
+  </el-dialog>
   <CascadeDialog @saveCascade="saveCascade" ref="cascadeDialog"></CascadeDialog>
 </template>
 
diff --git a/core/core-frontend/src/custom-component/v-query/StyleInject.vue b/core/core-frontend/src/custom-component/v-query/StyleInject.vue
index e879532c6a..032a5b275a 100644
--- a/core/core-frontend/src/custom-component/v-query/StyleInject.vue
+++ b/core/core-frontend/src/custom-component/v-query/StyleInject.vue
@@ -3,6 +3,7 @@ import { provide, PropType } from 'vue'
 import Select from './Select.vue'
 import Time from './Time.vue'
 import TextSearch from './TextSearch.vue'
+import NumberInput from './NumberInput.vue'
 import Tree from './Tree.vue'
 
 interface SelectConfig {
@@ -56,6 +57,9 @@ const filterTypeCom = (displayType: string) => {
   if (displayType === '8') {
     return TextSearch
   }
+  if (displayType === '22') {
+    return NumberInput
+  }
   return ['1', '7'].includes(displayType) ? Time : displayType === '9' ? Tree : Select
 }
 provide('$custom-style-filter', props.customStyle)

From 0b312b7b6453d343351df701280eec24a6fd6403 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 17 Oct 2024 11:21:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):?=
 =?UTF-8?q?=20=E6=95=B0=E5=80=BC=E5=8C=BA=E9=97=B4=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/QueryConditionConfiguration.vue   | 87 +++++++++++--------
 core/core-frontend/src/hooks/web/useFilter.ts | 61 +++++++++++++
 .../visualized/data/datasource/index.vue      |  2 +-
 3 files changed, 115 insertions(+), 35 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 def609dde2..9a2b132ec5 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -416,7 +416,7 @@ const setParametersArrNum = (val, componentId) => {
     curComponent.value.checkedFieldsMap[componentId] = ''
     curComponent.value.checkedFieldsMapEndNum[componentId] = ''
     curComponent.value.checkedFieldsMapStartNum[componentId] = ''
-    curComponent.value.parametersArrNum[componentId] = []
+    curComponent.value.parametersArr[componentId] = []
   }
 
   if (curComponent.value.checkedFieldsMapArrNum[componentId].length) {
@@ -628,6 +628,7 @@ const setParametersTimeType = componentId => {
             .includes(ele.id) && !!ele.variableName
       )
   )
+  if (!curComponent.value.parametersArr[componentId].length) return
   const [v1, v2] = curComponent.value.parametersArr[componentId][0].type
   curComponent.value.timeGranularityMultiple = typeTimeMap[v2 || v1]
     ? `${typeTimeMap[v2 || v1]}range`
@@ -757,7 +758,14 @@ const setTypeChange = () => {
 }
 
 const isTimeParameter = computed(() => {
-  return curComponent.value.parameters?.some(ele => ele.deType === 1 && !!ele.variableName)
+  return curComponent.value.checkedFields.some(ele => {
+    return curComponent.value.parameters?.some(
+      itx =>
+        itx.deType === 1 &&
+        !!itx.variableName &&
+        curComponent.value.checkedFieldsMap[ele] === itx.id
+    )
+  })
 })
 
 const isNumParameter = computed(() => {
@@ -767,25 +775,31 @@ const isNumParameter = computed(() => {
 })
 
 const notNumRange = computed(() => {
-  return Object.values(curComponent.value.checkedFieldsMapArrNum || {}).some(
-    ele => ele?.length !== 0
-  )
+  return curComponent.value.checkedFields.some(ele => {
+    return curComponent.value.checkedFieldsMapArrNum[ele]?.length > 0
+  })
 })
 
 const canNotNumRange = computed(() => {
   if (
     curComponent.value.checkedFields.every(id => {
-      return curComponent.value.checkedFieldsMapArrNum?.[id]?.length
+      return curComponent.value.checkedFieldsMapArrNum?.[id]?.length > 0
     })
   ) {
     return false
   } else {
-    return curComponent.value.parameters?.some(ele => [2, 3].includes(ele.deType))
+    return curComponent.value.checkedFields.some(ele => {
+      return curComponent.value.parameters?.some(
+        itx => [2, 3].includes(itx.deType) && curComponent.value.checkedFieldsMap[ele] === itx.id
+      )
+    })
   }
 })
 
 const notTimeRange = computed(() => {
-  return Object.values(curComponent.value.checkedFieldsMapArr || {}).some(ele => ele?.length !== 0)
+  return curComponent.value.checkedFields.some(ele => {
+    return curComponent.value.checkedFieldsMapArr[ele]?.length > 0
+  })
 })
 
 const notTimeRangeType = computed(() => {
@@ -2172,6 +2186,7 @@ defineExpose({
                         curComponent.checkedFieldsMapArr[field.componentId].includes(ele.id) &&
                         field.activelist === 'parameterList'
                       "
+                      @click.stop="timeClick(field.componentId, ele)"
                       class="range-time_setting"
                     >
                       {{
@@ -2181,7 +2196,7 @@ defineExpose({
                           ? '结束时间'
                           : ''
                       }}
-                      <el-icon @click.stop="timeClick(field.componentId, ele)">
+                      <el-icon>
                         <Icon>
                           <icon_edit_outlined class="svg-icon"></icon_edit_outlined>
                         </Icon>
@@ -2201,7 +2216,7 @@ defineExpose({
                 class="field-select--input"
                 style="margin-left: 12px"
                 popper-class="field-select--dqp"
-                v-if="
+                v-else-if="
                   curComponent.checkedFields.includes(field.componentId) &&
                   curComponent.checkedFieldsMapArrNum &&
                   curComponent.checkedFieldsMapArrNum[field.componentId] &&
@@ -2268,6 +2283,7 @@ defineExpose({
                         curComponent.checkedFieldsMapArrNum[field.componentId].includes(ele.id) &&
                         field.activelist === 'parameterList'
                       "
+                      @click.stop="numClick(field.componentId, ele)"
                       class="range-time_setting"
                     >
                       {{
@@ -2277,7 +2293,7 @@ defineExpose({
                           ? '最大值'
                           : ''
                       }}
-                      <el-icon @click.stop="numClick(field.componentId, ele)">
+                      <el-icon>
                         <Icon>
                           <icon_edit_outlined class="svg-icon"></icon_edit_outlined>
                         </Icon>
@@ -2287,7 +2303,6 @@ defineExpose({
                 </el-option>
               </el-select>
               <el-select
-                key="checkedFieldsMapNum"
                 @change="setParameters(field)"
                 @focus="handleDialogClick"
                 style="margin-left: 12px"
@@ -2366,6 +2381,12 @@ defineExpose({
                       {{ ele.name || ele.variableName }}
                     </span>
                     <span
+                      @click.stop="
+                        () =>
+                          isNumParameter
+                            ? numClick(field.componentId, ele)
+                            : timeClick(field.componentId, ele)
+                      "
                       v-if="
                         curComponent.checkedFieldsMap[field.componentId] === ele.id &&
                         field.activelist === 'parameterList' &&
@@ -2374,14 +2395,7 @@ defineExpose({
                       class="range-time_setting"
                     >
                       {{ isNumParameter ? '数值' : '时间' }}
-                      <el-icon
-                        @click.stop="
-                          () =>
-                            isNumParameter
-                              ? numClick(field.componentId, ele)
-                              : timeClick(field.componentId, ele)
-                        "
-                      >
+                      <el-icon>
                         <Icon>
                           <icon_edit_outlined class="svg-icon"></icon_edit_outlined>
                         </Icon>
@@ -2616,10 +2630,13 @@ defineExpose({
                     <template v-if="curComponent.field.id" #prefix>
                       <el-icon>
                         <Icon
-                          :className="`field-icon-${
-                            fieldType[getDetype(curComponent.field.id, curComponent.dataset.fields)]
-                          }`"
                           ><component
+                            class="svg-icon"
+                            :class="`field-icon-${
+                              fieldType[
+                                getDetype(curComponent.field.id, curComponent.dataset.fields)
+                              ]
+                            }`"
                             :is="
                               iconFieldMap[
                                 fieldType[
@@ -2673,12 +2690,13 @@ defineExpose({
                     <template v-if="curComponent.displayId" #prefix>
                       <el-icon>
                         <Icon
-                          :className="`field-icon-${
-                            fieldType[
-                              getDetype(curComponent.displayId, curComponent.dataset.fields)
-                            ]
-                          }`"
                           ><component
+                            class="svg-icon"
+                            :class="`field-icon-${
+                              fieldType[
+                                getDetype(curComponent.displayId, curComponent.dataset.fields)
+                              ]
+                            }`"
                             :is="
                               iconFieldMap[
                                 fieldType[
@@ -2734,10 +2752,11 @@ defineExpose({
                     <template v-if="curComponent.sortId" #prefix>
                       <el-icon>
                         <Icon
-                          :className="`field-icon-${
-                            fieldType[getDetype(curComponent.sortId, curComponent.dataset.fields)]
-                          }`"
                           ><component
+                            class="svg-icon"
+                            :class="`field-icon-${
+                              fieldType[getDetype(curComponent.sortId, curComponent.dataset.fields)]
+                            }`"
                             :is="
                               iconFieldMap[
                                 fieldType[
@@ -2761,7 +2780,7 @@ defineExpose({
                         :title="ele.desensitized ? '脱敏字段，不能被设置为查询条件' : ''"
                       >
                         <el-icon>
-                          <Icon :className="`field-icon-${fieldType[ele.deType]}`"
+                          <Icon
                             ><component
                               :class="`field-icon-${fieldType[ele.deType]}`"
                               class="svg-icon"
@@ -3144,8 +3163,8 @@ defineExpose({
             .ed-select-tags-wrapper.has-prefix {
               margin-left: 25px;
             }
-            .ed-tag {
-              max-width: 65px;
+            .ed-select__tags-text {
+              max-width: 38px !important;
             }
           }
 
diff --git a/core/core-frontend/src/hooks/web/useFilter.ts b/core/core-frontend/src/hooks/web/useFilter.ts
index 09f0ab5c1d..4732169df2 100644
--- a/core/core-frontend/src/hooks/web/useFilter.ts
+++ b/core/core-frontend/src/hooks/web/useFilter.ts
@@ -176,6 +176,18 @@ const getResult = (
   return [valueF || '', valueS || ''].filter(ele => ele !== '')
 }
 
+const getResultNum = (
+  defaultNumValueEnd,
+  numValueEnd,
+  numValueStart,
+  defaultNumValueStart,
+  firstLoad
+) => {
+  const valueS = firstLoad ? defaultNumValueStart : numValueStart
+  const valueE = firstLoad ? defaultNumValueEnd : numValueEnd
+  return [valueS || '', valueE || ''].filter(ele => ele !== '')
+}
+
 const getOperator = (
   displayType,
   multiple,
@@ -193,6 +205,11 @@ const getOperator = (
   if (+displayType === 9) {
     return multiple ? 'in' : 'eq'
   }
+
+  if (+displayType === 22) {
+    return 'between'
+  }
+
   const valueF = firstLoad ? defaultConditionValueF : conditionValueF
   const valueS = firstLoad ? defaultConditionValueS : conditionValueS
   const operatorF = firstLoad ? defaultConditionValueOperatorF : conditionValueOperatorF
@@ -240,6 +257,10 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa
             const {
               selectValue: value,
               timeGranularityMultiple,
+              defaultNumValueEnd,
+              numValueEnd,
+              numValueStart,
+              defaultNumValueStart,
               conditionType = 0,
               treeFieldList = [],
               defaultConditionValueOperatorF = 'eq',
@@ -325,6 +346,14 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa
                 conditionValueS,
                 firstLoad
               )
+            } else if (displayType === '22') {
+              selectValue = getResultNum(
+                defaultNumValueEnd,
+                numValueEnd,
+                numValueStart,
+                defaultNumValueStart,
+                firstLoad
+              )
             } else {
               selectValue = getValueByDefaultValueCheckOrFirstLoad(
                 defaultValueCheck,
@@ -409,6 +438,38 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa
                     isTree
                   })
                 }
+
+                if (item.checkedFieldsMapArrNum?.[curComponentId]?.length) {
+                  const endTimeFieldId = item.checkedFieldsMapArrNum?.[curComponentId].find(
+                    element => element !== fieldId
+                  )
+                  const resultEnd = Array(2).fill(
+                    endTimeFieldId === item.checkedFieldsMapEndNum[curComponentId]
+                      ? result[1]
+                      : result[0]
+                  )
+                  result = Array(2).fill(
+                    endTimeFieldId === item.checkedFieldsMapEndNum[curComponentId]
+                      ? result[0]
+                      : result[1]
+                  )
+                  parametersFilter = duplicateRemoval(
+                    item.parametersArr[curComponentId].filter(e => e.id === fieldId)
+                  )
+
+                  const parametersFilterEnd = duplicateRemoval(
+                    item.parametersArr[curComponentId].filter(e => e.id === endTimeFieldId)
+                  )
+                  filter.push({
+                    componentId: ele.id,
+                    fieldId: endTimeFieldId,
+                    operator,
+                    value: resultEnd,
+                    parameters: parametersFilterEnd,
+                    isTree
+                  })
+                }
+
                 filter.push({
                   componentId: ele.id,
                   fieldId,
diff --git a/core/core-frontend/src/views/visualized/data/datasource/index.vue b/core/core-frontend/src/views/visualized/data/datasource/index.vue
index cd18f472f0..9e9085ad50 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue
@@ -148,7 +148,7 @@ const datasourceEditor = ref()
 const activeTab = ref('')
 const menuList = [
   {
-    label: t('data_set.move_to'),
+    label: t('chart.move_to'),
     svgName: icon_intoItem_outlined,
     command: 'move'
   },