fengui - npm Package Compare versions

Comparing version 1.3.15 to 1.3.16

component/popup/FullAlertPopup.jsx

@@ -21,15 +21,22 @@ import React from 'react'
   render () {
-    let {message, okText, okClick, title, dangerousHtml} = this.props.options
+    let {message, okText, okClick, title,dangerousHtml,titleChildren,okTextChildren,messageChildren} = this.props.options
     return (
       <FixedContent mode='fullWidth' origin='top' className={styles.this}>
         <div className={styles.main}>
-          <div className={styles.title}>{title}</div>
+          <div className={styles.title}>{title}{titleChildren}</div>
           <div className={styles.content}>
-            {
-              dangerousHtml ? <div dangerouslySetInnerHTML={{__html: dangerousHtml.replace(/\n/g, '<br/>')}} /> : message
-            }
+            {messageChildren}
+            {dangerousHtml&& <div dangerouslySetInnerHTML={{__html: dangerousHtml.replace(/\n/g, '<br/>')}} />}
+            {message}
           </div>
           <div className={styles.button}>
-            <div onClick={okClick}>{okText ? <div style={{paddingTop: '1rem', fontSize: '.36rem'}}>{okText}</div>
+            {okTextChildren && <div style={{width:'100%'}} onClick={okClick}>{okTextChildren}</div>}
+            {okText && <div onClick={okClick}><div style={{paddingTop: '1rem', fontSize: '.36rem'}}>{okText}</div></div>}
+            {(!okText && !okTextChildren) && <div onClick={okClick}><img className={styles.closeImg} src={fullAlertImg} /></div>}
+
+            {/* <div onClick={okClick}>{okText ? <div style={{paddingTop: '1rem', fontSize: '.36rem'}}>{okText}</div>
               : <img className={styles.closeImg} src={fullAlertImg} />}</div>
+            {/* {okTextHtml&&<div dangerouslySetInnerHTML={{__html:okTextHtml}}/>}
+            {!okTextHtml && <div onClick={okClick}>{okText ? <div style={{paddingTop: '1rem', fontSize: '.36rem'}}>{okText}</div>
+              : <img className={styles.closeImg} src={fullAlertImg} />}</div>}  */}
           </div>
@@ -36,0 +43,0 @@ </div>

component/popup/index.js

@@ -51,3 +51,3 @@ import Promise from 'bluebird'
 export function fullAlert (opt, okTextParam, titleParam) {
-  let {message, okText, title, dangerousHtml} = (typeof opt === 'object') ? opt : {
+  let {message, okText, title, dangerousHtml,okTextChildren,titleChildren,messageChildren} = (typeof opt === 'object') ? opt : {
     message: opt,
@@ -63,2 +63,5 @@ okText: okTextParam,
       dangerousHtml,
+      titleChildren,
+      okTextChildren,
+      messageChildren,
       okClick: function () {
@@ -65,0 +68,0 @@ dispatch(actions.setVars('fuiFullAlert', ''))

package.json

 {
   "name": "fengui",
-  "version": "1.3.15",
+  "version": "1.3.16",
   "description": "",
@@ -5,0 +5,0 @@ "license": "MIT",

util/analysis.js

@@ -37,3 +37,3 @@ /* eslint-disable */
     fjr.async = true
-    fjr.src = '//mws.fengjr.com/public/dist/mobile-web/js/analysis.min-v1.4.js'
+    fjr.src = '//mws.fengjr.com/public/dist/mobile-web/js/analysis.min-2019-03-04.js'
     fjr.onload = function () {
@@ -40,0 +40,0 @@ window._fja.init()

No alert changes

Improved metrics

Total package byte prevSize

196267

increased by0.43%

Lines of code

2458

increased by0.37%

No dependency changes