easy3wui 1.5.8-10.beta → 1.5.8-11.beta
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/Easy3wModal/index.js +23 -2
- package/package.json +1 -1
package/lib/Easy3wModal/index.js
CHANGED
|
@@ -48,6 +48,12 @@ var _button2 = _interopRequireDefault(_button);
|
|
|
48
48
|
|
|
49
49
|
require('antd/lib/button/style');
|
|
50
50
|
|
|
51
|
+
var _alert = require('antd/lib/alert');
|
|
52
|
+
|
|
53
|
+
var _alert2 = _interopRequireDefault(_alert);
|
|
54
|
+
|
|
55
|
+
require('antd/lib/alert/style');
|
|
56
|
+
|
|
51
57
|
var _classnames = require('classnames');
|
|
52
58
|
|
|
53
59
|
var _classnames2 = _interopRequireDefault(_classnames);
|
|
@@ -288,13 +294,22 @@ var Easy3wModal = function (_Component) {
|
|
|
288
294
|
onOk = _props.onOk,
|
|
289
295
|
width = _props.width,
|
|
290
296
|
footer = _props.footer,
|
|
291
|
-
footBtnArr = _props.footBtnArr
|
|
297
|
+
footBtnArr = _props.footBtnArr,
|
|
298
|
+
helpInfo = _props.helpInfo,
|
|
299
|
+
e3wCardId = _props.e3wCardId,
|
|
300
|
+
e3wCardCfg = _props.e3wCardCfg;
|
|
301
|
+
|
|
302
|
+
var objCfg = e3wCardId && e3wCardCfg && e3wCardCfg instanceof Object && e3wCardCfg[e3wCardId] && e3wCardCfg[e3wCardId] instanceof Object ? e3wCardCfg[e3wCardId] : {};
|
|
303
|
+
var cardHelpInfo = objCfg.cardHelpInfo,
|
|
304
|
+
cardSName = objCfg.cardSName;
|
|
292
305
|
|
|
306
|
+
cardSName = cardSName || title;
|
|
307
|
+
cardHelpInfo = cardHelpInfo || helpInfo;
|
|
293
308
|
var btnObj = footer && footer.length ? footer : footBtnArr && footBtnArr.length ? this.getBtnObj() : null;
|
|
294
309
|
return _react2['default'].createElement(
|
|
295
310
|
_modal2['default'],
|
|
296
311
|
(0, _extends3['default'])({
|
|
297
|
-
title:
|
|
312
|
+
title: cardSName,
|
|
298
313
|
visible: visible,
|
|
299
314
|
confirmLoading: loadingFlag,
|
|
300
315
|
onCancel: cancelHandler,
|
|
@@ -309,6 +324,12 @@ var Easy3wModal = function (_Component) {
|
|
|
309
324
|
document.body.style.overflow = '';
|
|
310
325
|
}
|
|
311
326
|
}),
|
|
327
|
+
cardHelpInfo ? _react2['default'].createElement(_alert2['default'], {
|
|
328
|
+
message: cardHelpInfo,
|
|
329
|
+
type: 'success',
|
|
330
|
+
closable: true,
|
|
331
|
+
showIcon: true
|
|
332
|
+
}) : '',
|
|
312
333
|
children
|
|
313
334
|
);
|
|
314
335
|
};
|