From 5fe0ba7f99530fff50df70632a10371109cc8f85 Mon Sep 17 00:00:00 2001
From: River <382599512@qq.com>
Date: Fri, 17 Sep 2021 14:41:31 +0800
Subject: [PATCH 01/38] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dvscode=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=BB=A3=E7=A0=81=E5=BC=95=E7=94=A8=E4=B8=8D=E4=BC=9A?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E7=BB=84=E4=BB=B6=20(#9104)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

js项目如果react组件引用缺少/index  vscode无法导航到定义
---
 jsconfig.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jsconfig.json b/jsconfig.json
index f87334d4..197bee5d 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "jsx": "react-jsx",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "baseUrl": ".",

From 0322352d0f64b9a23279630ec6a18fd940ecf231 Mon Sep 17 00:00:00 2001
From: Shanjie Chen <cnzxcsj@outlook.com>
Date: Sun, 10 Oct 2021 21:11:11 +0800
Subject: [PATCH 02/38] fix: compatibility with pnpm (#9156)

* fix: dependencies were not found using pnpm

* fix: dependencies were not found using pnpm

* fix: lint problem

* chore: ignore pnpm lock file
---
 .gitignore            | 1 +
 package.json          | 3 +++
 src/service-worker.js | 1 -
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 7fd9f581..21ea862d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ yarn-error.log
 .idea
 yarn.lock
 package-lock.json
+pnpm-lock.yaml
 *bak
 .vscode
 
diff --git a/package.json b/package.json
index 3a0615d9..80d52bea 100644
--- a/package.json
+++ b/package.json
@@ -65,6 +65,8 @@
     "lodash": "^4.17.11",
     "moment": "^2.25.3",
     "omit.js": "^2.0.2",
+    "rc-menu": "^9.0.13",
+    "rc-util": "^5.14.0",
     "react": "^17.0.0",
     "react-dev-inspector": "^1.1.1",
     "react-dom": "^17.0.0",
@@ -104,6 +106,7 @@
     "prettier": "^2.3.2",
     "puppeteer-core": "^8.0.0",
     "stylelint": "^13.0.0",
+    "swagger-ui-react": "^3.52.3",
     "typescript": "^4.2.2"
   },
   "engines": {
diff --git a/src/service-worker.js b/src/service-worker.js
index 5f5f8b21..b86726cd 100644
--- a/src/service-worker.js
+++ b/src/service-worker.js
@@ -1,4 +1,3 @@
-/* eslint-disable eslint-comments/disable-enable-pair */
 /* eslint-disable no-restricted-globals */
 /* eslint-disable no-underscore-dangle */
 /* globals workbox */

From 2f5c14a455d6f2adfb83f9ccb583a1398827ccf1 Mon Sep 17 00:00:00 2001
From: chenshuai2144 <qixian.cs@outlook.com>
Date: Sun, 10 Oct 2021 23:36:23 +0800
Subject: [PATCH 03/38] chore: add default settings and extensions

---
 .gitignore              | 3 +--
 .vscode/extensions.json | 8 ++++++++
 .vscode/settings.json   | 4 ++++
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 .vscode/extensions.json
 create mode 100644 .vscode/settings.json

diff --git a/.gitignore b/.gitignore
index 21ea862d..21ab9fb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@ _roadhog-api-doc
 
 # production
 /dist
-/.vscode
 
 # misc
 .DS_Store
@@ -21,7 +20,7 @@ yarn.lock
 package-lock.json
 pnpm-lock.yaml
 *bak
-.vscode
+
 
 # visual studio code
 .history
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 00000000..33f300da
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,8 @@
+{
+  "recommendations": [
+    "esbenp.prettier-vscode",
+    "dbaeumer.vscode-eslint",
+    "stylelint.vscode-stylelint",
+    "wangzy.sneak-mark"
+  ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..713ac953
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+  "editor.formatOnSave": true,
+  "prettier.requireConfig": true
+}

From 3014171fcb5c204f2436d1737e6caffe197bf93b Mon Sep 17 00:00:00 2001
From: chenshuai2144 <qixian.cs@outlook.com>
Date: Mon, 11 Oct 2021 09:11:52 +0800
Subject: [PATCH 04/38] chore: add defaultFormatter set

---
 .vscode/settings.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 713ac953..a5d9d035 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,5 @@
 {
   "editor.formatOnSave": true,
-  "prettier.requireConfig": true
+  "prettier.requireConfig": true,
+  "editor.defaultFormatter": "esbenp.prettier-vscode"
 }

From 718592d93c6672c02e77dc59dbe6adedb338597b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B8=85?= <qixian.cs@outlook.com>
Date: Tue, 19 Oct 2021 14:15:47 +0800
Subject: [PATCH 05/38] feat: support next version antd (#9203)

---
 config/config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/config.ts b/config/config.ts
index fc977cb8..33bdfd4b 100644
--- a/config/config.ts
+++ b/config/config.ts
@@ -39,6 +39,7 @@ export default defineConfig({
   // Theme for antd: https://ant.design/docs/react/customize-theme-cn
   theme: {
     'primary-color': defaultSettings.primaryColor,
+    'root-entry-name': 'default',
   },
   // esbuild is father build tools
   // https://umijs.org/plugins/plugin-esbuild

From 07c15b388623fb38630cfccaa1d9610180169c3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B8=85?= <qixian.cs@outlook.com>
Date: Wed, 20 Oct 2021 11:56:19 +0800
Subject: [PATCH 06/38] chore: up devDependencies

---
 package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 80d52bea..1204ae30 100644
--- a/package.json
+++ b/package.json
@@ -55,10 +55,10 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.5.0",
-    "@ant-design/pro-descriptions": "^1.6.8",
-    "@ant-design/pro-form": "^1.18.3",
-    "@ant-design/pro-layout": "^6.15.3",
-    "@ant-design/pro-table": "^2.30.8",
+    "@ant-design/pro-descriptions": "^1.9.0",
+    "@ant-design/pro-form": "^1.43.0",
+    "@ant-design/pro-layout": "^6.26.0",
+    "@ant-design/pro-table": "^2.56.0",
     "@umijs/route-utils": "^1.0.36",
     "antd": "^4.14.0",
     "classnames": "^2.2.6",
@@ -84,7 +84,7 @@
     "@types/react-dom": "^17.0.0",
     "@types/react-helmet": "^6.1.0",
     "@umijs/fabric": "^2.6.2",
-    "@umijs/openapi": "^1.1.14",
+    "@umijs/openapi": "^1.3.0",
     "@umijs/plugin-blocks": "^2.0.5",
     "@umijs/plugin-esbuild": "^1.0.1",
     "@umijs/plugin-openapi": "^1.2.0",

From befd4a035d0aff6ec30d1e9400e9f1794f7e09e5 Mon Sep 17 00:00:00 2001
From: GrantDuan <duanxiugang@sina.com>
Date: Thu, 21 Oct 2021 17:10:55 +0800
Subject: [PATCH 07/38] replace proxy with proapi.azurewebsites.net/ (#9214)

https://proapi.azurewebsites.net/api/currentuser return the json data
https://preview.pro.ant.design/api/currentuser return 404 page
without this commit, logoin would fail if start the app by "npm run dev"
---
 config/proxy.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/proxy.ts b/config/proxy.ts
index d6c81ea7..5ef6a125 100644
--- a/config/proxy.ts
+++ b/config/proxy.ts
@@ -16,7 +16,7 @@ export default {
   },
   test: {
     '/api/': {
-      target: 'https://preview.pro.ant.design',
+      target: 'https://proapi.azurewebsites.net',
       changeOrigin: true,
       pathRewrite: { '^': '' },
     },

From 46415d647733ab10902c840f4827a7f95c10fc97 Mon Sep 17 00:00:00 2001
From: chenshuai2144 <qixian.cs@outlook.com>
Date: Thu, 28 Oct 2021 09:31:08 +0800
Subject: [PATCH 08/38] docs: add proxy doc

---
 config/proxy.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/config/proxy.ts b/config/proxy.ts
index 5ef6a125..a8194b7e 100644
--- a/config/proxy.ts
+++ b/config/proxy.ts
@@ -8,10 +8,13 @@
  */
 export default {
   dev: {
+    // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
     '/api/': {
+      // 要代理的地址
       target: 'https://preview.pro.ant.design',
+      // 配置了这个可以从 http 代理到 https
+      // 依赖 origin 的功能可能需要这个，比如 cookie
       changeOrigin: true,
-      pathRewrite: { '^': '' },
     },
   },
   test: {

From 8e3431b93b5f3ce2ef6f465e4b78f8b7f55c8cd4 Mon Sep 17 00:00:00 2001
From: SmallBun <30397655+leshalv@users.noreply.github.com>
Date: Thu, 11 Nov 2021 11:03:39 +0800
Subject: [PATCH 09/38] =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=B8=A6=E6=9C=89?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0=E6=97=B6=EF=BC=8C=E9=80=80?=
 =?UTF-8?q?=E5=87=BA=E8=B7=B3=E8=BD=AC=E6=B7=BB=E5=8A=A0=E5=B9=B6=E6=90=BA?=
 =?UTF-8?q?=E5=B8=A6=20(#9264)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 路径带有请求参数时，退出跳转添加并携带

* Update AvatarDropdown.tsx
---
 src/components/RightContent/AvatarDropdown.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/RightContent/AvatarDropdown.tsx b/src/components/RightContent/AvatarDropdown.tsx
index d9e67311..fc768c29 100644
--- a/src/components/RightContent/AvatarDropdown.tsx
+++ b/src/components/RightContent/AvatarDropdown.tsx
@@ -17,14 +17,14 @@ export type GlobalHeaderRightProps = {
  */
 const loginOut = async () => {
   await outLogin();
-  const { query = {}, pathname } = history.location;
+  const { query = {}, search, pathname } = history.location;
   const { redirect } = query;
   // Note: There may be security issues, please note
   if (window.location.pathname !== '/user/login' && !redirect) {
     history.replace({
       pathname: '/user/login',
       search: stringify({
-        redirect: pathname,
+        redirect: pathname + search,
       }),
     });
   }

From 782cb520a0bda0b7ecb745de7a821be04b26bd12 Mon Sep 17 00:00:00 2001
From: chenshuai2144 <qixian.cs@outlook.com>
Date: Thu, 11 Nov 2021 11:06:59 +0800
Subject: [PATCH 10/38] docs: add childrenRender demo

---
 src/app.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/app.tsx b/src/app.tsx
index f037d946..27d41419 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -78,6 +78,11 @@ export const layout: RunTimeLayoutConfig = ({ initialState }) => {
     menuHeaderRender: undefined,
     // 自定义 403 页面
     // unAccessible: <div>unAccessible</div>,
+    // 增加一个 loading 的状态
+    // childrenRender: (children) => {
+    //   if (initialState.loading) return <PageLoading />;
+    //   return children;
+    // },
     ...initialState?.settings,
   };
 };

From 3e5903491b09a70b5757ad6fc6b40b9259f592b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8D=86=E6=A3=98Justin?= <i@jsun969.cn>
Date: Mon, 15 Nov 2021 10:36:14 +0800
Subject: [PATCH 11/38] refactor: modify all function types in jsx to
 `React.FC` (#9298)

---
 src/components/Footer/index.tsx     | 4 +++-
 src/components/NoticeIcon/index.tsx | 2 +-
 src/pages/Admin.tsx                 | 4 +++-
 src/pages/Welcome.tsx               | 4 +++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/Footer/index.tsx b/src/components/Footer/index.tsx
index b259d6f8..4336de96 100644
--- a/src/components/Footer/index.tsx
+++ b/src/components/Footer/index.tsx
@@ -2,7 +2,7 @@ import { useIntl } from 'umi';
 import { GithubOutlined } from '@ant-design/icons';
 import { DefaultFooter } from '@ant-design/pro-layout';
 
-export default () => {
+const Footer: React.FC = () => {
   const intl = useIntl();
   const defaultMessage = intl.formatMessage({
     id: 'app.copyright.produced',
@@ -37,3 +37,5 @@ export default () => {
     />
   );
 };
+
+export default Footer;
diff --git a/src/components/NoticeIcon/index.tsx b/src/components/NoticeIcon/index.tsx
index 7c4cd29d..326a363b 100644
--- a/src/components/NoticeIcon/index.tsx
+++ b/src/components/NoticeIcon/index.tsx
@@ -70,7 +70,7 @@ const getUnreadData = (noticeData: Record<string, API.NoticeIconItem[]>) => {
   return unreadMsg;
 };
 
-const NoticeIconView = () => {
+const NoticeIconView: React.FC = () => {
   const { initialState } = useModel('@@initialState');
   const { currentUser } = initialState || {};
   const [notices, setNotices] = useState<API.NoticeIconItem[]>([]);
diff --git a/src/pages/Admin.tsx b/src/pages/Admin.tsx
index abd291f6..d8922fa2 100644
--- a/src/pages/Admin.tsx
+++ b/src/pages/Admin.tsx
@@ -4,7 +4,7 @@ import { Card, Typography, Alert } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { useIntl } from 'umi';
 
-export default (): React.ReactNode => {
+const Admin: React.FC = () => {
   const intl = useIntl();
   return (
     <PageHeaderWrapper
@@ -41,3 +41,5 @@ export default (): React.ReactNode => {
     </PageHeaderWrapper>
   );
 };
+
+export default Admin;
diff --git a/src/pages/Welcome.tsx b/src/pages/Welcome.tsx
index 12bf6d2a..ed10f13d 100644
--- a/src/pages/Welcome.tsx
+++ b/src/pages/Welcome.tsx
@@ -12,7 +12,7 @@ const CodePreview: React.FC = ({ children }) => (
   </pre>
 );
 
-export default (): React.ReactNode => {
+const Welcome: React.FC = () => {
   const intl = useIntl();
   return (
     <PageContainer>
@@ -61,3 +61,5 @@ export default (): React.ReactNode => {
     </PageContainer>
   );
 };
+
+export default Welcome;

From 9d1b63594046d429c53eb397b9a3ce23967c260f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B8=85?= <qixian.cs@outlook.com>
Date: Mon, 15 Nov 2021 14:44:18 +0800
Subject: [PATCH 12/38] chore: up @umijs/route-utils

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1204ae30..4bb0aeea 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "@ant-design/pro-form": "^1.43.0",
     "@ant-design/pro-layout": "^6.26.0",
     "@ant-design/pro-table": "^2.56.0",
-    "@umijs/route-utils": "^1.0.36",
+    "@umijs/route-utils": "2.0.2",
     "antd": "^4.14.0",
     "classnames": "^2.2.6",
     "lodash": "^4.17.11",

From 5b1cadead3d203083b223f7fab6b70b5c097694b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B8=85?= <qixian.cs@outlook.com>
Date: Mon, 15 Nov 2021 21:04:40 +0800
Subject: [PATCH 13/38] chore: up antd version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4bb0aeea..6e7de1df 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "@ant-design/pro-layout": "^6.26.0",
     "@ant-design/pro-table": "^2.56.0",
     "@umijs/route-utils": "2.0.2",
-    "antd": "^4.14.0",
+    "antd": "4.17.0",
     "classnames": "^2.2.6",
     "lodash": "^4.17.11",
     "moment": "^2.25.3",

From be345dc8e6a271fe4f5e62a512f8a3225ff22cb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B8=85?= <qixian.cs@outlook.com>
Date: Mon, 15 Nov 2021 21:14:45 +0800
Subject: [PATCH 14/38] chore: up antd version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6e7de1df..9c3cd994 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "@ant-design/pro-layout": "^6.26.0",
     "@ant-design/pro-table": "^2.56.0",
     "@umijs/route-utils": "2.0.2",
-    "antd": "4.17.0",
+    "antd": "4.16.13",
     "classnames": "^2.2.6",
     "lodash": "^4.17.11",
     "moment": "^2.25.3",

From f6b856c30960fc6b8b7a865cf93a465b291d5a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B8=85?= <qixian.cs@outlook.com>
Date: Mon, 15 Nov 2021 21:29:06 +0800
Subject: [PATCH 15/38] chore: up utils version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9c3cd994..f74853cf 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "@ant-design/pro-form": "^1.43.0",
     "@ant-design/pro-layout": "^6.26.0",
     "@ant-design/pro-table": "^2.56.0",
-    "@umijs/route-utils": "2.0.2",
+    "@umijs/route-utils": "^2.0.3",
     "antd": "4.16.13",
     "classnames": "^2.2.6",
     "lodash": "^4.17.11",

From 7a5c54a16a2268866c0a1d96a9ac3eb7ae2ee953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B8=85?= <qixian.cs@outlook.com>
Date: Thu, 25 Nov 2021 15:46:27 +0800
Subject: [PATCH 16/38] chore: use playwright (#9345)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: use playwright

* 修改图表

* e2e

* up version
---
 .github/workflows/ci.yml       |  2 +-
 Dockerfile                     |  2 +-
 Dockerfile.hub                 |  2 +-
 jest.config.js                 |  1 -
 package.json                   |  9 ++---
 playwright.config.ts           | 22 ++++++++++++
 src/e2e/baseLayout.e2e.js      | 61 ----------------------------------
 src/e2e/baseLayout.e2e.spec.ts | 45 +++++++++++++++++++++++++
 tests/PuppeteerEnvironment.js  | 41 -----------------------
 tests/beforeTest.js            | 39 ----------------------
 tests/getBrowser.js            | 45 -------------------------
 tests/run-tests.js             |  5 +--
 tsconfig.json                  |  1 +
 13 files changed, 77 insertions(+), 198 deletions(-)
 create mode 100644 playwright.config.ts
 delete mode 100644 src/e2e/baseLayout.e2e.js
 create mode 100644 src/e2e/baseLayout.e2e.spec.ts
 delete mode 100644 tests/PuppeteerEnvironment.js
 delete mode 100644 tests/beforeTest.js
 delete mode 100644 tests/getBrowser.js

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eb6bf71e..965eda38 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
       - run: yarn run lint
       - run: yarn run tsc
       - run: yarn run build
-      - run: yarn run test:all
+      - run: yarn run test:e2e
         env:
           CI: true
           PROGRESS: none
diff --git a/Dockerfile b/Dockerfile
index 35380f48..f828e839 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ RUN yarn
 
 COPY ./ ./
 
-RUN npm run test:all
+RUN npm run test:e2e
 
 RUN npm run fetch:blocks
 
diff --git a/Dockerfile.hub b/Dockerfile.hub
index 58bbcbc7..94534d3e 100644
--- a/Dockerfile.hub
+++ b/Dockerfile.hub
@@ -7,7 +7,7 @@ RUN yarn
 
 COPY ./ ./
 
-RUN npm run test:all
+RUN npm run test:e2e
 
 RUN npm run fetch:blocks
 
diff --git a/jest.config.js b/jest.config.js
index 09a2211b..47295738 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,6 +1,5 @@
 module.exports = {
   testURL: 'http://localhost:8000',
-  testEnvironment: './tests/PuppeteerEnvironment',
   verbose: false,
   extraSetupFiles: ['./tests/setupTests.js'],
   globals: {
diff --git a/package.json b/package.json
index f74853cf..9e541ee2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ant-design-pro",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "private": true,
   "description": "An out-of-box UI solution for enterprise applications",
   "scripts": {
@@ -26,19 +26,19 @@
     "lint:prettier": "prettier -c --write \"src/**/*\" --end-of-line auto",
     "lint:style": "stylelint --fix \"src/**/*.less\" --syntax less",
     "openapi": "umi openapi",
+    "playwright": "playwright install && playwright test",
     "precommit": "lint-staged",
     "prettier": "prettier -c --write \"src/**/*\"",
+    "serve": "umi-serve",
     "start": "cross-env UMI_ENV=dev umi dev",
     "start:dev": "cross-env REACT_APP_ENV=dev MOCK=none UMI_ENV=dev umi dev",
     "start:no-mock": "cross-env MOCK=none UMI_ENV=dev umi dev",
     "start:no-ui": "cross-env UMI_UI=none UMI_ENV=dev umi dev",
     "start:pre": "cross-env REACT_APP_ENV=pre UMI_ENV=dev umi dev",
     "start:test": "cross-env REACT_APP_ENV=test MOCK=none UMI_ENV=dev umi dev",
-    "pretest": "node ./tests/beforeTest",
     "test": "umi test",
-    "test:all": "node ./tests/run-tests.js",
+    "test:e2e": "node ./tests/run-tests.js",
     "test:component": "umi test ./src/components",
-    "serve": "umi-serve",
     "tsc": "tsc --noEmit"
   },
   "lint-staged": {
@@ -76,6 +76,7 @@
   },
   "devDependencies": {
     "@ant-design/pro-cli": "^2.0.2",
+    "@playwright/test": "^1.16.3",
     "@types/express": "^4.17.0",
     "@types/history": "^4.7.2",
     "@types/jest": "^26.0.0",
diff --git a/playwright.config.ts b/playwright.config.ts
new file mode 100644
index 00000000..ec1b31db
--- /dev/null
+++ b/playwright.config.ts
@@ -0,0 +1,22 @@
+// playwright.config.ts
+import type { PlaywrightTestConfig } from '@playwright/test';
+import { devices } from '@playwright/test';
+
+const config: PlaywrightTestConfig = {
+  forbidOnly: !!process.env.CI,
+  retries: process.env.CI ? 2 : 0,
+  use: {
+    trace: 'on-first-retry',
+  },
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'] },
+    },
+    {
+      name: 'firefox',
+      use: { ...devices['Desktop Firefox'] },
+    },
+  ],
+};
+export default config;
diff --git a/src/e2e/baseLayout.e2e.js b/src/e2e/baseLayout.e2e.js
deleted file mode 100644
index 459391cd..00000000
--- a/src/e2e/baseLayout.e2e.js
+++ /dev/null
@@ -1,61 +0,0 @@
-const { uniq } = require('lodash');
-const RouterConfig = require('../../config/config').default.routes;
-
-const BASE_URL = `http://localhost:${process.env.PORT || 8001}`;
-
-function formatter(routes, parentPath = '') {
-  const fixedParentPath = parentPath.replace(/\/{1,}/g, '/');
-  let result = [];
-  routes.forEach((item) => {
-    if (item.path && !item.path.startsWith('/')) {
-      result.push(`${fixedParentPath}/${item.path}`.replace(/\/{1,}/g, '/'));
-    }
-    if (item.path && item.path.startsWith('/')) {
-      result.push(`${item.path}`.replace(/\/{1,}/g, '/'));
-    }
-    if (item.routes) {
-      result = result.concat(
-        formatter(item.routes, item.path ? `${fixedParentPath}/${item.path}` : parentPath),
-      );
-    }
-  });
-  return uniq(result.filter((item) => !!item));
-}
-
-beforeEach(async () => {
-  await page.goto(`${BASE_URL}`);
-  await page.evaluate(() => {
-    localStorage.setItem('antd-pro-authority', '["admin"]');
-  });
-});
-
-describe('Ant Design Pro E2E test', () => {
-  const testPage = (path) => async () => {
-    await page.goto(`${BASE_URL}${path}`);
-    await page.waitForSelector('footer', {
-      timeout: 2000,
-    });
-    const haveFooter = await page.evaluate(
-      () => document.getElementsByTagName('footer').length > 0,
-    );
-    expect(haveFooter).toBeTruthy();
-  };
-
-  const routers = formatter(RouterConfig);
-  routers.forEach((route) => {
-    it(`test pages ${route}`, testPage(route));
-  });
-
-  it('topmenu should have footer', async () => {
-    const params = '?navTheme=light&layout=topmenu';
-    await page.goto(`${BASE_URL}${params}`);
-    await page.waitForSelector('footer', {
-      timeout: 2000,
-    });
-
-    const haveFooter = await page.evaluate(
-      () => document.getElementsByTagName('footer').length > 0,
-    );
-    expect(haveFooter).toBeTruthy();
-  });
-});
diff --git a/src/e2e/baseLayout.e2e.spec.ts b/src/e2e/baseLayout.e2e.spec.ts
new file mode 100644
index 00000000..e1d62c71
--- /dev/null
+++ b/src/e2e/baseLayout.e2e.spec.ts
@@ -0,0 +1,45 @@
+import type { Page } from '@playwright/test';
+import { test, expect } from '@playwright/test';
+const { uniq } = require('lodash');
+const RouterConfig = require('../../config/routes').default;
+
+const BASE_URL = `http://localhost:${process.env.PORT || 8001}`;
+
+function formatter(routes: any, parentPath = ''): string[] {
+  const fixedParentPath = parentPath.replace(/\/{1,}/g, '/');
+  let result: string[] = [];
+  routes.forEach((item: { path: string; routes: string }) => {
+    if (item.path && !item.path.startsWith('/')) {
+      result.push(`${fixedParentPath}/${item.path}`.replace(/\/{1,}/g, '/'));
+    }
+    if (item.path && item.path.startsWith('/')) {
+      result.push(`${item.path}`.replace(/\/{1,}/g, '/'));
+    }
+    if (item.routes) {
+      result = result.concat(
+        formatter(item.routes, item.path ? `${fixedParentPath}/${item.path}` : parentPath),
+      );
+    }
+  });
+  return uniq(result.filter((item) => !!item));
+}
+
+const testPage = (path: string, page: Page) => async () => {
+  await page.evaluate(() => {
+    localStorage.setItem('antd-pro-authority', '["admin"]');
+  });
+  await page.goto(`${BASE_URL}${path}`);
+  await page.waitForSelector('footer', {
+    timeout: 2000,
+  });
+  const haveFooter = await page.evaluate(() => document.getElementsByTagName('footer').length > 0);
+  expect(haveFooter).toBeTruthy();
+};
+
+const routers = formatter(RouterConfig);
+
+routers.forEach((route) => {
+  test(`test route page ${route}`, async ({ page }) => {
+    await testPage(route, page);
+  });
+});
diff --git a/tests/PuppeteerEnvironment.js b/tests/PuppeteerEnvironment.js
deleted file mode 100644
index 13409be1..00000000
--- a/tests/PuppeteerEnvironment.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// eslint-disable-next-line
-const NodeEnvironment = require('jest-environment-node');
-const getBrowser = require('./getBrowser');
-
-class PuppeteerEnvironment extends NodeEnvironment {
-  // Jest is not available here, so we have to reverse engineer
-  // the setTimeout function, see https://github.com/facebook/jest/blob/v23.1.0/packages/jest-runtime/src/index.js#L823
-  setTimeout(timeout) {
-    if (this.global.jasmine) {
-      // eslint-disable-next-line no-underscore-dangle
-      this.global.jasmine.DEFAULT_TIMEOUT_INTERVAL = timeout;
-    } else {
-      this.global[Symbol.for('TEST_TIMEOUT_SYMBOL')] = timeout;
-    }
-  }
-
-  async setup() {
-    const browser = await getBrowser();
-    const page = await browser.newPage();
-    this.global.browser = browser;
-    this.global.page = page;
-  }
-
-  async teardown() {
-    const { page, browser } = this.global;
-
-    if (page) {
-      await page.close();
-    }
-
-    if (browser) {
-      await browser.disconnect();
-    }
-
-    if (browser) {
-      await browser.close();
-    }
-  }
-}
-
-module.exports = PuppeteerEnvironment;
diff --git a/tests/beforeTest.js b/tests/beforeTest.js
deleted file mode 100644
index 226ea120..00000000
--- a/tests/beforeTest.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/* eslint-disable global-require */
-/* eslint-disable import/no-extraneous-dependencies */
-const { execSync } = require('child_process');
-const { join } = require('path');
-const findChrome = require('carlo/lib/find_chrome');
-const detectInstaller = require('detect-installer');
-
-const installPuppeteer = () => {
-  // find can use package manager
-  const packages = detectInstaller(join(__dirname, '../'));
-  // get installed package manager
-  const packageName = packages.find(detectInstaller.hasPackageCommand) || 'npm';
-  console.log(`🤖 will use ${packageName} install puppeteer`);
-  const command = `${packageName} ${packageName.includes('yarn') ? 'add' : 'i'} puppeteer`;
-  execSync(command, {
-    stdio: 'inherit',
-  });
-};
-
-const initPuppeteer = async () => {
-  try {
-    // eslint-disable-next-line import/no-unresolved
-    const findChromePath = await findChrome({});
-    const { executablePath } = findChromePath;
-    console.log(`🧲 find you browser in ${executablePath}`);
-    return;
-  } catch (error) {
-    console.log('🧲 no find chrome');
-  }
-
-  try {
-    require.resolve('puppeteer');
-  } catch (error) {
-    // need install puppeteer
-    await installPuppeteer();
-  }
-};
-
-initPuppeteer();
diff --git a/tests/getBrowser.js b/tests/getBrowser.js
deleted file mode 100644
index 3b4ef331..00000000
--- a/tests/getBrowser.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* eslint-disable global-require */
-/* eslint-disable import/no-extraneous-dependencies */
-const findChrome = require('carlo/lib/find_chrome');
-
-const getBrowser = async () => {
-  try {
-    // eslint-disable-next-line import/no-unresolved
-    const puppeteer = require('puppeteer');
-    const browser = await puppeteer.launch({
-      args: [
-        '--disable-gpu',
-        '--disable-dev-shm-usage',
-        '--no-first-run',
-        '--no-zygote',
-        '--no-sandbox',
-      ],
-    });
-    return browser;
-  } catch (error) {
-    // console.log(error)
-  }
-
-  try {
-    // eslint-disable-next-line import/no-unresolved
-    const puppeteer = require('puppeteer-core');
-    const findChromePath = await findChrome({});
-    const { executablePath } = findChromePath;
-    const browser = await puppeteer.launch({
-      executablePath,
-      args: [
-        '--disable-gpu',
-        '--disable-dev-shm-usage',
-        '--no-first-run',
-        '--no-zygote',
-        '--no-sandbox',
-      ],
-    });
-    return browser;
-  } catch (error) {
-    console.log('🧲 no find chrome');
-  }
-  throw new Error('no find puppeteer');
-};
-
-module.exports = getBrowser;
diff --git a/tests/run-tests.js b/tests/run-tests.js
index 368cd5e3..8ac1d871 100644
--- a/tests/run-tests.js
+++ b/tests/run-tests.js
@@ -1,8 +1,5 @@
-/* eslint-disable eslint-comments/disable-enable-pair */
 /* eslint-disable @typescript-eslint/no-var-requires */
-/* eslint-disable eslint-comments/no-unlimited-disable */
 const { spawn } = require('child_process');
-// eslint-disable-next-line import/no-extraneous-dependencies
 const { kill } = require('cross-port-killer');
 
 const env = Object.create(process.env);
@@ -36,7 +33,7 @@ startServer.stdout.on('data', (data) => {
     console.log('Development server is started, ready to run tests.');
     const testCmd = spawn(
       /^win/.test(process.platform) ? 'npm.cmd' : 'npm',
-      ['test', '--', '--maxWorkers=1', '--runInBand'],
+      ['run', 'playwright'],
       {
         stdio: 'inherit',
       },
diff --git a/tsconfig.json b/tsconfig.json
index 90a06413..e7a27859 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -26,6 +26,7 @@
   "include": [
     "mock/**/*",
     "src/**/*",
+    "playwright.config.ts",
     "tests/**/*",
     "test/**/*",
     "__test__/**/*",

From a2d8f88061f3c6600ba0b4e9e4c9a1aa5f4b431f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B8=85?= <qixian.cs@outlook.com>
Date: Mon, 20 Dec 2021 15:25:43 +0800
Subject: [PATCH 17/38] fix: remove unuse rules

close https://github.com/ant-design/ant-design-pro/issues/9449
---
 mock/listTableList.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mock/listTableList.ts b/mock/listTableList.ts
index d58a1bdc..08ed86de 100644
--- a/mock/listTableList.ts
+++ b/mock/listTableList.ts
@@ -1,4 +1,3 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { Request, Response } from 'express';
 import moment from 'moment';
 import { parse } from 'url';

From 645d6ed4fd27c6fab55cbf64d2fb2995018bddcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B8=85?= <qixian.cs@outlook.com>
Date: Wed, 22 Dec 2021 16:21:23 +0800
Subject: [PATCH 18/38] =?UTF-8?q?=F0=9F=8C=B7=20UI:=20alway=20set=20theme?=
 =?UTF-8?q?=20(#9458)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🌷 UI: alway set theme

* 🌷 UI: support dynamic theme

* merge master
---
 .github/workflows/deploy.yml              |  2 +-
 config/config.ts                          |  3 +--
 package.json                              |  8 +++----
 src/app.tsx                               | 28 +++++++++++++++++++----
 src/components/HeaderDropdown/index.less  |  2 +-
 src/components/HeaderSearch/index.less    |  2 +-
 src/components/NoticeIcon/NoticeList.less |  2 +-
 src/components/NoticeIcon/index.less      |  2 +-
 src/components/RightContent/index.less    |  2 +-
 src/global.less                           |  2 +-
 src/pages/Welcome.less                    |  2 +-
 src/pages/Welcome.tsx                     |  1 +
 src/pages/user/Login/index.less           |  2 +-
 13 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 12397635..b82bed81 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -15,7 +15,7 @@ jobs:
         run: yarn
 
       - name: plugins
-        run: yarn add umi-plugin-antd-theme umi-plugin-pro umi-plugin-setting-drawer
+        run: yarn add umi-plugin-pro
 
       - name: fetch-blocks
         run: yarn run pro fetch-blocks
diff --git a/config/config.ts b/config/config.ts
index 33bdfd4b..34d14151 100644
--- a/config/config.ts
+++ b/config/config.ts
@@ -38,8 +38,7 @@ export default defineConfig({
   routes,
   // Theme for antd: https://ant.design/docs/react/customize-theme-cn
   theme: {
-    'primary-color': defaultSettings.primaryColor,
-    'root-entry-name': 'default',
+    'root-entry-name': 'variable',
   },
   // esbuild is father build tools
   // https://umijs.org/plugins/plugin-esbuild
diff --git a/package.json b/package.json
index 9e541ee2..b88c7015 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ant-design-pro",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "private": true,
   "description": "An out-of-box UI solution for enterprise applications",
   "scripts": {
@@ -57,10 +57,10 @@
     "@ant-design/icons": "^4.5.0",
     "@ant-design/pro-descriptions": "^1.9.0",
     "@ant-design/pro-form": "^1.43.0",
-    "@ant-design/pro-layout": "^6.26.0",
+    "@ant-design/pro-layout": "^6.32.0-beta.4",
     "@ant-design/pro-table": "^2.56.0",
-    "@umijs/route-utils": "^2.0.3",
-    "antd": "4.16.13",
+    "@umijs/route-utils": "^2.0.4",
+    "antd": "^4.17.0",
     "classnames": "^2.2.6",
     "lodash": "^4.17.11",
     "moment": "^2.25.3",
diff --git a/src/app.tsx b/src/app.tsx
index 27d41419..71db29c4 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -1,4 +1,5 @@
 import type { Settings as LayoutSettings } from '@ant-design/pro-layout';
+import { SettingDrawer } from '@ant-design/pro-layout';
 import { PageLoading } from '@ant-design/pro-layout';
 import type { RunTimeLayoutConfig } from 'umi';
 import { history, Link } from 'umi';
@@ -21,6 +22,7 @@ export const initialStateConfig = {
 export async function getInitialState(): Promise<{
   settings?: Partial<LayoutSettings>;
   currentUser?: API.CurrentUser;
+  loading?: boolean;
   fetchUserInfo?: () => Promise<API.CurrentUser | undefined>;
 }> {
   const fetchUserInfo = async () => {
@@ -48,7 +50,7 @@ export async function getInitialState(): Promise<{
 }
 
 // ProLayout 支持的api https://procomponents.ant.design/components/layout
-export const layout: RunTimeLayoutConfig = ({ initialState }) => {
+export const layout: RunTimeLayoutConfig = ({ initialState, setInitialState }) => {
   return {
     rightContentRender: () => <RightContent />,
     disableContentMargin: false,
@@ -79,10 +81,26 @@ export const layout: RunTimeLayoutConfig = ({ initialState }) => {
     // 自定义 403 页面
     // unAccessible: <div>unAccessible</div>,
     // 增加一个 loading 的状态
-    // childrenRender: (children) => {
-    //   if (initialState.loading) return <PageLoading />;
-    //   return children;
-    // },
+    childrenRender: (children, props) => {
+      // if (initialState?.loading) return <PageLoading />;
+      return (
+        <>
+          {children}
+          {!props.location?.pathname?.includes('/login') && (
+            <SettingDrawer
+              enableDarkTheme
+              settings={initialState?.settings}
+              onSettingChange={(settings) => {
+                setInitialState((preInitialState) => ({
+                  ...preInitialState,
+                  settings,
+                }));
+              }}
+            />
+          )}
+        </>
+      );
+    },
     ...initialState?.settings,
   };
 };
diff --git a/src/components/HeaderDropdown/index.less b/src/components/HeaderDropdown/index.less
index 004b53eb..f583513f 100644
--- a/src/components/HeaderDropdown/index.less
+++ b/src/components/HeaderDropdown/index.less
@@ -1,4 +1,4 @@
-@import '~antd/es/style/themes/default.less';
+@import (reference) '~antd/es/style/themes/index';
 
 .container > * {
   background-color: @popover-bg;
diff --git a/src/components/HeaderSearch/index.less b/src/components/HeaderSearch/index.less
index 15060bdc..7dc3eaa0 100644
--- a/src/components/HeaderSearch/index.less
+++ b/src/components/HeaderSearch/index.less
@@ -1,4 +1,4 @@
-@import '~antd/es/style/themes/default.less';
+@import (reference) '~antd/es/style/themes/index';
 
 .headerSearch {
   display: inline-flex;
diff --git a/src/components/NoticeIcon/NoticeList.less b/src/components/NoticeIcon/NoticeList.less
index 65e0c407..c87fece4 100755
--- a/src/components/NoticeIcon/NoticeList.less
+++ b/src/components/NoticeIcon/NoticeList.less
@@ -1,4 +1,4 @@
-@import '~antd/es/style/themes/default.less';
+@import (reference) '~antd/es/style/themes/index';
 
 .list {
   max-height: 400px;
diff --git a/src/components/NoticeIcon/index.less b/src/components/NoticeIcon/index.less
index 45251cdd..253ccda5 100644
--- a/src/components/NoticeIcon/index.less
+++ b/src/components/NoticeIcon/index.less
@@ -1,4 +1,4 @@
-@import '~antd/es/style/themes/default.less';
+@import (reference) '~antd/es/style/themes/index';
 
 .popover {
   position: relative;
diff --git a/src/components/RightContent/index.less b/src/components/RightContent/index.less
index 486e80c9..6d6f1986 100644
--- a/src/components/RightContent/index.less
+++ b/src/components/RightContent/index.less
@@ -1,4 +1,4 @@
-@import '~antd/es/style/themes/default.less';
+@import (reference) '~antd/es/style/themes/index';
 
 @pro-header-hover-bg: rgba(0, 0, 0, 0.025);
 
diff --git a/src/global.less b/src/global.less
index 21a21f5e..0d6158c7 100644
--- a/src/global.less
+++ b/src/global.less
@@ -1,4 +1,4 @@
-@import '~antd/es/style/themes/default.less';
+@import '~antd/es/style/variable.less';
 
 html,
 body,
diff --git a/src/pages/Welcome.less b/src/pages/Welcome.less
index 914c40d8..224a7932 100644
--- a/src/pages/Welcome.less
+++ b/src/pages/Welcome.less
@@ -1,4 +1,4 @@
-@import '~antd/lib/style/themes/default.less';
+@import (reference) '~antd/es/style/themes/index';
 
 .pre {
   margin: 12px 0;
diff --git a/src/pages/Welcome.tsx b/src/pages/Welcome.tsx
index ed10f13d..9041b181 100644
--- a/src/pages/Welcome.tsx
+++ b/src/pages/Welcome.tsx
@@ -14,6 +14,7 @@ const CodePreview: React.FC = ({ children }) => (
 
 const Welcome: React.FC = () => {
   const intl = useIntl();
+
   return (
     <PageContainer>
       <Card>
diff --git a/src/pages/user/Login/index.less b/src/pages/user/Login/index.less
index 84c5fddd..f6ecf00d 100644
--- a/src/pages/user/Login/index.less
+++ b/src/pages/user/Login/index.less
@@ -1,4 +1,4 @@
-@import '~antd/es/style/themes/default.less';
+@import (reference) '~antd/es/style/themes/index';
 
 .container {
   display: flex;

From d56219f9c4b77d6209a39bd37f4f6987510b4944 Mon Sep 17 00:00:00 2001
From: chenshuai2144 <qixian.cs@outlook.com>
Date: Wed, 22 Dec 2021 17:31:06 +0800
Subject: [PATCH 19/38] feat: add theme-color

---
 src/pages/document.ejs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/document.ejs b/src/pages/document.ejs
index bfc96300..6db8355f 100644
--- a/src/pages/document.ejs
+++ b/src/pages/document.ejs
@@ -2,6 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
+    <meta name="theme-color" content="#1890ff" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta
       name="keywords"

From 8442881395faded4112a74c16733cd2466b33d54 Mon Sep 17 00:00:00 2001
From: JiangYu <178213568@qq.com>
Date: Wed, 29 Dec 2021 14:22:44 +0800
Subject: [PATCH 20/38] fix notice styles and update dependencies minor version
 (#9490)

* fix: notice styles

* chore: up depenedencies minor version

Co-authored-by: jiangyu <jiangyu@1414587873548331.onaliyun.com>
---
 package.json                         | 68 ++++++++++++++--------------
 src/components/NoticeIcon/index.less |  2 +-
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/package.json b/package.json
index b88c7015..5308ffcb 100644
--- a/package.json
+++ b/package.json
@@ -54,61 +54,61 @@
     "not ie <= 10"
   ],
   "dependencies": {
-    "@ant-design/icons": "^4.5.0",
-    "@ant-design/pro-descriptions": "^1.9.0",
-    "@ant-design/pro-form": "^1.43.0",
-    "@ant-design/pro-layout": "^6.32.0-beta.4",
-    "@ant-design/pro-table": "^2.56.0",
-    "@umijs/route-utils": "^2.0.4",
+    "@ant-design/icons": "^4.7.0",
+    "@ant-design/pro-descriptions": "^1.10.0",
+    "@ant-design/pro-form": "^1.52.0",
+    "@ant-design/pro-layout": "^6.32.0",
+    "@ant-design/pro-table": "^2.61.0",
+    "@umijs/route-utils": "^2.0.0",
     "antd": "^4.17.0",
-    "classnames": "^2.2.6",
-    "lodash": "^4.17.11",
-    "moment": "^2.25.3",
+    "classnames": "^2.3.0",
+    "lodash": "^4.17.0",
+    "moment": "^2.29.0",
     "omit.js": "^2.0.2",
-    "rc-menu": "^9.0.13",
-    "rc-util": "^5.14.0",
+    "rc-menu": "^9.1.0",
+    "rc-util": "^5.16.0",
     "react": "^17.0.0",
-    "react-dev-inspector": "^1.1.1",
+    "react-dev-inspector": "^1.7.0",
     "react-dom": "^17.0.0",
-    "react-helmet-async": "^1.0.4",
+    "react-helmet-async": "^1.2.0",
     "umi": "^3.5.0",
     "umi-serve": "^1.9.10"
   },
   "devDependencies": {
-    "@ant-design/pro-cli": "^2.0.2",
-    "@playwright/test": "^1.16.3",
+    "@ant-design/pro-cli": "^2.1.0",
+    "@playwright/test": "^1.17.0",
     "@types/express": "^4.17.0",
-    "@types/history": "^4.7.2",
+    "@types/history": "^4.7.0",
     "@types/jest": "^26.0.0",
-    "@types/lodash": "^4.14.144",
+    "@types/lodash": "^4.14.0",
     "@types/react": "^17.0.0",
     "@types/react-dom": "^17.0.0",
     "@types/react-helmet": "^6.1.0",
-    "@umijs/fabric": "^2.6.2",
+    "@umijs/fabric": "^2.8.0",
     "@umijs/openapi": "^1.3.0",
-    "@umijs/plugin-blocks": "^2.0.5",
-    "@umijs/plugin-esbuild": "^1.0.1",
-    "@umijs/plugin-openapi": "^1.2.0",
-    "@umijs/preset-ant-design-pro": "^1.2.0",
-    "@umijs/preset-dumi": "^1.1.7",
+    "@umijs/plugin-blocks": "^2.2.0",
+    "@umijs/plugin-esbuild": "^1.4.0",
+    "@umijs/plugin-openapi": "^1.3.0",
+    "@umijs/preset-ant-design-pro": "^1.3.0",
+    "@umijs/preset-dumi": "^1.1.0",
     "@umijs/preset-react": "^1.8.17",
-    "@umijs/yorkie": "^2.0.3",
+    "@umijs/yorkie": "^2.0.5",
     "carlo": "^0.9.46",
     "cross-env": "^7.0.0",
-    "cross-port-killer": "^1.1.1",
-    "detect-installer": "^1.0.1",
+    "cross-port-killer": "^1.3.0",
+    "detect-installer": "^1.0.0",
     "enzyme": "^3.11.0",
-    "eslint": "^7.1.0",
-    "express": "^4.17.1",
-    "gh-pages": "^3.0.0",
-    "jsdom-global": "^3.0.2",
+    "eslint": "^7.32.0",
+    "express": "^4.17.0",
+    "gh-pages": "^3.2.0",
+    "jsdom-global": "^3.0.0",
     "lint-staged": "^10.0.0",
-    "mockjs": "^1.0.1-beta3",
-    "prettier": "^2.3.2",
+    "mockjs": "^1.1.0",
+    "prettier": "^2.5.0",
     "puppeteer-core": "^8.0.0",
     "stylelint": "^13.0.0",
-    "swagger-ui-react": "^3.52.3",
-    "typescript": "^4.2.2"
+    "swagger-ui-react": "^3.52.0",
+    "typescript": "^4.5.0"
   },
   "engines": {
     "node": ">=10.0.0"
diff --git a/src/components/NoticeIcon/index.less b/src/components/NoticeIcon/index.less
index 253ccda5..a2e44f15 100644
--- a/src/components/NoticeIcon/index.less
+++ b/src/components/NoticeIcon/index.less
@@ -28,7 +28,7 @@
     .ant-tabs-nav-scroll {
       text-align: center;
     }
-    .ant-tabs-bar {
+    .ant-tabs-nav {
       margin-bottom: 0;
     }
   }

From bf9406c6f44fbf3d69c44510c555526333877817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B8=85?= <qixian.cs@outlook.com>
Date: Mon, 3 Jan 2022 13:56:19 +0800
Subject: [PATCH 21/38] chore: up version

---
 package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 5308ffcb..05c630fa 100644
--- a/package.json
+++ b/package.json
@@ -37,8 +37,8 @@
     "start:pre": "cross-env REACT_APP_ENV=pre UMI_ENV=dev umi dev",
     "start:test": "cross-env REACT_APP_ENV=test MOCK=none UMI_ENV=dev umi dev",
     "test": "umi test",
-    "test:e2e": "node ./tests/run-tests.js",
     "test:component": "umi test ./src/components",
+    "test:e2e": "node ./tests/run-tests.js",
     "tsc": "tsc --noEmit"
   },
   "lint-staged": {
@@ -71,8 +71,7 @@
     "react-dev-inspector": "^1.7.0",
     "react-dom": "^17.0.0",
     "react-helmet-async": "^1.2.0",
-    "umi": "^3.5.0",
-    "umi-serve": "^1.9.10"
+    "umi": "^3.5.0"
   },
   "devDependencies": {
     "@ant-design/pro-cli": "^2.1.0",
@@ -108,7 +107,8 @@
     "puppeteer-core": "^8.0.0",
     "stylelint": "^13.0.0",
     "swagger-ui-react": "^3.52.0",
-    "typescript": "^4.5.0"
+    "typescript": "^4.5.0",
+    "umi-serve": "^1.9.10"
   },
   "engines": {
     "node": ">=10.0.0"

From 50ee90f646e02837e28686a090e3a011a30228a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B8=85?= <qixian.cs@outlook.com>
Date: Tue, 11 Jan 2022 09:52:23 +0800
Subject: [PATCH 22/38] fix: should use defaultSetting

close https://github.com/ant-design/ant-design-pro/issues/9521
---
 src/app.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app.tsx b/src/app.tsx
index 71db29c4..15ad915e 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -7,6 +7,7 @@ import RightContent from '@/components/RightContent';
 import Footer from '@/components/Footer';
 import { currentUser as queryCurrentUser } from './services/ant-design-pro/api';
 import { BookOutlined, LinkOutlined } from '@ant-design/icons';
+import defaultSettings from '../config/defaultSettings';
 
 const isDev = process.env.NODE_ENV === 'development';
 const loginPath = '/user/login';
@@ -40,12 +41,12 @@ export async function getInitialState(): Promise<{
     return {
       fetchUserInfo,
       currentUser,
-      settings: {},
+      settings: defaultSettings,
     };
   }
   return {
     fetchUserInfo,
-    settings: {},
+    settings: defaultSettings,
   };
 }
 

From d4391552c1787fae3df6bf60244387f0ff3e07bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B8=85?= <qixian.cs@outlook.com>
Date: Tue, 11 Jan 2022 10:32:25 +0800
Subject: [PATCH 23/38] fix: default disable url params

ref https://github.com/ant-design/ant-design-pro/issues/9526#issuecomment-1009544266
---
 src/app.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app.tsx b/src/app.tsx
index 15ad915e..7b5fb1c8 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -68,11 +68,11 @@ export const layout: RunTimeLayoutConfig = ({ initialState, setInitialState }) =
     },
     links: isDev
       ? [
-          <Link to="/umi/plugin/openapi" target="_blank">
+          <Link key="openapi" to="/umi/plugin/openapi" target="_blank">
             <LinkOutlined />
             <span>OpenAPI 文档</span>
           </Link>,
-          <Link to="/~docs">
+          <Link to="/~docs" key="docs">
             <BookOutlined />
             <span>业务组件文档</span>
           </Link>,
@@ -89,6 +89,7 @@ export const layout: RunTimeLayoutConfig = ({ initialState, setInitialState }) =
           {children}
           {!props.location?.pathname?.includes('/login') && (
             <SettingDrawer
+              disableUrlParams
               enableDarkTheme
               settings={initialState?.settings}
               onSettingChange={(settings) => {

From 8342e01afc03c85c32c7368ad880bb96c8677c47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=9F=E8=B4=A4?= <qixian.cs@antgroup.com>
Date: Fri, 11 Feb 2022 15:50:11 +0800
Subject: [PATCH 24/38] fix: add serve exit code console

close https://github.com/ant-design/ant-design-pro/issues/9575\?notification_referrer_id\=NT_kwDOAHzrKLIzMDEzMDQ5MzkwOjgxODY2NjQ\&notifications_query\=is%3Aunread\#event-5965333309
---
 tests/run-tests.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/run-tests.js b/tests/run-tests.js
index 8ac1d871..d4e0fc8e 100644
--- a/tests/run-tests.js
+++ b/tests/run-tests.js
@@ -39,7 +39,7 @@ startServer.stdout.on('data', (data) => {
       },
     );
     testCmd.on('exit', (code) => {
-      console.log(code);
+      console.log('服务已经退出，退出码：', code);
       startServer.kill();
       process.exit(code);
     });

From 86b7c871f254dd3178de06818f4d387af8c05b4f Mon Sep 17 00:00:00 2001
From: Non-Official NPM Mirror Bot
 <99484857+npmmirror@users.noreply.github.com>
Date: Mon, 14 Feb 2022 16:47:03 +0800
Subject: [PATCH 25/38] update https://registry.npm.taobao.org to
 https://registry.npmmirror.com (#9592)

Co-authored-by: NPM Mirror Bot <npmmirror@localhost>
---
 Dockerfile.dev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.dev b/Dockerfile.dev
index b2c3d258..18446181 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -3,7 +3,7 @@ FROM node:latest
 WORKDIR /usr/src/app/
 
 COPY package.json ./
-RUN npm install --silent --no-cache --registry=https://registry.npm.taobao.org
+RUN npm install --silent --no-cache --registry=https://registry.npmmirror.com
 
 COPY ./ ./
 

From f1c9c3856f4bdc660697d8b2176f8d2d05ad31ea Mon Sep 17 00:00:00 2001
From: zqran <uuxnet@gmail.com>
Date: Mon, 14 Feb 2022 18:49:57 +0800
Subject: [PATCH 26/38] refactor: modify the parameter type of `access`
 function (#9596)

---
 src/access.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/access.ts b/src/access.ts
index 2ec89bdd..e823e24b 100644
--- a/src/access.ts
+++ b/src/access.ts
@@ -1,8 +1,8 @@
 /**
  * @see https://umijs.org/zh-CN/plugins/plugin-access
  * */
-export default function access(initialState: { currentUser?: API.CurrentUser | undefined }) {
-  const { currentUser } = initialState || {};
+export default function access(initialState: { currentUser?: API.CurrentUser } | undefined) {
+  const { currentUser } = initialState ?? {};
   return {
     canAdmin: currentUser && currentUser.access === 'admin',
   };

From 59499f682bca8d9c375d97726d1f02ef88277038 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 16 Feb 2022 19:14:52 +0800
Subject: [PATCH 27/38] chore: remove david badges

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 71f517a0..16b06c2f 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Language : 🇺🇸 | [🇨🇳](./README.zh-CN.md) | [🇷🇺](./README.ru-RU.
 
 An out-of-box UI solution for enterprise applications as a React boilerplate.
 
-[![Build Status](https://dev.azure.com/ant-design/ant-design-pro/_apis/build/status/ant-design.ant-design-pro?branchName=master)](https://dev.azure.com/ant-design/ant-design-pro/_build/latest?definitionId=1?branchName=master) ![Github Action](https://github.com/ant-design/ant-design-pro/workflows/Node%20CI/badge.svg) ![Deploy](https://github.com/ant-design/ant-design-pro/workflows/Deploy%20CI/badge.svg) [![Dependencies](https://img.shields.io/david/ant-design/ant-design-pro.svg)](https://david-dm.org/ant-design/ant-design-pro) [![DevDependencies](https://img.shields.io/david/dev/ant-design/ant-design-pro.svg)](https://david-dm.org/ant-design/ant-design-pro?type=dev)
+[![Build Status](https://dev.azure.com/ant-design/ant-design-pro/_apis/build/status/ant-design.ant-design-pro?branchName=master)](https://dev.azure.com/ant-design/ant-design-pro/_build/latest?definitionId=1?branchName=master) ![Github Action](https://github.com/ant-design/ant-design-pro/workflows/Node%20CI/badge.svg) ![Deploy](https://github.com/ant-design/ant-design-pro/workflows/Deploy%20CI/badge.svg)
 
 [![Gitter](https://img.shields.io/gitter/room/ant-design/pro-english.svg?style=flat-square&logoWidth=20&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgd2lkdGg9IjEyMzUiIGhlaWdodD0iNjUwIiB2aWV3Qm94PSIwIDAgNzQxMCAzOTAwIj4NCjxyZWN0IHdpZHRoPSI3NDEwIiBoZWlnaHQ9IjM5MDAiIGZpbGw9IiNiMjIyMzQiLz4NCjxwYXRoIGQ9Ik0wLDQ1MEg3NDEwbTAsNjAwSDBtMCw2MDBINzQxMG0wLDYwMEgwbTAsNjAwSDc0MTBtMCw2MDBIMCIgc3Ryb2tlPSIjZmZmIiBzdHJva2Utd2lkdGg9IjMwMCIvPg0KPHJlY3Qgd2lkdGg9IjI5NjQiIGhlaWdodD0iMjEwMCIgZmlsbD0iIzNjM2I2ZSIvPg0KPGcgZmlsbD0iI2ZmZiI%2BDQo8ZyBpZD0iczE4Ij4NCjxnIGlkPSJzOSI%2BDQo8ZyBpZD0iczUiPg0KPGcgaWQ9InM0Ij4NCjxwYXRoIGlkPSJzIiBkPSJNMjQ3LDkwIDMxNy41MzQyMzAsMzA3LjA4MjAzOSAxMzIuODczMjE4LDE3Mi45MTc5NjFIMzYxLjEyNjc4MkwxNzYuNDY1NzcwLDMwNy4wODIwMzl6Ii8%2BDQo8dXNlIHhsaW5rOmhyZWY9IiNzIiB5PSI0MjAiLz4NCjx1c2UgeGxpbms6aHJlZj0iI3MiIHk9Ijg0MCIvPg0KPHVzZSB4bGluazpocmVmPSIjcyIgeT0iMTI2MCIvPg0KPC9nPg0KPHVzZSB4bGluazpocmVmPSIjcyIgeT0iMTY4MCIvPg0KPC9nPg0KPHVzZSB4bGluazpocmVmPSIjczQiIHg9IjI0NyIgeT0iMjEwIi8%2BDQo8L2c%2BDQo8dXNlIHhsaW5rOmhyZWY9IiNzOSIgeD0iNDk0Ii8%2BDQo8L2c%2BDQo8dXNlIHhsaW5rOmhyZWY9IiNzMTgiIHg9Ijk4OCIvPg0KPHVzZSB4bGluazpocmVmPSIjczkiIHg9IjE5NzYiLz4NCjx1c2UgeGxpbms6aHJlZj0iI3M1IiB4PSIyNDcwIi8%2BDQo8L2c%2BDQo8L3N2Zz4%3D)](https://gitter.im/ant-design/pro-english?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Join the chat at https://gitter.im/ant-design/ant-design-pro](https://img.shields.io/gitter/room/ant-design/ant-design-pro.svg?style=flat-square&logoWidth=20&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgd2lkdGg9IjkwMCIgaGVpZ2h0PSI2MDAiIHZpZXdCb3g9IjAgMCAzMCAyMCI%2BDQo8ZGVmcz4NCjxwYXRoIGlkPSJzIiBkPSJNMCwtMSAwLjU4Nzc4NSwwLjgwOTAxNyAtMC45NTEwNTcsLTAuMzA5MDE3SDAuOTUxMDU3TC0wLjU4Nzc4NSwwLjgwOTAxN3oiIGZpbGw9IiNmZmRlMDAiLz4NCjwvZGVmcz4NCjxyZWN0IHdpZHRoPSIzMCIgaGVpZ2h0PSIyMCIgZmlsbD0iI2RlMjkxMCIvPg0KPHVzZSB4bGluazpocmVmPSIjcyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNSw1KSBzY2FsZSgzKSIvPg0KPHVzZSB4bGluazpocmVmPSIjcyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMTAsMikgcm90YXRlKDIzLjAzNjI0MykiLz4NCjx1c2UgeGxpbms6aHJlZj0iI3MiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEyLDQpIHJvdGF0ZSg0NS44Njk4OTgpIi8%2BDQo8dXNlIHhsaW5rOmhyZWY9IiNzIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxMiw3KSByb3RhdGUoNjkuOTQ1Mzk2KSIvPg0KPHVzZSB4bGluazpocmVmPSIjcyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMTAsOSkgcm90YXRlKDIwLjY1OTgwOCkiLz4NCjwvc3ZnPg%3D%3D)](https://gitter.im/ant-design/ant-design-pro?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Build With Umi](https://img.shields.io/badge/build%20with-umi-028fe4.svg?style=flat-square)](http://umijs.org/) ![](https://badgen.net/badge/icon/Ant%20Design?icon=https://gw.alipayobjects.com/zos/antfincdn/Pp4WPgVDB3/KDpgvguMpGfqaHPjicRK.svg&label)
 

From 4df99f17be8864510de493ebeaaac97452fb160e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B8=85?= <qixian.cs@outlook.com>
Date: Sun, 20 Feb 2022 19:11:50 +0800
Subject: [PATCH 28/38] version: up dependencies version

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 05c630fa..9698e250 100644
--- a/package.json
+++ b/package.json
@@ -56,11 +56,11 @@
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-descriptions": "^1.10.0",
-    "@ant-design/pro-form": "^1.52.0",
+    "@ant-design/pro-form": "^1.53.0",
     "@ant-design/pro-layout": "^6.32.0",
-    "@ant-design/pro-table": "^2.61.0",
+    "@ant-design/pro-table": "^2.63.0",
     "@umijs/route-utils": "^2.0.0",
-    "antd": "^4.17.0",
+    "antd": "^4.18.0",
     "classnames": "^2.3.0",
     "lodash": "^4.17.0",
     "moment": "^2.29.0",

From 84883f56506c6d10187d5e266e3b55770ec79b32 Mon Sep 17 00:00:00 2001
From: kalykun <984757534@qq.com>
Date: Tue, 22 Mar 2022 13:44:25 +0800
Subject: [PATCH 29/38] fix: wrong note (#9676)

---
 src/app.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app.tsx b/src/app.tsx
index 7b5fb1c8..58571014 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -35,7 +35,7 @@ export async function getInitialState(): Promise<{
     }
     return undefined;
   };
-  // 如果是登录页面，不执行
+  // 如果不是登录页面，执行
   if (history.location.pathname !== loginPath) {
     const currentUser = await fetchUserInfo();
     return {

From 9d8b711605a280d4339f29ab2dfb83851061ef98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B8=85?= <qixian.cs@outlook.com>
Date: Sun, 27 Mar 2022 20:20:26 +0800
Subject: [PATCH 30/38] chore: update package.json version

---
 config/config.ts |  3 +++
 package.json     | 13 +++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/config.ts b/config/config.ts
index 34d14151..72eca9d6 100644
--- a/config/config.ts
+++ b/config/config.ts
@@ -38,6 +38,9 @@ export default defineConfig({
   routes,
   // Theme for antd: https://ant.design/docs/react/customize-theme-cn
   theme: {
+    // 如果不想要 configProvide 动态设置主题需要把这个设置为 default
+    // 只有设置为 variable， 才能使用 configProvide 动态设置主色调
+    // https://ant.design/docs/react/customize-theme-variable-cn
     'root-entry-name': 'variable',
   },
   // esbuild is father build tools
diff --git a/package.json b/package.json
index 9698e250..86251d67 100644
--- a/package.json
+++ b/package.json
@@ -55,10 +55,11 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
+    "@ant-design/pro-card": "^1.19.0",
     "@ant-design/pro-descriptions": "^1.10.0",
-    "@ant-design/pro-form": "^1.53.0",
-    "@ant-design/pro-layout": "^6.32.0",
-    "@ant-design/pro-table": "^2.63.0",
+    "@ant-design/pro-form": "^1.60.0",
+    "@ant-design/pro-layout": "^6.34.0",
+    "@ant-design/pro-table": "^2.69.0",
     "@umijs/route-utils": "^2.0.0",
     "antd": "^4.18.0",
     "classnames": "^2.3.0",
@@ -92,26 +93,22 @@
     "@umijs/preset-dumi": "^1.1.0",
     "@umijs/preset-react": "^1.8.17",
     "@umijs/yorkie": "^2.0.5",
-    "carlo": "^0.9.46",
     "cross-env": "^7.0.0",
     "cross-port-killer": "^1.3.0",
     "detect-installer": "^1.0.0",
-    "enzyme": "^3.11.0",
     "eslint": "^7.32.0",
-    "express": "^4.17.0",
     "gh-pages": "^3.2.0",
     "jsdom-global": "^3.0.0",
     "lint-staged": "^10.0.0",
     "mockjs": "^1.1.0",
     "prettier": "^2.5.0",
-    "puppeteer-core": "^8.0.0",
     "stylelint": "^13.0.0",
     "swagger-ui-react": "^3.52.0",
     "typescript": "^4.5.0",
     "umi-serve": "^1.9.10"
   },
   "engines": {
-    "node": ">=10.0.0"
+    "node": ">=12.0.0"
   },
   "create-umi": {
     "ignoreScript": [

From a2f83ca834a1cdaace8f779eba0e85f515969e75 Mon Sep 17 00:00:00 2001
From: dengqing <dengqing0821@gmail.com>
Date: Wed, 30 Mar 2022 10:59:56 +0800
Subject: [PATCH 31/38] fix: type error (#9708)

---
 src/components/HeaderSearch/index.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/HeaderSearch/index.tsx b/src/components/HeaderSearch/index.tsx
index 91cc697e..d282de14 100644
--- a/src/components/HeaderSearch/index.tsx
+++ b/src/components/HeaderSearch/index.tsx
@@ -1,4 +1,5 @@
 import { SearchOutlined } from '@ant-design/icons';
+import type { InputRef } from 'antd';
 import { AutoComplete, Input } from 'antd';
 import useMergedState from 'rc-util/es/hooks/useMergedState';
 import type { AutoCompleteProps } from 'antd/es/auto-complete';
@@ -31,7 +32,7 @@ const HeaderSearch: React.FC<HeaderSearchProps> = (props) => {
     ...restProps
   } = props;
 
-  const inputRef = useRef<Input | null>(null);
+  const inputRef = useRef<InputRef | null>(null);
 
   const [value, setValue] = useMergedState<string | undefined>(defaultValue, {
     value: props.value,
@@ -74,7 +75,7 @@ const HeaderSearch: React.FC<HeaderSearchProps> = (props) => {
         className={inputClass}
         value={value}
         options={restProps.options}
-        onChange={setValue}
+        onChange={(completeValue) => setValue(completeValue)}
       >
         <Input
           size="small"

From c0eb9d15a0a56d2ae96bec29685a77316f858e21 Mon Sep 17 00:00:00 2001
From: Chuck <fanck0605@qq.com>
Date: Wed, 30 Mar 2022 18:20:32 +0800
Subject: [PATCH 32/38] =?UTF-8?q?chore:=20=E4=BD=BF=E7=94=A8=20husky=20?=
 =?UTF-8?q?=E4=BB=A3=E6=9B=BF=20yorkie=20(#9718)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

yorkie 在 pnpm 环境下并不能正确的安装 Git Hooks, 因此使用 husky 代替它.
---
 .husky/.gitignore | 1 +
 .husky/commit-msg | 7 +++++++
 .husky/pre-commit | 4 ++++
 package.json      | 9 +++------
 4 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 .husky/.gitignore
 create mode 100755 .husky/commit-msg
 create mode 100755 .husky/pre-commit

diff --git a/.husky/.gitignore b/.husky/.gitignore
new file mode 100644
index 00000000..31354ec1
--- /dev/null
+++ b/.husky/.gitignore
@@ -0,0 +1 @@
+_
diff --git a/.husky/commit-msg b/.husky/commit-msg
new file mode 100755
index 00000000..d50cdcf9
--- /dev/null
+++ b/.husky/commit-msg
@@ -0,0 +1,7 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+# Export Git hook params
+export GIT_PARAMS=$*
+
+npx --no-install fabric verify-commit
diff --git a/.husky/pre-commit b/.husky/pre-commit
new file mode 100755
index 00000000..d37daa07
--- /dev/null
+++ b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx --no-install lint-staged
diff --git a/package.json b/package.json
index 86251d67..6a1890a7 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,6 @@
     "lint:style": "stylelint --fix \"src/**/*.less\" --syntax less",
     "openapi": "umi openapi",
     "playwright": "playwright install && playwright test",
-    "precommit": "lint-staged",
     "prettier": "prettier -c --write \"src/**/*\"",
     "serve": "umi-serve",
     "start": "cross-env UMI_ENV=dev umi dev",
@@ -39,7 +38,8 @@
     "test": "umi test",
     "test:component": "umi test ./src/components",
     "test:e2e": "node ./tests/run-tests.js",
-    "tsc": "tsc --noEmit"
+    "tsc": "tsc --noEmit",
+    "prepare": "husky install"
   },
   "lint-staged": {
     "**/*.less": "stylelint --syntax less",
@@ -92,12 +92,12 @@
     "@umijs/preset-ant-design-pro": "^1.3.0",
     "@umijs/preset-dumi": "^1.1.0",
     "@umijs/preset-react": "^1.8.17",
-    "@umijs/yorkie": "^2.0.5",
     "cross-env": "^7.0.0",
     "cross-port-killer": "^1.3.0",
     "detect-installer": "^1.0.0",
     "eslint": "^7.32.0",
     "gh-pages": "^3.2.0",
+    "husky": "^7.0.4",
     "jsdom-global": "^3.0.0",
     "lint-staged": "^10.0.0",
     "mockjs": "^1.1.0",
@@ -138,8 +138,5 @@
       "CNAME",
       "create-umi"
     ]
-  },
-  "gitHooks": {
-    "commit-msg": "fabric verify-commit"
   }
 }

From 9f16dae8d7dd4e372aeb8d477d5b86a36710a669 Mon Sep 17 00:00:00 2001
From: zqran <uuxnet@gmail.com>
Date: Wed, 6 Apr 2022 18:27:36 +0800
Subject: [PATCH 33/38] chore: simplify routes configuration (#9728)

---
 config/routes.ts | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/config/routes.ts b/config/routes.ts
index ea518bba..92b61fbe 100644
--- a/config/routes.ts
+++ b/config/routes.ts
@@ -4,14 +4,9 @@
     layout: false,
     routes: [
       {
-        path: '/user',
-        routes: [
-          {
-            name: 'login',
-            path: '/user/login',
-            component: './user/Login',
-          },
-        ],
+        name: 'login',
+        path: '/user/login',
+        component: './user/Login',
       },
       {
         component: './404',

From 0d8a78874db153184a95a3c3207f1553667bac67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=9F=E8=B4=A4?= <qixian.cs@antgroup.com>
Date: Fri, 8 Apr 2022 10:17:32 +0800
Subject: [PATCH 34/38] chore: fix Deploy error

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b82bed81..bcaa437f 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -26,6 +26,6 @@ jobs:
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
         with:
-          deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./dist
           force_orphan: true

From 683f75159d06f3dab45f4d8a1f92d6fb6c2f8f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=9F=E8=B4=A4?= <qixian.cs@antgroup.com>
Date: Fri, 8 Apr 2022 10:30:00 +0800
Subject: [PATCH 35/38] chore: remove node@12.x

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 965eda38..101ea9ea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node_version: [12.x, 14.x]
+        node_version: [16.x, 14.x]
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
       - uses: actions/checkout@v1

From 5c27efd965b450bde0c7a05f2a4b3531ae907279 Mon Sep 17 00:00:00 2001
From: Sodium <fanck0605@qq.com>
Date: Mon, 18 Apr 2022 15:44:25 +0800
Subject: [PATCH 36/38] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20fabric.stylel?=
 =?UTF-8?q?int=20=E4=B8=8E=20IDE=20=E7=9A=84=E5=85=BC=E5=AE=B9=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20(#9757)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 修复 fabric.stylelint 与 IDE 的兼容问题

使用原来的写法 Webstorm 的 stylelint 插件会找不到配置文件

* chore: 移除未使用的变量
---
 .stylelintrc.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.stylelintrc.js b/.stylelintrc.js
index c2030787..a1184de4 100644
--- a/.stylelintrc.js
+++ b/.stylelintrc.js
@@ -1,5 +1,3 @@
-const fabric = require('@umijs/fabric');
-
 module.exports = {
-  ...fabric.stylelint,
+  extends: [require.resolve('@umijs/fabric/dist/stylelint')],
 };

From 10ced8124d0a9100eddc5c8f29509f9fe76a6a4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=9F=E8=B4=A4?= <qixian.cs@antgroup.com>
Date: Mon, 18 Apr 2022 16:15:37 +0800
Subject: [PATCH 37/38] version: update package.json

---
 package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 6a1890a7..95c3519e 100644
--- a/package.json
+++ b/package.json
@@ -57,11 +57,11 @@
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-card": "^1.19.0",
     "@ant-design/pro-descriptions": "^1.10.0",
-    "@ant-design/pro-form": "^1.60.0",
-    "@ant-design/pro-layout": "^6.34.0",
-    "@ant-design/pro-table": "^2.69.0",
+    "@ant-design/pro-form": "^1.64.0",
+    "@ant-design/pro-layout": "^6.35.0",
+    "@ant-design/pro-table": "^2.71.0",
     "@umijs/route-utils": "^2.0.0",
-    "antd": "^4.18.0",
+    "antd": "^4.19.0",
     "classnames": "^2.3.0",
     "lodash": "^4.17.0",
     "moment": "^2.29.0",

From d160dc04a543b484edf031f8aaa18833fdbfcc29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=9F=E8=B4=A4?= <qixian.cs@antgroup.com>
Date: Mon, 25 Apr 2022 22:21:18 +0800
Subject: [PATCH 38/38] fix: support access new version

---
 config/config.ts | 1 +
 package.json     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/config.ts b/config/config.ts
index 72eca9d6..d2883542 100644
--- a/config/config.ts
+++ b/config/config.ts
@@ -36,6 +36,7 @@ export default defineConfig({
   },
   // umi routes: https://umijs.org/docs/routing
   routes,
+  access: {},
   // Theme for antd: https://ant.design/docs/react/customize-theme-cn
   theme: {
     // 如果不想要 configProvide 动态设置主题需要把这个设置为 default
diff --git a/package.json b/package.json
index 95c3519e..a065cde6 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
     "@umijs/plugin-openapi": "^1.3.0",
     "@umijs/preset-ant-design-pro": "^1.3.0",
     "@umijs/preset-dumi": "^1.1.0",
-    "@umijs/preset-react": "^1.8.17",
+    "@umijs/preset-react": "^2.1.0",
     "cross-env": "^7.0.0",
     "cross-port-killer": "^1.3.0",
     "detect-installer": "^1.0.0",