Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wanjj_1210
ant-design
提交
b9ce4c7d
A
ant-design
项目概览
wanjj_1210
/
ant-design
与 Fork 源项目一致
从无法访问的项目Fork
通知
10
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
ant-design
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b9ce4c7d
编写于
10月 27, 2015
作者:
K
KgTong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
replace the table loading with spin
上级
5c1a1171
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
32 addition
and
19 deletion
+32
-19
components/spin/index.jsx
components/spin/index.jsx
+1
-1
components/table/index.jsx
components/table/index.jsx
+19
-4
style/components/table.less
style/components/table.less
+12
-14
未找到文件。
components/spin/index.jsx
浏览文件 @
b9ce4c7d
...
@@ -17,7 +17,7 @@ let AntSpin = React.createClass({
...
@@ -17,7 +17,7 @@ let AntSpin = React.createClass({
render
()
{
render
()
{
const
props
=
this
.
props
;
const
props
=
this
.
props
;
let
className
=
classSet
({
let
className
=
classSet
({
spin
:
1
,
spin
:
1
,
[
`spin-
${
props
.
type
}
`
]:
1
,
[
`spin-
${
props
.
type
}
`
]:
1
,
...
...
components/table/index.jsx
浏览文件 @
b9ce4c7d
...
@@ -5,6 +5,7 @@ import Checkbox from '../checkbox';
...
@@ -5,6 +5,7 @@ import Checkbox from '../checkbox';
import
FilterDropdown
from
'
./filterDropdown
'
;
import
FilterDropdown
from
'
./filterDropdown
'
;
import
Pagination
from
'
../pagination
'
;
import
Pagination
from
'
../pagination
'
;
import
objectAssign
from
'
object-assign
'
;
import
objectAssign
from
'
object-assign
'
;
import
Spin
from
'
../spin
'
;
function
noop
()
{
function
noop
()
{
}
}
...
@@ -468,9 +469,6 @@ let AntTable = React.createClass({
...
@@ -468,9 +469,6 @@ let AntTable = React.createClass({
let
columns
=
this
.
renderRowSelection
();
let
columns
=
this
.
renderRowSelection
();
let
classString
=
''
;
let
classString
=
''
;
let
expandIconAsCell
=
this
.
props
.
expandedRowRender
&&
this
.
props
.
expandIconAsCell
!==
false
;
let
expandIconAsCell
=
this
.
props
.
expandedRowRender
&&
this
.
props
.
expandIconAsCell
!==
false
;
if
(
this
.
state
.
loading
&&
!
this
.
isLocalDataSource
())
{
classString
+=
'
ant-table-loading
'
;
}
if
(
this
.
props
.
size
===
'
small
'
)
{
if
(
this
.
props
.
size
===
'
small
'
)
{
classString
+=
'
ant-table-small
'
;
classString
+=
'
ant-table-small
'
;
}
}
...
@@ -490,7 +488,23 @@ let AntTable = React.createClass({
...
@@ -490,7 +488,23 @@ let AntTable = React.createClass({
</
div
>;
</
div
>;
emptyClass
=
'
ant-table-empty
'
;
emptyClass
=
'
ant-table-empty
'
;
}
}
return
<
div
className
=
{
'
clearfix
'
+
emptyClass
}
>
// spin holder
let
spinEl
;
let
spinWrapperClass
=
''
;
if
(
this
.
state
.
loading
&&
!
this
.
isLocalDataSource
())
{
// if there is no pagination or no data, the height of spin should decrease by half of pagination
let
paginationPatchClass
=
(
this
.
hasPagination
()
&&
data
&&
data
.
length
!==
0
)
?
'
ant-table-with-pagination
'
:
'
ant-table-without-pagination
'
;
let
spinClass
=
`
${
paginationPatchClass
}
ant-table-spin-holder`
;
spinEl
=
<
div
className
=
{
spinClass
}
>
<
Spin
size
=
"md"
type
=
"primary"
/>
</
div
>;
spinWrapperClass
=
'
ant-table-loading
'
;
}
return
<
div
className
=
{
'
clearfix
'
+
emptyClass
+
spinWrapperClass
}
>
<
Table
<
Table
{
...
this
.
props
}
{
...
this
.
props
}
data
=
{
data
}
data
=
{
data
}
...
@@ -499,6 +513,7 @@ let AntTable = React.createClass({
...
@@ -499,6 +513,7 @@ let AntTable = React.createClass({
expandIconAsCell
=
{
expandIconAsCell
}
expandIconAsCell
=
{
expandIconAsCell
}
/>
/>
{
emptyText
}
{
emptyText
}
{
spinEl
}
{
this
.
renderPagination
()
}
{
this
.
renderPagination
()
}
</
div
>;
</
div
>;
}
}
...
...
style/components/table.less
浏览文件 @
b9ce4c7d
...
@@ -82,23 +82,21 @@
...
@@ -82,23 +82,21 @@
&-loading {
&-loading {
position: relative;
position: relative;
.@{table-prefix-cls}-body {
.@{table-prefix-cls}-body {
opacity: 0.
42
;
opacity: 0.
6
;
}
}
&:after {
.@{table-prefix-cls}-spin-holder {
position: absolute;
display: inline-block;
.animation(loadingCircle 1.5s infinite linear);
content: "\e610";
top: 50%;
left: 50%;
margin-top: -10px;
margin-left: -10px;
font-family: anticon;
width: 20px;
height: 20px;
height: 20px;
line-height: 20px;
line-height: 20px;
font-size: 20px;
left: 50%;
color: @primary-color;
top: 50%;
margin-left: -30px;
position: absolute;
}
.@{table-prefix-cls}-with-pagination {
margin-top: -20px;
}
.@{table-prefix-cls}-without-pagination {
margin-top: 10px;
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录