easy3wui 4.0.28-beta14 → 4.0.28-beta16

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.
@@ -32,11 +32,7 @@ var _tooltip2 = _interopRequireDefault(_tooltip);
32
32
 
33
33
  require('antd/lib/tooltip/style');
34
34
 
35
- var _icon = require('antd/lib/icon');
36
-
37
- var _icon2 = _interopRequireDefault(_icon);
38
-
39
- require('antd/lib/icon/style');
35
+ var _icons = require('@ant-design/icons');
40
36
 
41
37
  var _comonConfig = require('comonConfigPath/comonConfig');
42
38
 
@@ -62,6 +58,8 @@ var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
62
58
 
63
59
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
64
60
 
61
+ // import Icon from 'antd/lib/icon';
62
+ // import 'antd/lib/icon/style';
65
63
  var Easy3wDownLoad = function (_Component) {
66
64
  (0, _inherits3['default'])(Easy3wDownLoad, _Component);
67
65
 
@@ -202,7 +200,7 @@ var Easy3wDownLoad = function (_Component) {
202
200
  name
203
201
  )
204
202
  ),
205
- _react2['default'].createElement(_icon2['default'], { type: 'download', onClick: function onClick() {
203
+ _react2['default'].createElement(_icons.DownloadOutlined, { onClick: function onClick() {
206
204
  return _this2.touchDownload(obj, url);
207
205
  }, style: { float: 'right', lineHeight: '100%' } })
208
206
  );
@@ -241,7 +239,7 @@ var Easy3wDownLoad = function (_Component) {
241
239
  }, style: { overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis', paddingRight: '12px' } },
242
240
  name
243
241
  ),
244
- _react2['default'].createElement(_icon2['default'], { type: 'download', onClick: function onClick() {
242
+ _react2['default'].createElement(_icons.DownloadOutlined, { onClick: function onClick() {
245
243
  return _this2.touchDownload(obj, url);
246
244
  }, style: { float: 'right', lineHeight: '100%' } })
247
245
  );
@@ -514,6 +514,11 @@ var Easy3wFormPage = function (_Component) {
514
514
  // 只读文本框改为禁止录入
515
515
  if (fieldType === 'textarea' && (readFlag || allReadFlag)) {
516
516
  disableFlagReal = true;
517
+ } else if (fieldType === 'braftEditor') {
518
+ decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
519
+ trigger: 'onBlur',
520
+ validateTrigger: 'onBlur'
521
+ });
517
522
  }
518
523
  if (loadFinishFlag === true && bigFormFlag === true) {
519
524
  if ((fieldType === 'input' || fieldType === 'textarea') && !hadOnBlurFlag && !disableFlagReal && !notProxyOnblurFlag) {
@@ -1348,7 +1353,7 @@ var Easy3wFormPage = function (_Component) {
1348
1353
  if (readFlag || allReadFlag || cmptPros && cmptPros.readOnly) {
1349
1354
  cmptPros.controls = [];
1350
1355
  }
1351
- return _react2['default'].createElement(_braftEditor2['default'], (0, _extends3['default'])({ readOnly: readFlag || allReadFlag }, cmptPros));
1356
+ return _react2['default'].createElement(_braftEditor2['default'], (0, _extends3['default'])({ readOnly: readFlag || allReadFlag }, cmptPros, { style: { border: '1px solid #eee' } }));
1352
1357
  }, _this.cascaderHandler = function (item) {
1353
1358
  var cmptPros = item.cmptPros;
1354
1359
 
@@ -522,6 +522,11 @@ var Easy3wNewFormPage = function (_Component) {
522
522
  // 只读文本框改为禁止录入
523
523
  if (fieldType === 'textarea' && (readFlag || allReadFlag)) {
524
524
  disableFlagReal = true;
525
+ } else if (fieldType === 'braftEditor') {
526
+ decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
527
+ trigger: 'onBlur',
528
+ validateTrigger: 'onBlur'
529
+ });
525
530
  }
526
531
  if (loadFinishFlag === true && bigFormFlag === true) {
527
532
  if ((fieldType === 'input' || fieldType === 'textarea') && !hadOnBlurFlag && !disableFlagReal && !notProxyOnblurFlag) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "easy3wui",
3
- "version": "4.0.28-beta14",
3
+ "version": "4.0.28-beta16",
4
4
  "description": "easy3wui components for react",
5
5
  "keywords": [
6
6
  "react",