github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Form: fix validateDisabled

pull/7748/head^2
Leopoldthecoder 2017-10-26 12:18:47 +08:00 committed by 杨奕
parent 4aff63826c
commit 2a745aa8bf
5 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/deploy-ci.sh
View File

@ -44,9 +44,7 @@ if [ "$TRAVIS_TAG" ]; then
SUB_FOLDER='1.4' SUB_FOLDER='1.4'
mkdir $SUB_FOLDER mkdir $SUB_FOLDER
rm -rf *.js *.css *.map static
rm -rf $SUB_FOLDER/** rm -rf $SUB_FOLDER/**
cp -rf ../../examples/element-ui/** .
cp -rf ../../examples/element-ui/** $SUB_FOLDER/ cp -rf ../../examples/element-ui/** $SUB_FOLDER/
git add -A . git add -A .
git commit -m "$TRAVIS_COMMIT_MSG" git commit -m "$TRAVIS_COMMIT_MSG"

4
build/deploy-faas.sh
View File

@ -8,9 +8,9 @@ git clone -b gh-pages https://github.com/ElemeFE/element.git && cd element
SUB_FOLDER='1.4' SUB_FOLDER='1.4'
mkdir $SUB_FOLDER mkdir $SUB_FOLDER
rm -rf *.js *.css *.map static # rm -rf *.js *.css *.map static
rm -rf $SUB_FOLDER/** rm -rf $SUB_FOLDER/**
cp -rf ../../examples/element-ui/** . # cp -rf ../../examples/element-ui/** .
cp -rf ../../examples/element-ui/** $SUB_FOLDER/ cp -rf ../../examples/element-ui/** $SUB_FOLDER/
cd ../.. cd ../..

2
build/git-release.sh
View File

@ -1,5 +1,5 @@
#!/usr/bin/env sh #!/usr/bin/env sh
git checkout dev git checkout 1.x
if test -n "$(git status --porcelain)"; then if test -n "$(git status --porcelain)"; then
echo 'Unclean working tree. Commit or stash changes first.' >&2; echo 'Unclean working tree. Commit or stash changes first.' >&2;

21
build/release.sh
View File

@ -1,6 +1,3 @@
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: "
@ -19,11 +16,7 @@ then
echo "Releasing theme-default $VERSION ..." echo "Releasing theme-default $VERSION ..."
cd packages/theme-default cd packages/theme-default
npm version $VERSION --message "[release] $VERSION" npm version $VERSION --message "[release] $VERSION"
if [[ $VERSION =~ "beta" ]] npm publish
then
npm publish --tag beta
else
npm publish
fi fi
cd ../.. cd ../..
@ -33,16 +26,8 @@ then
npm version $VERSION --message "[release] $VERSION" npm version $VERSION --message "[release] $VERSION"
# publish # publish
git push eleme master git push eleme 1.x
git push eleme refs/tags/v$VERSION git push eleme refs/tags/v$VERSION
git checkout dev
git rebase master
git push eleme dev
if [[ $VERSION =~ "beta" ]] npm publish --tag legacy
then
npm publish --tag beta
else
npm publish
fi
fi fi

1
packages/form/src/form-item.vue
View File

@ -147,6 +147,7 @@
}, },
methods: { methods: {
validate(trigger, callback = noop) { validate(trigger, callback = noop) {
this.validateDisabled = false;
var rules = this.getFilteredRule(trigger); var rules = this.getFilteredRule(trigger);
if ((!rules || rules.length === 0) && !this._props.hasOwnProperty('required')) { if ((!rules || rules.length === 0) && !this._props.hasOwnProperty('required')) {
callback(); callback();