Skip to content

Commit

Permalink
chore(*): Release-1.21.0
Browse files Browse the repository at this point in the history
  • Loading branch information
youluna committed Aug 26, 2020
1 parent bed22a2 commit 9783ede
Show file tree
Hide file tree
Showing 11 changed files with 55 additions and 26 deletions.
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
# Change Log

# [1.21.0](https://github.com/alibaba-fusion/next/compare/1.20.28...1.21.0) (2020-08-25)


### Features

* **Button:** add active ([51107d1](https://github.com/alibaba-fusion/next/commit/51107d1))
* **Button:** update disabled configuration ([18140ab](https://github.com/alibaba-fusion/next/commit/18140ab))
* **List:** add loading/emptyContent/dataSource/renderItem, close [#2050](https://github.com/alibaba-fusion/next/issues/2050) ([#2105](https://github.com/alibaba-fusion/next/issues/2105)) ([1fb62bf](https://github.com/alibaba-fusion/next/commit/1fb62bf))
* **Locale:** add vi and it ([#2051](https://github.com/alibaba-fusion/next/issues/2051)) ([efd5da9](https://github.com/alibaba-fusion/next/commit/efd5da9))
* **Table:** ExpandTable with StickyLock ([343a550](https://github.com/alibaba-fusion/next/commit/343a550))
* **Table:** support columns ([83ef263](https://github.com/alibaba-fusion/next/commit/83ef263))
* **Table:** update lock with position sticky, close [#1728](https://github.com/alibaba-fusion/next/issues/1728) ([8732416](https://github.com/alibaba-fusion/next/commit/8732416))
* **Upload:** add fileKeyName to set form-data name for file. fix [#1940](https://github.com/alibaba-fusion/next/issues/1940) ([6f5d5f4](https://github.com/alibaba-fusion/next/commit/6f5d5f4))
* **Upload:** add fileKeyName to set form-data name for file. fix [#1940](https://github.com/alibaba-fusion/next/issues/1940) ([df561e2](https://github.com/alibaba-fusion/next/commit/df561e2))
* **Upload:** api fileNameRender/actionRender fix [#910](https://github.com/alibaba-fusion/next/issues/910),[#1934](https://github.com/alibaba-fusion/next/issues/1934),[#1778](https://github.com/alibaba-fusion/next/issues/1778) ([acd381d](https://github.com/alibaba-fusion/next/commit/acd381d))
* **Upload:** api fileNameRender/actionRender fix [#910](https://github.com/alibaba-fusion/next/issues/910),[#1934](https://github.com/alibaba-fusion/next/issues/1934),[#1778](https://github.com/alibaba-fusion/next/issues/1778) ([d681304](https://github.com/alibaba-fusion/next/commit/d681304))




## [1.20.28](https://github.com/alibaba-fusion/next/compare/1.20.26...1.20.28) (2020-08-12)


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

## [1.20.28](https://github.com/alibaba-fusion/next/compare/1.20.26...1.20.28) (2020-08-12)
# [1.21.0](https://github.com/alibaba-fusion/next/compare/1.20.28...1.21.0) (2020-08-25)


### Bug Fixes
### Features

* **Menu:** in caseof children null, close [#2088](https://github.com/alibaba-fusion/next/issues/2088) ([7f20168](https://github.com/alibaba-fusion/next/commit/7f20168))
* **Select:** compact with string value while useDetailValue=true ([59bd67a](https://github.com/alibaba-fusion/next/commit/59bd67a))
* **Button:** add active ([51107d1](https://github.com/alibaba-fusion/next/commit/51107d1))
* **Button:** update disabled configuration ([18140ab](https://github.com/alibaba-fusion/next/commit/18140ab))
* **List:** add loading/emptyContent/dataSource/renderItem, close [#2050](https://github.com/alibaba-fusion/next/issues/2050) ([#2105](https://github.com/alibaba-fusion/next/issues/2105)) ([1fb62bf](https://github.com/alibaba-fusion/next/commit/1fb62bf))
* **Locale:** add vi and it ([#2051](https://github.com/alibaba-fusion/next/issues/2051)) ([efd5da9](https://github.com/alibaba-fusion/next/commit/efd5da9))
* **Table:** ExpandTable with StickyLock ([343a550](https://github.com/alibaba-fusion/next/commit/343a550))
* **Table:** support columns ([83ef263](https://github.com/alibaba-fusion/next/commit/83ef263))
* **Table:** update lock with position sticky, close [#1728](https://github.com/alibaba-fusion/next/issues/1728) ([8732416](https://github.com/alibaba-fusion/next/commit/8732416))
* **Upload:** add fileKeyName to set form-data name for file. fix [#1940](https://github.com/alibaba-fusion/next/issues/1940) ([6f5d5f4](https://github.com/alibaba-fusion/next/commit/6f5d5f4))
* **Upload:** add fileKeyName to set form-data name for file. fix [#1940](https://github.com/alibaba-fusion/next/issues/1940) ([df561e2](https://github.com/alibaba-fusion/next/commit/df561e2))
* **Upload:** api fileNameRender/actionRender fix [#910](https://github.com/alibaba-fusion/next/issues/910),[#1934](https://github.com/alibaba-fusion/next/issues/1934),[#1778](https://github.com/alibaba-fusion/next/issues/1778) ([acd381d](https://github.com/alibaba-fusion/next/commit/acd381d))
* **Upload:** api fileNameRender/actionRender fix [#910](https://github.com/alibaba-fusion/next/issues/910),[#1934](https://github.com/alibaba-fusion/next/issues/1934),[#1778](https://github.com/alibaba-fusion/next/issues/1778) ([d681304](https://github.com/alibaba-fusion/next/commit/d681304))


6 changes: 3 additions & 3 deletions docs/list/demo/custom-loading.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const CustomLoading = (props) => (
const App = () => {
const [loading, setLoading] = useState(false);

return <div style={{width: 288}}>
return (<div style={{width: 288}}>
<Button onClick={() => setLoading(!loading)}>Toggle loading</Button>
<List
size="small"
Expand All @@ -67,8 +67,8 @@ const App = () => {
dataSource={data}
renderItem={(item, i) => <List.Item key={i} extra={item.money} title={item.title} media={<Avatar src={item.img}/>}>List Item {i}</List.Item>}
/>
</div>
}
</div>);
};
ReactDOM.render(
<App />
, mountNode);
Expand Down
6 changes: 3 additions & 3 deletions docs/list/demo/loading.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const data = [
const App = () => {
const [loading, setLoading] = useState(false);

return <div style={{width: 288}}>
return (<div style={{width: 288}}>
<Button onClick={() => setLoading(!loading)}>Toggle loading</Button>
<List
size="small"
Expand All @@ -53,8 +53,8 @@ const App = () => {
dataSource={data}
renderItem={(item, i) => <List.Item key={i} extra={item.money} title={item.title} media={<Avatar src={item.img}/>}>List Item {i}</List.Item>}
/>
</div>
}
</div>);
};
ReactDOM.render(
<App />
, mountNode);
Expand Down
6 changes: 3 additions & 3 deletions docs/select/demo/select-scroll-load.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@ class App extends React.Component {
console.log(dataSource, otherData);
this.setState({
dataSource: dataSource.concat(otherData)
})
});
}
}

render() {
return <Select
return (<Select
style={{width: 200}}
dataSource={this.state.dataSource}
menuProps={{onScroll: this.onScroll}}
autoHighlightFirstItem={false}
/>
/>);
}
}

Expand Down
2 changes: 1 addition & 1 deletion docs/table/demo/expanded-lock.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const dataSource = () => {
<Table.Column title="Title" dataIndex="title" width={200}/>
<Table.Column title="Title" dataIndex="title" width={200}/>
<Table.Column title="Title" dataIndex="title" width={200}/>
</Table.StickyLock>)
</Table.StickyLock>);
},
render = (value, index, record) => {
return <a>Remove({record.id})</a>;
Expand Down
10 changes: 5 additions & 5 deletions docs/upload/demo/extra.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@ const showImg = (url) => {
title: 'img preview',
content: <img src={url} style={{width: 400, height: 400}}/>,
footer: false,
})
}
});
};

const actionRender = (file) => {
console.log(file);
return <span style={{position: 'absolute', right: 50}}>
<Button text onClick={e=> {e.preventDefault(); showImg(file.url)}} size="large">
return (<span style={{position: 'absolute', right: 50}}>
<Button text onClick={e=> {e.preventDefault(); showImg(file.url);}} size="large">
<Icon type="eye" style={{marginRight: 12, cursor: 'pointer'}} />
</Button>
<Button text component="a" href={file.url} target="_blank">
<Icon type="download" style={{cursor: 'pointer'}}/>
</Button>
</span>
</span>);
};

const data = [{
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var next = require('./lib/index.js');

next.version = '1.20.28';
next.version = '1.21.0';

module.exports = next;
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@alifd/next",
"version": "1.20.28",
"version": "1.21.0",
"description": "A configurable component library for web built on React.",
"keywords": [
"fusion",
Expand Down
8 changes: 4 additions & 4 deletions scripts/release/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,13 @@ function checkFiles() {
}

function* pushMaster() {
yield runCommond('git checkout master');
// yield runCommond('git checkout master');
yield runCommond('git add .');
yield runCommond(`git commit -m 'chore(*): Release-${masterTag}'`);
yield runCommond('git pull');
yield runCommond('git push origin master');
yield runCommond('git push');

logger.success('******** push to branch master success! ********\n');
logger.success(`******** add commit message Release-${masterTag} success! ********\n`);
}

function* pushPlatformDocsBranch() {
Expand Down Expand Up @@ -171,7 +171,7 @@ function* pushPlatformDocsBranch() {
yield runCommond(`cd platform-docs;git tag ${buildTag}`);
yield runCommond(`cd platform-docs;git push origin ${buildTag}`);

logger.success('******** push to branch platform-docs success! ********\n');
logger.success(`******** add commit message Release-${buildTag} success! ********\n`);
} finally {
yield fs.remove(docs);
yield runCommond('git worktree prune');
Expand Down
2 changes: 1 addition & 1 deletion variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@
@import "lib/tree-select/scss/variable.scss";
@import "lib/typography/scss/variable.scss";
@import "lib/upload/scss/variable.scss";
@import "lib/virtual-list/scss/variable.scss";
@import "lib/virtual-list/scss/variable.scss";

0 comments on commit 9783ede

Please sign in to comment.