diff --git a/react-ui/config/routes.ts b/react-ui/config/routes.ts index 8838c75a..3caca59f 100644 --- a/react-ui/config/routes.ts +++ b/react-ui/config/routes.ts @@ -360,6 +360,16 @@ export default [ path: 'role-auth/user/:id', component: './System/Role/authUser', }, + { + name: '日志', + path: 'log', + routes: [ + { + path: '', + redirect: '/system/log/operlog', + }, + ], + }, ], }, { diff --git a/react-ui/src/pages/Monitor/JobLog/detail.tsx b/react-ui/src/pages/Monitor/JobLog/detail.tsx index d6b25913..10cac4e4 100644 --- a/react-ui/src/pages/Monitor/JobLog/detail.tsx +++ b/react-ui/src/pages/Monitor/JobLog/detail.tsx @@ -28,7 +28,7 @@ const JobLogDetailForm: React.FC = (props) => { return ( = (props) => { const [form] = Form.useForm(); - const { configTypeOptions } = props; + const formLayout = { + labelCol: { span: 4 }, + wrapperCol: { span: 20 }, + }; useEffect(() => { form.resetFields(); @@ -32,7 +35,7 @@ const ConfigForm: React.FC = (props) => { configName: props.values.configName, configKey: props.values.configKey, configValue: props.values.configValue, - configType: props.values.configType, + configType: props.values.configType || Object.keys(configTypeOptions)[0], createBy: props.values.createBy, createTime: props.values.createTime, updateBy: props.values.updateBy, @@ -54,7 +57,7 @@ const ConfigForm: React.FC = (props) => { return ( = (props) => { submitter={false} layout="horizontal" onFinish={handleFinish} + {...formLayout} + size="large" + labelAlign="right" + autoComplete="off" > { handleRefreshCache(); }} > - + {' '} , ]} diff --git a/react-ui/src/pages/System/DictData/edit.tsx b/react-ui/src/pages/System/DictData/edit.tsx index 8f03931a..deef59d6 100644 --- a/react-ui/src/pages/System/DictData/edit.tsx +++ b/react-ui/src/pages/System/DictData/edit.tsx @@ -23,8 +23,11 @@ export type DataFormProps = { const DictDataForm: React.FC = (props) => { const [form] = Form.useForm(); - const { statusOptions } = props; + const formLayout = { + labelCol: { span: 4 }, + wrapperCol: { span: 20 }, + }; useEffect(() => { form.resetFields(); @@ -36,8 +39,8 @@ const DictDataForm: React.FC = (props) => { dictType: props.values.dictType, cssClass: props.values.cssClass, listClass: props.values.listClass, - isDefault: props.values.isDefault, - status: props.values.status, + isDefault: props.values.isDefault || 'N', + status: props.values.status || Object.keys(statusOptions)[0], createBy: props.values.createBy, createTime: props.values.createTime, updateBy: props.values.updateBy, @@ -59,7 +62,7 @@ const DictDataForm: React.FC = (props) => { return ( = (props) => { submitter={false} layout="horizontal" onFinish={handleFinish} + {...formLayout} + size="large" + labelAlign="right" + autoComplete="off" > = (props) => { id: 'system.dict.data.dict_sort', defaultMessage: '字典排序', })} - colProps={{ md: 12, xl: 12 }} + colProps={{ md: 12, xl: 24 }} placeholder="请输入字典排序" rules={[ { @@ -203,7 +210,6 @@ const DictDataForm: React.FC = (props) => { Y: '是', N: '否', }} - initialValue={'N'} colProps={{ md: 12, xl: 24 }} placeholder="请输入是否默认" rules={[ @@ -220,7 +226,6 @@ const DictDataForm: React.FC = (props) => { id: 'system.dict.data.status', defaultMessage: '状态', })} - initialValue={'0'} colProps={{ md: 12, xl: 24 }} placeholder="请输入状态" rules={[ diff --git a/react-ui/src/pages/System/Logininfor/edit.tsx b/react-ui/src/pages/System/Logininfor/edit.tsx index 6248b376..5f7aa0a2 100644 --- a/react-ui/src/pages/System/Logininfor/edit.tsx +++ b/react-ui/src/pages/System/Logininfor/edit.tsx @@ -22,8 +22,11 @@ export type LogininforFormProps = { const LogininforForm: React.FC = (props) => { const [form] = Form.useForm(); - const { statusOptions } = props; + const formLayout = { + labelCol: { span: 4 }, + wrapperCol: { span: 20 }, + }; useEffect(() => { form.resetFields(); @@ -54,7 +57,7 @@ const LogininforForm: React.FC = (props) => { return ( = (props) => { onOk={handleOk} onCancel={handleCancel} > - + = (props) => { const [form] = Form.useForm(); - const { noticeTypeOptions, statusOptions } = props; + const formLayout = { + labelCol: { span: 4 }, + wrapperCol: { span: 20 }, + }; useEffect(() => { form.resetFields(); @@ -34,7 +37,7 @@ const NoticeForm: React.FC = (props) => { noticeTitle: props.values.noticeTitle, noticeType: props.values.noticeType, noticeContent: props.values.noticeContent, - status: props.values.status, + status: props.values.status || Object.keys(statusOptions)[0], createBy: props.values.createBy, createTime: props.values.createTime, updateBy: props.values.updateBy, @@ -56,7 +59,7 @@ const NoticeForm: React.FC = (props) => { return ( = (props) => { submitter={false} layout="horizontal" onFinish={handleFinish} + {...formLayout} + size="large" + labelAlign="right" + autoComplete="off" > = (props) => { return ( { tableAlertRender={false} tableAlertOptionRender={false} toolBarRender={() => [ - , + // ,