Form: fix validateDisabled

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"

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 ../..
 

build/git-release.sh

 #!/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;

build/release.sh

-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

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();