diff --git a/dinky-web/src/app.tsx b/dinky-web/src/app.tsx index 6a49f597ee..f0b998e7ef 100644 --- a/dinky-web/src/app.tsx +++ b/dinky-web/src/app.tsx @@ -21,7 +21,6 @@ import { AccessContextProvider } from '@/hooks/useAccess'; import { UnAccessible } from '@/pages/Other/403'; import { API_CONSTANTS } from '@/services/endpoints'; import { SysMenu } from '@/types/AuthCenter/data'; -import { THEME } from '@/types/Public/data'; import { l } from '@/utils/intl'; import { PageLoading, Settings as LayoutSettings } from '@ant-design/pro-components'; import type { RunTimeLayoutConfig } from '@umijs/max'; @@ -97,7 +96,10 @@ export async function getInitialState(): Promise<{ const { location } = history; if (location.pathname !== loginPath) { const currentUser = await fetchUserInfo(); - extraRoutes = currentUser?.menuList; + if (currentUser?.menuList) { + extraRoutes = currentUser?.menuList; + } + return { fetchUserInfo, currentUser, @@ -112,8 +114,6 @@ export async function getInitialState(): Promise<{ // ProLayout 支持的api https://procomponents.ant.design/components/layout export const layout: RunTimeLayoutConfig = ({ initialState }) => { - const theme = localStorage.getItem('navTheme') ?? THEME.light; - return { headerTitleRender: () => { // 重新对 title 的设置进行设置 @@ -146,8 +146,9 @@ export const layout: RunTimeLayoutConfig = ({ initialState }) => { unAccessible: , // 增加一个 loading 的状态 childrenRender: (children) => { - if (initialState?.loading) return ; - return ( + return initialState?.loading ? ( + + ) : ( {children} diff --git a/dinky-web/src/pages/AuthCenter/Token/component/TokenModalForm/TokenForm/index.tsx b/dinky-web/src/pages/AuthCenter/Token/component/TokenModalForm/TokenForm/index.tsx index 762cb34121..c300d4fe28 100644 --- a/dinky-web/src/pages/AuthCenter/Token/component/TokenModalForm/TokenForm/index.tsx +++ b/dinky-web/src/pages/AuthCenter/Token/component/TokenModalForm/TokenForm/index.tsx @@ -25,6 +25,7 @@ import { } from '@/pages/AuthCenter/Token/component/function'; import { TokenStateType } from '@/pages/AuthCenter/Token/component/model'; import { UserBaseInfo } from '@/types/AuthCenter/data'; +import { l } from '@/utils/intl'; import { ProFormDateTimePicker, ProFormDateTimeRangePicker, @@ -35,7 +36,6 @@ import { } from '@ant-design/pro-components'; import { connect } from '@umijs/max'; import React from 'react'; -import {l} from "@/utils/intl"; type TokenFormProps = { users: UserBaseInfo.User[]; @@ -56,7 +56,7 @@ const TokenForm: React.FC = (props) => { label={l('token.value')} width={'xl'} placeholder={l('token.generate.placeholder')} - rules={[{ required: true, message:l('token.generate.placeholder') }]} + rules={[{ required: true, message: l('token.generate.placeholder') }]} fieldProps={{ suffix: buildToken()}>{l('token.generate')} }} diff --git a/dinky-web/src/pages/AuthCenter/Token/component/TokenModalForm/index.tsx b/dinky-web/src/pages/AuthCenter/Token/component/TokenModalForm/index.tsx index b281b70cc2..e9911cbe39 100644 --- a/dinky-web/src/pages/AuthCenter/Token/component/TokenModalForm/index.tsx +++ b/dinky-web/src/pages/AuthCenter/Token/component/TokenModalForm/index.tsx @@ -17,19 +17,18 @@ * */ -import {FormContextValue} from '@/components/Context/FormContext'; -import {mapDispatchToProps, TokenStateType} from '@/pages/AuthCenter/Token/component/model'; +import { FormContextValue } from '@/components/Context/FormContext'; +import { mapDispatchToProps, TokenStateType } from '@/pages/AuthCenter/Token/component/model'; import TokenForm from '@/pages/AuthCenter/Token/component/TokenModalForm/TokenForm'; -import {DATETIME_FORMAT, MODAL_FORM_STYLE} from '@/services/constants'; -import {SysToken} from '@/types/AuthCenter/data.d'; -import {formatDateToYYYYMMDDHHMMSS, parseDateStringToDate} from '@/utils/function'; -import {l} from '@/utils/intl'; -import {ModalForm} from '@ant-design/pro-components'; -import {ProFormInstance} from '@ant-design/pro-form/lib'; -import {connect} from '@umijs/max'; -import {Button, Form} from 'antd'; -import React, {useEffect, useRef} from 'react'; -import dayjs from "dayjs"; +import { MODAL_FORM_STYLE } from '@/services/constants'; +import { SysToken } from '@/types/AuthCenter/data.d'; +import { formatDateToYYYYMMDDHHMMSS, parseDateStringToDate } from '@/utils/function'; +import { l } from '@/utils/intl'; +import { ModalForm } from '@ant-design/pro-components'; +import { ProFormInstance } from '@ant-design/pro-form/lib'; +import { connect } from '@umijs/max'; +import { Button, Form } from 'antd'; +import React, { useEffect, useRef } from 'react'; const DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss'; @@ -88,11 +87,11 @@ const TokenModalForm: React.FC = (props) => { value.expireType === 2 ? parseDateStringToDate(value.expireEndTime) : value.expireType === 3 - ? [ + ? [ parseDateStringToDate(value.expireStartTime), parseDateStringToDate(value.expireEndTime) ] - : undefined + : undefined }); }, [visible, value, form, selectUserId]); @@ -109,24 +108,24 @@ const TokenModalForm: React.FC = (props) => { */ const submitForm = async () => { const fieldsValue = await form.validateFields(); - let result = {...value, ...fieldsValue}; + let result = { ...value, ...fieldsValue }; // 转化时间 if (fieldsValue.expireType === 2) { // 只有一个时间 设置为结束时间 result = { ...result, - expireEndTime: formatDateToYYYYMMDDHHMMSS(fieldsValue.expireTime), - } + expireEndTime: formatDateToYYYYMMDDHHMMSS(fieldsValue.expireTime) + }; } else if (fieldsValue.expireType === 3) { // 两个时间都有 设置开始时间和结束时间 result = { ...result, expireEndTime: formatDateToYYYYMMDDHHMMSS(fieldsValue.expireTime[0]), - expireStartTime: formatDateToYYYYMMDDHHMMSS(fieldsValue.expireTime[1]), + expireStartTime: formatDateToYYYYMMDDHHMMSS(fieldsValue.expireTime[1]) }; } - await handleSubmit({...result}); + await handleSubmit({ ...result }); await handleCancel(); }; @@ -161,16 +160,16 @@ const TokenModalForm: React.FC = (props) => { form={form} formRef={formRef} onValuesChange={handleValuesChange} - submitter={{render: () => [...renderFooter()]}} - initialValues={{...value}} + submitter={{ render: () => [...renderFooter()] }} + initialValues={{ ...value }} > - + ); }; export default connect( - ({Token}: { Token: TokenStateType }) => ({ + ({ Token }: { Token: TokenStateType }) => ({ tokenValue: Token.token }), mapDispatchToProps diff --git a/dinky-web/src/pages/DataStudio/HeaderContainer/index.tsx b/dinky-web/src/pages/DataStudio/HeaderContainer/index.tsx index d690a5a187..2e6466c226 100644 --- a/dinky-web/src/pages/DataStudio/HeaderContainer/index.tsx +++ b/dinky-web/src/pages/DataStudio/HeaderContainer/index.tsx @@ -332,11 +332,9 @@ const HeaderContainer = (props: any) => { } return ( - <> - - '} items={buildBreadcrumbItems(activeBreadcrumbTitle)} /> - - + + '} items={buildBreadcrumbItems(activeBreadcrumbTitle)} /> + ); }; const renderHotkey = () => { @@ -397,14 +395,12 @@ const HeaderContainer = (props: any) => { * render */ return ( - <> - - {renderBreadcrumbItems()} - - {renderRightButtons()} - - - + + {renderBreadcrumbItems()} + + {renderRightButtons()} + + ); }; diff --git a/dinky-web/src/pages/SettingCenter/GlobalSetting/model.ts b/dinky-web/src/pages/SettingCenter/GlobalSetting/model.ts index e9d948ac3e..6e6ddbe766 100644 --- a/dinky-web/src/pages/SettingCenter/GlobalSetting/model.ts +++ b/dinky-web/src/pages/SettingCenter/GlobalSetting/model.ts @@ -49,7 +49,7 @@ const ConfigModel: ConfigModelType = { const response: BaseConfigProperties[] = yield call(queryDsConfig, payload); yield put({ type: 'saveDsConfig', - payload: response + payload: response || [] }); } }, diff --git a/dinky-web/src/utils/function.tsx b/dinky-web/src/utils/function.tsx index 8bb00ab4b8..7c88d745d3 100644 --- a/dinky-web/src/utils/function.tsx +++ b/dinky-web/src/utils/function.tsx @@ -568,5 +568,5 @@ export const formatDateToYYYYMMDDHHMMSS = (date: Date) => { }; export const parseDateStringToDate = (dateString: Date) => { - return dayjs(dateString).toDate(); + return dayjs(dateString).toDate(); };