diff --git a/build/deploy-ci.sh b/build/deploy-ci.sh index 8450f5813..070a93a19 100644 --- a/build/deploy-ci.sh +++ b/build/deploy-ci.sh @@ -44,9 +44,7 @@ if [ "$TRAVIS_TAG" ]; then SUB_FOLDER='1.4' mkdir $SUB_FOLDER - rm -rf *.js *.css *.map static rm -rf $SUB_FOLDER/** - cp -rf ../../examples/element-ui/** . cp -rf ../../examples/element-ui/** $SUB_FOLDER/ git add -A . git commit -m "$TRAVIS_COMMIT_MSG" diff --git a/build/deploy-faas.sh b/build/deploy-faas.sh index 5a645eb02..0e1f08f10 100644 --- a/build/deploy-faas.sh +++ b/build/deploy-faas.sh @@ -8,9 +8,9 @@ git clone -b gh-pages https://github.com/ElemeFE/element.git && cd element SUB_FOLDER='1.4' mkdir $SUB_FOLDER -rm -rf *.js *.css *.map static +# rm -rf *.js *.css *.map static rm -rf $SUB_FOLDER/** -cp -rf ../../examples/element-ui/** . +# cp -rf ../../examples/element-ui/** . cp -rf ../../examples/element-ui/** $SUB_FOLDER/ cd ../.. diff --git a/build/git-release.sh b/build/git-release.sh index 2795b7a60..5744c36c8 100644 --- a/build/git-release.sh +++ b/build/git-release.sh @@ -1,5 +1,5 @@ #!/usr/bin/env sh -git checkout dev +git checkout 1.x if test -n "$(git status --porcelain)"; then echo 'Unclean working tree. Commit or stash changes first.' >&2; diff --git a/build/release.sh b/build/release.sh index 0a38339b3..2ae15148f 100644 --- a/build/release.sh +++ b/build/release.sh @@ -1,6 +1,3 @@ -git checkout master -git merge dev - #!/usr/bin/env sh set -e echo "Enter release version: " @@ -19,11 +16,7 @@ then echo "Releasing theme-default $VERSION ..." cd packages/theme-default npm version $VERSION --message "[release] $VERSION" - if [[ $VERSION =~ "beta" ]] - then - npm publish --tag beta - else - npm publish + npm publish fi cd ../.. @@ -33,16 +26,8 @@ then npm version $VERSION --message "[release] $VERSION" # publish - git push eleme master + git push eleme 1.x git push eleme refs/tags/v$VERSION - git checkout dev - git rebase master - git push eleme dev - if [[ $VERSION =~ "beta" ]] - then - npm publish --tag beta - else - npm publish - fi + npm publish --tag legacy fi diff --git a/packages/form/src/form-item.vue b/packages/form/src/form-item.vue index 438086aba..c951bab71 100644 --- a/packages/form/src/form-item.vue +++ b/packages/form/src/form-item.vue @@ -147,6 +147,7 @@ }, methods: { validate(trigger, callback = noop) { + this.validateDisabled = false; var rules = this.getFilteredRule(trigger); if ((!rules || rules.length === 0) && !this._props.hasOwnProperty('required')) { callback();