Optimize import. Optimize date convert.

2023-11-29 11:12:35 +08:00
parent df16af6872
commit 5bcfa2be9c
23 changed files with 100 additions and 92 deletions
--- a/src/pages/system/Group.tsx
+++ b/src/pages/system/Group.tsx
@@ -1,9 +1,5 @@
-import React, { useEffect, useState } from 'react'
+import React from 'react'
 import Icon from '@ant-design/icons'
-import FitFullScreen from '@/components/common/FitFullScreen'
-import HideScrollbar from '@/components/common/HideScrollbar'
-import FlexBox from '@/components/common/FlexBox'
-import Card from '@/components/common/Card'
 import {
    COLOR_ERROR_SECONDARY,
    COLOR_FONT_SECONDARY,
@@ -14,7 +10,7 @@ import {
    DATABASE_SELECT_SUCCESS,
    DATABASE_UPDATE_SUCCESS
 } from '@/constants/common.constants'
-import { getLocalTime } from '@/utils/common'
+import { utcToLocalTime } from '@/utils/common'
 import {
    r_sys_group_add,
    r_sys_group_change_status,
@@ -24,6 +20,10 @@ import {
    r_sys_group_update,
    r_sys_role_get_list
 } from '@/services/system'
+import FitFullScreen from '@/components/common/FitFullScreen'
+import HideScrollbar from '@/components/common/HideScrollbar'
+import FlexBox from '@/components/common/FlexBox'
+import Card from '@/components/common/Card'

 const Group: React.FC = () => {
    const [modal, contextHolder] = AntdModal.useModal()
@@ -75,14 +75,14 @@ const Group: React.FC = () => {
            dataIndex: 'createTime',
            width: '10%',
            align: 'center',
-            render: (value: string) => getLocalTime(value)
+            render: (value: string) => utcToLocalTime(value)
        },
        {
            title: '修改时间',
            dataIndex: 'updateTime',
            width: '10%',
            align: 'center',
-            render: (value: string) => getLocalTime(value)
+            render: (value: string) => utcToLocalTime(value)
        },
        {
            title: '状态',
--- a/src/pages/system/Log.tsx
+++ b/src/pages/system/Log.tsx
@@ -1,14 +1,15 @@
 import React from 'react'
-import FitFullScreen from '@/components/common/FitFullScreen'
-import Card from '@/components/common/Card'
-import { r_sys_log_get } from '@/services/system'
+import dayjs from 'dayjs'
 import {
    COLOR_ERROR_SECONDARY,
    COLOR_FONT_SECONDARY,
    DATABASE_SELECT_SUCCESS
 } from '@/constants/common.constants'
+import { dayjsToUtc, utcToLocalTime } from '@/utils/common'
+import { r_sys_log_get } from '@/services/system'
+import FitFullScreen from '@/components/common/FitFullScreen'
+import Card from '@/components/common/Card'
 import HideScrollbar from '@/components/common/HideScrollbar'
-import { getLocalTime } from '@/utils/common'
 import FlexBox from '@/components/common/FlexBox'

 const Log: React.FC = () => {
@@ -87,7 +88,7 @@ const Log: React.FC = () => {
        {
            title: '开始时间',
            dataIndex: 'startTime',
-            render: (value: string) => getLocalTime(value),
+            render: (value: string) => utcToLocalTime(value),
            align: 'center',
            sorter: true
        },
@@ -96,7 +97,9 @@ const Log: React.FC = () => {
            dataIndex: 'executeTime',
            render: (value, record) => (
                <AntdTooltip
-                    title={`${getLocalTime(record.startTime)} ~ ${getLocalTime(record.endTime)}`}
+                    title={`${utcToLocalTime(record.startTime)} ~ ${utcToLocalTime(
+                        record.endTime
+                    )}`}
                >
                    {`${value}ms`}
                </AntdTooltip>
@@ -188,12 +191,9 @@ const Log: React.FC = () => {
        }
    }

-    const handleOnDateRangeChange = (_dates: unknown, dateStrings: [string, string]) => {
-        if (dateStrings[0] && dateStrings[1]) {
-            setTimeRange([
-                new Date(dateStrings[0]).toISOString(),
-                new Date(dateStrings[1]).toISOString()
-            ])
+    const handleOnDateRangeChange = (dates: [dayjs.Dayjs | null, dayjs.Dayjs | null] | null) => {
+        if (dates && dates[0] && dates[1]) {
+            setTimeRange([dayjsToUtc(dates[0]), dayjsToUtc(dates[1])])
        } else {
            setTimeRange(undefined)
        }
--- a/src/pages/system/Role.tsx
+++ b/src/pages/system/Role.tsx
@@ -1,17 +1,5 @@
-import React, { useEffect, useState } from 'react'
-import FitFullScreen from '@/components/common/FitFullScreen'
-import HideScrollbar from '@/components/common/HideScrollbar'
-import FlexBox from '@/components/common/FlexBox'
-import Card from '@/components/common/Card'
-import {
-    r_sys_role_add,
-    r_sys_role_change_status,
-    r_sys_power_get_list,
-    r_sys_role_get,
-    r_sys_role_update,
-    r_sys_role_delete,
-    r_sys_role_delete_list
-} from '@/services/system'
+import React from 'react'
+import Icon from '@ant-design/icons'
 import {
    COLOR_ERROR_SECONDARY,
    COLOR_FONT_SECONDARY,
@@ -22,8 +10,20 @@ import {
    DATABASE_SELECT_SUCCESS,
    DATABASE_UPDATE_SUCCESS
 } from '@/constants/common.constants'
-import Icon from '@ant-design/icons'
-import { getLocalTime, powerListToPowerTree } from '@/utils/common'
+import { utcToLocalTime, powerListToPowerTree } from '@/utils/common'
+import {
+    r_sys_role_add,
+    r_sys_role_change_status,
+    r_sys_power_get_list,
+    r_sys_role_get,
+    r_sys_role_update,
+    r_sys_role_delete,
+    r_sys_role_delete_list
+} from '@/services/system'
+import FitFullScreen from '@/components/common/FitFullScreen'
+import HideScrollbar from '@/components/common/HideScrollbar'
+import FlexBox from '@/components/common/FlexBox'
+import Card from '@/components/common/Card'

 const Role: React.FC = () => {
    const [modal, contextHolder] = AntdModal.useModal()
@@ -67,14 +67,14 @@ const Role: React.FC = () => {
            dataIndex: 'createTime',
            width: '10%',
            align: 'center',
-            render: (value: string) => getLocalTime(value)
+            render: (value: string) => utcToLocalTime(value)
        },
        {
            title: '修改时间',
            dataIndex: 'updateTime',
            width: '10%',
            align: 'center',
-            render: (value: string) => getLocalTime(value)
+            render: (value: string) => utcToLocalTime(value)
        },
        {
            title: '状态',
--- a/src/pages/system/User.tsx
+++ b/src/pages/system/User.tsx
@@ -1,4 +1,6 @@
-import React, { useEffect, useState } from 'react'
+import React from 'react'
+import Icon from '@ant-design/icons'
+import dayjs from 'dayjs'
 import {
    COLOR_BACKGROUND,
    COLOR_ERROR_SECONDARY,
@@ -10,12 +12,7 @@ import {
    DATABASE_SELECT_SUCCESS,
    DATABASE_UPDATE_SUCCESS
 } from '@/constants/common.constants'
-import { ColumnsType } from 'antd/es/table/interface'
-import FitFullScreen from '@/components/common/FitFullScreen.tsx'
-import HideScrollbar from '@/components/common/HideScrollbar.tsx'
-import FlexBox from '@/components/common/FlexBox.tsx'
-import Card from '@/components/common/Card.tsx'
-import Icon from '@ant-design/icons'
+import { utcToLocalTime, isPastTime, localTimeToUtc, dayjsToUtc } from '@/utils/common'
 import {
    r_sys_group_get_list,
    r_sys_role_get_list,
@@ -24,10 +21,12 @@ import {
    r_sys_user_delete_list,
    r_sys_user_get,
    r_sys_user_update
-} from '@/services/system.tsx'
-import { getLocalTime, isPastTime } from '@/utils/common.tsx'
-import { r_api_avatar_random_base64 } from '@/services/api/avatar.ts'
-import moment from 'moment'
+} from '@/services/system'
+import { r_api_avatar_random_base64 } from '@/services/api/avatar'
+import FitFullScreen from '@/components/common/FitFullScreen'
+import HideScrollbar from '@/components/common/HideScrollbar'
+import FlexBox from '@/components/common/FlexBox'
+import Card from '@/components/common/Card'

 const User: React.FC = () => {
    const [modal, contextHolder] = AntdModal.useModal()
@@ -57,7 +56,7 @@ const User: React.FC = () => {
    const [tableSelectedItem, setTableSelectedItem] = useState<React.Key[]>([])
    const [avatar, setAvatar] = useState('')

-    const dataColumns: ColumnsType<UserWithRoleInfoVo> = [
+    const dataColumns: _ColumnsType<UserWithRoleInfoVo> = [
        {
            dataIndex: 'username',
            title: '用户',
@@ -122,7 +121,7 @@ const User: React.FC = () => {
            title: '最近登录',
            render: (_, record) =>
                record.currentLoginTime
-                    ? `${getLocalTime(record.currentLoginTime)}【${record.currentLoginIp}】`
+                    ? `${utcToLocalTime(record.currentLoginTime)}【${record.currentLoginIp}】`
                    : '无',
            align: 'center'
        },
@@ -334,10 +333,10 @@ const User: React.FC = () => {
            void r_sys_user_update({
                ...formValues,
                expiration: formValues.expiration
-                    ? new Date(formValues.expiration).toISOString()
+                    ? localTimeToUtc(formValues.expiration)
                    : undefined,
                credentialsExpiration: formValues.credentialsExpiration
-                    ? new Date(formValues.credentialsExpiration).toISOString()
+                    ? localTimeToUtc(formValues.credentialsExpiration)
                    : undefined
            })
                .then((res) => {
@@ -362,10 +361,10 @@ const User: React.FC = () => {
            void r_sys_user_add({
                ...formValues,
                expiration: formValues.expiration
-                    ? new Date(formValues.expiration).toISOString()
+                    ? localTimeToUtc(formValues.expiration)
                    : undefined,
                credentialsExpiration: formValues.credentialsExpiration
-                    ? new Date(formValues.credentialsExpiration).toISOString()
+                    ? localTimeToUtc(formValues.credentialsExpiration)
                    : undefined
            })
                .then((res) => {
@@ -649,9 +648,9 @@ const User: React.FC = () => {
            <AntdForm.Item
                name={'expiration'}
                label={'过期时间'}
-                getValueProps={(date: string) => (date ? { value: moment.utc(date) } : {})}
-                getValueFromEvent={(_, dateString: string) =>
-                    dateString ? moment(dateString).format('yyyy-MM-DD HH:mm:ss') : undefined
+                getValueProps={(date: string) => (date ? { value: dayjs(date) } : {})}
+                getValueFromEvent={(date: dayjs.Dayjs | null) =>
+                    date ? dayjsToUtc(date) : undefined
                }
            >
                <AntdDatePicker showTime allowClear changeOnBlur style={{ width: '100%' }} />
@@ -659,9 +658,9 @@ const User: React.FC = () => {
            <AntdForm.Item
                name={'credentialsExpiration'}
                label={'认证过期时间'}
-                getValueProps={(date: string) => (date ? { value: moment.utc(date) } : {})}
-                getValueFromEvent={(_, dateString: string) =>
-                    dateString ? moment(dateString).format('yyyy-MM-DD HH:mm:ss') : undefined
+                getValueProps={(date: string) => (date ? { value: dayjs(date) } : {})}
+                getValueFromEvent={(date: dayjs.Dayjs | null) =>
+                    date ? dayjsToUtc(date) : undefined
                }
            >
                <AntdDatePicker showTime allowClear changeOnBlur style={{ width: '100%' }} />