{
// remove all caches
if (window.caches) {
@@ -23,7 +21,7 @@ const clearCache = () => {
if (pwa) {
// Notify user if offline now
window.addEventListener('sw.offline', () => {
- message.warning(useIntl().formatMessage({ id: 'app.pwa.offline' }));
+ message.warning('当前处于离线状态');
});
// Pop up a prompt on the page asking the user if they want to use the latest version
@@ -46,9 +44,13 @@ if (pwa) {
resolve(msgEvent.data);
}
};
- worker.postMessage({ type: 'skip-waiting' }, [channel.port2]);
+ worker.postMessage(
+ {
+ type: 'skip-waiting',
+ },
+ [channel.port2],
+ );
});
-
clearCache();
window.location.reload();
return true;
@@ -62,12 +64,12 @@ if (pwa) {
reloadSW();
}}
>
- {useIntl().formatMessage({ id: 'app.pwa.serviceworker.updated.ok' })}
+ {'刷新'}
);
notification.open({
- message: useIntl().formatMessage({ id: 'app.pwa.serviceworker.updated' }),
- description: useIntl().formatMessage({ id: 'app.pwa.serviceworker.updated.hint' }),
+ message: '有新内容',
+ description: '请点击“刷新”按钮或者手动刷新页面',
btn,
key,
onClose: async () => null,
@@ -86,6 +88,5 @@ if (pwa) {
serviceWorker.getRegistration().then((sw) => {
if (sw) sw.unregister();
});
-
clearCache();
}
diff --git a/src/pages/Admin.tsx b/src/pages/Admin.tsx
index 2f93986..e0a1aae 100644
--- a/src/pages/Admin.tsx
+++ b/src/pages/Admin.tsx
@@ -1,24 +1,14 @@
import { HeartTwoTone, SmileTwoTone } from '@ant-design/icons';
import { PageContainer } from '@ant-design/pro-components';
-import { useIntl } from '@umijs/max';
+import '@umijs/max';
import { Alert, Card, Typography } from 'antd';
import React from 'react';
-
const Admin: React.FC = () => {
- const intl = useIntl();
return (
-
+
{
marginBottom: 48,
}}
/>
-
+
-
);
};
-
export default Admin;
diff --git a/src/pages/TableList/components/UpdateForm.tsx b/src/pages/TableList/components/UpdateForm.tsx
index 5cd603e..958d8b9 100644
--- a/src/pages/TableList/components/UpdateForm.tsx
+++ b/src/pages/TableList/components/UpdateForm.tsx
@@ -6,10 +6,9 @@ import {
ProFormTextArea,
StepsForm,
} from '@ant-design/pro-components';
-import { FormattedMessage, useIntl } from '@umijs/max';
+import '@umijs/max';
import { Modal } from 'antd';
import React from 'react';
-
export type FormValueType = {
target?: string;
template?: string;
@@ -17,16 +16,13 @@ export type FormValueType = {
time?: string;
frequency?: string;
} & Partial;
-
export type UpdateFormProps = {
onCancel: (flag?: boolean, formVals?: FormValueType) => void;
onSubmit: (values: FormValueType) => Promise;
updateModalOpen: boolean;
values: Partial;
};
-
const UpdateForm: React.FC = (props) => {
- const intl = useIntl();
return (
= (props) => {
return (
{
@@ -59,50 +54,28 @@ const UpdateForm: React.FC = (props) => {
name: props.values.name,
desc: props.values.desc,
}}
- title={intl.formatMessage({
- id: 'pages.searchTable.updateForm.basicConfig',
- defaultMessage: '基本信息',
- })}
+ title={'基本信息'}
>
= (props) => {
target: '0',
template: '0',
}}
- title={intl.formatMessage({
- id: 'pages.searchTable.updateForm.ruleProps.title',
- defaultMessage: '配置规则属性',
- })}
+ title={'配置规则属性'}
>
= (props) => {
= (props) => {
/>
= (props) => {
type: '1',
frequency: 'month',
}}
- title={intl.formatMessage({
- id: 'pages.searchTable.updateForm.schedulingPeriod.title',
- defaultMessage: '设定调度周期',
- })}
+ title={'设定调度周期'}
>
= (props) => {
);
};
-
export default UpdateForm;
diff --git a/src/pages/TableList/index.tsx b/src/pages/TableList/index.tsx
index c201007..f6617b7 100644
--- a/src/pages/TableList/index.tsx
+++ b/src/pages/TableList/index.tsx
@@ -10,7 +10,7 @@ import {
ProFormTextArea,
ProTable,
} from '@ant-design/pro-components';
-import { FormattedMessage, useIntl } from '@umijs/max';
+import '@umijs/max';
import { Button, Drawer, Input, message } from 'antd';
import React, { useRef, useState } from 'react';
import type { FormValueType } from './components/UpdateForm';
@@ -24,7 +24,9 @@ import UpdateForm from './components/UpdateForm';
const handleAdd = async (fields: API.RuleListItem) => {
const hide = message.loading('正在添加');
try {
- await addRule({ ...fields });
+ await addRule({
+ ...fields,
+ });
hide();
message.success('Added successfully');
return true;
@@ -50,7 +52,6 @@ const handleUpdate = async (fields: FormValueType) => {
key: fields.key,
});
hide();
-
message.success('Configuration is successful');
return true;
} catch (error) {
@@ -82,7 +83,6 @@ const handleRemove = async (selectedRows: API.RuleListItem[]) => {
return false;
}
};
-
const TableList: React.FC = () => {
/**
* @en-US Pop-up window of new window
@@ -94,9 +94,7 @@ const TableList: React.FC = () => {
* @zh-CN 分布更新窗口的弹窗
* */
const [updateModalOpen, handleUpdateModalOpen] = useState(false);
-
const [showDetail, setShowDetail] = useState(false);
-
const actionRef = useRef();
const [currentRow, setCurrentRow] = useState();
const [selectedRowsState, setSelectedRows] = useState([]);
@@ -105,16 +103,10 @@ const TableList: React.FC = () => {
* @en-US International configuration
* @zh-CN 国际化配置
* */
- const intl = useIntl();
const columns: ProColumns[] = [
{
- title: (
-
- headerTitle={intl.formatMessage({
- id: 'pages.searchTable.title',
- defaultMessage: 'Enquiry form',
- })}
+ headerTitle={'查询表格'}
actionRef={actionRef}
rowKey="key"
search={{
@@ -261,7 +210,7 @@ const TableList: React.FC = () => {
handleModalOpen(true);
}}
>
-
-
}
@@ -298,24 +247,13 @@ const TableList: React.FC = () => {
actionRef.current?.reloadAndRest?.();
}}
>
- +
Want to add more pages? Please refer to{' '} use block @@ -41,5 +41,4 @@ const Admin: React.FC = () => {
- {SelectLang &&
- );
+ return;
};
-
const LoginMessage: React.FC<{
content: string;
}> = ({ content }) => {
@@ -82,12 +73,10 @@ const LoginMessage: React.FC<{
/>
);
};
-
const Login: React.FC = () => {
const [userLoginState, setUserLoginState] = useState
}
title="Ant Design"
- subTitle={intl.formatMessage({ id: 'pages.layouts.userLayout.title' })}
+ subTitle={'Ant Design 是西湖区最具影响力的 Web 设计规范'}
initialValues={{
autoLogin: true,
}}
- actions={[
-