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

Fix:1; Refactor:1; Perf:1 #47

Merged
FatttSnake merged 3 commits from FatttSnake into dev 2024-04-22 16:22:28 +08:00
Conversation 0 Commits 3 Files Changed 8 +69 -21
8 changed files with 69 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/System/Group.tsx
View File

@@ -603,7 +603,7 @@ const Group = () => {
<AntdForm.Item
name={'name'}
label={'名称'}
rules={[{ required: true, whitespace: false }]}
rules={[{ required: true, whitespace: true }]}
>
<AntdInput allowClear />
</AntdForm.Item>

2
src/pages/System/Role.tsx
View File

@@ -612,7 +612,7 @@ const Role = () => {
<AntdForm.Item
name={'name'}
label={'名称'}
rules={[{ required: true, whitespace: false }]}
rules={[{ required: true, whitespace: true }]}
>
<AntdInput allowClear />
</AntdForm.Item>

4
src/pages/System/Statistics/ActiveInfo.tsx
View File

@@ -10,7 +10,7 @@ const ActiveInfo = () => {
const activeInfoDivRef = useRef<HTMLDivElement>(null)
const activeInfoEChartsRef = useRef<echarts.EChartsType | null>(null)
const [isLoading, setIsLoading] = useState(false)
const [scope, setScope] = useState('WEAK')
const [scope, setScope] = useState('WEEK')
useEffect(() => {
const chartResizeObserver = new ResizeObserver(() => {
@@ -165,7 +165,7 @@ const ActiveInfo = () => {
disabled={isLoading}
style={{ width: '8em' }}
>
<AntdSelect.Option key={'WEAK'}>最近7天</AntdSelect.Option>
<AntdSelect.Option key={'WEEK'}>最近7天</AntdSelect.Option>
<AntdSelect.Option key={'MONTH'}>最近30天</AntdSelect.Option>
<AntdSelect.Option key={'QUARTER'}>最近3个月</AntdSelect.Option>
<AntdSelect.Option key={'YEAR'}>最近12个月</AntdSelect.Option>

68
src/pages/System/Statistics/OnlineInfo.tsx
View File

@@ -11,7 +11,7 @@ const OnlineInfo = () => {
const onlineInfoEChartsRef = useRef<echarts.EChartsType | null>(null)
const [isLoading, setIsLoading] = useState(false)
const [currentOnlineCount, setCurrentOnlineCount] = useState(-1)
const [scope, setScope] = useState('WEAK')
const [scope, setScope] = useState('WEEK')
useEffect(() => {
const chartResizeObserver = new ResizeObserver(() => {
@@ -59,13 +59,53 @@ const OnlineInfo = () => {
const dataList = getTimesBetweenTwoTimes(
data.history[0].time,
data.history[data.history.length - 1].time,
'minute'
).map((time) => [
time,
data.history.find(
(value) => value.time.substring(0, 16) === time.substring(0, 16)
)?.record ?? 0
])
_scope === 'DAY'
? 'minute'
: _scope === 'WEEK'
? 'minute'
: _scope === 'MONTH'
? 'hour'
: 'day'
).map((time) => {
const records = data.history
.filter(
(value) =>
value.time.substring(
0,
_scope === 'DAY'
? 16
: _scope === 'WEEK'
? 16
: _scope === 'MONTH'
? 13
: 10
) ===
time.substring(
0,
_scope === 'DAY'
? 16
: _scope === 'WEEK'
? 16
: _scope === 'MONTH'
? 13
: 10
)
)
.map((item) => Number(item.record))
return [
time.substring(
0,
_scope === 'DAY'
? 16
: _scope === 'WEEK'
? 16
: _scope === 'MONTH'
? 13
: 10
),
records.length ? Math.max(...records) : 0
]
})
onlineInfoEChartsRef.current = echarts.init(
onlineInfoDivRef.current,
@@ -77,7 +117,15 @@ const OnlineInfo = () => {
...lineEChartsBaseOption,
tooltip: {
...lineEChartsBaseOption.tooltip,
formatter: getTooltipTimeFormatter('yyyy-MM-DD HH:mm')
formatter: getTooltipTimeFormatter(
_scope === 'DAY'
? 'yyyy-MM-DD HH:mm'
: _scope === 'WEEK'
? 'yyyy-MM-DD HH:mm'
: _scope === 'MONTH'
? 'yyyy-MM-DD HH时'
: 'yyyy-MM-DD'
)
},
xAxis: {
...lineEChartsBaseOption.xAxis
@@ -122,7 +170,7 @@ const OnlineInfo = () => {
style={{ width: '8em' }}
>
<AntdSelect.Option key={'DAY'}>最近24小时</AntdSelect.Option>
<AntdSelect.Option key={'WEAK'}>最近7天</AntdSelect.Option>
<AntdSelect.Option key={'WEEK'}>最近7天</AntdSelect.Option>
<AntdSelect.Option key={'MONTH'}>最近30天</AntdSelect.Option>
<AntdSelect.Option key={'QUARTER'}>最近3个月</AntdSelect.Option>
<AntdSelect.Option key={'YEAR'}>最近12个月</AntdSelect.Option>

2
src/pages/System/Tools/Base.tsx
View File

@@ -1046,7 +1046,7 @@ const Base = () => {
<AntdForm.Item
name={'name'}
label={'名称'}
rules={[{ required: true, whitespace: false }]}
rules={[{ required: true, whitespace: true }]}
>
<AntdInput allowClear />
</AntdForm.Item>

2
src/pages/System/Tools/Category.tsx
View File

@@ -272,7 +272,7 @@ const Category = () => {
<AntdForm.Item
name={'name'}
label={'名称'}
rules={[{ required: true, whitespace: false }]}
rules={[{ required: true, whitespace: true }]}
>
<AntdInput allowClear />
</AntdForm.Item>

2
src/pages/System/Tools/Template.tsx
View File

@@ -985,7 +985,7 @@ const Template = () => {
<AntdForm.Item
name={'name'}
label={'名称'}
rules={[{ required: true, whitespace: false }]}
rules={[{ required: true, whitespace: true }]}
>
<AntdInput allowClear />
</AntdForm.Item>

8
src/pages/System/User.tsx
View File

@@ -806,7 +806,7 @@ const User = () => {
<AntdForm.Item
name={'username'}
label={'用户名'}
rules={[{ required: true, whitespace: false }]}
rules={[{ required: true, whitespace: true }]}
>
<AntdInput allowClear />
</AntdForm.Item>
@@ -815,7 +815,7 @@ const User = () => {
<AntdForm.Item
name={'password'}
label={'密码'}
rules={[{ required: true, whitespace: false }]}
rules={[{ required: true, whitespace: true }]}
>
<AntdInput.Password allowClear />
</AntdForm.Item>
@@ -824,14 +824,14 @@ const User = () => {
<AntdForm.Item
name={'nickname'}
label={'昵称'}
rules={[{ required: true, whitespace: false }]}
rules={[{ required: true, whitespace: true }]}
>
<AntdInput allowClear />
</AntdForm.Item>
<AntdForm.Item
name={'email'}
label={'邮箱'}
rules={[{ required: true, whitespace: false, type: 'email' }]}
rules={[{ required: true, whitespace: true, type: 'email' }]}
>
<AntdInput type={'email'} allowClear />
</AntdForm.Item>