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 1d9177a594..3f3eba59e6 100644 --- a/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue @@ -35,6 +35,14 @@ const filterTypeCom = computed(() => { : Select }) +const emits = defineEmits(['handleTimeTypeChange']) + +const handleTimeTypeChange = val => { + if (val === 'dynamic') { + emits('handleTimeTypeChange') + } +} + const props = defineProps({ curComponent: { type: Object, @@ -436,7 +444,7 @@ defineExpose({ v-if="curComponent.defaultValueCheck && ['1', '7'].includes(curComponent.displayType)" >
- + 固定时间 动态时间 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 594adfa216..5374899e90 100644 --- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue @@ -1332,6 +1332,11 @@ const timeGranularityChange = (val: string) => { } } +const handleTimeTypeChange = () => { + timeGranularityChange(curComponent.value.timeGranularity) + timeGranularityMultipleChange(curComponent.value.timeGranularityMultiple) +} + const timeGranularityMultipleChange = (val: string) => { handleDialogClick() curComponent.value.relativeToCurrentType = ['daterange', 'datetimerange'].includes(val) @@ -2121,6 +2126,7 @@ defineExpose({
diff --git a/core/core-frontend/src/utils/attr.ts b/core/core-frontend/src/utils/attr.ts index 0a57da747e..0cf07d90bd 100644 --- a/core/core-frontend/src/utils/attr.ts +++ b/core/core-frontend/src/utils/attr.ts @@ -100,16 +100,6 @@ export const selectKey = ['textAlign', 'borderStyle', 'verticalAlign'] export const horizontalPosition = ['headHorizontalPosition'] export const fieldType = ['text', 'time', 'value', 'value', 'value', 'location', 'binary', 'url'] -export const fieldTypeCalculated = [ - 'icon_text_calculated_outlined', - 'icon_calendar_calculated_outlined', - 'icon_number_calculated_outlined', - 'icon_number_calculated_outlined', - 'icon_number_calculated_outlined', - 'icon_local_calculated_outlined', - 'binary', - 'icon_link_calculated_outlined' -] export const fieldTypeText = [ '文本', '时间', diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue index 94aa087bbd..a2ccde6641 100644 --- a/core/core-frontend/src/views/chart/components/editor/index.vue +++ b/core/core-frontend/src/views/chart/components/editor/index.vue @@ -18,9 +18,7 @@ import { nextTick, onBeforeMount, provide, - h, unref, - getCurrentInstance, onMounted } from 'vue' import Icon from '@/components/icon-custom/src/Icon.vue' @@ -32,7 +30,7 @@ import { useEmitt } from '@/hooks/web/useEmitt' import { ElMessage, ElTreeSelect } from 'element-plus-secondary' import draggable from 'vuedraggable' import DimensionItem from './drag-item/DimensionItem.vue' -import { fieldType, fieldTypeCalculated } from '@/utils/attr' +import { fieldType } from '@/utils/attr' import QuotaItem from '@/views/chart/components/editor/drag-item/QuotaItem.vue' import DragPlaceholder from '@/views/chart/components/editor/drag-item/DragPlaceholder.vue' import FilterTree from './filter/FilterTree.vue' @@ -1454,7 +1452,7 @@ const confirmEditCalc = () => { const getIconName = (deType, extField, dimension = false) => { if (extField === 2) { const iconFieldCalculated = dimension ? iconFieldCalculatedMap : iconFieldCalculatedQMap - return iconFieldCalculated[fieldTypeCalculated[deType]] + return iconFieldCalculated[deType] } return iconFieldMap[fieldType[deType]] }