From f60379314ee3ab42663cdbb2c76c878136254858 Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Mon, 24 Jun 2024 16:06:45 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E6=95=88=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v-query/QueryConditionConfiguration.vue | 57 ------------------- 1 file changed, 57 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 79bf179229..35e92e3b0a 100644 --- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue @@ -24,14 +24,9 @@ import type { DatasetDetail } from '@/api/dataset' import { getDsDetailsWithPerm, getSqlParams, listFieldsWithPermissions } from '@/api/dataset' import EmptyBackground from '@/components/empty-background/src/EmptyBackground.vue' import { cloneDeep } from 'lodash-es' -import Select from './Select.vue' -import Time from './Time.vue' -import DynamicTime from './DynamicTime.vue' -import DynamicTimeRange from './DynamicTimeRange.vue' import { getDatasetTree } from '@/api/dataset' import { Tree } from '@/views/visualized/data/dataset/form/CreatDsGroup.vue' import draggable from 'vuedraggable' -import RangeFilterTime from './RangeFilterTime.vue' import type { ManipulateType } from 'dayjs' import dayjs from 'dayjs' import ConditionDefaultConfiguration from '@/custom-component/v-query/ConditionDefaultConfiguration.vue' @@ -710,17 +705,6 @@ const confirmValueSource = () => { cancelValueSource() } -const filterTypeCom = computed(() => { - const { displayType, timeType = 'fixed' } = curComponent.value - return ['1', '7'].includes(displayType) - ? timeType === 'dynamic' - ? displayType === '1' - ? DynamicTime - : DynamicTimeRange - : Time - : Select -}) - const setCondition = (queryId: string) => { conditions.value = cloneDeep(props.queryElement.propValue) || [] init(queryId) @@ -1013,36 +997,6 @@ const relativeToCurrentList = computed(() => { ] }) -const dynamicTime = computed(() => { - const { displayType, timeType } = curComponent.value - return timeType === 'dynamic' && [1, 7].includes(+displayType) -}) - -const relativeToCurrentTypeList = computed(() => { - if (!curComponent.value) return [] - let index = ['year', 'month', 'date', 'datetime'].indexOf(curComponent.value.timeGranularity) + 1 - if (+curComponent.value.displayType === 7) { - index = - ['yearrange', 'monthrange', 'daterange', 'datetimerange'].indexOf( - curComponent.value.timeGranularityMultiple - ) + 1 - } - return [ - { - label: '年', - value: 'year' - }, - { - label: '月', - value: 'month' - }, - { - label: '日', - value: 'date' - } - ].slice(0, index) -}) - const timeGranularityChange = (val: string) => { if ( ['year', 'month', 'date', 'datetime'].indexOf(val) < @@ -1085,17 +1039,6 @@ const timeGranularityMultipleChange = (val: string) => { aroundRange: 'f' } } -const aroundList = [ - { - label: '前', - value: 'f' - }, - { - label: '后', - value: 'b' - } -] - watch( () => showError.value, val => {