From 4e752faf8591bab2bbdf2579b51a83875a347c4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B8=85?= Date: Tue, 16 Apr 2019 17:43:15 +0800 Subject: [PATCH] remove umirc --- AdvancedForm/.umirc.js | 12 ------------ Analysis/.umirc.js | 12 ------------ Analysis/package.json | 3 ++- BasicForm/.umirc.js | 12 ------------ BasicList/.umirc.js | 12 ------------ BasicProfile/.umirc.js | 12 ------------ BasicProfile/package.json | 4 ++-- CardList/.umirc.js | 12 ------------ CardList/package.json | 3 ++- Exception403/.umirc.js | 10 ---------- Exception403/package.json | 3 ++- Exception404/.umirc.js | 10 ---------- Monitor/.umirc.js | 18 ------------------ Monitor/package.json | 3 +-- ResultFail/.umirc.js | 12 ------------ ResultFail/package.json | 3 ++- ResultSuccess/.umirc.js | 12 ------------ ResultSuccess/package.json | 5 ++--- SearchListApplications/.umirc.js | 12 ------------ SearchListApplications/package.json | 3 +-- SearchListArticles/.umirc.js | 12 ------------ SearchListArticles/package.json | 3 +-- SearchListProjects/.umirc.js | 12 ------------ SearchListProjects/package.json | 3 +-- StepForm/.umirc.js | 12 ------------ StepForm/package.json | 3 +-- TableList/.umirc.js | 12 ------------ TableList/package.json | 3 +-- UserLogin/.umirc.js | 12 ------------ Workplace/.umirc.js | 12 ------------ 30 files changed, 18 insertions(+), 239 deletions(-) delete mode 100644 AdvancedForm/.umirc.js delete mode 100644 Analysis/.umirc.js delete mode 100644 BasicForm/.umirc.js delete mode 100644 BasicList/.umirc.js delete mode 100644 BasicProfile/.umirc.js delete mode 100644 CardList/.umirc.js delete mode 100644 Exception403/.umirc.js delete mode 100644 Exception404/.umirc.js delete mode 100644 Monitor/.umirc.js delete mode 100644 ResultFail/.umirc.js delete mode 100644 ResultSuccess/.umirc.js delete mode 100644 SearchListApplications/.umirc.js delete mode 100644 SearchListArticles/.umirc.js delete mode 100644 SearchListProjects/.umirc.js delete mode 100644 StepForm/.umirc.js delete mode 100644 TableList/.umirc.js delete mode 100644 UserLogin/.umirc.js delete mode 100644 Workplace/.umirc.js diff --git a/AdvancedForm/.umirc.js b/AdvancedForm/.umirc.js deleted file mode 100644 index 545b4c7a..00000000 --- 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 545b4c7a..00000000 --- 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 ff98c471..d73b4cb2 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 545b4c7a..00000000 --- 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 545b4c7a..00000000 --- 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 545b4c7a..00000000 --- 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 ed1a15ed..93dc636e 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 545b4c7a..00000000 --- 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 9f43492d..1ac8514d 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 e6e79ab6..00000000 --- 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 1c2a3a35..88293ebc 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 218e63be..00000000 --- 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 70ab1e9b..00000000 --- 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 5ef67d79..181a2a21 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 545b4c7a..00000000 --- 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 a6a7b35a..a524f7bd 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 545b4c7a..00000000 --- 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 86e3a724..b36d8616 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 545b4c7a..00000000 --- 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 b0b7f012..8dd5dcd8 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 545b4c7a..00000000 --- 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 599c2968..9fb68ae5 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 545b4c7a..00000000 --- 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 441cc04f..85dda4f6 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 545b4c7a..00000000 --- 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 a1b07ec1..58301d18 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 545b4c7a..00000000 --- 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 fb526910..0c6f62c2 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 ed8db9a1..00000000 --- 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 d85d9819..00000000 --- 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, - }], - ], -}; -- GitLab