easy3wui 4.0.38 → 4.0.39-beta.2

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 (12) hide show
  1. package/lib/Easy3wA/index.js +6 -2
  2. package/lib/Easy3wButton/index.js +6 -2
  3. package/lib/Easy3wButtonOne/index.js +6 -2
  4. package/lib/Easy3wFormPage/index.js +6 -2
  5. package/lib/Easy3wModal/index.js +18 -6
  6. package/lib/Easy3wNewFormPage/index.js +6 -2
  7. package/lib/Easy3wNewUpload/index.js +4 -6
  8. package/lib/Easy3wNewUploadB/index.js +1 -6
  9. package/lib/Easy3wNewUploadM/index.js +4 -6
  10. package/lib/Easy3wPositionButton/index.js +6 -2
  11. package/lib/Easy3wQryGrid/index.js +6 -2
  12. package/package.json +1 -1
package/lib/Easy3wA/index.js CHANGED
@@ -51,8 +51,12 @@ var Easy3wA = function (_Component) {
51
51
  }
52
52
 
53
53
  return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onClickFunc = function (e, func) {
54
- var globalLoading = _this.props.loading.global;
55
- if (globalLoading) {
54
+ var _this$props$loading = _this.props.loading,
55
+ globalLoading = _this$props$loading.global,
56
+ globalFetchLoading = _this$props$loading.globalFetch,
57
+ globalBlackLoading = _this$props$loading.globalBlack;
58
+
59
+ if (globalLoading || globalFetchLoading || globalBlackLoading) {
56
60
  _notification2['default'].warning({
57
61
  message: '温馨提示',
58
62
  description: '正在后台处理，请稍后！',
package/lib/Easy3wButton/index.js CHANGED
@@ -91,8 +91,12 @@ var Easy3wButton = function (_Component) {
91
91
  }
92
92
 
93
93
  return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onClickFunc = function (func) {
94
- var globalLoading = _this.props.loading.global;
95
- if (globalLoading) {
94
+ var _this$props$loading = _this.props.loading,
95
+ globalLoading = _this$props$loading.global,
96
+ globalFetchLoading = _this$props$loading.globalFetch,
97
+ globalBlackLoading = _this$props$loading.globalBlack;
98
+
99
+ if (globalLoading || globalFetchLoading || globalBlackLoading) {
96
100
  _notification2['default'].warning({
97
101
  message: '温馨提示',
98
102
  description: '正在后台处理，请稍后！',
package/lib/Easy3wButtonOne/index.js CHANGED
@@ -63,8 +63,12 @@ var Easy3wButtonOne = function (_Component) {
63
63
  }
64
64
 
65
65
  return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onClickFunc = function (e, func) {
66
- var globalLoading = _this.props.loadingFlag.global;
67
- if (globalLoading) {
66
+ var _this$props$loadingFl = _this.props.loadingFlag,
67
+ globalLoading = _this$props$loadingFl.global,
68
+ globalFetchLoading = _this$props$loadingFl.globalFetch,
69
+ globalBlackLoading = _this$props$loadingFl.globalBlack;
70
+
71
+ if (globalLoading || globalFetchLoading || globalBlackLoading) {
68
72
  _notification3['default'].warning({
69
73
  message: '温馨提示',
70
74
  description: '正在后台处理，请稍后！',
package/lib/Easy3wFormPage/index.js CHANGED
@@ -282,8 +282,12 @@ var Easy3wFormPage = function (_Component) {
282
282
  }
283
283
 
284
284
  return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onClickFunc = function (e, func) {
285
- var globalLoading = _this.props.loadingFlag.global;
286
- if (globalLoading) {
285
+ var _this$props$loadingFl = _this.props.loadingFlag,
286
+ globalLoading = _this$props$loadingFl.global,
287
+ globalFetchLoading = _this$props$loadingFl.globalFetch,
288
+ globalBlackLoading = _this$props$loadingFl.globalBlack;
289
+
290
+ if (globalLoading || globalFetchLoading || globalBlackLoading) {
287
291
  _notification3['default'].warning({
288
292
  message: '温馨提示',
289
293
  description: '正在后台处理，请稍后！',
package/lib/Easy3wModal/index.js CHANGED
@@ -67,8 +67,12 @@ var Easy3wModal = function (_Component) {
67
67
  }
68
68
 
69
69
  return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onClickFunc = function (e, func) {
70
- var globalLoading = _this.props.loadingFlag.global;
71
- if (globalLoading) {
70
+ var _this$props$loadingFl = _this.props.loadingFlag,
71
+ globalLoading = _this$props$loadingFl.global,
72
+ globalFetchLoading = _this$props$loadingFl.globalFetch,
73
+ globalBlackLoading = _this$props$loadingFl.globalBlack;
74
+
75
+ if (globalLoading || globalFetchLoading || globalBlackLoading) {
72
76
  _notification3['default'].warning({
73
77
  message: '温馨提示',
74
78
  description: '正在后台处理，请稍后！',
@@ -148,8 +152,12 @@ var Easy3wModal = function (_Component) {
148
152
  },
149
153
  onOk: function onOk() {
150
154
  // 1. 检查全局 loading 状态，阻止重复操作
151
- var loadingFlag = Easy3wModal.getLoading();
152
- if (loadingFlag) {
155
+ var _ref = Easy3wModal.getLoading() || {},
156
+ globalLoading = _ref.global,
157
+ globalFetchLoading = _ref.globalFetch,
158
+ globalBlackLoading = _ref.globalBlack;
159
+
160
+ if (globalLoading || globalFetchLoading || globalBlackLoading) {
153
161
  _notification3['default'].warning({
154
162
  message: '温馨提示',
155
163
  description: '操作正在进行中，请稍后！',
@@ -212,8 +220,12 @@ var Easy3wModal = function (_Component) {
212
220
  },
213
221
  onOk: function onOk() {
214
222
  if (_onOk2) {
215
- var loadingFlag = Easy3wModal.getLoading();
216
- if (loadingFlag) {
223
+ var _ref2 = Easy3wModal.getLoading() || {},
224
+ globalLoading = _ref2.global,
225
+ globalFetchLoading = _ref2.globalFetch,
226
+ globalBlackLoading = _ref2.globalBlack;
227
+
228
+ if (globalLoading || globalFetchLoading || globalBlackLoading) {
217
229
  _notification3['default'].warning({
218
230
  message: '温馨提示',
219
231
  description: '操作正在进行中，请稍后！',
package/lib/Easy3wNewFormPage/index.js CHANGED
@@ -281,8 +281,12 @@ var Easy3wNewFormPage = function (_Component) {
281
281
  }
282
282
 
283
283
  return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onClickFunc = function (e, func) {
284
- var globalLoading = _this.props.loadingFlag.global;
285
- if (globalLoading) {
284
+ var _this$props$loadingFl = _this.props.loadingFlag,
285
+ globalLoading = _this$props$loadingFl.global,
286
+ globalFetchLoading = _this$props$loadingFl.globalFetch,
287
+ globalBlackLoading = _this$props$loadingFl.globalBlack;
288
+
289
+ if (globalLoading || globalFetchLoading || globalBlackLoading) {
286
290
  _notification3['default'].warning({
287
291
  message: '温馨提示',
288
292
  description: '正在后台处理，请稍后！',
package/lib/Easy3wNewUpload/index.js CHANGED
@@ -172,14 +172,12 @@ var Easy3wNewUpload = function (_Component) {
172
172
  data: sendData
173
173
  }
174
174
  };
175
- var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
176
- var previewFileFlag = objPreviewFileNew.previewFileFlag,
177
- _objPreviewFileNew$do = objPreviewFileNew.downloadFileFlag,
178
- downloadFileFlag = _objPreviewFileNew$do === undefined ? '1' : _objPreviewFileNew$do;
179
-
180
175
  if (isRead) {
181
- upProps = (0, _extends3['default'])({}, upProps, { showUploadList: { showDownloadIcon: downloadFileFlag === '1', showPreviewIcon: true, showRemoveIcon: false } });
176
+ upProps = (0, _extends3['default'])({}, upProps, { showUploadList: { showPreviewIcon: true, showRemoveIcon: false } });
182
177
  }
178
+ var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
179
+ var previewFileFlag = objPreviewFileNew.previewFileFlag;
180
+
183
181
  if (previewFileFlag && fileViewFlag !== false) {
184
182
  upProps.onPreview = this.onPreview;
185
183
  }
package/lib/Easy3wNewUploadB/index.js CHANGED
@@ -296,13 +296,8 @@ var NewBigFileUpload = function (_Component) {
296
296
  fileList: this.state.fileList
297
297
  };
298
298
  var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
299
- var previewFileFlag = objPreviewFileNew.previewFileFlag,
300
- _objPreviewFileNew$do = objPreviewFileNew.downloadFileFlag,
301
- downloadFileFlag = _objPreviewFileNew$do === undefined ? '1' : _objPreviewFileNew$do;
299
+ var previewFileFlag = objPreviewFileNew.previewFileFlag;
302
300
 
303
- if (isRead) {
304
- upProps = (0, _extends3['default'])({}, upProps, { showUploadList: { showDownloadIcon: downloadFileFlag === '1', showPreviewIcon: true, showRemoveIcon: false } });
305
- }
306
301
  if (previewFileFlag && fileViewFlag !== false) {
307
302
  uploadProp.onPreview = this.onPreview;
308
303
  }
package/lib/Easy3wNewUploadM/index.js CHANGED
@@ -195,14 +195,12 @@ var Easy3wNewUploadM = function (_Component) {
195
195
  data: sendData
196
196
  }
197
197
  };
198
- var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
199
- var previewFileFlag = objPreviewFileNew.previewFileFlag,
200
- _objPreviewFileNew$do = objPreviewFileNew.downloadFileFlag,
201
- downloadFileFlag = _objPreviewFileNew$do === undefined ? '1' : _objPreviewFileNew$do;
202
-
203
198
  if (isRead) {
204
- upProps = (0, _extends3['default'])({}, upProps, { showUploadList: { showDownloadIcon: downloadFileFlag === '1', showPreviewIcon: true, showRemoveIcon: false } });
199
+ upProps = (0, _extends3['default'])({}, upProps, { showUploadList: { showPreviewIcon: true, showRemoveIcon: false } });
205
200
  }
201
+ var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
202
+ var previewFileFlag = objPreviewFileNew.previewFileFlag;
203
+
206
204
  if (previewFileFlag && fileViewFlag !== false) {
207
205
  upProps.onPreview = this.onPreview;
208
206
  }
package/lib/Easy3wPositionButton/index.js CHANGED
@@ -45,8 +45,12 @@ var Easy3wPositionButton = function (_Component) {
45
45
  }
46
46
 
47
47
  return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onClickFunc = function (func) {
48
- var globalLoading = _this.props.loading.global;
49
- if (globalLoading) {
48
+ var _this$props$loading = _this.props.loading,
49
+ globalLoading = _this$props$loading.global,
50
+ globalFetchLoading = _this$props$loading.globalFetch,
51
+ globalBlackLoading = _this$props$loading.globalBlack;
52
+
53
+ if (globalLoading || globalFetchLoading || globalBlackLoading) {
50
54
  _notification2['default'].warning({
51
55
  message: '温馨提示',
52
56
  description: '正在后台处理，请稍后！',
package/lib/Easy3wQryGrid/index.js CHANGED
@@ -455,8 +455,12 @@ var Easy3wQryGrid = function (_Component) {
455
455
 
456
456
  return _react2['default'].createElement(_cascader2['default'], cmptPros);
457
457
  }, _this.handleSearch = function () {
458
- var globalLoading = _this.props.loading.global;
459
- if (globalLoading) {
458
+ var _this$props$loading = _this.props.loading,
459
+ globalLoading = _this$props$loading.global,
460
+ globalFetchLoading = _this$props$loading.globalFetch,
461
+ globalBlackLoading = _this$props$loading.globalBlack;
462
+
463
+ if (globalLoading || globalFetchLoading || globalBlackLoading) {
460
464
  _notification2['default'].warning({
461
465
  message: '温馨提示',
462
466
  description: '正在后台处理，请稍后！',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "easy3wui",
3
- "version": "4.0.38",
3
+ "version": "4.0.39-beta.2",
4
4
  "description": "easy3wui components for react",
5
5
  "keywords": [
6
6
  "react",