diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index a4f1ae21b0..f2cab1e935 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -15,10 +15,19 @@ timeline: true --- -## 3.17.1 +## 3.18.1 + +`2019-05-13` + +- ๐Ÿž Remove useless `module.export` of package. [#antd-tools](https://github.com/ant-design/antd-tools/commit/b9e230c91551af5b4555f672130b14304ff58357) + +## 3.18.0 `2019-05-12` +- ๐ŸŒŸ Transfer support `children` prop to customize render list. [#16026](https://github.com/ant-design/ant-design/pull/16026) +- ๐ŸŒŸ Pagination support `disabled` prop. [#16493](https://github.com/ant-design/ant-design/pull/16493) +- ๐ŸŒŸ Upgrade `@ant-design/icons` and `@ant-design/icons-react` to 2.0 for fix lots of missing icons. [#15874](https://github.com/ant-design/ant-design/pull/15874) - ๐Ÿž Fix Form `hasFeedback` overlap issue with Input.Password. [#16445](https://github.com/ant-design/ant-design/pull/16445) - ๐Ÿž Fix Select selected and disabled item wrong hover color. [#16477](https://github.com/ant-design/ant-design/pull/16477) - ๐Ÿž Fix disabled Upload being triggered by label. [#16483](https://github.com/ant-design/ant-design/pull/16483) diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 8f2fc3e1de..9b29408b81 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -15,10 +15,19 @@ timeline: true --- -## 3.17.1 +## 3.18.1 + +`2019-05-13` + +- ๐Ÿž ็งป้™คๆ‰“ๅŒ…ๅŽๅคšไฝ™็š„ `module.export`ใ€‚[#antd-tools](https://github.com/ant-design/antd-tools/commit/b9e230c91551af5b4555f672130b14304ff58357) + +## 3.18.0 `2019-05-12` +- ๐ŸŒŸ Transfer ๆ”ฏๆŒ `children` ๆฅ่‡ชๅฎšไน‰ๆธฒๆŸ“ๅˆ—่กจใ€‚[#16026](https://github.com/ant-design/ant-design/pull/16026) +- ๐ŸŒŸ Pagination ๆ”ฏๆŒ `disabled` ๅฑžๆ€งใ€‚[#16493](https://github.com/ant-design/ant-design/pull/16493) +- ๐ŸŒŸ ๅ‡็บง `@ant-design/icons` ๅ’Œ `@ant-design/icons-react` ๅˆฐ 2.0 ไฟฎๅคไธ€ไบ›ๅ›พๆ ‡็ผบๅคฑ็š„้—ฎ้ข˜ใ€‚[#15874](https://github.com/ant-design/ant-design/pull/15874) - ๐Ÿž ไฟฎๅค Form `hasFeedback` ๅ’Œ Input.Password ไธ€่ตทไฝฟ็”จๆ—ถไบ’็›ธ้‡ๅ ็š„้—ฎ้ข˜ใ€‚[#16445](https://github.com/ant-design/ant-design/pull/16445) - ๐Ÿž ไฟฎๅค Select ๅฝ“ๅ‰้€‰ไธญ็š„ๅคฑๆ•ˆ้กน็š„ๆ ทๅผ้—ฎ้ข˜ใ€‚[#16477](https://github.com/ant-design/ant-design/pull/16477) - ๐Ÿž ไฟฎๅค Upload disabled ็Šถๆ€ไธ‹ไผš่ขซ label ๆฟ€ๆดป็š„้—ฎ้ข˜ใ€‚[#16483](https://github.com/ant-design/ant-design/pull/16483) diff --git a/components/style/themes/index.less b/components/style/themes/index.less index 4c3fad2d35..f19386d8b2 100644 --- a/components/style/themes/index.less +++ b/components/style/themes/index.less @@ -1,4 +1 @@ @import './default.less'; - -@ant-theme-file: ~'./override.less'; -@import '@{ant-theme-file}'; diff --git a/components/style/themes/override.less b/components/style/themes/override.less deleted file mode 100644 index 029504eec1..0000000000 --- a/components/style/themes/override.less +++ /dev/null @@ -1 +0,0 @@ -// Placeholder, it's used for user to customize the theme variable by less file. diff --git a/components/table/__tests__/__snapshots__/demo.test.js.snap b/components/table/__tests__/__snapshots__/demo.test.js.snap index d6527d66f4..f0f95cda04 100755 --- a/components/table/__tests__/__snapshots__/demo.test.js.snap +++ b/components/table/__tests__/__snapshots__/demo.test.js.snap @@ -12107,7 +12107,7 @@ exports[`renders ./components/table/demo/resizable-column.md correctly 1`] = ` @@ -12129,7 +12129,7 @@ exports[`renders ./components/table/demo/resizable-column.md correctly 1`] = ` @@ -12151,7 +12151,7 @@ exports[`renders ./components/table/demo/resizable-column.md correctly 1`] = ` @@ -12173,7 +12173,7 @@ exports[`renders ./components/table/demo/resizable-column.md correctly 1`] = ` diff --git a/docs/react/customize-theme.en-US.md b/docs/react/customize-theme.en-US.md index c548b11128..50ce459c0c 100644 --- a/docs/react/customize-theme.en-US.md +++ b/docs/react/customize-theme.en-US.md @@ -56,7 +56,7 @@ module.exports = { + 'link-color': '#1DA57A', + 'border-radius-base': '2px', + // or -+ 'ant-theme-file': "~'your-less-file-path.less'", // Override with less file ++ 'hack': `true; @import "your-less-file-path.less";`, // Override with less file + }, + javascriptEnabled: true, + }, diff --git a/docs/react/customize-theme.zh-CN.md b/docs/react/customize-theme.zh-CN.md index 86f48b53f2..5b002aceca 100644 --- a/docs/react/customize-theme.zh-CN.md +++ b/docs/react/customize-theme.zh-CN.md @@ -56,7 +56,7 @@ module.exports = { + 'link-color': '#1DA57A', + 'border-radius-base': '2px', + // or -+ 'ant-theme-file': "~'your-less-file-path.less'", // Override with less file ++ 'hack': `true; @import "your-less-file-path.less";`, // Override with less file + }, + javascriptEnabled: true, + }, diff --git a/package.json b/package.json index 6b00ba4895..7dcb443da3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "antd", - "version": "3.17.1", + "version": "3.18.1", "title": "Ant Design", "description": "An enterprise-class UI design language and React components implementation", "homepage": "http://ant.design/", @@ -106,7 +106,7 @@ "@yesmeck/offline-plugin": "^5.0.5", "ansi-styles": "^3.2.1", "antd-theme-generator": "^1.1.4", - "antd-tools": "^7.3.0", + "antd-tools": "^7.3.5", "babel-eslint": "^10.0.1", "babel-plugin-add-react-displayname": "^0.0.5", "bisheng": "^1.2.4", @@ -137,7 +137,7 @@ "fetch-jsonp": "^1.1.3", "glob": "^7.1.3", "immutability-helper": "^3.0.0", - "intersection-observer": "^0.6.0", + "intersection-observer": "^0.7.0", "jest": "^24.0.0", "jsdom": "^15.0.0", "jsonml.js": "^0.1.0", @@ -167,7 +167,7 @@ "react-highlight-words": "^0.16.0", "react-infinite-scroller": "^1.2.1", "react-intl": "^2.7.0", - "react-resizable": "^1.7.5", + "react-resizable": "^1.8.0", "react-router-dom": "^5.0.0", "react-sticky": "^6.0.3", "react-test-renderer": "^16.6.3",