fix: 优化antdp-base 组件页和实例页

antdpro · Jun 9, 2023 · fe7ec86 · fe7ec86
1 parent 9395941
commit fe7ec86
Show file tree

Hide file tree

Showing 34 changed files with 1,542 additions and 1,008 deletions.
diff --git a/examples/antdp-base/.eslintignore b/examples/antdp-base/.eslintignore
@@ -0,0 +1,2 @@
+/config
+/src/pages/.umi/
diff --git a/examples/antdp-base/.eslintrc.js b/examples/antdp-base/.eslintrc.js
@@ -0,0 +1,14 @@
+module.exports = {
+  extends: [require.resolve('@umijs/fabric/dist/eslint'), 'eslint:recommended'],
+  // in antd-design-pro
+  globals: {
+    ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: true,
+    page: true,
+    REACT_APP_ENV: true,
+  },
+  plugins: ['prettier'],
+  rules: {
+    'prettier/prettier': 'error',
+    'no-unused-vars': 'error',
+  },
+};
diff --git a/examples/antdp-base/.prettierrc b/examples/antdp-base/.prettierrc
diff --git a/examples/antdp-base/.prettierrc.js b/examples/antdp-base/.prettierrc.js
@@ -0,0 +1,5 @@
+const fabric = require('@umijs/fabric');
+
+module.exports = {
+  ...fabric.prettier,
+};
diff --git a/examples/antdp-base/.stylelintrc.js b/examples/antdp-base/.stylelintrc.js
@@ -0,0 +1,6 @@
+module.exports = {
+  extends: [require.resolve('@umijs/fabric/dist/stylelint')],
+  rules: {
+    // your rules
+  },
+};
diff --git a/examples/antdp-base/config/config.js b/examples/antdp-base/config/config.js
@@ -10,9 +10,9 @@ export default config(router, {
     // 是否显示 head头部
     // ANTD_HEAD_IS_SHOW: false,
     // 是否展示tab栏
-    ANTD_IS_TABS: true,
+    ANTD_IS_TABS: false,
     // 是否展示面包屑
-    ANTD_IS_BREADCRUMB: false,
+    ANTD_IS_BREADCRUMB: true,
     ANTD_AUTH_CONF: {
       auth_menu: 'authMenu',
       auth_btn: 'authBtn',

diff --git a/examples/antdp-base/config/router.json b/examples/antdp-base/config/router.json
@@ -37,28 +37,28 @@
         "icon": "form",
         "routes": [
           {
-            "path": "/components/quickform",
-            "name": "快速表单",
-            "locale": "quickform",
-            "component": "@/pages/Components/QuickForm"
+            "path": "/components/proform",
+            "name": "ProForm",
+            "locale": "proform",
+            "component": "@/pages/Components/ProForm"
           },
           {
-            "path": "/components/formdetail",
-            "name": "详情表单",
-            "locale": "formdetail",
-            "component": "@/pages/Components/FormDetail"
+            "path": "/components/proDescriptions",
+            "name": "ProDescriptions",
+            "locale": "proDescriptions",
+            "component": "@/pages/Components/ProDescriptions"
           },
           {
-            "path": "/components/edittable",
-            "name": "编辑表格",
-            "locale": "edittable",
-            "component": "@/pages/Components/EditTable"
+            "path": "/components/editableProTable",
+            "name": "EditableProTable",
+            "locale": "editableProTable",
+            "component": "@/pages/Components/EditableProTable"
           },
           {
-            "path": "/components/proform",
-            "name": "ProForm",
-            "locale": "proform",
-            "component": "@/pages/Components/ProForm"
+            "path": "/components/quickform",
+            "name": "快速表单",
+            "locale": "quickform",
+            "component": "@/pages/Components/QuickForm"
           }
         ]
       },
@@ -68,18 +68,6 @@
         "icon": "table",
         "locale": "list",
         "routes": [
-          {
-            "path": "/list/basiclist",
-            "name": "基础列表",
-            "locale": "basiclist",
-            "component": "@/pages/List/BasicList"
-          },
-          {
-            "path": "/list/cardlist",
-            "name": "卡片列表",
-            "locale": "cardlist",
-            "component": "@/pages/List/CardList"
-          },
           {
             "path": "/list/tablelist",
             "name": "ProTable",
@@ -91,6 +79,18 @@
             "name": "ProList",
             "locale": "prolist",
             "component": "@/pages/List/ProList"
+          },
+          {
+            "path": "/list/basiclist",
+            "name": "基础列表",
+            "locale": "basiclist",
+            "component": "@/pages/List/BasicList"
+          },
+          {
+            "path": "/list/cardlist",
+            "name": "卡片列表",
+            "locale": "cardlist",
+            "component": "@/pages/List/CardList"
           }
         ]
       },

diff --git a/examples/antdp-base/mock/api.js b/examples/antdp-base/mock/api.js
@@ -41,7 +41,7 @@ export default {
       list[i] = {
         id: i,
         name: '霞仔',
-        title: '16',
+        age: '16',
         address: '上海市',
       };
     }
@@ -240,40 +240,35 @@ export default {
           avatar: 'https://xsgames.co/randomusers/avatar.php?g=pixel',
           title: 'Card title',
           descriptio: 'antdp 好用',
-          image:
-            'https://gw.alipayobjects.com/zos/rmsportal/JiqGstEfoWAOHiTxclqi.png',
+          image: 'https://gw.alipayobjects.com/zos/rmsportal/JiqGstEfoWAOHiTxclqi.png',
         },
         {
           id: 'trend-2',
           avatar: 'https://xsgames.co/randomusers/avatar.php?g=pixel',
           title: 'Card title',
           descriptio: 'antdp 好用',
-          image:
-            'https://gw.alipayobjects.com/zos/rmsportal/JiqGstEfoWAOHiTxclqi.png',
+          image: 'https://gw.alipayobjects.com/zos/rmsportal/JiqGstEfoWAOHiTxclqi.png',
         },
         {
           id: 'trend-3',
           avatar: 'https://xsgames.co/randomusers/avatar.php?g=pixel',
           title: 'Card title',
           descriptio: 'antdp 好用',
-          image:
-            'https://gw.alipayobjects.com/zos/rmsportal/JiqGstEfoWAOHiTxclqi.png',
+          image: 'https://gw.alipayobjects.com/zos/rmsportal/JiqGstEfoWAOHiTxclqi.png',
         },
         {
           id: 'trend-4',
           avatar: 'https://xsgames.co/randomusers/avatar.php?g=pixel',
           title: 'Card title',
           descriptio: 'antdp 好用',
-          image:
-            'https://gw.alipayobjects.com/zos/rmsportal/JiqGstEfoWAOHiTxclqi.png',
+          image: 'https://gw.alipayobjects.com/zos/rmsportal/JiqGstEfoWAOHiTxclqi.png',
         },
         {
           id: 'trend-5',
           avatar: 'https://xsgames.co/randomusers/avatar.php?g=pixel',
           title: 'Card title',
           descriptio: 'antdp 好用',
-          image:
-            'https://gw.alipayobjects.com/zos/rmsportal/JiqGstEfoWAOHiTxclqi.png',
+          image: 'https://gw.alipayobjects.com/zos/rmsportal/JiqGstEfoWAOHiTxclqi.png',
         },
       ],
     });

diff --git a/examples/antdp-base/mock/login.js b/examples/antdp-base/mock/login.js
@@ -4,10 +4,10 @@ const menus = [
   '/chart',
   '/dashboard',
   '/components',
-  '/components/quickform',
-  '/components/formdetail',
-  '/components/edittable',
   '/components/proform',
+  '/components/proDescriptions',
+  '/components/editableProTable',
+  '/components/quickform',
   '/list',
   '/list/basiclist',
   '/list/cardlist',

diff --git a/examples/antdp-base/package.json b/examples/antdp-base/package.json
@@ -5,31 +5,25 @@
     "start": "max dev",
     "build": "max build",
     "umiinstall": "max setup",
-    "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
+    "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
+    "precommit": "npm run lint",
+    "lint-staged": "lint-staged"
   },
   "lint-staged": {
+    "**/*.{js,jsx,ts,tsx}": "eslint --fix",
     "*.{js,jsx,less,md,json}": [
       "prettier --write"
     ]
   },
   "dependencies": {
-    "@ant-design/pro-form": "1.74.7",
+    "@ant-design/pro-components": "^2.4.14",
     "@antdp/antdp-ui": "2.0.16",
-    "@antdp/edit-table": "2.0.16",
     "@antdp/authorized": "2.0.16",
     "@antdp/basic-layouts": "2.0.16",
     "@antdp/hooks": "2.0.16",
-    "@antdp/page-loading": "2.0.16",
     "@antdp/request": "2.0.16",
-    "@antdp/user-login": "2.0.16",
     "ahooks": "~3.7.2",
     "antd": "5.4.7",
-    "rc-field-form": "~1.27.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
@@ -44,9 +38,15 @@
   "devDependencies": {
     "@antdp/config": "2.0.16",
     "@antdp/dependencies": "2.0.16",
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.0",
+    "@umijs/fabric": "~2.14.1",
     "@umijs/max": "~4.0.47",
     "@umijs/plugin-model": "~2.6.2",
-    "lint-staged": "~13.0.4",
-    "prettier": "2.8.1"
+    "eslint-plugin-jest": "^27.2.1",
+    "eslint-plugin-prettier": "~4.2.1",
+    "eslint-plugin-unicorn": "^47.0.0",
+    "husky": "~8.0.3",
+    "lint-staged": "~13.2.2"
   }
 }
diff --git a/examples/antdp-base/src/locales/en-US/menu.js b/examples/antdp-base/src/locales/en-US/menu.js
@@ -4,8 +4,8 @@ export default {
   'menu.dashboard': 'dashboard',
   'menu.components': 'components pages',
   'menu.components.quickform': 'quickform',
-  'menu.components.formdetail': 'formdetail',
-  'menu.components.edittable': 'edittable',
+  'menu.components.proDescriptions': 'proDescriptions',
+  'menu.components.editableProTable': 'editableProTable',
   'menu.components.proform': 'proform',
   'menu.list': 'list pages',
   'menu.list.basiclist': 'basiclist',

diff --git a/examples/antdp-base/src/locales/zh-CN/menu.js b/examples/antdp-base/src/locales/zh-CN/menu.js
@@ -4,8 +4,8 @@ export default {
   'menu.dashboard': '页面实例',
   'menu.components': '组件页',
   'menu.components.quickform': '快速表单',
-  'menu.components.formdetail': '详情表单',
-  'menu.components.edittable': '编辑表格',
+  'menu.components.proDescriptions': 'ProDescriptions',
+  'menu.components.editableProTable': 'EditableProTable',
   'menu.components.proform': 'ProForm',
   'menu.list': '列表页',
   'menu.list.basiclist': '基础列表',

diff --git a/examples/antdp-base/src/models/demo.js b/examples/antdp-base/src/models/demo.js