easy3wui 4.0.39-beta.2 → 4.0.39

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 (10) hide show
  1. package/lib/Easy3wA/index.js +2 -6
  2. package/lib/Easy3wButton/index.js +2 -6
  3. package/lib/Easy3wButtonOne/index.js +2 -6
  4. package/lib/Easy3wFormPage/index.js +2 -6
  5. package/lib/Easy3wModal/index.js +6 -18
  6. package/lib/Easy3wNewFormPage/index.js +2 -6
  7. package/lib/Easy3wPositionButton/index.js +2 -6
  8. package/lib/Easy3wQryGrid/index.js +2 -6
  9. package/lib/Easy3wTabs/index.js +2 -2
  10. package/package.json +1 -1
package/lib/Easy3wA/index.js CHANGED
@@ -51,12 +51,8 @@ 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 _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) {
54
+ var globalLoading = _this.props.loading.global;
55
+ if (globalLoading) {
60
56
  _notification2['default'].warning({
61
57
  message: '温馨提示',
62
58
  description: '正在后台处理，请稍后！',
package/lib/Easy3wButton/index.js CHANGED
@@ -91,12 +91,8 @@ 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 _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) {
94
+ var globalLoading = _this.props.loading.global;
95
+ if (globalLoading) {
100
96
  _notification2['default'].warning({
101
97
  message: '温馨提示',
102
98
  description: '正在后台处理，请稍后！',
package/lib/Easy3wButtonOne/index.js CHANGED
@@ -63,12 +63,8 @@ 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 _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) {
66
+ var globalLoading = _this.props.loadingFlag.global;
67
+ if (globalLoading) {
72
68
  _notification3['default'].warning({
73
69
  message: '温馨提示',
74
70
  description: '正在后台处理，请稍后！',
package/lib/Easy3wFormPage/index.js CHANGED
@@ -282,12 +282,8 @@ 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 _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) {
285
+ var globalLoading = _this.props.loadingFlag.global;
286
+ if (globalLoading) {
291
287
  _notification3['default'].warning({
292
288
  message: '温馨提示',
293
289
  description: '正在后台处理，请稍后！',
package/lib/Easy3wModal/index.js CHANGED
@@ -67,12 +67,8 @@ 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 _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) {
70
+ var globalLoading = _this.props.loadingFlag.global;
71
+ if (globalLoading) {
76
72
  _notification3['default'].warning({
77
73
  message: '温馨提示',
78
74
  description: '正在后台处理，请稍后！',
@@ -152,12 +148,8 @@ var Easy3wModal = function (_Component) {
152
148
  },
153
149
  onOk: function onOk() {
154
150
  // 1. 检查全局 loading 状态，阻止重复操作
155
- var _ref = Easy3wModal.getLoading() || {},
156
- globalLoading = _ref.global,
157
- globalFetchLoading = _ref.globalFetch,
158
- globalBlackLoading = _ref.globalBlack;
159
-
160
- if (globalLoading || globalFetchLoading || globalBlackLoading) {
151
+ var loadingFlag = Easy3wModal.getLoading();
152
+ if (loadingFlag) {
161
153
  _notification3['default'].warning({
162
154
  message: '温馨提示',
163
155
  description: '操作正在进行中，请稍后！',
@@ -220,12 +212,8 @@ var Easy3wModal = function (_Component) {
220
212
  },
221
213
  onOk: function onOk() {
222
214
  if (_onOk2) {
223
- var _ref2 = Easy3wModal.getLoading() || {},
224
- globalLoading = _ref2.global,
225
- globalFetchLoading = _ref2.globalFetch,
226
- globalBlackLoading = _ref2.globalBlack;
227
-
228
- if (globalLoading || globalFetchLoading || globalBlackLoading) {
215
+ var loadingFlag = Easy3wModal.getLoading();
216
+ if (loadingFlag) {
229
217
  _notification3['default'].warning({
230
218
  message: '温馨提示',
231
219
  description: '操作正在进行中，请稍后！',
package/lib/Easy3wNewFormPage/index.js CHANGED
@@ -281,12 +281,8 @@ 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 _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) {
284
+ var globalLoading = _this.props.loadingFlag.global;
285
+ if (globalLoading) {
290
286
  _notification3['default'].warning({
291
287
  message: '温馨提示',
292
288
  description: '正在后台处理，请稍后！',
package/lib/Easy3wPositionButton/index.js CHANGED
@@ -45,12 +45,8 @@ 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 _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) {
48
+ var globalLoading = _this.props.loading.global;
49
+ if (globalLoading) {
54
50
  _notification2['default'].warning({
55
51
  message: '温馨提示',
56
52
  description: '正在后台处理，请稍后！',
package/lib/Easy3wQryGrid/index.js CHANGED
@@ -455,12 +455,8 @@ var Easy3wQryGrid = function (_Component) {
455
455
 
456
456
  return _react2['default'].createElement(_cascader2['default'], cmptPros);
457
457
  }, _this.handleSearch = function () {
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) {
458
+ var globalLoading = _this.props.loading.global;
459
+ if (globalLoading) {
464
460
  _notification2['default'].warning({
465
461
  message: '温馨提示',
466
462
  description: '正在后台处理，请稍后！',
package/lib/Easy3wTabs/index.js CHANGED
@@ -73,11 +73,11 @@ var Easy3wTabs = function (_PureComponent) {
73
73
  this.props,
74
74
  children
75
75
  ) : children && children.length > 0 ? children.map(function (item) {
76
- return _react2['default'].createElement(
76
+ return item ? _react2['default'].createElement(
77
77
  _Easy3wCard2['default'],
78
78
  { label: item.props && item.props.tab ? item.props.tab : '' },
79
79
  item.props && item.props.children ? item.props.children : ''
80
- );
80
+ ) : '';
81
81
  }) : ''
82
82
  );
83
83
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "easy3wui",
3
- "version": "4.0.39-beta.2",
3
+ "version": "4.0.39",
4
4
  "description": "easy3wui components for react",
5
5
  "keywords": [
6
6
  "react",