From 5204b45e01e91026c8cc63dba343b1c67ca8f7a0 Mon Sep 17 00:00:00 2001 From: afc163 Date: Fri, 9 Nov 2018 18:32:20 +0800 Subject: [PATCH 1/3] revert webpackbar --- package.json | 2 +- site/bisheng.config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 30540774d6..23f51fb1d3 100644 --- a/package.json +++ b/package.json @@ -174,7 +174,7 @@ "typescript": "~3.1.1", "unified": "^7.0.0", "values.js": "^1.0.3", - "webpackbar": "^3.0.3", + "webpackbar": "^2.6.3", "xhr-mock": "^2.4.1", "xhr2": "^0.1.4" }, diff --git a/site/bisheng.config.js b/site/bisheng.config.js index c258385a21..24e7ad015d 100644 --- a/site/bisheng.config.js +++ b/site/bisheng.config.js @@ -33,7 +33,7 @@ function usePrettyWebpackBar(config) { // use brand new progress bar. config.plugins.push( new WebpackBar({ - name: '📦 Site', + name: '📦 Ant Design Site', minimal: false, }) ); From 0760cb7ff7e63d59693846be7eb125e8c71217a2 Mon Sep 17 00:00:00 2001 From: muzea Date: Fri, 9 Nov 2018 18:04:47 +0800 Subject: [PATCH 2/3] docs(table): generic type arguments in jsx elements demo --- components/table/index.en-US.md | 9 ++++++++- components/table/index.zh-CN.md | 10 +++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/components/table/index.en-US.md b/components/table/index.en-US.md index 3c8f6a5474..9cb5b5b25e 100644 --- a/components/table/index.en-US.md +++ b/components/table/index.en-US.md @@ -176,7 +176,7 @@ Properties for row selection. ## Using in TypeScript -```jsx +```tsx import { Table } from 'antd'; import { ColumnProps } from 'antd/lib/table'; @@ -206,6 +206,13 @@ class NameColumn extends Table.Column {} + +// after TypeScript 2.9 can write like this +// https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-9.html#generic-type-arguments-in-jsx-elements + columns={columns} dataSource={data} /> + dataSource={data}> + key="name" title="Name" dataIndex="name" /> + ``` ## Note diff --git a/components/table/index.zh-CN.md b/components/table/index.zh-CN.md index c327171d2e..b489b53eb1 100644 --- a/components/table/index.zh-CN.md +++ b/components/table/index.zh-CN.md @@ -181,7 +181,7 @@ const columns = [{ ## 在 TypeScript 中使用 -```jsx +```tsx import { Table } from 'antd'; import { ColumnProps } from 'antd/lib/table'; @@ -210,6 +210,14 @@ class NameColumn extends Table.Column {} + +// TypeScript 2.9 之后也可以这样写 +// https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-9.html#generic-type-arguments-in-jsx-elements + columns={columns} dataSource={data} /> + dataSource={data}> + key="name" title="Name" dataIndex="name" /> + + ``` ## 注意 From 0c5bbf04f42af07d356ec86d7dcabedc326c6992 Mon Sep 17 00:00:00 2001 From: muzea Date: Fri, 9 Nov 2018 18:33:39 +0800 Subject: [PATCH 3/3] fix: extra space --- components/table/index.en-US.md | 2 +- components/table/index.zh-CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/table/index.en-US.md b/components/table/index.en-US.md index 9cb5b5b25e..5cec5ffd03 100644 --- a/components/table/index.en-US.md +++ b/components/table/index.en-US.md @@ -210,7 +210,7 @@ class NameColumn extends Table.Column {} // after TypeScript 2.9 can write like this // https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-9.html#generic-type-arguments-in-jsx-elements columns={columns} dataSource={data} /> - dataSource={data}> + dataSource={data}> key="name" title="Name" dataIndex="name" /> ``` diff --git a/components/table/index.zh-CN.md b/components/table/index.zh-CN.md index b489b53eb1..420974ff01 100644 --- a/components/table/index.zh-CN.md +++ b/components/table/index.zh-CN.md @@ -214,7 +214,7 @@ class NameColumn extends Table.Column {} // TypeScript 2.9 之后也可以这样写 // https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-9.html#generic-type-arguments-in-jsx-elements columns={columns} dataSource={data} /> - dataSource={data}> + dataSource={data}> key="name" title="Name" dataIndex="name" />