easy3wui 4.0.28-beta18 → 4.0.28-beta19
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.
|
@@ -471,10 +471,10 @@ var Easy3wFormPage = function (_Component) {
|
|
|
471
471
|
formItemProps = item.formItemProps,
|
|
472
472
|
novalueFlag = item.novalueFlag,
|
|
473
473
|
label = item.label,
|
|
474
|
-
fieldId = item.fieldId,
|
|
475
474
|
required = item.required,
|
|
476
475
|
requiredMessage = item.requiredMessage,
|
|
477
476
|
cmptPros = item.cmptPros;
|
|
477
|
+
var fieldId = item.fieldId;
|
|
478
478
|
|
|
479
479
|
var addRules = [];
|
|
480
480
|
var hadOnBlurFlag = false;
|
|
@@ -487,14 +487,33 @@ var Easy3wFormPage = function (_Component) {
|
|
|
487
487
|
addRules = rules;
|
|
488
488
|
}
|
|
489
489
|
}
|
|
490
|
+
var objValidator = {};
|
|
491
|
+
if (fieldType === 'braftEditor') {
|
|
492
|
+
objValidator = {
|
|
493
|
+
validator: _this.validatorBraftEditor
|
|
494
|
+
};
|
|
495
|
+
}
|
|
490
496
|
var decoratorObj = {
|
|
491
|
-
rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }].concat(addRules)
|
|
497
|
+
rules: [(0, _extends3['default'])({ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, objValidator)].concat(addRules)
|
|
492
498
|
};
|
|
493
499
|
if (itemValue || itemValue === 0) {
|
|
494
500
|
decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
|
|
495
501
|
initialValue: itemValue
|
|
496
502
|
});
|
|
497
503
|
}
|
|
504
|
+
if (readFlag || allReadFlag) {
|
|
505
|
+
fieldId = fieldId + 'Easy3wView';
|
|
506
|
+
if (fieldType === 'braftEditor' && itemValue.isEmpty()) {
|
|
507
|
+
// 只读时，符合必填校验
|
|
508
|
+
decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
|
|
509
|
+
initialValue: _braftEditor2['default'].createEditorState('<p> </p>')
|
|
510
|
+
});
|
|
511
|
+
} else if (fieldType === 'textarea' && !(itemValue || itemValue === 0)) {
|
|
512
|
+
decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
|
|
513
|
+
initialValue: ' '
|
|
514
|
+
});
|
|
515
|
+
}
|
|
516
|
+
}
|
|
498
517
|
if (cmptPros) {
|
|
499
518
|
if (cmptPros.getValueFromEvent) {
|
|
500
519
|
var getValueFromEvent = cmptPros.getValueFromEvent;
|
|
@@ -516,8 +535,7 @@ var Easy3wFormPage = function (_Component) {
|
|
|
516
535
|
disableFlagReal = true;
|
|
517
536
|
} else if (fieldType === 'braftEditor') {
|
|
518
537
|
decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
|
|
519
|
-
|
|
520
|
-
validateTrigger: 'onBlur'
|
|
538
|
+
valuePropName: 'defaultValue'
|
|
521
539
|
});
|
|
522
540
|
}
|
|
523
541
|
if (loadFinishFlag === true && bigFormFlag === true) {
|
|
@@ -528,7 +546,7 @@ var Easy3wFormPage = function (_Component) {
|
|
|
528
546
|
});
|
|
529
547
|
}
|
|
530
548
|
}
|
|
531
|
-
if ((readFlag || allReadFlag) && fieldType !== 'textarea' && fieldType !== 'braftEditor') {
|
|
549
|
+
if ((readFlag || allReadFlag) && fieldType !== 'textarea' && fieldType !== 'braftEditor' || !label) {
|
|
532
550
|
// if (fieldType === 'braftEditor') {
|
|
533
551
|
// return (
|
|
534
552
|
// <FormItem
|
|
@@ -554,7 +572,7 @@ var Easy3wFormPage = function (_Component) {
|
|
|
554
572
|
}, formItemLayout, formItemProps, {
|
|
555
573
|
style: formItemStyle
|
|
556
574
|
}),
|
|
557
|
-
getFieldDecorator(fieldId
|
|
575
|
+
getFieldDecorator(fieldId, {
|
|
558
576
|
initialValue: 'easy3wView',
|
|
559
577
|
rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
|
|
560
578
|
})(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),
|
|
@@ -1342,6 +1360,12 @@ var Easy3wFormPage = function (_Component) {
|
|
|
1342
1360
|
var cmptPros = item.cmptPros;
|
|
1343
1361
|
|
|
1344
1362
|
return _react2['default'].createElement(_autoComplete2['default'], cmptPros);
|
|
1363
|
+
}, _this.validatorBraftEditor = function (rule, value, callback) {
|
|
1364
|
+
if (value.isEmpty()) {
|
|
1365
|
+
callback(rule.message);
|
|
1366
|
+
} else {
|
|
1367
|
+
callback();
|
|
1368
|
+
}
|
|
1345
1369
|
}, _this.braftEditorHandler = function (item) {
|
|
1346
1370
|
var allReadFlag = _this.props.allReadFlag;
|
|
1347
1371
|
var readFlag = item.readFlag;
|
|
@@ -1562,6 +1586,9 @@ var Easy3wFormPage = function (_Component) {
|
|
|
1562
1586
|
/** autoComplete end */
|
|
1563
1587
|
|
|
1564
1588
|
/** braftEditor start */
|
|
1589
|
+
// 文章内容校验
|
|
1590
|
+
|
|
1591
|
+
// 富文本编辑器
|
|
1565
1592
|
|
|
1566
1593
|
/** braftEditor end */
|
|
1567
1594
|
|
|
@@ -484,10 +484,10 @@ var Easy3wNewFormPage = function (_Component) {
|
|
|
484
484
|
formItemProps = item.formItemProps,
|
|
485
485
|
novalueFlag = item.novalueFlag,
|
|
486
486
|
label = item.label,
|
|
487
|
-
fieldId = item.fieldId,
|
|
488
487
|
required = item.required,
|
|
489
488
|
requiredMessage = item.requiredMessage,
|
|
490
489
|
cmptPros = item.cmptPros;
|
|
490
|
+
var fieldId = item.fieldId;
|
|
491
491
|
|
|
492
492
|
var addRules = [];
|
|
493
493
|
var hadOnBlurFlag = false;
|
|
@@ -500,9 +500,33 @@ var Easy3wNewFormPage = function (_Component) {
|
|
|
500
500
|
addRules = rules;
|
|
501
501
|
}
|
|
502
502
|
}
|
|
503
|
+
var objValidator = {};
|
|
504
|
+
if (fieldType === 'braftEditor') {
|
|
505
|
+
objValidator = {
|
|
506
|
+
validator: _this.validatorBraftEditor
|
|
507
|
+
};
|
|
508
|
+
}
|
|
503
509
|
var decoratorObj = {
|
|
504
|
-
rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }].concat(addRules)
|
|
510
|
+
rules: [(0, _extends3['default'])({ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, objValidator)].concat(addRules)
|
|
505
511
|
};
|
|
512
|
+
if (itemValue || itemValue === 0) {
|
|
513
|
+
decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
|
|
514
|
+
initialValue: itemValue
|
|
515
|
+
});
|
|
516
|
+
}
|
|
517
|
+
if (readFlag || allReadFlag) {
|
|
518
|
+
fieldId = fieldId + 'Easy3wView';
|
|
519
|
+
if (fieldType === 'braftEditor' && itemValue.isEmpty()) {
|
|
520
|
+
// 只读时，符合必填校验
|
|
521
|
+
decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
|
|
522
|
+
initialValue: _braftEditor2['default'].createEditorState('<p> </p>')
|
|
523
|
+
});
|
|
524
|
+
} else if (fieldType === 'textarea' && !(itemValue || itemValue === 0)) {
|
|
525
|
+
decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
|
|
526
|
+
initialValue: ' '
|
|
527
|
+
});
|
|
528
|
+
}
|
|
529
|
+
}
|
|
506
530
|
if (cmptPros) {
|
|
507
531
|
if (cmptPros.getValueFromEvent) {
|
|
508
532
|
var getValueFromEvent = cmptPros.getValueFromEvent;
|
|
@@ -524,8 +548,7 @@ var Easy3wNewFormPage = function (_Component) {
|
|
|
524
548
|
disableFlagReal = true;
|
|
525
549
|
} else if (fieldType === 'braftEditor') {
|
|
526
550
|
decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
|
|
527
|
-
|
|
528
|
-
validateTrigger: 'onBlur'
|
|
551
|
+
valuePropName: 'defaultValue'
|
|
529
552
|
});
|
|
530
553
|
}
|
|
531
554
|
if (loadFinishFlag === true && bigFormFlag === true) {
|
|
@@ -1366,6 +1389,12 @@ var Easy3wNewFormPage = function (_Component) {
|
|
|
1366
1389
|
var cmptPros = item.cmptPros;
|
|
1367
1390
|
|
|
1368
1391
|
return _react2['default'].createElement(_autoComplete2['default'], cmptPros);
|
|
1392
|
+
}, _this.validatorBraftEditor = function (rule, value, callback) {
|
|
1393
|
+
if (value.isEmpty()) {
|
|
1394
|
+
callback(rule.message);
|
|
1395
|
+
} else {
|
|
1396
|
+
callback();
|
|
1397
|
+
}
|
|
1369
1398
|
}, _this.braftEditorHandler = function (item) {
|
|
1370
1399
|
var allReadFlag = _this.props.allReadFlag;
|
|
1371
1400
|
var readFlag = item.readFlag;
|
|
@@ -1641,6 +1670,9 @@ var Easy3wNewFormPage = function (_Component) {
|
|
|
1641
1670
|
/** autoComplete end */
|
|
1642
1671
|
|
|
1643
1672
|
/** braftEditor start */
|
|
1673
|
+
// 文章内容校验
|
|
1674
|
+
|
|
1675
|
+
// 富文本编辑器
|
|
1644
1676
|
|
|
1645
1677
|
/** braftEditor end */
|
|
1646
1678
|
|