Merge pull request #13 from binjie09/feature-C7NF-1211

Feature c7 nf 1211
binjie09 · Dec 14, 2018 · f6da138 · f6da138
2 parents 4a75c7e + 0e8c4fa
commit f6da138
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 5 deletions.
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -15,6 +15,19 @@ timeline: true
 
 ---
 
+## 0.4.5
+
+`2018-12-11`
+
+- 🌟 `Icon`: Add new icons.
+- 💄 `Select`: `all` and `no` button change to not valid for disabled options
+
+## 0.4.4
+
+`2018-12-3`
+
+- 💄 `Menu`: Fixed a dependency error.
+
 ## 0.4.3
 
 `2018-11-29`

diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
@@ -15,6 +15,17 @@ timeline: true
 
 ---
 
+## 0.4.5
+
+- 🌟 `Icon`: 增加新的图标。
+- 💄 `Select`: select全选和无更改为不对禁用的选项生效
+
+## 0.4.4
+
+`2018-12-3`
+
+- 💄 `Menu`: 修复了一个依赖错误。
+
 ## 0.4.3
 
 `2018-11-29`

diff --git a/components/icon/icons.tsx b/components/icon/icons.tsx
@@ -1,7 +1,8 @@
 const icons = {
   default: [
-    'cluster', 'kubernetes_cluster', 'disconnect', 'running', 'notification_setting',
-    'authority', 'develop_console', 'frame', 'record_test',
+    'add_crt', 'add_branch', 'line', 'secret', 'recover', 'table', 'test_execution', 'test_progress',
+    'test_record', 'execution_schedule', 'cluster', 'kubernetes_cluster', 'disconnect',
+    'running', 'notification_setting', 'authority', 'develop_console', 'frame', 'record_test',
     'agile_epic', 'agile_fault', 'agile_story', 'agile_subtask', 'agile_task', 'auto_test', 'devops_chart',
     'agile_chart', 'test_chart', 'bar_chart', 'unlock', 'classname',
     'state_over', 'task_schedule', 'unallocated_question', 'unfinished_question', 'all_reports', 'burnout_map',

diff --git a/components/rc-components/select/Select.jsx b/components/rc-components/select/Select.jsx
@@ -1396,7 +1396,10 @@ export default class Select extends React.Component {
     }
 
     let newValues;
-    const values = this._options.map((option) => {
+    const values = this._options.filter((option) => {
+      // 当这个选项为禁用时，全选和无不对这个选项做处理
+      return option.props.disabled !== true;
+    }).map((option) => {
       return getValuePropValue(option);
     });
     if (name === 'check-all') {

diff --git a/components/style/core/iconfont.less b/components/style/core/iconfont.less
@@ -23,6 +23,40 @@
     height: @icon-font-size-sm;
   }
 }
+
+// 12.11
+
+.@{iconfont-css-prefix}-add_crt:before {
+  content: "\e9cf";
+}
+.@{iconfont-css-prefix}-add_branch:before {
+  content: "\e9d0";
+}
+.@{iconfont-css-prefix}-line:before {
+  content: "\e9d1";
+}
+.@{iconfont-css-prefix}-secret:before {
+  content: "\e9ce";
+}
+.@{iconfont-css-prefix}-recover:before {
+  content: "\e9cc";
+}
+.@{iconfont-css-prefix}-table:before {
+  content: "\e9cd";
+}
+.@{iconfont-css-prefix}-test_execution:before {
+  content: "\e9c8";
+}
+.@{iconfont-css-prefix}-test_progress:before {
+  content: "\e9c9";
+}
+.@{iconfont-css-prefix}-test_record:before {
+  content: "\e9ca";
+}
+.@{iconfont-css-prefix}-execution_schedule:before {
+  content: "\e9cb";
+}
+
 // 11.09
 
 .@{iconfont-css-prefix}-cluster:before {

diff --git a/docs/react/introduce.zh-CN.md b/docs/react/introduce.zh-CN.md
@@ -94,7 +94,7 @@ import 'choerodon-ui/dist/antd.css';  // or 'choerodon-ui/dist/antd.less'
 
 ## 链接
 
-- [首页](/)
+- [首页](/index)
 - [组件库](/docs/react/introduce)
 - [更新日志](/changelog)
 - [脚手架市场](http://scaffold.ant.design)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "choerodon-ui",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "title": "Choerodon UI",
   "description": "An enterprise-class UI design language and React-based implementation",
   "homepage": "",