@hzab/data-model 2.0.2 → 2.0.3-alpha.1

package/src/data-model.ts

@@ -1,4 +1,4 @@
-import _ from "lodash";
+import { merge, each, isString, isNumber, isBoolean, pickBy, isNil, cloneDeep, isObject } from "lodash-es";
 
 import { axios, isCancel } from "./axios";
 
@@ -407,9 +407,9 @@ class DataModel<T = any, R = Record<string, any>> {
       throw new Error(errMsg);
     }
     let apiUrl = api;
-    const params = _.merge({}, record, ctx);
-    _.each(params, (value, key) => {
-      if (!_.isString(value) || !_.isNumber(value) || _.isBoolean(value)) {
+    const params = merge({}, record, ctx);
+    each(params, (value, key) => {
+      if (!isString(value) || !isNumber(value) || isBoolean(value)) {
         apiUrl = apiUrl.replace(new RegExp(`:${key}$|:${key}(?=/)`), value);
       }
     });
@@ -424,8 +424,8 @@ class DataModel<T = any, R = Record<string, any>> {
    * @returns Promise<any>
    */
   async get(q: QueryParams = {}, ctx: JSONObject = {}, axiosConf?: AxiosConfig): Promise<any> {
-    let query = _.merge({}, this.query, q);
-    query = _.pickBy(query, (val) => !_.isNil(val) && val !== "");
+    let query = merge({}, this.query, q);
+    query = pickBy(query, (val) => !isNil(val) && val !== "");
 
     if (this.getReqMap) {
       query = await this.getReqMap(query);
@@ -467,8 +467,8 @@ class DataModel<T = any, R = Record<string, any>> {
    * @returns Promise<GetListResult<T>>
    */
   async getList(q: QueryParams = {}, ctx: JSONObject = {}, axiosConf?: AxiosConfig): Promise<GetListResult<T>> {
-    let query = _.merge({}, this.query, q);
-    query = _.pickBy(query, (val) => !_.isNil(val) && val !== "");
+    let query = merge({}, this.query, q);
+    query = pickBy(query, (val) => !isNil(val) && val !== "");
 
     if (this.getListReqMap) {
       query = await this.getListReqMap(query);
@@ -525,7 +525,7 @@ class DataModel<T = any, R = Record<string, any>> {
         ...this.createAxiosConf,
         ...axiosConf,
       };
-      let _params = _.cloneDeep(formDataToObj(params));
+      let _params = cloneDeep(formDataToObj(params));
       if (this.createReqMap) {
         _params = await this.createReqMap(_params, params);
       }
@@ -562,7 +562,7 @@ class DataModel<T = any, R = Record<string, any>> {
   update(params?: RequestData | FormData, ctx?: JSONObject, axiosConf?: AxiosConfig): Promise<any> {
     return new Promise(async (resolve, reject) => {
       const opt: AxiosConfig = { ...this.axiosConf, ...this.updateAxiosConf, ...axiosConf };
-      let _params = _.cloneDeep(formDataToObj(params));
+      let _params = cloneDeep(formDataToObj(params));
       if (this.updateReqMap) {
         _params = await this.updateReqMap(_params, params);
       }
@@ -599,7 +599,7 @@ class DataModel<T = any, R = Record<string, any>> {
   patch(params?: RequestData | FormData, ctx?: JSONObject, axiosConf?: AxiosConfig): Promise<any> {
     return new Promise(async (resolve, reject) => {
       const opt: AxiosConfig = { ...this.axiosConf, ...this.patchAxiosConf, ...axiosConf };
-      let _params = _.cloneDeep(formDataToObj(params));
+      let _params = cloneDeep(formDataToObj(params));
       if (this.patchReqMap) {
         _params = await this.patchReqMap(_params, params);
       }
@@ -635,14 +635,14 @@ class DataModel<T = any, R = Record<string, any>> {
    * @returns Promise<any>
    */
   async delete(config?: DeleteConfig, ctx?: JSONObject): Promise<any> {
-    let _config = _.cloneDeep(config) || {};
+    let _config = cloneDeep(config) || {};
     if (this.deleteReqMap) {
       _config = await this.deleteReqMap(_config);
     }
     return new Promise((resolve, reject) => {
       const apiUrl = this.getApiUrl(
         this.deleteApi,
-        Object.assign(_.cloneDeep(_config), _config.params, _config.data),
+        Object.assign(cloneDeep(_config), _config.params, _config.data),
         ctx,
         { from: "delete" },
       );
@@ -673,14 +673,14 @@ class DataModel<T = any, R = Record<string, any>> {
    * @returns Promise<any>
    */
   async multipleDelete(config?: DeleteConfig, ctx?: JSONObject): Promise<any> {
-    let _config = _.cloneDeep(config) || {};
+    let _config = cloneDeep(config) || {};
     if (this.multipleDeleteReqMap) {
       _config = await this.multipleDeleteReqMap(_config);
     }
     return new Promise((resolve, reject) => {
       const apiUrl = this.getApiUrl(
         this.multipleDeleteApi,
-        Object.assign(_.cloneDeep(_config), _config.params, _config.data),
+        Object.assign(cloneDeep(_config), _config.params, _config.data),
         ctx,
         { from: "multipleDelete" },
       );
@@ -741,7 +741,7 @@ class DataModel<T = any, R = Record<string, any>> {
     const message = this.handleMsg(response);
     if (code == 200) {
       const _data = data ?? {};
-      if (_.isObject(_data)) {
+      if (isObject(_data)) {
         if (Array.isArray(_data.content) && _data.pageNumber) {
           _data.list = _data.content;
           _data.pagination = { current: _data.pageNumber, total: _data.total };

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-es";
+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 || []);
+};