Merge branch 'hotfix/demo25' into develop

Former-commit-id: fc553f5d0c32cabbd5cd0ca22736b80669355fed [formerly fc553f5d0c32cabbd5cd0ca22736b80669355fed [formerly fc553f5d0c32cabbd5cd0ca22736b80669355fed [formerly fc553f5d0c32cabbd5cd0ca22736b80669355fed [formerly ab7395b7bb237814b474f9957a359d94ca2a8572 [formerly 805b813e0a5e7d6f9ef78257fc80eaa2bdfa806d]]]]]
Former-commit-id: 676f179511fdf37d789edc0aab7593e512ba3f8a
Former-commit-id: 58abf1979d30fe381ea0251b9cb86a04ede62312
Former-commit-id: 648548e06767122baa4ed4ae4d747395c308023c [formerly 23ff28ec5d2d376ab165b39331d5044bdfad0e12]
Former-commit-id: 5f5539f0c2eabe31977f4e4ffdd39db41c058c8c
Former-commit-id: ad621e418b82ea2e30e10892ffd79fabd45f5610
Former-commit-id: eecf7f74e614251623be11326271b640d036fe94
Former-commit-id: 27afe8eb0d1d04568a2e7c0c1e9d72738faf8595
Former-commit-id: feceeed85482a2f8a053aa949091d87dfe2d80a6
This commit is contained in:
liyang
2018-12-29 21:05:53 +08:00

View File

@@ -11,12 +11,10 @@ export default {
type: Boolean,
require: true
},
// 本行的所有数据,此字段不需要额外配置
scope: {
default: null
},
// 通过 component 中 props 字段传过来的数据,此字段需要先在 component 中配置
myProps: {
default: null