Skip to content

Commit 2349348

Browse files
tangjinzhoutangjinzhou
committed
Merge branch 'master' into feat-1.4.0
# Conflicts: # components/button/__tests__/__snapshots__/demo.test.js.snap # components/button/buttonTypes.js # components/button/demo/basic.md # components/button/style/index.less # components/button/style/mixin.less # components/form/__tests__/__snapshots__/demo.test.js.snap # components/input/__tests__/__snapshots__/demo.test.js.snap # components/select/__tests__/__snapshots__/demo.test.js.snap # components/select/__tests__/__snapshots__/index.test.js.snap # components/tabs/__tests__/__snapshots__/demo.test.js.snap # components/vc-collapse/src/Collapse.jsx # package.json
2 parents f12d53b + d459b20 commit 2349348

File tree

52 files changed

+1032
-881
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1032
-881
lines changed

‎.prettierrc

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22
"singleQuote": true,
33
"trailingComma": "all",
44
"printWidth": 100,
5+
"proseWrap": "never",
56
"overrides": [
67
{
78
"files": ".prettierrc",
89
"options": {
910
"parser": "json"
1011
}
11-
},
12-
{
13-
"files": ".stylelintrc",
14-
"options": {
15-
"parser": "json"
16-
}
1712
}
1813
]
19-
}
14+
}

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: node_js
22
sudo: required
33
node_js:
4-
- 10.10.0
4+
- 12.4.0
55
before_script:
66
- npm install vue vue-template-compiler
77
script:

‎CHANGELOG.en-US.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,30 @@
1010

1111
---
1212

13+
## 1.3.16
14+
`2019-08-25`
15+
- 🐞 Fix `Select` component to uninstall component error when there is no input [#1091](https://github.com/vueComponent/ant-design-vue/pull/1091)
16+
- 🐞 Fix `Collapse` error when no child element [#1116](https://github.com/vueComponent/ant-design-vue/pull/1116)
17+
- 🐞 Fix TypeScript type definitions.
18+
19+
## 1.3.15
20+
`2019-08-17`
21+
- 🐞 Fix `Select` component cannot scroll under IE [#999](https://github.com/vueComponent/ant-design-vue/issues/999)
22+
- 🐞 Fix `Form` `initialValue` warning [#1076](https://github.com/vueComponent/ant-design-vue/issues/1076)
23+
- 🐞 Fix `Form` error when verifying `Number` type [#1090](https://github.com/vueComponent/ant-design-vue/issues/1090)
24+
25+
## 1.3.14
26+
`2019-08-12`
27+
- 🐞 Fix `MenuItem` parsing array `class` incorrect question [#1009](https://github.com/vueComponent/ant-design-vue/issues/1009)
28+
- 🐞 Fix an error when npm install [#997](https://github.com/vueComponent/ant-design-vue/issues/997)
29+
- 🐞 Fix `Select` component cannot scroll under IE [#999] (https://github.com/vueComponent/ant-design-vue/issues/999)
30+
- 🐞 Fix `Select` component does not trigger focus event problem [#999] (https://github.com/vueComponent/ant-design-vue/issues/999)
31+
- 🐞 Fix `DropdownButton` `size` attribute does not work [#71b7c9](https://github.com/vueComponent/ant-design-vue/commit/71b7c9d33895f55694e28aaba4b2cfca7228771b)
32+
- 🐞 Fix `Table` component does not support vue 2.6 v-slot syntax problem [#1058](https://github.com/vueComponent/ant-design-vue/issues/1058)
33+
- 🌟 `Popover` add `builtinPlacements` attribute [#1073](https://github.com/vueComponent/ant-design-vue/issues/1073)
34+
- 🌟 `Button` support `link` type [#1077](https://github.com/vueComponent/ant-design-vue/pull/1077)
35+
- 🌟 `Modal.confirm` `title` and `content` support function [#824](https://github.com/vueComponent/ant-design-vue/issues/824)
36+
1337
## 1.3.13
1438
`2019-07-22`
1539
- 🐞 Fix `dist` missing `antd.less` file problem [#995](https://github.com/vueComponent/ant-design-vue/issues/995)

‎CHANGELOG.zh-CN.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,30 @@
1010

1111
---
1212

13+
## 1.3.16
14+
`2019-08-25`
15+
- 🐞 修复 `Select` 组件在没有 input 时，卸载组件报错问题 [#1091](https://github.com/vueComponent/ant-design-vue/pull/1091)
16+
- 🐞 修复 `Collapse` 无子元素时报错问题 [#1116](https://github.com/vueComponent/ant-design-vue/pull/1116)
17+
- 🐞 修复 TypeScript 类型定义。
18+
19+
## 1.3.15
20+
`2019-08-17`
21+
- 🐞 修复 `Select` 组件在 IE 下无法滚动问题 [#999](https://github.com/vueComponent/ant-design-vue/issues/999)
22+
- 🐞 修复 `Form` `initialValue` 为空时报 warning 问题 [#1076](https://github.com/vueComponent/ant-design-vue/issues/1076)
23+
- 🐞 修复 `Form` 校验 Number 类型时错误问题 [#1090](https://github.com/vueComponent/ant-design-vue/issues/1090)
24+
25+
## 1.3.14
26+
`2019-08-12`
27+
- 🐞 修复 `MenuItem` 解析数组 `class` 不正确问题 [#1009](https://github.com/vueComponent/ant-design-vue/issues/1009)
28+
- 🐞 修复 npm install 时报错问题 [#997](https://github.com/vueComponent/ant-design-vue/issues/997)
29+
- 🐞 修复 `Select` 组件在 IE 下无法滚动问题 [#999](https://github.com/vueComponent/ant-design-vue/issues/999)
30+
- 🐞 修复 `Select` 组件不触发 focus 事件问题 [#999](https://github.com/vueComponent/ant-design-vue/issues/999)
31+
- 🐞 修复 `DropdownButton` `size` 属性不生效问题 [#71b7c9](https://github.com/vueComponent/ant-design-vue/commit/71b7c9d33895f55694e28aaba4b2cfca7228771b)
32+
- 🐞 修复 `Table` 组件不支持 vue 2.6 v-slot 语法问题 [#1058](https://github.com/vueComponent/ant-design-vue/issues/1058)
33+
- 🌟 `Popover` 添加 `builtinPlacements` 属性 [#1073](https://github.com/vueComponent/ant-design-vue/issues/1073)
34+
- 🌟 `Button` 支持 `link` 类型 [#1077](https://github.com/vueComponent/ant-design-vue/pull/1077)
35+
- 🌟 `Modal.confirm` `title` and `content` 支持 function
36+
1337
## 1.3.13
1438
`2019-07-22`
1539
- 🐞 修复 dist 缺少 antd.less 文件问题 [#995](https://github.com/vueComponent/ant-design-vue/issues/995)

‎README-zh_CN.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<p align="center">
22
<a href="https://vue.ant.design/">
3-
<img width="200" src="http://pvrd7go2h.bkt.clouddn.com/logo.png">
3+
<img width="200" src="https://qn.antdv.com/logo.png">
44
</a>
55
</p>
66

@@ -91,7 +91,7 @@ ant-design-vue是MIT协议的开源项目。为了项目能够更好的持续的
9191
- [Patreon](https://www.patreon.com/tangjinzhou)
9292
- [opencollective](https://opencollective.com/ant-design-vue)
9393
- [paypal](https://www.paypal.me/tangjinzhou)
94-
- [支付宝或微信](http://pvrd7go2h.bkt.clouddn.com/alipay-and-wechat.png)
94+
- [支付宝或微信](https://qn.antdv.com/alipay-and-wechat.png)
9595

9696
## Backers
9797

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<p align="center">
22
<a href="https://vue.ant.design/">
3-
<img width="200" src="http://pvrd7go2h.bkt.clouddn.com/logo.png">
3+
<img width="200" src="https://qn.antdv.com/logo.png">
44
</a>
55
</p>
66

@@ -86,7 +86,7 @@ ant-design-vue is an MIT-licensed open source project. In order to achieve bette
8686
- [Patreon](https://www.patreon.com/tangjinzhou)
8787
- [opencollective](https://opencollective.com/ant-design-vue)
8888
- [paypal](https://www.paypal.me/tangjinzhou)
89-
- [支付宝或微信](http://pvrd7go2h.bkt.clouddn.com/alipay-and-wechat.png)
89+
- [支付宝或微信](https://qn.antdv.com/alipay-and-wechat.png)
9090

9191
## Backers
9292

‎antd-tools/gulpfile.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,10 @@ function tag() {
145145
execSync(`git config --global user.name ${process.env.GITHUB_USER_NAME}`);
146146
execSync(`git tag ${version}`);
147147
execSync(
148-
`git push https://${
149-
process.env.GITHUB_TOKEN
150-
}@github.com/vueComponent/ant-design-vue.git ${version}:${version}`,
148+
`git push https://${process.env.GITHUB_TOKEN}@github.com/vueComponent/ant-design-vue.git ${version}:${version}`,
151149
);
152150
execSync(
153-
`git push https://${
154-
process.env.GITHUB_TOKEN
155-
}@github.com/vueComponent/ant-design-vue.git master:master`,
151+
`git push https://${process.env.GITHUB_TOKEN}@github.com/vueComponent/ant-design-vue.git master:master`,
156152
);
157153
console.log('tagged');
158154
}
@@ -339,7 +335,7 @@ gulp.task(
339335
newVersion &&
340336
newVersion.trim() === version
341337
) {
342-
runCmd('npm', ['pub'], code => {
338+
runCmd('npm', ['run', 'pub'], code => {
343339
done();
344340
});
345341
} else {

‎antd-tools/utils/getRunCmdEnv.js

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,18 @@ module.exports = function getRunCmdEnv() {
99
});
1010
// make sure `antd-tools/node_modules/.bin` in the PATH env
1111
const nodeModulesBinDir = path.join(__dirname, '../../node_modules/.bin');
12-
env.PATH = env.PATH ? `${nodeModulesBinDir}:${env.PATH}` : nodeModulesBinDir;
12+
13+
Object.entries(env)
14+
.filter(
15+
v =>
16+
v
17+
.slice(0, 1)
18+
.pop()
19+
.toLowerCase() === 'path',
20+
)
21+
.forEach(v => {
22+
const key = v.slice(0, 1).pop();
23+
env[key] = env[key] ? `${nodeModulesBinDir}:${env[key]}` : nodeModulesBinDir;
24+
});
1325
return env;
1426
};

‎components/auto-complete/__tests__/__snapshots__/demo.test.js.snap

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`renders ./components/auto-complete/demo/basic.md correctly 1`] = `
4-
<div tabindex="-1" class="ant-select ant-select-combobox ant-select-enabled ant-select-show-search ant-select-auto-complete" style="width: 200px;">
4+
<div tabindex="0" class="ant-select ant-select-combobox ant-select-enabled ant-select-show-search ant-select-auto-complete" style="width: 200px;">
55
<div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
66
<div class="ant-select-selection__rendered">
77
<div unselectable="on" class="ant-select-selection__placeholder" style="display: block; user-select: none;">input here</div>
@@ -17,7 +17,7 @@ exports[`renders ./components/auto-complete/demo/basic.md correctly 1`] = `
1717
1818
exports[`renders ./components/auto-complete/demo/certain-category.md correctly 1`] = `
1919
<div class="certain-category-search-wrapper" style="width: 250px;">
20-
<div tabindex="-1" class="certain-category-search ant-select ant-select-combobox ant-select-enabled ant-select-lg ant-select-lg ant-select-show-search ant-select-auto-complete" style="width: 100%;">
20+
<div tabindex="0" class="certain-category-search ant-select ant-select-combobox ant-select-enabled ant-select-lg ant-select-lg ant-select-show-search ant-select-auto-complete" style="width: 100%;">
2121
<div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
2222
<div class="ant-select-selection__rendered">
2323
<div unselectable="on" class="ant-select-selection__placeholder" style="display: block; user-select: none;">input here</div>
@@ -33,7 +33,7 @@ exports[`renders ./components/auto-complete/demo/certain-category.md correctly 1
3333
`;
3434
3535
exports[`renders ./components/auto-complete/demo/custom.md correctly 1`] = `
36-
<div tabindex="-1" class="ant-select ant-select-combobox ant-select-enabled ant-select-show-search ant-select-auto-complete" style="width: 200px;">
36+
<div tabindex="0" class="ant-select ant-select-combobox ant-select-enabled ant-select-show-search ant-select-auto-complete" style="width: 200px;">
3737
<div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
3838
<div class="ant-select-selection__rendered">
3939
<ul>
@@ -47,7 +47,7 @@ exports[`renders ./components/auto-complete/demo/custom.md correctly 1`] = `
4747
`;
4848
4949
exports[`renders ./components/auto-complete/demo/non-case-sensitive.md correctly 1`] = `
50-
<div tabindex="-1" class="ant-select ant-select-combobox ant-select-enabled ant-select-show-search ant-select-auto-complete" style="width: 200px;">
50+
<div tabindex="0" class="ant-select ant-select-combobox ant-select-enabled ant-select-show-search ant-select-auto-complete" style="width: 200px;">
5151
<div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
5252
<div class="ant-select-selection__rendered">
5353
<div unselectable="on" class="ant-select-selection__placeholder" style="display: block; user-select: none;">input here</div>
@@ -62,7 +62,7 @@ exports[`renders ./components/auto-complete/demo/non-case-sensitive.md correctly
6262
`;
6363
6464
exports[`renders ./components/auto-complete/demo/options.md correctly 1`] = `
65-
<div tabindex="-1" class="ant-select ant-select-combobox ant-select-enabled ant-select-show-search ant-select-auto-complete" style="width: 200px;">
65+
<div tabindex="0" class="ant-select ant-select-combobox ant-select-enabled ant-select-show-search ant-select-auto-complete" style="width: 200px;">
6666
<div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
6767
<div class="ant-select-selection__rendered">
6868
<div unselectable="on" class="ant-select-selection__placeholder" style="display: block; user-select: none;">input here</div>
@@ -78,7 +78,7 @@ exports[`renders ./components/auto-complete/demo/options.md correctly 1`] = `
7878
7979
exports[`renders ./components/auto-complete/demo/uncertain-category.md correctly 1`] = `
8080
<div class="global-search-wrapper" style="width: 300px;">
81-
<div tabindex="-1" class="global-search ant-select ant-select-combobox ant-select-enabled ant-select-lg ant-select-lg ant-select-show-search ant-select-auto-complete" style="width: 100%;">
81+
<div tabindex="0" class="global-search ant-select ant-select-combobox ant-select-enabled ant-select-lg ant-select-lg ant-select-show-search ant-select-auto-complete" style="width: 100%;">
8282
<div role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-controls="test-uuid" class="ant-select-selection ant-select-selection--single">
8383
<div class="ant-select-selection__rendered">
8484
<div unselectable="on" class="ant-select-selection__placeholder" style="display: block; user-select: none;">input here</div>

‎components/auto-complete/index.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ const AutoComplete = {
144144
on: $listeners,
145145
};
146146
return <Select {...selectProps}>{options}</Select>;
147-
}
148-
}
147+
},
148+
};
149149

150150
/* istanbul ignore next */
151151
AutoComplete.install = function(Vue) {

0 commit comments

Comments
 (0)