feat(dialog): the imperative call returns the trigger

Author: betavs

src/dialog/README.en-US.md

@@ -47,15 +47,16 @@ t-class-content | \-
 ### CSS Variables
 
 The component provides the following CSS variables, which can be used to customize styles.
-Name | Default Value | Description 
+
+Name | Default Value | Description
 -- | -- | --
---td-dialog-body-max-height | 912rpx | - 
---td-dialog-border-radius | @radius-extra-large | - 
---td-dialog-close-color | @text-color-placeholder | - 
---td-dialog-content-color | @text-color-secondary | - 
---td-dialog-content-font-size | 32rpx | - 
---td-dialog-content-line-height | 48rpx | - 
---td-dialog-title-color | @text-color-primary | - 
---td-dialog-title-font-size | 36rpx | - 
---td-dialog-title-line-height | 52rpx | - 
---td-dialog-width | 622rpx | -
+--td-dialog-body-max-height | 912rpx | -
+--td-dialog-border-radius | @radius-extra-large | -
+--td-dialog-close-color | @text-color-placeholder | -
+--td-dialog-content-color | @text-color-secondary | -
+--td-dialog-content-font-size | 32rpx | -
+--td-dialog-content-line-height | 48rpx | -
+--td-dialog-title-color | @text-color-primary | -
+--td-dialog-title-font-size | 36rpx | -
+--td-dialog-title-line-height | 52rpx | -
+--td-dialog-width | 622rpx | -

src/dialog/README.md

@@ -6,6 +6,7 @@ isComponent: true
 ---
 
 <span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20lines-97%25-blue" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20functions-100%25-blue" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20statements-94%25-blue" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20branches-82%25-blue" /></span>
+
 ## 引入
 
 全局引入，在 miniprogram 根目录下的`app.json`中配置，局部引入，在需要引入的页面或组件的`index.json`中配置。
@@ -51,6 +52,7 @@ isComponent: true
 {{ status }}
 
 ### 组件用法
+
 #### 命令调用
 
 {{ command }}
@@ -108,15 +110,16 @@ t-class-content | 内容样式类
 ### CSS Variables
 
 组件提供了下列 CSS 变量，可用于自定义样式。
-名称 | 默认值 | 描述 
+
+名称 | 默认值 | 描述
 -- | -- | --
---td-dialog-body-max-height | 912rpx | - 
---td-dialog-border-radius | @radius-extra-large | - 
---td-dialog-close-color | @text-color-placeholder | - 
---td-dialog-content-color | @text-color-secondary | - 
---td-dialog-content-font-size | 32rpx | - 
---td-dialog-content-line-height | 48rpx | - 
---td-dialog-title-color | @text-color-primary | - 
---td-dialog-title-font-size | 36rpx | - 
---td-dialog-title-line-height | 52rpx | - 
---td-dialog-width | 622rpx | -
+--td-dialog-body-max-height | 912rpx | -
+--td-dialog-border-radius | @radius-extra-large | -
+--td-dialog-close-color | @text-color-placeholder | -
+--td-dialog-content-color | @text-color-secondary | -
+--td-dialog-content-font-size | 32rpx | -
+--td-dialog-content-line-height | 48rpx | -
+--td-dialog-title-color | @text-color-primary | -
+--td-dialog-title-font-size | 36rpx | -
+--td-dialog-title-line-height | 52rpx | -
+--td-dialog-width | 622rpx | -

src/dialog/_example/command/index.js

@@ -13,8 +13,8 @@ Component({
       };
 
       Dialog.confirm(dialogConfig)
-        .then(() => console.log('点击了确定'))
-        .catch(() => console.log('点击了取消'));
+        .then((data) => console.log('点击了确定', data))
+        .catch((data) => console.log('点击了取消', data));
     },
   },
 });

src/dialog/dialog.ts

@@ -110,24 +110,30 @@ export default class Dialog extends SuperComponent {
 
     onConfirm() {
       this.triggerEvent('confirm');
+
       if (this._onConfirm) {
-        this._onConfirm();
+        this._onConfirm({ trigger: 'confirm' });
         this.close();
       }
     },
 
     onCancel() {
-      this.triggerEvent('close', { trigger: 'cancel' });
+      const trigger = { trigger: 'cancel' };
+
       this.triggerEvent('cancel');
+      this.triggerEvent('close', trigger);
 
       if (this._onCancel) {
-        this._onCancel();
+        this._onCancel(trigger);
         this.close();
       }
     },
 
     onClose() {
-      this.triggerEvent('close', { trigger: 'close-btn' });
+      const trigger = { trigger: 'close-btn' };
+
+      this.triggerEvent('close', trigger);
+      this._onCancel?.(trigger);
       this.close();
     },
 
@@ -136,11 +142,15 @@ export default class Dialog extends SuperComponent {
     },
 
     overlayClick() {
+      this.triggerEvent('overlay-click');
+
       if (this.properties.closeOnOverlayClick) {
-        this.triggerEvent('close', { trigger: 'overlay' });
+        const trigger = { trigger: 'overlay' };
+
+        this.triggerEvent('close', trigger);
+        this._onCancel?.(trigger);
         this.close();
       }
-      this.triggerEvent('overlay-click');
     },
 
     onActionTap(index: number) {