From c40c46272b6e3254dc48b7562dec3a51b55836ad Mon Sep 17 00:00:00 2001
From: yang <yang@139.com>
Date: Sat, 1 Sep 2018 00:34:16 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dd.ts=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81tsx=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 types/vue.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/vue.d.ts b/types/vue.d.ts
index 302fc4eb6..d6cf34d4c 100644
--- a/types/vue.d.ts
+++ b/types/vue.d.ts
@@ -13,6 +13,6 @@ declare module "vue/types/options" {
 
 declare module "vue/types/vue" {
   interface Vue {
-    $store: Store<any>;
+    $store?: Store<any>;
   }
 }

From 19025fda57b2899bd831d9643d4df74e12511ba1 Mon Sep 17 00:00:00 2001
From: yangdan <yangdan1@wps.cn>
Date: Wed, 2 Jun 2021 17:26:04 +0800
Subject: [PATCH 2/3] Providing generic support for actioncontext

---
 types/index.d.ts | 51 ++++++++++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/types/index.d.ts b/types/index.d.ts
index aeb69617f..5b877fefd 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -43,27 +43,36 @@ export declare class Store<S> {
 
 export declare function install(Vue: typeof _Vue): void;
 
-export interface Dispatch {
-  (type: string, payload?: any, options?: DispatchOptions): Promise<any>;
-  <P extends Payload>(payloadWithType: P, options?: DispatchOptions): Promise<any>;
-}
-
-export interface Commit {
-  (type: string, payload?: any, options?: CommitOptions): void;
-  <P extends Payload>(payloadWithType: P, options?: CommitOptions): void;
-}
-
-export interface ActionContext<S, R> {
-  dispatch: Dispatch;
-  commit: Commit;
-  state: S;
-  getters: any;
-  rootState: R;
-  rootGetters: any;
-}
-
-export interface Payload {
-  type: string;
+export interface Dispatch<Actions extends Record<string, never> = any> {
+  <T extends keyof Actions>(type: T, payload?: Parameters<Actions[T]>[1], options?: DispatchOptions): Promise<any>;
+  <P extends Payload<Actions>>(payloadWithType: P, options?: DispatchOptions): Promise<any>;
+}
+
+export interface Commit<Mutations extends Record<string, never> = any> {
+  <T extends keyof Mutations>(type: T, payload?: Parameters<Mutations[T]>[1], options?: CommitOptions): void;
+  <P extends Payload<Mutations>>(payloadWithType: P, options?: CommitOptions): void;
+}
+
+export interface ActionContext<
+  State,
+  RootState,
+  Getters extends Record<string, never> = any,
+  Mutations extends Record<string, never> = any,
+  Actions extends Record<string, never> = any,
+  RootGetters = any
+> {
+  dispatch: Dispatch<Actions>;
+  commit: Commit<Mutations>;
+  state: State;
+  getters: {
+    [K in keyof Getters]: ReturnType<Getters[K]>;
+  };
+  rootState: RootState;
+  rootGetters: RootGetters;
+}
+
+export interface Payload<T extends { [key: string]: never } = {}> {
+  type: keyof T;
 }
 
 export interface MutationPayload extends Payload {

From f8cd115640bd653c6a1e9f9a32a635c5082e4036 Mon Sep 17 00:00:00 2001
From: yangdan <yangdan1@wps.cn>
Date: Wed, 2 Jun 2021 17:38:53 +0800
Subject: [PATCH 3/3] Correct type definition to avoid error

---
 types/index.d.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/types/index.d.ts b/types/index.d.ts
index 5b877fefd..3aca51fad 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -43,12 +43,12 @@ export declare class Store<S> {
 
 export declare function install(Vue: typeof _Vue): void;
 
-export interface Dispatch<Actions extends Record<string, never> = any> {
+export interface Dispatch<Actions extends Record<string, (...args: any) => any> = any> {
   <T extends keyof Actions>(type: T, payload?: Parameters<Actions[T]>[1], options?: DispatchOptions): Promise<any>;
   <P extends Payload<Actions>>(payloadWithType: P, options?: DispatchOptions): Promise<any>;
 }
 
-export interface Commit<Mutations extends Record<string, never> = any> {
+export interface Commit<Mutations extends Record<string, (...args: any) => any> = any> {
   <T extends keyof Mutations>(type: T, payload?: Parameters<Mutations[T]>[1], options?: CommitOptions): void;
   <P extends Payload<Mutations>>(payloadWithType: P, options?: CommitOptions): void;
 }
@@ -56,9 +56,9 @@ export interface Commit<Mutations extends Record<string, never> = any> {
 export interface ActionContext<
   State,
   RootState,
-  Getters extends Record<string, never> = any,
-  Mutations extends Record<string, never> = any,
-  Actions extends Record<string, never> = any,
+  Getters extends Record<string, (...args: any) => any> = any,
+  Mutations extends Record<string, (...args: any) => any> = any,
+  Actions extends Record<string, (...args: any) => any> = any,
   RootGetters = any
 > {
   dispatch: Dispatch<Actions>;
@@ -71,7 +71,7 @@ export interface ActionContext<
   rootGetters: RootGetters;
 }
 
-export interface Payload<T extends { [key: string]: never } = {}> {
+export interface Payload<T extends { [key: string]: (...args: any) => any } = {}> {
   type: keyof T;
 }