easy3wui 1.4.255 → 1.4.260

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.
Files changed (2) hide show
  1. package/lib/Easy3wFormPage/index.js +76 -52
  2. package/package.json +1 -1
package/lib/Easy3wFormPage/index.js CHANGED
@@ -450,13 +450,13 @@ var Easy3wFormPage = function (_Component) {
450
450
  if (afterBtn) {
451
451
  var allBtn = afterBtn.map(function (btn) {
452
452
  if (btn.objType === 'btn') {
453
- return _this.btnHandler(btn);
453
+ return _this.btnHandler(btn, true);
454
454
  }
455
455
  if (btn.objType === 'a') {
456
- return _this.aHandler(btn);
456
+ return _this.aHandler(btn, true);
457
457
  }
458
458
  if (btn.objType === 'string') {
459
- return _this.strHandler(btn);
459
+ return _this.strHandler(btn, true);
460
460
  }
461
461
  return {};
462
462
  });
@@ -593,7 +593,7 @@ var Easy3wFormPage = function (_Component) {
593
593
 
594
594
  return _react2['default'].createElement(
595
595
  'div',
596
- { style: { position: 'relative' } },
596
+ null,
597
597
  _react2['default'].createElement(
598
598
  FormItem,
599
599
  (0, _extends3['default'])({
@@ -602,28 +602,40 @@ var Easy3wFormPage = function (_Component) {
602
602
  style: formItemStyle,
603
603
  className: (0, _classnames2['default'])(['formContent'])
604
604
  }),
605
- formItemChild,
606
- _react2['default'].createElement(
607
- _popover2['default'],
608
- {
609
- title: title,
610
- content: _react2['default'].createElement(
611
- 'div',
612
- { style: { padding: '4px 0' } },
613
- _react2['default'].createElement(
614
- 'span',
615
- { style: { color: '#5468b2', width: 200, height: 300 } },
616
- content
617
- )
618
- ),
619
- placement: placement
620
- },
621
- getFieldDecorator(fieldId, (0, _extends3['default'])({}, decoratorObj))(itemArea)
622
- ),
623
605
  _react2['default'].createElement(
624
606
  'div',
625
- { style: { position: 'absolute', left: '100%', top: '0px', zIndex: 2 } },
626
- afterBtns
607
+ { style: { display: 'flex', flexDirection: 'row', flexWrap: 'wrap' } },
608
+ _react2['default'].createElement(
609
+ 'span',
610
+ { style: { wordBreak: 'break-all' } },
611
+ formItemChild
612
+ ),
613
+ _react2['default'].createElement(
614
+ 'span',
615
+ { style: { flexGrow: 1 } },
616
+ _react2['default'].createElement(
617
+ _popover2['default'],
618
+ {
619
+ title: title,
620
+ content: _react2['default'].createElement(
621
+ 'div',
622
+ { style: { padding: '4px 0' } },
623
+ _react2['default'].createElement(
624
+ 'span',
625
+ { style: { color: '#5468b2', width: 200, height: 300 } },
626
+ content
627
+ )
628
+ ),
629
+ placement: placement
630
+ },
631
+ getFieldDecorator(fieldId, (0, _extends3['default'])({}, decoratorObj))(itemArea)
632
+ )
633
+ ),
634
+ _react2['default'].createElement(
635
+ 'div',
636
+ null,
637
+ afterBtns
638
+ )
627
639
  )
628
640
  )
629
641
  );
@@ -649,12 +661,20 @@ var Easy3wFormPage = function (_Component) {
649
661
  }),
650
662
  _react2['default'].createElement(
651
663
  'div',
652
- { style: { position: 'relative' } },
653
- formItemChild,
654
- getFieldDecorator(fieldId, (0, _extends3['default'])({}, decoratorObj))(itemArea),
664
+ { style: { display: 'flex', flexDirection: 'row', flexWrap: 'wrap' } },
665
+ _react2['default'].createElement(
666
+ 'span',
667
+ { style: { wordBreak: 'break-all' } },
668
+ formItemChild
669
+ ),
670
+ _react2['default'].createElement(
671
+ 'span',
672
+ { style: { flexGrow: 1 } },
673
+ getFieldDecorator(fieldId, (0, _extends3['default'])({}, decoratorObj))(itemArea)
674
+ ),
655
675
  _react2['default'].createElement(
656
676
  'div',
657
- { style: { position: 'absolute', left: '100%', top: '0px', zIndex: 2 } },
677
+ null,
658
678
  afterBtns
659
679
  )
660
680
  )
@@ -1356,10 +1376,10 @@ var Easy3wFormPage = function (_Component) {
1356
1376
  }),
1357
1377
  _react2['default'].createElement(
1358
1378
  'div',
1359
- { style: { position: 'relative' } },
1379
+ { style: { display: 'flex', flexDirection: 'row', flexWrap: 'wrap' } },
1360
1380
  _react2['default'].createElement(
1361
1381
  _row2['default'],
1362
- null,
1382
+ { style: { flexGrow: 1 } },
1363
1383
  _react2['default'].createElement(
1364
1384
  _col2['default'],
1365
1385
  { span: cmptPros && cmptPros.addonAfter ? 21 : 24 },
@@ -1395,7 +1415,7 @@ var Easy3wFormPage = function (_Component) {
1395
1415
  ),
1396
1416
  _react2['default'].createElement(
1397
1417
  'div',
1398
- { style: { position: 'absolute', left: '100%', zIndex: 2, top: '0px' } },
1418
+ null,
1399
1419
  afterBtns
1400
1420
  )
1401
1421
  )
@@ -1477,22 +1497,26 @@ var Easy3wFormPage = function (_Component) {
1477
1497
  }),
1478
1498
  _react2['default'].createElement(
1479
1499
  'div',
1480
- { style: { position: 'relative' } },
1481
- getFieldDecorator(fieldId, {
1482
- initialValue: value,
1483
- rules: [{ required: required, message: '\u8BF7\u9009\u62E9' + label }]
1484
- })(_react2['default'].createElement(
1485
- _select2['default'],
1486
- (0, _extends3['default'])({
1487
- style: { width: '100%' }
1488
- }, cmptProsNew, {
1489
- size: 'small'
1490
- }),
1491
- selectOpts
1492
- )),
1500
+ { style: { display: 'flex', flexDirection: 'row', flexWrap: 'wrap' } },
1501
+ _react2['default'].createElement(
1502
+ 'span',
1503
+ { style: { flexGrow: 1 } },
1504
+ getFieldDecorator(fieldId, {
1505
+ initialValue: value,
1506
+ rules: [{ required: required, message: '\u8BF7\u9009\u62E9' + label }]
1507
+ })(_react2['default'].createElement(
1508
+ _select2['default'],
1509
+ (0, _extends3['default'])({
1510
+ style: { width: '100%' }
1511
+ }, cmptProsNew, {
1512
+ size: 'small'
1513
+ }),
1514
+ selectOpts
1515
+ ))
1516
+ ),
1493
1517
  _react2['default'].createElement(
1494
1518
  'div',
1495
- { style: { position: 'absolute', left: '100%', zIndex: 2, top: '0px' } },
1519
+ null,
1496
1520
  afterBtns
1497
1521
  )
1498
1522
  )
@@ -1746,7 +1770,7 @@ var Easy3wFormPage = function (_Component) {
1746
1770
  var value = item.value;
1747
1771
 
1748
1772
  return value;
1749
- }, _this.btnHandler = function (obj) {
1773
+ }, _this.btnHandler = function (obj, noMarginFlag) {
1750
1774
  var func = obj.func,
1751
1775
  cName = obj.cName,
1752
1776
  confirmContent = obj.confirmContent;
@@ -1759,7 +1783,7 @@ var Easy3wFormPage = function (_Component) {
1759
1783
  } },
1760
1784
  _react2['default'].createElement(
1761
1785
  _button2['default'],
1762
- { className: (0, _classnames2['default'])(['e3wFootBtn']), size: 'small' },
1786
+ { className: (0, _classnames2['default'])([noMarginFlag ? '' : 'e3wFootBtn']), size: 'small' },
1763
1787
  cName
1764
1788
  )
1765
1789
  );
@@ -1770,12 +1794,12 @@ var Easy3wFormPage = function (_Component) {
1770
1794
  onClick: function onClick(e) {
1771
1795
  return _this.onClickFunc(e, func);
1772
1796
  },
1773
- className: (0, _classnames2['default'])(['e3wFootBtn']),
1797
+ className: (0, _classnames2['default'])([noMarginFlag ? '' : 'e3wFootBtn']),
1774
1798
  size: 'small'
1775
1799
  },
1776
1800
  cName
1777
1801
  );
1778
- }, _this.aHandler = function (obj) {
1802
+ }, _this.aHandler = function (obj, noMarginFlag) {
1779
1803
  var func = obj.func,
1780
1804
  cName = obj.cName;
1781
1805
 
@@ -1785,18 +1809,18 @@ var Easy3wFormPage = function (_Component) {
1785
1809
  onClick: function onClick(e) {
1786
1810
  return _this.onClickFunc(e, func);
1787
1811
  },
1788
- className: (0, _classnames2['default'])(['e3wFootBtn'])
1812
+ className: (0, _classnames2['default'])([noMarginFlag ? '' : 'e3wFootBtn'])
1789
1813
  },
1790
1814
  cName
1791
1815
  );
1792
- }, _this.strHandler = function (obj) {
1816
+ }, _this.strHandler = function (obj, noMarginFlag) {
1793
1817
  var cName = obj.cName,
1794
1818
  color = obj.color;
1795
1819
 
1796
1820
  return _react2['default'].createElement(
1797
1821
  'span',
1798
1822
  {
1799
- className: (0, _classnames2['default'])(['e3wFootBtn']),
1823
+ className: (0, _classnames2['default'])([noMarginFlag ? '' : 'e3wFootBtn']),
1800
1824
  style: { color: color || '' }
1801
1825
  },
1802
1826
  cName
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "easy3wui",
3
- "version": "1.4.255",
3
+ "version": "1.4.260",
4
4
  "description": "easy3wui components for react",
5
5
  "keywords": [
6
6
  "react",