github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Update: release script

pull/1207/head
qingwei.li 2016-11-18 19:14:56 +08:00 committed by Leopoldthecoder
parent 528067f3cd
commit 37510831ca
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/release.sh
View File

@ -1,3 +1,6 @@
git checkout master
git merge dev
#!/usr/bin/env sh #!/usr/bin/env sh
set -e set -e
echo "Enter release version: " echo "Enter release version: "
@ -25,11 +28,11 @@ then
npm version $VERSION --message "[release] $VERSION" npm version $VERSION --message "[release] $VERSION"
# publish # publish
git push eleme dev
git checkout master
git merge dev
git push eleme master git push eleme master
git push eleme refs/tags/v$VERSION git push eleme refs/tags/v$VERSION
git checkout dev
git merge master
git push eleme dev
npm publish npm publish
fi fi

1
packages/table/src/table-column.js
View File

@ -217,6 +217,7 @@ export default {
if (Object.prototype.toString.call(data._self) === '[object Object]') { if (Object.prototype.toString.call(data._self) === '[object Object]') {
for (let prop in data._self) { for (let prop in data._self) {
if (!data.hasOwnProperty(prop)) { if (!data.hasOwnProperty(prop)) {
// _self.$set(data, prop, data._self[prop]);
data[prop] = data._self[prop]; data[prop] = data._self[prop];
} }
} }