-
-
diff --git a/src/components/ReSeamlessScroll/src/utils.ts b/src/components/ReSeamlessScroll/src/utils.ts
index 52178c73c..021a65d18 100644
--- a/src/components/ReSeamlessScroll/src/utils.ts
+++ b/src/components/ReSeamlessScroll/src/utils.ts
@@ -2,7 +2,7 @@
* @desc AnimationFrame简单兼容hack
*/
export const animationFrame = () => {
- window.cancelAnimationFrame = (function () {
+ window.cancelAnimationFrame = (() => {
return (
window.cancelAnimationFrame ||
window.webkitCancelAnimationFrame ||
diff --git a/tsconfig.json b/tsconfig.json
index d1c251b11..808e2507a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -24,7 +24,7 @@
"/#/*": ["types/*"]
},
"types": ["node", "vite/client"],
- "typeRoots": ["./node_modules/@types/", "./types"]
+ "typeRoots": ["./node_modules/@types/", "./types", "./vue-types"]
},
"include": [
"src/**/*.ts",
diff --git a/types/global.d.ts b/types/global.d.ts
index 815212d5e..aca224dca 100644
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -20,13 +20,14 @@ declare global {
// Global vue app instance
__APP__: App
;
webkitCancelAnimationFrame: (handle: number) => void;
+ mozCancelAnimationFrame: (handle: number) => void;
+ oCancelAnimationFrame: (handle: number) => void;
+ msCancelAnimationFrame: (handle: number) => void;
+
webkitRequestAnimationFrame: (callback: FrameRequestCallback) => number;
- mozCancelAnimationFrame: (id?: string) => any;
- oCancelAnimationFrame: (id?: string) => any;
- msCancelAnimationFrame: (id?: string) => any;
- mozRequestAnimationFrame: (id?: string) => any;
- oRequestAnimationFrame: (id?: string) => any;
- msRequestAnimationFrame: (id?: string) => any;
+ mozRequestAnimationFrame: (callback: FrameRequestCallback) => number;
+ oRequestAnimationFrame: (callback: FrameRequestCallback) => number;
+ msRequestAnimationFrame: (callback: FrameRequestCallback) => number;
}
// vue
diff --git a/types/index.d.ts b/types/index.d.ts
index 314e07fc2..7c8b94ef8 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -25,3 +25,7 @@ declare type ComponentRef =
ComponentElRef | null;
declare type ElRef = Nullable;
+
+declare type ForDataType = {
+ [P in T]?: ForDataType;
+};
diff --git a/yarn.lock b/yarn.lock
index 3c86bf323..b9ed8aff6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -786,6 +786,17 @@
estree-walker "^2.0.2"
source-map "^0.6.1"
+"@vue/compiler-core@3.2.12":
+ version "3.2.12"
+ resolved "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.12.tgz#23998d6986a45e1ab0424130cc0ad00e33da1101"
+ integrity sha512-IGJ0JmrAaAl5KBBegPAKkoXvsfDFgN/h7K1t/+0MxqpZF1fTDVUOp3tG7q9gWa7fwzGEaIsPhjtT5C3qztdLKg==
+ dependencies:
+ "@babel/parser" "^7.15.0"
+ "@babel/types" "^7.15.0"
+ "@vue/shared" "3.2.12"
+ estree-walker "^2.0.2"
+ source-map "^0.6.1"
+
"@vue/compiler-dom@3.2.11":
version "3.2.11"
resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.11.tgz#d066f8e1f1812b4e881593819ade0fe6d654c776"
@@ -794,7 +805,15 @@
"@vue/compiler-core" "3.2.11"
"@vue/shared" "3.2.11"
-"@vue/compiler-sfc@^3.0.11", "@vue/compiler-sfc@^3.2.11":
+"@vue/compiler-dom@3.2.12":
+ version "3.2.12"
+ resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.12.tgz#d6ba00114e73adb8b18940c3ff18797cc2b0514f"
+ integrity sha512-MulvKilA2USm8ubPfvXvNY55HVTn+zHERsXeNg437TXrmM4FRCis6zjWW47QZ3ZyxEkCdqOmuiFCtXbpnuthyw==
+ dependencies:
+ "@vue/compiler-core" "3.2.12"
+ "@vue/shared" "3.2.12"
+
+"@vue/compiler-sfc@^3.0.11":
version "3.2.11"
resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.11.tgz#628fa12238760d9b9b339ac2e125a759224fadbf"
integrity sha512-cUIaS8mgJrQ6yucj2AupWAwBRITK3W/a8wCOn9g5fJGtOl8h4APY8vN3lzP8HIJDyEeRF3I8SfRhL+oX97kSnw==
@@ -818,6 +837,30 @@
postcss-selector-parser "^6.0.4"
source-map "^0.6.1"
+"@vue/compiler-sfc@^3.2.12":
+ version "3.2.12"
+ resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.12.tgz#39555550d96051508753ba934f7260dc5ee5211e"
+ integrity sha512-EjzeMQ7H2ICj+JRw2buSFXTocdCg8e5yWQTlNM/6h/u68sTwMbIfiOJBFEwBhG/wCG7Nb6Nnz888AfHTU3hdrA==
+ dependencies:
+ "@babel/parser" "^7.15.0"
+ "@babel/types" "^7.15.0"
+ "@types/estree" "^0.0.48"
+ "@vue/compiler-core" "3.2.12"
+ "@vue/compiler-dom" "3.2.12"
+ "@vue/compiler-ssr" "3.2.12"
+ "@vue/ref-transform" "3.2.12"
+ "@vue/shared" "3.2.12"
+ consolidate "^0.16.0"
+ estree-walker "^2.0.2"
+ hash-sum "^2.0.0"
+ lru-cache "^5.1.1"
+ magic-string "^0.25.7"
+ merge-source-map "^1.1.0"
+ postcss "^8.1.10"
+ postcss-modules "^4.0.0"
+ postcss-selector-parser "^6.0.4"
+ source-map "^0.6.1"
+
"@vue/compiler-ssr@3.2.11":
version "3.2.11"
resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.11.tgz#702cef3429651645bdbe09fe5962803b5a621abb"
@@ -826,6 +869,14 @@
"@vue/compiler-dom" "3.2.11"
"@vue/shared" "3.2.11"
+"@vue/compiler-ssr@3.2.12":
+ version "3.2.12"
+ resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.12.tgz#32e5d4bc31c371c125b43e9d07b8a8f70442b080"
+ integrity sha512-sY+VbLQ17FPr1CgirnqEgY+jbC7wI5c2Ma6u8le0+b4UKMYF9urI2pybAZc1nKz6O78FWA3OSnQFxTTLppe+9Q==
+ dependencies:
+ "@vue/compiler-dom" "3.2.12"
+ "@vue/shared" "3.2.12"
+
"@vue/devtools-api@^6.0.0-beta.13", "@vue/devtools-api@^6.0.0-beta.14", "@vue/devtools-api@^6.0.0-beta.15":
version "6.0.0-beta.15"
resolved "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.0.0-beta.15.tgz#ad7cb384e062f165bcf9c83732125bffbc2ad83d"
@@ -852,6 +903,13 @@
dependencies:
"@vue/shared" "3.2.11"
+"@vue/reactivity@3.2.12":
+ version "3.2.12"
+ resolved "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.12.tgz#b482a737cbdc891f9b1ec3100f3c1804b56d080b"
+ integrity sha512-Lr5CTQjFm5mT/6DGnVNhptmba/Qg1DbD6eNWWmiHLMlpPt4q2ww9A2orEjVw0qNcdTJ04JLPEVAz5jhTZTCfIg==
+ dependencies:
+ "@vue/shared" "3.2.12"
+
"@vue/ref-transform@3.2.11":
version "3.2.11"
resolved "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.11.tgz#4d282b9570d1485a73e7bf5d57cce27b4a7aa690"
@@ -863,6 +921,17 @@
estree-walker "^2.0.2"
magic-string "^0.25.7"
+"@vue/ref-transform@3.2.12":
+ version "3.2.12"
+ resolved "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.12.tgz#6f7fa46dd84447ddcf54adfb1b689b1cf4243de0"
+ integrity sha512-lS7TDda61iSf3ljokXVfN0VbOsQdmpST6MZLjxzBydFCECCJaEAr6o+K8VZ7NhUCSrl+gKXHpdXxmcvwdk66aQ==
+ dependencies:
+ "@babel/parser" "^7.15.0"
+ "@vue/compiler-core" "3.2.12"
+ "@vue/shared" "3.2.12"
+ estree-walker "^2.0.2"
+ magic-string "^0.25.7"
+
"@vue/runtime-core@3.2.11":
version "3.2.11"
resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.11.tgz#0dbe801be4bd0bfde253226797e7d304c8fdda30"
@@ -871,6 +940,14 @@
"@vue/reactivity" "3.2.11"
"@vue/shared" "3.2.11"
+"@vue/runtime-core@3.2.12":
+ version "3.2.12"
+ resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.12.tgz#422662fd5b85f787222d2aea840264ba97e84a13"
+ integrity sha512-LO+ztgcmsomavYUaSq7BTteh8pmnUmvUnXUFVYdlcg3VCdYRS0ImlclpYsNHqjAk2gU+H09dr2PP0kL961xUfQ==
+ dependencies:
+ "@vue/reactivity" "3.2.12"
+ "@vue/shared" "3.2.12"
+
"@vue/runtime-dom@3.2.11":
version "3.2.11"
resolved "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.11.tgz#04f9054a9e64bdf156c2fc22cad67cfaa8b84616"
@@ -880,17 +957,31 @@
"@vue/shared" "3.2.11"
csstype "^2.6.8"
+"@vue/runtime-dom@3.2.12":
+ version "3.2.12"
+ resolved "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.12.tgz#d9fe865dca36f9ca33ba327afdeb89ae2aa03f4c"
+ integrity sha512-+NSDqivgihvoPYbKFDmzFu1tW7SOzwc7r0b7T8vsJtooVPGxwtfAFZ6wyLtteOXXrCpyTR3kpyTCIp31uY7aJg==
+ dependencies:
+ "@vue/runtime-core" "3.2.12"
+ "@vue/shared" "3.2.12"
+ csstype "^2.6.8"
+
"@vue/shared@3.2.11":
version "3.2.11"
resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.2.11.tgz#01899f54949caf1ac241de397bd17069632574de"
integrity sha512-ovfXAsSsCvV9JVceWjkqC/7OF5HbgLOtCWjCIosmPGG8lxbPuavhIxRH1dTx4Dg9xLgRTNLvI3pVxG4ItQZekg==
-"@vueuse/core@^6.0.0":
- version "6.3.3"
- resolved "https://registry.npmjs.org/@vueuse/core/-/core-6.3.3.tgz#0682c01b50d28e91d3d76f27278600ee1692fa24"
- integrity sha512-qa/0WYqcvqFKQmlkgsLGlXBrYcQeUi3fzHMIaxsD/lO/zm0IWBSN8CTFu91LwER5qNYs4DGhU5pu7jOdrTzAIQ==
+"@vue/shared@3.2.12":
+ version "3.2.12"
+ resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.2.12.tgz#304064a4b56fc6c7b9169d80e9ee62ecb4bf0a1c"
+ integrity sha512-5CkaifUCJwcTuru7FDwKFacPJuEoGUTw0LKSa5bw40B23s0TS+MGlYR1285nbV/ju3QUGlA6d6PD+GJkWy7uFg==
+
+"@vueuse/core@^6.4.1":
+ version "6.4.1"
+ resolved "https://registry.npmjs.org/@vueuse/core/-/core-6.4.1.tgz#21416997a23bfb4924a5082ed6fa959027f80d04"
+ integrity sha512-FRFeEPVq77gcMZP0mCloJY+lyHJaUQmUMaPp5fBds3fs/BbkAt7HTMMizFKHWDVjbmA20vBOjmC9tTnfD+DdEA==
dependencies:
- "@vueuse/shared" "6.3.3"
+ "@vueuse/shared" "6.4.1"
vue-demi "*"
"@vueuse/core@~6.1.0":
@@ -908,10 +999,10 @@
dependencies:
vue-demi "*"
-"@vueuse/shared@6.3.3":
- version "6.3.3"
- resolved "https://registry.npmjs.org/@vueuse/shared/-/shared-6.3.3.tgz#4e5c600ad1ed5bf2a8630ad0bd38edb1f4269f37"
- integrity sha512-2+YPRhFNUXEhhvKNTWBtNU6hGkft9+mfYSVjI4hZu2U8KDbNNKF/215lBPzMYI2twScDtPsAssQ+vu5t9PBy0g==
+"@vueuse/shared@6.4.1":
+ version "6.4.1"
+ resolved "https://registry.npmjs.org/@vueuse/shared/-/shared-6.4.1.tgz#5bc84be107cead84e11c21d2c57b1e9f2c376975"
+ integrity sha512-zsaYxxZwACQbMmGg+UBjPUVemi325sDdnnB0mn+PNizE0fVC57B+vbLgdj45NBmr6P4nw6a0Y2rMupebwDWsdw==
dependencies:
vue-demi "*"
@@ -4498,14 +4589,14 @@ vue-router@^4.0.11:
dependencies:
"@vue/devtools-api" "^6.0.0-beta.14"
-vue-types@^4.0.3:
+vue-types@^4.1.0:
version "4.1.0"
resolved "https://registry.npmjs.org/vue-types/-/vue-types-4.1.0.tgz#8dcbbaccf9d5c3815449ac7cb8ae5864454cfff0"
integrity sha512-oPAeKKx5vY5Q8c7lMQPQyrBIbmWQGael5XEHqO1f+Y3V/RUZNuISz7KxI4woGjh79Vy/gDDaPX9j9zKYpaaA2g==
dependencies:
is-plain-object "5.0.0"
-vue@^3.1.1, vue@^3.2.11:
+vue@^3.1.1:
version "3.2.11"
resolved "https://registry.npmjs.org/vue/-/vue-3.2.11.tgz#6b92295048df705ddac558fd3e3ed553e55e57c8"
integrity sha512-JkI3/eIgfk4E0f/p319TD3EZgOwBQfftgnkRsXlT7OrRyyiyoyUXn6embPGZXSBxD3LoZ9SWhJoxLhFh5AleeA==
@@ -4514,6 +4605,15 @@ vue@^3.1.1, vue@^3.2.11:
"@vue/runtime-dom" "3.2.11"
"@vue/shared" "3.2.11"
+vue@^3.2.12:
+ version "3.2.12"
+ resolved "https://registry.npmjs.org/vue/-/vue-3.2.12.tgz#b44f55506fb6a7c4b65635e609deb5f9368aa2ce"
+ integrity sha512-VV14HtubmB56uuQaSvLkJZgoocPiN8CJI3zZA9y8h7q/Z5hcknDIFkbq5d8ku0ukZ6AJPQqMsZWcq0qryF0jgg==
+ dependencies:
+ "@vue/compiler-dom" "3.2.12"
+ "@vue/runtime-dom" "3.2.12"
+ "@vue/shared" "3.2.12"
+
vuedraggable@^4.1.0:
version "4.1.0"
resolved "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz#edece68adb8a4d9e06accff9dfc9040e66852270"