瀏覽代碼

Update: release script

qingwei.li 8 年之前
父節點
當前提交
d3a32d7343
共有 2 個文件被更改,包括 7 次插入3 次删除
  1. 6 3
      build/release.sh
  2. 1 0
      packages/table/src/table-column.js

+ 6 - 3
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

+ 1 - 0
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];
               }
             }