fix required prop warning when using propsData (fix vuejs#3668)

yyx990803 · yyx990803 · commit 2f35c99bd3e9 · 2016-09-23T10:45:37.000-04:00
diff --git a/src/compiler/compile-props.js b/src/compiler/compile-props.js
@@ -145,7 +145,12 @@ export function compileProps (el, propOptions, vm) {
           'kebab-case for props in templates.',
           vm
         )
-      } else if (options.required) {
+      } else if (options.required && (
+        !propsData || (
+          !(name in propsData) &&
+          !(path in propsData)
+        )
+      )) {
         // warn missing required
         warn('Missing required prop: ' + name, vm)
       }

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,12 @@ export function compileProps (el, propOptions, vm) {`
`145`	`145`	`'kebab-case for props in templates.',`
`146`	`146`	`vm`
`147`	`147`	`)`
`148`		`- } else if (options.required) {`
	`148`	`+ } else if (options.required && (`
	`149`	`+ !propsData \|\| (`
	`150`	`+ !(name in propsData) &&`
	`151`	`+ !(path in propsData)`
	`152`	`+ )`
	`153`	`+ )) {`
`149`	`154`	`// warn missing required`
`150`	`155`	`warn('Missing required prop: ' + name, vm)`
`151`	`156`	`}`