diff --git a/build/release.sh b/build/release.sh index 93ba423b..1a05b4bb 100644 --- a/build/release.sh +++ b/build/release.sh @@ -1,3 +1,6 @@ +git checkout master +git merge dev + #!/usr/bin/env sh set -e echo "Enter release version: " @@ -25,11 +28,11 @@ then npm version $VERSION --message "[release] $VERSION" # publish - git push eleme dev - git checkout master - git merge dev git push eleme master git push eleme refs/tags/v$VERSION + git checkout dev + git merge master + git push eleme dev npm publish fi diff --git a/packages/table/src/table-column.js b/packages/table/src/table-column.js index fd9ea95e..9a13ebe3 100644 --- a/packages/table/src/table-column.js +++ b/packages/table/src/table-column.js @@ -217,6 +217,7 @@ export default { if (Object.prototype.toString.call(data._self) === '[object Object]') { for (let prop in data._self) { if (!data.hasOwnProperty(prop)) { + // _self.$set(data, prop, data._self[prop]); data[prop] = data._self[prop]; } }