Merge branch 'dev' into next

This commit is contained in:
chenjiahan
2022-07-23 22:20:49 +08:00
82 changed files with 353 additions and 916 deletions

View File

@@ -107,7 +107,7 @@ export function useCountDown(options: UseCountDownOptions) {
const tick = () => {
// should not start counting in server
// see: https://github.com/youzan/vant/issues/7807
// see: https://github.com/vant-ui/vant/issues/7807
if (!inBrowser) {
return;
}

View File

@@ -15,7 +15,7 @@ function isElement(node: Element) {
);
}
// https://github.com/youzan/vant/issues/3823
// https://github.com/vant-ui/vant/issues/3823
export function getScrollParent(
el: Element,
root: ScrollElement | undefined = defaultRoot