Commit d3a32d73 authored by qingwei.li's avatar qingwei.li Committed by 杨奕

Update: release script

parent d51635ae
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 ...@@ -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
...@@ -217,6 +217,7 @@ export default { ...@@ -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];
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment