Merge pull request #29 from binjie09/master

upgrade to 0.4.5
open-hand · Dec 14, 2018 · c2cd683 · c2cd683
2 parents 8b6bbd4 + f6da138
commit c2cd683
Show file tree

Hide file tree

Showing 11 changed files with 182 additions and 10 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/locale-provider/__tests__/__snapshots__/index.test.js.snap b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap
@@ -846,6 +846,7 @@ exports[`Locale Provider should display the text as ar 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -2557,6 +2558,7 @@ exports[`Locale Provider should display the text as bg 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -4268,6 +4270,7 @@ exports[`Locale Provider should display the text as ca 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -5979,6 +5982,7 @@ exports[`Locale Provider should display the text as cs 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -7690,6 +7694,7 @@ exports[`Locale Provider should display the text as de 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -9401,6 +9406,7 @@ exports[`Locale Provider should display the text as el 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -11112,6 +11118,7 @@ exports[`Locale Provider should display the text as en 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -12823,6 +12830,7 @@ exports[`Locale Provider should display the text as en-gb 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -14534,6 +14542,7 @@ exports[`Locale Provider should display the text as es 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -16245,6 +16254,7 @@ exports[`Locale Provider should display the text as et 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -17956,6 +17966,7 @@ exports[`Locale Provider should display the text as fa 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -19667,6 +19678,7 @@ exports[`Locale Provider should display the text as fi 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -21378,6 +21390,7 @@ exports[`Locale Provider should display the text as fr 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -23089,6 +23102,7 @@ exports[`Locale Provider should display the text as fr 2`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -24800,6 +24814,7 @@ exports[`Locale Provider should display the text as is 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -26511,6 +26526,7 @@ exports[`Locale Provider should display the text as it 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -28222,6 +28238,7 @@ exports[`Locale Provider should display the text as ja 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -29933,6 +29950,7 @@ exports[`Locale Provider should display the text as ko 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -31644,6 +31662,7 @@ exports[`Locale Provider should display the text as ku-iq 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -33355,6 +33374,7 @@ exports[`Locale Provider should display the text as nb 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -35066,6 +35086,7 @@ exports[`Locale Provider should display the text as nl 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -36777,6 +36798,7 @@ exports[`Locale Provider should display the text as nl-be 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -38488,6 +38510,7 @@ exports[`Locale Provider should display the text as pl 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -40199,6 +40222,7 @@ exports[`Locale Provider should display the text as pt 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -41910,6 +41934,7 @@ exports[`Locale Provider should display the text as pt-br 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -43621,6 +43646,7 @@ exports[`Locale Provider should display the text as ru 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -45332,6 +45358,7 @@ exports[`Locale Provider should display the text as sk 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -47043,6 +47070,7 @@ exports[`Locale Provider should display the text as sl 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -48754,6 +48782,7 @@ exports[`Locale Provider should display the text as sr 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -50465,6 +50494,7 @@ exports[`Locale Provider should display the text as sv 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -52176,6 +52206,7 @@ exports[`Locale Provider should display the text as th 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -53887,6 +53918,7 @@ exports[`Locale Provider should display the text as tr 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -55598,6 +55630,7 @@ exports[`Locale Provider should display the text as uk 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -57309,6 +57342,7 @@ exports[`Locale Provider should display the text as vi 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -59020,6 +59054,7 @@ exports[`Locale Provider should display the text as zh-cn 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"
@@ -60731,6 +60766,7 @@ exports[`Locale Provider should display the text as zh-tw 1`] = `
               class="ant-radio-button ant-radio-button-checked"
             >
               <input
+                checked=""
                 class="ant-radio-button-input"
                 type="radio"
                 value="date"

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/components/table/ColumnFilter.tsx b/components/table/ColumnFilter.tsx
@@ -76,7 +76,7 @@ export default class ColumnFilter<T> extends React.Component<ColumnFilterProps<T
 
   getOptions() {
     let options: any = [];
-    (this.props.columns || []).map((column, i) => {
+    (this.props.columns || []).filter((column) => !column.notDisplay).map((column, i) => {
       const item = column.title ? (
         <MenuItem
           disabled={column.disableClick}