Skip to content

Commit

Permalink
Merge pull request #315 from alibaba-fusion/master
Browse files Browse the repository at this point in the history 
Merge master into feat/rtl2
  • Loading branch information
@youluna
youluna authored Feb 14, 2019
2 parents 3677330 + 06842a4 commit b97a049
Show file tree
Hide file tree
Showing 46 changed files with 1,246 additions and 105 deletions.
22 changes: 22 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
# Change Log

<a name="1.12.4"></a>
## [1.12.4](https://github.com/alibaba-fusion/next/compare/1.12.3...1.12.4) (2019-02-14)


### Bug Fixes

* **Checkbox:** group didn't honor children's indeternimated state ([f90a747](https://github.com/alibaba-fusion/next/commit/f90a747))
* **Input:** textarea placeholder in ie11 ([069c73b](https://github.com/alibaba-fusion/next/commit/069c73b))
* **Select:** could add tag while popup not visible ([662a959](https://github.com/alibaba-fusion/next/commit/662a959))
* **Table:** can't scroll horizontally when body scrollTop !== 0 ([5935b52](https://github.com/alibaba-fusion/next/commit/5935b52))
* **Table:** head selection emptied wrongly ([adb3b59](https://github.com/alibaba-fusion/next/commit/adb3b59))


### Features

* **Icon:** suport size of inherit ([48e7f1d](https://github.com/alibaba-fusion/next/commit/48e7f1d))
* **Progress:** remove tabindex ([602b267](https://github.com/alibaba-fusion/next/commit/602b267))
* **Step:** uniform parameter of step ([e1d2ab5](https://github.com/alibaba-fusion/next/commit/e1d2ab5))




<a name="1.12.3"></a>
## [1.12.3](https://github.com/alibaba-fusion/next/compare/1.12.2...1.12.3) (2019-01-28)

Expand Down
17 changes: 13 additions & 4 deletions LATESTLOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
# Latest Log

## [1.12.3](https://github.com/alibaba-fusion/next/compare/1.12.2...1.12.3) (2019-01-28)
## [1.12.4](https://github.com/alibaba-fusion/next/compare/1.12.3...1.12.4) (2019-02-14)


### Bug Fixes

* **Pagination:** locale text error ([406c198](https://github.com/alibaba-fusion/next/commit/406c198))
* **Tab:** extra is covered by other elements ([c3d913f](https://github.com/alibaba-fusion/next/commit/c3d913f))
* **Tab:** inproperly focus when using with field ([0d3bd2c](https://github.com/alibaba-fusion/next/commit/0d3bd2c))
* **Checkbox:** group didn't honor children's indeternimated state ([f90a747](https://github.com/alibaba-fusion/next/commit/f90a747))
* **Input:** textarea placeholder in ie11 ([069c73b](https://github.com/alibaba-fusion/next/commit/069c73b))
* **Select:** could add tag while popup not visible ([662a959](https://github.com/alibaba-fusion/next/commit/662a959))
* **Table:** can't scroll horizontally when body scrollTop !== 0 ([5935b52](https://github.com/alibaba-fusion/next/commit/5935b52))
* **Table:** head selection emptied wrongly ([adb3b59](https://github.com/alibaba-fusion/next/commit/adb3b59))


### Features

* **Icon:** suport size of inherit ([48e7f1d](https://github.com/alibaba-fusion/next/commit/48e7f1d))
* **Progress:** remove tabindex ([602b267](https://github.com/alibaba-fusion/next/commit/602b267))
* **Step:** uniform parameter of step ([e1d2ab5](https://github.com/alibaba-fusion/next/commit/e1d2ab5))


4 changes: 2 additions & 2 deletions docs/field/demo/basic.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import { Input, Button, Field } from '@alifd/next';



class App extends React.PureComponent {
field = new Field(this, {forceUpdate: true});
class App extends React.Component {
field = new Field(this);

onGetValue() {
console.log(this.field.getValue('input'));
Expand Down
4 changes: 1 addition & 3 deletions docs/field/demo/mix.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ const layout = {
};

class App extends React.Component {
field = new Field(this, {
deepReset: true
});
field = new Field(this);

render() {
const {init, getValue} = this.field;
Expand Down
1 change: 1 addition & 0 deletions docs/field/index.en-us.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Fields can be used to manage data when it comes to form data manipulation and va
- With Field `init` components, `value` `onChange` must be placed in init's third argument, otherwise it may be overridden by init.
- `Form` has been deeply optimized with `Field` for `data acquisition` and `automatic verification prompt`. It is recommended to use `Field` in `Form`. Please check Form demo.
- initValue The defaultValue of a similar component, which only takes effect when the component first renders (the ajax asynchronous invocation setting initValue may have missed the first render)
- with `parseName=true` you could use `getValues` to get a struct value, but not work in `getValue` you still need pass complete key

### basic use

Expand Down
1 change: 1 addition & 0 deletions docs/field/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
- `Form`已经和`Field` 在`数据获取`和`自动校验提示`方面做了深度优化，建议在`Form`中使用`Field`, 请查看 Form demo。
- initValue 类似组件的 defaultValue 只有在组件第一次render的时候才生效(ajax 异步调用设置 initValue 可能已经错过了第一次render)
- autoUnmount 默认打开的，如果需要保留会 `自动卸载的组件` 数据请关闭此项
- `parseName=true` 可以通过 `getValues` 获取到结构化的数据, 但是 getValue 还是必须传完整 key 值

### 基本使用

Expand Down
4 changes: 2 additions & 2 deletions docs/select/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const dataSource = [
| placeholder | 没有值的时候的占位符 | String | - |
| autoWidth | 下拉菜单是否与选择器对齐 | Boolean | true |
| label | 自定义内联 label | ReactNode | - |
| hasClear | 是否有清除按钮 | Boolean | - |
| hasClear | 是否有清除按钮（单选模式有效） | Boolean | - |
| state | 校验状态<br><br>**可选值**:<br>'error', 'loading' | Enum | - |
| readOnly | 是否只读，只读模式下可以展开弹层但不能选 | Boolean | - |
| disabled | 是否禁用选择器 | Boolean | - |
Expand Down Expand Up @@ -117,7 +117,7 @@ const dataSource = [
| placeholder | 没有值的时候的占位符 | String | - |
| autoWidth | 下拉菜单是否与选择器对齐 | Boolean | true |
| label | 自定义内联 label | ReactNode | - |
| hasClear | 是否有清除按钮 | Boolean | - |
| hasClear | 是否有清除按钮（单选模式有效） | Boolean | - |
| state | 校验状态<br><br>**可选值**:<br>'error', 'loading' | Enum | - |
| readOnly | 是否只读，只读模式下可以展开弹层但不能选 | Boolean | - |
| disabled | 是否禁用选择器 | Boolean | - |
Expand Down
18 changes: 9 additions & 9 deletions docs/step/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@

### Step

| 参数 | 说明 | 类型 | 默认值 |
| -------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ------------ |
| current | 当前步骤 | Number | 0 |
| shape | 类型<br><br>**可选值**:<br>'circle', 'arrow', 'dot' | Enum | 'circle' |
| direction | 展示方向<br><br>**可选值**:<br>'hoz', 'ver' | Enum | 'hoz' |
| labelPlacement | 横向布局时的内容排列<br><br>**可选值**:<br>'hoz', 'ver' | Enum | 'ver' |
| readOnly | 是否只读模式 | Boolean | - |
| animation | 是否开启动效 | Boolean | true |
| itemRender | StepItem 的自定义渲染<br><br>**签名**:<br>Function(index: Number, status: String) => Node<br>**参数**:<br>_index_: {Number} 节点索引<br>_status_: {String} 节点状态<br>**返回值**:<br>{Node} 节点的渲染结果<br> | Function | null |
| 参数 | 说明 | 类型 | 默认值 |
| -------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | -------- |
| current | 当前步骤 | Number | 0 |
| shape | 类型<br><br>**可选值**:<br>'circle', 'arrow', 'dot' | Enum | 'circle' |
| direction | 展示方向<br><br>**可选值**:<br>'hoz', 'ver' | Enum | 'hoz' |
| labelPlacement | 横向布局时的内容排列<br><br>**可选值**:<br>'hoz', 'ver' | Enum | 'ver' |
| readOnly | 是否只读模式 | Boolean | - |
| animation | 是否开启动效 | Boolean | true |
| itemRender | StepItem 的自定义渲染<br><br>**签名**:<br>Function(index: Number, status: String) => Node<br>**参数**:<br>_index_: {Number} 节点索引<br>_status_: {String} 节点状态<br>**返回值**:<br>{Node} 节点的渲染结果<br> | Function | null |

### Step.Item

Expand Down
Loading

0 comments on commit b97a049

Please sign in to comment.