From 07481b5ddf6cff041860c819d6c65cc35c7f9538 Mon Sep 17 00:00:00 2001 From: rex-zsd Date: Tue, 19 Jun 2018 21:11:24 +0800 Subject: [PATCH] =?UTF-8?q?fix(Dialog):=20=E4=BF=AE=E5=A4=8D=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E6=8C=89=E9=92=AE=E5=8F=AA=E7=94=9F=E6=95=88=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=20@rex-zsd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #295 --- packages/dialog/data.js | 3 --- packages/dialog/dialog.js | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/dialog/data.js b/packages/dialog/data.js index 9a624d0f..7a7a2684 100644 --- a/packages/dialog/data.js +++ b/packages/dialog/data.js @@ -1,9 +1,6 @@ module.exports = { // 标题 title: '', - // 自定义 btn 列表 - // { type: 按钮类型,回调时以此作为区分依据,text: 按钮文案, color: 按钮文字颜色 } - buttons: [], // 内容 message: ' ', // 选择节点 diff --git a/packages/dialog/dialog.js b/packages/dialog/dialog.js index 55184de3..f1653ed7 100644 --- a/packages/dialog/dialog.js +++ b/packages/dialog/dialog.js @@ -4,6 +4,9 @@ const defaultData = require('./data'); // pageCtx 页面 page 上下文 function Dialog(options, pageCtx) { const parsedOptions = { + // 自定义 btn 列表 + // { type: 按钮类型,回调时以此作为区分依据,text: 按钮文案, color: 按钮文字颜色 } + buttons: [], ...defaultData, ...options };