react-hook-core 0.1.13 → 0.1.15
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/lib/search.js +1 -3
- package/lib/state.js +1 -1
- package/lib/useEdit.js +28 -6
- package/package.json +1 -1
- package/src/search.ts +612 -613
- package/src/state.ts +187 -187
- package/src/useEdit.ts +549 -526
package/lib/search.js
CHANGED
|
@@ -175,9 +175,7 @@ function mapObjects(objA, objB) {
|
|
|
175
175
|
if (objB.hasOwnProperty(key) && objB[key] !== null && objB[key] !== undefined) {
|
|
176
176
|
if (Array.isArray(objA[key])) {
|
|
177
177
|
objA[key] = [];
|
|
178
|
-
if (Array.isArray(objB[key]) && objB[key].length === 0) {
|
|
179
|
-
}
|
|
180
|
-
else {
|
|
178
|
+
if (!(Array.isArray(objB[key]) && objB[key].length === 0) && typeof objB[key] === 'string') {
|
|
181
179
|
var arrayObjKeyB = objB[key].length > 0 ? (_a = (objB[key])) === null || _a === void 0 ? void 0 : _a.split(',') : [];
|
|
182
180
|
if (arrayObjKeyB && arrayObjKeyB.length > 1) {
|
|
183
181
|
objA[key] = __spreadArrays(arrayObjKeyB);
|
package/lib/state.js
CHANGED
|
@@ -123,7 +123,7 @@ function buildState(e, state, ctrl, modelName, tloc) {
|
|
|
123
123
|
var objSet = {};
|
|
124
124
|
try {
|
|
125
125
|
var selectedDate = new Date(ctrl.value);
|
|
126
|
-
reflect_1.setValue(model, field, selectedDate.toISOString());
|
|
126
|
+
reflect_1.setValue(model, field, ctrl.value && ctrl.value !== '' ? selectedDate.toISOString() : '');
|
|
127
127
|
objSet[modelName] = model;
|
|
128
128
|
return objSet;
|
|
129
129
|
}
|
package/lib/useEdit.js
CHANGED
|
@@ -48,7 +48,13 @@ exports.useEdit = function (refForm, initialState, service, p2, p) {
|
|
|
48
48
|
p.initialize(id, baseProps.load, baseProps.setState, p.callback);
|
|
49
49
|
}
|
|
50
50
|
else {
|
|
51
|
-
|
|
51
|
+
try {
|
|
52
|
+
baseProps.load(id, p ? p.callback : undefined);
|
|
53
|
+
}
|
|
54
|
+
catch (error) {
|
|
55
|
+
p2.showError(error);
|
|
56
|
+
core_1.hideLoading(p2.loading);
|
|
57
|
+
}
|
|
52
58
|
}
|
|
53
59
|
}, []);
|
|
54
60
|
return __assign({}, baseProps);
|
|
@@ -313,10 +319,26 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
|
|
|
313
319
|
}
|
|
314
320
|
};
|
|
315
321
|
var fail = (p && p.fail ? p.fail : _fail);
|
|
316
|
-
var
|
|
322
|
+
var _handleError = function (err) {
|
|
323
|
+
if (err) {
|
|
324
|
+
setRunning(false);
|
|
325
|
+
core_1.hideLoading(p1.loading);
|
|
326
|
+
var errMsg = p1.resource.value('error_internal');
|
|
327
|
+
var data = (err && err.response) ? err.response : err;
|
|
328
|
+
if (data.status === 400) {
|
|
329
|
+
var errMsg_1 = p1.resource.value('error_400');
|
|
330
|
+
p1.showError(errMsg_1, "Error");
|
|
331
|
+
}
|
|
332
|
+
else {
|
|
333
|
+
p1.showError(errMsg, "Error");
|
|
334
|
+
}
|
|
335
|
+
}
|
|
336
|
+
};
|
|
337
|
+
var handleError = (p && p.handleError ? p.handleError : _handleError);
|
|
338
|
+
var _postSave = function (obj, r, version, backOnSave) {
|
|
317
339
|
setRunning(false);
|
|
318
340
|
core_1.hideLoading(p1.loading);
|
|
319
|
-
var x =
|
|
341
|
+
var x = r;
|
|
320
342
|
var successMsg = p1.resource.value('msg_save_success');
|
|
321
343
|
var newMod = flag.newMode;
|
|
322
344
|
var st = core_1.createEditStatus(p ? p.status : undefined);
|
|
@@ -372,14 +394,14 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
|
|
|
372
394
|
var patchable = (p ? p.patchable : true);
|
|
373
395
|
if (flag.newMode === false) {
|
|
374
396
|
if (service.patch && patchable !== false && body && Object.keys(body).length > 0) {
|
|
375
|
-
service.patch(body).then(function (result) { return postSave(obj, result, version, isBackO); });
|
|
397
|
+
service.patch(body).then(function (result) { return postSave(obj, result, version, isBackO); }).catch(handleError);
|
|
376
398
|
}
|
|
377
399
|
else {
|
|
378
|
-
service.update(obj).then(function (result) { return postSave(obj, result, version, isBackO); });
|
|
400
|
+
service.update(obj).then(function (result) { return postSave(obj, result, version, isBackO); }).catch(handleError);
|
|
379
401
|
}
|
|
380
402
|
}
|
|
381
403
|
else {
|
|
382
|
-
service.insert(obj).then(function (result) { return postSave(obj, result, version, isBackO); });
|
|
404
|
+
service.insert(obj).then(function (result) { return postSave(obj, result, version, isBackO); }).catch(handleError);
|
|
383
405
|
}
|
|
384
406
|
};
|
|
385
407
|
var doSave = (p && p.doSave ? p.doSave : _doSave);
|