feat: add close

unliar · Jul 9, 2021 · 9374d7a · 9374d7a
1 parent 084010b
commit 9374d7a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/src/components/common/Message/instance.ts b/src/components/common/Message/instance.ts
@@ -5,14 +5,15 @@ import type {
     MessageInstance,
     Options,
     InstanceComponent,
-    IntanceOptions,
+    InstanceOptions,
+    InstanceHandle,
 } from "./type";
 
 const isServer = typeof window === "undefined";
 
 const Queqe: InstanceQueqe = [];
 let seed = 5201414;
-const Message: MessageInstance = (opts: IntanceOptions) => {
+const Message: MessageInstance = (opts: InstanceOptions) => {
     if (isServer) return;
     let options: Options = {
         content: "",
@@ -60,7 +61,7 @@ const Message: MessageInstance = (opts: IntanceOptions) => {
         close: () => {
             (vm.component?.proxy as InstanceComponent).visible = false;
         },
-    };
+    } as InstanceHandle;
 };
 
 Message.closeAll = () => {
@@ -71,7 +72,7 @@ Message.closeAll = () => {
 };
 
 (["success", "warn", "info", "error"] as const).forEach(type => {
-    Message[type] = (options: IntanceOptions) => {
+    Message[type] = (options: InstanceOptions) => {
         if (typeof options === "string") {
             options = {
                 content: options,

diff --git a/src/components/common/Message/type.ts b/src/components/common/Message/type.ts
@@ -3,12 +3,12 @@ import type { VNode, ComponentPublicInstance } from "vue";
 export type MessageType = "warn" | "error" | "success" | "info";
 
 export type MessageInstance = {
-    (opt: IntanceOptions): void;
-    warn(opt: IntanceOptions): void;
-    error(opt: IntanceOptions): void;
-    success(opt: IntanceOptions): void;
-    info(opt: IntanceOptions): void;
-    closeAll(): void;
+    (opt?: InstanceOptions): InstanceHandle;
+    warn: (opt: InstanceOptions) => InstanceHandle;
+    error: (opt: InstanceOptions) => InstanceHandle;
+    success: (opt: InstanceOptions) => InstanceHandle;
+    info: (opt: InstanceOptions) => InstanceHandle;
+    closeAll: () => void;
 };
 
 export type Options = {
@@ -25,4 +25,8 @@ export type InstanceComponent = ComponentPublicInstance<{ visible: boolean }>;
 
 export type InstanceQueqe = Array<VNode>;
 
-export type IntanceOptions = Options | string;
+export type InstanceOptions = Options | string;
+
+export interface InstanceHandle {
+    close: () => void;
+}