feats

config/config.js

@@ -44,7 +44,7 @@ export default defineConfig({
     // 如果不想要 configProvide 动态设置主题需要把这个设置为 default
     // 只有设置为 variable， 才能使用 configProvide 动态设置主色调
     // https://ant.design/docs/react/customize-theme-variable-cn
-    'root-entry-name': 'default' // 'variable',
+    'root-entry-name': 'variable',
   },
   ignoreMomentLocale: true,
   proxy: proxy[REACT_APP_ENV || 'dev'],

package.json

@@ -27,8 +27,6 @@
     "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"
   },
@@ -45,9 +43,8 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-components": "1.1.1",
-    "@ant-design/pro-layout": "^6.38.13",
-    "@umijs/route-utils": "^2.0.0",
+    "@ant-design/pro-components": "^2.0.0",
+    "@umijs/route-utils": "^2.1.3",
     "antd": "^4.20.0",
     "classnames": "^2.3.0",
     "lodash": "^4.17.0",
@@ -66,7 +63,6 @@
     "@types/classnames": "^2.3.1",
     "@types/express": "^4.17.0",
     "@types/history": "^4.7.0",
-    "@types/jest": "^26.0.0",
     "@types/lodash": "^4.14.0",
     "@types/react": "^17.0.0",
     "@types/react-dom": "^17.0.0",
@@ -80,7 +76,6 @@
     "eslint": "^7.32.0",
     "gh-pages": "^3.2.0",
     "husky": "^7.0.4",
-    "jsdom-global": "^3.0.0",
     "lint-staged": "^10.0.0",
     "mockjs": "^1.1.0",
     "prettier": "^2.5.0",
@@ -91,5 +86,34 @@
   },
   "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"
+    ]
   }
 }

src/app.jsx

@@ -1,5 +1,6 @@
 import { requestConfig } from '@/utils/request';
 import { history } from '@umijs/max';
+import { SettingDrawer } from '@ant-design/pro-components';
 import defaultSettings from '../config/defaultSettings';
 
 const isDev = process.env.NODE_ENV === 'development';
@@ -36,17 +37,17 @@ export async function getInitialState() {
 
 // ProLayout 支持的api https://procomponents.ant.design/components/layout
 export const layout = ({ initialState, setInitialState }) => {
-  return {
+  const cfg = {
     // rightContentRender: () => <RightContent />,
     disableContentMargin: false,
     token: {
       sider: {
-        menuBackgroundColor: '#001529',
-        menuTitleTextColor: '#fff',
-        menuTextColor: 'hsla(0,0%,100%,.65);',
-        menuSubArrowColor: '#fff',
-        menuItemSelectedBgColor: '#1890ff',
-        menuSelectedTextColor: '#fff',
+        colorMenuBackground: '#001529',
+        colorTextMenuTitle: '#fff',
+        colorTextMenu: 'hsla(0,0%,100%,.65);',
+        colorBgMenuItemHover: '#fff',
+        colorBgMenuItemSelected: '#1890ff',
+        colorTextMenuSelected: '#fff',
       },
     },
     // waterMarkProps: {
@@ -75,11 +76,32 @@ export const layout = ({ initialState, setInitialState }) => {
     // 增加一个 loading 的状态
     childrenRender: (children, props) => {
       // if (initialState?.loading) return <PageLoading />;
-      return <>{children}</>;
+      return (
+        <>
+          {children}
+          {/* {!props.location?.pathname?.includes('/login') && (
+            <SettingDrawer
+              disableUrlParams
+              enableDarkTheme
+              settings={initialState?.settings}
+              onSettingChange={(settings) => {
+                setInitialState((preInitialState) => ({
+                  ...preInitialState,
+                  settings,
+                }));
+              }}
+            />
+          )} */}
+        </>
+      );
     },
 
-    ...initialState?.settings,
+    settings: initialState?.settings,
   };
+
+  console.log(cfg)
+
+  return cfg;
 };
 
 export const request = requestConfig;

src/pages/package/index.jsx

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { PageContainer } from '@ant-design/pro-components';
-import { Row, Col } from 'antd';
+import { Row, Col, Card } from 'antd';
 import List from './List';
 import BasicForm from './BasicForm';
 import DishList from './DishList';
@@ -12,17 +12,19 @@ export default (props) => {
 
   return (
     <PageContainer>
-      <Row gutter={100}>
-        <Col span={8}>
-          <List current={current} setCurrent={setCurrent}/>
-        </Col>
-        <Col span={8}>
-          <BasicForm current={current} onChange={it => setCurrent(it)} />
-          <div style={{ marginTop: '100px' }}>
-            <DishList />
-          </div>
-        </Col>
-      </Row>
+      <Card>
+        <Row gutter={100}>
+          <Col span={8}>
+            <List current={current} setCurrent={setCurrent}/>
+          </Col>
+          <Col span={8}>
+            <BasicForm current={current} onChange={it => setCurrent(it)} />
+            <div style={{ marginTop: '100px' }}>
+              <DishList />
+            </div>
+          </Col>
+        </Row>
+      </Card>
     </PageContainer>
   )
 }