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.
- package/LICENSE.md +3 -3
- package/README.md +26 -26
- package/assets/index.css +4 -0
- package/assets/skeleton.css +4 -0
- package/lib/Easy3wA/index.js +4 -9
- package/lib/Easy3wBlankLayout/index.js +45 -13
- package/lib/Easy3wButton/index.js +8 -12
- package/lib/Easy3wButtonOne/index.js +5 -9
- package/lib/Easy3wCaHandler/index.js +6 -10
- package/lib/Easy3wCard/indexM.js +3 -9
- package/lib/Easy3wCard/indexPC.js +3 -9
- package/lib/Easy3wDictCode/index.js +1 -5
- package/lib/Easy3wDownLoad/Easy3wFileView.js +3 -9
- package/lib/Easy3wDownLoad/Easy3wImgView.js +3 -9
- package/lib/Easy3wDownLoad/Easy3wPDFView.js +5 -11
- package/lib/Easy3wDownLoad/index.js +7 -3
- package/lib/Easy3wEditBigTable/Easy3wEditBigTableForm.js +12 -23
- package/lib/Easy3wEditBigTable/Editors/EditorsInputNumber.js +7 -0
- package/lib/Easy3wEditBigTable/index.js +112 -87
- package/lib/Easy3wException/index.js +6 -7
- package/lib/Easy3wException/typeConfig.js +3 -10
- package/lib/Easy3wFlow/index.js +15 -19
- package/lib/Easy3wFormPage/indexM.js +248 -647
- package/lib/Easy3wFormPage/indexPC.js +232 -631
- package/lib/Easy3wGetCookie/index.js +3 -10
- package/lib/Easy3wGetDesensitization/index.js +0 -7
- package/lib/Easy3wGlobalFooter/index.js +3 -8
- package/lib/Easy3wGlobalHeader/index.js +0 -4
- package/lib/Easy3wGridCheckBox/index.js +1 -5
- package/lib/Easy3wGridDatePicker/index.js +1 -5
- package/lib/Easy3wGridDateTimePicker/index.js +1 -5
- package/lib/Easy3wGridInput/index.js +2 -6
- package/lib/Easy3wGridInputAmount/index.js +1 -5
- package/lib/Easy3wGridInputDigit/index.js +1 -5
- package/lib/Easy3wGridInputEmail/index.js +1 -5
- package/lib/Easy3wGridInputNumber/index.js +1 -5
- package/lib/Easy3wGridInputNumberFormat/index.js +1 -5
- package/lib/Easy3wGridPage/index.js +2 -5
- package/lib/Easy3wGridPage/indexM.js +27 -12
- package/lib/Easy3wGridPage/indexPC.js +30 -11
- package/lib/Easy3wGridRadio/index.js +1 -5
- package/lib/Easy3wGridSelect/index.js +1 -5
- package/lib/Easy3wGridTextArea/index.js +1 -5
- package/lib/Easy3wInput/index.js +0 -4
- package/lib/Easy3wLogin/index.js +15 -19
- package/lib/Easy3wLoginLayout/index.js +0 -4
- package/lib/Easy3wModal/index.js +4 -8
- package/lib/Easy3wPositionButton/index.js +2 -6
- package/lib/Easy3wQryGrid/index.js +4 -8
- package/lib/Easy3wResult/index.js +0 -4
- package/lib/Easy3wRow/index.js +0 -4
- package/lib/Easy3wSetCookie/index.js +3 -10
- package/lib/Easy3wSkeleton/index.js +64 -0
- package/lib/Easy3wSpin/index.js +2 -5
- package/lib/Easy3wTagSelect/index.js +0 -4
- package/lib/Easy3wTagSelect/index.less +120 -120
- package/lib/Easy3wTree/index.js +88 -66
- package/lib/Easy3wUpload/index.js +18 -28
- package/lib/Easy3wUploadB/index copy 2.js +1011 -0
- package/lib/Easy3wUploadB/index copy 3.js +1088 -0
- package/lib/Easy3wUploadB/index copy.js +1020 -0
- package/lib/Easy3wUploadB/index.js +42 -48
- package/lib/Easy3wUploadM/index copy.js +523 -0
- package/lib/Easy3wUploadM/index.js +21 -30
- package/lib/Easy3wUserLayout/index.js +28 -20
- package/lib/index.js +9 -9
- package/package.json +122 -122
- package/CHANGELOG.md +0 -189
- package/HISTORY.md +0 -8
- package/lib/Easy3wI18N/index.js +0 -56
- package/lib/Easy3wI18N/locales/index.js +0 -8
|
@@ -34,17 +34,7 @@ var _react2 = _interopRequireDefault(_react);
|
|
|
34
34
|
|
|
35
35
|
var _antd = require('antd');
|
|
36
36
|
|
|
37
|
-
var
|
|
38
|
-
|
|
39
|
-
var _Easy3wModal2 = _interopRequireDefault(_Easy3wModal);
|
|
40
|
-
|
|
41
|
-
var _Easy3wFormPage = require('../Easy3wFormPage');
|
|
42
|
-
|
|
43
|
-
var _Easy3wFormPage2 = _interopRequireDefault(_Easy3wFormPage);
|
|
44
|
-
|
|
45
|
-
var _Easy3wI18N = require('../Easy3wI18N');
|
|
46
|
-
|
|
47
|
-
var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
|
|
37
|
+
var _easy3wui = require('easy3wui');
|
|
48
38
|
|
|
49
39
|
var _lib = require('antd/lib');
|
|
50
40
|
|
|
@@ -145,13 +135,13 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
|
|
|
145
135
|
}
|
|
146
136
|
var arrRules = [].concat(rules);
|
|
147
137
|
if (ruleType === 'phone') {
|
|
148
|
-
arrRules.push({ pattern: /^1\d{10}$/, message:
|
|
138
|
+
arrRules.push({ pattern: /^1\d{10}$/, message: '手机格式错误!' });
|
|
149
139
|
} else if (ruleType === 'email') {
|
|
150
|
-
arrRules.push({ type: 'email', message:
|
|
140
|
+
arrRules.push({ type: 'email', message: '邮箱地址格式错误!' });
|
|
151
141
|
} else if (ruleType === 'idcard') {
|
|
152
142
|
arrRules.push({ pattern: /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}[0-9Xx]$)/, message: '身份证格式错误!' });
|
|
153
143
|
} else if (regex) {
|
|
154
|
-
arrRules.push({ pattern: new RegExp(regex), message:
|
|
144
|
+
arrRules.push({ pattern: new RegExp(regex), message: regexMsg || '数据格式错误!' });
|
|
155
145
|
}
|
|
156
146
|
var fieldRowItem = {
|
|
157
147
|
cols: [rowItem || {
|
|
@@ -211,15 +201,14 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
|
|
|
211
201
|
// strName 字串名称
|
|
212
202
|
// name 字段名称
|
|
213
203
|
|
|
214
|
-
var fName = strName || name;
|
|
215
204
|
_lib.Modal.confirm({
|
|
216
|
-
content:
|
|
205
|
+
content: '\u8BF7\u786E\u8BA4\u6B64\u5217' + (strName || name) + '\u5168\u90E8\u8BBE\u7F6E\u6210\u5F55\u5165\u503C\uFF0C\u5C06\u8986\u76D6\u539F\u503C!',
|
|
217
206
|
onOk: function onOk() {
|
|
218
207
|
confirmCallback(valuesNew, objColumn);
|
|
219
208
|
},
|
|
220
209
|
onCancel: function onCancel() {},
|
|
221
|
-
okText:
|
|
222
|
-
cancelText:
|
|
210
|
+
okText: '确认',
|
|
211
|
+
cancelText: '取消'
|
|
223
212
|
});
|
|
224
213
|
}
|
|
225
214
|
_this.touchCancel();
|
|
@@ -268,7 +257,7 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
|
|
|
268
257
|
form = _props.form;
|
|
269
258
|
var batchButtonText = objOtherParameters.batchButtonText;
|
|
270
259
|
|
|
271
|
-
var footBtnArr = [{ func: this.touchConfirm, cName:
|
|
260
|
+
var footBtnArr = [{ func: this.touchConfirm, cName: '保存' }, { func: this.touchCancel, cName: '关闭' }];
|
|
272
261
|
|
|
273
262
|
var _getBatchField = this.getBatchField(),
|
|
274
263
|
fieldRowItems = _getBatchField.fieldRowItems,
|
|
@@ -276,7 +265,7 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
|
|
|
276
265
|
|
|
277
266
|
var rowItems = [{
|
|
278
267
|
cols: [{
|
|
279
|
-
label:
|
|
268
|
+
label: '录入内容',
|
|
280
269
|
fieldId: 'batchField_easy3wView',
|
|
281
270
|
fieldType: 'select',
|
|
282
271
|
required: true,
|
|
@@ -287,15 +276,15 @@ var Easy3wEditBigTableForm = function (_PureComponent) {
|
|
|
287
276
|
}]
|
|
288
277
|
}].concat(fieldRowItems);
|
|
289
278
|
return _react2['default'].createElement(
|
|
290
|
-
|
|
279
|
+
_easy3wui.Easy3wModal,
|
|
291
280
|
{
|
|
292
|
-
title:
|
|
281
|
+
title: batchButtonText || '批量录入',
|
|
293
282
|
visible: visible,
|
|
294
283
|
onCancel: this.touchCancel,
|
|
295
284
|
footBtnArr: footBtnArr,
|
|
296
285
|
width: '80%'
|
|
297
286
|
},
|
|
298
|
-
_react2['default'].createElement(
|
|
287
|
+
_react2['default'].createElement(_easy3wui.Easy3wFormPage, { rowItems: rowItems, hiddenItems: hiddenItems, form: form, mixColFlag: true })
|
|
299
288
|
);
|
|
300
289
|
};
|
|
301
290
|
|
|
@@ -34,8 +34,15 @@ var _reactDom2 = _interopRequireDefault(_reactDom);
|
|
|
34
34
|
|
|
35
35
|
var _antd = require('antd');
|
|
36
36
|
|
|
37
|
+
var _reactDataGrid = require('react-data-grid');
|
|
38
|
+
|
|
39
|
+
var _reactDataGrid2 = _interopRequireDefault(_reactDataGrid);
|
|
40
|
+
|
|
37
41
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
|
|
38
42
|
|
|
43
|
+
var editors = _reactDataGrid2['default'].editors;
|
|
44
|
+
var EditorBase = editors.EditorBase;
|
|
45
|
+
|
|
39
46
|
var EditorsInputNumber = function (_React$Component) {
|
|
40
47
|
(0, _inherits3['default'])(EditorsInputNumber, _React$Component);
|
|
41
48
|
|
|
@@ -44,6 +44,8 @@ var _react = require('react');
|
|
|
44
44
|
|
|
45
45
|
var _react2 = _interopRequireDefault(_react);
|
|
46
46
|
|
|
47
|
+
var _dva = require('dva');
|
|
48
|
+
|
|
47
49
|
var _antd = require('antd');
|
|
48
50
|
|
|
49
51
|
var _reactDataGrid = require('react-data-grid');
|
|
@@ -64,15 +66,14 @@ var _Easy3wEditBigTableForm = require('./Easy3wEditBigTableForm');
|
|
|
64
66
|
|
|
65
67
|
var _Easy3wEditBigTableForm2 = _interopRequireDefault(_Easy3wEditBigTableForm);
|
|
66
68
|
|
|
67
|
-
var
|
|
69
|
+
var _Easy3wSpin = require('../Easy3wSpin');
|
|
68
70
|
|
|
69
|
-
var
|
|
71
|
+
var _Easy3wSpin2 = _interopRequireDefault(_Easy3wSpin);
|
|
70
72
|
|
|
71
73
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
|
|
72
74
|
|
|
73
75
|
// import XLSX from 'xlsx';
|
|
74
|
-
/* eslint-disable no-alert */
|
|
75
|
-
var Selectors = _reactDataGridAddons.Data.Selectors;
|
|
76
|
+
var Selectors = _reactDataGridAddons.Data.Selectors; /* eslint-disable no-alert */
|
|
76
77
|
|
|
77
78
|
var Easy3wEditBigTable = function (_React$Component) {
|
|
78
79
|
(0, _inherits3['default'])(Easy3wEditBigTable, _React$Component);
|
|
@@ -147,10 +148,10 @@ var Easy3wEditBigTable = function (_React$Component) {
|
|
|
147
148
|
} else {
|
|
148
149
|
// 有变更-未保存
|
|
149
150
|
_modal2['default'].confirm({
|
|
150
|
-
title:
|
|
151
|
-
content:
|
|
152
|
-
okText:
|
|
153
|
-
cancelText:
|
|
151
|
+
title: '提示',
|
|
152
|
+
content: '表格数据未保存, 是否保存?',
|
|
153
|
+
okText: '保存',
|
|
154
|
+
cancelText: '取消',
|
|
154
155
|
onOk: function onOk() {
|
|
155
156
|
saveEditBigTableZJ();
|
|
156
157
|
}
|
|
@@ -243,6 +244,9 @@ var Easy3wEditBigTable = function (_React$Component) {
|
|
|
243
244
|
// 校验数据
|
|
244
245
|
|
|
245
246
|
// #endregion 校验数据
|
|
247
|
+
// #region 获取loading状态
|
|
248
|
+
|
|
249
|
+
// #endregion 获取loading状态
|
|
246
250
|
// 转换数字
|
|
247
251
|
|
|
248
252
|
// 变量 num 是一个有效的数字,即非空、不为 NaN 且是有限值
|
|
@@ -262,58 +266,63 @@ var Easy3wEditBigTable = function (_React$Component) {
|
|
|
262
266
|
var objReactDataGridProps = this.getReactDataGridProps();
|
|
263
267
|
var columns = this.createColumns(); // 表头
|
|
264
268
|
var objTotal = totalFlag ? this.touchLoopData() : {}; // 循环数据获取
|
|
269
|
+
var spinLoading = this.getLoading();
|
|
265
270
|
return _react2['default'].createElement(
|
|
266
|
-
'
|
|
267
|
-
{
|
|
271
|
+
_Easy3wSpin2['default'],
|
|
272
|
+
{ noStyle: true, spinLoading: spinLoading },
|
|
268
273
|
_react2['default'].createElement(
|
|
269
|
-
'style',
|
|
270
|
-
null,
|
|
271
|
-
strReactDataGridStyle || (strAddReactDataGridStyle || '') + '\n .custom-edit-cell {\n background-color: #f6ffed;\n }\n '
|
|
272
|
-
),
|
|
273
|
-
_react2['default'].createElement(_reactDataGrid2['default'], (0, _extends3['default'])({}, this.props, {
|
|
274
|
-
ref: this.ReactDataGridRef,
|
|
275
|
-
columns: columns // 表头
|
|
276
|
-
// rows={rows}
|
|
277
|
-
, rowGetter: this.rowGetter // 获取行数据
|
|
278
|
-
, rowsCount: this.getSize() // 行数
|
|
279
|
-
, onGridSort: this.onGridSort
|
|
280
|
-
}, objReactDataGridProps, objOtherProps)),
|
|
281
|
-
totalFlag ? _react2['default'].createElement(
|
|
282
274
|
'div',
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
null,
|
|
292
|
-
objTotal[key].name,
|
|
293
|
-
'\uFF1A'
|
|
294
|
-
),
|
|
295
|
-
_react2['default'].createElement(
|
|
296
|
-
'span',
|
|
297
|
-
null,
|
|
298
|
-
' ',
|
|
299
|
-
objTotal[key].numberFormat ? _this2.touchFormatNum(objTotal[key].value) : objTotal[key].value,
|
|
300
|
-
' ',
|
|
301
|
-
objTotal[key].unit || ''
|
|
302
|
-
)
|
|
303
|
-
);
|
|
304
|
-
})
|
|
305
|
-
) : '',
|
|
306
|
-
visible ? _react2['default'].createElement(_Easy3wEditBigTableForm2['default'] // 批量录入Modal
|
|
307
|
-
, { visible: visible // 是否显示
|
|
308
|
-
, objOtherParameters: (0, _extends3['default'])({}, objToolbarProps, { // 工具栏属性
|
|
275
|
+
{ className: (0, _classnames2['default'])(['Easy3wEditBigTable']) },
|
|
276
|
+
_react2['default'].createElement(
|
|
277
|
+
'style',
|
|
278
|
+
null,
|
|
279
|
+
strReactDataGridStyle || (strAddReactDataGridStyle || '') + '\n .custom-edit-cell {\n background-color: #f6ffed;\n }\n '
|
|
280
|
+
),
|
|
281
|
+
_react2['default'].createElement(_reactDataGrid2['default'], (0, _extends3['default'])({}, this.props, {
|
|
282
|
+
ref: this.ReactDataGridRef,
|
|
309
283
|
columns: columns // 表头
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
,
|
|
315
|
-
|
|
316
|
-
|
|
284
|
+
// rows={rows}
|
|
285
|
+
, rowGetter: this.rowGetter // 获取行数据
|
|
286
|
+
, rowsCount: this.getSize() // 行数
|
|
287
|
+
, onGridSort: this.onGridSort
|
|
288
|
+
}, objReactDataGridProps, objOtherProps)),
|
|
289
|
+
totalFlag ? _react2['default'].createElement(
|
|
290
|
+
'div',
|
|
291
|
+
null,
|
|
292
|
+
objTotal && Object.keys(objTotal).map(function (key, index) {
|
|
293
|
+
return _react2['default'].createElement(
|
|
294
|
+
'span',
|
|
295
|
+
{ key: key },
|
|
296
|
+
index === 0 ? '' : ';',
|
|
297
|
+
_react2['default'].createElement(
|
|
298
|
+
'span',
|
|
299
|
+
null,
|
|
300
|
+
objTotal[key].name,
|
|
301
|
+
'\uFF1A'
|
|
302
|
+
),
|
|
303
|
+
_react2['default'].createElement(
|
|
304
|
+
'span',
|
|
305
|
+
null,
|
|
306
|
+
' ',
|
|
307
|
+
objTotal[key].numberFormat ? _this2.touchFormatNum(objTotal[key].value) : objTotal[key].value,
|
|
308
|
+
' ',
|
|
309
|
+
objTotal[key].unit || ''
|
|
310
|
+
)
|
|
311
|
+
);
|
|
312
|
+
})
|
|
313
|
+
) : '',
|
|
314
|
+
visible ? _react2['default'].createElement(_Easy3wEditBigTableForm2['default'] // 批量录入Modal
|
|
315
|
+
, { visible: visible // 是否显示
|
|
316
|
+
, objOtherParameters: (0, _extends3['default'])({}, objToolbarProps, { // 工具栏属性
|
|
317
|
+
columns: columns // 表头
|
|
318
|
+
}) // 其他参数
|
|
319
|
+
, bidPureComponent: function bidPureComponent(that) {
|
|
320
|
+
return _this2.bidPureComponent('Easy3wEditBigTableForm', that);
|
|
321
|
+
} // 绑定组件
|
|
322
|
+
, confirmCallback: this.confirmCallbackBatchEditBigTable,
|
|
323
|
+
hideModal: this.hideModalBatchEditBigTable
|
|
324
|
+
}) : ''
|
|
325
|
+
)
|
|
317
326
|
);
|
|
318
327
|
};
|
|
319
328
|
|
|
@@ -475,8 +484,8 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
475
484
|
_this3.onGridRowsUpdatedZJ('touchCopyRow', rows, rowsView);
|
|
476
485
|
} else {
|
|
477
486
|
_modal2['default'].error({
|
|
478
|
-
title:
|
|
479
|
-
content:
|
|
487
|
+
title: '错误',
|
|
488
|
+
content: '请选择要复制的行'
|
|
480
489
|
});
|
|
481
490
|
}
|
|
482
491
|
};
|
|
@@ -517,8 +526,8 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
517
526
|
_this3.onSelectedRowsChange([], []); // 选择行清空
|
|
518
527
|
} else {
|
|
519
528
|
_modal2['default'].error({
|
|
520
|
-
title:
|
|
521
|
-
content:
|
|
529
|
+
title: '错误',
|
|
530
|
+
content: '请选择要删除的行'
|
|
522
531
|
});
|
|
523
532
|
}
|
|
524
533
|
};
|
|
@@ -736,7 +745,7 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
736
745
|
name = column.name,
|
|
737
746
|
hiddeKeys = column.hiddeKeys;
|
|
738
747
|
|
|
739
|
-
objSheetNew[key] =
|
|
748
|
+
objSheetNew[key] = name;
|
|
740
749
|
arrColumnsKeyNew.push(key);
|
|
741
750
|
arrColInfoNew.push({});
|
|
742
751
|
if (hiddeKeys) {
|
|
@@ -798,8 +807,7 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
798
807
|
}
|
|
799
808
|
return option;
|
|
800
809
|
});
|
|
801
|
-
|
|
802
|
-
arrOptionsLabel.push((0, _Easy3wI18N2['default'])(strLabel));
|
|
810
|
+
arrOptionsLabel.push(isLabel ? strLabel : item);
|
|
803
811
|
}
|
|
804
812
|
return flag;
|
|
805
813
|
});
|
|
@@ -822,7 +830,7 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
822
830
|
var isFlag = false;
|
|
823
831
|
options.map(function (option) {
|
|
824
832
|
if (item.label === option.label) {
|
|
825
|
-
arrFilterTerm.push({ value: option.value, label:
|
|
833
|
+
arrFilterTerm.push({ value: option.value, label: option.value });
|
|
826
834
|
isFlag = true;
|
|
827
835
|
}
|
|
828
836
|
return option;
|
|
@@ -880,11 +888,11 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
880
888
|
if (addRowFlag) {
|
|
881
889
|
// 新增按钮
|
|
882
890
|
toolbarProps.onAddRow = touchAddRow || _this3.touchAddRow;
|
|
883
|
-
toolbarProps.addRowButtonText =
|
|
891
|
+
toolbarProps.addRowButtonText = addRowButtonText || '新增';
|
|
884
892
|
} else if (enableFilter) {
|
|
885
893
|
// 筛选按钮
|
|
886
894
|
toolbarProps.enableFilter = enableFilter;
|
|
887
|
-
toolbarProps.filterRowsButtonText =
|
|
895
|
+
toolbarProps.filterRowsButtonText = filterRowsButtonText || '筛选';
|
|
888
896
|
}
|
|
889
897
|
var toolbar = _react2['default'].createElement(
|
|
890
898
|
_reactDataGridAddons.Toolbar,
|
|
@@ -896,34 +904,34 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
896
904
|
return _react2['default'].createElement(
|
|
897
905
|
'button',
|
|
898
906
|
{ type: 'button', className: 'btn', onClick: btn.onClick },
|
|
899
|
-
|
|
907
|
+
btn.text
|
|
900
908
|
);
|
|
901
909
|
}),
|
|
902
910
|
batchFlag ? _react2['default'].createElement(
|
|
903
911
|
'button',
|
|
904
912
|
{ type: 'button', className: 'btn', onClick: showModalBatchEditBigTable || _this3.showModalBatchEditBigTable },
|
|
905
|
-
|
|
913
|
+
batchButtonText || '批量录入'
|
|
906
914
|
) : '',
|
|
907
915
|
saveFlag ? _react2['default'].createElement(
|
|
908
916
|
'button',
|
|
909
917
|
{ type: 'button', className: 'btn', onClick: _this3.saveEditBigTableZJ },
|
|
910
|
-
|
|
918
|
+
saveButtonText || '保存'
|
|
911
919
|
) : '',
|
|
912
920
|
deleteFlag ? _react2['default'].createElement(
|
|
913
921
|
'button',
|
|
914
922
|
{ type: 'button', className: 'btn', onClick: deleteRow || _this3.deleteRow },
|
|
915
|
-
|
|
923
|
+
deleteButtonText || '删除'
|
|
916
924
|
) : '',
|
|
917
925
|
importFlag ? _react2['default'].createElement(
|
|
918
926
|
'button',
|
|
919
927
|
{ type: 'button', className: 'btn', onClick: touchImport || _this3.touchImport },
|
|
920
928
|
_react2['default'].createElement('input', { type: 'file', id: 'touchImportExcel', accept: '.xlsx, .xls', style: { display: 'none' } }),
|
|
921
|
-
|
|
929
|
+
importButtonText || '导入'
|
|
922
930
|
) : '',
|
|
923
931
|
exportFlag ? _react2['default'].createElement(
|
|
924
932
|
'button',
|
|
925
933
|
{ type: 'button', className: 'btn', onClick: touchExport || _this3.touchExport },
|
|
926
|
-
|
|
934
|
+
exportButtonText || '导出'
|
|
927
935
|
) : ''
|
|
928
936
|
);
|
|
929
937
|
return toolbar;
|
|
@@ -1096,11 +1104,9 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
1096
1104
|
} else {
|
|
1097
1105
|
required = fieldReqFlag === '0' ? false : fieldReqFlag === '1' ? true : required;
|
|
1098
1106
|
if (fieldSName) {
|
|
1099
|
-
titlec =
|
|
1100
|
-
} else {
|
|
1101
|
-
titlec = (0, _Easy3wI18N2['default'])(titlec);
|
|
1107
|
+
titlec = fieldSName;
|
|
1102
1108
|
}
|
|
1103
|
-
helpInfo =
|
|
1109
|
+
helpInfo = fieldHelpInfo || helpInfo;
|
|
1104
1110
|
if (helpInfo) {
|
|
1105
1111
|
var needHelpFlag = true;
|
|
1106
1112
|
if (titlec && titlec instanceof Object) {
|
|
@@ -1172,10 +1178,10 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
1172
1178
|
title: _react2['default'].createElement(
|
|
1173
1179
|
'span',
|
|
1174
1180
|
{ style: { whiteSpace: 'pre-wrap' } },
|
|
1175
|
-
|
|
1181
|
+
helpInfo
|
|
1176
1182
|
)
|
|
1177
1183
|
},
|
|
1178
|
-
|
|
1184
|
+
titlec,
|
|
1179
1185
|
_react2['default'].createElement(_icon2['default'], { type: 'question-circle' })
|
|
1180
1186
|
);
|
|
1181
1187
|
}
|
|
@@ -1189,14 +1195,11 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
1189
1195
|
{ style: { color: 'red' } },
|
|
1190
1196
|
'*'
|
|
1191
1197
|
),
|
|
1192
|
-
|
|
1198
|
+
titlec
|
|
1193
1199
|
);
|
|
1194
1200
|
}
|
|
1195
1201
|
column.name = titlec;
|
|
1196
1202
|
}
|
|
1197
|
-
if (column.unit) {
|
|
1198
|
-
column.unit = (0, _Easy3wI18N2['default'])(column.unit);
|
|
1199
|
-
}
|
|
1200
1203
|
columnsNew.push((0, _extends3['default'])({}, column));
|
|
1201
1204
|
}
|
|
1202
1205
|
if (autoAddNumber && typeof autoAddNumber === 'boolean') {
|
|
@@ -1204,7 +1207,7 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
1204
1207
|
var _objColumns$frozen = objColumns.frozen,
|
|
1205
1208
|
frozen = _objColumns$frozen === undefined ? false : _objColumns$frozen;
|
|
1206
1209
|
|
|
1207
|
-
columnsNew = [{ name:
|
|
1210
|
+
columnsNew = [{ name: '序号', key: 'autoAddNumber_idx_view', resizable: true, width: 50, frozen: frozen }].concat(columnsNew);
|
|
1208
1211
|
}
|
|
1209
1212
|
_this3.columns = columnsNew;
|
|
1210
1213
|
return columnsNew;
|
|
@@ -1280,8 +1283,7 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
1280
1283
|
// name 字段名称
|
|
1281
1284
|
if (required && !row[key]) {
|
|
1282
1285
|
boolcheckFailFlag = true;
|
|
1283
|
-
var
|
|
1284
|
-
var strRequiredMessage = (0, _Easy3wI18N2['default'])('Easy3wUI:请录入第rowIndex + 1行的fName;', { rowIndex: rowIndex + 1, fName: (0, _Easy3wI18N2['default'])(fName) });
|
|
1286
|
+
var strRequiredMessage = '\u8BF7\u5F55\u5165\u7B2C' + (rowIndex + 1) + '\u884C\u7684' + (strName || name) + ';';
|
|
1285
1287
|
arrRequiredMessage.push(strRequiredMessage);
|
|
1286
1288
|
}
|
|
1287
1289
|
}
|
|
@@ -1297,7 +1299,7 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
1297
1299
|
if (strCheckFailRows) {
|
|
1298
1300
|
// 校验失败
|
|
1299
1301
|
_modal2['default'].error({
|
|
1300
|
-
title:
|
|
1302
|
+
title: '校验失败',
|
|
1301
1303
|
content: _react2['default'].createElement(
|
|
1302
1304
|
'div',
|
|
1303
1305
|
null,
|
|
@@ -1320,6 +1322,25 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
1320
1322
|
return { arrRequiredMessage: arrRequiredMessage, strCheckFailRows: strCheckFailRows };
|
|
1321
1323
|
};
|
|
1322
1324
|
|
|
1325
|
+
this.getLoading = function () {
|
|
1326
|
+
var spinLoading = false;
|
|
1327
|
+
var queryApi = _this3.props.queryApi;
|
|
1328
|
+
var effectsFetch = _this3.props.loadingFlag.effectsFetch;
|
|
1329
|
+
|
|
1330
|
+
if (queryApi && typeof queryApi === 'string') {
|
|
1331
|
+
spinLoading = effectsFetch[queryApi];
|
|
1332
|
+
} else if (queryApi && queryApi instanceof Array && queryApi.length) {
|
|
1333
|
+
queryApi.map(function (str) {
|
|
1334
|
+
var spinLoadingC = effectsFetch[str];
|
|
1335
|
+
if (spinLoadingC) {
|
|
1336
|
+
spinLoading = spinLoadingC;
|
|
1337
|
+
}
|
|
1338
|
+
return str;
|
|
1339
|
+
});
|
|
1340
|
+
}
|
|
1341
|
+
return spinLoading;
|
|
1342
|
+
};
|
|
1343
|
+
|
|
1323
1344
|
this.touchFormatNum = function (num) {
|
|
1324
1345
|
return _this3.checkNum(num) ? (0, _numeral2['default'])(num).format('0,0.00') : num || '';
|
|
1325
1346
|
};
|
|
@@ -1330,5 +1351,9 @@ var _initialiseProps = function _initialiseProps() {
|
|
|
1330
1351
|
};
|
|
1331
1352
|
};
|
|
1332
1353
|
|
|
1333
|
-
exports['default'] =
|
|
1354
|
+
exports['default'] = (0, _dva.connect)(function (state) {
|
|
1355
|
+
return {
|
|
1356
|
+
loadingFlag: state.loading
|
|
1357
|
+
};
|
|
1358
|
+
})(Easy3wEditBigTable);
|
|
1334
1359
|
module.exports = exports['default'];
|
|
@@ -18,11 +18,11 @@ var _classnames = require('classnames');
|
|
|
18
18
|
|
|
19
19
|
var _classnames2 = _interopRequireDefault(_classnames);
|
|
20
20
|
|
|
21
|
-
require('antd/lib/button
|
|
21
|
+
var _button = require('antd/lib/button');
|
|
22
22
|
|
|
23
|
-
var
|
|
23
|
+
var _button2 = _interopRequireDefault(_button);
|
|
24
24
|
|
|
25
|
-
|
|
25
|
+
require('antd/lib/button/style');
|
|
26
26
|
|
|
27
27
|
var _typeConfig = require('./typeConfig');
|
|
28
28
|
|
|
@@ -38,13 +38,12 @@ exports['default'] = function (_ref) {
|
|
|
38
38
|
title = _ref.title,
|
|
39
39
|
desc = _ref.desc,
|
|
40
40
|
img = _ref.img,
|
|
41
|
-
|
|
41
|
+
actions = _ref.actions,
|
|
42
42
|
personPage = _ref.personPage,
|
|
43
43
|
rest = (0, _objectWithoutProperties3['default'])(_ref, ['className', 'linkElement', 'type', 'title', 'desc', 'img', 'actions', 'personPage']);
|
|
44
44
|
|
|
45
45
|
var pageType = type in _typeConfig2['default'] ? type : '404';
|
|
46
46
|
var clsString = (0, _classnames2['default'])((0, _classnames2['default'])(['e3wException']), className);
|
|
47
|
-
var actions = (0, _Easy3wI18N2['default'])(actionsA);
|
|
48
47
|
return _react2['default'].createElement(
|
|
49
48
|
'div',
|
|
50
49
|
(0, _extends3['default'])({ className: clsString }, rest),
|
|
@@ -69,12 +68,12 @@ exports['default'] = function (_ref) {
|
|
|
69
68
|
_react2['default'].createElement(
|
|
70
69
|
'h1',
|
|
71
70
|
null,
|
|
72
|
-
|
|
71
|
+
title || _typeConfig2['default'][pageType].title
|
|
73
72
|
),
|
|
74
73
|
_react2['default'].createElement(
|
|
75
74
|
'div',
|
|
76
75
|
{ className: (0, _classnames2['default'])(['e3wExceptionDesc']) },
|
|
77
|
-
|
|
76
|
+
desc || _typeConfig2['default'][pageType].desc
|
|
78
77
|
),
|
|
79
78
|
_react2['default'].createElement(
|
|
80
79
|
'div',
|
|
@@ -1,28 +1,21 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
|
-
|
|
5
|
-
var _Easy3wI18N = require('../Easy3wI18N');
|
|
6
|
-
|
|
7
|
-
var _Easy3wI18N2 = _interopRequireDefault(_Easy3wI18N);
|
|
8
|
-
|
|
9
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
|
|
10
|
-
|
|
11
4
|
var config = {
|
|
12
5
|
403: {
|
|
13
6
|
img: 'https://gw.alipayobjects.com/zos/rmsportal/wZcnGqRDyhPOEYFcZDnb.svg',
|
|
14
7
|
title: '403',
|
|
15
|
-
desc:
|
|
8
|
+
desc: '抱歉,你无权访问该页面'
|
|
16
9
|
},
|
|
17
10
|
404: {
|
|
18
11
|
img: 'https://gw.alipayobjects.com/zos/rmsportal/KpnpchXsobRgLElEozzI.svg',
|
|
19
12
|
title: '404',
|
|
20
|
-
desc:
|
|
13
|
+
desc: '抱歉,你访问的页面不存在'
|
|
21
14
|
},
|
|
22
15
|
500: {
|
|
23
16
|
img: 'https://gw.alipayobjects.com/zos/rmsportal/RVRUAYdCGeYNBWoKiIwB.svg',
|
|
24
17
|
title: '500',
|
|
25
|
-
desc:
|
|
18
|
+
desc: '抱歉,服务器出错了'
|
|
26
19
|
}
|
|
27
20
|
};
|
|
28
21
|
|