diff --git a/AdvancedForm/.umirc.js b/AdvancedForm/.umirc.js
deleted file mode 100644
index 545b4c7a99507a4973cd944fc2eafbd612ead8ef..0000000000000000000000000000000000000000
--- a/AdvancedForm/.umirc.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export default {
-  plugins: [
-    ['umi-plugin-block-dev', {
-      layout: 'ant-design-pro',
-    }],
-    ['umi-plugin-react', {
-      dva: true,
-      locale: true,
-      antd: true,
-    }]
-  ],
-}
diff --git a/Analysis/.umirc.js b/Analysis/.umirc.js
deleted file mode 100644
index 545b4c7a99507a4973cd944fc2eafbd612ead8ef..0000000000000000000000000000000000000000
--- a/Analysis/.umirc.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export default {
-  plugins: [
-    ['umi-plugin-block-dev', {
-      layout: 'ant-design-pro',
-    }],
-    ['umi-plugin-react', {
-      dva: true,
-      locale: true,
-      antd: true,
-    }]
-  ],
-}
diff --git a/Analysis/package.json b/Analysis/package.json
index ff98c471a699020fbafb3a1c0b17cf9d43c4fc49..d73b4cb2134d454acd250daec15231fb11a44e9d 100644
--- a/Analysis/package.json
+++ b/Analysis/package.json
@@ -12,6 +12,7 @@
     "dev": "umi dev"
   },
   "dependencies": {
+    "@ant-design/pro-layout": "^4.0.5",
     "@antv/data-set": "^0.10.2",
     "@types/numeral": "^0.0.25",
     "antd": "^3.10.9",
@@ -29,4 +30,4 @@
     "umi-plugin-block-dev": "^1.1.0",
     "umi-plugin-react": "^1.7.2"
   }
-}
+}
\ No newline at end of file
diff --git a/BasicForm/.umirc.js b/BasicForm/.umirc.js
deleted file mode 100644
index 545b4c7a99507a4973cd944fc2eafbd612ead8ef..0000000000000000000000000000000000000000
--- a/BasicForm/.umirc.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export default {
-  plugins: [
-    ['umi-plugin-block-dev', {
-      layout: 'ant-design-pro',
-    }],
-    ['umi-plugin-react', {
-      dva: true,
-      locale: true,
-      antd: true,
-    }]
-  ],
-}
diff --git a/BasicList/.umirc.js b/BasicList/.umirc.js
deleted file mode 100644
index 545b4c7a99507a4973cd944fc2eafbd612ead8ef..0000000000000000000000000000000000000000
--- a/BasicList/.umirc.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export default {
-  plugins: [
-    ['umi-plugin-block-dev', {
-      layout: 'ant-design-pro',
-    }],
-    ['umi-plugin-react', {
-      dva: true,
-      locale: true,
-      antd: true,
-    }]
-  ],
-}
diff --git a/BasicProfile/.umirc.js b/BasicProfile/.umirc.js
deleted file mode 100644
index 545b4c7a99507a4973cd944fc2eafbd612ead8ef..0000000000000000000000000000000000000000
--- a/BasicProfile/.umirc.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export default {
-  plugins: [
-    ['umi-plugin-block-dev', {
-      layout: 'ant-design-pro',
-    }],
-    ['umi-plugin-react', {
-      dva: true,
-      locale: true,
-      antd: true,
-    }]
-  ],
-}
diff --git a/BasicProfile/package.json b/BasicProfile/package.json
index ed1a15ed684e7e437628381337c970bc0780eb4a..93dc636e7bd39eea7fd97daa8211299c407ea4f0 100644
--- a/BasicProfile/package.json
+++ b/BasicProfile/package.json
@@ -11,7 +11,7 @@
     "url": "https://github.com/umijs/umi-blocks/ant-design-pro/basicprofile"
   },
   "dependencies": {
-    "ant-design-pro": "^2.1.1",
+    "@ant-design/pro-layout": "^4.0.5",
     "antd": "^3.10.9",
     "dva": "^2.4.0",
     "react": "^16.6.3",
@@ -23,4 +23,4 @@
     "umi-plugin-block-dev": "^1.0.0"
   },
   "license": "ISC"
-}
+}
\ No newline at end of file
diff --git a/CardList/.umirc.js b/CardList/.umirc.js
deleted file mode 100644
index 545b4c7a99507a4973cd944fc2eafbd612ead8ef..0000000000000000000000000000000000000000
--- a/CardList/.umirc.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export default {
-  plugins: [
-    ['umi-plugin-block-dev', {
-      layout: 'ant-design-pro',
-    }],
-    ['umi-plugin-react', {
-      dva: true,
-      locale: true,
-      antd: true,
-    }]
-  ],
-}
diff --git a/CardList/package.json b/CardList/package.json
index 9f43492dd0595fbace32772a2cbad792e7b33311..1ac8514d2d36928ea47f2cdc2258620f324543cb 100644
--- a/CardList/package.json
+++ b/CardList/package.json
@@ -11,6 +11,7 @@
     "url": "https://github.com/umijs/umi-blocks/ant-design-pro/cardlist"
   },
   "dependencies": {
+    "@ant-design/pro-layout": "^4.0.5",
     "ant-design-pro": "^2.1.1",
     "antd": "^3.10.9",
     "dva": "^2.4.0",
@@ -23,4 +24,4 @@
     "umi-plugin-block-dev": "^1.0.0"
   },
   "license": "ISC"
-}
+}
\ No newline at end of file
diff --git a/Exception403/.umirc.js b/Exception403/.umirc.js
deleted file mode 100644
index e6e79ab6a2b871d1781de8ecf9843c00849ae065..0000000000000000000000000000000000000000
--- a/Exception403/.umirc.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export default {
-  plugins: [
-    ['umi-plugin-block-dev', { layout: 'ant-design-pro', }],
-    ['umi-plugin-react', {
-      dva: true,
-      locale: true,
-      antd: true,
-    }]
-  ],
-}
diff --git a/Exception403/package.json b/Exception403/package.json
index 1c2a3a3550e2abf402d6c2a9532e9deb7d287479..88293ebced21e50df47d7ec9512f581f4d0989e0 100644
--- a/Exception403/package.json
+++ b/Exception403/package.json
@@ -16,10 +16,11 @@
     "react": "^16.6.3",
     "umi-request": "^1.0.4",
     "umi": "^2.6.8",
+    "@ant-design/pro-layout": "^4.0.5",
     "umi-plugin-react": "^1.7.2"
   },
   "devDependencies": {
     "umi-plugin-block-dev": "^1.3.0"
   },
   "license": "MIT"
-}
+}
\ No newline at end of file
diff --git a/Exception404/.umirc.js b/Exception404/.umirc.js
deleted file mode 100644
index 218e63be0626108feb8df1944a56ac016d287b25..0000000000000000000000000000000000000000
--- a/Exception404/.umirc.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export default {
-  plugins: [
-    ['umi-plugin-block-dev', {layout: 'ant-design-pro',}],
-    ['umi-plugin-react', {
-      dva: true,
-      locale: true,
-      antd: true,
-    }]
-  ],
-}
diff --git a/Monitor/.umirc.js b/Monitor/.umirc.js
deleted file mode 100644
index 70ab1e9b79813e2a091d036d763edc262cdf23bf..0000000000000000000000000000000000000000
--- a/Monitor/.umirc.js
+++ /dev/null
@@ -1,18 +0,0 @@
-export default {
-  plugins: [
-    [
-      'umi-plugin-block-dev',
-      {
-        layout: 'ant-design-pro',
-      },
-    ],
-    [
-      'umi-plugin-react',
-      {
-        dva: true,
-        locale: true,
-        antd: true,
-      },
-    ],
-  ],
-};
diff --git a/Monitor/package.json b/Monitor/package.json
index 5ef67d7905378993e75289aca3fada30f55222a9..181a2a21497f06610e5f0de24c993651e722a789 100644
--- a/Monitor/package.json
+++ b/Monitor/package.json
@@ -11,7 +11,6 @@
     "url": "https://github.com/umijs/umi-blocks/ant-design-pro/monitor"
   },
   "dependencies": {
-    "ant-design-pro": "^2.1.1",
     "antd": "^3.10.9",
     "dva": "^2.4.0",
     "numeral": "^2.0.6",
@@ -25,4 +24,4 @@
     "umi-plugin-block-dev": "^1.0.0"
   },
   "license": "ISC"
-}
+}
\ No newline at end of file
diff --git a/ResultFail/.umirc.js b/ResultFail/.umirc.js
deleted file mode 100644
index 545b4c7a99507a4973cd944fc2eafbd612ead8ef..0000000000000000000000000000000000000000
--- a/ResultFail/.umirc.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export default {
-  plugins: [
-    ['umi-plugin-block-dev', {
-      layout: 'ant-design-pro',
-    }],
-    ['umi-plugin-react', {
-      dva: true,
-      locale: true,
-      antd: true,
-    }]
-  ],
-}
diff --git a/ResultFail/package.json b/ResultFail/package.json
index a6a7b35a09e64b02fcd9c03ef909072caf3a4736..a524f7bd3dadda7577fd3509025fd5e3c31b3de2 100644
--- a/ResultFail/package.json
+++ b/ResultFail/package.json
@@ -11,6 +11,7 @@
     "url": "https://github.com/umijs/umi-blocks/ant-design-pro/resultfail"
   },
   "dependencies": {
+    "@ant-design/pro-layout": "^4.0.5",
     "react": "^16.6.3",
     "antd": "^3.10.9",
     "ant-design-pro": "^2.1.1"
@@ -21,4 +22,4 @@
     "umi-plugin-block-dev": "^1.0.0"
   },
   "license": "ISC"
-}
+}
\ No newline at end of file
diff --git a/ResultSuccess/.umirc.js b/ResultSuccess/.umirc.js
deleted file mode 100644
index 545b4c7a99507a4973cd944fc2eafbd612ead8ef..0000000000000000000000000000000000000000
--- a/ResultSuccess/.umirc.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export default {
-  plugins: [
-    ['umi-plugin-block-dev', {
-      layout: 'ant-design-pro',
-    }],
-    ['umi-plugin-react', {
-      dva: true,
-      locale: true,
-      antd: true,
-    }]
-  ],
-}
diff --git a/ResultSuccess/package.json b/ResultSuccess/package.json
index 86e3a72413aaaccc2c0af08b0984c27941c01f6c..b36d8616aeca90f0f82b86b07d823c800fca6995 100644
--- a/ResultSuccess/package.json
+++ b/ResultSuccess/package.json
@@ -12,8 +12,7 @@
   },
   "dependencies": {
     "react": "^16.6.3",
-    "antd": "^3.10.9",
-    "ant-design-pro": "^2.1.1"
+    "antd": "^3.10.9"
   },
   "devDependencies": {
     "umi": "^2.6.9",
@@ -21,4 +20,4 @@
     "umi-plugin-block-dev": "^1.0.0"
   },
   "license": "ISC"
-}
+}
\ No newline at end of file
diff --git a/SearchListApplications/.umirc.js b/SearchListApplications/.umirc.js
deleted file mode 100644
index 545b4c7a99507a4973cd944fc2eafbd612ead8ef..0000000000000000000000000000000000000000
--- a/SearchListApplications/.umirc.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export default {
-  plugins: [
-    ['umi-plugin-block-dev', {
-      layout: 'ant-design-pro',
-    }],
-    ['umi-plugin-react', {
-      dva: true,
-      locale: true,
-      antd: true,
-    }]
-  ],
-}
diff --git a/SearchListApplications/package.json b/SearchListApplications/package.json
index b0b7f012a60edb7e659ae2ff34a712a2189eaad0..8dd5dcd814e34eafe3ac5a3d64eeeb94adfa0ab6 100644
--- a/SearchListApplications/package.json
+++ b/SearchListApplications/package.json
@@ -11,7 +11,6 @@
     "url": "https://github.com/umijs/umi-blocks/ant-design-pro/searchlistapplications"
   },
   "dependencies": {
-    "ant-design-pro": "^2.1.1",
     "antd": "^3.10.9",
     "classnames": "^2.2.6",
     "dva": "^2.4.0",
@@ -28,4 +27,4 @@
     "umi-plugin-block-dev": "^1.0.0"
   },
   "license": "ISC"
-}
+}
\ No newline at end of file
diff --git a/SearchListArticles/.umirc.js b/SearchListArticles/.umirc.js
deleted file mode 100644
index 545b4c7a99507a4973cd944fc2eafbd612ead8ef..0000000000000000000000000000000000000000
--- a/SearchListArticles/.umirc.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export default {
-  plugins: [
-    ['umi-plugin-block-dev', {
-      layout: 'ant-design-pro',
-    }],
-    ['umi-plugin-react', {
-      dva: true,
-      locale: true,
-      antd: true,
-    }]
-  ],
-}
diff --git a/SearchListArticles/package.json b/SearchListArticles/package.json
index 599c2968d52891841bf2ba93c03e25b426aa12f5..9fb68ae58e443141b979202d68c37acac0239b25 100644
--- a/SearchListArticles/package.json
+++ b/SearchListArticles/package.json
@@ -11,7 +11,6 @@
     "url": "https://github.com/umijs/umi-blocks/ant-design-pro/searchlistarticles"
   },
   "dependencies": {
-    "ant-design-pro": "^2.1.1",
     "antd": "^3.10.9",
     "classnames": "^2.2.6",
     "dva": "^2.4.0",
@@ -25,4 +24,4 @@
     "umi-plugin-block-dev": "^1.0.0"
   },
   "license": "ISC"
-}
+}
\ No newline at end of file
diff --git a/SearchListProjects/.umirc.js b/SearchListProjects/.umirc.js
deleted file mode 100644
index 545b4c7a99507a4973cd944fc2eafbd612ead8ef..0000000000000000000000000000000000000000
--- a/SearchListProjects/.umirc.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export default {
-  plugins: [
-    ['umi-plugin-block-dev', {
-      layout: 'ant-design-pro',
-    }],
-    ['umi-plugin-react', {
-      dva: true,
-      locale: true,
-      antd: true,
-    }]
-  ],
-}
diff --git a/SearchListProjects/package.json b/SearchListProjects/package.json
index 441cc04f698741a06b5c76e271554087fa826bce..85dda4f6d1bd102bbc4d46977e87039ee362ebcd 100644
--- a/SearchListProjects/package.json
+++ b/SearchListProjects/package.json
@@ -11,7 +11,6 @@
     "url": "https://github.com/umijs/umi-blocks/ant-design-pro/searchlistprojects"
   },
   "dependencies": {
-    "ant-design-pro": "^2.1.1",
     "antd": "^3.10.9",
     "classnames": "^2.2.6",
     "dva": "^2.4.0",
@@ -25,4 +24,4 @@
     "umi-plugin-block-dev": "^1.0.0"
   },
   "license": "ISC"
-}
+}
\ No newline at end of file
diff --git a/StepForm/.umirc.js b/StepForm/.umirc.js
deleted file mode 100644
index 545b4c7a99507a4973cd944fc2eafbd612ead8ef..0000000000000000000000000000000000000000
--- a/StepForm/.umirc.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export default {
-  plugins: [
-    ['umi-plugin-block-dev', {
-      layout: 'ant-design-pro',
-    }],
-    ['umi-plugin-react', {
-      dva: true,
-      locale: true,
-      antd: true,
-    }]
-  ],
-}
diff --git a/StepForm/package.json b/StepForm/package.json
index a1b07ec193e42cc0f0671459356546260bb83a33..58301d1887d428a8eefd4ccd4e0d1431ea737ec0 100644
--- a/StepForm/package.json
+++ b/StepForm/package.json
@@ -11,7 +11,6 @@
     "url": "https://github.com/umijs/umi-blocks/ant-design-pro/stepform"
   },
   "dependencies": {
-    "ant-design-pro": "^2.1.1",
     "antd": "^3.10.9",
     "dva": "^2.4.0",
     "react": "^16.6.3",
@@ -24,4 +23,4 @@
     "umi-plugin-block-dev": "^1.0.0"
   },
   "license": "ISC"
-}
+}
\ No newline at end of file
diff --git a/TableList/.umirc.js b/TableList/.umirc.js
deleted file mode 100644
index 545b4c7a99507a4973cd944fc2eafbd612ead8ef..0000000000000000000000000000000000000000
--- a/TableList/.umirc.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export default {
-  plugins: [
-    ['umi-plugin-block-dev', {
-      layout: 'ant-design-pro',
-    }],
-    ['umi-plugin-react', {
-      dva: true,
-      locale: true,
-      antd: true,
-    }]
-  ],
-}
diff --git a/TableList/package.json b/TableList/package.json
index fb526910b6afe19278ffbeb73b38690ad2b4be87..0c6f62c23edc5a4d1c7c68040f95db5cae8871c3 100644
--- a/TableList/package.json
+++ b/TableList/package.json
@@ -11,7 +11,6 @@
     "url": "https://github.com/umijs/umi-blocks/ant-design-pro/tablelist"
   },
   "dependencies": {
-    "ant-design-pro": "^2.1.1",
     "antd": "^3.10.9",
     "dva": "^2.4.0",
     "moment": "^2.22.2",
@@ -24,4 +23,4 @@
     "umi-plugin-block-dev": "^1.0.0"
   },
   "license": "ISC"
-}
+}
\ No newline at end of file
diff --git a/UserLogin/.umirc.js b/UserLogin/.umirc.js
deleted file mode 100644
index ed8db9a149035779b8d35bb8f32ce6b8b0052aad..0000000000000000000000000000000000000000
--- a/UserLogin/.umirc.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export default {
-  plugins: [
-    ['umi-plugin-block-dev', {
-      layout: 'ant-design-pro-user',
-    }],
-    ['umi-plugin-react', {
-      dva: true,
-      locale: true,
-      antd: true,
-    }]
-  ],
-}
diff --git a/Workplace/.umirc.js b/Workplace/.umirc.js
deleted file mode 100644
index d85d9819c2767f6c90c44aa787703a23475c4b01..0000000000000000000000000000000000000000
--- a/Workplace/.umirc.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export default {
-  plugins: [
-    ['umi-plugin-block-dev', {
-      layout: 'ant-design-pro',
-    }],
-    ['umi-plugin-react', {
-      dva: true,
-      locale: true,
-      antd: true,
-    }],
-  ],
-};