@steroidsjs/core 2.2.49 → 2.2.52
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/hooks/useFile.js +30 -11
- package/package.json +1 -1
- package/ui/form/Form/Form.js +20 -3
package/hooks/useFile.js
CHANGED
|
@@ -54,21 +54,40 @@ function useFile(props) {
|
|
|
54
54
|
}
|
|
55
55
|
react_1.useEffect(function () {
|
|
56
56
|
if (initialFiles) {
|
|
57
|
-
|
|
58
|
-
.filter(function (item) { return !!item.uid; })
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
57
|
+
var normalizedInitialFiles_1 = [].concat(initialFiles || [])
|
|
58
|
+
.filter(function (item) { return !!item.uid; });
|
|
59
|
+
// Remove not exists
|
|
60
|
+
var toDelete = uploader.queue.getFiles()
|
|
61
|
+
.filter(function (file) { return !normalizedInitialFiles_1.find(function (item) { return item.uid === file.getUid(); }); });
|
|
62
|
+
if (toDelete.length > 0) {
|
|
63
|
+
uploader.queue.remove(toDelete);
|
|
64
|
+
}
|
|
65
|
+
// Add or update
|
|
66
|
+
uploader.queue.add(normalizedInitialFiles_1
|
|
67
|
+
.map(function (item) {
|
|
68
|
+
var path = item.title || item.label || item.uid || item.id;
|
|
69
|
+
var resultHttpMessage = {
|
|
65
70
|
id: item.id || item.uid,
|
|
66
71
|
images: item.thumbnailUrl
|
|
67
72
|
? [{ url: item.thumbnailUrl }]
|
|
68
73
|
: null
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
|
|
74
|
+
};
|
|
75
|
+
var file = uploader.queue.getByUid(item.uid);
|
|
76
|
+
if (file) {
|
|
77
|
+
file.setPath(path);
|
|
78
|
+
file.setResultHttpMessage(resultHttpMessage);
|
|
79
|
+
return false;
|
|
80
|
+
}
|
|
81
|
+
return new File_1["default"]({
|
|
82
|
+
path: path,
|
|
83
|
+
status: File_1["default"].STATUS_END,
|
|
84
|
+
result: File_1["default"].RESULT_SUCCESS,
|
|
85
|
+
resultHttpStatus: 200,
|
|
86
|
+
resultHttpMessage: resultHttpMessage,
|
|
87
|
+
uid: item.uid
|
|
88
|
+
});
|
|
89
|
+
})
|
|
90
|
+
.filter(Boolean));
|
|
72
91
|
forceUpdate();
|
|
73
92
|
}
|
|
74
93
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
package/package.json
CHANGED
package/ui/form/Form/Form.js
CHANGED
|
@@ -178,16 +178,33 @@ function Form(props) {
|
|
|
178
178
|
if (e) {
|
|
179
179
|
e.preventDefault();
|
|
180
180
|
}
|
|
181
|
+
cleanedValues = cloneDeep_1["default"](values);
|
|
181
182
|
// Append non touched fields to values object
|
|
182
183
|
if (props.formId) {
|
|
183
184
|
Object.keys(components.ui.getRegisteredFields(props.formId) || {})
|
|
184
185
|
.forEach(function (key) {
|
|
185
|
-
|
|
186
|
-
|
|
186
|
+
// Don't set null values for keys in empty array items
|
|
187
|
+
var keyParts = [];
|
|
188
|
+
var arrayKey;
|
|
189
|
+
key.split('.').find(function (keyPart) {
|
|
190
|
+
if (keyParts.length > 0 && Array.isArray(get_1["default"](cleanedValues, keyParts))) {
|
|
191
|
+
keyParts.push(keyPart);
|
|
192
|
+
arrayKey = keyParts.join('.');
|
|
193
|
+
return true;
|
|
194
|
+
}
|
|
195
|
+
keyParts.push(keyPart);
|
|
196
|
+
return false;
|
|
197
|
+
});
|
|
198
|
+
if (arrayKey && !get_1["default"](cleanedValues, arrayKey)) {
|
|
199
|
+
return;
|
|
200
|
+
}
|
|
201
|
+
if (isUndefined_1["default"](get_1["default"](cleanedValues, key))) {
|
|
202
|
+
set_1["default"](cleanedValues, key, null);
|
|
187
203
|
}
|
|
188
204
|
});
|
|
189
205
|
}
|
|
190
|
-
|
|
206
|
+
// Clean
|
|
207
|
+
cleanedValues = form_1.cleanEmptyObject(cleanedValues);
|
|
191
208
|
// Event onBeforeSubmit
|
|
192
209
|
if (props.onBeforeSubmit && props.onBeforeSubmit.call(null, cleanedValues) === false) {
|
|
193
210
|
dispatch(form_2.formSetSubmitting(props.formId, false));
|