From f785c8271f2cc7512cd72bf732715bff6f496766 Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Mon, 6 May 2024 11:01:02 +0800 Subject: [PATCH] Build(SensitiveWord and Echarts): Fix tsc error --- src/pages/System/Settings/SensitiveWord.tsx | 8 ++++++-- src/pages/System/Statistics/shared.ts | 10 ++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/pages/System/Settings/SensitiveWord.tsx b/src/pages/System/Settings/SensitiveWord.tsx index db80be5..0a0c32e 100644 --- a/src/pages/System/Settings/SensitiveWord.tsx +++ b/src/pages/System/Settings/SensitiveWord.tsx @@ -138,8 +138,12 @@ const SensitiveWord = () => { dataSource={dataSource} targetKeys={targetKeys} selectedKeys={selectedKeys} - onChange={setTargetKeys} - onSelectChange={setSelectedKeys} + onChange={(value) => { + setTargetKeys(value as string[]) + }} + onSelectChange={(value) => { + setSelectedKeys(value as string[]) + }} rowKey={(item) => item.id} render={(item) => item.word} /> diff --git a/src/pages/System/Statistics/shared.ts b/src/pages/System/Statistics/shared.ts index 8e3a0f4..bebc1b6 100644 --- a/src/pages/System/Statistics/shared.ts +++ b/src/pages/System/Statistics/shared.ts @@ -14,6 +14,8 @@ import { import { BarChart, BarSeriesOption, LineChart, LineSeriesOption } from 'echarts/charts' import { SVGRenderer } from 'echarts/renderers' import { UniversalTransition } from 'echarts/features' +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-expect-error import { CallbackDataParams } from 'echarts/types/dist/shared' import { utcToLocalTime } from '@/util/datetime' @@ -81,15 +83,11 @@ export const barEChartsBaseOption: EChartsOption = { export const getTooltipTimeFormatter = (format: string = 'yyyy-MM-DD HH:mm:ss') => { return (params: CallbackDataParams[]) => - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-expect-error - // eslint-disable-next-line @typescript-eslint/no-unsafe-argument + // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-member-access `${utcToLocalTime(params[0].data[0], format)}
${params .map( (param) => - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-expect-error - // eslint-disable-next-line @typescript-eslint/restrict-template-expressions + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access `${param.marker}${param.seriesName}${param.data[1]}` ) .join('')}`