Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Sunny_yiyi
Swagger Ui
提交
cade5100
S
Swagger Ui
项目概览
Sunny_yiyi
/
Swagger Ui
通知
4
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
Swagger Ui
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cade5100
编写于
9月 12, 2017
作者:
O
Owen Conti
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of github.com:swagger-api/swagger-ui into bug/3032-wrong-properties-order
上级
cb88cd53
746e2478
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
31 addition
and
27 deletion
+31
-27
src/core/components/array-model.jsx
src/core/components/array-model.jsx
+6
-1
src/core/components/model.jsx
src/core/components/model.jsx
+25
-25
src/core/components/models.jsx
src/core/components/models.jsx
+0
-1
未找到文件。
src/core/components/array-model.jsx
浏览文件 @
cade5100
...
...
@@ -28,10 +28,15 @@ export default class ArrayModel extends Component {
<
span
className
=
"model-title__text"
>
{
title
}
</
span
>
</
span
>
/*
Note: we set `name={null}` in <Model> below because we don't want
the name of the current Model passed (and displayed) as the name of the array element Model
*/
return
<
span
className
=
"model"
>
<
ModelCollapse
title
=
{
titleEl
}
collapsed
=
{
depth
>
expandDepth
}
collapsedContent
=
"[...]"
>
[
<
span
><
Model
{
...
this
.
props
}
schema
=
{
items
}
required
=
{
false
}
depth
=
{
depth
+
1
}
/></
span
>
<
span
><
Model
{
...
this
.
props
}
name
=
{
null
}
schema
=
{
items
}
required
=
{
false
}
depth
=
{
depth
+
1
}
/></
span
>
]
{
properties
.
size
?
<
span
>
...
...
src/core/components/model.jsx
浏览文件 @
cade5100
...
...
@@ -30,39 +30,38 @@ export default class Model extends Component {
render
()
{
let
{
getComponent
,
specSelectors
,
schema
,
required
,
name
,
isRef
}
=
this
.
props
let
ObjectModel
=
getComponent
(
"
ObjectModel
"
)
let
ArrayModel
=
getComponent
(
"
ArrayModel
"
)
let
PrimitiveModel
=
getComponent
(
"
PrimitiveModel
"
)
const
ObjectModel
=
getComponent
(
"
ObjectModel
"
)
const
ArrayModel
=
getComponent
(
"
ArrayModel
"
)
const
PrimitiveModel
=
getComponent
(
"
PrimitiveModel
"
)
let
type
=
"
object
"
let
$$ref
=
schema
&&
schema
.
get
(
"
$$ref
"
)
let
modelName
=
$$ref
&&
this
.
getModelName
(
$$ref
)
let
modelSchema
,
type
const
deprecated
=
specSelectors
.
isOAS3
()
&&
schema
.
get
(
"
deprecated
"
)
if
(
schema
&&
(
schema
.
get
(
"
type
"
)
||
schema
.
get
(
"
properties
"
))
)
{
modelSchema
=
schema
}
else
if
(
$$ref
)
{
modelSchema
=
this
.
getRefSchema
(
modelName
)
// If we weren't passed a `name` but have a ref, grab the name from the ref
if
(
!
name
&&
$$ref
)
{
name
=
this
.
getModelName
(
$$ref
)
}
type
=
modelSchema
&&
modelSchema
.
get
(
"
type
"
)
if
(
!
type
&&
modelSchema
&&
modelSchema
.
get
(
"
properties
"
)
)
{
type
=
"
object
"
// If we weren't passed a `schema` but have a ref, grab the schema from the ref
if
(
!
schema
&&
$$ref
)
{
schema
=
this
.
getRefSchema
(
name
)
}
const
deprecated
=
specSelectors
.
isOAS3
()
&&
schema
.
get
(
"
deprecated
"
)
isRef
=
isRef
!==
undefined
?
isRef
:
!!
$$ref
type
=
schema
&&
schema
.
get
(
"
type
"
)
||
type
switch
(
type
)
{
case
"
object
"
:
return
<
ObjectModel
className
=
"object"
{
...
this
.
props
}
schema
=
{
modelS
chema
}
name
=
{
modelName
||
name
}
schema
=
{
s
chema
}
name
=
{
name
}
deprecated
=
{
deprecated
}
isRef
=
{
isRef
!==
undefined
?
isRef
:
!!
$$ref
}
/>
isRef
=
{
isRef
}
/>
case
"
array
"
:
return
<
ArrayModel
className
=
"array"
{
...
this
.
props
}
schema
=
{
modelS
chema
}
name
=
{
modelName
||
name
}
schema
=
{
s
chema
}
name
=
{
name
}
deprecated
=
{
deprecated
}
required
=
{
required
}
/>
case
"
string
"
:
...
...
@@ -73,9 +72,10 @@ export default class Model extends Component {
return
<
PrimitiveModel
{
...
this
.
props
}
getComponent
=
{
getComponent
}
schema
=
{
modelS
chema
}
name
=
{
modelName
||
name
}
schema
=
{
s
chema
}
name
=
{
name
}
deprecated
=
{
deprecated
}
required
=
{
required
}
/>
}
required
=
{
required
}
/>
}
}
}
src/core/components/models.jsx
浏览文件 @
cade5100
...
...
@@ -34,7 +34,6 @@ export default class Models extends Component {
return
<
div
className
=
"model-container"
key
=
{
`models-section-
${
name
}
`
}
>
<
ModelWrapper
name
=
{
name
}
schema
=
{
model
}
isRef
=
{
true
}
getComponent
=
{
getComponent
}
specSelectors
=
{
specSelectors
}
/>
</
div
>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录