fix(ui/dialog): 修复类型声明

affects: @varlet/ui
varletjs · Apr 6, 2021 · 29639b8 · 29639b8
1 parent 76d4e4e
commit 29639b8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/packages/varlet-ui/src/dialog/Dialog.vue b/packages/varlet-ui/src/dialog/Dialog.vue
@@ -27,6 +27,7 @@
       <div class="var-dialog__actions">
         <var-button
           class="var-dialog__button var-dialog__cancel-button"
+          var-dialog-cover
           text
           :text-color="cancelButtonTextColor"
           :color="cancelButtonColor"
@@ -37,6 +38,7 @@
         </var-button>
         <var-button
           class="var-dialog__button var-dialog__confirm-button"
+          var-dialog-cover
           text
           :text-color="confirmButtonTextColor"
           :color="confirmButtonColor"

diff --git a/packages/varlet-ui/src/dialog/dialog.less b/packages/varlet-ui/src/dialog/dialog.less
@@ -36,7 +36,7 @@
     justify-content: flex-end;
   }
 
-  &__button {
+  &__button[var-dialog-cover] {
     margin-left: @dialog-button-margin-left;
     background-color: transparent;
     box-shadow: none;
@@ -46,11 +46,11 @@
     }
   }
 
-  &__confirm-button {
+  &__confirm-button[var-dialog-cover] {
     color: @dialog-confirm-button-color;
   }
 
-  &__cancel-button {
+  &__cancel-button[var-dialog-cover] {
     color: @dialog-cancel-button-color;
   }
 }
diff --git a/packages/varlet-ui/src/dialog/example/index.vue b/packages/varlet-ui/src/dialog/example/index.vue
@@ -64,7 +64,10 @@ export default {
       close: () => Snackbar.info('close'),
     }
 
-    const createBasic = () => Dialog(pack.value.message)
+    const createBasic = () =>
+      Dialog({
+        message: pack.value.message,
+      })
 
     const createAction = async () => actions[await Dialog(pack.value.message)]()
 

diff --git a/packages/varlet-ui/types/dialog.d.ts b/packages/varlet-ui/types/dialog.d.ts
@@ -33,7 +33,7 @@ export interface DialogOptions {
 }
 
 export interface Dialog {
-  (options: DialogOptions): Promise<DialogActions>
+  (options: DialogOptions | string): Promise<DialogActions>
   install(app: App): void
   close(): void
   Component: DialogComponent

diff --git a/packages/varlet-ui/types/picker.d.ts b/packages/varlet-ui/types/picker.d.ts
@@ -31,7 +31,7 @@ interface PickerOptions {
 }
 
 export interface Picker {
-  (options: PickerOptions): Promise<PickerResolvedData>
+  (options: PickerOptions | Texts): Promise<PickerResolvedData>
   install(app: App): void
   close(): void
   Component: PickerComponent