chore: auto merge branchs (#34635)

chore: merge master into feature
This commit is contained in:
github-actions[bot] 2022-03-22 02:18:06 +00:00 committed by GitHub
commit 2f65904de2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 132 additions and 35 deletions

View File

@ -11,7 +11,7 @@ jobs:
CI_JOB_NUMBER: 1 CI_JOB_NUMBER: 1
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: preactjs/compressed-size-action@v2 - uses: preactjs/compressed-size-action@v2
with: with:
repo-token: "${{ secrets.GITHUB_TOKEN }}" repo-token: "${{ secrets.GITHUB_TOKEN }}"

View File

@ -8,14 +8,14 @@ jobs:
issue-open-check: issue-open-check:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions-cool/check-user-permission@v1 - uses: actions-cool/check-user-permission@v2
id: checkUser id: checkUser
with: with:
require: 'write' require: 'write'
check-bot: true check-bot: true
- name: check invalid - name: check invalid
if: (contains(github.event.issue.body, 'ant-design-issue-helper') == false) && (steps.checkUser.outputs.result == 'false') if: (contains(github.event.issue.body, 'ant-design-issue-helper') == false) && (steps.checkUser.outputs.require-result == 'false')
uses: actions-cool/issues-helper@v3 uses: actions-cool/issues-helper@v3
with: with:
actions: 'create-comment,add-labels,close-issue' actions: 'create-comment,add-labels,close-issue'
@ -83,6 +83,6 @@ jobs:
with: with:
DING_TALK_TOKEN: ${{ secrets.DINGDING_BOT_TOKEN }} DING_TALK_TOKEN: ${{ secrets.DINGDING_BOT_TOKEN }}
notify_title: '🔥 @${{ github.event.issue.user.login }} 创建了 issue${{ github.event.issue.title }}' notify_title: '🔥 @${{ github.event.issue.user.login }} 创建了 issue${{ github.event.issue.title }}'
notify_body: '### 🔥 @${{ github.event.issue.user.login }} 创建了 issue[${{ github.event.issue.title }}](${{ github.event.issue.html_url }}) <hr /> ${{ github.event.issue.body }}' notify_body: '### 🔥 @${{ github.event.issue.user.login }} 创建了 issue[${{ github.event.issue.title }}](${{ github.event.issue.html_url }}) <hr /> ![](https://gw.alipayobjects.com/zos/antfincdn/5Cl2G7JjF/jieping2022-03-20%252520xiawu11.06.04.png) <hr /> ${{ github.event.issue.body }}'
notify_footer: '> 💬 欢迎前往 GitHub 进行讨论,社区可能需要你的帮助。' notify_footer: '> 💬 欢迎前往 GitHub 进行讨论,社区可能需要你的帮助。'
at_all: false # whether to ding everybody at_all: false # whether to ding everybody

View File

@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: analysis - name: analysis
uses: actions-cool/issues-similarity-analysis@v1.0.0 uses: actions-cool/issues-similarity-analysis@v1.1.0
with: with:
filter-threshold: 0.5 filter-threshold: 0.5
title-excludes: '' title-excludes: ''

View File

@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: cache package-lock.json - name: cache package-lock.json
uses: actions/cache@v2 uses: actions/cache@v2
@ -47,7 +47,7 @@ jobs:
needs: setup needs: setup
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: restore cache from package-lock.json - name: restore cache from package-lock.json
uses: actions/cache@v2 uses: actions/cache@v2
@ -68,7 +68,7 @@ jobs:
SITE_ENV: development SITE_ENV: development
- name: upload site artifact - name: upload site artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: site name: site
path: _site/ path: _site/
@ -81,7 +81,7 @@ jobs:
- name: Upload PR number - name: Upload PR number
if: ${{ always() }} if: ${{ always() }}
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: pr name: pr
path: ./pr-id.txt path: ./pr-id.txt

View File

@ -10,7 +10,7 @@ jobs:
if: github.event.issue.pull_request != '' && (contains(github.event.comment.body, '/rebase') || contains(github.event.comment.body, '\rebase')) if: github.event.issue.pull_request != '' && (contains(github.event.comment.body, '/rebase') || contains(github.event.comment.body, '\rebase'))
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Automatic Rebase - name: Automatic Rebase

View File

@ -10,7 +10,7 @@ jobs:
if: github.event.ref_type == 'tag' && (contains(github.event.ref, '-') == false) if: github.event.ref_type == 'tag' && (contains(github.event.ref, '-') == false)
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: cache package-lock.json - name: cache package-lock.json
uses: actions/cache@v2 uses: actions/cache@v2
@ -43,7 +43,7 @@ jobs:
needs: setup needs: setup
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: restore cache from package-lock.json - name: restore cache from package-lock.json
uses: actions/cache@v2 uses: actions/cache@v2

View File

@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: cache package-lock.json - name: cache package-lock.json
uses: actions/cache@v2 uses: actions/cache@v2
@ -41,7 +41,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: restore cache from package-lock.json - name: restore cache from package-lock.json
uses: actions/cache@v2 uses: actions/cache@v2
@ -78,7 +78,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: restore cache from package-lock.json - name: restore cache from package-lock.json
uses: actions/cache@v2 uses: actions/cache@v2
@ -100,7 +100,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: restore cache from package-lock.json - name: restore cache from package-lock.json
uses: actions/cache@v2 uses: actions/cache@v2
@ -122,7 +122,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: restore cache from package-lock.json - name: restore cache from package-lock.json
uses: actions/cache@v2 uses: actions/cache@v2
@ -145,7 +145,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: restore cache from package-lock.json - name: restore cache from package-lock.json
uses: actions/cache@v2 uses: actions/cache@v2
@ -171,7 +171,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: restore cache from package-lock.json - name: restore cache from package-lock.json
uses: actions/cache@v2 uses: actions/cache@v2
@ -194,7 +194,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: restore cache from package-lock.json - name: restore cache from package-lock.json
uses: actions/cache@v2 uses: actions/cache@v2
@ -225,7 +225,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: restore cache from package-lock.json - name: restore cache from package-lock.json
uses: actions/cache@v2 uses: actions/cache@v2
@ -256,7 +256,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: restore cache from package-lock.json - name: restore cache from package-lock.json
uses: actions/cache@v2 uses: actions/cache@v2
@ -296,7 +296,7 @@ jobs:
REACT: 16 REACT: 16
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: restore cache from package-lock.json - name: restore cache from package-lock.json
uses: actions/cache@v2 uses: actions/cache@v2
@ -324,7 +324,7 @@ jobs:
REACT: 16 REACT: 16
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: restore cache from package-lock.json - name: restore cache from package-lock.json
uses: actions/cache@v2 uses: actions/cache@v2
@ -352,7 +352,7 @@ jobs:
REACT: 16 REACT: 16
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: restore cache from package-lock.json - name: restore cache from package-lock.json
uses: actions/cache@v2 uses: actions/cache@v2
@ -388,7 +388,7 @@ jobs:
REACT: 16 REACT: 16
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: restore cache from package-lock.json - name: restore cache from package-lock.json
uses: actions/cache@v2 uses: actions/cache@v2
@ -424,7 +424,7 @@ jobs:
REACT: 16 REACT: 16
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: restore cache from package-lock.json - name: restore cache from package-lock.json
uses: actions/cache@v2 uses: actions/cache@v2
@ -460,7 +460,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: restore cache from package-lock.json - name: restore cache from package-lock.json
uses: actions/cache@v2 uses: actions/cache@v2

View File

@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: cache package-lock.json - name: cache package-lock.json
uses: actions/cache@v2 uses: actions/cache@v2
@ -44,7 +44,7 @@ jobs:
run: npm run test-image run: npm run test-image
- name: upload snapshots artifact - name: upload snapshots artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: snapshots name: snapshots
path: imageSnapshots/ path: imageSnapshots/
@ -60,7 +60,7 @@ jobs:
- name: Upload commit - name: Upload commit
if: ${{ always() }} if: ${{ always() }}
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: commit name: commit
path: ./commit.txt path: ./commit.txt
@ -75,7 +75,7 @@ jobs:
- name: Upload branch - name: Upload branch
if: ${{ always() }} if: ${{ always() }}
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: branch name: branch
path: ./branch.txt path: ./branch.txt

View File

@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: contains(github.event.pull_request.title, 'changelog') || contains(github.event.pull_request.title, 'release') if: contains(github.event.pull_request.title, 'changelog') || contains(github.event.pull_request.title, 'release')
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: verify-version - name: verify-version
uses: actions-cool/verify-package-version@v1 uses: actions-cool/verify-package-version@v1
with: with:

View File

@ -15,6 +15,21 @@ timeline: true
--- ---
## 4.19.3
`2022-03-21`
- 🐞 Fix TextArea `clearIcon` color. [#34610](https://github.com/ant-design/ant-design/pull/34610)
- 🐞 Fix: apply scale transform to disabled star. [#34547](https://github.com/ant-design/ant-design/pull/34547) [@Unuuuuu](https://github.com/Unuuuuu)
- 🐞 Fix Tooltip arrow color with preset. [#34548](https://github.com/ant-design/ant-design/pull/34548)
- 🐞 Fixed number abnormal position display in Badge RTL mode. [#34545](https://github.com/ant-design/ant-design/pull/34545)
- 💄 Fix numeric Row and Col class styles when using prefixCls. [#34494](https://github.com/ant-design/ant-design/pull/34494) [@mic-web](https://github.com/mic-web)
- 🐞 Fix Editable Textarea height jump in Firefox and Editable Typography.Title confirm icon position. [#34518](https://github.com/ant-design/ant-design/pull/34518)
- 💄 Fix missing `status` style in RangePicker. [#34509](https://github.com/ant-design/ant-design/pull/34509)
- 🛎 Add warning for Input getting blurred when dynamically add `hasFeedback`. [#34475](https://github.com/ant-design/ant-design/pull/34475)
- 🐞 Fix missing classname in input when Input has `prefix` or `suffix`. [#34474](https://github.com/ant-design/ant-design/pull/34474)
- 🌐 Updated it_LT locale for `typeTemplate`. [#34567](https://github.com/ant-design/ant-design/pull/34567) [@Anizcus](https://gitit_LTit_LThub.com/Anizcus)
## 4.19.2 ## 4.19.2
`2022-03-13` `2022-03-13`

View File

@ -15,6 +15,21 @@ timeline: true
--- ---
## 4.19.3
`2022-03-21`
- 🐞 修复 TextArea `clearIcon` 的颜色问题。[#34610](https://github.com/ant-design/ant-design/pull/34610)
- 🐞 修复 Rate 下 disabled 时依然有 hover 效果的问题。[#34547](https://github.com/ant-design/ant-design/pull/34547) [@Unuuuuu](https://github.com/Unuuuuu)
- 🐞 修复 Tooltip 使用预设颜色时 arrow 颜色错误的问题。[#34548](https://github.com/ant-design/ant-design/pull/34548)
- 🐞 修复 Badge 数字 RTL 模式下异常位置显示。[#34545](https://github.com/ant-design/ant-design/pull/34545)
- 💄 修复使用 `prefixCls` 时的数字 Row 和 Col 类样式问题。[#34494](https://github.com/ant-design/ant-design/pull/34494) [@mic-web](https://github.com/mic-web)
- 🐞 修复 Typography `editable` 切换时在 Firefox 下高度跳动 和 Typography.Title `editable` 确定图标错位的问题。[#34518](https://github.com/ant-design/ant-design/pull/34518)
- 💄 修复 RangePicker `status` 相关样式丢失的问题。[#34509](https://github.com/ant-design/ant-design/pull/34509)
- 🛎 为动态改变 Form.Item 的 `hasFeedback` 时 Input 焦点丢失添加警告。[#34475](https://github.com/ant-design/ant-design/pull/34475)
- 🐞 修复 Input 有 `prefix` 或者 `suffix` 时 input 缺少某些 className 的问题。[#34474](https://github.com/ant-design/ant-design/pull/34474)
- 🌐 更新 it_LT 的 locale。[#34567](https://github.com/ant-desin/ant-design/pull/34567) [@Anizcus](https://github.com/Anizcus)
## 4.19.2 ## 4.19.2
`2022-03-13` `2022-03-13`

View File

@ -1,11 +1,21 @@
@media screen and (max-width: @screen-md) { @media screen and (max-width: @screen-md) {
.@{backtop-prefix-cls} { .@{backtop-prefix-cls} {
right: 60px; right: 60px;
&-rtl {
right: auto;
left: 60px;
}
} }
} }
@media screen and (max-width: @screen-xs) { @media screen and (max-width: @screen-xs) {
.@{backtop-prefix-cls} { .@{backtop-prefix-cls} {
right: 20px; right: 20px;
&-rtl {
right: auto;
left: 20px;
}
} }
} }

View File

@ -30,6 +30,19 @@
} }
} }
} }
&-zoom-appear,
&-zoom-enter {
.@{badge-prefix-cls}-rtl & {
animation-name: antZoomBadgeInRtl;
}
}
&-zoom-leave {
.@{badge-prefix-cls}-rtl & {
animation-name: antZoomBadgeOutRtl;
}
}
} }
.@{ribbon-prefix-cls}-rtl { .@{ribbon-prefix-cls}-rtl {
@ -65,3 +78,26 @@
} }
} }
} }
@keyframes antZoomBadgeInRtl {
0% {
transform: scale(0) translate(-50%, -50%);
opacity: 0;
}
100% {
transform: scale(1) translate(-50%, -50%);
}
}
@keyframes antZoomBadgeOutRtl {
0% {
transform: scale(1) translate(-50%, -50%);
}
100% {
transform: scale(0) translate(-50%, -50%);
opacity: 0;
}
}

View File

@ -403,4 +403,20 @@ describe('Calendar', () => {
); );
expect(wrapper.find('.bamboo').first().text()).toEqual('Light'); expect(wrapper.find('.bamboo').first().text()).toEqual('Light');
}); });
it('when fullscreen is false, the element returned by dateFullCellRender should be interactive', () => {
const onClick = jest.fn();
const wrapper = mount(
<Calendar
fullscreen={false}
dateFullCellRender={() => (
<div className="bamboo" onClick={onClick}>
Light
</div>
)}
/>,
);
wrapper.find('.bamboo').first().simulate('click');
expect(onClick).toBeCalled();
});
}); });

View File

@ -70,6 +70,10 @@
line-height: 18px; line-height: 18px;
} }
} }
.@{calendar-picker-prefix-cls}-cell::before {
pointer-events: none;
}
} }
// ========================== Full ========================== // ========================== Full ==========================

View File

@ -2,6 +2,7 @@
@input-prefix-cls: ~'@{ant-prefix}-input'; @input-prefix-cls: ~'@{ant-prefix}-input';
// ========================= Input ========================= // ========================= Input =========================
.@{iconfont-css-prefix}.@{ant-prefix}-input-clear-icon,
.@{ant-prefix}-input-clear-icon { .@{ant-prefix}-input-clear-icon {
margin: 0; margin: 0;
color: @disabled-color; color: @disabled-color;

View File

@ -1,6 +1,6 @@
{ {
"name": "antd", "name": "antd",
"version": "4.19.2", "version": "4.19.3",
"description": "An enterprise-class UI design language and React components implementation", "description": "An enterprise-class UI design language and React components implementation",
"title": "Ant Design", "title": "Ant Design",
"keywords": [ "keywords": [

View File

@ -44,7 +44,7 @@ async function checkCommit({ files }) {
async function checkRemote() { async function checkRemote() {
const { remote } = await git.fetch('origin', 'master'); const { remote } = await git.fetch('origin', 'master');
if (remote.indexOf('ant-design/ant-design') === -1) { if (remote?.indexOf('ant-design/ant-design') === -1) {
console.log( console.log(
chalk.yellow('😓 Your remote origin is not ant-design/ant-design, did you fork it?'), chalk.yellow('😓 Your remote origin is not ant-design/ant-design, did you fork it?'),
); );