feats

.editorconfig

@@ -1,16 +0,0 @@
-# http://editorconfig.org
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false
-
-[Makefile]
-indent_style = tab

.env

@@ -0,0 +1 @@
+VITE_SERVER_BASE=/api

.env.production

@@ -0,0 +1 @@
+VITE_SERVER_BASE=/api

.eslintignore

@@ -1,8 +0,0 @@
-/lambda/
-/scripts
-/config
-.history
-public
-dist
-.umi
-mock

.eslintrc.js

@@ -1,8 +0,0 @@
-module.exports = {
-  extends: [require.resolve('@umijs/fabric/dist/eslint')],
-  globals: {
-    ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: true,
-    page: true,
-    REACT_APP_ENV: true,
-  },
-};

.gitignore

@@ -1,40 +1,24 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-**/node_modules
-# roadhog-api-doc ignore
-/src/utils/request-temp.js
-_roadhog-api-doc
-
-# production
-/dist
-
-# misc
-.DS_Store
+# Logs
+logs
+*.log
 npm-debug.log*
-yarn-error.log
-
-/coverage
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
 .idea
-yarn.lock
-package-lock.json
-pnpm-lock.yaml
-*bak
-
-
-# visual studio code
-.history
-*.log
-functions/*
-.temp/**
-
-# umi
-.umi
-.umi-production
-
-# screenshot
-screenshot
-.firebase
-.eslintcache
-
-build
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

.prettierignore

@@ -1,23 +0,0 @@
-**/*.svg
-package.json
-.umi
-.umi-production
-/dist
-.dockerignore
-.DS_Store
-.eslintignore
-*.png
-*.toml
-docker
-.editorconfig
-Dockerfile*
-.gitignore
-.prettierignore
-LICENSE
-.eslintcache
-*.lock
-yarn-error.log
-.history
-CNAME
-/build
-/public

.prettierrc.js

@@ -1,5 +0,0 @@
-const fabric = require('@umijs/fabric');
-
-module.exports = {
-  ...fabric.prettier,
-};

README.md

@@ -1,57 +0,0 @@
-# Ant Design Pro
-
-This project is initialized with [Ant Design Pro](https://pro.ant.design). Follow is the quick guide for how to use.
-
-## Environment Prepare
-
-Install `node_modules`:
-
-```bash
-npm install
-```
-
-or
-
-```bash
-yarn
-```
-
-## Provided Scripts
-
-Ant Design Pro provides some useful script to help you quick start and build with web project, code style check and test.
-
-Scripts provided in `package.json`. It's safe to modify or add additional script:
-
-### Start project
-
-```bash
-npm start
-```
-
-### Build project
-
-```bash
-npm run build
-```
-
-### Check code style
-
-```bash
-npm run lint
-```
-
-You can also use script to auto fix some lint error:
-
-```bash
-npm run lint:fix
-```
-
-### Test code
-
-```bash
-npm test
-```
-
-## More
-
-You can view full document on our [official website](https://pro.ant.design). And welcome any feedback in our [github](https://github.com/ant-design/ant-design-pro).

config/config.js

@@ -1,58 +0,0 @@
-// https://umijs.org/config/
-import { defineConfig } from '@umijs/max';
-import { join } from 'path';
-import defaultSettings from './defaultSettings';
-import proxy from './proxy';
-import routes from './routes';
-
-const { REACT_APP_ENV } = process.env;
-
-export default defineConfig({
-  define: {
-    API_BASE: REACT_APP_ENV ? '' : ''
-  },
-  publicPath: '/w2/',
-  hash: true,
-  history: {
-    type: 'hash'
-  },
-  antd: {
-    dark: true,
-  },
-  request: {},
-  initialState: {},
-  model: {},
-  layout: {
-    // https://umijs.org/zh-CN/plugins/plugin-layout
-    locale: false,
-    siderWidth: 208,
-    ...defaultSettings,
-  },
-  // https://umijs.org/zh-CN/plugins/plugin-locale
-  locale: false,
-
-  jsMinifier: 'terser',
-  cssMinifier: 'cssnano',
-  targets: {
-    ie: 11,
-  },
-  // umi routes: https://umijs.org/docs/routing
-  routes,
-  access: {},
-  // 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',
-  },
-  ignoreMomentLocale: true,
-  proxy: proxy[REACT_APP_ENV || 'dev'],
-  manifest: {
-    basePath: '/',
-  },
-  // Fast Refresh 热更新
-  fastRefresh: true,
-  presets: ['umi-presets-pro'],
-  openAPI: false,
-});

config/defaultSettings.js

@@ -1,20 +0,0 @@
-
-const Settings = {
-  navTheme: 'dark',
-  // 拂晓蓝
-  primaryColor: '#1890ff',
-  contentWidth: 'Fluid',
-  colorWeak: false,
-  title: '', // 必须为空
-  pwa: false,
-  iconfontUrl: '',
-  footerRender: false,
-  menu: {
-    type: 'group'
-  },
-  fixSiderbar: true,
-  layout: 'mix',
-  splitMenus: true,
-};
-
-export default Settings;

config/oneapi.json

@@ -1,593 +0,0 @@
-{
-  "openapi": "3.0.1",
-  "info": {
-    "title": "Ant Design Pro",
-    "version": "1.0.0"
-  },
-  "servers": [
-    {
-      "url": "http://localhost:8000/"
-    },
-    {
-      "url": "https://localhost:8000/"
-    }
-  ],
-  "paths": {
-    "/api/currentUser": {
-      "get": {
-        "tags": ["api"],
-        "description": "获取当前的用户",
-        "operationId": "currentUser",
-        "responses": {
-          "200": {
-            "description": "Success",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/CurrentUser"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "Error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ErrorResponse"
-                }
-              }
-            }
-          }
-        }
-      },
-      "x-swagger-router-controller": "api"
-    },
-    "/api/login/captcha": {
-      "post": {
-        "description": "发送验证码",
-        "operationId": "getFakeCaptcha",
-        "tags": ["login"],
-        "parameters": [
-          {
-            "name": "phone",
-            "in": "query",
-            "description": "手机号",
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/FakeCaptcha"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/api/login/outLogin": {
-      "post": {
-        "description": "登录接口",
-        "operationId": "outLogin",
-        "tags": ["login"],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "Error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ErrorResponse"
-                }
-              }
-            }
-          }
-        }
-      },
-      "x-swagger-router-controller": "api"
-    },
-    "/api/login/account": {
-      "post": {
-        "tags": ["login"],
-        "description": "登录接口",
-        "operationId": "login",
-        "requestBody": {
-          "description": "登录系统",
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/LoginParams"
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "200": {
-            "description": "Success",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/LoginResult"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "Error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ErrorResponse"
-                }
-              }
-            }
-          }
-        },
-        "x-codegen-request-body-name": "body"
-      },
-      "x-swagger-router-controller": "api"
-    },
-    "/api/notices": {
-      "summary": "getNotices",
-      "description": "NoticeIconItem",
-      "get": {
-        "tags": ["api"],
-        "operationId": "getNotices",
-        "responses": {
-          "200": {
-            "description": "Success",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/NoticeIconList"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/api/rule": {
-      "get": {
-        "tags": ["rule"],
-        "description": "获取规则列表",
-        "operationId": "rule",
-        "parameters": [
-          {
-            "name": "current",
-            "in": "query",
-            "description": "当前的页码",
-            "schema": {
-              "type": "number"
-            }
-          },
-          {
-            "name": "pageSize",
-            "in": "query",
-            "description": "页面的容量",
-            "schema": {
-              "type": "number"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/RuleList"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "Error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ErrorResponse"
-                }
-              }
-            }
-          }
-        }
-      },
-      "post": {
-        "tags": ["rule"],
-        "description": "新建规则",
-        "operationId": "addRule",
-        "responses": {
-          "200": {
-            "description": "Success",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/RuleListItem"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "Error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ErrorResponse"
-                }
-              }
-            }
-          }
-        }
-      },
-      "put": {
-        "tags": ["rule"],
-        "description": "新建规则",
-        "operationId": "updateRule",
-        "responses": {
-          "200": {
-            "description": "Success",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/RuleListItem"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "Error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ErrorResponse"
-                }
-              }
-            }
-          }
-        }
-      },
-      "delete": {
-        "tags": ["rule"],
-        "description": "删除规则",
-        "operationId": "removeRule",
-        "responses": {
-          "200": {
-            "description": "Success",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "Error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ErrorResponse"
-                }
-              }
-            }
-          }
-        }
-      },
-      "x-swagger-router-controller": "api"
-    },
-    "/swagger": {
-      "x-swagger-pipe": "swagger_raw"
-    }
-  },
-  "components": {
-    "schemas": {
-      "CurrentUser": {
-        "type": "object",
-        "properties": {
-          "name": {
-            "type": "string"
-          },
-          "avatar": {
-            "type": "string"
-          },
-          "userid": {
-            "type": "string"
-          },
-          "email": {
-            "type": "string"
-          },
-          "signature": {
-            "type": "string"
-          },
-          "title": {
-            "type": "string"
-          },
-          "group": {
-            "type": "string"
-          },
-          "tags": {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "properties": {
-                "key": {
-                  "type": "string"
-                },
-                "label": {
-                  "type": "string"
-                }
-              }
-            }
-          },
-          "notifyCount": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "unreadCount": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "country": {
-            "type": "string"
-          },
-          "access": {
-            "type": "string"
-          },
-          "geographic": {
-            "type": "object",
-            "properties": {
-              "province": {
-                "type": "object",
-                "properties": {
-                  "label": {
-                    "type": "string"
-                  },
-                  "key": {
-                    "type": "string"
-                  }
-                }
-              },
-              "city": {
-                "type": "object",
-                "properties": {
-                  "label": {
-                    "type": "string"
-                  },
-                  "key": {
-                    "type": "string"
-                  }
-                }
-              }
-            }
-          },
-          "address": {
-            "type": "string"
-          },
-          "phone": {
-            "type": "string"
-          }
-        }
-      },
-      "LoginResult": {
-        "type": "object",
-        "properties": {
-          "status": {
-            "type": "string"
-          },
-          "type": {
-            "type": "string"
-          },
-          "currentAuthority": {
-            "type": "string"
-          }
-        }
-      },
-      "PageParams": {
-        "type": "object",
-        "properties": {
-          "current": {
-            "type": "number"
-          },
-          "pageSize": {
-            "type": "number"
-          }
-        }
-      },
-      "RuleListItem": {
-        "type": "object",
-        "properties": {
-          "key": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "disabled": {
-            "type": "boolean"
-          },
-          "href": {
-            "type": "string"
-          },
-          "avatar": {
-            "type": "string"
-          },
-          "name": {
-            "type": "string"
-          },
-          "owner": {
-            "type": "string"
-          },
-          "desc": {
-            "type": "string"
-          },
-          "callNo": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "status": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "updatedAt": {
-            "type": "string",
-            "format": "datetime"
-          },
-          "createdAt": {
-            "type": "string",
-            "format": "datetime"
-          },
-          "progress": {
-            "type": "integer",
-            "format": "int32"
-          }
-        }
-      },
-      "RuleList": {
-        "type": "object",
-        "properties": {
-          "data": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/RuleListItem"
-            }
-          },
-          "total": {
-            "type": "integer",
-            "description": "列表的内容总数",
-            "format": "int32"
-          },
-          "success": {
-            "type": "boolean"
-          }
-        }
-      },
-      "FakeCaptcha": {
-        "type": "object",
-        "properties": {
-          "code": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "status": {
-            "type": "string"
-          }
-        }
-      },
-      "LoginParams": {
-        "type": "object",
-        "properties": {
-          "username": {
-            "type": "string"
-          },
-          "password": {
-            "type": "string"
-          },
-          "autoLogin": {
-            "type": "boolean"
-          },
-          "type": {
-            "type": "string"
-          }
-        }
-      },
-      "ErrorResponse": {
-        "required": ["errorCode"],
-        "type": "object",
-        "properties": {
-          "errorCode": {
-            "type": "string",
-            "description": "业务约定的错误码"
-          },
-          "errorMessage": {
-            "type": "string",
-            "description": "业务上的错误信息"
-          },
-          "success": {
-            "type": "boolean",
-            "description": "业务上的请求是否成功"
-          }
-        }
-      },
-      "NoticeIconList": {
-        "type": "object",
-        "properties": {
-          "data": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/NoticeIconItem"
-            }
-          },
-          "total": {
-            "type": "integer",
-            "description": "列表的内容总数",
-            "format": "int32"
-          },
-          "success": {
-            "type": "boolean"
-          }
-        }
-      },
-      "NoticeIconItemType": {
-        "title": "NoticeIconItemType",
-        "description": "已读未读列表的枚举",
-        "type": "string",
-        "properties": {},
-        "enum": ["notification", "message", "event"]
-      },
-      "NoticeIconItem": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "string"
-          },
-          "extra": {
-            "type": "string",
-            "format": "any"
-          },
-          "key": { "type": "string" },
-          "read": {
-            "type": "boolean"
-          },
-          "avatar": {
-            "type": "string"
-          },
-          "title": {
-            "type": "string"
-          },
-          "status": {
-            "type": "string"
-          },
-          "datetime": {
-            "type": "string",
-            "format": "date"
-          },
-          "description": {
-            "type": "string"
-          },
-          "type": {
-            "extensions": {
-              "x-is-enum": true
-            },
-            "$ref": "#/components/schemas/NoticeIconItemType"
-          }
-        }
-      }
-    }
-  }
-}

config/proxy.js

@@ -1,35 +0,0 @@
-/**
- * 在生产环境 代理是无法生效的，所以这里没有生产环境的配置
- * -------------------------------
- * The agent cannot take effect in the production environment
- * so there is no configuration of the production environment
- * For details, please see
- * https://pro.ant.design/docs/deploy
- */
-export default {
-  dev: {
-    // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
-    '/api/': {
-      // 要代理的地址
-      //http://192.168.89.147:8087
-      target: 'http://192.168.89.147:8087',
-      // 配置了这个可以从 http 代理到 https
-      // 依赖 origin 的功能可能需要这个，比如 cookie
-      changeOrigin: true,
-    },
-  },
-  test: {
-    '/api/': {
-      target: 'https://proapi.azurewebsites.net',
-      changeOrigin: true,
-      pathRewrite: { '^': '' },
-    },
-  },
-  pre: {
-    '/api/': {
-      target: 'your pre url',
-      changeOrigin: true,
-      pathRewrite: { '^': '' },
-    },
-  },
-};

config/routes.js

@@ -1,148 +0,0 @@
-export default [
-  {
-    path: '/user',
-    layout: false,
-    routes: [
-      {
-        name: 'login',
-        path: '/user/login',
-        component: './User/Login',
-      },
-      {
-        component: './404',
-      },
-    ],
-  },
-  // {
-  //   path: '/welcome',
-  //   name: 'welcome',
-  //   icon: 'smile',
-  //   component: './Welcome',
-  // },
-  {
-    path: '/',
-    redirect: '/rotationChart/list',
-  },
-  {
-    path: '/rotationChart',
-    name: '轮播图管理',
-    icon: 'picCenter',
-    routes: [
-      {
-        path: '/rotationChart/list',
-        name: '轮播图管理',
-        component: './rotationChart/list',
-      },
-    ],
-  },
-  {
-    path: '/rotationChart/add',
-    name: '轮播图新增',
-    hideInMenu: true,
-    component: './rotationChart/edit',
-  },
-  {
-    path: '/rotationChart/edit',
-    name: '轮播图编辑',
-    hideInMenu: true,
-    component: './rotationChart/edit',
-  },
-  // {
-  //   path: '/monitor',
-  //   name: '监控管理',
-  //   icon: 'VideoCameraOutlined',
-  //   component: './monitor/index',
-  // },
-  {
-    path: '/dish/list',
-    name: '菜肴管理',
-    icon: 'star',
-    icon: 'VideoCameraOutlined',
-    component: './dish/list',
-  },
-  {
-    path: '/dish/add',
-    name: '菜肴详情',
-    icon: 'smile',
-    hideInMenu: true,
-    component: './dish/edit',
-  },
-  {
-    path: '/dish/edit',
-    name: '菜肴修改',
-    hideInMenu: true,
-    component: './dish/edit',
-  },
-  {
-    path: '/package/list',
-    name: '套餐管理',
-    icon: 'shopping',
-    component: './package/index',
-  },
-  {
-    path: '/guaranteeTask/list',
-    name: '任务管理',
-    icon: 'borderBottom',
-    component: './guaranteeTask/index',
-  },
-  {
-    path: '/guaranteeTask/edit',
-    name: '任务详情',
-    icon: 'borderBottom',
-    hideInMenu: true,
-    component: './guaranteeTask/Edit/index',
-  },
-  {
-    path: '/stock/list',
-    name: '库存管理',
-    icon: 'appstore',
-    component: './stock/list',
-  },
-  {
-    path: '/stock/add',
-    name: '库存新增',
-    hideInMenu: true,
-    component: './stock/edit',
-  },
-
-  {
-    path: '/stock/edit',
-    name: '库存详细',
-    hideInMenu: true,
-    component: './stock/edit',
-  },
-  {
-    path: '/stock/outAndIn',
-    name: '出入库管理',
-    hideInMenu: true,
-    component: './stock/outAndIn',
-  },
-  {
-    path: '/stockLog/list',
-    name: '库存日志',
-    icon: 'appstoreAdd',
-    component: './stock/stockLog',
-  },
-  {
-    path: '/stockClassification/list',
-    name: '库存分类',
-    icon: 'sortAscending',
-    component: './stockClassification/list',
-  },
-  {
-    path: '/stockClassification/edit',
-    name: '分类编辑',
-    hideInMenu: true,
-    component: './stockClassification/edit',
-  },
-  {
-    path: '/guaranteeTask/print',
-    name: '保障单打印',
-    hideInMenu: true,
-    layout: false,
-    component: './guaranteeTask/print/index',
-  },
-  {
-    component: './404',
-  },
-];

index.html

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite + React</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.jsx"></script>
+  </body>
+</html>

jest.config.js

@@ -1,9 +0,0 @@
-module.exports = {
-  testURL: 'http://localhost:8000',
-  verbose: false,
-  extraSetupFiles: ['./tests/setupTests.js'],
-  globals: {
-    ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: false,
-    localStorage: null,
-  },
-};

jsconfig.json

@@ -1,8 +1,5 @@
 {
   "compilerOptions": {
-    "jsx": "react-jsx",
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
     "baseUrl": ".",
     "paths": {
       "@/*": ["./src/*"]

mock/listTableList.ts

@@ -1,174 +0,0 @@
-import { Request, Response } from 'express';
-import moment from 'moment';
-import { parse } from 'url';
-
-// mock tableListDataSource
-const genList = (current: number, pageSize: number) => {
-  const tableListDataSource: API.RuleListItem[] = [];
-
-  for (let i = 0; i < pageSize; i += 1) {
-    const index = (current - 1) * 10 + i;
-    tableListDataSource.push({
-      key: index,
-      disabled: i % 6 === 0,
-      href: 'https://ant.design',
-      avatar: [
-        'https://gw.alipayobjects.com/zos/rmsportal/eeHMaZBwmTvLdIwMfBpg.png',
-        'https://gw.alipayobjects.com/zos/rmsportal/udxAbMEhpwthVVcjLXik.png',
-      ][i % 2],
-      name: `TradeCode ${index}`,
-      owner: '曲丽丽',
-      desc: '这是一段描述',
-      callNo: Math.floor(Math.random() * 1000),
-      status: Math.floor(Math.random() * 10) % 4,
-      updatedAt: moment().format('YYYY-MM-DD'),
-      createdAt: moment().format('YYYY-MM-DD'),
-      progress: Math.ceil(Math.random() * 100),
-    });
-  }
-  tableListDataSource.reverse();
-  return tableListDataSource;
-};
-
-let tableListDataSource = genList(1, 100);
-
-function getRule(req: Request, res: Response, u: string) {
-  let realUrl = u;
-  if (!realUrl || Object.prototype.toString.call(realUrl) !== '[object String]') {
-    realUrl = req.url;
-  }
-  const { current = 1, pageSize = 10 } = req.query;
-  const params = parse(realUrl, true).query as unknown as API.PageParams &
-    API.RuleListItem & {
-      sorter: any;
-      filter: any;
-    };
-
-  let dataSource = [...tableListDataSource].slice(
-    ((current as number) - 1) * (pageSize as number),
-    (current as number) * (pageSize as number),
-  );
-  if (params.sorter) {
-    const sorter = JSON.parse(params.sorter);
-    dataSource = dataSource.sort((prev, next) => {
-      let sortNumber = 0;
-      Object.keys(sorter).forEach((key) => {
-        if (sorter[key] === 'descend') {
-          if (prev[key] - next[key] > 0) {
-            sortNumber += -1;
-          } else {
-            sortNumber += 1;
-          }
-          return;
-        }
-        if (prev[key] - next[key] > 0) {
-          sortNumber += 1;
-        } else {
-          sortNumber += -1;
-        }
-      });
-      return sortNumber;
-    });
-  }
-  if (params.filter) {
-    const filter = JSON.parse(params.filter as any) as {
-      [key: string]: string[];
-    };
-    if (Object.keys(filter).length > 0) {
-      dataSource = dataSource.filter((item) => {
-        return Object.keys(filter).some((key) => {
-          if (!filter[key]) {
-            return true;
-          }
-          if (filter[key].includes(`${item[key]}`)) {
-            return true;
-          }
-          return false;
-        });
-      });
-    }
-  }
-
-  if (params.name) {
-    dataSource = dataSource.filter((data) => data?.name?.includes(params.name || ''));
-  }
-  const result = {
-    data: dataSource,
-    total: tableListDataSource.length,
-    success: true,
-    pageSize,
-    current: parseInt(`${params.current}`, 10) || 1,
-  };
-
-  return res.json(result);
-}
-
-function postRule(req: Request, res: Response, u: string, b: Request) {
-  let realUrl = u;
-  if (!realUrl || Object.prototype.toString.call(realUrl) !== '[object String]') {
-    realUrl = req.url;
-  }
-
-  const body = (b && b.body) || req.body;
-  const { method, name, desc, key } = body;
-
-  switch (method) {
-    /* eslint no-case-declarations:0 */
-    case 'delete':
-      tableListDataSource = tableListDataSource.filter((item) => key.indexOf(item.key) === -1);
-      break;
-    case 'post':
-      (() => {
-        const i = Math.ceil(Math.random() * 10000);
-        const newRule: API.RuleListItem = {
-          key: tableListDataSource.length,
-          href: 'https://ant.design',
-          avatar: [
-            'https://gw.alipayobjects.com/zos/rmsportal/eeHMaZBwmTvLdIwMfBpg.png',
-            'https://gw.alipayobjects.com/zos/rmsportal/udxAbMEhpwthVVcjLXik.png',
-          ][i % 2],
-          name,
-          owner: '曲丽丽',
-          desc,
-          callNo: Math.floor(Math.random() * 1000),
-          status: Math.floor(Math.random() * 10) % 2,
-          updatedAt: moment().format('YYYY-MM-DD'),
-          createdAt: moment().format('YYYY-MM-DD'),
-          progress: Math.ceil(Math.random() * 100),
-        };
-        tableListDataSource.unshift(newRule);
-        return res.json(newRule);
-      })();
-      return;
-
-    case 'update':
-      (() => {
-        let newRule = {};
-        tableListDataSource = tableListDataSource.map((item) => {
-          if (item.key === key) {
-            newRule = { ...item, desc, name };
-            return { ...item, desc, name };
-          }
-          return item;
-        });
-        return res.json(newRule);
-      })();
-      return;
-    default:
-      break;
-  }
-
-  const result = {
-    list: tableListDataSource,
-    pagination: {
-      total: tableListDataSource.length,
-    },
-  };
-
-  res.json(result);
-}
-
-export default {
-  'GET /api/rule': getRule,
-  'POST /api/rule': postRule,
-};

mock/notices.ts

@@ -1,107 +0,0 @@
-import { Request, Response } from 'express';
-
-const getNotices = (req: Request, res: Response) => {
-  res.json({
-    data: [
-      {
-        id: '000000001',
-        avatar: 'https://mdn.alipayobjects.com/yuyan_qk0oxh/afts/img/MSbDR4FR2MUAAAAAAAAAAAAAFl94AQBr',
-        title: '你收到了 14 份新周报',
-        datetime: '2017-08-09',
-        type: 'notification',
-      },
-      {
-        id: '000000002',
-        avatar: 'https://mdn.alipayobjects.com/yuyan_qk0oxh/afts/img/hX-PTavYIq4AAAAAAAAAAAAAFl94AQBr',
-        title: '你推荐的 曲妮妮 已通过第三轮面试',
-        datetime: '2017-08-08',
-        type: 'notification',
-      },
-      {
-        id: '000000003',
-        avatar: 'https://mdn.alipayobjects.com/yuyan_qk0oxh/afts/img/jHX5R5l3QjQAAAAAAAAAAAAAFl94AQBr',
-        title: '这种模板可以区分多种通知类型',
-        datetime: '2017-08-07',
-        read: true,
-        type: 'notification',
-      },
-      {
-        id: '000000004',
-        avatar: 'https://mdn.alipayobjects.com/yuyan_qk0oxh/afts/img/Wr4mQqx6jfwAAAAAAAAAAAAAFl94AQBr',
-        title: '左侧图标用于区分不同的类型',
-        datetime: '2017-08-07',
-        type: 'notification',
-      },
-      {
-        id: '000000005',
-        avatar: 'https://mdn.alipayobjects.com/yuyan_qk0oxh/afts/img/Mzj_TbcWUj4AAAAAAAAAAAAAFl94AQBr',
-        title: '内容不要超过两行字，超出时自动截断',
-        datetime: '2017-08-07',
-        type: 'notification',
-      },
-      {
-        id: '000000006',
-        avatar: 'https://mdn.alipayobjects.com/yuyan_qk0oxh/afts/img/eXLzRbPqQE4AAAAAAAAAAAAAFl94AQBr',
-        title: '曲丽丽 评论了你',
-        description: '描述信息描述信息描述信息',
-        datetime: '2017-08-07',
-        type: 'message',
-        clickClose: true,
-      },
-      {
-        id: '000000007',
-        avatar: 'https://mdn.alipayobjects.com/yuyan_qk0oxh/afts/img/w5mRQY2AmEEAAAAAAAAAAAAAFl94AQBr',
-        title: '朱偏右 回复了你',
-        description: '这种模板用于提醒谁与你发生了互动，左侧放『谁』的头像',
-        datetime: '2017-08-07',
-        type: 'message',
-        clickClose: true,
-      },
-      {
-        id: '000000008',
-        avatar: 'https://mdn.alipayobjects.com/yuyan_qk0oxh/afts/img/wPadR5M9918AAAAAAAAAAAAAFl94AQBr',
-        title: '标题',
-        description: '这种模板用于提醒谁与你发生了互动，左侧放『谁』的头像',
-        datetime: '2017-08-07',
-        type: 'message',
-        clickClose: true,
-      },
-      {
-        id: '000000009',
-        title: '任务名称',
-        description: '任务需要在 2017-01-12 20:00 前启动',
-        extra: '未开始',
-        status: 'todo',
-        type: 'event',
-      },
-      {
-        id: '000000010',
-        title: '第三方紧急代码变更',
-        description: '冠霖提交于 2017-01-06，需在 2017-01-07 前完成代码变更任务',
-        extra: '马上到期',
-        status: 'urgent',
-        type: 'event',
-      },
-      {
-        id: '000000011',
-        title: '信息安全考试',
-        description: '指派竹尔于 2017-01-09 前完成更新并发布',
-        extra: '已耗时 8 天',
-        status: 'doing',
-        type: 'event',
-      },
-      {
-        id: '000000012',
-        title: 'ABCD 版本发布',
-        description: '冠霖提交于 2017-01-06，需在 2017-01-07 前完成代码变更任务',
-        extra: '进行中',
-        status: 'processing',
-        type: 'event',
-      },
-    ],
-  });
-};
-
-export default {
-  'GET /api/notices': getNotices,
-};

mock/route.ts

@@ -1,5 +0,0 @@
-export default {
-  '/api/auth_routes': {
-    '/form/advanced-form': { authority: ['admin', 'user'] },
-  },
-};

mock/user.ts

@@ -1,203 +0,0 @@
-import { Request, Response } from 'express';
-
-const waitTime = (time: number = 100) => {
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      resolve(true);
-    }, time);
-  });
-};
-
-async function getFakeCaptcha(req: Request, res: Response) {
-  await waitTime(2000);
-  return res.json('captcha-xxx');
-}
-
-const { ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION } = process.env;
-
-/**
- * 当前用户的权限，如果为空代表没登录
- * current user access， if is '', user need login
- * 如果是 pro 的预览，默认是有权限的
- */
-let access = ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION === 'site' ? 'admin' : '';
-
-const getAccess = () => {
-  return access;
-};
-
-// 代码中会兼容本地 service mock 以及部署站点的静态数据
-export default {
-  // 支持值为 Object 和 Array
-  'GET /api/currentUser': (req: Request, res: Response) => {
-    if (!getAccess()) {
-      res.status(401).send({
-        data: {
-          isLogin: false,
-        },
-        errorCode: '401',
-        errorMessage: '请先登录！',
-        success: true,
-      });
-      return;
-    }
-    res.send({
-      success: true,
-      data: {
-        name: 'Serati Ma',
-        avatar: 'https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png',
-        userid: '00000001',
-        email: 'antdesign@alipay.com',
-        signature: '海纳百川，有容乃大',
-        title: '交互专家',
-        group: '蚂蚁金服－某某某事业群－某某平台部－某某技术部－UED',
-        tags: [
-          {
-            key: '0',
-            label: '很有想法的',
-          },
-          {
-            key: '1',
-            label: '专注设计',
-          },
-          {
-            key: '2',
-            label: '辣~',
-          },
-          {
-            key: '3',
-            label: '大长腿',
-          },
-          {
-            key: '4',
-            label: '川妹子',
-          },
-          {
-            key: '5',
-            label: '海纳百川',
-          },
-        ],
-        notifyCount: 12,
-        unreadCount: 11,
-        country: 'China',
-        access: getAccess(),
-        geographic: {
-          province: {
-            label: '浙江省',
-            key: '330000',
-          },
-          city: {
-            label: '杭州市',
-            key: '330100',
-          },
-        },
-        address: '西湖区工专路 77 号',
-        phone: '0752-268888888',
-      },
-    });
-  },
-  // GET POST 可省略
-  'GET /api/users': [
-    {
-      key: '1',
-      name: 'John Brown',
-      age: 32,
-      address: 'New York No. 1 Lake Park',
-    },
-    {
-      key: '2',
-      name: 'Jim Green',
-      age: 42,
-      address: 'London No. 1 Lake Park',
-    },
-    {
-      key: '3',
-      name: 'Joe Black',
-      age: 32,
-      address: 'Sidney No. 1 Lake Park',
-    },
-  ],
-  'POST /api/login/account': async (req: Request, res: Response) => {
-    const { password, username, type } = req.body;
-    await waitTime(2000);
-    if (password === '1' && username === '1') {
-      res.send({
-        status: 'ok',
-        type,
-        currentAuthority: 'admin',
-      });
-      access = 'admin';
-      return;
-    }
-    if (password === 'ant.design' && username === 'user') {
-      res.send({
-        status: 'ok',
-        type,
-        currentAuthority: 'user',
-      });
-      access = 'user';
-      return;
-    }
-    if (type === 'mobile') {
-      res.send({
-        status: 'ok',
-        type,
-        currentAuthority: 'admin',
-      });
-      access = 'admin';
-      return;
-    }
-
-    res.send({
-      status: 'error',
-      type,
-      currentAuthority: 'guest',
-    });
-    access = 'guest';
-  },
-  'POST /api/login/outLogin': (req: Request, res: Response) => {
-    access = '';
-    res.send({ data: {}, success: true });
-  },
-  'POST /api/register': (req: Request, res: Response) => {
-    res.send({ status: 'ok', currentAuthority: 'user', success: true });
-  },
-  'GET /api/500': (req: Request, res: Response) => {
-    res.status(500).send({
-      timestamp: 1513932555104,
-      status: 500,
-      error: 'error',
-      message: 'error',
-      path: '/base/category/list',
-    });
-  },
-  'GET /api/404': (req: Request, res: Response) => {
-    res.status(404).send({
-      timestamp: 1513932643431,
-      status: 404,
-      error: 'Not Found',
-      message: 'No message available',
-      path: '/base/category/list/2121212',
-    });
-  },
-  'GET /api/403': (req: Request, res: Response) => {
-    res.status(403).send({
-      timestamp: 1513932555104,
-      status: 403,
-      error: 'Forbidden',
-      message: 'Forbidden',
-      path: '/base/category/list',
-    });
-  },
-  'GET /api/401': (req: Request, res: Response) => {
-    res.status(401).send({
-      timestamp: 1513932555104,
-      status: 401,
-      error: 'Unauthorized',
-      message: 'Unauthorized',
-      path: '/base/category/list',
-    });
-  },
-
-  'GET  /api/login/captcha': getFakeCaptcha,
-};

package.json

@@ -1,122 +1,35 @@
 {
-  "name": "ant-design-pro",
-  "version": "6.0.0-beta.1",
+  "name": "vite-project",
   "private": true,
-  "description": "An out-of-box UI solution for enterprise applications",
+  "version": "0.0.0",
+  "type": "module",
   "scripts": {
-    "analyze": "cross-env ANALYZE=1 max build",
-    "build": "max build",
-    "deploy": "npm run build && npm run gh-pages",
-    "dev": "npm run start:dev",
-    "gh-pages": "gh-pages -d dist",
-    "i18n-remove": "pro i18n-remove --locale=zh-CN --write",
-    "postinstall": "max setup",
-    "lint": "npm run lint:js && npm run lint:prettier && npm run tsc",
-    "lint-staged": "lint-staged",
-    "lint-staged:js": "eslint --ext .js,.jsx,.ts,.tsx ",
-    "lint:fix": "eslint --fix --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src ",
-    "lint:js": "eslint --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src",
-    "lint:prettier": "prettier -c --write \"src/**/*\" --end-of-line auto",
-    "openapi": "max openapi",
-    "playwright": "playwright install && playwright test",
-    "prepare": "husky install",
-    "prettier": "prettier -c --write \"src/**/*\"",
-    "serve": "umi-serve",
-    "start": "cross-env UMI_ENV=dev max dev",
-    "start:dev": "cross-env REACT_APP_ENV=dev MOCK=none UMI_ENV=dev max dev",
-    "start:no-mock": "cross-env MOCK=none UMI_ENV=dev max dev",
-    "start:pre": "cross-env REACT_APP_ENV=pre UMI_ENV=dev max dev",
-    "start:test": "cross-env REACT_APP_ENV=test MOCK=none UMI_ENV=dev max dev",
-    "test": "max test",
-    "test:component": "max test ./src/components",
-    "test:e2e": "node ./tests/run-tests.js",
-    "tsc": "tsc --noEmit"
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview"
   },
-  "lint-staged": {
-    "**/*.{js,jsx,ts,tsx}": "npm run lint-staged:js",
-    "**/*.{js,jsx,tsx,ts,less,md,json}": [
-      "prettier --write"
-    ]
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 10"
-  ],
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-components": "^2.3.16",
-    "@umijs/route-utils": "^2.1.3",
-    "antd": "^4.20.0",
-    "classnames": "^2.3.0",
-    "lodash": "^4.17.0",
+    "@ant-design/pro-components": "^2.3.13",
+    "@zjxpcyc/react-tiny-store": "^2.0.1",
+    "antd": "^4.23.4",
+    "axios": "^1.1.2",
+    "classnames": "^2.3.2",
+    "echarts": "^5.4.0",
     "md5": "^2.3.0",
-    "moment": "^2.29.0",
-    "omit.js": "^2.0.2",
-    "rc-menu": "^9.1.0",
-    "rc-util": "^5.16.0",
-    "react": "^17.0.0",
-    "react-dev-inspector": "^1.7.0",
-    "react-dom": "^17.0.0",
-    "react-helmet-async": "^1.2.0"
+    "moment": "^2.29.4",
+    "react": "18.1.0",
+    "react-dom": "18.1.0",
+    "react-helmet": "^6.1.0",
+    "react-router-dom": "^6.4.2",
+    "react-transition-group": "^4.4.5"
   },
   "devDependencies": {
-    "@ant-design/pro-cli": "^2.1.0",
-    "@playwright/test": "^1.17.0",
-    "@types/classnames": "^2.3.1",
-    "@types/express": "^4.17.0",
-    "@types/history": "^4.7.0",
-    "@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.11.1",
-    "@umijs/max": "^4.0.0-rc.22",
-    "@umijs/openapi": "^1.3.0",
-    "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",
-    "lint-staged": "^10.0.0",
-    "mockjs": "^1.1.0",
-    "prettier": "^2.5.0",
-    "swagger-ui-dist": "^4.12.0",
-    "typescript": "^4.5.0",
-    "umi-presets-pro": "^1.0.1",
-    "umi-serve": "^1.9.10"
-  },
-  "engines": {
-    "node": ">=12.0.0"
-  },
-  "create-umi": {
-    "ignoreScript": [
-      "docker*",
-      "functions*",
-      "site",
-      "generateMock"
-    ],
-    "ignoreDependencies": [
-      "netlify*",
-      "serverless"
-    ],
-    "ignore": [
-      ".dockerignore",
-      ".git",
-      ".github",
-      ".gitpod.yml",
-      "CODE_OF_CONDUCT.md",
-      "Dockerfile",
-      "Dockerfile.*",
-      "lambda",
-      "LICENSE",
-      "netlify.toml",
-      "README.*.md",
-      "azure-pipelines.yml",
-      "docker",
-      "CNAME",
-      "create-umi"
-    ]
+    "@types/react": "^18.0.15",
+    "@types/react-dom": "^18.0.6",
+    "@vitejs/plugin-react": "^2.0.0",
+    "less": "^4.1.3",
+    "vite": "^3.0.0",
+    "vite-plugin-imp": "^2.2.0"
   }
 }

playwright.config.ts

@@ -1,22 +0,0 @@
-// 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;

public/CNAME

@@ -1 +0,0 @@
-preview.pro.ant.design

public/vite.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

src/App.css

@@ -0,0 +1,42 @@
+#root {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
+  text-align: center;
+}
+
+.logo {
+  height: 6em;
+  padding: 1.5em;
+  will-change: filter;
+}
+.logo:hover {
+  filter: drop-shadow(0 0 2em #646cffaa);
+}
+.logo.react:hover {
+  filter: drop-shadow(0 0 2em #61dafbaa);
+}
+
+
+@keyframes logo-spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+@media (prefers-reduced-motion: no-preference) {
+  a:nth-of-type(2) .logo {
+    animation: logo-spin infinite 20s linear;
+  }
+}
+
+.card {
+  padding: 2em;
+}
+
+.read-the-docs {
+  color: #888;
+}

src/access.ts

@@ -1,9 +0,0 @@
-/**
- * @see https://umijs.org/zh-CN/plugins/plugin-access
- * */
-export default function access(initialState: { currentUser?: API.CurrentUser } | undefined) {
-  const { currentUser } = initialState ?? {};
-  return {
-    canAdmin: currentUser && currentUser.access === 'admin',
-  };
-}

src/app.jsx

@@ -1,118 +1,10 @@
-import { requestConfig } from '@/utils/request';
-import { Link } from 'umi';
-import { history } from '@umijs/max';
-import RightContent from '@/components/RightContent';
-import { SettingDrawer } from '@ant-design/pro-components';
-import { queryCurrentUser } from '@/services/api/user';
-import logoImg from '@/assets/images/logo.png';
-import defaultSettings from '../config/defaultSettings';
+import { useState } from 'react'
 
-const isDev = process.env.NODE_ENV === 'development';
-const loginPath = '/user/login';
 
-/**
- * @see  https://umijs.org/zh-CN/plugins/plugin-initial-state
- * */
+function App() {
+  const [count, setCount] = useState(0)
 
-export async function getInitialState() {
-  const fetchUserInfo = async () => {
-    try {
-      const msg = await queryCurrentUser();
-      return msg;
-    } catch (error) {
-      history.push(loginPath);
-    }
-    return undefined;
-  };
-
-  // 如果不是登录页面，执行
-  if (history.location.pathname !== loginPath) {
-    const currentUser = await fetchUserInfo();
-    return {
-      fetchUserInfo,
-      currentUser,
-      settings: defaultSettings,
-    };
-  }
-  return {
-    fetchUserInfo,
-    settings: defaultSettings,
-  };
+  return null;
 }
 
-// ProLayout 支持的api https://procomponents.ant.design/components/layout
-export const layout = ({ initialState, setInitialState }) => {
-  const cfg = {
-    rightContentRender: () => <RightContent />,
-    disableContentMargin: false,
-    token: {
-      sider: {
-        colorMenuBackground: '#001529',
-        colorBgMenuItemHover: '#fff',
-        colorBgMenuItemSelected: '#1890ff',
-        colorTextMenuActive: '#fff',
-        colorTextMenuSelected: '#fff',
-        colorTextMenuTitle: '#fff',
-        colorTextMenu: 'hsla(0,0%,100%,.65);',
-
-      },
-      header: {
-        colorBgHeader: '#0D267C',
-        colorHeaderTitle: '#fff',
-        colorTextMenuActive: '#fff',
-        colorTextMenu: '#fff',
-        colorTextMenuSelected: '#fff',
-        colorBgMenuItemHover: '#4276F5',
-        colorBgMenuItemSelected: '#4276F5',
-        colorTextRightActionsItem: '#fff',
-        heightLayoutHeader: 64,
-      }
-    },
-    // waterMarkProps: {
-    //   content: initialState?.currentUser?.name,
-    // },
-    // footerRender: () => <Footer />,
-    headerTitleRender: () => <Link to="/"><img src={logoImg} style={{ height: '42px' }} alt="" /></Link>,
-    onPageChange: () => {
-      const { location } = history;
-
-      // 如果没有登录，重定向到 login
-      if (!initialState?.currentUser && location.pathname !== loginPath) {
-        history.push(loginPath);
-      }
-    },
-    menuHeaderRender: undefined,
-    // 自定义 403 页面
-    // unAccessible: <div>unAccessible</div>,
-    // 增加一个 loading 的状态
-    childrenRender: (children, props) => {
-      // if (initialState?.loading) return <PageLoading />;
-      return (
-        <>
-          {children}
-          {/* {!props.location?.pathname?.includes('/login') && (
-            <SettingDrawer
-              disableUrlParams
-              enableDarkTheme
-              settings={initialState?.settings}
-              onSettingChange={(settings) => {
-                setInitialState((preInitialState) => ({
-                  ...preInitialState,
-                  settings,
-                }));
-              }}
-            />
-          )} */}
-        </>
-      );
-    },
-
-    ...initialState?.settings,
-  };
-
-  console.log(cfg)
-
-  return cfg;
-};
-
-export const request = requestConfig;
+export default App

src/assets/react.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>

src/components/Footer/index.jsx

@@ -1,18 +0,0 @@
-import { DefaultFooter } from '@ant-design/pro-components';
-
-const Footer = () => {
-  const defaultMessage = '南京云致';
-
-  const currentYear = new Date().getFullYear();
-
-  return (
-    <DefaultFooter
-      style={{
-        background: 'none',
-      }}
-      copyright={`${currentYear} ${defaultMessage}`}
-    />
-  );
-};
-
-export default Footer;

src/components/HeaderDropdown/index.jsx

@@ -1,16 +0,0 @@
-import { Dropdown } from 'antd';
-// import type { DropDownProps } from 'antd/es/dropdown';
-import classNames from 'classnames';
-import styles from './index.less';
-
-// export type HeaderDropdownProps = {
-//   overlayClassName?: string;
-//   overlay: React.ReactNode | (() => React.ReactNode) | any;
-//   placement?: 'bottomLeft' | 'bottomRight' | 'topLeft' | 'topCenter' | 'topRight' | 'bottomCenter';
-// } & Omit<DropDownProps, 'overlay'>;
-
-const HeaderDropdown = ({ overlayClassName: cls, ...restProps }) => (
-  <Dropdown overlayClassName={classNames(styles.container, cls)} {...restProps} />
-);
-
-export default HeaderDropdown;

src/components/HeaderDropdown/index.less

@@ -1,16 +0,0 @@
-@import (reference) '~antd/es/style/themes/index';
-
-.container > * {
-  background-color: @popover-bg;
-  border-radius: 4px;
-  box-shadow: @shadow-1-down;
-}
-
-@media screen and (max-width: @screen-xs) {
-  .container {
-    width: 100% !important;
-  }
-  .container > * {
-    border-radius: 0 !important;
-  }
-}

src/components/HeaderSearch/index.jsx

@@ -1,105 +0,0 @@
-import { SearchOutlined } from '@ant-design/icons';
-// import type { InputRef } from 'antd';
-import { AutoComplete, Input } from 'antd';
-// import type { AutoCompleteProps } from 'antd/es/auto-complete';
-import classNames from 'classnames';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
-import { useRef } from 'react';
-import styles from './index.less';
-
-// export type HeaderSearchProps = {
-//   onSearch?: (value?: string) => void;
-//   onChange?: (value?: string) => void;
-//   onVisibleChange?: (b: boolean) => void;
-//   className?: string;
-//   placeholder?: string;
-//   options: AutoCompleteProps['options'];
-//   defaultVisible?: boolean;
-//   visible?: boolean;
-//   defaultValue?: string;
-//   value?: string;
-// };
-
-const HeaderSearch = (props) => {
-  const {
-    className,
-    defaultValue,
-    onVisibleChange,
-    placeholder,
-    visible,
-    defaultVisible,
-    ...restProps
-  } = props;
-
-  const inputRef = useRef(null);
-
-  const [value, setValue] =
-    (useMergedState < string) |
-    (undefined >
-      (defaultValue,
-      {
-        value: props.value,
-        onChange: props.onChange,
-      }));
-
-  const [searchMode, setSearchMode] = useMergedState(defaultVisible ?? false, {
-    value: props.visible,
-    onChange: onVisibleChange,
-  });
-
-  const inputClass = classNames(styles.input, {
-    [styles.show]: searchMode,
-  });
-  return (
-    <div
-      className={classNames(className, styles.headerSearch)}
-      onClick={() => {
-        setSearchMode(true);
-        if (searchMode && inputRef.current) {
-          inputRef.current.focus();
-        }
-      }}
-      onTransitionEnd={({ propertyName }) => {
-        if (propertyName === 'width' && !searchMode) {
-          if (onVisibleChange) {
-            onVisibleChange(searchMode);
-          }
-        }
-      }}
-    >
-      <SearchOutlined
-        key="Icon"
-        style={{
-          cursor: 'pointer',
-        }}
-      />
-      <AutoComplete
-        key="AutoComplete"
-        className={inputClass}
-        value={value}
-        options={restProps.options}
-        onChange={(completeValue) => setValue(completeValue)}
-      >
-        <Input
-          size="small"
-          ref={inputRef}
-          defaultValue={defaultValue}
-          aria-label={placeholder}
-          placeholder={placeholder}
-          onKeyDown={(e) => {
-            if (e.key === 'Enter') {
-              if (restProps.onSearch) {
-                restProps.onSearch(value);
-              }
-            }
-          }}
-          onBlur={() => {
-            setSearchMode(false);
-          }}
-        />
-      </AutoComplete>
-    </div>
-  );
-};
-
-export default HeaderSearch;

src/components/HeaderSearch/index.less

@@ -1,25 +0,0 @@
-@import (reference) '~antd/es/style/themes/index';
-
-.headerSearch {
-  display: inline-flex;
-  align-items: center;
-  .input {
-    width: 0;
-    min-width: 0;
-    overflow: hidden;
-    background: transparent;
-    border-radius: 0;
-    transition: width 0.3s, margin-left 0.3s;
-    :global(.ant-select-selection) {
-      background: transparent;
-    }
-    input {
-      box-shadow: none !important;
-    }
-
-    &.show {
-      width: 210px;
-      margin-left: 8px;
-    }
-  }
-}

src/components/NoticeIcon/NoticeIcon.tsx

@@ -1,126 +0,0 @@
-import { BellOutlined } from '@ant-design/icons';
-import { Badge, Spin, Tabs } from 'antd';
-import classNames from 'classnames';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
-import React from 'react';
-import HeaderDropdown from '../HeaderDropdown';
-import styles from './index.less';
-import type { NoticeIconTabProps } from './NoticeList';
-import NoticeList from './NoticeList';
-
-const { TabPane } = Tabs;
-
-export type NoticeIconProps = {
-  count?: number;
-  bell?: React.ReactNode;
-  className?: string;
-  loading?: boolean;
-  onClear?: (tabName: string, tabKey: string) => void;
-  onItemClick?: (item: API.NoticeIconItem, tabProps: NoticeIconTabProps) => void;
-  onViewMore?: (tabProps: NoticeIconTabProps, e: MouseEvent) => void;
-  onTabChange?: (tabTile: string) => void;
-  style?: React.CSSProperties;
-  onPopupVisibleChange?: (visible: boolean) => void;
-  popupVisible?: boolean;
-  clearText?: string;
-  viewMoreText?: string;
-  clearClose?: boolean;
-  emptyImage?: string;
-  children?: React.ReactElement<NoticeIconTabProps>[];
-};
-
-const NoticeIcon: React.FC<NoticeIconProps> & {
-  Tab: typeof NoticeList;
-} = (props) => {
-  const getNotificationBox = (): React.ReactNode => {
-    const {
-      children,
-      loading,
-      onClear,
-      onTabChange,
-      onItemClick,
-      onViewMore,
-      clearText,
-      viewMoreText,
-    } = props;
-    if (!children) {
-      return null;
-    }
-    const panes: React.ReactNode[] = [];
-    React.Children.forEach(children, (child: React.ReactElement<NoticeIconTabProps>): void => {
-      if (!child) {
-        return;
-      }
-      const { list, title, count, tabKey, showClear, showViewMore } = child.props;
-      const len = list && list.length ? list.length : 0;
-      const msgCount = count || count === 0 ? count : len;
-      const tabTitle: string = msgCount > 0 ? `${title} (${msgCount})` : title;
-      panes.push(
-        <TabPane tab={tabTitle} key={tabKey}>
-          <NoticeList
-            clearText={clearText}
-            viewMoreText={viewMoreText}
-            list={list}
-            tabKey={tabKey}
-            onClear={(): void => onClear && onClear(title, tabKey)}
-            onClick={(item): void => onItemClick && onItemClick(item, child.props)}
-            onViewMore={(event): void => onViewMore && onViewMore(child.props, event)}
-            showClear={showClear}
-            showViewMore={showViewMore}
-            title={title}
-          />
-        </TabPane>,
-      );
-    });
-    return (
-      <>
-        <Spin spinning={loading} delay={300}>
-          <Tabs className={styles.tabs} onChange={onTabChange}>
-            {panes}
-          </Tabs>
-        </Spin>
-      </>
-    );
-  };
-
-  const { className, count, bell } = props;
-
-  const [visible, setVisible] = useMergedState<boolean>(false, {
-    value: props.popupVisible,
-    onChange: props.onPopupVisibleChange,
-  });
-  const noticeButtonClass = classNames(className, styles.noticeButton);
-  const notificationBox = getNotificationBox();
-  const NoticeBellIcon = bell || <BellOutlined className={styles.icon} />;
-  const trigger = (
-    <span className={classNames(noticeButtonClass, { opened: visible })}>
-      <Badge count={count} style={{ boxShadow: 'none' }} className={styles.badge}>
-        {NoticeBellIcon}
-      </Badge>
-    </span>
-  );
-  if (!notificationBox) {
-    return trigger;
-  }
-
-  return (
-    <HeaderDropdown
-      placement="bottomRight"
-      overlay={notificationBox}
-      overlayClassName={styles.popover}
-      trigger={['click']}
-      visible={visible}
-      onVisibleChange={setVisible}
-    >
-      {trigger}
-    </HeaderDropdown>
-  );
-};
-
-NoticeIcon.defaultProps = {
-  emptyImage: 'https://gw.alipayobjects.com/zos/rmsportal/wAhyIChODzsoKIOBHcBk.svg',
-};
-
-NoticeIcon.Tab = NoticeList;
-
-export default NoticeIcon;

src/components/NoticeIcon/NoticeList.less

@@ -1,103 +0,0 @@
-@import (reference) '~antd/es/style/themes/index';
-
-.list {
-  max-height: 400px;
-  overflow: auto;
-  &::-webkit-scrollbar {
-    display: none;
-  }
-  .item {
-    padding-right: 24px;
-    padding-left: 24px;
-    overflow: hidden;
-    cursor: pointer;
-    transition: all 0.3s;
-
-    .meta {
-      width: 100%;
-    }
-
-    .avatar {
-      margin-top: 4px;
-      background: @component-background;
-    }
-    .iconElement {
-      font-size: 32px;
-    }
-
-    &.read {
-      opacity: 0.4;
-    }
-    &:last-child {
-      border-bottom: 0;
-    }
-    &:hover {
-      background: @primary-1;
-    }
-    .title {
-      margin-bottom: 8px;
-      font-weight: normal;
-    }
-    .description {
-      font-size: 12px;
-      line-height: @line-height-base;
-    }
-    .datetime {
-      margin-top: 4px;
-      font-size: 12px;
-      line-height: @line-height-base;
-    }
-    .extra {
-      float: right;
-      margin-top: -1.5px;
-      margin-right: 0;
-      color: @text-color-secondary;
-      font-weight: normal;
-    }
-  }
-  .loadMore {
-    padding: 8px 0;
-    color: @primary-6;
-    text-align: center;
-    cursor: pointer;
-    &.loadedAll {
-      color: rgba(0, 0, 0, 0.25);
-      cursor: unset;
-    }
-  }
-}
-
-.notFound {
-  padding: 73px 0 88px;
-  color: @text-color-secondary;
-  text-align: center;
-  img {
-    display: inline-block;
-    height: 76px;
-    margin-bottom: 16px;
-  }
-}
-
-.bottomBar {
-  height: 46px;
-  color: @text-color;
-  line-height: 46px;
-  text-align: center;
-  border-top: 1px solid @border-color-split;
-  border-radius: 0 0 @border-radius-base @border-radius-base;
-  transition: all 0.3s;
-  div {
-    display: inline-block;
-    width: 50%;
-    cursor: pointer;
-    transition: all 0.3s;
-    user-select: none;
-
-    &:only-child {
-      width: 100%;
-    }
-    &:not(:only-child):last-child {
-      border-left: 1px solid @border-color-split;
-    }
-  }
-}

src/components/NoticeIcon/NoticeList.tsx

@@ -1,112 +0,0 @@
-import { Avatar, List } from 'antd';
-import classNames from 'classnames';
-import React from 'react';
-import styles from './NoticeList.less';
-
-export type NoticeIconTabProps = {
-  count?: number;
-  showClear?: boolean;
-  showViewMore?: boolean;
-  style?: React.CSSProperties;
-  title: string;
-  tabKey: API.NoticeIconItemType;
-  onClick?: (item: API.NoticeIconItem) => void;
-  onClear?: () => void;
-  emptyText?: string;
-  clearText?: string;
-  viewMoreText?: string;
-  list: API.NoticeIconItem[];
-  onViewMore?: (e: any) => void;
-};
-const NoticeList: React.FC<NoticeIconTabProps> = ({
-  list = [],
-  onClick,
-  onClear,
-  title,
-  onViewMore,
-  emptyText,
-  showClear = true,
-  clearText,
-  viewMoreText,
-  showViewMore = false,
-}) => {
-  if (!list || list.length === 0) {
-    return (
-      <div className={styles.notFound}>
-        <img
-          src="https://gw.alipayobjects.com/zos/rmsportal/sAuJeJzSKbUmHfBQRzmZ.svg"
-          alt="not found"
-        />
-        <div>{emptyText}</div>
-      </div>
-    );
-  }
-  return (
-    <div>
-      <List<API.NoticeIconItem>
-        className={styles.list}
-        dataSource={list}
-        renderItem={(item, i) => {
-          const itemCls = classNames(styles.item, {
-            [styles.read]: item.read,
-          });
-          // eslint-disable-next-line no-nested-ternary
-          const leftIcon = item.avatar ? (
-            typeof item.avatar === 'string' ? (
-              <Avatar className={styles.avatar} src={item.avatar} />
-            ) : (
-              <span className={styles.iconElement}>{item.avatar}</span>
-            )
-          ) : null;
-
-          return (
-            <div
-              onClick={() => {
-                onClick?.(item);
-              }}
-            >
-              <List.Item className={itemCls} key={item.key || i}>
-                <List.Item.Meta
-                  className={styles.meta}
-                  avatar={leftIcon}
-                  title={
-                    <div className={styles.title}>
-                      {item.title}
-                      <div className={styles.extra}>{item.extra}</div>
-                    </div>
-                  }
-                  description={
-                    <div>
-                      <div className={styles.description}>{item.description}</div>
-                      <div className={styles.datetime}>{item.datetime}</div>
-                    </div>
-                  }
-                />
-              </List.Item>
-            </div>
-          );
-        }}
-      />
-      <div className={styles.bottomBar}>
-        {showClear ? (
-          <div onClick={onClear}>
-            {clearText} {title}
-          </div>
-        ) : null}
-        {showViewMore ? (
-          <div
-            onClick={(e) => {
-              if (onViewMore) {
-                onViewMore(e);
-              }
-            }}
-          >
-            {viewMoreText}
-          </div>
-        ) : null}
-      </div>
-    </div>
-  );
-};
-
-export default NoticeList;

src/components/NoticeIcon/index.jsx

@@ -1,152 +0,0 @@
-import { getNotices } from '@/services/ant-design-pro/api';
-import { useModel, useRequest } from '@umijs/max';
-import { message, Tag } from 'antd';
-import { groupBy } from 'lodash';
-import moment from 'moment';
-import { useEffect, useState } from 'react';
-import styles from './index.less';
-import NoticeIcon from './NoticeIcon';
-
-// export type GlobalHeaderRightProps = {
-//   fetchingNotices?: boolean;
-//   onNoticeVisibleChange?: (visible: boolean) => void;
-//   onNoticeClear?: (tabName?: string) => void;
-// };
-
-const getNoticeData = (notices) => {
-  if (!notices || notices.length === 0 || !Array.isArray(notices)) {
-    return {};
-  }
-
-  const newNotices = notices.map((notice) => {
-    const newNotice = { ...notice };
-
-    if (newNotice.datetime) {
-      newNotice.datetime = moment(notice.datetime).fromNow();
-    }
-
-    if (newNotice.id) {
-      newNotice.key = newNotice.id;
-    }
-
-    if (newNotice.extra && newNotice.status) {
-      const color = {
-        todo: '',
-        processing: 'blue',
-        urgent: 'red',
-        doing: 'gold',
-      }[newNotice.status];
-      newNotice.extra = (
-        <Tag
-          color={color}
-          style={{
-            marginRight: 0,
-          }}
-        >
-          {newNotice.extra}
-        </Tag>
-      );
-    }
-
-    return newNotice;
-  });
-  return groupBy(newNotices, 'type');
-};
-
-const getUnreadData = (noticeData) => {
-  const unreadMsg = {};
-  Object.keys(noticeData).forEach((key) => {
-    const value = noticeData[key];
-
-    if (!unreadMsg[key]) {
-      unreadMsg[key] = 0;
-    }
-
-    if (Array.isArray(value)) {
-      unreadMsg[key] = value.filter((item) => !item.read).length;
-    }
-  });
-  return unreadMsg;
-};
-
-const NoticeIconView = () => {
-  const { initialState } = useModel('@@initialState');
-  const { currentUser } = initialState || {};
-  const [notices, setNotices] = useState([]);
-  const { data } = useRequest(getNotices);
-
-  useEffect(() => {
-    setNotices(data || []);
-  }, [data]);
-
-  const noticeData = getNoticeData(notices);
-  const unreadMsg = getUnreadData(noticeData || {});
-
-  const changeReadState = (id) => {
-    setNotices(
-      notices.map((item) => {
-        const notice = { ...item };
-        if (notice.id === id) {
-          notice.read = true;
-        }
-        return notice;
-      }),
-    );
-  };
-
-  const clearReadState = (title, key) => {
-    setNotices(
-      notices.map((item) => {
-        const notice = { ...item };
-        if (notice.type === key) {
-          notice.read = true;
-        }
-        return notice;
-      }),
-    );
-    message.success(`${'清空了'} ${title}`);
-  };
-
-  return (
-    <NoticeIcon
-      className={styles.action}
-      count={currentUser && currentUser.unreadCount}
-      onItemClick={(item) => {
-        changeReadState(item.id);
-      }}
-      onClear={(title, key) => clearReadState(title, key)}
-      loading={false}
-      clearText="清空"
-      viewMoreText="查看更多"
-      onViewMore={() => message.info('Click on view more')}
-      clearClose
-    >
-      <NoticeIcon.Tab
-        tabKey="notification"
-        count={unreadMsg.notification}
-        list={noticeData.notification}
-        title="通知"
-        emptyText="你已查看所有通知"
-        showViewMore
-      />
-      <NoticeIcon.Tab
-        tabKey="message"
-        count={unreadMsg.message}
-        list={noticeData.message}
-        title="消息"
-        emptyText="您已读完所有消息"
-        showViewMore
-      />
-      <NoticeIcon.Tab
-        tabKey="event"
-        title="待办"
-        emptyText="你已完成所有待办"
-        count={unreadMsg.event}
-        list={noticeData.event}
-        showViewMore
-      />
-    </NoticeIcon>
-  );
-};
-
-export default NoticeIconView;

src/components/NoticeIcon/index.less

@@ -1,35 +0,0 @@
-@import (reference) '~antd/es/style/themes/index';
-
-.popover {
-  position: relative;
-  width: 336px;
-}
-
-.noticeButton {
-  display: inline-block;
-  cursor: pointer;
-  transition: all 0.3s;
-}
-.icon {
-  padding: 4px;
-  vertical-align: middle;
-}
-
-.badge {
-  font-size: 16px;
-}
-
-.tabs {
-  :global {
-    .ant-tabs-nav-list {
-      margin: auto;
-    }
-
-    .ant-tabs-nav-scroll {
-      text-align: center;
-    }
-    .ant-tabs-nav {
-      margin-bottom: 0;
-    }
-  }
-}

src/components/RightContent/AvatarDropdown.jsx

@@ -1,112 +0,0 @@
-import { LogoutOutlined, SettingOutlined, UserOutlined } from '@ant-design/icons';
-import { history, useModel } from '@umijs/max';
-import { Avatar, Menu, Spin } from 'antd';
-import { stringify } from 'querystring';
-import { useCallback } from 'react';
-import HeaderDropdown from '../HeaderDropdown';
-import styles from './index.less';
-
-/**
- * 退出登录，并且将当前的 url 保存
- */
-const loginOut = async () => {
-  // await outLogin();
-  sessionStorage.removeItem('token');
-  const { search, pathname } = history.location;
-  const urlParams = new URL(window.location.href).searchParams;
-  /** 此方法会跳转到 redirect 参数所在的位置 */
-  const redirect = urlParams.get('redirect');
-  // Note: There may be security issues, please note
-  if (window.location.pathname !== '/user/login' && !redirect) {
-    history.replace({
-      pathname: '/user/login',
-      search: stringify({
-        redirect: pathname + search,
-      }),
-    });
-  }
-};
-
-const AvatarDropdown = ({ menu }) => {
-  const { initialState, setInitialState } = useModel('@@initialState');
-
-  const onMenuClick = useCallback(
-    (event) => {
-      const { key } = event;
-      if (key === 'logout') {
-        setInitialState((s) => ({ ...s, currentUser: undefined }));
-        loginOut();
-        return;
-      }
-      history.push(`/account/${key}`);
-    },
-    [setInitialState],
-  );
-
-  const loading = (
-    <span className={`${styles.action} ${styles.account}`}>
-      <Spin
-        size="small"
-        style={{
-          marginLeft: 8,
-          marginRight: 8,
-        }}
-      />
-    </span>
-  );
-
-  if (!initialState) {
-    return loading;
-  }
-
-  const { currentUser } = initialState;
-
-  if (!currentUser || !currentUser.name) {
-    return loading;
-  }
-
-  const menuItems = [
-    ...(menu
-      ? [
-          {
-            key: 'center',
-            icon: <UserOutlined />,
-            label: '个人中心',
-          },
-          {
-            key: 'settings',
-            icon: <SettingOutlined />,
-            label: '个人设置',
-          },
-          {
-            type: 'divider',
-          },
-        ]
-      : []),
-    {
-      key: 'logout',
-      icon: <LogoutOutlined />,
-      label: '退出登录',
-    },
-  ];
-
-  const menuHeaderDropdown = (
-    <Menu className={styles.menu} selectedKeys={[]} onClick={onMenuClick} items={menuItems} />
-  );
-
-  return (
-    <HeaderDropdown overlay={menuHeaderDropdown}>
-      <span className={`${styles.action} ${styles.account}`}>
-        <Avatar
-          className={styles.avatar}
-          icon={<UserOutlined />}
-          // src={currentUser.avatar}
-          alt="avatar"
-        />
-        <span className={`${styles.name} anticon`}>{currentUser.name}</span>
-      </span>
-    </HeaderDropdown>
-  );
-};
-
-export default AvatarDropdown;

src/components/RightContent/index.jsx

@@ -1,27 +0,0 @@
-import { useModel } from '@umijs/max';
-import { Space } from 'antd';
-import Avatar from './AvatarDropdown';
-import styles from './index.less';
-
-// export type SiderTheme = 'light' | 'dark';
-
-const GlobalHeaderRight = () => {
-  const { initialState } = useModel('@@initialState');
-
-  if (!initialState || !initialState.settings) {
-    return null;
-  }
-
-  const { navTheme, layout } = initialState.settings;
-  let className = styles.right;
-
-  if ((navTheme === 'dark' && layout === 'top') || layout === 'mix') {
-    className = `${styles.right}  ${styles.dark}`;
-  }
-  return (
-    <Space className={className}>
-      <Avatar />
-    </Space>
-  );
-};
-export default GlobalHeaderRight;

src/components/RightContent/index.less

@@ -1,75 +0,0 @@
-@import (reference) '~antd/es/style/themes/index';
-
-@pro-header-hover-bg: rgba(255, 255, 255, 0.025);
-
-.menu {
-  :global(.anticon) {
-    margin-right: 8px;
-  }
-  :global(.ant-dropdown-menu-item) {
-    min-width: 160px;
-  }
-}
-
-.right {
-  display: flex;
-  float: right;
-  height: 48px;
-  margin-left: auto;
-  overflow: hidden;
-  .action {
-    display: flex;
-    align-items: center;
-    height: 48px;
-    padding: 0 12px;
-    cursor: pointer;
-    transition: all 0.3s;
-    > span {
-      vertical-align: middle;
-    }
-    &:hover {
-      background: @pro-header-hover-bg;
-    }
-    &:global(.opened) {
-      background: @pro-header-hover-bg;
-    }
-  }
-  .search {
-    padding: 0 12px;
-    &:hover {
-      background: transparent;
-    }
-  }
-  .account {
-    color: #fff;
-
-    .avatar {
-      margin-right: 8px;
-      color: @primary-color;
-      vertical-align: top;
-      // background: rgba(255, 255, 255, 0.85);
-    }
-  }
-}
-
-@media only screen and (max-width: @screen-md) {
-  :global(.ant-divider-vertical) {
-    vertical-align: unset;
-  }
-  .name {
-    display: none;
-  }
-  .right {
-    position: absolute;
-    top: 0;
-    right: 12px;
-    .account {
-      .avatar {
-        margin-right: 0;
-      }
-    }
-    .search {
-      display: none;
-    }
-  }
-}

src/components/UploadFile/index.jsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useState } from 'react'
 import { UploadOutlined } from '@ant-design/icons';
 import { Upload, Button } from 'antd';
-import { uploadFile } from '@/services/api/rotationChart';
+import { uploadFile } from '@/services/rotationChart';
 
 const customRequest = ({ file, onError, onSuccess }) => {
   const data = new FormData();

src/components/UploadVideo/index.jsx

@@ -37,7 +37,7 @@ export default (props) => {
     <div>
       <Upload
       accept='video/*'
-        action={'/api/video/upload'}
+        action={'/video/upload'}
         className="image-uploader"
         showUploadList={false}
         // beforeUpload={beforeUpload}

src/components/chart/index.jsx

@@ -0,0 +1,81 @@
+import React, { useRef, useEffect } from 'react';
+
+// 引入 echarts 核心模块，核心模块提供了 echarts 使用必须要的接口。
+import * as echarts from 'echarts/core';
+// 引入图表，图表后缀都为 Chart
+import {
+  BarChart,
+  PieChart,
+  LineChart,
+  GaugeChart,
+  RadarChart,
+  PictorialBarChart,
+} from 'echarts/charts';
+// 引入提示框，标题，直角坐标系，数据集，内置数据转换器组件，组件后缀都为 Component
+import {
+  TitleComponent,
+  TooltipComponent,
+  ToolboxComponent,
+  GridComponent,
+  DatasetComponent,
+  LegendComponent,
+  DataZoomComponent,
+  TransformComponent,
+  VisualMapComponent,
+} from 'echarts/components';
+// 标签自动布局，全局过渡动画等特性
+import { LabelLayout, UniversalTransition } from 'echarts/features';
+// 引入 Canvas 渲染器，注意引入 CanvasRenderer 或者 SVGRenderer 是必须的一步
+import { CanvasRenderer } from 'echarts/renderers';
+
+// 注册必须的组件
+echarts.use([
+  TitleComponent,
+  TooltipComponent,
+  ToolboxComponent,
+  GridComponent,
+  DatasetComponent,
+  LegendComponent,
+  DataZoomComponent,
+  TransformComponent,
+  VisualMapComponent,
+  BarChart,
+  PieChart,
+  LineChart,
+  GaugeChart,
+  RadarChart,
+  PictorialBarChart,
+  LabelLayout,
+  UniversalTransition,
+  CanvasRenderer
+]);
+
+export default (props) => {
+  const { className, style, option } = props;
+
+  const domRef = useRef();
+  const chartRef = useRef();
+
+  useEffect(() => {
+    if (!chartRef.current) {
+      chartRef.current = echarts.init(domRef.current);
+    }
+
+    const resize = () => {
+      const t = setTimeout(() => {
+        clearTimeout(t);
+        chartRef.current.resize();
+      }, 100);
+    };
+
+    chartRef.current.setOption(option);
+    resize();
+
+    window.addEventListener('resize', resize);    
+    return () => window.removeEventListener('resize', resize);
+  }, [option]);
+
+  return (
+    <div className={className} style={style} ref={domRef}></div>
+  )
+}

src/components/index.md

@@ -1,267 +0,0 @@
----
-title: 业务组件
-sidemenu: false
----
-
-> 此功能由[dumi](https://d.umijs.org/zh-CN/guide/advanced#umi-%E9%A1%B9%E7%9B%AE%E9%9B%86%E6%88%90%E6%A8%A1%E5%BC%8F)提供，dumi 是一个 📖 为组件开发场景而生的文档工具，用过的都说好。
-
-# 业务组件
-
-这里列举了 Pro 中所有用到的组件，这些组件不适合作为组件库，但是在业务中却真实需要。所以我们准备了这个文档，来指导大家是否需要使用这个组件。
-
-## Footer 页脚组件
-
-这个组件自带了一些 Pro 的配置，你一般都需要改掉它的信息。
-
-```tsx
-/**
- * background: '#f0f2f5'
- */
-import Footer from '@/components/Footer';
-
-export default () => <Footer />;
-```
-
-## HeaderDropdown 头部下拉列表
-
-HeaderDropdown 是 antd Dropdown 的封装，但是增加了移动端的特殊处理，用法也是相同的。
-
-```tsx
-/**
- * background: '#f0f2f5'
- */
-import HeaderDropdown from '@/components/HeaderDropdown';
-import { Button, Menu } from 'antd';
-
-export default () => {
-  const menuHeaderDropdown = (
-    <Menu selectedKeys={[]}>
-      <Menu.Item key="center">个人中心</Menu.Item>
-      <Menu.Item key="settings">个人设置</Menu.Item>
-      <Menu.Divider />
-      <Menu.Item key="logout">退出登录</Menu.Item>
-    </Menu>
-  );
-  return (
-    <HeaderDropdown overlay={menuHeaderDropdown}>
-      <Button>hover 展示菜单</Button>
-    </HeaderDropdown>
-  );
-};
-```
-
-## HeaderSearch 头部搜索框
-
-一个带补全数据的输入框，支持收起和展开 Input
-
-```tsx
-/**
- * background: '#f0f2f5'
- */
-import HeaderSearch from '@/components/HeaderSearch';
-
-export default () => {
-  return (
-    <HeaderSearch
-      placeholder="站内搜索"
-      defaultValue="umi ui"
-      options={[
-        { label: 'Ant Design Pro', value: 'Ant Design Pro' },
-        {
-          label: 'Ant Design',
-          value: 'Ant Design',
-        },
-        {
-          label: 'Pro Table',
-          value: 'Pro Table',
-        },
-        {
-          label: 'Pro Layout',
-          value: 'Pro Layout',
-        },
-      ]}
-      onSearch={(value) => {
-        console.log('input', value);
-      }}
-    />
-  );
-};
-```
-
-### API
-
-| 参数            | 说明                               | 类型                         | 默认值 |
-| --------------- | ---------------------------------- | ---------------------------- | ------ |
-| value           | 输入框的值                         | `string`                     | -      |
-| onChange        | 值修改后触发                       | `(value?: string) => void`   | -      |
-| onSearch        | 查询后触发                         | `(value?: string) => void`   | -      |
-| options         | 选项菜单的的列表                   | `{label,value}[]`            | -      |
-| defaultVisible  | 输入框默认是否显示，只有第一次生效 | `boolean`                    | -      |
-| visible         | 输入框是否显示                     | `boolean`                    | -      |
-| onVisibleChange | 输入框显示隐藏的回调函数           | `(visible: boolean) => void` | -      |
-
-## NoticeIcon 通知工具
-
-通知工具提供一个展示多种通知信息的界面。
-
-```tsx
-/**
- * background: '#f0f2f5'
- */
-import NoticeIcon from '@/components/NoticeIcon/NoticeIcon';
-import { message } from 'antd';
-
-export default () => {
-  const list = [
-    {
-      id: '000000001',
-      avatar: 'https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png',
-      title: '你收到了 14 份新周报',
-      datetime: '2017-08-09',
-      type: 'notification',
-    },
-    {
-      id: '000000002',
-      avatar: 'https://gw.alipayobjects.com/zos/rmsportal/OKJXDXrmkNshAMvwtvhu.png',
-      title: '你推荐的 曲妮妮 已通过第三轮面试',
-      datetime: '2017-08-08',
-      type: 'notification',
-    },
-  ];
-  return (
-    <NoticeIcon
-      count={10}
-      onItemClick={(item) => {
-        message.info(`${item.title} 被点击了`);
-      }}
-      onClear={(title: string, key: string) => message.info('点击了清空更多')}
-      loading={false}
-      clearText="清空"
-      viewMoreText="查看更多"
-      onViewMore={() => message.info('点击了查看更多')}
-      clearClose
-    >
-      <NoticeIcon.Tab
-        tabKey="notification"
-        count={2}
-        list={list}
-        title="通知"
-        emptyText="你已查看所有通知"
-        showViewMore
-      />
-      <NoticeIcon.Tab
-        tabKey="message"
-        count={2}
-        list={list}
-        title="消息"
-        emptyText="您已读完所有消息"
-        showViewMore
-      />
-      <NoticeIcon.Tab
-        tabKey="event"
-        title="待办"
-        emptyText="你已完成所有待办"
-        count={2}
-        list={list}
-        showViewMore
-      />
-    </NoticeIcon>
-  );
-};
-```
-
-### NoticeIcon API
-
-| 参数 | 说明 | 类型 | 默认值 |
-| --- | --- | --- | --- |
-| count | 有多少未读通知 | `number` | - |
-| bell | 铃铛的图表 | `ReactNode` | - |
-| onClear | 点击清空数据按钮 | `(tabName: string, tabKey: string) => void` | - |
-| onItemClick | 未读消息列被点击 | `(item: API.NoticeIconData, tabProps: NoticeIconTabProps) => void` | - |
-| onViewMore | 查看更多的按钮点击 | `(tabProps: NoticeIconTabProps, e: MouseEvent) => void` | - |
-| onTabChange | 通知 Tab 的切换 | `(tabTile: string) => void;` | - |
-| popupVisible | 通知显示是否展示 | `boolean` | - |
-| onPopupVisibleChange | 通知信息显示隐藏的回调函数 | `(visible: boolean) => void` | - |
-| clearText | 清空按钮的文字 | `string` | - |
-| viewMoreText | 查看更多的按钮文字 | `string` | - |
-| clearClose | 展示清空按钮 | `boolean` | - |
-| emptyImage | 列表为空时的兜底展示 | `ReactNode` | - |
-
-### NoticeIcon.Tab API
-
-| 参数         | 说明               | 类型                                 | 默认值 |
-| ------------ | ------------------ | ------------------------------------ | ------ |
-| count        | 有多少未读通知     | `number`                             | -      |
-| title        | 通知 Tab 的标题    | `ReactNode`                          | -      |
-| showClear    | 展示清除按钮       | `boolean`                            | `true` |
-| showViewMore | 展示加载更         | `boolean`                            | `true` |
-| tabKey       | Tab 的唯一 key     | `string`                             | -      |
-| onClick      | 子项的单击事件     | `(item: API.NoticeIconData) => void` | -      |
-| onClear      | 清楚按钮的点击     | `()=>void`                           | -      |
-| emptyText    | 为空的时候测试     | `()=>void`                           | -      |
-| viewMoreText | 查看更多的按钮文字 | `string`                             | -      |
-| onViewMore   | 查看更多的按钮点击 | `( e: MouseEvent) => void`           | -      |
-| list         | 通知信息的列表     | `API.NoticeIconData`                 | -      |
-
-### NoticeIconData
-
-```tsx | pure
-export interface NoticeIconData {
-  id: string;
-  key: string;
-  avatar: string;
-  title: string;
-  datetime: string;
-  type: string;
-  read?: boolean;
-  description: string;
-  clickClose?: boolean;
-  extra: any;
-  status: string;
-}
-```
-
-## RightContent
-
-RightContent 是以上几个组件的组合，同时新增了 plugins 的 `SelectLang` 插件。
-
-```tsx | pure
-<Space>
-  <HeaderSearch
-    placeholder="站内搜索"
-    defaultValue="umi ui"
-    options={[
-      { label: <a href="https://umijs.org/zh/guide/umi-ui.html">umi ui</a>, value: 'umi ui' },
-      {
-        label: <a href="next.ant.design">Ant Design</a>,
-        value: 'Ant Design',
-      },
-      {
-        label: <a href="https://protable.ant.design/">Pro Table</a>,
-        value: 'Pro Table',
-      },
-      {
-        label: <a href="https://prolayout.ant.design/">Pro Layout</a>,
-        value: 'Pro Layout',
-      },
-    ]}
-  />
-  <Tooltip title="使用文档">
-    <span
-      className={styles.action}
-      onClick={() => {
-        window.location.href = 'https://pro.ant.design/docs/getting-started';
-      }}
-    >
-      <QuestionCircleOutlined />
-    </span>
-  </Tooltip>
-  <Avatar />
-  {REACT_APP_ENV && (
-    <span>
-      <Tag color={ENVTagColor[REACT_APP_ENV]}>{REACT_APP_ENV}</Tag>
-    </span>
-  )}
-  <SelectLang className={styles.action} />
-</Space>
-```

src/components/page/Container.jsx

@@ -0,0 +1,10 @@
+import React from 'react';
+import './style.less'
+
+export default (props) => {
+  return (
+    <div className="page-container">
+      {props.children}
+    </div>
+  )
+}

src/components/page/index.jsx

@@ -0,0 +1,14 @@
+import React, { useEffect } from 'react';
+// import { PageHeader } from 'antd';
+import { useModel } from '@/store';
+import Container from './Container';
+
+export default (props) => {
+  // const { children, ...headerProps } = props;
+  
+  return (
+    <Container>
+      {props.children}
+    </Container>
+  )
+}

src/components/page/style.less

@@ -0,0 +1,5 @@
+
+.page-container {
+  margin: 24px;
+  margin-bottom: 0;
+}

src/e2e/baseLayout.e2e.spec.ts

@@ -1,45 +0,0 @@
-import type { Page } from '@playwright/test';
-import { expect, test } 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);
-  });
-});

src/global.jsx

@@ -1,91 +0,0 @@
-import { useIntl } from '@umijs/max';
-import { Button, message, notification } from 'antd';
-import defaultSettings from '../config/defaultSettings';
-
-const { pwa } = defaultSettings;
-const isHttps = document.location.protocol === 'https:';
-
-const clearCache = () => {
-  // remove all caches
-  if (window.caches) {
-    caches
-      .keys()
-      .then((keys) => {
-        keys.forEach((key) => {
-          caches.delete(key);
-        });
-      })
-      .catch((e) => console.log(e));
-  }
-};
-
-// if pwa is true
-if (pwa) {
-  // Notify user if offline now
-  window.addEventListener('sw.offline', () => {
-    message.warning(useIntl().formatMessage({ id: 'app.pwa.offline' }));
-  });
-
-  // Pop up a prompt on the page asking the user if they want to use the latest version
-  window.addEventListener('sw.updated', (event) => {
-    const e = event ;
-    const reloadSW = async () => {
-      // Check if there is sw whose state is waiting in ServiceWorkerRegistration
-      // https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorkerRegistration
-      const worker = e.detail && e.detail.waiting;
-      if (!worker) {
-        return true;
-      }
-      // Send skip-waiting event to waiting SW with MessageChannel
-      await new Promise((resolve, reject) => {
-        const channel = new MessageChannel();
-        channel.port1.onmessage = (msgEvent) => {
-          if (msgEvent.data.error) {
-            reject(msgEvent.data.error);
-          } else {
-            resolve(msgEvent.data);
-          }
-        };
-        worker.postMessage({ type: 'skip-waiting' }, [channel.port2]);
-      });
-
-      clearCache();
-      window.location.reload();
-      return true;
-    };
-    const key = `open${Date.now()}`;
-    const btn = (
-      <Button
-        type="primary"
-        onClick={() => {
-          notification.close(key);
-          reloadSW();
-        }}
-      >
-        {useIntl().formatMessage({ id: 'app.pwa.serviceworker.updated.ok' })}
-      </Button>
-    );
-    notification.open({
-      message: useIntl().formatMessage({ id: 'app.pwa.serviceworker.updated' }),
-      description: useIntl().formatMessage({ id: 'app.pwa.serviceworker.updated.hint' }),
-      btn,
-      key,
-      onClose: async () => null,
-    });
-  });
-} else if ('serviceWorker' in navigator && isHttps) {
-  // unregister service worker
-  const { serviceWorker } = navigator;
-  if (serviceWorker.getRegistrations) {
-    serviceWorker.getRegistrations().then((sws) => {
-      sws.forEach((sw) => {
-        sw.unregister();
-      });
-    });
-  }
-  serviceWorker.getRegistration().then((sw) => {
-    if (sw) sw.unregister();
-  });
-
-  clearCache();
-}

src/global.less

@@ -1,102 +0,0 @@
-@import '~antd/es/style/variable.less';
-
-html,
-body,
-#root {
-  height: 100%;
-}
-
-.ant-pro-sider-actions {
-  display: none !important;
-}
-
-.colorWeak {
-  filter: invert(80%);
-}
-
-.ant-layout {
-  min-height: 100vh;
-}
-
-.ant-pro .ant-layout-header.ant-pro-layout-header {
-  padding: 0;
-}
-
-.ant-pro-top-nav-header-menu {
-  line-height: 64px !important;
-}
-
-.ant-pro-layout .ant-pro-top-nav-header-base-menu.ant-menu-light .ant-menu-item-selected {
-  border-radius: 0;
-}
-
-.ant-pro-sider.ant-layout-sider.ant-pro-sider-fixed {
-  left: unset;
-}
-
-canvas {
-  display: block;
-}
-
-body {
-  text-rendering: optimizeLegibility;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-ul,
-ol {
-  list-style: none;
-}
-
-@media (max-width: @screen-xs) {
-  .ant-table {
-    width: 100%;
-    overflow-x: auto;
-    &-thead > tr,
-    &-tbody > tr {
-      > th,
-      > td {
-        white-space: pre;
-        > span {
-          display: block;
-        }
-      }
-    }
-  }
-}
-
-.ant-page-header {
-  background-color: #fff !important;
-  // box-shadow: 0 2px 2px rgba(0, 0, 0, 0.04);
-}
-
-// 兼容 360
-.ant-pro-sider-collapsed-button {
-  top: 18px;
-  right: -13px;
-}
-
-// .ant-pro .ant-pro-layout .ant-pro-sider-mix {
-//   top: 64px;
-// }
-
-.ant-layout-sider-children {
-  padding: 8px;
-}
-
-.ant-pro .ant-pro-layout .ant-pro-sider-logo {
-  padding: 16px;
-}
-
-.ant-pro-page-container .ant-pro-page-container-warp-page-header ~ .ant-pro-grid-content .ant-pro-page-container-children-content {
-  margin: 8px 40px 40px 40px;
-}
-
-.ant-pro-table-list-toolbar-container {
-  padding: 16px 0;
-}
-
-.ant-pro-card .ant-pro-card-body {
-  padding: 16px 24px;
-}

src/index.less

@@ -0,0 +1,77 @@
+html, body, #root {
+  width: 100%;
+  height: 100%;
+  margin: 0;
+}
+
+:root {
+  --theme-color: #081A48;
+  --theme-front: #fff;
+  --header-height: 94px;
+  --siderbar-width: 240px;
+}
+
+.main-layout {
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+}
+
+.fixd-header {
+  width: 100%;
+  position: fixed;
+  top: 0;
+  height: var(--header-height);
+  line-height: var(--header-height);
+  z-index: 100;
+}
+
+.ant-layout {
+  background-color: #f0f2f5;
+}
+
+.ant-layout-header {
+  line-height: var(--header-height);
+  box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+  // border-bottom: 1px solid gainsboro;
+  z-index: 10;
+}
+
+.layout-sidebar {
+  width: var(--siderbar-width);
+  background-color: var(--theme-color);
+  color: var(--theme-front);
+  box-shadow: 1px 0 4px 0 rgba(0, 21, 41, 0.08);
+
+  .ant-menu {
+    font-size: 16px;
+    background: var(--theme-color);
+  }
+}
+
+
+// 兼容 360
+.ant-pro-sider-collapsed-button {
+  top: 18px;
+  right: -13px;
+}
+
+.ant-pro .ant-pro-layout .ant-pro-sider-logo {
+  padding: 16px;
+}
+
+.ant-pro .ant-pro-query-filter .ant-form-item {
+  margin: 0;
+}
+
+.ant-pro-page-container .ant-pro-page-container-warp-page-header ~ .ant-pro-grid-content .ant-pro-page-container-children-content {
+  margin: 8px 40px 40px 40px;
+}
+
+.ant-pro-table-list-toolbar-container {
+  padding: 16px 0;
+}
+
+.ant-pro-card .ant-pro-card-body {
+  padding: 16px 24px;
+}

src/layouts/AuthLayout/components/Container.jsx

@@ -0,0 +1,30 @@
+import React, { useEffect, useRef, useMemo, useState } from 'react';
+import { Layout, Spin } from 'antd';
+import { Outlet } from "react-router-dom";
+import PageTransition from './PageTransition';
+import Footer from './Footer';
+
+const { Content } = Layout;
+
+export default (props) => {  
+  const containerRef = useRef();
+  const [minHeight, setMinHeight] = useState(0);
+  const contentStyle = useMemo(() => ({ minHeight: `${minHeight}px` }), [minHeight]);
+  
+  useEffect(() => {
+    const containerHeight = containerRef.current.offsetHeight;
+    const footerHeight = document.querySelector('.ant-layout-footer').offsetHeight;
+    setMinHeight(containerHeight - footerHeight);
+  }, []);
+
+  return (
+    <div className='layout-container' ref={containerRef}>
+      <Content style={contentStyle}>
+        {/* <PageTransition location={props.location}> */}
+          <Outlet />
+        {/* </PageTransition> */}
+      </Content>
+      <Footer />
+    </div>
+  )
+}

src/layouts/AuthLayout/components/Footer.jsx

@@ -0,0 +1,14 @@
+import React from 'react';
+import { Layout, Spin } from 'antd';
+
+const { Footer } = Layout;
+
+const year = new Date().getFullYear();
+export default (props) => {
+
+  const copyRight = `南京云致 @${year}`
+
+  return (
+    <Footer style={{ textAlign: 'center' }}>{copyRight}</Footer>
+  )
+}

src/layouts/AuthLayout/components/Header/Exit.jsx

@@ -0,0 +1,28 @@
+import React from 'react';
+import { useNavigate } from 'react-router-dom';
+import { LogoutOutlined } from '@ant-design/icons';
+import { Button, Modal } from 'antd';
+import { useModel } from '@/store';
+
+const { confirm } = Modal;
+
+export default (props) => {
+  const navigate = useNavigate();
+  const { setUser } = useModel('user');
+
+  const onExit = () => {
+
+    confirm({
+      title: '确认退出系统?',
+      onOk: () => {
+        sessionStorage.removeItem('token');
+        setUser();
+        navigate('/login?back=true');
+      }
+    });
+  }
+
+  return (
+    <Button className='font' type="text" icon={<LogoutOutlined />} onClick={onExit}>退出</Button>
+  )
+}

src/layouts/AuthLayout/components/Header/SplitMenu.jsx

@@ -0,0 +1,28 @@
+import React from 'react';
+import { Menu } from 'antd';
+import { useNavigate } from 'react-router-dom';
+
+export default (props) => {
+  const { items, onChange, location } = props;
+
+  const navigate = useNavigate();
+  const [selectedKeys, setSelectedKeys] = React.useState([]);
+
+  const renderItems = React.useMemo(() => items.map(x => ({ ...x, children: undefined })), [items]);
+
+  const rootPath = React.useMemo(() => `/${location.pathname.split('/')[1]}`, [location.pathname]);
+
+  const onClick = (item) => {
+    onChange(item.key);
+    navigate(item.key);
+  };
+
+  React.useEffect(() => {
+    setSelectedKeys([rootPath]);
+    onChange(rootPath);
+  }, [rootPath]);
+
+  return (
+    <Menu className='split-menu' mode="horizontal" items={renderItems} selectedKeys={selectedKeys} onClick={onClick} />
+  )
+}

src/layouts/AuthLayout/components/Header/Title.jsx

@@ -0,0 +1,26 @@
+import { Typography } from 'antd';
+import useRoute from '@/utils/hooks/useRoute';
+
+const { Title } = Typography;
+
+const titleStyle = {
+  margin: 0,
+}
+
+const spanStyle = {
+  display: 'inline-block',
+  width: '24px',
+  textAlign: 'center'
+}
+
+export default (props) => {
+  const route = useRoute();
+  const { title } = route && route.meta || {}
+
+  return (
+    <Title level={5} style={titleStyle}>
+      { title && <span style={spanStyle}>&raquo;</span> }
+      { title && <span>{title}</span> }
+    </Title>
+  );
+}

src/layouts/AuthLayout/components/Header/User.jsx

@@ -0,0 +1,88 @@
+import React, { useState, forwardRef, useRef, useImperativeHandle } from 'react';
+import { Avatar, Button, Dropdown, Menu, Form, Input, Modal } from 'antd';
+import { useModel } from '@/store'
+
+const ChangePassword = forwardRef((props, ref) => {
+  const [visible, setVisible] = useState(false);
+
+  const onFinish = (values) => {
+    console.log('Success:', values);
+  };
+
+  useImperativeHandle(ref, () => {
+    return {
+      show: () => setVisible(true),
+    }
+  });
+
+  return (
+    <Modal title="修改密码" visible={visible} onCancel={() => setVisible(false)}>
+      <Form
+        labelCol={{ span: 8 }}
+        wrapperCol={{ span: 16 }}
+        onFinish={onFinish}
+        autoComplete="off"
+      >
+        <Form.Item
+          label="原始密码"
+          name="password"
+          rules={[{ required: true, message: '请输入原始密码!' }]}
+        >
+          <Input.Password />
+        </Form.Item>
+
+        <Form.Item
+          label="新密码"
+          name="newPassword"
+          rules={[{ required: true, message: '请输入新密码!' }]}
+        >
+          <Input.Password />
+        </Form.Item>
+
+        <Form.Item
+          label="确认新密码"
+          name="newPassword2"
+          rules={[{ required: true, message: '请输入新密码!' }]}
+        >
+          <Input.Password />
+        </Form.Item>
+
+        <Form.Item wrapperCol={{ offset: 8, span: 16 }}>
+          <Button type="primary" htmlType="submit">
+            提交
+          </Button>
+        </Form.Item>
+      </Form>
+    </Modal>
+  )
+});
+
+export default (props) => {
+  const menuItems = [
+    {
+      key: 'changePassword',
+      label: '修改密码',
+    }
+  ];
+
+  const passRef = useRef();
+  const { user = {} } = useModel('user');
+
+  const onClick = ({ key }) => {
+    if (key === 'changePassword') {
+      passRef.current.show();
+    }
+  };
+
+  const menu = <Menu items={menuItems} onClick={onClick} />;
+
+  return (
+    <Dropdown overlay={menu}>
+      <div className="user-info">
+        <Avatar size={24} src="https://joeschmoe.io/api/v1/random" />
+        <span className='font'>{user.name}</span>
+        <ChangePassword ref={passRef} />
+      </div>
+    </Dropdown>
+  )
+}

src/layouts/AuthLayout/components/Header/index.jsx

@@ -0,0 +1,30 @@
+import React, { useMemo } from 'react';
+import { Layout, Space } from 'antd';
+import classNames from 'classnames';
+import Logo from '../Logo';
+import Title from './Title';
+import User from './User';
+import Exit from './Exit';
+import SplitMenu from './SplitMenu';
+
+const { Header } = Layout;
+
+export default (props) => {
+  const { menus, theme, location, onMenuChange } = props;
+
+  const className = useMemo(() => classNames({
+    'layout-header': true,
+    'light': theme === 'light',
+  }), [theme]);
+
+  return (
+    <Header className={className}>
+      <Logo />
+      <SplitMenu items={menus} location={location} onChange={onMenuChange} />
+      <Space>
+        <User />
+        <Exit />
+      </Space>
+    </Header>
+  )
+}

src/layouts/AuthLayout/components/HtmlTitle.jsx

@@ -0,0 +1,19 @@
+
+import { Helmet } from "react-helmet";
+import { useModel } from '@/store';
+import useRoute from '@/utils/hooks/useRoute';
+
+export default (props) => {
+  const { app } = useModel('system');
+  const route = useRoute();
+  const { title } = route && route.meta || {}
+  
+  const titleTemplate = `%s - ${app.fullName}`;
+  const defaultTitle = app.fullName;
+
+  return (
+    <Helmet titleTemplate={titleTemplate} defaultTitle={defaultTitle}>
+      <title>{title}</title>
+    </Helmet>
+  );
+}

src/layouts/AuthLayout/components/Logo.jsx

@@ -0,0 +1,17 @@
+import React from 'react';
+import { Typography } from 'antd';
+import { NavLink } from "react-router-dom";
+import { useModel } from '@/store';
+
+const { Title } = Typography;
+
+export default (props) => {
+  const { app } = useModel('system');
+
+  return (
+    <NavLink className='logo'  to="/">
+      <img src="./logo.png" alt="" />
+      {/* <Title level={5}>{app.shorName}</Title> */}
+    </NavLink>
+  )
+}

src/layouts/AuthLayout/components/Menus.jsx

@@ -0,0 +1,41 @@
+import React, { useState } from 'react';
+import { useNavigate, useLocation } from "react-router-dom";
+import { Menu } from 'antd';
+
+const linkTo = url => {
+  const a = document.createElement('a');
+  a.href = item.key;
+  a.target = '_blank';
+  a.click();
+}
+
+const menuStyle = { height: '100%' };
+
+export default (props) => {
+  const { theme, items, location } = props;
+  // const [selectedKeys, setSelectedKeys] = useState([]);
+
+  const navigate = useNavigate();
+
+  const onClick = (item) => {
+    // console.log(item);
+
+    if (item.key.indexOf('http') === 0) {
+      // http 开头说明是外部链接
+      linkTo(item.key);
+    } else {
+      // setSelectedKeys([item.key]);
+      navigate(item.key);
+    }
+  }
+
+  // React.useEffect(() => {
+  //   if (location.pathname) {
+  //     setSelectedKeys([location.pathname]);
+  //   }
+  // }, [location.pathname]);
+
+  return (
+    <Menu style={menuStyle} theme={theme} items={items} onClick={onClick} selectedKeys={[location.pathname]} />
+  )
+}

src/layouts/AuthLayout/components/PageTransition/index.jsx

@@ -0,0 +1,21 @@
+import { TransitionGroup, CSSTransition } from 'react-transition-group';
+import './style.less';
+
+export default (props) => {
+  const { location } = props;
+  const currentURL = location.pathname + location.search;
+
+  return (
+    <TransitionGroup component={null}>
+      <CSSTransition
+        key={currentURL}
+        addEndListener={(node, done) => node.addEventListener("transitionend", done, false)}
+        classNames="page-fade"
+      >
+        <div>
+          {props.children}
+        </div>
+      </CSSTransition>
+    </TransitionGroup>
+  );
+}

src/layouts/AuthLayout/components/PageTransition/style.less

@@ -0,0 +1,21 @@
+
+.page-fade-enter {
+  opacity: 0;
+  transform: translateY(10%);
+}
+.page-fade-enter-active {
+  opacity: 1;
+  transform: translateY(0%);
+}
+.page-fade-exit {
+  opacity: 1;
+  transform: translateY(0%);
+}
+.page-fade-exit-active {
+  opacity: 0;
+  transform: translateY(10%);
+}
+.page-fade-enter-active,
+.page-fade-exit-active {
+  transition: opacity 220ms, transform 220ms;
+}

src/layouts/AuthLayout/components/RequireLogin.jsx

@@ -0,0 +1,13 @@
+import React, { useState } from 'react'
+import { useLocation, Navigate } from "react-router-dom"
+
+export default (props) => {
+  const { user } = props
+  const location = useLocation()
+
+  return props.children
+
+  // return !user || !user.isLoged ?
+  //   <Navigate to="/login" state={{ from: location }} replace /> :
+  //   props.children
+}

src/layouts/AuthLayout/components/SiderBar.jsx

@@ -0,0 +1,20 @@
+import React, { useMemo } from 'react';
+import { Layout, Spin } from 'antd';
+import { getPropertyValue } from '@/utils/css';
+import Menus from './Menus';
+
+const { Sider } = Layout;
+
+export default (props) => {
+  const { theme, location, menus } = props;
+
+  const width = useMemo(() => {
+    return /\d+/.exec(getPropertyValue('--siderbar-width'))[0] - 0;
+  }, []);
+
+  return (
+    <Sider className='layout-sidebar' theme={theme} collapsible width={width}>
+      <Menus theme={theme} items={menus} location={location} />
+    </Sider>
+  );
+}

src/layouts/AuthLayout/index.jsx

@@ -0,0 +1,48 @@
+import React, { useEffect, useRef, useMemo, useState } from 'react';
+import { Layout, Spin } from 'antd';
+import { useLocation } from "react-router-dom";
+import { useModel } from '@/store';
+import { getItems } from '@/routes/menus';
+import RequireLogin from './components/RequireLogin';
+import SiderBar from './components/SiderBar';
+import Header from './components/Header';
+import Container from './components/Container';
+import HtmlTitle from './components/HtmlTitle';
+import useReady from './useReady';
+
+import './style.less';
+
+export default (props) => {
+  const { theme } = useModel('system');
+  const { user, setUser } = useModel('user');
+
+  const allMenus = useMemo(() => getItems(), []);
+  const [siderMenus, setSiderMenus] = useState([]);
+
+  // 如果当前未登录, 跳转到登录页
+  useReady({ user, setUser });
+
+  const location = useLocation();
+
+  const onSplitMenuChange = (key) => {
+    const target = allMenus.filter(x => x.key === key)[0];
+    if (target) {
+      setSiderMenus(target.children || []);
+    }
+  }
+
+  return (
+    <Spin spinning={!user} size="large">
+      <HtmlTitle />
+      <RequireLogin>
+        <Layout style={{ minHeight: '100vh' }}>
+          <Header theme={theme} menus={allMenus} location={location} onMenuChange={onSplitMenuChange} />
+          <Layout>
+            <SiderBar theme={theme} menus={siderMenus} location={location} />
+            <Container location={location} />
+          </Layout>
+        </Layout>
+      </RequireLogin>
+    </Spin>
+  );
+}

src/layouts/AuthLayout/style.less

@@ -0,0 +1,105 @@
+.layout-header {
+  height: var(--header-height);
+  box-sizing: border-box;
+  padding: 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  color: #fff;
+  background: #0D267C;
+
+  .split-menu {
+    flex: 0;
+    max-width: 1000px;
+    background: transparent;
+    font-size: 20px;
+    color: #fff;
+    border-bottom-color: transparent;
+
+    .ant-menu-item-selected {
+      color: #fff;
+    }
+
+    .ant-menu-item .ant-menu-item-icon {
+      font-size: 20px;
+    }
+
+    .ant-menu-item-selected::after {
+      border-bottom-width: 6px !important;
+    }
+  }
+
+  &.light {
+    background-color: #fff;
+    color: #000;
+  }
+
+  .header-content {
+    flex: 1;
+  }
+
+  .font {
+    color: inherit;
+    display: inline-block;
+  }
+
+  .user-info {
+    cursor: pointer;
+
+    .ant-avatar {
+      border: 1px solid rgba(255, 255, 255, 0.4);
+    }
+
+    span {
+      margin-left: 1em;
+    }
+  }
+
+  .sys-exit {
+    margin-right: 1em;
+  }
+}
+
+.logo {
+  height: var(--header-height);
+  display: flex;
+  align-items: center;
+  box-sizing: border-box;
+  padding-left: 1em;
+  color: inherit;
+
+  & > * {
+    color: inherit;
+    margin: 0;
+  }
+
+  h5 {
+    margin: 0;
+  }
+
+  img {
+    height: 52px;
+    vertical-align: middle;
+    margin-right: 1em;
+  }
+}
+
+.layout-sidebar {
+  background: #0D267C;
+
+  .ant-menu-item-selected {
+    background: #4276F5 !important;
+  }
+}
+
+.layout-container {
+  flex: 1;
+
+  overflow-y: auto;
+  scrollbar-width: none;
+  -ms-overflow-style: none;
+
+  &::--webkit-scrollbar {
+    display: none;
+  }
+}

src/layouts/AuthLayout/useReady.jsx

@@ -0,0 +1,21 @@
+import React, { useState, useEffect } from 'react';
+import { useNavigate, useHref } from "react-router-dom";
+import { queryCurrentUser } from '@/services/user';
+
+export default function useReady({ user, setUser }) {
+  const navigate = useNavigate();
+  const isLogined = user && user.id;
+
+  useEffect(() => {
+    if (!isLogined) {
+      queryCurrentUser().then((res) => {
+        setUser(res);
+      }).catch(err => {
+        const { data } = err;
+        if (data.code === 1001) {
+          navigate('/login?back=true');
+        }
+      });
+    }
+  }, [isLogined]);
+}

src/layouts/Container.jsx

@@ -0,0 +1,15 @@
+import React from 'react';
+import { Outlet } from 'react-router-dom';
+
+const containerStyle = {
+  margin: '24px 24px 0 24px',
+  height: '100%',
+}
+
+export default (props) => {
+  return (
+    <div style={containerStyle}>
+      <Outlet />
+    </div>
+  )
+}

src/main.jsx

@@ -0,0 +1,11 @@
+import React from 'react'
+import ReactDOM from 'react-dom/client';
+import Router from './routes/Router';
+import './index.less'
+import { Provider } from './store';
+
+ReactDOM.createRoot(document.getElementById('root')).render(
+  <Provider>
+    <Router />
+  </Provider>
+)

src/manifest.json

@@ -1,22 +0,0 @@
-{
-  "name": "Ant Design Pro",
-  "short_name": "Ant Design Pro",
-  "display": "standalone",
-  "start_url": "./?utm_source=homescreen",
-  "theme_color": "#002140",
-  "background_color": "#001529",
-  "icons": [
-    {
-      "src": "icons/icon-192x192.png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "icons/icon-128x128.png",
-      "sizes": "128x128"
-    },
-    {
-      "src": "icons/icon-512x512.png",
-      "sizes": "512x512"
-    }
-  ]
-}

src/pages/404.jsx

@@ -1,18 +0,0 @@
-import { history } from '@umijs/max';
-import { Button, Result } from 'antd';
-import React from 'react';
-
-const NoFoundPage= () => (
-  <Result
-    status="404"
-    title="404"
-    subTitle="Sorry, the page you visited does not exist."
-    extra={
-      <Button type="primary" onClick={() => history.push('/')}>
-        Back Home
-      </Button>
-    }
-  />
-);
-
-export default NoFoundPage;

src/pages/404/index.jsx

@@ -0,0 +1,29 @@
+import React from 'react';
+import { Button, Result } from 'antd';
+import { Helmet } from "react-helmet";
+import { NavLink } from "react-router-dom";
+import { useModel } from '@/store';
+
+const style = {
+  display: 'grid',
+  placeItems: 'center',
+  height: '100%'
+}
+
+export default (props) => {
+  const { app } = useModel('system');
+
+  return (
+    <div style={style}>
+      <Helmet>
+        <title>{app.fullName}</title>
+      </Helmet>
+      <Result
+        status="404"
+        title="404"
+        subTitle="页面不存在"
+        extra={<NavLink to="/" replace><Button type="primary">返回首页</Button></NavLink>}
+      />
+    </div>
+  )
+}

src/pages/Admin.jsx

@@ -1,45 +0,0 @@
-import { HeartTwoTone, SmileTwoTone } from '@ant-design/icons';
-import { PageHeaderWrapper } from '@ant-design/pro-components';
-import { useIntl } from '@umijs/max';
-import { Alert, Card, Typography } from 'antd';
-import React from 'react';
-
-const Admin = () => {
-  const intl = useIntl();
-  return (
-    <PageHeaderWrapper
-      content={intl.formatMessage({
-        id: 'pages.admin.subPage.title',
-        defaultMessage: 'This page can only be viewed by admin',
-      })}
-    >
-      <Card>
-        <Alert
-          message={intl.formatMessage({
-            id: 'pages.welcome.alertMessage',
-            defaultMessage: 'Faster and stronger heavy-duty components have been released.',
-          })}
-          type="success"
-          showIcon
-          banner
-          style={{
-            margin: -12,
-            marginBottom: 48,
-          }}
-        />
-        <Typography.Title level={2} style={{ textAlign: 'center' }}>
-          <SmileTwoTone /> Ant Design Pro <HeartTwoTone twoToneColor="#eb2f96" /> You
-        </Typography.Title>
-      </Card>
-      <p style={{ textAlign: 'center', marginTop: 24 }}>
-        Want to add more pages? Please refer to{' '}
-        <a href="https://pro.ant.design/docs/block-cn" target="_blank" rel="noopener noreferrer">
-          use block
-        </a>
-        。
-      </p>
-    </PageHeaderWrapper>
-  );
-};
-
-export default Admin;

src/pages/Welcome.jsx

@@ -1,17 +0,0 @@
-import { PageContainer } from '@ant-design/pro-components';
-import { Typography } from 'antd';
-import styles from './Welcome.less';
-
-const CodePreview = ({ children }) => (
-  <pre className={styles.pre}>
-    <code>
-      <Typography.Text copyable>{children}</Typography.Text>
-    </code>
-  </pre>
-);
-
-const Welcome = () => {
-  return <PageContainer>234</PageContainer>;
-};
-
-export default Welcome;

src/pages/Welcome.less

@@ -1,8 +0,0 @@
-@import (reference) '~antd/es/style/themes/index';
-
-.pre {
-  margin: 12px 0;
-  padding: 12px 20px;
-  background: @input-bg;
-  box-shadow: @card-shadow;
-}

src/pages/dish/edit/index.jsx

@@ -1,7 +1,7 @@
-import { addDish, getDishById } from '@/services/api/dish';
-import { getStoreList } from '@/services/api/stock';
+import { addDish, getDishById } from '@/services/dish';
+import { getStoreList } from '@/services/stock';
 import { PageContainer, ProForm, ProFormSelect, ProFormText } from '@ant-design/pro-components';
-import { history, useSearchParams } from '@umijs/max';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import { Card, Col, message, Row, Space } from 'antd';
 import { useEffect, useRef, useState } from 'react';
 
@@ -9,6 +9,7 @@ export default (props) => {
   const [searchParams] = useSearchParams();
   const id = searchParams.get('id');
   const [foodDict, setFoodDict] = useState([]);
+  const navigate = useNavigate();
 
   const formRef = useRef();
   useEffect(() => {
@@ -35,7 +36,7 @@ export default (props) => {
 
     addDish({ ...values, id }).then((res) => {
       message.success('添加成功');
-      history.back();
+      navigate(-1);
     });
 
     return false;
@@ -55,7 +56,7 @@ export default (props) => {
             searchConfig: {
               resetText: '返回',
             },
-            onReset: () => history.back(),
+            onReset: () => navigate(-1),
             render: (props, doms) => {
               return (
                 <Row>

src/pages/dish/list/index.jsx

@@ -1,8 +1,8 @@
-import { getDishList, addDish, updataDish, deleteDish } from '@/services/api/dish';
+import { getDishList, addDish, updataDish, deleteDish } from '@/services/dish';
 import { queryTable } from '@/utils/request';
 import { PageContainer, ProTable } from '@ant-design/pro-components';
-import { history } from '@umijs/max';
-import { Button, message, Popconfirm, EditForm } from 'antd';
+import { useNavigate } from 'react-router-dom';
+import { Button, message, Popconfirm } from 'antd';
 import { useRef, useState } from 'react';
 
 const DishList = (props) => {
@@ -10,6 +10,7 @@ const DishList = (props) => {
   const [showDetail, setShowDetail] = useState(false);
   const [activeKey, setActiveKey] = useState('');
   const actionRef = useRef();
+  const navigate = useNavigate();
 
   const updata = (row) => {
     if (row.id) {
@@ -56,7 +57,7 @@ const DishList = (props) => {
           style={{ padding: 0 }}
           type="link"
           onClick={() => {
-            history.push(`/dish/add?id=${record.id}`);
+            navigate(`/material/dish/edit?id=${record.id}`);
           }}
         >
           修改
@@ -89,7 +90,7 @@ const DishList = (props) => {
             key="2"
             type="primary"
             onClick={() => {
-              history.push('/dish/add');
+              navigate('/material/dish/edit');
             }}
           >
             新增

src/pages/document.ejs

@@ -1,236 +0,0 @@
-<!DOCTYPE html>
-<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"
-      content="antd,umi,umijs,ant design,Scaffolding, layout, Ant Design, project, Pro, admin, console, homepage, out-of-the-box, middle and back office, solution, component library"
-    />
-    <meta
-      name="description"
-      content="
-    An out-of-box UI solution for enterprise applications as a React boilerplate."
-    />
-    <meta
-      name="description"
-      content="
-      Out-of-the-box mid-stage front-end/design solution."
-    />
-    <meta
-      name="viewport"
-      content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
-    />
-    <title>军供</title>
-    <link rel="icon" href="<%= context.config.publicPath +'favicon.ico'%>" type="image/x-icon" />
-  </head>
-  <body>
-    <noscript>
-      <div class="noscript-container">
-        Hi there! Please
-        <div class="noscript-enableJS">
-          <a href="https://www.enablejavascript.io/en" target="_blank" rel="noopener noreferrer">
-            <b>enable Javascript</b>
-          </a>
-        </div>
-        in your browser to use Ant Design, Out-of-the-box mid-stage front/design solution!
-      </div>
-    </noscript>
-    <div id="root">
-      <style>
-        html,
-        body,
-        #root {
-          height: 100%;
-          margin: 0;
-          padding: 0;
-        }
-        #root {
-          background-repeat: no-repeat;
-          background-size: 100% auto;
-        }
-        .noscript-container {
-          display: flex;
-          align-content: center;
-          justify-content: center;
-          margin-top: 90px;
-          font-size: 20px;
-          font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode',
-            Geneva, Verdana, sans-serif;
-        }
-        .noscript-enableJS {
-          padding-right: 3px;
-          padding-left: 3px;
-        }
-        .page-loading-warp {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          padding: 98px;
-        }
-        .ant-spin {
-          position: absolute;
-          display: none;
-          -webkit-box-sizing: border-box;
-          box-sizing: border-box;
-          margin: 0;
-          padding: 0;
-          color: rgba(0, 0, 0, 0.65);
-          color: #1890ff;
-          font-size: 14px;
-          font-variant: tabular-nums;
-          line-height: 1.5;
-          text-align: center;
-          list-style: none;
-          opacity: 0;
-          -webkit-transition: -webkit-transform 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86);
-          transition: -webkit-transform 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86);
-          transition: transform 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86);
-          transition: transform 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86),
-            -webkit-transform 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86);
-          -webkit-font-feature-settings: 'tnum';
-          font-feature-settings: 'tnum';
-        }
-
-        .ant-spin-spinning {
-          position: static;
-          display: inline-block;
-          opacity: 1;
-        }
-
-        .ant-spin-dot {
-          position: relative;
-          display: inline-block;
-          width: 20px;
-          height: 20px;
-          font-size: 20px;
-        }
-
-        .ant-spin-dot-item {
-          position: absolute;
-          display: block;
-          width: 9px;
-          height: 9px;
-          background-color: #1890ff;
-          border-radius: 100%;
-          -webkit-transform: scale(0.75);
-          -ms-transform: scale(0.75);
-          transform: scale(0.75);
-          -webkit-transform-origin: 50% 50%;
-          -ms-transform-origin: 50% 50%;
-          transform-origin: 50% 50%;
-          opacity: 0.3;
-          -webkit-animation: antspinmove 1s infinite linear alternate;
-          animation: antSpinMove 1s infinite linear alternate;
-        }
-
-        .ant-spin-dot-item:nth-child(1) {
-          top: 0;
-          left: 0;
-        }
-
-        .ant-spin-dot-item:nth-child(2) {
-          top: 0;
-          right: 0;
-          -webkit-animation-delay: 0.4s;
-          animation-delay: 0.4s;
-        }
-
-        .ant-spin-dot-item:nth-child(3) {
-          right: 0;
-          bottom: 0;
-          -webkit-animation-delay: 0.8s;
-          animation-delay: 0.8s;
-        }
-
-        .ant-spin-dot-item:nth-child(4) {
-          bottom: 0;
-          left: 0;
-          -webkit-animation-delay: 1.2s;
-          animation-delay: 1.2s;
-        }
-
-        .ant-spin-dot-spin {
-          -webkit-transform: rotate(45deg);
-          -ms-transform: rotate(45deg);
-          transform: rotate(45deg);
-          -webkit-animation: antrotate 1.2s infinite linear;
-          animation: antRotate 1.2s infinite linear;
-        }
-
-        .ant-spin-lg .ant-spin-dot {
-          width: 32px;
-          height: 32px;
-          font-size: 32px;
-        }
-
-        .ant-spin-lg .ant-spin-dot i {
-          width: 14px;
-          height: 14px;
-        }
-
-        @media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
-          .ant-spin-blur {
-            background: #fff;
-            opacity: 0.5;
-          }
-        }
-
-        @-webkit-keyframes antSpinMove {
-          to {
-            opacity: 1;
-          }
-        }
-
-        @keyframes antSpinMove {
-          to {
-            opacity: 1;
-          }
-        }
-
-        @-webkit-keyframes antRotate {
-          to {
-            -webkit-transform: rotate(405deg);
-            transform: rotate(405deg);
-          }
-        }
-
-        @keyframes antRotate {
-          to {
-            -webkit-transform: rotate(405deg);
-            transform: rotate(405deg);
-          }
-        }
-      </style>
-      <div
-        style="
-          display: flex;
-          flex-direction: column;
-          align-items: center;
-          justify-content: center;
-          height: 100%;
-          min-height: 420px;
-        "
-      >
-        <img src="<%= context.config.publicPath +'pro_icon.svg'%>" alt="logo" width="256" />
-        <div class="page-loading-warp">
-          <div class="ant-spin ant-spin-lg ant-spin-spinning">
-            <span class="ant-spin-dot ant-spin-dot-spin"
-              ><i class="ant-spin-dot-item"></i><i class="ant-spin-dot-item"></i
-              ><i class="ant-spin-dot-item"></i><i class="ant-spin-dot-item"></i
-            ></span>
-          </div>
-        </div>
-        <div style="display: flex; align-items: center; justify-content: center">
-          <img
-            src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg"
-            width="32"
-            style="margin-right: 8px"
-          />
-          Ant Design
-        </div>
-      </div>
-    </div>
-  </body>
-</html>

src/pages/guaranteeTask/Edit/BasicForm.jsx

@@ -1,9 +1,8 @@
 import React, { useState, useEffect } from 'react';
 import moment from 'moment';
-import { Link } from 'umi';
-import { history } from '@umijs/max';
+import { Link, useNavigate } from 'react-router-dom';
 import { Button, Row, Col, Form, Input, InputNumber, DatePicker, notification } from 'antd';
-import { addGuaranteeTask, updateGuaranteeTask } from '@/services/api/guaranteeTask';
+import { addGuaranteeTask, updateGuaranteeTask } from '@/services/guaranteeTask';
 
 const { TextArea } = Input;
 const { RangePicker } = DatePicker;
@@ -12,7 +11,8 @@ export default (props) => {
   const { dataSource, setDataSource } = props;
   const id = dataSource ? dataSource.id : undefined;
 
-  const [form] = Form.useForm()
+  const navigate = useNavigate();
+  const [form] = Form.useForm();
   const [rangeDate, setRangeDate] = useState([]);
   const [loading, setLoading] = useState(false);
 
@@ -200,7 +200,7 @@ export default (props) => {
       <Row gutter={48}>
         <Col offset={6} span={12}>
           <Button type="primary" htmlType="submit" loading={loading}>提交</Button>
-          <Button style={{ marginLeft: '48px' }} onClick={() => history.back()}>返回</Button>
+          <Button style={{ marginLeft: '48px' }} onClick={() => navigate(-1)}>返回</Button>
           <Button style={{ marginLeft: '48px' }}>
             <Link target="_blank" to={`/guaranteeTask/print?id=${id}`}>打印预览</Link>
           </Button>

src/pages/guaranteeTask/Edit/DishList.jsx

@@ -1,14 +1,14 @@
 import React, { useState, useEffect, useRef } from 'react';
 import { Row, Col, Card, Button, notification } from 'antd';
 import EditableTag from '@/components/EditableTag';
-import { getDishList } from '@/services/api/dish';
-import { getPackageList, getPackageDetailList } from '@/services/api/package';
+import { getDishList } from '@/services/dish';
+import { getPackageList, getPackageDetailList } from '@/services/package';
 import {
   updateGuaranteeTask,
   getGuaranteeDetailList,
   addGuaranteeDetailBatch,
   deleteGuaranteeDetail
-} from '@/services/api/guaranteeTask';
+} from '@/services/guaranteeTask';
 import Selector from './components/Selector';
 
 export default (props) => {

src/pages/guaranteeTask/Edit/index.jsx

@@ -1,8 +1,8 @@
 import React, { useState, useEffect } from 'react';
-import { useSearchParams } from '@umijs/max';
+import { useSearchParams } from 'react-router-dom';
 import { Tabs, Card } from 'antd';
 import { PageContainer } from '@ant-design/pro-components';
-import { getGuaranteeTask } from '@/services/api/guaranteeTask';
+import { getGuaranteeTask } from '@/services/guaranteeTask';
 import BasicForm from './BasicForm';
 import DishList from './DishList';
 

src/pages/guaranteeTask/index.jsx

@@ -1,13 +1,14 @@
-import { deleteGuaranteeTask, getGuaranteeTaskList } from '@/services/api/guaranteeTask';
+import { deleteGuaranteeTask, getGuaranteeTaskList } from '@/services/guaranteeTask';
 import { queryTable } from '@/utils/request';
 import { PageContainer, ProTable } from '@ant-design/pro-components';
-import { Link } from 'umi';
-import { history } from '@umijs/max';
+import { Link, useNavigate } from 'react-router-dom';
+
 import { Button, message, Popconfirm } from 'antd';
 import moment from 'moment';
 import { useRef, useState } from 'react';
 
 const GuaranteeTaskList = (props) => {
+  const navigate = useNavigate();
   const [isOpen, setIsOpen] = useState(false);
   const [modalData, setModalData] = useState({});
   // const [storeTypeDict, setStoreTypeDict] = useState([]);
@@ -78,7 +79,7 @@ const GuaranteeTaskList = (props) => {
           style={{ padding: 0 }}
           type="link"
           onClick={() => {
-            history.push(`/guaranteeTask/edit?id=${record.id}`);
+            navigate(`/task/guaranteeTask/edit?id=${record.id}`);
           }}
         >
           修改
@@ -101,7 +102,7 @@ const GuaranteeTaskList = (props) => {
           style={{ padding: 0 }}
           type="link"
         >
-          <Link target="_blank" to={`/guaranteeTask/print?id=${record.id}`}>打印</Link>
+          <Link target="_blank" to={`/task/guaranteeTask/print?id=${record.id}`}>打印</Link>
         </Button>,
       ],
     },

src/pages/guaranteeTask/print/index.jsx

@@ -1,9 +1,9 @@
 import React, { useRef, useState, useEffect } from 'react';
 import moment from 'moment';
 import { Button } from 'antd';
-import { useSearchParams } from '@umijs/max';
-import { getGuaranteeTask } from '@/services/api/guaranteeTask';
-import { getGuaranteeDetailList } from '@/services/api/guaranteeTask';
+import { useSearchParams } from 'react-router-dom';
+import { getGuaranteeTask } from '@/services/guaranteeTask';
+import { getGuaranteeDetailList } from '@/services/guaranteeTask';
 import Styles from './style.less';
 
 export default (props) => {

src/pages/User/Login/index.jsx → src/pages/login/index.jsx

@@ -1,11 +1,10 @@
-import Footer from '@/components/Footer';
-import { login } from '@/services/api/user';
-import { LockOutlined, UserOutlined } from '@ant-design/icons';
-import { LoginForm, ProFormText } from '@ant-design/pro-components';
-import { history, useModel } from '@umijs/max';
-import { Alert, message, Form, Button, Input } from 'antd';
 import { useState } from 'react';
+import { useNavigate, useParams } from "react-router-dom";
+import { login } from '@/services/user';
+import { LockOutlined, UserOutlined } from '@ant-design/icons';
+import { message, Form, Button, Input } from 'antd';
 import md5 from 'md5';
+import { useModel } from '@/store';
 import Logo from '@/assets/images/logo.png';
 import decorateLeft from '@/assets/images/login/装饰左.png';
 import decorateRight from '@/assets/images/login/装饰右.png';
@@ -14,9 +13,11 @@ import './index.less';
 const errStyle = {color: 'red', paddingBottom: '10px'}
 
 const Login = () => {
-  const [type, setType] = useState('account');
-  const { initialState, setInitialState } = useModel('@@initialState');
-  const [errMsg, setErrMsg] = useState()
+  const urlParams = useParams();
+  const { setUser } = useModel('user');
+  const [errMsg, setErrMsg] = useState();
+
+  const navigate = useNavigate();
 
   const handleSubmit = async (values) => {
     try {
@@ -27,22 +28,20 @@ const Login = () => {
       const defaultLoginSuccessMessage = '登录成功！';
       message.success(defaultLoginSuccessMessage);
       
-      setInitialState({
-        currentUser: res.user,
-      });
-      
-      const urlParams = new URL(window.location.href).searchParams;
-      history.push(urlParams.get('redirect') || '/');
-      return;
-
-      
+      setUser(res.user);      
+      if (urlParams.back) {
+        navigate(-1);
+      } else {
+        navigate('/');
+      }
+      return;      
     } catch (error) {
       console.log(error);
     }
   };
 
   return (
-    <div className="page-container">
+    <div className="login-container">
       <Form name="login" id="login" onFinish={handleSubmit}>
         <div className="form-left">
           <img src={Logo} />

src/pages/User/Login/index.less → src/pages/login/index.less

@@ -4,10 +4,10 @@ html, body {
   margin: 0;
 }
 
-.page-container {
+.login-container {
   width: 100%;
   height: 100%;
-  background-image: url(~@/assets/images/login/background.png);
+  background-image: url(@/assets/images/login/background.png);
   background-repeat: no-repeat;
   background-size: cover;
   display: flex;
@@ -26,7 +26,7 @@ html, body {
     .form-left {
       flex: 2;
       height: 480px;
-      background-image: url(~@/assets/images/login/小背景.png);
+      background-image: url(@/assets/images/login/小背景.png);
       background-color: transparent;
       background-repeat: no-repeat;
       background-size: cover;

src/pages/monitor/edit.jsx

@@ -1,43 +0,0 @@
-import {
-  ModalForm,
-  ProFormText,
-} from '@ant-design/pro-components';
-import { Button, Form, message } from 'antd';
-import { useEffect } from 'react';
-
-export default (props) => {
-  const { onSubmit, onCancel, dataSource = {}, visible } = props;
-  const [form] = Form.useForm();
-
-  const handleSubmit = (values) => {
-    if (typeof onSubmit === 'function') {
-      onSubmit({
-        status: '1',
-        ...(dataSource || {}),
-        ...values
-
-      })
-    }
-  }
-
-  useEffect(() => {
-    console.log('----------', dataSource.title)
-    form.setFieldsValue({ title: dataSource.title, url: dataSource.url })
-  }, [dataSource.title, dataSource.url, form])
-
-  return (
-    <ModalForm
-      title="新建表单"
-      visible={visible}
-      form={form}
-      modalProps={{
-        destroyOnClose: true,
-        onCancel: onCancel,
-      }}
-      onFinish={handleSubmit}
-    >
-      <ProFormText name="title" label="监控名称" />
-      <ProFormText name="url" label="视频地址" />
-    </ModalForm>
-  );
-};

src/pages/monitor/index.jsx

@@ -1,151 +0,0 @@
-import { deleteMonitor, getMonitorList, updataMonitor, addMonitor } from '@/services/api/monitor';
-import { queryTable } from '@/utils/request';
-import { PageContainer, ProTable } from '@ant-design/pro-components';
-import { history } from '@umijs/max';
-import { Button, message, Popconfirm } from 'antd';
-import { useRef, useState } from 'react';
-import EditForm from './edit'
-
-const List = (props) => {
-  console.log(props, '===');
-  const [visible, setVisible] = useState(false);
-  const [current, setCurrent] = useState({});
-  const [activeKey, setActiveKey] = useState('');
-  const actionRef = useRef();
-
-  const updata = (row) => {
-    if (row.id) {
-      updataMonitor(row.id, { status: row.status === '1' ? '2' : '1' }).then((res) => {
-        message.success('修改成功');
-        actionRef.current.reload();
-      });
-    }
-  };
-
-  const onSubmit = (values) => {
-    if (!Object.prototype.hasOwnProperty.call(values, 'id')) {
-      addMonitor(values).then((res) => {
-        setCurrent(res);
-        setVisible(false);
-        message.success('操作成功');
-        actionRef.current.reload();
-      })
-    } else {
-      updataMonitor(values.id, values).then((res) => {
-        setVisible(false);
-        message.success('操作成功');
-        actionRef.current.reload();
-      });
-    }
-  }
-
-  const handleDelete = (id) => {
-    if (id) {
-      deleteMonitor(id).then((res) => {
-        message.success('删除成功');
-        actionRef.current.reload();
-      });
-    }
-  };
-
-  const columns = [
-    {
-      title: 'id',
-      dataIndex: 'id',
-    },
-    {
-      title: '监控',
-      dataIndex: 'title',
-    },
-    {
-      title: '地址',
-      dataIndex: 'url',
-    },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      valueEnum: {
-        1: {
-          text: '上架',
-          status: 'Processing',
-        },
-        2: {
-          text: '下架',
-          status: 'Error',
-        },
-      },
-    },
-    {
-      title: '操作',
-      valueType: 'option',
-      width: 200,
-      render: (_, record) => [
-        <Button
-          key={1}
-          style={{ padding: 0 }}
-          type="link"
-          onClick={() => {
-            updata(record);
-          }}
-        >
-          {record.status === '1' ? '下架' : '上架'}
-        </Button>,
-        <Button
-          key={2}
-          style={{ padding: 0 }}
-          type="link"
-          onClick={() => {
-            setCurrent(record);
-            setVisible(true);
-          }}
-        >
-          编辑
-        </Button>,
-
-        <Popconfirm
-          key={3}
-          title="您是否确认删除 ?"
-          onConfirm={() => handleDelete(record.id)}
-          okText="确定"
-          cancelText="取消"
-        >
-          {/* manualPush */}
-          <Button style={{ padding: 0 }} type="link">
-            删除
-          </Button>
-        </Popconfirm>,
-      ],
-    },
-  ];
-
-  return (
-    <PageContainer>
-      <EditForm
-        visible={visible}
-        dataSource={current}
-        onCancel={() => setVisible(false)}
-        onSubmit={onSubmit}
-      />
-      <ProTable
-        // headerTitle={'中高风险地区库'}
-        search={false}
-        actionRef={actionRef}
-        rowKey="id"
-        toolBarRender={() => [
-          <Button
-            key="2"
-            type="primary"
-            onClick={() => { setCurrent({}); setVisible(true); }}
-          >
-            新增
-          </Button>,
-        ]}
-        // search={false}
-        request={queryTable(getMonitorList)}
-        columns={columns}
-      />
-    </PageContainer>
-  );
-};
-
-export default List;

src/pages/package/BasicForm.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { Button, Checkbox, Card, Form, Input, notification } from 'antd';
-import { addPackage, updataPackage } from '@/services/api/package';
+import { addPackage, updataPackage } from '@/services/package';
 
 export default (props) => {
   const { current, onChange } = props;

src/pages/package/DishList.jsx

@@ -1,8 +1,8 @@
 import React, { useEffect, useState, useRef } from 'react';
 import { Button, List, Popconfirm, Select } from 'antd';
 import classNames from 'classnames';
-import { getPackageDetailList, addPackageDetail, deletePackageDetail } from '@/services/api/package';
-import { getDishList } from '@/services/api/dish';
+import { getPackageDetailList, addPackageDetail, deletePackageDetail } from '@/services/package';
+import { getDishList } from '@/services/dish';
 
 const { Option } = Select;
 

src/pages/package/List.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useRef } from 'react';
 import { Row, Col, Button, List, Popconfirm, Input } from 'antd';
 import classNames from 'classnames';
-import { getPackageList, deletePackage } from '@/services/api/package';
+import { getPackageList, deletePackage } from '@/services/package';
 
 export default (props) => {
   const { current, setCurrent } = props;

src/pages/rotationChart/edit/index.jsx

@@ -1,7 +1,7 @@
 import UploadImage from '@/components/UploadImage';
 import UploadVideo from '@/components/UploadVideo';
 import UploadFile from '@/components/UploadFile';
-import { addBanner, getBannerdById, updataBanner } from '@/services/api/rotationChart';
+import { addBanner, getBannerdById, updataBanner } from '@/services/rotationChart';
 import {
   PageContainer,
   ProForm,
@@ -10,7 +10,7 @@ import {
   ProFormSelect,
   ProFormTextArea,
 } from '@ant-design/pro-components';
-import { history, useSearchParams } from '@umijs/max';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import { Card, Col, message, Row, Space, Image } from 'antd';
 import { useEffect, useRef, useState } from 'react';
 
@@ -20,6 +20,8 @@ export default (props) => {
   const [data, setData] = useState({});
   const [imgLabel, setImgLabel] = useState('图片');
   const formRef = useRef();
+  const navigate = useNavigate();
+
   useEffect(() => {
     if (id) {
       getBannerdById(id).then((res) => {
@@ -35,13 +37,13 @@ export default (props) => {
       // 修改
       updataBanner(id, { ...values }).then((res) => {
         message.success('修改成功');
-        history.back();
+        navigate(-1);
       });
     } else {
       // 新增
       addBanner({ ...values }).then((res) => {
         message.success('添加成功');
-        history.back();
+        navigate(-1);
       });
     }
 
@@ -62,7 +64,7 @@ export default (props) => {
             searchConfig: {
               resetText: '返回',
             },
-            onReset: () => history.back(),
+            onReset: () => navigate(-1),
             render: (props, doms) => {
               return (
                 <Row>

src/pages/rotationChart/list/index.jsx

@@ -1,7 +1,7 @@
-import { deleteBanner, getBannerList, updataBanner } from '@/services/api/rotationChart';
+import { deleteBanner, getBannerList, updataBanner } from '@/services/rotationChart';
 import { queryTable } from '@/utils/request';
 import { PageContainer, ProTable } from '@ant-design/pro-components';
-import { history } from '@umijs/max';
+import { useNavigate } from 'react-router-dom';
 import { Button, message, Popconfirm } from 'antd';
 import { useRef, useState } from 'react';
 
@@ -10,6 +10,7 @@ const RotationChartList = (props) => {
   const [showDetail, setShowDetail] = useState(false);
   const [activeKey, setActiveKey] = useState('');
   const actionRef = useRef();
+  const navigate = useNavigate();
 
   const updata = (row) => {
     if (row.id) {
@@ -97,7 +98,7 @@ const RotationChartList = (props) => {
           type="link"
           onClick={() => {
             console.log(record, ']]');
-            history.push(`/rotationChart/add?id=${record.id}`);
+            navigate(`/cms/rotationChart/add?id=${record.id}`);
           }}
         >
           编辑
@@ -131,7 +132,7 @@ const RotationChartList = (props) => {
             key="2"
             type="primary"
             onClick={() => {
-              history.push('/rotationChart/add');
+              navigate('/cms/rotationChart/edit');
             }}
           >
             新增