easy3wui 1.5.31 → 1.5.32

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.
@@ -6,6 +6,10 @@ var _icon = require('antd/lib/icon');
6
6
 
7
7
  var _icon2 = _interopRequireDefault(_icon);
8
8
 
9
+ var _extends2 = require('babel-runtime/helpers/extends');
10
+
11
+ var _extends3 = _interopRequireDefault(_extends2);
12
+
9
13
  var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
10
14
 
11
15
  var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
@@ -68,10 +72,7 @@ var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
68
72
 
69
73
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
70
74
 
71
- var _ref = _comonConfig.objPreviewFile || {},
72
- previewFileUrl = _ref.previewFileUrl,
73
- previewFileFlag = _ref.previewFileFlag,
74
- previewFileType = _ref.previewFileType;
75
+ // const { previewFileUrl, previewFileFlag, previewFileType } = objPreviewFile || {};
75
76
 
76
77
  var Easy3wDownLoad = function (_Component) {
77
78
  (0, _inherits3['default'])(Easy3wDownLoad, _Component);
@@ -82,6 +83,9 @@ var Easy3wDownLoad = function (_Component) {
82
83
  var _this = (0, _possibleConstructorReturn3['default'])(this, _Component.call(this, props));
83
84
 
84
85
  _this.onPreview = function (file, url) {
86
+ var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, _this.props.objPreviewFile);
87
+ var previewFileUrl = objPreviewFileNew.previewFileUrl,
88
+ previewFileType = objPreviewFileNew.previewFileType;
85
89
  var uid = file.uid,
86
90
  name = file.name;
87
91
 
@@ -194,6 +198,9 @@ var Easy3wDownLoad = function (_Component) {
194
198
  fileViewURL = _props.fileViewURL,
195
199
  fileCallURL = _props.fileCallURL;
196
200
 
201
+ var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
202
+ var previewFileFlag = objPreviewFileNew.previewFileFlag;
203
+
197
204
  var retObj = '';
198
205
  if (downloadArr) {
199
206
  retObj = downloadArr.map(function (obj) {
@@ -78,11 +78,6 @@ var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
78
78
 
79
79
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
80
80
 
81
- var _ref = _comonConfig.objPreviewFile || {},
82
- previewFileUrl = _ref.previewFileUrl,
83
- previewFileFlag = _ref.previewFileFlag,
84
- previewFileType = _ref.previewFileType;
85
-
86
81
  var FormItem = _form2['default'].Item;
87
82
  var formItemStyle = {
88
83
  marginBottom: 6
@@ -101,6 +96,9 @@ var Easy3wUpload = function (_Component) {
101
96
  }
102
97
 
103
98
  return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onPreview = function (file) {
99
+ var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, _this.props.objPreviewFile);
100
+ var previewFileUrl = objPreviewFileNew.previewFileUrl,
101
+ previewFileType = objPreviewFileNew.previewFileType;
104
102
  var uid = file.uid,
105
103
  url = file.url,
106
104
  name = file.name;
@@ -210,6 +208,9 @@ var Easy3wUpload = function (_Component) {
210
208
  if (isRead) {
211
209
  upProps = (0, _extends3['default'])({}, upProps, { children: true, showUploadList: { showDownloadIcon: true, showPreviewIcon: true, showRemoveIcon: false } });
212
210
  }
211
+ var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
212
+ var previewFileFlag = objPreviewFileNew.previewFileFlag;
213
+
213
214
  if (previewFileFlag && fileViewFlag !== false) {
214
215
  upProps.onPreview = this.onPreview;
215
216
  }
@@ -88,10 +88,7 @@ var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
88
88
 
89
89
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
90
90
 
91
- var _ref = _comonConfig.objPreviewFile || {},
92
- previewFileUrl = _ref.previewFileUrl,
93
- previewFileFlag = _ref.previewFileFlag,
94
- previewFileType = _ref.previewFileType;
91
+ // const { previewFileUrl, previewFileFlag, previewFileType } = objPreviewFile || {};
95
92
 
96
93
  var formItemStyle = {
97
94
  marginBottom: 6
@@ -313,6 +310,9 @@ var BigFileUpload = function (_Component) {
313
310
  },
314
311
  fileList: this.state.fileList
315
312
  };
313
+ var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
314
+ var previewFileFlag = objPreviewFileNew.previewFileFlag;
315
+
316
316
  if (previewFileFlag && fileViewFlag !== false) {
317
317
  uploadProp.onPreview = this.onPreview;
318
318
  }
@@ -470,6 +470,9 @@ var _initialiseProps = function _initialiseProps() {
470
470
  var _this3 = this;
471
471
 
472
472
  this.onPreview = function (file) {
473
+ var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, _this3.props.objPreviewFile);
474
+ var previewFileUrl = objPreviewFileNew.previewFileUrl,
475
+ previewFileType = objPreviewFileNew.previewFileType;
473
476
  var uid = file.uid,
474
477
  url = file.url,
475
478
  name = file.name;
@@ -78,10 +78,7 @@ var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
78
78
 
79
79
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
80
80
 
81
- var _ref = _comonConfig.objPreviewFile || {},
82
- previewFileUrl = _ref.previewFileUrl,
83
- previewFileFlag = _ref.previewFileFlag,
84
- previewFileType = _ref.previewFileType;
81
+ // const { previewFileUrl, previewFileFlag, previewFileType } = objPreviewFile || {};
85
82
 
86
83
  var formItemStyle = {
87
84
  marginBottom: 6
@@ -103,6 +100,9 @@ var Easy3wUploadM = function (_Component) {
103
100
  fileList: [{}]
104
101
  // 预览
105
102
  }, _this.onPreview = function (file) {
103
+ var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, _this.props.objPreviewFile);
104
+ var previewFileUrl = objPreviewFileNew.previewFileUrl,
105
+ previewFileType = objPreviewFileNew.previewFileType;
106
106
  var uid = file.uid,
107
107
  url = file.url,
108
108
  name = file.name;
@@ -214,6 +214,9 @@ var Easy3wUploadM = function (_Component) {
214
214
  if (isRead) {
215
215
  upProps = (0, _extends3['default'])({}, upProps, { children: true, showUploadList: { showPreviewIcon: false, showRemoveIcon: false } });
216
216
  }
217
+ var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
218
+ var previewFileFlag = objPreviewFileNew.previewFileFlag;
219
+
217
220
  if (previewFileFlag && fileViewFlag !== false) {
218
221
  upProps.onPreview = this.onPreview;
219
222
  }
@@ -349,7 +352,7 @@ var Easy3wUploadM = function (_Component) {
349
352
  return true;
350
353
  });
351
354
  allivaule = '';
352
- iniVal = fileList.map(function (obj, index) {
355
+ iniVal = fileList.map(function (obj) {
353
356
  var uid = obj.uid;
354
357
 
355
358
  if (allivaule === '') {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "easy3wui",
3
- "version": "1.5.31",
3
+ "version": "1.5.32",
4
4
  "description": "easy3wui components for react",
5
5
  "keywords": [
6
6
  "react",