blackteay/vant-weapp
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant-weapp.git synced 2025-04-06 03:58:05 +08:00
Code Issues Projects Releases Wiki Activity

fix: conflict

Browse Source
This commit is contained in:
yangjinfeng 2022-12-12 14:48:14 +08:00
commit 830a68c511
2 changed files with 7 additions and 23 deletions
packages/common
utils.ts
yarn.lock

24
packages/common/utils.ts

@ -1,9 +1,5 @@
import { isDef, isNumber, isPlainObject, isPromise } from './validator';
import {
canIUseGroupSetData,
canIUseNextTick,
getSystemInfoSync,
} from './version';
import { canIUseGroupSetData, canIUseNextTick } from './version';
export { isDef } from './validator';
export { getSystemInfoSync } from './version';
@ -32,21 +28,9 @@ export function addUnit(value?: string | number): string | undefined {
}
export function requestAnimationFrame(cb: () => void) {
const systemInfo = getSystemInfoSync();
if (systemInfo.platform === 'devtools') {
return setTimeout(() => {
cb();
}, 1000 / 30);
}
return wx
.createSelectorQuery()
.selectViewport()
.boundingClientRect()
.exec(() => {
cb();
});
return setTimeout(() => {
cb();
}, 1000 / 30);
}
export function pickExclude(obj: unknown, keys: string[]) {

6
yarn.lock

@ -5333,9 +5333,9 @@ decimal.js@^10.2.1:
integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
decode-uri-component@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==
version "0.2.2"
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
decompress-response@^6.0.0:
version "6.0.0"