Преглед на файлове

Merge pull request #3941 from shockey/bug/3932-schema-not-values

Don't treat `not` as an array (in contrast to `allOf`, `anyOf`, `oneOf`)
bubble
kyle преди 6 години
committed by GitHub
родител
ревизия
01d84cdc0f
No known key found for this signature in database GPG ключ ID: 4AEE18F83AFDEB23
променени са 2 файла, в които са добавени 9 реда и са изтрити 7 реда
  1. +2
    -1
      src/core/components/model.jsx
  2. +7
    -6
      src/core/components/object-model.jsx

+ 2
- 1
src/core/components/model.jsx Целия файл

@@ -1,9 +1,10 @@
import React, { PureComponent } from "react"
import ImPropTypes from "react-immutable-proptypes"
import PropTypes from "prop-types"

export default class Model extends PureComponent {
static propTypes = {
schema: PropTypes.object.isRequired,
schema: ImPropTypes.orderedMap.isRequired,
getComponent: PropTypes.func.isRequired,
specSelectors: PropTypes.object.isRequired,
name: PropTypes.string,


+ 7
- 6
src/core/components/object-model.jsx Целия файл

@@ -142,12 +142,13 @@ export default class ObjectModel extends Component {
: <tr>
<td>{ "not ->" }</td>
<td>
{not.map((schema, k) => {
return <div key={k}><Model { ...otherProps } required={ false }
getComponent={ getComponent }
schema={ schema }
depth={ depth + 1 } /></div>
})}
<div>
<Model { ...otherProps }
required={ false }
getComponent={ getComponent }
schema={ not }
depth={ depth + 1 } />
</div>
</td>
</tr>
}


Зареждане…
Отказ
Запис