FatttSnake/oxygen-ui
1
0
Fork 0
Code Pull Requests Activity

Build:2 #50

Merged
FatttSnake merged 2 commits from FatttSnake into dev 2024-05-06 11:34:58 +08:00
Conversation 0 Commits 2 Files Changed 4 +10 -8
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f785c8271f - Show all commits

8
src/pages/System/Settings/SensitiveWord.tsx
View File

@@ -138,8 +138,12 @@ const SensitiveWord = () => {
dataSource={dataSource} dataSource={dataSource}
targetKeys={targetKeys} targetKeys={targetKeys}
selectedKeys={selectedKeys} selectedKeys={selectedKeys}
onChange={setTargetKeys} onChange={(value) => {
onSelectChange={setSelectedKeys} setTargetKeys(value as string[])
}}
onSelectChange={(value) => {
setSelectedKeys(value as string[])
}}
rowKey={(item) => item.id} rowKey={(item) => item.id}
render={(item) => item.word} render={(item) => item.word}
/> />

10
src/pages/System/Statistics/shared.ts
View File

@@ -14,6 +14,8 @@ import {
import { BarChart, BarSeriesOption, LineChart, LineSeriesOption } from 'echarts/charts' import { BarChart, BarSeriesOption, LineChart, LineSeriesOption } from 'echarts/charts'
import { SVGRenderer } from 'echarts/renderers' import { SVGRenderer } from 'echarts/renderers'
import { UniversalTransition } from 'echarts/features' 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 { CallbackDataParams } from 'echarts/types/dist/shared'
import { utcToLocalTime } from '@/util/datetime' import { utcToLocalTime } from '@/util/datetime'
@@ -81,15 +83,11 @@ export const barEChartsBaseOption: EChartsOption = {
export const getTooltipTimeFormatter = (format: string = 'yyyy-MM-DD HH:mm:ss') => { export const getTooltipTimeFormatter = (format: string = 'yyyy-MM-DD HH:mm:ss') => {
return (params: CallbackDataParams[]) => return (params: CallbackDataParams[]) =>
// eslint-disable-next-line @typescript-eslint/ban-ts-comment // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-member-access
// @ts-expect-error
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
`${utcToLocalTime(params[0].data[0], format)}<br>${params `${utcToLocalTime(params[0].data[0], format)}<br>${params
.map( .map(
(param) => (param) =>
// eslint-disable-next-line @typescript-eslint/ban-ts-comment // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
// @ts-expect-error
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
`<span style="display: flex; justify-content: space-between;"><span>${param.marker}${param.seriesName}</span><span style="font-weight: bold; margin-left: 16px;">${param.data[1]}</span></span>` `<span style="display: flex; justify-content: space-between;"><span>${param.marker}${param.seriesName}</span><span style="font-weight: bold; margin-left: 16px;">${param.data[1]}</span></span>`
) )
.join('')}` .join('')}`