Comparing version 0.6.15 to 0.6.16
@@ -15,8 +15,9 @@ import React from "react"; | ||
render() { | ||
let {message, okText, okClick, cancelText, cancelClick} = this.props.options; | ||
let {message, okText, okClick, cancelText, cancelClick, title} = this.props.options; | ||
return ( | ||
<FixedContent mode="fullWidth" origin="top" className={styles.this}> | ||
<div className={styles.main}> | ||
<div className={styles.title}>{message}</div> | ||
<div className={styles.content}> | ||
<div className={styles.title}>{title}</div> | ||
<div className={styles.content} style={{marginTop:!title && ".6rem"}}> | ||
{message} | ||
</div> | ||
@@ -23,0 +24,0 @@ <div className={styles.button} |
@@ -12,3 +12,3 @@ let Promise = require('bluebird'); | ||
exports.alert = function (message, okText = '确定') { | ||
exports.alert = function (message, okText = '确定', title) { | ||
return new Promise(function (resolve, reject) { | ||
@@ -19,2 +19,3 @@ dispatch(actions.setVars("fuiAlert", { | ||
cancelText: null, | ||
title, | ||
okClick: function () { | ||
@@ -28,3 +29,3 @@ dispatch(actions.setVars("fuiAlert", "")); | ||
export function confirm (message, okText = '确定', cancelText = "取消") { | ||
export function confirm(message, okText = '确定', cancelText = "取消", title) { | ||
return new Promise(function (resolve, reject) { | ||
@@ -35,2 +36,3 @@ dispatch(actions.setVars("fuiAlert", { | ||
cancelText, | ||
title, | ||
okClick: function () { | ||
@@ -66,8 +68,7 @@ dispatch(actions.setVars("fuiAlert", "")); | ||
exports.toast = function (toastValue, time = 2000, hasAnimate) { | ||
dispatch(actions.setVars("fuiToast", { | ||
toastValue: toastValue, | ||
time: time, | ||
hasAnimate: hasAnimate | ||
})); | ||
exports.toast = function (toastValue, time = 2500) { | ||
dispatch(actions.setVars("fuiToast", { | ||
toastValue: toastValue, | ||
time: time | ||
})); | ||
}; | ||
@@ -79,3 +80,4 @@ | ||
location.href = `tel:${tel}`; | ||
}).catch(() => {}); | ||
}).catch(() => { | ||
}); | ||
} else { | ||
@@ -82,0 +84,0 @@ location.href = `tel:${tel}`; |
@@ -21,6 +21,6 @@ import React from "react"; | ||
render() { | ||
let {toastValue, hasAnimate} = this.props.options; | ||
let {toastValue} = this.props.options; | ||
return toastValue && ( | ||
<FixedContent className={styles.this}> | ||
<div className={`${styles.promptBox} ${ !hasAnimate && styles.flipInX} `}> | ||
<div className={`${styles.promptBox} ${styles.bounce} `}> | ||
<p>{toastValue}</p> | ||
@@ -27,0 +27,0 @@ </div> |
{ | ||
"name": "fengui", | ||
"version": "0.6.15", | ||
"version": "0.6.16", | ||
"description": "", | ||
@@ -5,0 +5,0 @@ "main": "dist/fengjr", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
5734
321895