From d9bfc689a44eeae31b241d5a7a32d69eee487115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AA=97=E4=BD=A0=E6=98=AF=E5=B0=8F=E7=8C=AB=E5=92=AA?= Date: Thu, 5 Sep 2019 11:33:11 +0800 Subject: [PATCH 01/22] test(Anchor): optimize dataNowMockFn, avoid being consumed in advance (#18663) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 优化 dataNowMockFn, 避免被提前消费 * test circleci/node:latest * change .circleci circleci/node:latest -> circleci/node:lts * add step command [node -v] check current node version * retry ci test * rebase master * retry CI test --- .circleci/config.yml | 2 +- components/anchor/__tests__/Anchor.test.js | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3f219e68c6..a280fde28d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 references: container_config: &container_config docker: - - image: circleci/node:8 + - image: circleci/node:lts working_directory: ~/ant-design attach_workspace: &attach_workspace diff --git a/components/anchor/__tests__/Anchor.test.js b/components/anchor/__tests__/Anchor.test.js index 65be9cfa2e..3cf43c755c 100644 --- a/components/anchor/__tests__/Anchor.test.js +++ b/components/anchor/__tests__/Anchor.test.js @@ -279,10 +279,13 @@ describe('Anchor Render', () => { let dateNowMock; function dataNowMockFn() { - return jest - .spyOn(Date, 'now') - .mockImplementationOnce(() => 0) - .mockImplementationOnce(() => 1000); + let start = 0; + + const handler = () => { + return (start += 1000); + }; + + return jest.spyOn(Date, 'now').mockImplementation(handler); } dateNowMock = dataNowMockFn(); From 61ad79dde5fc4c00b2d36688d38149c74edb9a4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=84=9A=E9=81=93?= Date: Wed, 4 Sep 2019 20:35:27 +0800 Subject: [PATCH 02/22] fix: navigation Steps hover color --- components/steps/style/index.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/steps/style/index.less b/components/steps/style/index.less index e5619f1d61..fdb028b4c1 100644 --- a/components/steps/style/index.less +++ b/components/steps/style/index.less @@ -148,7 +148,7 @@ } // ===================== Clickable ===================== -.@{steps-prefix-cls}:not(.@{steps-prefix-cls}-navigation) .@{steps-prefix-cls}-item { +.@{steps-prefix-cls} .@{steps-prefix-cls}-item { &:not(.@{steps-prefix-cls}-item-active) { & > .@{steps-prefix-cls}-item-container[role='button'] { cursor: pointer; From 7ad1068006378b540c8ce57e536f9f1322d569af Mon Sep 17 00:00:00 2001 From: kanweiwei Date: Wed, 4 Sep 2019 22:48:32 +0800 Subject: [PATCH 03/22] fix transformFileHandler ts def --- components/upload/interface.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/upload/interface.tsx b/components/upload/interface.tsx index f24b2ff843..ac6ffe7491 100755 --- a/components/upload/interface.tsx +++ b/components/upload/interface.tsx @@ -53,7 +53,9 @@ export type UploadType = 'drag' | 'select'; export type UploadListType = 'text' | 'picture' | 'picture-card'; type PreviewFileHandler = (file: File | Blob) => PromiseLike; -type TransformFileHandler = (file: UploadFile) => string | Blob | File | PromiseLike; +type TransformFileHandler = ( + file: RcFile, +) => string | Blob | File | PromiseLike; export interface UploadProps { type?: UploadType; From 4d6c8bc0b5c3b5a3e318afb464654e870c695623 Mon Sep 17 00:00:00 2001 From: kanweiwei <475801900@qq.com> Date: Sun, 1 Sep 2019 12:00:47 +0800 Subject: [PATCH 04/22] fix: icon render --- components/icon/index.tsx | 88 +++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/components/icon/index.tsx b/components/icon/index.tsx index 513e5d1328..13ebff8f28 100755 --- a/components/icon/index.tsx +++ b/components/icon/index.tsx @@ -128,8 +128,6 @@ const Icon: IconComponent = props => { [`anticon-spin`]: !!spin || type === 'loading', }); - let innerNode: React.ReactNode; - const svgStyle = rotate ? { msTransform: `rotate(${rotate}deg)`, @@ -148,52 +146,54 @@ const Icon: IconComponent = props => { delete innerSvgProps.viewBox; } - // component > children > type - if (Component) { - innerNode = {children}; - } - - if (children) { - warning( - Boolean(viewBox) || - (React.Children.count(children) === 1 && - React.isValidElement(children) && - React.Children.only(children).type === 'use'), - 'Icon', - 'Make sure that you provide correct `viewBox`' + - ' prop (default `0 0 1024 1024`) to the icon.', - ); - innerNode = ( - - {children} - - ); - } + const renderInnerNode = () => { + // component > children > type + if (Component) { + return {children}; + } - if (typeof type === 'string') { - let computedType = type; - if (theme) { - const themeInName = getThemeFromTypeName(type); + if (children) { warning( - !themeInName || theme === themeInName, + Boolean(viewBox) || + (React.Children.count(children) === 1 && + React.isValidElement(children) && + React.Children.only(children).type === 'use'), 'Icon', - `The icon name '${type}' already specify a theme '${themeInName}',` + - ` the 'theme' prop '${theme}' will be ignored.`, + 'Make sure that you provide correct `viewBox`' + + ' prop (default `0 0 1024 1024`) to the icon.', + ); + return ( + + {children} + ); } - computedType = withThemeSuffix( - removeTypeTheme(alias(computedType)), - dangerousTheme || theme || defaultTheme, - ); - innerNode = ( - - ); - } + + if (typeof type === 'string') { + let computedType = type; + if (theme) { + const themeInName = getThemeFromTypeName(type); + warning( + !themeInName || theme === themeInName, + 'Icon', + `The icon name '${type}' already specify a theme '${themeInName}',` + + ` the 'theme' prop '${theme}' will be ignored.`, + ); + } + computedType = withThemeSuffix( + removeTypeTheme(alias(computedType)), + dangerousTheme || theme || defaultTheme, + ); + return ( + + ); + } + }; let iconTabIndex = tabIndex; if (iconTabIndex === undefined && onClick) { @@ -210,7 +210,7 @@ const Icon: IconComponent = props => { onClick={onClick} className={classString} > - {innerNode} + {renderInnerNode()} )} From 19325b4175834a77085a52d82b090f30528431c3 Mon Sep 17 00:00:00 2001 From: kanweiwei <475801900@qq.com> Date: Sun, 1 Sep 2019 12:51:09 +0800 Subject: [PATCH 05/22] modify component renderer --- components/icon/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/icon/index.tsx b/components/icon/index.tsx index 13ebff8f28..a06fafbea7 100755 --- a/components/icon/index.tsx +++ b/components/icon/index.tsx @@ -149,7 +149,7 @@ const Icon: IconComponent = props => { const renderInnerNode = () => { // component > children > type if (Component) { - return {children}; + return ; } if (children) { From bbd979f7ff8f40e6fcf67a8ea0bc6a60c008e8f5 Mon Sep 17 00:00:00 2001 From: kanweiwei <475801900@qq.com> Date: Sun, 1 Sep 2019 12:51:40 +0800 Subject: [PATCH 06/22] update test --- .../__snapshots__/index.test.js.snap | 25 +++++++++++++------ components/icon/__tests__/index.test.js | 2 +- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/components/icon/__tests__/__snapshots__/index.test.js.snap b/components/icon/__tests__/__snapshots__/index.test.js.snap index 131df98113..0b2c70850d 100644 --- a/components/icon/__tests__/__snapshots__/index.test.js.snap +++ b/components/icon/__tests__/__snapshots__/index.test.js.snap @@ -12,12 +12,20 @@ exports[`Icon \`component\` prop can access to svg defs if has children 1`] = ` height="1em" width="1em" > - - Cool Home - - + + + + + + `; @@ -298,13 +306,14 @@ exports[`Icon should support svg react component 1`] = ` fill="currentColor" focusable="false" height="1em" + viewBox="0 0 24 24" width="1em" > - Cool Home + Custom Svg diff --git a/components/icon/__tests__/index.test.js b/components/icon/__tests__/index.test.js index 90f2762eec..cd56970a58 100644 --- a/components/icon/__tests__/index.test.js +++ b/components/icon/__tests__/index.test.js @@ -162,7 +162,7 @@ describe('Icon', () => { it('should support svg react component', () => { const SvgComponent = props => ( - Cool Home + Custom Svg ); From 784ad7d57ce9cf866c5a04a1386ba259836b8c5b Mon Sep 17 00:00:00 2001 From: kanweiwei <475801900@qq.com> Date: Sun, 1 Sep 2019 13:00:05 +0800 Subject: [PATCH 07/22] update --- components/icon/__tests__/__snapshots__/index.test.js.snap | 7 +++++++ components/icon/index.tsx | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/components/icon/__tests__/__snapshots__/index.test.js.snap b/components/icon/__tests__/__snapshots__/index.test.js.snap index 0b2c70850d..8036fa6df7 100644 --- a/components/icon/__tests__/__snapshots__/index.test.js.snap +++ b/components/icon/__tests__/__snapshots__/index.test.js.snap @@ -26,6 +26,13 @@ exports[`Icon \`component\` prop can access to svg defs if has children 1`] = ` /> + + Cool Home + + `; diff --git a/components/icon/index.tsx b/components/icon/index.tsx index a06fafbea7..13ebff8f28 100755 --- a/components/icon/index.tsx +++ b/components/icon/index.tsx @@ -149,7 +149,7 @@ const Icon: IconComponent = props => { const renderInnerNode = () => { // component > children > type if (Component) { - return ; + return {children}; } if (children) { From 5d2596bda8b8ffd204889e938e8846891ffcc7a8 Mon Sep 17 00:00:00 2001 From: kanweiwei Date: Sun, 1 Sep 2019 13:56:48 +0800 Subject: [PATCH 08/22] component props are readonly --- components/icon/index.en-US.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/icon/index.en-US.md b/components/icon/index.en-US.md index f7d0eb5d17..0bbb591f05 100644 --- a/components/icon/index.en-US.md +++ b/components/icon/index.en-US.md @@ -121,7 +121,7 @@ ReactDOM.render(, mountNode); The following properties are available for the component: -| Property | Description | Type | Default | Version | +| Property | Description | Type | Readonly | Version | | --- | --- | --- | --- | --- | | width | The width of the `svg` element | string \| number | '1em' | 3.10.0 | | height | The height of the `svg` element | string \| number | '1em' | 3.10.0 | From 701b3f5fc98e131660caacf8bd01aabc73346036 Mon Sep 17 00:00:00 2001 From: vagusX Date: Wed, 4 Sep 2019 19:32:23 +0800 Subject: [PATCH 09/22] Update index.en-US.md --- components/icon/index.en-US.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/icon/index.en-US.md b/components/icon/index.en-US.md index 0bbb591f05..50def0ac10 100644 --- a/components/icon/index.en-US.md +++ b/components/icon/index.en-US.md @@ -26,6 +26,8 @@ ReactDOM.render(, mountNode); | component | The component used for the root node. This will override the **`type`** property. | ComponentType | - | 3.9.0 | | twoToneColor | Only supports the two-tone icon. Specify the primary color. | string (hex color) | - | 3.9.0 | +> Note: the rendering priority of the Icon component is component > children > type. When props is passed, the priority is directly effective, and the lower priority would be invalid. + ### SVG icons We introduced SVG icons in `3.9.0` version replacing font icons which brings benefits below: From 43bcd0ec8f328245986df7f11bf7baca942c6a4c Mon Sep 17 00:00:00 2001 From: vagusX Date: Wed, 4 Sep 2019 19:30:28 +0800 Subject: [PATCH 10/22] Update index.zh-CN.md --- components/icon/index.zh-CN.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/icon/index.zh-CN.md b/components/icon/index.zh-CN.md index 93a75032be..12009ca95b 100644 --- a/components/icon/index.zh-CN.md +++ b/components/icon/index.zh-CN.md @@ -31,6 +31,8 @@ ReactDOM.render(, mountNode); | component | 控制如何渲染图标，通常是一个渲染根标签为 `` 的 `React` 组件，**会使 `type` 属性失效** | ComponentType | - | 3.9.0 | | twoToneColor | 仅适用双色图标。设置双色图标的主要颜色 | string (十六进制颜色) | - | 3.9.0 | +> 注意：Icon 组件的渲染优先级为 component > children > type, 传入 props 时，优先级高的直接生效，优先级低的则失效 + ### SVG 图标 在 `3.9.0` 之后，我们使用了 SVG 图标替换了原先的 font 图标，从而带来了以下优势： From e479f1f476b8a445194a8c0e1f44bec18fcd4be1 Mon Sep 17 00:00:00 2001 From: vagusX Date: Wed, 4 Sep 2019 21:54:19 +0800 Subject: [PATCH 11/22] update docs --- components/icon/index.en-US.md | 2 +- components/icon/index.zh-CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/icon/index.en-US.md b/components/icon/index.en-US.md index 50def0ac10..5e3f7fabdc 100644 --- a/components/icon/index.en-US.md +++ b/components/icon/index.en-US.md @@ -26,7 +26,7 @@ ReactDOM.render(, mountNode); | component | The component used for the root node. This will override the **`type`** property. | ComponentType | - | 3.9.0 | | twoToneColor | Only supports the two-tone icon. Specify the primary color. | string (hex color) | - | 3.9.0 | -> Note: the rendering priority of the Icon component is component > children > type. When props is passed, the priority is directly effective, and the lower priority would be invalid. +> Note: icon rendering priority of the Icon component is component > children > type. When props is passed, higher priority item will works, and lower priority item would be invalid. ### SVG icons diff --git a/components/icon/index.zh-CN.md b/components/icon/index.zh-CN.md index 12009ca95b..ad053223bd 100644 --- a/components/icon/index.zh-CN.md +++ b/components/icon/index.zh-CN.md @@ -31,7 +31,7 @@ ReactDOM.render(, mountNode); | component | 控制如何渲染图标，通常是一个渲染根标签为 `` 的 `React` 组件，**会使 `type` 属性失效** | ComponentType | - | 3.9.0 | | twoToneColor | 仅适用双色图标。设置双色图标的主要颜色 | string (十六进制颜色) | - | 3.9.0 | -> 注意：Icon 组件的渲染优先级为 component > children > type, 传入 props 时，优先级高的直接生效，优先级低的则失效 +> 注意：Icon 组件中图标渲染的优先级为 component > children > type, 传入 props 时，优先级高的直接生效，优先级低的则失效。 ### SVG 图标 From 864138370fc38c68b71e9863e1b5ee3b1d3b7275 Mon Sep 17 00:00:00 2001 From: yoyo837 Date: Thu, 5 Sep 2019 19:45:44 +0800 Subject: [PATCH 12/22] update type --- components/table/interface.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/table/interface.tsx b/components/table/interface.tsx index 5022f4ead2..cc2d00293a 100644 --- a/components/table/interface.tsx +++ b/components/table/interface.tsx @@ -183,8 +183,8 @@ export interface TableProps { useFixedHeader?: boolean; bordered?: boolean; showHeader?: boolean; - footer?: (currentPageData: Object[]) => React.ReactNode; - title?: (currentPageData: Object[]) => React.ReactNode; + footer?: (currentPageData: T[]) => React.ReactNode; + title?: (currentPageData: T[]) => React.ReactNode; scroll?: { x?: boolean | number | string; y?: boolean | number | string }; childrenColumnName?: string; bodyStyle?: React.CSSProperties; From 2189bf5f548e0824d6fc8f23616d272b38e12560 Mon Sep 17 00:00:00 2001 From: Aiello <770540123@qq.com> Date: Fri, 6 Sep 2019 11:13:36 +0800 Subject: [PATCH 13/22] Remove `border` parameter from `Descriptions` `size` demo (#18518) `border` parameter is no longer used. --- components/descriptions/demo/size.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/descriptions/demo/size.md b/components/descriptions/demo/size.md index d37fd7dba3..3d7db86ddc 100644 --- a/components/descriptions/demo/size.md +++ b/components/descriptions/demo/size.md @@ -38,7 +38,7 @@ class Demo extends React.Component {

- + Cloud Database Prepaid 18:00:00 @@ -61,7 +61,7 @@ class Demo extends React.Component {

- + Cloud Database Prepaid 18:00:00 From 9157bc99a9462fd9328e972801c204c08519e39f Mon Sep 17 00:00:00 2001 From: afc163 Date: Fri, 6 Sep 2019 12:40:24 +0800 Subject: [PATCH 14/22] :bug: Fix round button font size too large --- components/button/style/mixin.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/button/style/mixin.less b/components/button/style/mixin.less index d290be92c8..6e34f138f0 100644 --- a/components/button/style/mixin.less +++ b/components/button/style/mixin.less @@ -225,10 +225,10 @@ } // round button .btn-round(@btnClassName: btn) { - .button-size(@btn-circle-size; 0 @btn-circle-size / 2; @font-size-base + 2px; @btn-circle-size); + .button-size(@btn-circle-size; 0 @btn-circle-size / 2; @font-size-base; @btn-circle-size); &.@{btnClassName}-lg { .button-size( - @btn-circle-size-lg; 0 @btn-circle-size-lg / 2; @btn-font-size-lg + 2px; @btn-circle-size-lg + @btn-circle-size-lg; 0 @btn-circle-size-lg / 2; @btn-font-size-lg; @btn-circle-size-lg ); } &.@{btnClassName}-sm { From ffe0645589f341b53e306968831e325fd703b7c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AF=B8=E5=B2=B3?= Date: Fri, 6 Sep 2019 13:30:47 +0800 Subject: [PATCH 15/22] fix(PageHeader): Allow back icon to coexist with breadcrumb, close #18094 (#18691) --- .../page-header/__tests__/index.test.js | 8 ++++---- components/page-header/index.tsx | 20 +------------------ 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/components/page-header/__tests__/index.test.js b/components/page-header/__tests__/index.test.js index 8484c7ef21..4e7c576ee0 100644 --- a/components/page-header/__tests__/index.test.js +++ b/components/page-header/__tests__/index.test.js @@ -67,7 +67,7 @@ describe('PageHeader', () => { expect(wrapper).toMatchSnapshot(); }); - it('breadcrumbs and back icon can only have one', () => { + it('breadcrumbs and back icon can coexist', () => { const routes = [ { path: 'index', @@ -82,10 +82,10 @@ describe('PageHeader', () => { breadcrumbName: 'Third-level Menu', }, ]; - const wrapper = mount( true} breadcrumb={{ routes }} />); - expect(wrapper.find('.ant-breadcrumb')).toHaveLength(0); + const wrapper = mount(); + expect(wrapper.find('.ant-breadcrumb')).toHaveLength(1); - wrapper.setProps({ onBack: undefined }); + wrapper.setProps({ onBack: () => {} }); expect(wrapper.find('.ant-breadcrumb')).toHaveLength(1); }); }); diff --git a/components/page-header/index.tsx b/components/page-header/index.tsx index 346043f0d4..5019c0e961 100644 --- a/components/page-header/index.tsx +++ b/components/page-header/index.tsx @@ -8,7 +8,6 @@ import Breadcrumb, { BreadcrumbProps } from '../breadcrumb'; import Avatar, { AvatarProps } from '../avatar'; import TransButton from '../_util/transButton'; import LocaleReceiver from '../locale-provider/LocaleReceiver'; -import warning from '../_util/warning'; export interface PageHeaderProps { backIcon?: React.ReactNode; @@ -58,23 +57,6 @@ const renderBreadcrumb = (breadcrumb: BreadcrumbProps) => { return ; }; -const renderHeader = ( - breadcrumb: PageHeaderProps['breadcrumb'], - { backIcon, onBack }: PageHeaderProps, -) => { - // by design,Bread crumbs and back icon can only have one - if (backIcon && onBack) { - if (breadcrumb && breadcrumb.routes) { - warning(false, 'page-header', 'breadcrumbs and back icon can only have one'); - } - return null; - } - if (breadcrumb && breadcrumb.routes) { - return renderBreadcrumb(breadcrumb); - } - return null; -}; - const renderTitle = (prefixCls: string, props: PageHeaderProps) => { const { title, avatar, subTitle, tags, extra, backIcon, onBack } = props; const headingPrefixCls = `${prefixCls}-heading`; @@ -118,7 +100,7 @@ const PageHeader: React.SFC = props => ( } = props; const prefixCls = getPrefixCls('page-header', customizePrefixCls); - const breadcrumbDom = renderHeader(breadcrumb, props); + const breadcrumbDom = breadcrumb && breadcrumb.routes ? renderBreadcrumb(breadcrumb) : null; const className = classnames(prefixCls, customizeClassName, { 'has-breadcrumb': breadcrumbDom, 'has-footer': footer, From 01970b691371981c9d828e29c300ea0b30f6a05d Mon Sep 17 00:00:00 2001 From: Lyndon001 Date: Fri, 6 Sep 2019 16:24:24 +0800 Subject: [PATCH 16/22] Update work-with-us.zh-CN.md --- docs/spec/work-with-us.zh-CN.md | 42 +++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/docs/spec/work-with-us.zh-CN.md b/docs/spec/work-with-us.zh-CN.md index b739184b2a..9f103b76fa 100644 --- a/docs/spec/work-with-us.zh-CN.md +++ b/docs/spec/work-with-us.zh-CN.md @@ -6,21 +6,7 @@ title: 加入我们 我们（蚂蚁金服体验技术部）是一支兼具设计视角和工程视角的团队，服务蚂蚁金服上百个中后台系统，主打产品 Ant Design 服务全球 100 万设计师和工程师，是西湖区学院路西侧最具影响力的设计语言。欢迎来这里和我们一起打造优雅高效的人机设计/研发体系。 -## ADI（Artificial Design Intelligence） 工程师 - -简历和作品集请投递：lindong.lld#alipay.com - -> 注明简历来自 ant.design 官网 -- 岗位级别：P7/P8 -- 岗位地点：杭州 -- 岗位要求： - - 有良好的工程师背景，善于学习和使用各类工具、框架解决研发问题； - - 对人工智能应用在设计行业，有坚定的信心和意愿； - - 已经有相关实践工作，优先考虑。 -- 岗位职责： - - 负责 Ant Design 工具体系和智能设计的研发，并配合团队成员进行商业化实践，把设计做成业务； - - 组建和培养有梯度的研发团队。 ## UI/UE 设计师 @@ -28,20 +14,23 @@ title: 加入我们 > 注明简历来自 ant.design 官网 -- 岗位级别：P6/P7 +- 岗位级别：P6/P7/P8 - 岗位地点：杭州 - 岗位要求： - - 至少 2-3 年的工作经验，扎实设计功底； + - 至少 3-5 年的工作经验，扎实设计功底； - 抽象能力强，善于透过表象找本质； - 沟通能力佳，善于自我管理； - 有企业级设计实战经验，加分； + - 有数据驱动的增长设计实践，加分； - 深度理解 SAP、Salesforce、Google 等设计体系，能提出自己独到见解并落实到实践中，加加加分。 - 岗位职责： - - 参与[蚂蚁金融科技](https://tech.antfin.com/)、区块链、人工智能等企业级产品的设计工作； - - 参与[语雀](https://www.yuque.com/)、[云凤蝶](https://www.yunfengdie.com/)、K12/中小学（支付宝搜索：小钱袋）等创新产品的设计工作； + - 参与[蚂蚁金融科技](https://tech.antfin.com/)、[区块链](https://tech.antfin.com/blockchain)、人工智能等企业级产品的设计工作； + - 参与[语雀](https://www.yuque.com/)、[云凤蝶](https://www.yunfengdie.com/)等创新产品的设计工作； - 参与 Ant Design 的打磨，将其建设成全球卓越的设计体系。 + - 参与 AntV 的打磨，将其建设成全球一流的数据可视化体系。 - One More Thing ❤️ ： - 你们总是为世界带去美好，但总是忘却你们也需要美好。我们正在努力打造 [🍳 Kitchen：一款为设计师提效的 Sketch 工具集](https://kitchen.alipay.com/)、[语雀画板](https://yuque.com/) 等专属设计师的产品，让设计真正变成财富。期待志同道合的你，一道给设计行业带来「微小而美好的改变」。 + ## 前端工程师 @@ -60,3 +49,20 @@ title: 加入我们 - 岗位职责： - 负责 Ant Design 前端基础设施研发。 - 负责中后台设计/前端工具体系建设。 + + +## ADI（Artificial Design Intelligence） 工程师 + +简历和作品集请投递：lindong.lld#alipay.com + +> 注明简历来自 ant.design 官网 + +- 岗位级别：P7/P8 +- 岗位地点：杭州 +- 岗位要求： + - 有良好的工程师背景，善于学习和使用各类工具、框架解决研发问题； + - 对人工智能应用在设计行业，有坚定的信心和意愿； + - 已经有相关实践工作，优先考虑。 +- 岗位职责： + - 负责 Ant Design 工具体系和智能设计的研发，并配合团队成员进行商业化实践，把设计做成业务； + - 组建和培养有梯度的研发团队。 From d0f95299cd820e61a95fccadd2667d5d0aa1096a Mon Sep 17 00:00:00 2001 From: ycjcl868 <45808948@qq.com> Date: Fri, 23 Aug 2019 18:07:39 +0800 Subject: [PATCH 17/22] fix: result types --- components/result/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/result/index.tsx b/components/result/index.tsx index 0dd6606b86..2ef05910ce 100644 --- a/components/result/index.tsx +++ b/components/result/index.tsx @@ -24,7 +24,7 @@ export type ResultStatusType = ExceptionStatusType | keyof typeof IconMap; export interface ResultProps { icon?: React.ReactNode; - status: ResultStatusType; + status?: ResultStatusType; title?: React.ReactNode; subTitle?: React.ReactNode; extra?: React.ReactNode; From 35aaf6b9e924218d8e9a3777bd7911747d6c16da Mon Sep 17 00:00:00 2001 From: ycjcl868 <45808948@qq.com> Date: Tue, 27 Aug 2019 14:23:14 +0800 Subject: [PATCH 18/22] fix: status types --- components/result/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/result/index.tsx b/components/result/index.tsx index 2ef05910ce..a065ed5345 100644 --- a/components/result/index.tsx +++ b/components/result/index.tsx @@ -46,7 +46,7 @@ const ExceptionStatus = Object.keys(ExceptionMap); const renderIcon = (prefixCls: string, { status, icon }: ResultProps) => { const className = classnames(`${prefixCls}-icon`); - if (ExceptionStatus.includes(status)) { + if (ExceptionStatus.includes(status as ResultStatusType)) { const SVGComponent = ExceptionMap[status as ExceptionStatusType]; return (
From f5a20fec826e141aac1243dfba282f52d571ebd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AF=B8=E5=B2=B3?= Date: Fri, 6 Sep 2019 18:58:28 +0800 Subject: [PATCH 19/22] docs: Add the changelog of 3.23.2 (#18710) --- CHANGELOG.en-US.md | 17 +++++++++++++++++ CHANGELOG.zh-CN.md | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index e56612e52f..fe34bf9fc5 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -15,6 +15,23 @@ timeline: true --- +## 3.23.2 + +`2019-09-06` + +- 🐞 Fix `round` Button font size too large. [#18701](https://github.com/ant-design/ant-design/pull/18701) +- 🐞 Fix Descriptions warning with same key when bordered is true. [#18637](https://github.com/ant-design/ant-design/pull/18637) +- 🐞 Fix Drawer animation when `placement` is right and `mask` is false. [#18636](https://github.com/ant-design/ant-design/pull/18636) +- 🐞 Fix Icon that `component` and `children` prop should have priority over `type` prop. [#18592](https://github.com/ant-design/ant-design/pull/18592) +- 🐞 Fix Layout.Sider boundary values for max-width. [#18553](https://github.com/ant-design/ant-design/pull/18553) [@Nikitenkova](https://github.com/Nikitenkova) +- 🐞 Fix PageHeader that back icon can't coexist with breadcrumb. [#18691](https://github.com/ant-design/ant-design/pull/18691) +- 🗑Deprecated Select `inputValue` prop and use `searchValue` instead. [#18629](https://github.com/ant-design/ant-design/pull/18629) +- TypeScript + - 🐞 Fix type definition of `status` for Result. [#18445](https://github.com/ant-design/ant-design/pull/18445) + - 🐞 Fix type definition of `target` for Anchor.Link. [#18646](https://github.com/ant-design/ant-design/pull/18646) + - 🐞 Fix type definition of `transformFile` params for Upload. [#18671](https://github.com/ant-design/ant-design/pull/18671) + - 🐞 Fix type definition of `title` and `footer` for Table. [#18697](https://github.com/ant-design/ant-design/pull/18697) [@yoyo837](https://github.com/yoyo837) + ## 3.23.1 `2019-09-03` diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index c6571a54d1..1b25d53f0d 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -15,6 +15,23 @@ timeline: true --- +## 3.23.2 + +`2019-09-06` + +- 🐞 修复圆形按钮的字体大一号的问题。[#18701](https://github.com/ant-design/ant-design/pull/18701) +- 🐞 修复 Descriptions 带边框时控制台告警的问题。[#18637](https://github.com/ant-design/ant-design/pull/18637) +- 🐞 修复 Drawer 无遮罩从右边展开时的动画问题。[#18636](https://github.com/ant-design/ant-design/pull/18636) +- 🐞 修复 Icon 中 `component` 和 `children` 属性优先级低于 `type` 的问题。[#18592](https://github.com/ant-design/ant-design/pull/18592) +- 🐞 修复 Layout.Sider 的最大宽度的响应式断点值。[#18553](https://github.com/ant-design/ant-design/pull/18553) [@Nikitenkova](https://github.com/Nikitenkova) +- 🐞 修复 PageHeader 中返回图标与面包屑无法共存的问题。[#18691](https://github.com/ant-design/ant-design/pull/18691) +- 🗑 废弃 Select 的 `inputValue` 属性，请使用 `searchValue` 代替。[#18629](https://github.com/ant-design/ant-design/pull/18629) +- TypeScript + - 🐞 修复 Result 中 `status` 的类型定义。[#18445](https://github.com/ant-design/ant-design/pull/18445) + - 🐞 修复 Anchor.Link 中 `target` 的类型定义。[#18646](https://github.com/ant-design/ant-design/pull/18646) + - 🐞 修复 Upload 中 `transformFile` 函数的参数定义。[#18671](https://github.com/ant-design/ant-design/pull/18671) + - 🐞 修复 Table 中 `title` 和 `footer` 的类型定义。[#18697](https://github.com/ant-design/ant-design/pull/18697) [@yoyo837](https://github.com/yoyo837) + ## 3.23.1 `2019-09-03` From d0f3c18508e7abfde918fb9a8d66d4222e99232f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AF=B8=E5=B2=B3?= Date: Fri, 6 Sep 2019 19:00:29 +0800 Subject: [PATCH 20/22] Bump 3.23.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bd85b6235f..96fb4722fe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "antd", - "version": "3.23.1", + "version": "3.23.2", "title": "Ant Design", "description": "An enterprise-class UI design language and React components implementation", "homepage": "http://ant.design/", From e71aee45ad8c44af8fc8cff07f7b68a5bf62338b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AF=B8=E5=B2=B3?= Date: Fri, 6 Sep 2019 19:23:08 +0800 Subject: [PATCH 21/22] test: Update snapshot --- .../progress/__tests__/__snapshots__/demo.test.js.snap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/progress/__tests__/__snapshots__/demo.test.js.snap b/components/progress/__tests__/__snapshots__/demo.test.js.snap index 3e31bc7cb5..fea5273804 100644 --- a/components/progress/__tests__/__snapshots__/demo.test.js.snap +++ b/components/progress/__tests__/__snapshots__/demo.test.js.snap @@ -713,7 +713,7 @@ exports[`renders ./components/progress/demo/gradient-line.md correctly 1`] = ` > Date: Fri, 6 Sep 2019 23:05:06 +0800 Subject: [PATCH 22/22] test: fix ci fail --- .../progress/__tests__/__snapshots__/demo.test.js.snap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/progress/__tests__/__snapshots__/demo.test.js.snap b/components/progress/__tests__/__snapshots__/demo.test.js.snap index fea5273804..3e31bc7cb5 100644 --- a/components/progress/__tests__/__snapshots__/demo.test.js.snap +++ b/components/progress/__tests__/__snapshots__/demo.test.js.snap @@ -713,7 +713,7 @@ exports[`renders ./components/progress/demo/gradient-line.md correctly 1`] = ` >