diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 426bd581f6..fb1a474a8e 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -14,6 +14,16 @@ timeline: true
 * 主版本号：含有破坏性更新和新特性，不在发布周期内。
 
 ---
+## 0.5.3
+
+`2018-03-20`
+
+- 💄 `Input`:  Input输入到达字符限制时显示提示。
+- 🌟 `Modal`:  Modal添加disableOk和disableCancel属性。
+- 🌟 `TreeNode`:  TreeNode添加wrapper属性。
+- 🌟 `Icon`:  增加新的图标。
+- 🌟 `IconSelect`:  增加showAll属性。
+
 ## 0.5.2
 
 `2018-02-22`
diff --git a/components/icon-select/IconSelect.tsx b/components/icon-select/IconSelect.tsx
index 9f3b434da1..c9a4a7e394 100644
--- a/components/icon-select/IconSelect.tsx
+++ b/components/icon-select/IconSelect.tsx
@@ -11,6 +11,7 @@ const icons = Icon.icons;
 
 export interface IconSelectProps extends SelectProps {
   prefix?: string;
+  showAll?: boolean;
 }
 export interface IconSelectState {
   current: number,
@@ -25,6 +26,7 @@ export default class IconSelect extends React.Component<IconSelectProps, IconSel
     filter: true,
     showArrow: false,
     showCheckAll: false,
+    showAll: false,
   };
   icons: any;
   rcSelect: React.ReactNode | null;
@@ -44,13 +46,24 @@ export default class IconSelect extends React.Component<IconSelectProps, IconSel
   }
 
   initIcon(current: number = 1, pageSize: number = 20, filterValue: string = '') {
+    const { showAll } = this.props;
     const minIndex = (current - 1) * pageSize;
     const maxIndex = current * pageSize;
-    let items = icons.favorite;
-    if (filterValue) {
-      items = icons.favorite.filter((name) => {
-        return name.toLowerCase().indexOf(filterValue.toLowerCase()) !== -1;
-      });
+    let items;
+    if (showAll) {
+      items = icons.default;
+      if (filterValue) {
+        items = icons.favorite.filter((name) => {
+          return name.toLowerCase().indexOf(filterValue.toLowerCase()) !== -1;
+        });
+      }
+    } else {
+      items = icons.favorite;
+      if (filterValue) {
+        items = icons.favorite.filter((name) => {
+          return name.toLowerCase().indexOf(filterValue.toLowerCase()) !== -1;
+        });
+      }
     }
     const total = items.length || 0;
     const currentData = items.filter((name, index) => {
diff --git a/components/select/demo/iconselect.md b/components/select/demo/iconselect.md
index 08b686b09c..bc4f04e5ec 100644
--- a/components/select/demo/iconselect.md
+++ b/components/select/demo/iconselect.md
@@ -17,6 +17,6 @@ Icon Select.
 import { IconSelect } from 'choerodon-ui';
 
 ReactDOM.render(
-  <IconSelect style={{ width: '300px' }} defaultValue={['root']} />,
+  <IconSelect showAll style={{ width: '300px' }} defaultValue={['root']} />,
   mountNode);
 ````