@hzab/data-model 1.8.0 → 1.8.2
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/CHANGELOG.md +8 -0
- package/package.json +1 -1
- package/src/array-data-model.js +1 -2
- package/src/data-model.js +2 -1
package/CHANGELOG.md
CHANGED
package/package.json
CHANGED
package/src/array-data-model.js
CHANGED
|
@@ -397,8 +397,7 @@ class ArrayDataModel extends ArrayUtils {
|
|
|
397
397
|
// 是否使用 response.statusText 作为兜底 msg
|
|
398
398
|
useStatusText,
|
|
399
399
|
} = opt || {};
|
|
400
|
-
let message = (response.data && (response.data.message || response.data.msg)) || response.msg;
|
|
401
|
-
|
|
400
|
+
let message = (response.data && (response.data.message || response.data.msg)) || response.msg || response.message;
|
|
402
401
|
if (!message && useStatusText) {
|
|
403
402
|
message = response.statusText;
|
|
404
403
|
}
|
package/src/data-model.js
CHANGED
|
@@ -516,7 +516,7 @@ class DataModel {
|
|
|
516
516
|
reject(err?.data ?? err);
|
|
517
517
|
return;
|
|
518
518
|
}
|
|
519
|
-
const response = err
|
|
519
|
+
const response = err?.response || err;
|
|
520
520
|
if (response) {
|
|
521
521
|
const message = this.handleMsg(response, { useStatusText: true });
|
|
522
522
|
const error = new Error(message);
|
|
@@ -546,6 +546,7 @@ class DataModel {
|
|
|
546
546
|
let message =
|
|
547
547
|
(response.data && (response.data.message || response.data.msg)) ||
|
|
548
548
|
response.msg ||
|
|
549
|
+
response.message ||
|
|
549
550
|
this.getNetworkErrMsg(response);
|
|
550
551
|
|
|
551
552
|
if (!message && useStatusText) {
|