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

Pr@dev v2 dzz

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

@@ -212,6 +212,8 @@ const infoFormat = (obj: ComponentInfo) => {
     timeNum: 0,
     relativeToCurrentType: 'year',
     around: 'f',
+    parametersStart: null,
+    parametersEnd: null,
     arbitraryTime: new Date(),
     timeNumRange: 0,
     relativeToCurrentTypeRange: 'year',

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

@@ -478,6 +478,8 @@ const parameterCompletion = () => {
   const attributes = {
     timeType: 'fixed',
     required: false,
+    parametersStart: null,
+    parametersEnd: null,
     relativeToCurrent: 'custom',
     timeNum: 0,
     relativeToCurrentType: 'year',
@@ -1184,8 +1186,7 @@ defineExpose({
                   <el-select
                     popper-class="dataset-parameters"
                     value-key="id"
-                    multiple
+                    v-model="curComponent.parametersStart"
-                    v-model="curComponent.parameters"
                     clearable
                   >
                     <el-option
@@ -1205,8 +1206,7 @@ defineExpose({
                   <el-select
                     popper-class="dataset-parameters"
                     value-key="id"
-                    multiple
+                    v-model="curComponent.parametersEnd"
-                    v-model="curComponent.parameters"
                     clearable
                   >
                     <el-option

core/core-frontend/src/hooks/web/useFilter.ts

@@ -90,6 +90,8 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa
             let selectValue = ''
             const {
               selectValue: value,
+              parametersStart,
+              parametersEnd,
               defaultValueCheck,
               timeType = 'fixed',
               defaultValue,
@@ -154,7 +156,16 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa
                 fieldId: item.checkedFieldsMap[curComponentId],
                 operator: [1, 7].includes(+displayType) ? 'between' : multiple ? 'in' : 'eq',
                 value: values,
-                parameters: parametersCheck ? parameters : [],
+                parameters: parametersCheck
+                  ? +displayType === 7
+                    ? [
+                        parametersStart,
+                        parametersEnd?.id
+                          ? { ...parametersEnd, id: `${parametersEnd.id}_START_END_SPLIT` }
+                          : parametersEnd
+                      ]
+                    : parameters
+                  : [],
                 isTree
               })
             }