diff --git a/src/hooks/useChartInteract.hook.ts b/src/hooks/useChartInteract.hook.ts index 78fdb52e..9ca42a74 100644 --- a/src/hooks/useChartInteract.hook.ts +++ b/src/hooks/useChartInteract.hook.ts @@ -19,9 +19,9 @@ export const useChartInteract = ( return item.interactOn === onEvent }) + if (fnOnEvent.length === 0) return fnOnEvent.forEach(item => { const index = chartEditStore.fetchTargetIndex(item.interactComponents) - if (index !== -1) return const { Params, Header } = toRefs(chartEditStore.componentList[index].request.requestParams) Object.keys(item.interactFn).forEach(key => { if (Params.value[key]) { diff --git a/src/packages/components/Decorates/Inputs/InputsDate/index.vue b/src/packages/components/Decorates/Inputs/InputsDate/index.vue index ac658b58..e370e9de 100644 --- a/src/packages/components/Decorates/Inputs/InputsDate/index.vue +++ b/src/packages/components/Decorates/Inputs/InputsDate/index.vue @@ -31,12 +31,12 @@ const option = shallowReactive({ const onChange = (v: number | number[]) => { if (v instanceof Array) { - const data1 = dayjs(v[0]).format('YYYY-MM-DD') - const data2 = dayjs(v[1]).format('YYYY-MM-DD') - useChartInteract(props.chartConfig, useChartEditStore, { data1, data2 }, 'change') + const dateStart = dayjs(v[0]).format('YYYY-MM-DD') + const dateEnd = dayjs(v[1]).format('YYYY-MM-DD') + useChartInteract(props.chartConfig, useChartEditStore, { dateStart, dateEnd }, 'change') } else { - const data1 = dayjs(v).format('YYYY-MM-DD') - useChartInteract(props.chartConfig, useChartEditStore, { data1 }, 'change') + const date = dayjs(v).format('YYYY-MM-DD') + useChartInteract(props.chartConfig, useChartEditStore, { date }, 'change') } }