easy3wui 1.5.86-7.beta → 1.5.86

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 (71) hide show
  1. package/LICENSE.md +3 -3
  2. package/README.md +26 -26
  3. package/assets/index.css +4 -0
  4. package/assets/skeleton.css +4 -0
  5. package/lib/Easy3wA/index.js +4 -9
  6. package/lib/Easy3wBlankLayout/index.js +45 -13
  7. package/lib/Easy3wButton/index.js +8 -12
  8. package/lib/Easy3wButtonOne/index.js +5 -9
  9. package/lib/Easy3wCaHandler/index.js +6 -10
  10. package/lib/Easy3wCard/indexM.js +3 -9
  11. package/lib/Easy3wCard/indexPC.js +3 -9
  12. package/lib/Easy3wDictCode/index.js +1 -5
  13. package/lib/Easy3wDownLoad/Easy3wFileView.js +3 -9
  14. package/lib/Easy3wDownLoad/Easy3wImgView.js +3 -9
  15. package/lib/Easy3wDownLoad/Easy3wPDFView.js +5 -11
  16. package/lib/Easy3wDownLoad/index.js +7 -3
  17. package/lib/Easy3wEditBigTable/Easy3wEditBigTableForm.js +12 -23
  18. package/lib/Easy3wEditBigTable/Editors/EditorsInputNumber.js +7 -0
  19. package/lib/Easy3wEditBigTable/index.js +112 -87
  20. package/lib/Easy3wException/index.js +6 -7
  21. package/lib/Easy3wException/typeConfig.js +3 -10
  22. package/lib/Easy3wFlow/index.js +15 -19
  23. package/lib/Easy3wFormPage/indexM.js +248 -647
  24. package/lib/Easy3wFormPage/indexPC.js +232 -631
  25. package/lib/Easy3wGetCookie/index.js +3 -10
  26. package/lib/Easy3wGetDesensitization/index.js +0 -7
  27. package/lib/Easy3wGlobalFooter/index.js +3 -8
  28. package/lib/Easy3wGlobalHeader/index.js +0 -4
  29. package/lib/Easy3wGridCheckBox/index.js +1 -5
  30. package/lib/Easy3wGridDatePicker/index.js +1 -5
  31. package/lib/Easy3wGridDateTimePicker/index.js +1 -5
  32. package/lib/Easy3wGridInput/index.js +2 -6
  33. package/lib/Easy3wGridInputAmount/index.js +1 -5
  34. package/lib/Easy3wGridInputDigit/index.js +1 -5
  35. package/lib/Easy3wGridInputEmail/index.js +1 -5
  36. package/lib/Easy3wGridInputNumber/index.js +1 -5
  37. package/lib/Easy3wGridInputNumberFormat/index.js +1 -5
  38. package/lib/Easy3wGridPage/index.js +2 -5
  39. package/lib/Easy3wGridPage/indexM.js +27 -12
  40. package/lib/Easy3wGridPage/indexPC.js +30 -11
  41. package/lib/Easy3wGridRadio/index.js +1 -5
  42. package/lib/Easy3wGridSelect/index.js +1 -5
  43. package/lib/Easy3wGridTextArea/index.js +1 -5
  44. package/lib/Easy3wInput/index.js +0 -4
  45. package/lib/Easy3wLogin/index.js +15 -19
  46. package/lib/Easy3wLoginLayout/index.js +0 -4
  47. package/lib/Easy3wModal/index.js +4 -8
  48. package/lib/Easy3wPositionButton/index.js +2 -6
  49. package/lib/Easy3wQryGrid/index.js +4 -8
  50. package/lib/Easy3wResult/index.js +0 -4
  51. package/lib/Easy3wRow/index.js +0 -4
  52. package/lib/Easy3wSetCookie/index.js +3 -10
  53. package/lib/Easy3wSkeleton/index.js +64 -0
  54. package/lib/Easy3wSpin/index.js +2 -5
  55. package/lib/Easy3wTagSelect/index.js +0 -4
  56. package/lib/Easy3wTagSelect/index.less +120 -120
  57. package/lib/Easy3wTree/index.js +88 -66
  58. package/lib/Easy3wUpload/index.js +18 -28
  59. package/lib/Easy3wUploadB/index copy 2.js +1011 -0
  60. package/lib/Easy3wUploadB/index copy 3.js +1088 -0
  61. package/lib/Easy3wUploadB/index copy.js +1020 -0
  62. package/lib/Easy3wUploadB/index.js +42 -48
  63. package/lib/Easy3wUploadM/index copy.js +523 -0
  64. package/lib/Easy3wUploadM/index.js +21 -30
  65. package/lib/Easy3wUserLayout/index.js +28 -20
  66. package/lib/index.js +9 -9
  67. package/package.json +122 -122
  68. package/CHANGELOG.md +0 -189
  69. package/HISTORY.md +0 -8
  70. package/lib/Easy3wI18N/index.js +0 -56
  71. package/lib/Easy3wI18N/locales/index.js +0 -8
@@ -1,17 +1,10 @@
1
- 'use strict';
1
+ "use strict";
2
2
 
3
3
  exports.__esModule = true;
4
- exports['default'] = Easy3wGetCookie;
5
-
6
- var _Easy3wI18N = require('../Easy3wI18N');
7
-
8
- var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
9
-
10
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
11
-
4
+ exports["default"] = Easy3wGetCookie;
12
5
  function Easy3wGetCookie(name) {
13
6
  var arr = void 0;
14
- var reg = new RegExp('(^| )' + name + '=([^;]*)(;|$)');
7
+ var reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
15
8
  if (arr = document.cookie.match(reg)) {
16
9
  return unescape(arr[2]);
17
10
  } else {
@@ -2,13 +2,6 @@
2
2
 
3
3
  exports.__esModule = true;
4
4
  exports['default'] = Easy3wGetDesensitization;
5
-
6
- var _Easy3wI18N = require('../Easy3wI18N');
7
-
8
- var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
9
-
10
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
11
-
12
5
  // 脱敏规则:
13
6
  // 1. 手机号:脱敏为前三位和后四位,中间用****代替
14
7
  // 2. 邮箱:脱敏为用户名的第一个字母和最后一个字母,中间用****代替,@后面的地址不变
@@ -22,10 +22,6 @@ var _classnames = require('classnames');
22
22
 
23
23
  var _classnames2 = _interopRequireDefault(_classnames);
24
24
 
25
- var _Easy3wI18N = require('../Easy3wI18N');
26
-
27
- var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
28
-
29
25
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
30
26
 
31
27
  var Easy3wGlobalFooter = function (_Component) {
@@ -50,22 +46,21 @@ var Easy3wGlobalFooter = function (_Component) {
50
46
  'div',
51
47
  { className: (0, _classnames2['default'])(['e3wGlobalFooterLinks']) },
52
48
  links.map(function (link) {
53
- var title = (0, _Easy3wI18N2['default'])(link.title);
54
49
  return _react2['default'].createElement(
55
50
  'a',
56
51
  {
57
- key: title,
52
+ key: link.title,
58
53
  target: link.blankTarget ? '_blank' : '_self',
59
54
  href: link.href
60
55
  },
61
- title
56
+ link.title
62
57
  );
63
58
  })
64
59
  ),
65
60
  copyright && _react2['default'].createElement(
66
61
  'div',
67
62
  { className: (0, _classnames2['default'])(['e3wGlobalFooterCopyright']) },
68
- (0, _Easy3wI18N2['default'])(copyright)
63
+ copyright
69
64
  )
70
65
  );
71
66
  };
@@ -58,10 +58,6 @@ var _classnames = require('classnames');
58
58
 
59
59
  var _classnames2 = _interopRequireDefault(_classnames);
60
60
 
61
- var _Easy3wI18N = require('../Easy3wI18N');
62
-
63
- var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
64
-
65
61
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
66
62
 
67
63
  var Header = _layout2['default'].Header;
@@ -30,10 +30,6 @@ var _checkbox2 = _interopRequireDefault(_checkbox);
30
30
 
31
31
  require('antd/lib/checkbox/style');
32
32
 
33
- var _Easy3wI18N = require('../Easy3wI18N');
34
-
35
- var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
36
-
37
33
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
38
34
 
39
35
  var CheckboxGroup = _checkbox2['default'].Group;
@@ -61,7 +57,7 @@ var Easy3wGridCheckBox = function (_Component) {
61
57
  { style: { marginBottom: 0, 'white-space': 'normal', 'text-align': 'left' } },
62
58
  getFieldDecorator(fieldId, {
63
59
  initialValue: value,
64
- rules: [{ required: required, message: (0, _Easy3wI18N2['default'])('Easy3wUI:请选择label', { label: label }) }]
60
+ rules: [{ required: required, message: '\u8BF7\u9009\u62E9' + label }]
65
61
  })(_react2['default'].createElement(CheckboxGroup, cmptPros))
66
62
  );
67
63
  };
@@ -44,10 +44,6 @@ var _zh_CN2 = _interopRequireDefault(_zh_CN);
44
44
 
45
45
  require('moment/locale/zh-cn');
46
46
 
47
- var _Easy3wI18N = require('../Easy3wI18N');
48
-
49
- var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
50
-
51
47
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
52
48
 
53
49
  _moment2['default'].locale('zh-cn');
@@ -77,7 +73,7 @@ var Easy3wGridDatePicker = function (_Component) {
77
73
  _form2['default'].Item,
78
74
  { style: { marginBottom: 0 } },
79
75
  getFieldDecorator(fieldId, {
80
- rules: [{ required: required, message: (0, _Easy3wI18N2['default'])('Easy3wUI:请选择label', { label: label }) }],
76
+ rules: [{ required: required, message: '\u8BF7\u9009\u62E9' + label }],
81
77
  initialValue: val
82
78
  })(_react2['default'].createElement(_datePicker2['default'], (0, _extends3['default'])({
83
79
  locale: _zh_CN2['default'],
@@ -44,10 +44,6 @@ var _zh_CN2 = _interopRequireDefault(_zh_CN);
44
44
 
45
45
  require('moment/locale/zh-cn');
46
46
 
47
- var _Easy3wI18N = require('../Easy3wI18N');
48
-
49
- var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
50
-
51
47
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
52
48
 
53
49
  _moment2['default'].locale('zh-cn');
@@ -107,7 +103,7 @@ var Easy3wGridDateTimePicker = function (_Component) {
107
103
  _form2['default'].Item,
108
104
  { style: { marginBottom: 0 } },
109
105
  getFieldDecorator(fieldId, {
110
- rules: [{ required: required, message: (0, _Easy3wI18N2['default'])('Easy3wUI:请选择label', { label: label }) }],
106
+ rules: [{ required: required, message: '\u8BF7\u9009\u62E9' + label }],
111
107
  initialValue: val
112
108
  })(_react2['default'].createElement(_datePicker2['default'], (0, _extends3['default'])({
113
109
  locale: _zh_CN2['default'],
@@ -34,10 +34,6 @@ var _input2 = _interopRequireDefault(_input);
34
34
 
35
35
  require('antd/lib/input/style');
36
36
 
37
- var _Easy3wI18N = require('../Easy3wI18N');
38
-
39
- var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
40
-
41
37
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
42
38
 
43
39
  var Easy3wGridInput = function (_Component) {
@@ -85,7 +81,7 @@ var Easy3wGridInput = function (_Component) {
85
81
  if (titleType) {
86
82
  defaultMaxLength = 400;
87
83
  }
88
- var rules = [{ required: required, message: requiredMessage || (0, _Easy3wI18N2['default'])('Easy3wUI:请填写label', { label: label }) }, { pattern: pattern, message: patternMessage }, { max: maxLength || defaultMaxLength, message: '\u5F55\u5165\u6587\u5B57\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7' + (maxLength || defaultMaxLength), transform: this.touchTransform }];
84
+ var rules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, { pattern: pattern, message: patternMessage }, { max: maxLength || defaultMaxLength, message: '\u5F55\u5165\u6587\u5B57\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7' + (maxLength || defaultMaxLength), transform: this.touchTransform }];
89
85
  if (disabled) {
90
86
  rules.pop();
91
87
  }
@@ -96,7 +92,7 @@ var Easy3wGridInput = function (_Component) {
96
92
  // trigger: 'onBlur',
97
93
  // valuePropName: 'defaultValue',
98
94
  rules: rules,
99
- // addRules = [{ max: maxLength, message: Easy3wI18N('Easy3wUI:录入文字长度不能超过maxLength', { maxLength }) }, ...addRules];
95
+ // addRules = [{ max: maxLength, message: `录入文字长度不能超过${maxLength}` }, ...addRules];
100
96
  initialValue: value
101
97
  })(_react2['default'].createElement(_input2['default'], (0, _extends3['default'])({}, cmptPros, { style: { minWidth: 80 } })))
102
98
  );
@@ -34,10 +34,6 @@ var _inputNumber2 = _interopRequireDefault(_inputNumber);
34
34
 
35
35
  require('antd/lib/input-number/style');
36
36
 
37
- var _Easy3wI18N = require('../Easy3wI18N');
38
-
39
- var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
40
-
41
37
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
42
38
 
43
39
  var Easy3wGridInputAmount = function (_Component) {
@@ -62,7 +58,7 @@ var Easy3wGridInputAmount = function (_Component) {
62
58
  var getFieldDecorator = form.getFieldDecorator;
63
59
 
64
60
  var rulesArr = [];
65
- var requiredRule = { required: required, message: requiredMessage || (0, _Easy3wI18N2['default'])('Easy3wUI:请填写label', { label: label }) };
61
+ var requiredRule = { required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label };
66
62
  var patternRule = { pattern: pattern, message: patternMessage };
67
63
  rulesArr.push(requiredRule);
68
64
  if (pattern) {
@@ -34,10 +34,6 @@ var _inputNumber2 = _interopRequireDefault(_inputNumber);
34
34
 
35
35
  require('antd/lib/input-number/style');
36
36
 
37
- var _Easy3wI18N = require('../Easy3wI18N');
38
-
39
- var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
40
-
41
37
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
42
38
 
43
39
  var Easy3wGridInputDigit = function (_Component) {
@@ -62,7 +58,7 @@ var Easy3wGridInputDigit = function (_Component) {
62
58
  var getFieldDecorator = form.getFieldDecorator;
63
59
 
64
60
  var rulesArr = [];
65
- var requiredRule = { required: required, message: requiredMessage || (0, _Easy3wI18N2['default'])('Easy3wUI:请填写label', { label: label }) };
61
+ var requiredRule = { required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label };
66
62
  var patternRule = { pattern: pattern, message: patternMessage };
67
63
  rulesArr.push(requiredRule);
68
64
  if (pattern) {
@@ -34,10 +34,6 @@ var _input2 = _interopRequireDefault(_input);
34
34
 
35
35
  require('antd/lib/input/style');
36
36
 
37
- var _Easy3wI18N = require('../Easy3wI18N');
38
-
39
- var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
40
-
41
37
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
42
38
 
43
39
  var Easy3wGridInputEmail = function (_Component) {
@@ -59,7 +55,7 @@ var Easy3wGridInputEmail = function (_Component) {
59
55
  label = _props.label;
60
56
  var getFieldDecorator = form.getFieldDecorator;
61
57
 
62
- var rules = [{ required: required, message: requiredMessage || (0, _Easy3wI18N2['default'])('Easy3wUI:请填写label', { label: label }) }, { pattern: 'email', message: (0, _Easy3wI18N2['default'])('Easy3wUI:邮箱地址格式错误!') }];
58
+ var rules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, { pattern: 'email', message: '邮箱地址格式错误!' }];
63
59
  return _react2['default'].createElement(
64
60
  _form2['default'].Item,
65
61
  { style: { marginBottom: 0 } },
@@ -34,10 +34,6 @@ var _inputNumber2 = _interopRequireDefault(_inputNumber);
34
34
 
35
35
  require('antd/lib/input-number/style');
36
36
 
37
- var _Easy3wI18N = require('../Easy3wI18N');
38
-
39
- var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
40
-
41
37
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
42
38
 
43
39
  var Easy3wGridInputNumber = function (_Component) {
@@ -62,7 +58,7 @@ var Easy3wGridInputNumber = function (_Component) {
62
58
  var getFieldDecorator = form.getFieldDecorator;
63
59
 
64
60
  var rulesArr = [];
65
- var requiredRule = { required: required, message: requiredMessage || (0, _Easy3wI18N2['default'])('Easy3wUI:请填写label', { label: label }) };
61
+ var requiredRule = { required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label };
66
62
  var patternRule = { pattern: pattern, message: patternMessage };
67
63
  rulesArr.push(requiredRule);
68
64
  if (pattern) {
@@ -34,10 +34,6 @@ var _inputNumber2 = _interopRequireDefault(_inputNumber);
34
34
 
35
35
  require('antd/lib/input-number/style');
36
36
 
37
- var _Easy3wI18N = require('../Easy3wI18N');
38
-
39
- var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
40
-
41
37
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
42
38
 
43
39
  var Easy3wGridInputNumberFormat = function (_Component) {
@@ -62,7 +58,7 @@ var Easy3wGridInputNumberFormat = function (_Component) {
62
58
  var getFieldDecorator = form.getFieldDecorator;
63
59
 
64
60
  var rulesArr = [];
65
- var requiredRule = { required: required, message: requiredMessage || (0, _Easy3wI18N2['default'])('Easy3wUI:请填写label', { label: label }) };
61
+ var requiredRule = { required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label };
66
62
  var patternRule = { pattern: pattern, message: patternMessage };
67
63
  rulesArr.push(requiredRule);
68
64
  if (pattern) {
@@ -12,16 +12,13 @@ var _indexPC = require('./indexPC');
12
12
 
13
13
  var _indexPC2 = _interopRequireDefault(_indexPC);
14
14
 
15
- var _Easy3wI18N = require('../Easy3wI18N');
16
-
17
- var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
18
-
19
15
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
20
16
 
21
17
  var isMobile = window.matchMedia('(max-width: 768px)').matches;
22
18
  exports['default'] = (0, _dva.connect)(function (state) {
23
19
  return {
24
- globalData: state.globalData
20
+ globalData: state.globalData,
21
+ loadingFlag: state.loading
25
22
  };
26
23
  })(isMobile ? _indexM2['default'] : _indexPC2['default']);
27
24
  module.exports = exports['default'];
@@ -72,13 +72,7 @@ var _numeral2 = _interopRequireDefault(_numeral);
72
72
 
73
73
  var _dva = require('dva');
74
74
 
75
- var _Easy3wGetDesensitization = require('../Easy3wGetDesensitization');
76
-
77
- var _Easy3wGetDesensitization2 = _interopRequireDefault(_Easy3wGetDesensitization);
78
-
79
- var _Easy3wI18N = require('../Easy3wI18N');
80
-
81
- var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
75
+ var _easy3wui = require('easy3wui');
82
76
 
83
77
  var _comonConfig = require('comonConfigPath/comonConfig');
84
78
 
@@ -136,8 +130,11 @@ var Easy3wGridPageM = function (_Component) {
136
130
  };
137
131
  // #region 获取表头
138
132
 
139
-
140
133
  // #endregion 获取表头
134
+ // #region 获取loading状态
135
+
136
+
137
+ // #endregion 获取loading状态
141
138
  Easy3wGridPageM.prototype.render = function render() {
142
139
  var _this2 = this;
143
140
 
@@ -145,7 +142,6 @@ var Easy3wGridPageM = function (_Component) {
145
142
  columns = _props.columns,
146
143
  totalResult = _props.totalResult,
147
144
  dataList = _props.dataList,
148
- loading = _props.loading,
149
145
  getCheckboxProps = _props.getCheckboxProps,
150
146
  needPaginationFlag = _props.needPaginationFlag,
151
147
  autoAddNumber = _props.autoAddNumber,
@@ -345,7 +341,7 @@ var Easy3wGridPageM = function (_Component) {
345
341
  '\u6E05\u7A7A'
346
342
  )
347
343
  ), type: 'info' });
348
-
344
+ var spinLoading = this.getLoading();
349
345
  // console.log('父级是否有 .e3wFormPageWrap:', hasParentClass);
350
346
  return _react2['default'].createElement(
351
347
  _react2['default'].Fragment,
@@ -361,7 +357,7 @@ var Easy3wGridPageM = function (_Component) {
361
357
  columns: myColumns,
362
358
  dataSource: dataList,
363
359
  pagination: paginationProps,
364
- loading: loading,
360
+ loading: spinLoading,
365
361
  rowKey: rowKey,
366
362
  rowSelection: rowSelection,
367
363
  bordered: bordered,
@@ -740,7 +736,7 @@ var _initialiseProps = function _initialiseProps() {
740
736
  var _ref = globalData || {},
741
737
  dataDesensitizationEyeFlag = _ref.dataDesensitizationEyeFlag;
742
738
 
743
- var strTextNew = _comonConfig.dataDesensitizationFlag ? dataDesensitizationEyeFlag ? text : (0, _Easy3wGetDesensitization2['default'])(text) : text;
739
+ var strTextNew = _comonConfig.dataDesensitizationFlag ? dataDesensitizationEyeFlag ? text : (0, _easy3wui.Easy3wGetDesensitization)(text) : text;
744
740
  if (strTextNew && strTextNew.length * 14 > 160) {
745
741
  return _react2['default'].createElement(
746
742
  _tooltip2['default'],
@@ -882,6 +878,25 @@ var _initialiseProps = function _initialiseProps() {
882
878
  });
883
879
  return myColumns;
884
880
  };
881
+
882
+ this.getLoading = function () {
883
+ var spinLoading = false;
884
+ var queryApi = _this3.props.queryApi;
885
+ var effectsFetch = _this3.props.loadingFlag.effectsFetch;
886
+
887
+ if (queryApi && typeof queryApi === 'string') {
888
+ spinLoading = effectsFetch[queryApi];
889
+ } else if (queryApi && queryApi instanceof Array && queryApi.length) {
890
+ queryApi.map(function (str) {
891
+ var spinLoadingC = effectsFetch[str];
892
+ if (spinLoadingC) {
893
+ spinLoading = spinLoadingC;
894
+ }
895
+ return str;
896
+ });
897
+ }
898
+ return spinLoading;
899
+ };
885
900
  };
886
901
 
887
902
  exports['default'] = Easy3wGridPageM;
@@ -72,15 +72,13 @@ var _numeral2 = _interopRequireDefault(_numeral);
72
72
 
73
73
  var _dva = require('dva');
74
74
 
75
- var _Easy3wGetDesensitization = require('../Easy3wGetDesensitization');
75
+ var _easy3wui = require('easy3wui');
76
76
 
77
- var _Easy3wGetDesensitization2 = _interopRequireDefault(_Easy3wGetDesensitization);
78
-
79
- var _Easy3wI18N = require('../Easy3wI18N');
77
+ var _comonConfig = require('comonConfigPath/comonConfig');
80
78
 
81
- var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
79
+ var _Easy3wSpin = require('../Easy3wSpin');
82
80
 
83
- var _comonConfig = require('comonConfigPath/comonConfig');
81
+ var _Easy3wSpin2 = _interopRequireDefault(_Easy3wSpin);
84
82
 
85
83
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
86
84
 
@@ -136,8 +134,11 @@ var Easy3wGridPagePC = function (_Component) {
136
134
  };
137
135
  // #region 获取表头
138
136
 
139
-
140
137
  // #endregion 获取表头
138
+ // #region 获取loading状态
139
+
140
+
141
+ // #endregion 获取loading状态
141
142
  Easy3wGridPagePC.prototype.render = function render() {
142
143
  var _this2 = this;
143
144
 
@@ -145,7 +146,6 @@ var Easy3wGridPagePC = function (_Component) {
145
146
  columns = _props.columns,
146
147
  totalResult = _props.totalResult,
147
148
  dataList = _props.dataList,
148
- loading = _props.loading,
149
149
  getCheckboxProps = _props.getCheckboxProps,
150
150
  needPaginationFlag = _props.needPaginationFlag,
151
151
  autoAddNumber = _props.autoAddNumber,
@@ -326,7 +326,7 @@ var Easy3wGridPagePC = function (_Component) {
326
326
  '\u6E05\u7A7A'
327
327
  )
328
328
  ), type: 'info' });
329
-
329
+ var spinLoading = this.getLoading();
330
330
  // console.log('父级是否有 .e3wFormPageWrap:', hasParentClass);
331
331
  return _react2['default'].createElement(
332
332
  'div',
@@ -336,7 +336,7 @@ var Easy3wGridPagePC = function (_Component) {
336
336
  columns: myColumns,
337
337
  dataSource: dataList,
338
338
  pagination: paginationProps,
339
- loading: loading,
339
+ loading: spinLoading,
340
340
  rowKey: rowKey,
341
341
  rowSelection: rowSelection,
342
342
  bordered: bordered,
@@ -713,7 +713,7 @@ var _initialiseProps = function _initialiseProps() {
713
713
  var _ref = globalData || {},
714
714
  dataDesensitizationEyeFlag = _ref.dataDesensitizationEyeFlag;
715
715
 
716
- var strTextNew = _comonConfig.dataDesensitizationFlag ? dataDesensitizationEyeFlag ? text : (0, _Easy3wGetDesensitization2['default'])(text) : text;
716
+ var strTextNew = _comonConfig.dataDesensitizationFlag ? dataDesensitizationEyeFlag ? text : (0, _easy3wui.Easy3wGetDesensitization)(text) : text;
717
717
  if (strTextNew && strTextNew.length * 14 > 160) {
718
718
  return _react2['default'].createElement(
719
719
  _tooltip2['default'],
@@ -855,6 +855,25 @@ var _initialiseProps = function _initialiseProps() {
855
855
  });
856
856
  return myColumns;
857
857
  };
858
+
859
+ this.getLoading = function () {
860
+ var spinLoading = false;
861
+ var queryApi = _this3.props.queryApi;
862
+ var effectsFetch = _this3.props.loadingFlag.effectsFetch;
863
+
864
+ if (queryApi && typeof queryApi === 'string') {
865
+ spinLoading = effectsFetch[queryApi];
866
+ } else if (queryApi && queryApi instanceof Array && queryApi.length) {
867
+ queryApi.map(function (str) {
868
+ var spinLoadingC = effectsFetch[str];
869
+ if (spinLoadingC) {
870
+ spinLoading = spinLoadingC;
871
+ }
872
+ return str;
873
+ });
874
+ }
875
+ return spinLoading;
876
+ };
858
877
  };
859
878
 
860
879
  exports['default'] = Easy3wGridPagePC;
@@ -30,10 +30,6 @@ var _radio2 = _interopRequireDefault(_radio);
30
30
 
31
31
  require('antd/lib/radio/style');
32
32
 
33
- var _Easy3wI18N = require('../Easy3wI18N');
34
-
35
- var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
36
-
37
33
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
38
34
 
39
35
  var RadioGroup = _radio2['default'].Group;
@@ -62,7 +58,7 @@ var Easy3wGridRadio = function (_Component) {
62
58
  { style: { marginBottom: 0 } },
63
59
  getFieldDecorator(fieldId, {
64
60
  initialValue: value,
65
- rules: [{ required: required, message: requiredMessage || (0, _Easy3wI18N2['default'])('Easy3wUI:请选择label', { label: label }) }]
61
+ rules: [{ required: required, message: requiredMessage || '\u8BF7\u9009\u62E9' + label }]
66
62
  })(_react2['default'].createElement(RadioGroup, cmptPros))
67
63
  );
68
64
  };
@@ -34,10 +34,6 @@ var _select2 = _interopRequireDefault(_select);
34
34
 
35
35
  require('antd/lib/select/style');
36
36
 
37
- var _Easy3wI18N = require('../Easy3wI18N');
38
-
39
- var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
40
-
41
37
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
42
38
 
43
39
  var Option = _select2['default'].Option;
@@ -74,7 +70,7 @@ var Easy3wGridSelect = function (_Component) {
74
70
  { style: { marginBottom: 0 } },
75
71
  getFieldDecorator(fieldId, {
76
72
  initialValue: value,
77
- rules: [{ required: required, message: (0, _Easy3wI18N2['default'])('Easy3wUI:请选择label', { label: label }) }]
73
+ rules: [{ required: required, message: '\u8BF7\u9009\u62E9' + label }]
78
74
  })(_react2['default'].createElement(
79
75
  _select2['default'],
80
76
  (0, _extends3['default'])({
@@ -34,10 +34,6 @@ var _input2 = _interopRequireDefault(_input);
34
34
 
35
35
  require('antd/lib/input/style');
36
36
 
37
- var _Easy3wI18N = require('../Easy3wI18N');
38
-
39
- var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
40
-
41
37
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
42
38
 
43
39
  var TextArea = _input2['default'].TextArea;
@@ -109,7 +105,7 @@ var Easy3wGridTextArea = function (_Component) {
109
105
  // if (!rows) {
110
106
  // cmptPros = { autosize: { minRows: 2, maxRows: 9999 }, ...cmptPros };
111
107
  // }
112
- var rules = [{ required: required, message: requiredMessage || (0, _Easy3wI18N2['default'])('Easy3wUI:请填写label', { label: label }) }, { max: maxLength || defaultMaxLength, message: '\u5F55\u5165\u6587\u5B57\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7' + (maxLength || defaultMaxLength), transform: this.touchTransform }];
108
+ var rules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, { max: maxLength || defaultMaxLength, message: '\u5F55\u5165\u6587\u5B57\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7' + (maxLength || defaultMaxLength), transform: this.touchTransform }];
113
109
  if (disabled) {
114
110
  rules.pop();
115
111
  }
@@ -24,10 +24,6 @@ var _input2 = _interopRequireDefault(_input);
24
24
 
25
25
  require('antd/lib/input/style');
26
26
 
27
- var _Easy3wI18N = require('../Easy3wI18N');
28
-
29
- var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
30
-
31
27
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
32
28
 
33
29
  var Search = _input2['default'].Search;