diff --git a/components/date-picker/demo/disabled-date.ts b/components/date-picker/demo/disabled-date.ts
index af02a65fe9f..ad60a20c83e 100644
--- a/components/date-picker/demo/disabled-date.ts
+++ b/components/date-picker/demo/disabled-date.ts
@@ -14,6 +14,8 @@ import setHours from 'date-fns/set_hours';
+
+
`,
styles : [ `
- nz-date-picker, nz-month-picker, nz-range-picker, nz-week-picker {
+ nz-date-picker, nz-month-picker, nz-year-picker, nz-range-picker, nz-week-picker {
margin: 0 8px 12px 0;
}
` ]
diff --git a/components/date-picker/doc/index.en-US.md b/components/date-picker/doc/index.en-US.md
index a8408363d2f..7b34b7be221 100644
--- a/components/date-picker/doc/index.en-US.md
+++ b/components/date-picker/doc/index.en-US.md
@@ -41,7 +41,7 @@ The following APIs are shared by nz-date-picker, nz-month-picker, nz-range-picke
| `[nzClassName]` | picker className | `string` | `''` |
| `[nzDateRender]` | custom rendering function for date cells (Not support by month-picker/year-picker) | `TemplateRef|string|((d: Date) => TemplateRef|string)` | - |
| `[nzDisabled]` | determine whether the nz-date-picker is disabled | `boolean` | `false` |
-| `[nzDisabledDate]` | specify the date that cannot be selected (Not support by year-picker) | `(current: Date) => boolean` | - |
+| `[nzDisabledDate]` | specify the date that cannot be selected | `(current: Date) => boolean` | - |
| `[nzLocale]` | localization configuration | `object` | [default](https://github.com/ant-design/ant-design/blob/master/components/date-picker/locale/example.json) |
| `[nzOpen]` | open state of picker | `boolean` | - |
| `[nzPopupStyle]` | to customize the style of the popup calendar | `object` | `{}` |
diff --git a/components/date-picker/doc/index.zh-CN.md b/components/date-picker/doc/index.zh-CN.md
index 94e4c82bbed..91227bc8ff9 100644
--- a/components/date-picker/doc/index.zh-CN.md
+++ b/components/date-picker/doc/index.zh-CN.md
@@ -41,7 +41,7 @@ registerLocaleData(zh);
| `[nzClassName]` | 选择器 className | `string` | `''` |
| `[nzDateRender]` | 自定义日期单元格的内容(month-picker/year-picker不支持) | `TemplateRef|string|((d: Date) => TemplateRef|string)` | - |
| `[nzDisabled]` | 禁用 | `boolean` | `false` |
-| `[nzDisabledDate]` | 不可选择的日期(year-picker不支持) | `(current: Date) => boolean` | - |
+| `[nzDisabledDate]` | 不可选择的日期 | `(current: Date) => boolean` | - |
| `[nzLocale]` | 国际化配置 | `object` | [默认配置](https://github.com/ant-design/ant-design/blob/master/components/date-picker/locale/example.json) |
| `[nzOpen]` | 控制弹层是否展开 | `boolean` | - |
| `[nzPopupStyle]` | 额外的弹出日历样式 | `object` | `{}` |
diff --git a/components/date-picker/header-picker.component.html b/components/date-picker/header-picker.component.html
index fed362f5a35..42fd98e0d3b 100644
--- a/components/date-picker/header-picker.component.html
+++ b/components/date-picker/header-picker.component.html
@@ -20,6 +20,7 @@