@hzab/data-model 1.7.6 → 1.8.1

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# @hzab/data-model@1.8.1
+
+fix: handleMsg 新增 response.message 获取
+
+# @hzab/data-model@1.8.0
+
+fix: public utils getPublicUrl 多层目录问题修复 isFullPath
+
 # @hzab/data-model@1.7.6
 
 feat: getPublicUrl 获取 public 文件路径（自动拼接 hash 数据）

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/data-model",
-  "version": "1.7.6",
+  "version": "1.8.1",
   "description": "data model",
   "main": "src",
   "scripts": {

package/src/array-data-model.js

@@ -397,8 +397,7 @@ class ArrayDataModel extends ArrayUtils {
       // 是否使用 response.statusText 作为兜底 msg
       useStatusText,
     } = opt || {};
-    let message = (response.data && (response.data.message || response.data.msg)) || response.msg;
-
+    let message = (response.data && (response.data.message || response.data.msg)) || response.msg || response.message;
     if (!message && useStatusText) {
       message = response.statusText;
     }

package/src/data-model.js

@@ -546,6 +546,7 @@ class DataModel {
     let message =
       (response.data && (response.data.message || response.data.msg)) ||
       response.msg ||
+      response.message ||
       this.getNetworkErrMsg(response);
 
     if (!message && useStatusText) {

package/src/public-utils.js

@@ -3,13 +3,15 @@
  * @param {*} url 文件路径
  * @param {*} opt
  */
-export function getPublicUrl(url, opt) {
+export function getPublicUrl(url, opt = {}) {
   if (typeof url !== "string") {
     return url;
   }
+  const { isFullPath } = opt || {};
   let baseURL = (process.env.WEBPACK_PUBLIC_PATH || ".")?.replace(/^\//, "")?.replace(/\/$/, "");
-  return `${(baseURL.startsWith("http") ? "" : window.location.origin)?.replace(/\/$/, "")}/${baseURL}/${url?.replace(
-    /^\//,
-    "",
-  )}`;
+  if (isFullPath) {
+    const fullPathname = (location.origin + location.pathname).replace(/[^\/]+.html\/?$/, "").replace(/\/$/, "");
+    return `${fullPathname}/${baseURL?.replace(/^\./, "")}/${url?.replace(/^\//, "")}`;
+  }
+  return `${baseURL}/${url?.replace(/^\//, "")}`;
 }