wapplr 1.0.43 → 1.0.48
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/dist/common/contents.js +19 -3
- package/dist/common/requests.js +1 -1
- package/dist/common/utils.js +13 -3
- package/package.json +1 -1
package/dist/common/contents.js
CHANGED
|
@@ -44,22 +44,35 @@ function createDefaultContentManager() {
|
|
|
44
44
|
contents = contentManager.contents;
|
|
45
45
|
content = contentName && contents[contentName] ? (0, _objectSpread2["default"])({}, contents[contentName]) : null;
|
|
46
46
|
|
|
47
|
-
if (!
|
|
47
|
+
if (!contentManager.firstRequest) {
|
|
48
48
|
_context.next = 8;
|
|
49
49
|
break;
|
|
50
50
|
}
|
|
51
51
|
|
|
52
52
|
_context.next = 8;
|
|
53
|
-
return
|
|
53
|
+
return contentManager.firstRequest({
|
|
54
54
|
wapp: wapp,
|
|
55
55
|
req: req,
|
|
56
56
|
res: res
|
|
57
57
|
});
|
|
58
58
|
|
|
59
59
|
case 8:
|
|
60
|
+
if (!(content && content.request)) {
|
|
61
|
+
_context.next = 11;
|
|
62
|
+
break;
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
_context.next = 11;
|
|
66
|
+
return content.request({
|
|
67
|
+
wapp: wapp,
|
|
68
|
+
req: req,
|
|
69
|
+
res: res
|
|
70
|
+
});
|
|
71
|
+
|
|
72
|
+
case 11:
|
|
60
73
|
return _context.abrupt("return", content);
|
|
61
74
|
|
|
62
|
-
case
|
|
75
|
+
case 12:
|
|
63
76
|
case "end":
|
|
64
77
|
return _context.stop();
|
|
65
78
|
}
|
|
@@ -211,6 +224,9 @@ function createDefaultContentManager() {
|
|
|
211
224
|
}),
|
|
212
225
|
getComponent: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
|
|
213
226
|
value: defaultGetComponent
|
|
227
|
+
}),
|
|
228
|
+
firstRequest: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _utils.defaultDescriptor), {}, {
|
|
229
|
+
value: null
|
|
214
230
|
})
|
|
215
231
|
});
|
|
216
232
|
return contentManager;
|
package/dist/common/requests.js
CHANGED
package/dist/common/utils.js
CHANGED
|
@@ -27,12 +27,22 @@ var defaultDescriptor = {
|
|
|
27
27
|
exports.defaultDescriptor = defaultDescriptor;
|
|
28
28
|
|
|
29
29
|
function copyObject(obj) {
|
|
30
|
+
var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
31
|
+
|
|
30
32
|
function cloneObj() {
|
|
33
|
+
var _options$skip = options.skip,
|
|
34
|
+
skip = _options$skip === void 0 ? [] : _options$skip,
|
|
35
|
+
_options$keep = options.keep,
|
|
36
|
+
keep = _options$keep === void 0 ? [] : _options$keep;
|
|
31
37
|
var clone = {};
|
|
32
38
|
|
|
33
39
|
for (var key in obj) {
|
|
34
|
-
if (obj.hasOwnProperty(key)) {
|
|
35
|
-
clone[key] = copyObject(obj[key]);
|
|
40
|
+
if (keep.indexOf(key) === -1 && skip.indexOf(key) === -1 && obj.hasOwnProperty(key)) {
|
|
41
|
+
clone[key] = copyObject(obj[key], options);
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
if (keep.indexOf(key) > -1) {
|
|
45
|
+
clone[key] = obj[key];
|
|
36
46
|
}
|
|
37
47
|
}
|
|
38
48
|
|
|
@@ -41,7 +51,7 @@ function copyObject(obj) {
|
|
|
41
51
|
|
|
42
52
|
function cloneArr() {
|
|
43
53
|
return obj.map(function (item) {
|
|
44
|
-
return copyObject(item);
|
|
54
|
+
return copyObject(item, options);
|
|
45
55
|
});
|
|
46
56
|
}
|
|
47
57
|
|