@lingxiteam/ebe-utils 0.3.28 → 0.3.30

package/lib/public/src/hooks/useBaseDataSource.ts

@@ -6,7 +6,6 @@ import { cloneDeep, isPlainObject } from 'lodash';
 import { useEffect, useRef, useState } from 'react';
 
 export interface UpdateDataSourceOptions {
-
   /**
    * 数据源名称
    */
@@ -52,7 +51,6 @@ export interface DataSourceOptions {
 
 export interface BaseDataSourceType {
   _others_: {
-
     /**
      * 用户信息
      */
@@ -165,6 +163,16 @@ const useBaseDataSource = <T extends BaseDataSourceType>(options: DataSourceOpti
       [name]: params,
     });
 
+  const getParams = (params: any) => {
+    if (params?.serviceRequest) {
+      return params?.serviceRequest;
+    } else if (params?.parameters) {
+      return params?.parameters;
+    } else if (params?.params) {
+      return params?.params;
+    }
+    return params;
+  };
   /**
    * 刷新对象数据源
    */
@@ -174,15 +182,15 @@ const useBaseDataSource = <T extends BaseDataSourceType>(options: DataSourceOpti
       ...options,
       attrs: params,
     })
-      .then(res => {
+      .then((res) => {
         setData({
           [name]: res,
-          [`${name}Filter`]: params,
+          [`${name}Filter`]: getParams(params),
         });
         const snapShot = cloneDeep(res);
         setDataSnapshot({
           [name]: snapShot,
-          [`${name}Filter`]: params,
+          [`${name}Filter`]: getParams(params),
         });
         return res;
       })
@@ -195,18 +203,18 @@ const useBaseDataSource = <T extends BaseDataSourceType>(options: DataSourceOpti
   /**
    * 刷新服务数据源
    */
-  const reloadServiceDataSource = (name: string, service: any, params: any) => {
+  const reloadServiceDataSource = (name: string, url: any, params: any) => {
     setLoading(true);
-    return fetchQueryService(service, params)
-      .then(res => {
+    return fetchQueryService(url, params)
+      .then((res) => {
         setData({
           [name]: res,
-          [`${name}Filter`]: params,
+          [`${name}Filter`]: getParams(params),
         });
         const snapShot = cloneDeep(res);
         setDataSnapshot({
           [name]: snapShot,
-          [`${name}Filter`]: params,
+          [`${name}Filter`]: getParams(params),
         });
         return res;
       })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/ebe-utils",
-  "version": "0.3.28",
+  "version": "0.3.30",
   "description": "",
   "keywords": [],
   "author": "",
@@ -19,7 +19,7 @@
     "@babel/types": "^7.12.12",
     "cac": "^6.7.14",
     "fs-extra": "9.x",
-    "@lingxiteam/ebe": "0.3.28"
+    "@lingxiteam/ebe": "0.3.30"
   },
   "publishConfig": {
     "access": "public"