test/ant-design
1
0
Fork 0
mirror of https://gitee.com/ant-design/ant-design.git synced 2024-11-30 11:08:45 +08:00
Code Issues Actions 68 Packages Projects Releases Wiki Activity

Merge branch 'master' into antd-3.0

Browse Source
This commit is contained in:
afc163 2017-09-13 14:29:01 +08:00
commit 2e8e9ccf61
6 changed files with 16 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.en-US.md
View File

@ -66,7 +66,6 @@ If you want to read change logs before `2.0.0`, please visit [GitHub](https://gi
- 📖 Rewrite the [Use in create-react-app](/docs/react/use-with-create-react-app) documentation without ejecting. [#7276](https://github.com/ant-design/ant-design/pull/7276)
- 🌟 Better empty data style for fixed-columns Table. [#7298](https://github.com/ant-design/ant-design/issues/7298)
![](https://gw.alipayobjects.com/zos/rmsportal/kpxITHnXvsLlMTqEKgUm.gif)
- 🐞 Fix `disabled` logic of CheckboxGroup and Checkbox. [#7266](https://github.com/ant-design/ant-design/issues/7266) [@dilidili](https://github.com/dilidili)
- 🐞 Fix errors of rendering Spin and Carousel in react-snapshot or other jsdom environment. [#3308](https://github.com/ant-design/ant-design/issues/3308) [#7318](https://github.com/ant-design/ant-design/issues/7318)
- 🐞 Fix some details of Select, Tooltip and Menu.

3
CHANGELOG.zh-CN.md
View File

@ -66,9 +66,6 @@ timeline: true
- 📖 重写了 [《在 create-react-app 中使用》](/docs/react/use-with-create-react-app) 文档，现在不再需要 eject。[#7276](https://github.com/ant-design/ant-design/pull/7276)
- 🌟 优化了固定列的空表格样式。[#7298](https://github.com/ant-design/ant-design/issues/7298)
![](https://gw.alipayobjects.com/zos/rmsportal/kpxITHnXvsLlMTqEKgUm.gif)
- 🐞 修复了 CheckboxGroup 和 Checkbox 的 `disabled` 属性逻辑。[#7266](https://github.com/ant-design/ant-design/issues/7266) [@dilidili](https://github.com/dilidili)
- 🐞 修复在 react-snapshot 或 jsdom 环境下测试 Spin 和 Carousel 时报错的问题。[#3308](https://github.com/ant-design/ant-design/issues/3308) [#7318](https://github.com/ant-design/ant-design/issues/7318)
- 🐞 修复 Select、Tooltip、Menu 的一些细节样式问题。

18
README.md
View File

@ -58,7 +58,15 @@ import 'antd/dist/antd.css'; // or 'antd/dist/antd.less'
### Use modularized antd
- Use [babel-plugin-import](https://github.com/ant-design/babel-plugin-import) (Recommended)
- Manually import
```jsx
import DatePicker from 'antd/lib/date-picker'; // for js
import 'antd/lib/date-picker/style/css'; // for css
// import 'antd/lib/date-picker/style'; // that will import less
```
- Use [babel-plugin-import](https://github.com/ant-design/babel-plugin-import)
```js
// .babelrc or babel-loader option
@ -76,14 +84,6 @@ import 'antd/dist/antd.css'; // or 'antd/dist/antd.less'
import { DatePicker } from 'antd';
```
- Manually import
```jsx
import DatePicker from 'antd/lib/date-picker'; // for js
import 'antd/lib/date-picker/style/css'; // for css
// import 'antd/lib/date-picker/style'; // that will import less
```
### TypeScript
```js

78
components/table/__tests__/__snapshots__/empty.test.js.snap
View File

@ -356,55 +356,11 @@ exports[`Table renders empty table with fixed columns 1`] = `
</thead>
<tbody
class="ant-table-tbody"
>
<tr
class="ant-table-row ant-table-row-level-0 ant-table-row-empty-placeholder"
style="color:transparent;background:transparent;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none;pointer-events:none;"
>
<td
class=""
>
<span
class="ant-table-row-indent indent-level-0"
style="padding-left:0px;"
/>
</td>
<td
class=""
/>
<td
class=""
/>
<td
class=""
/>
<td
class=""
/>
<td
class=""
/>
<td
class=""
/>
<td
class=""
/>
<td
class=""
/>
<td
class=""
/>
<td
class=""
/>
</tr>
</tbody>
/>
</table>
</div>
<div
class="ant-table-placeholder ant-table-placeholder-fixed-columns"
class="ant-table-placeholder"
>
<span>
<i
@ -456,24 +412,7 @@ exports[`Table renders empty table with fixed columns 1`] = `
</thead>
<tbody
class="ant-table-tbody"
>
<tr
class="ant-table-row ant-table-row-level-0 ant-table-row-empty-placeholder"
style="color:transparent;background:transparent;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none;pointer-events:none;"
>
<td
class=""
>
<span
class="ant-table-row-indent indent-level-0"
style="padding-left:0px;"
/>
</td>
<td
class=""
/>
</tr>
</tbody>
/>
</table>
</div>
</div>
@ -510,16 +449,7 @@ exports[`Table renders empty table with fixed columns 1`] = `
</thead>
<tbody
class="ant-table-tbody"
>
<tr
class="ant-table-row ant-table-row-level-0 ant-table-row-empty-placeholder"
style="color:transparent;background:transparent;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none;pointer-events:none;"
>
<td
class=""
/>
</tr>
</tbody>
/>
</table>
</div>
</div>

42
components/table/style/index.less
View File

@ -69,11 +69,6 @@
&-tbody > tr > td {
border-bottom: @border-width-base @border-style-base @border-color-split;
transition: all .3s;
// height placeholder for empty cell
&:empty:after {
content: '.';
visibility: hidden;
}
}
&-thead > tr,
@ -437,45 +432,10 @@
text-align: center;
font-size: @font-size-base;
color: @text-color-secondary;
z-index: 1;
.@{iconfont-css-prefix} {
margin-right: 4px;
}
&-fixed-columns {
position: absolute;
bottom: 0;
width: 100%;
background: transparent;
pointer-events: none;
// tricky code for https://github.com/ant-design/ant-design/issues/7457
overflow-x: scroll;
opacity: 0.4;
color: #000;
}
}
// Fix https://github.com/ant-design/ant-design/issues/7509
&-middle &-placeholder {
padding: 10px 8px;
}
&-small &-placeholder {
padding: 6px 8px;
}
// not scrollable
&-scroll-position-left&-scroll-position-right &-placeholder-fixed-columns {
overflow-x: hidden;
}
&-row-empty-placeholder {
> td {
border-right-color: transparent !important;
}
> td > * {
color: transparent !important;
opacity: 0 !important;
height: 0 !important;
}
}
&-pagination {

4
package.json
View File

@ -64,7 +64,7 @@
"rc-slider": "~8.2.0",
"rc-steps": "~3.0.0",
"rc-switch": "~1.5.1",
"rc-table": "~5.6.7",
"rc-table": "~5.6.9",
"rc-tabs": "~9.1.2",
"rc-time-picker": "~2.4.1",
"rc-tooltip": "~3.4.6",
@ -80,7 +80,7 @@
"devDependencies": {
"@types/react": "^15.0.38",
"@types/react-dom": "~0.14.18",
"antd-tools": "~1.8.0",
"antd-tools": "~2.1.0",
"babel-cli": "^6.18.0",
"babel-eslint": "^7.1.0",
"babel-plugin-import": "^1.0.0",