@hzab/data-model 2.0.0 → 2.0.1

package/src/hooks.ts

@@ -1,38 +1,38 @@
-import { useMemo, useRef } from "react";
-import { merge } from "lodash";
-import DataModel, { DataModelOptions } from "./data-model";
-
-/**
- * useDataModel 选项接口
- */
-export interface UseDataModelOptions<T = any> {
-  /** 动态数据监听的目标 */
-  effectTargets?: any[];
-  /** 动态的 params 数据，包含了 query */
-  effectParams?: Partial<DataModelOptions<T>>;
-  /** 动态的 query 数据 */
-  effectQuery?: DataModelOptions<T>["query"];
-}
-
-/**
- * 解决 hooks 重复实例化导致 query 丢失的问题
- * @param {Object} initParams 初始参数
- * @param {Object} opt
- * @param {Object} opt.effectTargets 动态数据监听的目标
- * @param {Object} opt.effectParams 动态的 params 数据，包含了 query
- * @param {Object} opt.effectQuery 动态的 query 数据
- * @returns DataModel 实例
- */
-export const useDataModel = function <T = any>(initParams: DataModelOptions<T> = {}, opt: UseDataModelOptions<T> = {}) {
-  const model = useRef<DataModel<T>>(new DataModel(initParams));
-  return useMemo(() => {
-    const { effectParams, effectQuery } = opt || {};
-    if (effectParams) {
-      merge(model.current, effectParams);
-    }
-    if (effectQuery) {
-      merge(model.current.query, effectQuery);
-    }
-    return model.current;
-  }, opt.effectTargets || []);
-};
+import { useMemo, useRef } from "react";
+import { merge } from "lodash";
+import DataModel, { DataModelOptions } from "./data-model";
+
+/**
+ * useDataModel 选项接口
+ */
+export interface UseDataModelOptions<T = any> {
+  /** 动态数据监听的目标 */
+  effectTargets?: any[];
+  /** 动态的 params 数据，包含了 query */
+  effectParams?: Partial<DataModelOptions<T>>;
+  /** 动态的 query 数据 */
+  effectQuery?: DataModelOptions<T>["query"];
+}
+
+/**
+ * 解决 hooks 重复实例化导致 query 丢失的问题
+ * @param {Object} initParams 初始参数
+ * @param {Object} opt
+ * @param {Object} opt.effectTargets 动态数据监听的目标
+ * @param {Object} opt.effectParams 动态的 params 数据，包含了 query
+ * @param {Object} opt.effectQuery 动态的 query 数据
+ * @returns DataModel 实例
+ */
+export const useDataModel = function <T = any>(initParams: DataModelOptions<T> = {}, opt: UseDataModelOptions<T> = {}) {
+  const model = useRef<DataModel<T>>(new DataModel(initParams));
+  return useMemo(() => {
+    const { effectParams, effectQuery } = opt || {};
+    if (effectParams) {
+      merge(model.current, effectParams);
+    }
+    if (effectQuery) {
+      merge(model.current.query, effectQuery);
+    }
+    return model.current;
+  }, opt.effectTargets || []);
+};

package/src/index.ts

@@ -1,11 +1,11 @@
-import axios from "./axios";
-import DataModel from "./data-model";
-
-export * from "./axios";
-export * from "./data-model";
-export * from "./hooks";
-export * from "./type";
-
-export { axios, DataModel };
-
-export default DataModel;
+import axios from "./axios";
+import DataModel from "./data-model";
+
+export * from "./axios";
+export * from "./data-model";
+export * from "./hooks";
+export * from "./type";
+
+export { axios, DataModel };
+
+export default DataModel;

package/src/public-utils.ts

@@ -1,26 +1,26 @@
-/**
- * getPublicUrl 选项接口
- */
-export interface GetPublicUrlOptions {
-  /** 是否返回完整路径 */
-  isFullPath?: boolean;
-}
-
-/**
- * 获取 public 文件路径（自动拼接 hash 数据）
- * @param url 文件路径
- * @param opt 选项
- * @returns 完整的 public 文件路径
- */
-export function getPublicUrl(url: string | any, opt?: GetPublicUrlOptions): string | any {
-  if (typeof url !== "string") {
-    return url;
-  }
-  const { isFullPath } = opt || {};
-  const baseURL = (process.env.WEBPACK_PUBLIC_PATH || ".")?.replace(/^\//, "")?.replace(/\/$/, "");
-  if (isFullPath) {
-    const fullPathname = (location.origin + location.pathname).replace(/[^\/]+.html\/?$/, "").replace(/\/$/, "");
-    return `${fullPathname}/${baseURL?.replace(/^\./, "")}/${url?.replace(/^\//, "")}`;
-  }
-  return `${baseURL}/${url?.replace(/^\//, "")}`;
-}
+/**
+ * getPublicUrl 选项接口
+ */
+export interface GetPublicUrlOptions {
+  /** 是否返回完整路径 */
+  isFullPath?: boolean;
+}
+
+/**
+ * 获取 public 文件路径（自动拼接 hash 数据）
+ * @param url 文件路径
+ * @param opt 选项
+ * @returns 完整的 public 文件路径
+ */
+export function getPublicUrl(url: string | any, opt?: GetPublicUrlOptions): string | any {
+  if (typeof url !== "string") {
+    return url;
+  }
+  const { isFullPath } = opt || {};
+  const baseURL = (process.env.WEBPACK_PUBLIC_PATH || ".")?.replace(/^\//, "")?.replace(/\/$/, "");
+  if (isFullPath) {
+    const fullPathname = (location.origin + location.pathname).replace(/[^\/]+.html\/?$/, "").replace(/\/$/, "");
+    return `${fullPathname}/${baseURL?.replace(/^\./, "")}/${url?.replace(/^\//, "")}`;
+  }
+  return `${baseURL}/${url?.replace(/^\//, "")}`;
+}

package/src/utils.ts

@@ -1,98 +1,98 @@
-/** 默认错误提示文案 */
-const DEFAULT_MSG = "未知错误";
-/** 网络异常提示文案 */
-const NETWORK_MSG = "网络异常，请检查网络是否开启";
-
-/** 暂存相关变量 */
-export interface TempStore {
-  defaultErrMsg: string;
-  networkErrMsg: string;
-  axios?: any;
-}
-
-export const _$Temp: TempStore = {
-  defaultErrMsg: DEFAULT_MSG,
-  networkErrMsg: NETWORK_MSG,
-};
-
-/**
- * 设置默认的 axios
- * @param ax axios 实例
- */
-export function setDefaultAxios(ax: any) {
-  if (ax) {
-    _$Temp.axios = ax;
-  }
-}
-
-/**
- * 设置默认的错误提示文案
- * @param msg 错误提示文案
- */
-export function setDefaultErrMsg(msg: string) {
-  if (msg) {
-    _$Temp.defaultErrMsg = msg;
-  }
-}
-
-/**
- * 设置默认的网络异常提示文案
- * @param msg 网络异常提示文案
- */
-export function setNetworkErrMsg(msg: string) {
-  if (msg) {
-    _$Temp.networkErrMsg = msg;
-  }
-}
-
-/**
- * 检测网络状态
- * @returns 网络是否可用
- */
-export function checkNetwork(): boolean {
-  if (typeof navigator === "undefined") {
-    return true;
-  }
-  if (navigator.onLine === false) {
-    return false;
-  }
-  const _navigator = navigator as any;
-  const connection = _navigator.connection || _navigator.mozConnection || _navigator.webkitConnection;
-  if (!connection) {
-    return true;
-  }
-  const noNetwork = connection?.type === "none" || connection.downlink === 0 || connection.effectiveType === null;
-  return !noNetwork;
-}
-
-/**
- * 对象转 FormData 格式
- * @param data 对象数据
- * @returns FormData 对象
- */
-export function objToFormData(data: Record<string, any>): FormData {
-  if (data instanceof FormData) {
-    return data;
-  }
-  const formData = new FormData();
-  Object.keys(data)?.forEach((key) => {
-    formData.set(key, data[key]);
-  });
-  return formData;
-}
-
-/**
- * FormData 转对象
- * @param formData FormData 对象
- * @returns 普通对象
- */
-export function formDataToObj(formData: FormData | any): Record<string, any> {
-  if (!(formData instanceof FormData)) {
-    return formData;
-  }
-  const tempData: Record<string, any> = {};
-  for (const [key, value] of formData.entries()) {
-    tempData[key] = value;
-  }
-  return tempData;
-}
+/** 默认错误提示文案 */
+const DEFAULT_MSG = "未知错误";
+/** 网络异常提示文案 */
+const NETWORK_MSG = "网络异常，请检查网络是否开启";
+
+/** 暂存相关变量 */
+export interface TempStore {
+  defaultErrMsg: string;
+  networkErrMsg: string;
+  axios?: any;
+}
+
+export const _$Temp: TempStore = {
+  defaultErrMsg: DEFAULT_MSG,
+  networkErrMsg: NETWORK_MSG,
+};
+
+/**
+ * 设置默认的 axios
+ * @param ax axios 实例
+ */
+export function setDefaultAxios(ax: any) {
+  if (ax) {
+    _$Temp.axios = ax;
+  }
+}
+
+/**
+ * 设置默认的错误提示文案
+ * @param msg 错误提示文案
+ */
+export function setDefaultErrMsg(msg: string) {
+  if (msg) {
+    _$Temp.defaultErrMsg = msg;
+  }
+}
+
+/**
+ * 设置默认的网络异常提示文案
+ * @param msg 网络异常提示文案
+ */
+export function setNetworkErrMsg(msg: string) {
+  if (msg) {
+    _$Temp.networkErrMsg = msg;
+  }
+}
+
+/**
+ * 检测网络状态
+ * @returns 网络是否可用
+ */
+export function checkNetwork(): boolean {
+  if (typeof navigator === "undefined") {
+    return true;
+  }
+  if (navigator.onLine === false) {
+    return false;
+  }
+  const _navigator = navigator as any;
+  const connection = _navigator.connection || _navigator.mozConnection || _navigator.webkitConnection;
+  if (!connection) {
+    return true;
+  }
+  const noNetwork = connection?.type === "none" || connection.downlink === 0 || connection.effectiveType === null;
+  return !noNetwork;
+}
+
+/**
+ * 对象转 FormData 格式
+ * @param data 对象数据
+ * @returns FormData 对象
+ */
+export function objToFormData(data: Record<string, any>): FormData {
+  if (data instanceof FormData) {
+    return data;
+  }
+  const formData = new FormData();
+  Object.keys(data)?.forEach((key) => {
+    formData.set(key, data[key]);
+  });
+  return formData;
+}
+
+/**
+ * FormData 转对象
+ * @param formData FormData 对象
+ * @returns 普通对象
+ */
+export function formDataToObj(formData: FormData | any): Record<string, any> {
+  if (!(formData instanceof FormData)) {
+    return formData;
+  }
+  const tempData: Record<string, any> = {};
+  for (const [key, value] of formData.entries()) {
+    tempData[key] = value;
+  }
+  return tempData;
+}