Merge pull request #39 from binjie09/master

update ui 0.5.2

CHANGELOG.en-US.md

@@ -14,6 +14,13 @@ timeline: true
 * Major version release is not included in this schedule for breaking change and new features.
 
 ---
+## 0.5.2
+
+`2018-02-22`
+
+- 💄 `Table`:  The confirmation button for the filter in the repair table is fixed at the bottom of the selection box and the style is overwritten.
+- 🌟 `Sidebar`: add `alwaysCanCancel`.
+
 ## 0.5.1
 
 `2018-02-19`

CHANGELOG.zh-CN.md

@@ -14,6 +14,12 @@ timeline: true
 * 主版本号：含有破坏性更新和新特性，不在发布周期内。
 
 ---
+## 0.5.2
+
+`2018-02-22`
+
+- 💄 `Table`:  修复Table中过滤的确认按钮固定在选择框底部样式被覆盖。
+- 🌟 `Sidebar`: 增加属性alwaysCanCancel。
 
 ## 0.5.1
 

components/modal/Sidebar.tsx

@@ -10,6 +10,7 @@ export interface SidebarState {
 
 export interface SidebarProps extends ModalFuncProps {
   close?: (...args: any[]) => void;
+  alwaysCanCancel?: boolean;
 }
 
 export default class Sidebar extends React.Component<SidebarProps, {}> {
@@ -20,6 +21,7 @@ export default class Sidebar extends React.Component<SidebarProps, {}> {
     transitionName: 'slide-right',
     maskTransitionName: 'fade',
     confirmLoading: false,
+    alwaysCanCancel: false,
     visible: false,
     okType: 'primary',
     funcType: 'raised',
@@ -49,7 +51,7 @@ export default class Sidebar extends React.Component<SidebarProps, {}> {
 
   renderFooter = () => {
     const props = this.props;
-    const { prefixCls, onCancel, onOk, okType, funcType, confirmLoading } = props;
+    const { prefixCls, onCancel, onOk, okType, funcType, confirmLoading, alwaysCanCancel } = props;
     const okCancel = ('okCancel' in props) ? props.okCancel! : true;
     const runtimeLocale = getConfirmLocale();
     const okText = props.okText ||
@@ -59,7 +61,7 @@ export default class Sidebar extends React.Component<SidebarProps, {}> {
     const  cancalBtn = okCancel ? (
       <Button
         className={`${prefixCls}-btn-cancel`}
-        disabled={confirmLoading}
+        disabled={!alwaysCanCancel && confirmLoading}
         funcType={funcType}
         onClick={onCancel}
       >
@@ -86,7 +88,7 @@ export default class Sidebar extends React.Component<SidebarProps, {}> {
     this.setState({
       open: !open,
     })
-  }
+  };
 
   render() {
     const props = this.props;

components/modal/index.zh-CN.md

@@ -46,7 +46,10 @@ title: Modal
 
 ### Modal.SideBar
 
-侧边栏弹出窗，API同Modal
+侧边栏弹出窗，表中无说明的API同Modal
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| alwaysCanCancel | 取消按钮是否一直可按，无论是否有confirmLoading | boolean | false |
 
 ### Modal.method()
 

components/table/demo/reset-filter.md

@@ -117,6 +117,15 @@ class App extends React.Component {
       filters: [
         { text: 'London', value: 'a' },
         { text: 'New York', value: 'b' },
+        { text: 'New York1', value: 'c' },
+        { text: 'New York2', value: 'd' },
+        { text: 'New York3', value: 'e' },
+        { text: 'New York4', value: 'f' },
+        { text: 'New York5', value: 'g' },
+        { text: 'New York6', value: 'h' },
+        { text: 'New York7', value: 'i' },
+        { text: 'New York8', value: 'j' },
+        { text: 'New York9', value: 'k' },
       ],
       filterMultiple: true,
       filteredValue: filteredInfo.address || null,

components/table/style/index.less

@@ -448,10 +448,10 @@
       }
     }
     &-ok-btn {
-      position: absolute;
+      position: absolute !important;
       bottom: 0;
       right: 0;
-      padding: 10px 20px;
+      padding: 10px 20px !important;
       background-color: #fff;
       width: 100%;
       text-align: right;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "choerodon-ui",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "title": "Choerodon UI",
   "description": "An enterprise-class UI design language and React-based implementation",
   "homepage": "",