diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 8d6d2cba1..8a375208a 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -1,5 +1,12 @@ ## Changelog +### 1.1.5 + +*2017-01-17* + +- Fixed Menu not activating corresponding menu item after router switching in router mode, #2451 +- Fixed `value` attribute of Collapse not supporting `Number` typed value, #2455 + ### 1.1.4 *2017-01-16* diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 1e4fc947f..cbf824c24 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -1,5 +1,11 @@ ## 更新日志 +### 1.1.5 +*2017-01-17* + +- 修复 Menu 在启用 router 模式下点击菜单跳转后没有激活对应菜单项的问题,#2451 +- 新增 Collapse `value` 属性增加对 `Number` 类型的支持,#2455 + ### 1.1.4 *2017-01-16* diff --git a/build/bin/version.js b/build/bin/version.js new file mode 100644 index 000000000..42e63e91c --- /dev/null +++ b/build/bin/version.js @@ -0,0 +1,6 @@ +var fs = require('fs'); +var path = require('path'); +var version = process.env.VERSION || require('../../package.json').version; +var content = { '1.0.9': '1.0' }; +content[version] = '1.1'; +fs.writeFileSync(path.resolve(__dirname, '../../examples/versions.json'), JSON.stringify(content)); diff --git a/package.json b/package.json index 491a6bcd8..740a272a1 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ ], "scripts": { "bootstrap": "yarn || npm i", - "build:file": "node build/bin/iconInit.js & node build/bin/build-entry.js & node build/bin/i18n.js", + "build:file": "node build/bin/iconInit.js & node build/bin/build-entry.js & node build/bin/i18n.js & node build/bin/version.js", "build:theme": "node build/bin/gen-cssfile && gulp build --gulpfile packages/theme-default/gulpfile.js && cp-cli packages/theme-default/lib lib/theme-default", "build:utils": "cross-env BABEL_ENV=utils babel src --out-dir lib --ignore src/index.js", "clean": "rimraf lib && rimraf packages/*/lib && rimraf test/**/coverage && lerna clean --yes",