Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit c4ca5db

Browse files
committed
update packages
1 parent 5c7a9a9 commit c4ca5db

File tree

3 files changed

+35
-36
lines changed

3 files changed

+35
-36
lines changed

‎package.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
"dependencies": {
2525
"@loadable/component": "^5.15.0",
2626
"@rematch/core": "^2.0.1",
27-
"antd": "^4.15.5",
27+
"antd": "^4.16.0",
2828
"axios": "^0.21.1",
29-
"core-js": "^3.12.1",
29+
"core-js": "^3.13.0",
3030
"history": "^4.10.1",
3131
"lodash": "^4.17.21",
3232
"normalize.css": "^8.0.1",
@@ -37,36 +37,37 @@
3737
"react-router-dom": "^5.2.0",
3838
"react-use": "^17.2.4",
3939
"react-vcode": "1.0.11",
40-
"redux": "^4.1.0"
40+
"redux": "^4.1.0",
41+
"typescript": "4.2.4"
4142
},
4243
"devDependencies": {
4344
"@types/enzyme": "^3.10.8",
4445
"@types/enzyme-adapter-react-16": "^1.0.6",
4546
"@types/history": "^4.7.8",
4647
"@types/jest": "^26.0.23",
4748
"@types/loadable__component": "^5.13.3",
48-
"@types/lodash": "^4.14.169",
49+
"@types/lodash": "^4.14.170",
4950
"@types/mockjs": "^1.0.3",
5051
"@types/qs": "^6.9.6",
51-
"@types/react": "^17.0.5",
52+
"@types/react": "^17.0.8",
5253
"@types/react-dom": "^17.0.5",
5354
"@types/react-redux": "^7.1.16",
5455
"@types/react-router-dom": "^5.1.7",
5556
"@types/webpack-env": "^1.16.0",
56-
"@typescript-eslint/eslint-plugin": "^4.23.0",
57-
"@typescript-eslint/parser": "^4.23.0",
57+
"@typescript-eslint/eslint-plugin": "^4.25.0",
58+
"@typescript-eslint/parser": "^4.25.0",
5859
"antd-dayjs-webpack-plugin": "^1.0.6",
59-
"autoprefixer": "^10.2.5",
60+
"autoprefixer": "^10.2.6",
6061
"awesome-typescript-loader": "^5.2.1",
6162
"body-parser": "^1.19.0",
6263
"clean-webpack-plugin": "^3.0.0",
63-
"copy-webpack-plugin": "^8.1.1",
64-
"css-loader": "^5.2.4",
64+
"copy-webpack-plugin": "^9.0.0",
65+
"css-loader": "^5.2.6",
6566
"css-minimizer-webpack-plugin": "^3.0.0",
66-
"dayjs": "^1.10.4",
67+
"dayjs": "^1.10.5",
6768
"enzyme": "^3.11.0",
6869
"enzyme-adapter-react-16": "^1.15.6",
69-
"eslint": "^7.26.0",
70+
"eslint": "^7.27.0",
7071
"eslint-config-prettier": "^8.3.0",
7172
"eslint-loader": "^4.0.2",
7273
"eslint-plugin-prettier": "^3.4.0",
@@ -78,27 +79,26 @@
7879
"file-loader": "^6.2.0",
7980
"html-webpack-plugin": "^5.3.1",
8081
"http-proxy-middleware": "^2.0.0",
81-
"jest": "^26.6.3",
82+
"jest": "^27.0.1",
8283
"jest-canvas-mock": "^2.3.1",
8384
"jest-transform-stub": "^2.0.0",
8485
"less": "^4.1.1",
8586
"less-loader": "^9.0.0",
8687
"mini-css-extract-plugin": "^1.6.0",
8788
"mockjs": "^1.1.0",
88-
"postcss": "^8.2.15",
89-
"postcss-loader": "^5.2.0",
89+
"postcss": "^8.3.0",
90+
"postcss-loader": "^5.3.0",
9091
"prettier": "2.3.0",
91-
"source-map-loader": "^2.0.1",
92+
"source-map-loader": "^3.0.0",
9293
"style-loader": "^2.0.0",
9394
"sw-precache-webpack-plugin": "^1.0.0",
9495
"terser-webpack-plugin": "^5.1.2",
9596
"ts-import-plugin": "^1.6.7",
96-
"ts-jest": "^26.5.6",
97-
"typescript": "4.2.4",
97+
"ts-jest": "^27.0.1",
9898
"url-loader": "^4.1.1",
99-
"webpack": "^5.37.0",
99+
"webpack": "^5.37.1",
100100
"webpack-cli": "^4.7.0",
101-
"webpack-dev-middleware": "^4.2.0",
101+
"webpack-dev-middleware": "^4.3.0",
102102
"webpack-hot-middleware": "^2.25.0",
103103
"webpackbar": "^4.0.0",
104104
"workbox-webpack-plugin": "^6.1.5",

‎src/pages/System/RoleAdmin/index.tsx‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -437,21 +437,19 @@ function RoleAdminContainer(props: Props) {
437437
];
438438

439439
const tableData = useMemo(() => {
440-
return data.map(
441-
(item, index): TableRecordData => {
442-
return {
443-
key: index,
444-
id: item.id,
445-
serial: index + 1 + (page.pageNum - 1) * page.pageSize,
446-
title: item.title,
447-
desc: item.desc,
448-
sorts: item.sorts,
449-
conditions: item.conditions,
450-
control: item.id,
451-
menuAndPowers: item.menuAndPowers,
452-
};
453-
}
454-
);
440+
return data.map((item, index): TableRecordData => {
441+
return {
442+
key: index,
443+
id: item.id,
444+
serial: index + 1 + (page.pageNum - 1) * page.pageSize,
445+
title: item.title,
446+
desc: item.desc,
447+
sorts: item.sorts,
448+
conditions: item.conditions,
449+
control: item.id,
450+
menuAndPowers: item.menuAndPowers,
451+
};
452+
});
455453
}, [page, data]);
456454

457455
return (

‎src/util/tools.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ const tools = {
9999
* @param str - 待处理的字符串
100100
* **/
101101
checkEmail(str: string): boolean {
102-
const rex = /^[a-zA-Z0-9]+([-_.][a-zA-Z0-9]+)*@[a-zA-Z0-9]+([-_.][a-zA-Z0-9]+)*\.[a-z]{2,}$/;
102+
const rex =
103+
/^[a-zA-Z0-9]+([-_.][a-zA-Z0-9]+)*@[a-zA-Z0-9]+([-_.][a-zA-Z0-9]+)*\.[a-z]{2,}$/;
103104
return rex.test(str);
104105
},
105106

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /