cloud-b2b 1.1.75 → 1.1.77
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/es/Area/Area.js +12 -1
- package/es/InpurCascader/InputCascader.js +2 -2
- package/es/SuperForm2/SuperForm.js +37 -6
- package/es/SuperForm2/SuperForm.less +3 -1
- package/es/SuperUpload/SuperUpload.js +19 -76
- package/lib/Area/Area.js +12 -1
- package/lib/InpurCascader/InputCascader.js +2 -2
- package/lib/SuperForm2/SuperForm.js +37 -6
- package/lib/SuperForm2/SuperForm.less +3 -1
- package/lib/SuperUpload/SuperUpload.js +20 -77
- package/package.json +1 -1
package/es/Area/Area.js
CHANGED
|
@@ -9,6 +9,7 @@ import _Object$defineProperty from "@babel/runtime-corejs3/core-js-stable/object
|
|
|
9
9
|
import _Row from "antd/es/row";
|
|
10
10
|
import _Col from "antd/es/col";
|
|
11
11
|
import _typeof from "@babel/runtime-corejs3/helpers/typeof";
|
|
12
|
+
import _Icon from "antd/es/icon";
|
|
12
13
|
import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
|
|
13
14
|
import _createClass from "@babel/runtime-corejs3/helpers/createClass";
|
|
14
15
|
import _possibleConstructorReturn from "@babel/runtime-corejs3/helpers/possibleConstructorReturn";
|
|
@@ -110,6 +111,15 @@ var Area = /*#__PURE__*/function (_React$Component) {
|
|
|
110
111
|
type: type,
|
|
111
112
|
onClick: onClick
|
|
112
113
|
}, title);
|
|
114
|
+
} else if (item.type === 'icon') {
|
|
115
|
+
var _onClick = props.onClick;
|
|
116
|
+
var _key = item.key,
|
|
117
|
+
icon = item.icon;
|
|
118
|
+
return /*#__PURE__*/React.createElement(_Icon, {
|
|
119
|
+
type: icon,
|
|
120
|
+
key: _key,
|
|
121
|
+
onClick: _onClick
|
|
122
|
+
});
|
|
113
123
|
} else {
|
|
114
124
|
return /*#__PURE__*/React.createElement(Control, props);
|
|
115
125
|
}
|
|
@@ -174,8 +184,9 @@ var Area = /*#__PURE__*/function (_React$Component) {
|
|
|
174
184
|
type: readonly ? 'readonly' : item.type,
|
|
175
185
|
searchWhenClick: true
|
|
176
186
|
});
|
|
187
|
+
var factor = item.span || 24 / child.length;
|
|
177
188
|
return /*#__PURE__*/React.createElement(_Col, {
|
|
178
|
-
span:
|
|
189
|
+
span: factor,
|
|
179
190
|
key: item.key
|
|
180
191
|
}, _this2.toControl(item, props));
|
|
181
192
|
}));
|
|
@@ -41,7 +41,7 @@ var PROPS = {
|
|
|
41
41
|
onChange: PropTypes.func,
|
|
42
42
|
loadData: PropTypes.func,
|
|
43
43
|
//动态加载 ps:loadData 与 showSearch 无法一起使用
|
|
44
|
-
showSearch: PropTypes.
|
|
44
|
+
showSearch: PropTypes.bool
|
|
45
45
|
};
|
|
46
46
|
var PROPS_KEYS = _Object$keys(PROPS);
|
|
47
47
|
var InputCascader = /*#__PURE__*/function (_React$Component) {
|
|
@@ -109,7 +109,7 @@ var InputCascader = /*#__PURE__*/function (_React$Component) {
|
|
|
109
109
|
value: function render() {
|
|
110
110
|
return /*#__PURE__*/React.createElement(_Cascader, _extends({}, this.getProps(), {
|
|
111
111
|
style: {
|
|
112
|
-
backgroundColor: props.isBgColor ? '#f6ffc1' : ''
|
|
112
|
+
backgroundColor: this.props.isBgColor ? '#f6ffc1' : ''
|
|
113
113
|
}
|
|
114
114
|
}));
|
|
115
115
|
}
|
|
@@ -28,7 +28,7 @@ import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/ins
|
|
|
28
28
|
import _bindInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/bind";
|
|
29
29
|
import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
|
|
30
30
|
function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
31
|
-
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var
|
|
31
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context27, _context28; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context27 = ownKeys(Object(t), !0)).call(_context27, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context28 = ownKeys(Object(t))).call(_context28, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
32
32
|
function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? _Reflect$construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
|
|
33
33
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(_Reflect$construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
34
34
|
import React from 'react';
|
|
@@ -567,9 +567,12 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
|
|
|
567
567
|
_defineProperty(_this2, "toLabel", function (_ref10, type) {
|
|
568
568
|
var title = _ref10.title,
|
|
569
569
|
showAdd = _ref10.showAdd,
|
|
570
|
+
showQuery = _ref10.showQuery,
|
|
570
571
|
key = _ref10.key,
|
|
571
572
|
showInfo = _ref10.showInfo,
|
|
572
|
-
showInfoTitle = _ref10.showInfoTitle
|
|
573
|
+
showInfoTitle = _ref10.showInfoTitle,
|
|
574
|
+
showIcon = _ref10.showIcon,
|
|
575
|
+
iconType = _ref10.iconType;
|
|
573
576
|
if (showAdd && type !== 'readonly') {
|
|
574
577
|
var _context22;
|
|
575
578
|
var onClick = _bindInstanceProperty(_context22 = _this2.onAdd).call(_context22, _this2, key, title);
|
|
@@ -578,6 +581,32 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
|
|
|
578
581
|
type: "plus-circle-o",
|
|
579
582
|
onClick: onClick
|
|
580
583
|
}));
|
|
584
|
+
} else if (showQuery && type !== 'readonly') {
|
|
585
|
+
var _context23;
|
|
586
|
+
var _onClick = _bindInstanceProperty(_context23 = _this2.onAdd).call(_context23, _this2, key, title);
|
|
587
|
+
return /*#__PURE__*/React.createElement("span", null, title, /*#__PURE__*/React.createElement(_Icon, {
|
|
588
|
+
role: "add",
|
|
589
|
+
type: "search",
|
|
590
|
+
onClick: _onClick
|
|
591
|
+
}));
|
|
592
|
+
} else if (showIcon && iconType && type !== 'readonly' && showInfoTitle) {
|
|
593
|
+
var _context24;
|
|
594
|
+
var _onClick2 = _bindInstanceProperty(_context24 = _this2.onAdd).call(_context24, _this2, key, title);
|
|
595
|
+
return /*#__PURE__*/React.createElement("span", null, title, /*#__PURE__*/React.createElement(_Tooltip, {
|
|
596
|
+
title: showInfoTitle
|
|
597
|
+
}, /*#__PURE__*/React.createElement(_Icon, {
|
|
598
|
+
role: "add",
|
|
599
|
+
type: iconType,
|
|
600
|
+
onClick: _onClick2
|
|
601
|
+
})));
|
|
602
|
+
} else if (showIcon && iconType && type !== 'readonly') {
|
|
603
|
+
var _context25;
|
|
604
|
+
var _onClick3 = _bindInstanceProperty(_context25 = _this2.onAdd).call(_context25, _this2, key, title);
|
|
605
|
+
return /*#__PURE__*/React.createElement("span", null, title, /*#__PURE__*/React.createElement(_Icon, {
|
|
606
|
+
role: "add",
|
|
607
|
+
type: iconType,
|
|
608
|
+
onClick: _onClick3
|
|
609
|
+
}));
|
|
581
610
|
} else if (showInfo) {
|
|
582
611
|
return /*#__PURE__*/React.createElement("span", null, title, /*#__PURE__*/React.createElement(_Tooltip, {
|
|
583
612
|
title: showInfoTitle
|
|
@@ -602,6 +631,8 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
|
|
|
602
631
|
onCheckItem = _this2$props4.onCheckItem,
|
|
603
632
|
_this2$props4$isGridF = _this2$props4.isGridForm,
|
|
604
633
|
isGridForm = _this2$props4$isGridF === void 0 ? false : _this2$props4$isGridF;
|
|
634
|
+
var labelSpan = factor === 3 ? 3 : factor === 2 ? 4 : 8;
|
|
635
|
+
var smSpan = control.title ? factor === 3 ? 21 : factor === 2 ? 20 : 16 : 24;
|
|
605
636
|
return control.type !== 'empty' ? /*#__PURE__*/React.createElement(_Col, {
|
|
606
637
|
span: span * factor,
|
|
607
638
|
key: control.key
|
|
@@ -616,7 +647,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
|
|
|
616
647
|
span: 24
|
|
617
648
|
},
|
|
618
649
|
sm: {
|
|
619
|
-
span:
|
|
650
|
+
span: labelSpan
|
|
620
651
|
}
|
|
621
652
|
},
|
|
622
653
|
wrapperCol: {
|
|
@@ -624,7 +655,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
|
|
|
624
655
|
span: 24
|
|
625
656
|
},
|
|
626
657
|
sm: {
|
|
627
|
-
span:
|
|
658
|
+
span: smSpan
|
|
628
659
|
}
|
|
629
660
|
}
|
|
630
661
|
}), _this2.toControl(controlProps, control))) : /*#__PURE__*/React.createElement(_Col, {
|
|
@@ -636,7 +667,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
|
|
|
636
667
|
});
|
|
637
668
|
});
|
|
638
669
|
_defineProperty(_this2, "toCols", function () {
|
|
639
|
-
var
|
|
670
|
+
var _context26;
|
|
640
671
|
var _this2$props5 = _this2.props,
|
|
641
672
|
_this2$props5$colNum = _this2$props5.colNum,
|
|
642
673
|
colNum = _this2$props5$colNum === void 0 ? defaultColNum : _this2$props5$colNum,
|
|
@@ -645,7 +676,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
|
|
|
645
676
|
colNum = 1;
|
|
646
677
|
}
|
|
647
678
|
var span = 24 / colNum;
|
|
648
|
-
return _mapInstanceProperty(
|
|
679
|
+
return _mapInstanceProperty(_context26 = _this2.getControls()).call(_context26, function (control) {
|
|
649
680
|
if (allFullFather) {
|
|
650
681
|
control.allFullFather = allFullFather;
|
|
651
682
|
}
|
|
@@ -65,7 +65,8 @@ var convertFileList = function convertFileList(fileList) {
|
|
|
65
65
|
return {
|
|
66
66
|
fileFormat: item.fileFormat || 'id',
|
|
67
67
|
fileName: item.name,
|
|
68
|
-
fileUrl: item.response ? item.response.result : ''
|
|
68
|
+
fileUrl: item.response ? item.response.result : '',
|
|
69
|
+
fileShowUrl: item.fileShowUrl || ''
|
|
69
70
|
};
|
|
70
71
|
});
|
|
71
72
|
};
|
|
@@ -210,19 +211,20 @@ function SuperUpload(props) {
|
|
|
210
211
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
211
212
|
fileList = _useState4[0],
|
|
212
213
|
setFileList = _useState4[1];
|
|
213
|
-
var initFileList = [];
|
|
214
214
|
useEffect(function () {
|
|
215
215
|
function fetchImgData() {
|
|
216
216
|
return _fetchImgData.apply(this, arguments);
|
|
217
217
|
}
|
|
218
218
|
function _fetchImgData() {
|
|
219
219
|
_fetchImgData = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
|
|
220
|
-
var _iterator, _step, item,
|
|
220
|
+
var initFileList, _iterator, _step, item, _t, _t2;
|
|
221
221
|
return _regeneratorRuntime.wrap(function (_context3) {
|
|
222
222
|
while (1) switch (_context3.prev = _context3.next) {
|
|
223
223
|
case 0:
|
|
224
|
-
|
|
225
|
-
|
|
224
|
+
initFileList = [];
|
|
225
|
+
console.log(props.fileList);
|
|
226
|
+
if (!(props.fileList.length > 0)) {
|
|
227
|
+
_context3.next = 10;
|
|
226
228
|
break;
|
|
227
229
|
}
|
|
228
230
|
_iterator = _createForOfIteratorHelper(props.fileList);
|
|
@@ -230,20 +232,16 @@ function SuperUpload(props) {
|
|
|
230
232
|
_iterator.s();
|
|
231
233
|
case 2:
|
|
232
234
|
if ((_step = _iterator.n()).done) {
|
|
233
|
-
_context3.next =
|
|
235
|
+
_context3.next = 7;
|
|
234
236
|
break;
|
|
235
237
|
}
|
|
236
238
|
item = _step.value;
|
|
237
|
-
if (!(item.fileUrl == '')) {
|
|
238
|
-
_context3.next = 6;
|
|
239
|
-
break;
|
|
240
|
-
}
|
|
241
239
|
if (!props.getFileList) {
|
|
242
240
|
_context3.next = 4;
|
|
243
241
|
break;
|
|
244
242
|
}
|
|
245
243
|
_context3.next = 3;
|
|
246
|
-
return props.getFileList(fileList);
|
|
244
|
+
return props.getFileList(props.fileList);
|
|
247
245
|
case 3:
|
|
248
246
|
_t = _context3.sent;
|
|
249
247
|
_context3.next = 5;
|
|
@@ -252,84 +250,29 @@ function SuperUpload(props) {
|
|
|
252
250
|
_t = [];
|
|
253
251
|
case 5:
|
|
254
252
|
initFileList = _t;
|
|
255
|
-
_context3.next = 10;
|
|
256
|
-
break;
|
|
257
253
|
case 6:
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
break;
|
|
261
|
-
}
|
|
262
|
-
_context3.next = 7;
|
|
263
|
-
return props.getFileList(props.fileList);
|
|
254
|
+
_context3.next = 2;
|
|
255
|
+
break;
|
|
264
256
|
case 7:
|
|
265
|
-
_t2 = _context3.sent;
|
|
266
257
|
_context3.next = 9;
|
|
267
258
|
break;
|
|
268
259
|
case 8:
|
|
269
|
-
|
|
260
|
+
_context3.prev = 8;
|
|
261
|
+
_t2 = _context3["catch"](1);
|
|
262
|
+
_iterator.e(_t2);
|
|
270
263
|
case 9:
|
|
271
|
-
|
|
272
|
-
case 10:
|
|
273
|
-
_context3.next = 2;
|
|
274
|
-
break;
|
|
275
|
-
case 11:
|
|
276
|
-
_context3.next = 13;
|
|
277
|
-
break;
|
|
278
|
-
case 12:
|
|
279
|
-
_context3.prev = 12;
|
|
280
|
-
_t3 = _context3["catch"](1);
|
|
281
|
-
_iterator.e(_t3);
|
|
282
|
-
case 13:
|
|
283
|
-
_context3.prev = 13;
|
|
264
|
+
_context3.prev = 9;
|
|
284
265
|
_iterator.f();
|
|
285
|
-
return _context3.finish(
|
|
286
|
-
case
|
|
287
|
-
_iterator2 = _createForOfIteratorHelper(fileList);
|
|
288
|
-
_context3.prev = 15;
|
|
289
|
-
_iterator2.s();
|
|
290
|
-
case 16:
|
|
291
|
-
if ((_step2 = _iterator2.n()).done) {
|
|
292
|
-
_context3.next = 21;
|
|
293
|
-
break;
|
|
294
|
-
}
|
|
295
|
-
_item = _step2.value;
|
|
296
|
-
if (!props.getFileList) {
|
|
297
|
-
_context3.next = 18;
|
|
298
|
-
break;
|
|
299
|
-
}
|
|
300
|
-
_context3.next = 17;
|
|
301
|
-
return props.getFileList(fileList);
|
|
302
|
-
case 17:
|
|
303
|
-
_t4 = _context3.sent;
|
|
304
|
-
_context3.next = 19;
|
|
305
|
-
break;
|
|
306
|
-
case 18:
|
|
307
|
-
_t4 = [];
|
|
308
|
-
case 19:
|
|
309
|
-
initFileList = _t4;
|
|
310
|
-
case 20:
|
|
311
|
-
_context3.next = 16;
|
|
312
|
-
break;
|
|
313
|
-
case 21:
|
|
314
|
-
_context3.next = 23;
|
|
315
|
-
break;
|
|
316
|
-
case 22:
|
|
317
|
-
_context3.prev = 22;
|
|
318
|
-
_t5 = _context3["catch"](15);
|
|
319
|
-
_iterator2.e(_t5);
|
|
320
|
-
case 23:
|
|
321
|
-
_context3.prev = 23;
|
|
322
|
-
_iterator2.f();
|
|
323
|
-
return _context3.finish(23);
|
|
324
|
-
case 24:
|
|
266
|
+
return _context3.finish(9);
|
|
267
|
+
case 10:
|
|
325
268
|
//const initFileList = props.getFileList ? await props.getFileList(props.fileList) : [];
|
|
326
269
|
setFileList(initFileList ? initFileList : []);
|
|
327
270
|
setLoading(false);
|
|
328
|
-
case
|
|
271
|
+
case 11:
|
|
329
272
|
case "end":
|
|
330
273
|
return _context3.stop();
|
|
331
274
|
}
|
|
332
|
-
}, _callee2, null, [[1,
|
|
275
|
+
}, _callee2, null, [[1, 8, 9, 10]]);
|
|
333
276
|
}));
|
|
334
277
|
return _fetchImgData.apply(this, arguments);
|
|
335
278
|
}
|
package/lib/Area/Area.js
CHANGED
|
@@ -21,6 +21,7 @@ var _bind = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stabl
|
|
|
21
21
|
var _row = _interopRequireDefault(require("antd/lib/row"));
|
|
22
22
|
var _col = _interopRequireDefault(require("antd/lib/col"));
|
|
23
23
|
var _typeof2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/typeof"));
|
|
24
|
+
var _icon = _interopRequireDefault(require("antd/lib/icon"));
|
|
24
25
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));
|
|
25
26
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/createClass"));
|
|
26
27
|
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/possibleConstructorReturn"));
|
|
@@ -118,6 +119,15 @@ var Area = /*#__PURE__*/function (_React$Component) {
|
|
|
118
119
|
type: type,
|
|
119
120
|
onClick: onClick
|
|
120
121
|
}, title);
|
|
122
|
+
} else if (item.type === 'icon') {
|
|
123
|
+
var _onClick = props.onClick;
|
|
124
|
+
var _key = item.key,
|
|
125
|
+
icon = item.icon;
|
|
126
|
+
return /*#__PURE__*/_react["default"].createElement(_icon["default"], {
|
|
127
|
+
type: icon,
|
|
128
|
+
key: _key,
|
|
129
|
+
onClick: _onClick
|
|
130
|
+
});
|
|
121
131
|
} else {
|
|
122
132
|
return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
|
|
123
133
|
}
|
|
@@ -182,8 +192,9 @@ var Area = /*#__PURE__*/function (_React$Component) {
|
|
|
182
192
|
type: readonly ? 'readonly' : item.type,
|
|
183
193
|
searchWhenClick: true
|
|
184
194
|
});
|
|
195
|
+
var factor = item.span || 24 / child.length;
|
|
185
196
|
return /*#__PURE__*/_react["default"].createElement(_col["default"], {
|
|
186
|
-
span:
|
|
197
|
+
span: factor,
|
|
187
198
|
key: item.key
|
|
188
199
|
}, _this2.toControl(item, props));
|
|
189
200
|
}));
|
|
@@ -48,7 +48,7 @@ var PROPS = {
|
|
|
48
48
|
onChange: _propTypes["default"].func,
|
|
49
49
|
loadData: _propTypes["default"].func,
|
|
50
50
|
//动态加载 ps:loadData 与 showSearch 无法一起使用
|
|
51
|
-
showSearch: _propTypes["default"].
|
|
51
|
+
showSearch: _propTypes["default"].bool
|
|
52
52
|
};
|
|
53
53
|
var PROPS_KEYS = (0, _keys["default"])(PROPS);
|
|
54
54
|
var InputCascader = /*#__PURE__*/function (_React$Component) {
|
|
@@ -116,7 +116,7 @@ var InputCascader = /*#__PURE__*/function (_React$Component) {
|
|
|
116
116
|
value: function render() {
|
|
117
117
|
return /*#__PURE__*/_react["default"].createElement(_cascader["default"], (0, _extends2["default"])({}, this.getProps(), {
|
|
118
118
|
style: {
|
|
119
|
-
backgroundColor: props.isBgColor ? '#f6ffc1' : ''
|
|
119
|
+
backgroundColor: this.props.isBgColor ? '#f6ffc1' : ''
|
|
120
120
|
}
|
|
121
121
|
}));
|
|
122
122
|
}
|
|
@@ -45,7 +45,7 @@ var _Control = _interopRequireWildcard(require("../Control"));
|
|
|
45
45
|
var _variables = _interopRequireDefault(require("../variables"));
|
|
46
46
|
function _interopRequireWildcard(e, t) { if ("function" == typeof _WeakMap) var r = new _WeakMap(), n = new _WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = _Object$defineProperty) && _Object$getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
47
47
|
function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty2(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
48
|
-
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var
|
|
48
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context27, _context28; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context27 = ownKeys(Object(t), !0)).call(_context27, function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context28 = ownKeys(Object(t))).call(_context28, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
49
49
|
function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? _Reflect$construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
|
|
50
50
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(_Reflect$construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
51
51
|
var FormItem = _form["default"].Item;
|
|
@@ -578,9 +578,12 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
|
|
|
578
578
|
(0, _defineProperty2["default"])(_this2, "toLabel", function (_ref10, type) {
|
|
579
579
|
var title = _ref10.title,
|
|
580
580
|
showAdd = _ref10.showAdd,
|
|
581
|
+
showQuery = _ref10.showQuery,
|
|
581
582
|
key = _ref10.key,
|
|
582
583
|
showInfo = _ref10.showInfo,
|
|
583
|
-
showInfoTitle = _ref10.showInfoTitle
|
|
584
|
+
showInfoTitle = _ref10.showInfoTitle,
|
|
585
|
+
showIcon = _ref10.showIcon,
|
|
586
|
+
iconType = _ref10.iconType;
|
|
584
587
|
if (showAdd && type !== 'readonly') {
|
|
585
588
|
var _context22;
|
|
586
589
|
var onClick = (0, _bind["default"])(_context22 = _this2.onAdd).call(_context22, _this2, key, title);
|
|
@@ -589,6 +592,32 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
|
|
|
589
592
|
type: "plus-circle-o",
|
|
590
593
|
onClick: onClick
|
|
591
594
|
}));
|
|
595
|
+
} else if (showQuery && type !== 'readonly') {
|
|
596
|
+
var _context23;
|
|
597
|
+
var _onClick = (0, _bind["default"])(_context23 = _this2.onAdd).call(_context23, _this2, key, title);
|
|
598
|
+
return /*#__PURE__*/_react["default"].createElement("span", null, title, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
|
|
599
|
+
role: "add",
|
|
600
|
+
type: "search",
|
|
601
|
+
onClick: _onClick
|
|
602
|
+
}));
|
|
603
|
+
} else if (showIcon && iconType && type !== 'readonly' && showInfoTitle) {
|
|
604
|
+
var _context24;
|
|
605
|
+
var _onClick2 = (0, _bind["default"])(_context24 = _this2.onAdd).call(_context24, _this2, key, title);
|
|
606
|
+
return /*#__PURE__*/_react["default"].createElement("span", null, title, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
|
|
607
|
+
title: showInfoTitle
|
|
608
|
+
}, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
|
|
609
|
+
role: "add",
|
|
610
|
+
type: iconType,
|
|
611
|
+
onClick: _onClick2
|
|
612
|
+
})));
|
|
613
|
+
} else if (showIcon && iconType && type !== 'readonly') {
|
|
614
|
+
var _context25;
|
|
615
|
+
var _onClick3 = (0, _bind["default"])(_context25 = _this2.onAdd).call(_context25, _this2, key, title);
|
|
616
|
+
return /*#__PURE__*/_react["default"].createElement("span", null, title, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
|
|
617
|
+
role: "add",
|
|
618
|
+
type: iconType,
|
|
619
|
+
onClick: _onClick3
|
|
620
|
+
}));
|
|
592
621
|
} else if (showInfo) {
|
|
593
622
|
return /*#__PURE__*/_react["default"].createElement("span", null, title, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
|
|
594
623
|
title: showInfoTitle
|
|
@@ -613,6 +642,8 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
|
|
|
613
642
|
onCheckItem = _this2$props4.onCheckItem,
|
|
614
643
|
_this2$props4$isGridF = _this2$props4.isGridForm,
|
|
615
644
|
isGridForm = _this2$props4$isGridF === void 0 ? false : _this2$props4$isGridF;
|
|
645
|
+
var labelSpan = factor === 3 ? 3 : factor === 2 ? 4 : 8;
|
|
646
|
+
var smSpan = control.title ? factor === 3 ? 21 : factor === 2 ? 20 : 16 : 24;
|
|
616
647
|
return control.type !== 'empty' ? /*#__PURE__*/_react["default"].createElement(_col["default"], {
|
|
617
648
|
span: span * factor,
|
|
618
649
|
key: control.key
|
|
@@ -627,7 +658,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
|
|
|
627
658
|
span: 24
|
|
628
659
|
},
|
|
629
660
|
sm: {
|
|
630
|
-
span:
|
|
661
|
+
span: labelSpan
|
|
631
662
|
}
|
|
632
663
|
},
|
|
633
664
|
wrapperCol: {
|
|
@@ -635,7 +666,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
|
|
|
635
666
|
span: 24
|
|
636
667
|
},
|
|
637
668
|
sm: {
|
|
638
|
-
span:
|
|
669
|
+
span: smSpan
|
|
639
670
|
}
|
|
640
671
|
}
|
|
641
672
|
}), _this2.toControl(controlProps, control))) : /*#__PURE__*/_react["default"].createElement(_col["default"], {
|
|
@@ -647,7 +678,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
|
|
|
647
678
|
});
|
|
648
679
|
});
|
|
649
680
|
(0, _defineProperty2["default"])(_this2, "toCols", function () {
|
|
650
|
-
var
|
|
681
|
+
var _context26;
|
|
651
682
|
var _this2$props5 = _this2.props,
|
|
652
683
|
_this2$props5$colNum = _this2$props5.colNum,
|
|
653
684
|
colNum = _this2$props5$colNum === void 0 ? defaultColNum : _this2$props5$colNum,
|
|
@@ -656,7 +687,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
|
|
|
656
687
|
colNum = 1;
|
|
657
688
|
}
|
|
658
689
|
var span = 24 / colNum;
|
|
659
|
-
return (0, _map["default"])(
|
|
690
|
+
return (0, _map["default"])(_context26 = _this2.getControls()).call(_context26, function (control) {
|
|
660
691
|
if (allFullFather) {
|
|
661
692
|
control.allFullFather = allFullFather;
|
|
662
693
|
}
|
|
@@ -36,7 +36,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
|
36
36
|
var _helper = _interopRequireDefault(require("../helper"));
|
|
37
37
|
var _Title = _interopRequireDefault(require("../Title"));
|
|
38
38
|
var _variables = _interopRequireDefault(require("../variables"));
|
|
39
|
-
function _interopRequireWildcard(e, t) { if ("function" == typeof _WeakMap) var r = new _WeakMap(), n = new _WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var
|
|
39
|
+
function _interopRequireWildcard(e, t) { if ("function" == typeof _WeakMap) var r = new _WeakMap(), n = new _WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t3 in e) "default" !== _t3 && {}.hasOwnProperty.call(e, _t3) && ((i = (o = _Object$defineProperty) && _Object$getOwnPropertyDescriptor(e, _t3)) && (i.get || i.set) ? o(f, _t3, i) : f[_t3] = e[_t3]); return f; })(e, t); }
|
|
40
40
|
function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof _Symbol && _getIteratorMethod(r) || r["@@iterator"]; if (!t) { if (_Array$isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
|
|
41
41
|
function _unsupportedIterableToArray(r, a) { if (r) { var _context7; if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = _sliceInstanceProperty(_context7 = {}.toString.call(r)).call(_context7, 8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? _Array$from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
|
|
42
42
|
function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
|
|
@@ -76,7 +76,8 @@ var convertFileList = function convertFileList(fileList) {
|
|
|
76
76
|
return {
|
|
77
77
|
fileFormat: item.fileFormat || 'id',
|
|
78
78
|
fileName: item.name,
|
|
79
|
-
fileUrl: item.response ? item.response.result : ''
|
|
79
|
+
fileUrl: item.response ? item.response.result : '',
|
|
80
|
+
fileShowUrl: item.fileShowUrl || ''
|
|
80
81
|
};
|
|
81
82
|
});
|
|
82
83
|
};
|
|
@@ -221,19 +222,20 @@ function SuperUpload(props) {
|
|
|
221
222
|
_useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
|
|
222
223
|
fileList = _useState4[0],
|
|
223
224
|
setFileList = _useState4[1];
|
|
224
|
-
var initFileList = [];
|
|
225
225
|
(0, _react.useEffect)(function () {
|
|
226
226
|
function fetchImgData() {
|
|
227
227
|
return _fetchImgData.apply(this, arguments);
|
|
228
228
|
}
|
|
229
229
|
function _fetchImgData() {
|
|
230
230
|
_fetchImgData = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
|
|
231
|
-
var _iterator, _step, item,
|
|
231
|
+
var initFileList, _iterator, _step, item, _t, _t2;
|
|
232
232
|
return _regenerator["default"].wrap(function (_context3) {
|
|
233
233
|
while (1) switch (_context3.prev = _context3.next) {
|
|
234
234
|
case 0:
|
|
235
|
-
|
|
236
|
-
|
|
235
|
+
initFileList = [];
|
|
236
|
+
console.log(props.fileList);
|
|
237
|
+
if (!(props.fileList.length > 0)) {
|
|
238
|
+
_context3.next = 10;
|
|
237
239
|
break;
|
|
238
240
|
}
|
|
239
241
|
_iterator = _createForOfIteratorHelper(props.fileList);
|
|
@@ -241,20 +243,16 @@ function SuperUpload(props) {
|
|
|
241
243
|
_iterator.s();
|
|
242
244
|
case 2:
|
|
243
245
|
if ((_step = _iterator.n()).done) {
|
|
244
|
-
_context3.next =
|
|
246
|
+
_context3.next = 7;
|
|
245
247
|
break;
|
|
246
248
|
}
|
|
247
249
|
item = _step.value;
|
|
248
|
-
if (!(item.fileUrl == '')) {
|
|
249
|
-
_context3.next = 6;
|
|
250
|
-
break;
|
|
251
|
-
}
|
|
252
250
|
if (!props.getFileList) {
|
|
253
251
|
_context3.next = 4;
|
|
254
252
|
break;
|
|
255
253
|
}
|
|
256
254
|
_context3.next = 3;
|
|
257
|
-
return props.getFileList(fileList);
|
|
255
|
+
return props.getFileList(props.fileList);
|
|
258
256
|
case 3:
|
|
259
257
|
_t = _context3.sent;
|
|
260
258
|
_context3.next = 5;
|
|
@@ -263,84 +261,29 @@ function SuperUpload(props) {
|
|
|
263
261
|
_t = [];
|
|
264
262
|
case 5:
|
|
265
263
|
initFileList = _t;
|
|
266
|
-
_context3.next = 10;
|
|
267
|
-
break;
|
|
268
264
|
case 6:
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
break;
|
|
272
|
-
}
|
|
273
|
-
_context3.next = 7;
|
|
274
|
-
return props.getFileList(props.fileList);
|
|
265
|
+
_context3.next = 2;
|
|
266
|
+
break;
|
|
275
267
|
case 7:
|
|
276
|
-
_t2 = _context3.sent;
|
|
277
268
|
_context3.next = 9;
|
|
278
269
|
break;
|
|
279
270
|
case 8:
|
|
280
|
-
|
|
271
|
+
_context3.prev = 8;
|
|
272
|
+
_t2 = _context3["catch"](1);
|
|
273
|
+
_iterator.e(_t2);
|
|
281
274
|
case 9:
|
|
282
|
-
|
|
283
|
-
case 10:
|
|
284
|
-
_context3.next = 2;
|
|
285
|
-
break;
|
|
286
|
-
case 11:
|
|
287
|
-
_context3.next = 13;
|
|
288
|
-
break;
|
|
289
|
-
case 12:
|
|
290
|
-
_context3.prev = 12;
|
|
291
|
-
_t3 = _context3["catch"](1);
|
|
292
|
-
_iterator.e(_t3);
|
|
293
|
-
case 13:
|
|
294
|
-
_context3.prev = 13;
|
|
275
|
+
_context3.prev = 9;
|
|
295
276
|
_iterator.f();
|
|
296
|
-
return _context3.finish(
|
|
297
|
-
case
|
|
298
|
-
_iterator2 = _createForOfIteratorHelper(fileList);
|
|
299
|
-
_context3.prev = 15;
|
|
300
|
-
_iterator2.s();
|
|
301
|
-
case 16:
|
|
302
|
-
if ((_step2 = _iterator2.n()).done) {
|
|
303
|
-
_context3.next = 21;
|
|
304
|
-
break;
|
|
305
|
-
}
|
|
306
|
-
_item = _step2.value;
|
|
307
|
-
if (!props.getFileList) {
|
|
308
|
-
_context3.next = 18;
|
|
309
|
-
break;
|
|
310
|
-
}
|
|
311
|
-
_context3.next = 17;
|
|
312
|
-
return props.getFileList(fileList);
|
|
313
|
-
case 17:
|
|
314
|
-
_t4 = _context3.sent;
|
|
315
|
-
_context3.next = 19;
|
|
316
|
-
break;
|
|
317
|
-
case 18:
|
|
318
|
-
_t4 = [];
|
|
319
|
-
case 19:
|
|
320
|
-
initFileList = _t4;
|
|
321
|
-
case 20:
|
|
322
|
-
_context3.next = 16;
|
|
323
|
-
break;
|
|
324
|
-
case 21:
|
|
325
|
-
_context3.next = 23;
|
|
326
|
-
break;
|
|
327
|
-
case 22:
|
|
328
|
-
_context3.prev = 22;
|
|
329
|
-
_t5 = _context3["catch"](15);
|
|
330
|
-
_iterator2.e(_t5);
|
|
331
|
-
case 23:
|
|
332
|
-
_context3.prev = 23;
|
|
333
|
-
_iterator2.f();
|
|
334
|
-
return _context3.finish(23);
|
|
335
|
-
case 24:
|
|
277
|
+
return _context3.finish(9);
|
|
278
|
+
case 10:
|
|
336
279
|
//const initFileList = props.getFileList ? await props.getFileList(props.fileList) : [];
|
|
337
280
|
setFileList(initFileList ? initFileList : []);
|
|
338
281
|
setLoading(false);
|
|
339
|
-
case
|
|
282
|
+
case 11:
|
|
340
283
|
case "end":
|
|
341
284
|
return _context3.stop();
|
|
342
285
|
}
|
|
343
|
-
}, _callee2, null, [[1,
|
|
286
|
+
}, _callee2, null, [[1, 8, 9, 10]]);
|
|
344
287
|
}));
|
|
345
288
|
return _fetchImgData.apply(this, arguments);
|
|
346
289
|
}
|