p96170835
/
amis
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'baidu/master'

This commit is contained in:
liaoxuezhi 2020-04-01 00:06:28 +08:00
parent 28cfe4a7cc 17923051ab
commit ce557d311e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scss/components/form/_switch.scss
View File

@ -61,6 +61,7 @@
&:before { &:before {
color: $Switch-onDisabled-color; color: $Switch-onDisabled-color;
background-color: $Switch-onDisabled-bgColor; background-color: $Switch-onDisabled-bgColor;
cursor: not-allowed;
} }
&:after { &:after {

2
src/utils/dom.tsx
View File

@ -257,7 +257,7 @@ export function calculatePosition(
positionLeft += leftDelta; positionLeft += leftDelta;
arrowOffsetLeft = 50 * (1 - (2 * leftDelta) / overlayHeight) + '%'; arrowOffsetLeft = 50 * (1 - (2 * leftDelta) / overlayHeight) + '%';
} else if ((placement = 'center')) { } else if ((placement === 'center')) {
// atX = atY = myX = myY = 'center'; // atX = atY = myX = myY = 'center';
positionLeft = childOffset.left + (childOffset.width - overlayWidth) / 2; positionLeft = childOffset.left + (childOffset.width - overlayWidth) / 2;
positionTop = childOffset.top + (childOffset.height - overlayHeight) / 2; positionTop = childOffset.top + (childOffset.height - overlayHeight) / 2;