mirror of
https://github.com/ant-design/ant-design.git
synced 2024-11-27 20:49:53 +08:00
Merge branch 'master' into feature-3.9.0
This commit is contained in:
afc163
commit
bf2f7e9c33
@ -15,6 +15,13 @@ timeline: true
|
||||
|
||||
---
|
||||
|
||||
## 3.8.4
|
||||
|
||||
`2018-08-27`
|
||||
|
||||
- 🐞 Fixed an issue where the Tag component would cause a line break after deleting the tag.
|
||||
- 🐞 Fixed `Failed to execute 'removeChild' on 'Node'` error when click Switch.
|
||||
|
||||
## 3.8.3
|
||||
|
||||
`2018-08-26`
|
||||
|
||||
@ -15,6 +15,13 @@ timeline: true
|
||||
|
||||
---
|
||||
|
||||
## 3.8.4
|
||||
|
||||
`2018-08-27`
|
||||
|
||||
- 🐞 修复 Tag 组件删除 tag 后会造成换行的问题。
|
||||
- 🐞 修复 Switch 单击时会产生 `Failed to execute 'removeChild' on 'Node'` 错误的问题。
|
||||
|
||||
## 3.8.3
|
||||
|
||||
`2018-08-26`
|
||||
|
||||
@ -83,11 +83,14 @@ export default class Wave extends React.Component<{insertExtraNode?: boolean}> {
|
||||
}
|
||||
|
||||
resetEffect(node: HTMLElement) {
|
||||
if (!node || node === this.extraNode) {
|
||||
return;
|
||||
}
|
||||
const { insertExtraNode } = this.props;
|
||||
const attributeName = this.getAttributeName();
|
||||
node.removeAttribute(attributeName);
|
||||
this.removeExtraStyleNode();
|
||||
if (insertExtraNode) {
|
||||
if (insertExtraNode && this.extraNode && node.contains(this.extraNode)) {
|
||||
node.removeChild(this.extraNode);
|
||||
}
|
||||
TransitionEvents.removeEndEventListener(node, this.onTransitionEnd);
|
||||
|
||||
@ -8,6 +8,10 @@ toc: false
|
||||
|
||||
语义化的矢量图形。
|
||||
|
||||
## 设计师专属 🌟
|
||||
|
||||
安装 [Kitchen Sketch](https://kitchen.alipay.com) 插件，就可以一键拖拽使用 Ant Design 和 Iconfont 官方的海量图标，还可以关联自己的项目哦！
|
||||
|
||||
## 图标的命名规范
|
||||
|
||||
我们为每个图标赋予了语义化的命名，命名规则如下:
|
||||
|
||||
@ -23,6 +23,7 @@
|
||||
animation: fadeEffect 2s @ease-out-circ, waveEffect .4s @ease-out-circ;
|
||||
animation-fill-mode: forwards;
|
||||
display: block;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
@keyframes waveEffect {
|
||||
|
||||
@ -8,6 +8,10 @@ subtitle: 表格
|
||||
|
||||
展示行列数据。
|
||||
|
||||
## 设计师专属 🌟
|
||||
|
||||
还在用 Sketch 手动画表格吗？现在安装 [Kitchen Sketch](https://kitchen.alipay.com/) 插件，两步就可以自动生成 Ant Design 表格组件啦！
|
||||
|
||||
## 何时使用
|
||||
|
||||
- 当有大量结构化的数据需要展现时；
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||
|
||||
exports[`Tag visibility can be controlled by visible with hidden as initial value 1`] = `<div />`;
|
||||
exports[`Tag visibility can be controlled by visible with hidden as initial value 1`] = `<span />`;
|
||||
|
||||
exports[`Tag visibility can be controlled by visible with hidden as initial value 2`] = `
|
||||
<div
|
||||
@ -9,11 +9,7 @@ exports[`Tag visibility can be controlled by visible with hidden as initial valu
|
||||
/>
|
||||
`;
|
||||
|
||||
exports[`Tag visibility can be controlled by visible with hidden as initial value 3`] = `
|
||||
<div
|
||||
style="width: 0px;"
|
||||
/>
|
||||
`;
|
||||
exports[`Tag visibility can be controlled by visible with hidden as initial value 3`] = `<span />`;
|
||||
|
||||
exports[`Tag visibility can be controlled by visible with visible as initial value 1`] = `
|
||||
<div
|
||||
@ -22,16 +18,11 @@ exports[`Tag visibility can be controlled by visible with visible as initial val
|
||||
/>
|
||||
`;
|
||||
|
||||
exports[`Tag visibility can be controlled by visible with visible as initial value 2`] = `
|
||||
<div
|
||||
style="width: 0px;"
|
||||
/>
|
||||
`;
|
||||
exports[`Tag visibility can be controlled by visible with visible as initial value 2`] = `<span />`;
|
||||
|
||||
exports[`Tag visibility can be controlled by visible with visible as initial value 3`] = `
|
||||
<div
|
||||
class="ant-tag"
|
||||
data-show="true"
|
||||
style="width: 0px;"
|
||||
/>
|
||||
`;
|
||||
|
||||
@ -147,7 +147,7 @@ class Tag extends React.Component<TagProps, TagState> {
|
||||
backgroundColor: (color && !isPresetColor) ? color : null,
|
||||
...style,
|
||||
};
|
||||
const tag = this.state.closed ? <div /> : (
|
||||
const tag = this.state.closed ? <span/> : (
|
||||
<div
|
||||
data-show={!this.state.closing}
|
||||
{...divProps}
|
||||
|
||||
@ -85,7 +85,7 @@ Or just [a javascript file path](https://github.com/ant-design/ant-design-pro/bl
|
||||
|
||||
### Customize in create-react-app
|
||||
|
||||
Follow [Use in create-react-app](/docs/react/create-react-app).
|
||||
Follow [Use in create-react-app](/docs/react/use-with-create-react-app).
|
||||
|
||||
### Customize in less file
|
||||
|
||||
|
||||
@ -85,7 +85,7 @@ module.exports = {
|
||||
|
||||
### 在 create-react-app 中定制主题
|
||||
|
||||
参考 [在 create-react-app 中使用](/docs/react/create-react-app) 进行配置即可。
|
||||
参考 [在 create-react-app 中使用](/docs/react/use-with-create-react-app) 进行配置即可。
|
||||
|
||||
### 配置 less 变量文件
|
||||
|
||||
|
||||
@ -10,6 +10,11 @@ Ant Design 将色彩体系解读成两个层面：系统级色彩体系和产品
|
||||
|
||||
---
|
||||
|
||||
## 设计师专属 🌟
|
||||
|
||||
安装 [Kitchen Sketch](https://kitchen.alipay.com) 插件，不但可以使用 Ant Design 官方色板库，还可以管理自己的专属色板哦！
|
||||
|
||||
|
||||
## 色彩模型
|
||||
|
||||
Ant Design 的设计团队倾向于采用 HSB 色彩模型进行设计，该模型更便于设计师在调整色彩时对于颜色有明确的心理预期，同时也方便团队间的沟通。
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "antd",
|
||||
"version": "3.8.3",
|
||||
"version": "3.8.4",
|
||||
"title": "Ant Design",
|
||||
"description": "An enterprise-class UI design language and React-based implementation",
|
||||
"homepage": "http://ant.design/",
|
||||
@ -91,7 +91,6 @@
|
||||
"warning": "~4.0.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/types": "7.0.0-beta.44",
|
||||
"@types/classnames": "^2.2.6",
|
||||
"@types/prop-types": "^15.5.4",
|
||||
"@types/react": "^16.0.0",
|
||||
@ -100,10 +99,10 @@
|
||||
"@yesmeck/offline-plugin": "^5.0.5",
|
||||
"ansi-styles": "^3.2.0",
|
||||
"ant-design-palettes": "^1.0.0",
|
||||
"antd-theme-generator": "1.0.7",
|
||||
"antd-theme-generator": "1.1.3",
|
||||
"antd-tools": "^5.1.6",
|
||||
"babel-cli": "^6.18.0",
|
||||
"babel-eslint": "^8.2.5",
|
||||
"babel-eslint": "^9.0.0",
|
||||
"babel-plugin-import": "^1.0.0",
|
||||
"babel-plugin-transform-runtime": "^6.23.0",
|
||||
"babel-preset-es2015": "^6.18.0",
|
||||
|
||||
@ -133,13 +133,15 @@ export default class Demo extends React.Component {
|
||||
const codepenPrefillConfig = {
|
||||
title: `${localizedTitle} - Ant Design Demo`,
|
||||
html,
|
||||
js: state.sourceCode.replace(/import\s+\{\s+(.*)\s+\}\s+from\s+'antd';/, 'const { $1 } = antd;'),
|
||||
js: state.sourceCode
|
||||
.replace(/import\s+\{\s+(.*)\s+\}\s+from\s+'antd';/, 'const { $1 } = antd;')
|
||||
.replace("import moment from 'moment';", ''),
|
||||
css: prefillStyle,
|
||||
editors: '001',
|
||||
css_external: 'https://unpkg.com/antd/dist/antd.css',
|
||||
js_external: [
|
||||
'react@15.x/dist/react.js',
|
||||
'react-dom@15.x/dist/react-dom.js',
|
||||
'react@16.x/umd/react.development.js',
|
||||
'react-dom@16.x/umd/react-dom.development.js',
|
||||
'moment/min/moment-with-locales.js',
|
||||
'antd/dist/antd-with-locales.js',
|
||||
].map(url => `https://unpkg.com/${url}`).join(';'),
|
||||
|
||||
@ -31,9 +31,7 @@ export default class IconSet extends React.Component {
|
||||
};
|
||||
|
||||
// Show badges
|
||||
newIcons = [
|
||||
'zhihu', 'file-markdown', 'slack', 'slack-square', 'behance', 'behance-square', 'dribbble', 'dribbble-square', 'instagram', 'yuque',
|
||||
];
|
||||
newIcons = [];
|
||||
|
||||
render() {
|
||||
const { justCopied } = this.state;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user