zy-react-library 1.0.145 → 1.0.147

package/hooks/useTable/index.d.ts

@@ -12,6 +12,8 @@ export interface UseTableOptions<TData extends Data, TParams extends Params> ext
   defaultPagination?: { current: number; pageSize: number };
   /** 是否使用存储查询条件，默认是 */
   useStorageQueryCriteria?: boolean;
+  /** 是否使用数据权限，默认是 */
+  usePermission?: boolean;
   /** 额外参数 */
   params?: Record<string, any> | (() => Record<string, any>);
   /** 表单数据转换函数，在每次请求之前调用，接收当前搜索的表单项，要求返回一个对象 */

package/hooks/useTable/index.js

@@ -4,7 +4,7 @@ import useUrlQueryCriteria from "../useUrlQueryCriteria";
 /**
  * 获取数据
  */
-function getService(service, getExtraParams = {}, transform) {
+function getService(service, getExtraParams = {}, transform, usePermission) {
   // 获取额外的参数
   const extraParams = (typeof getExtraParams === "function" ? getExtraParams() : getExtraParams) || {};
   // 获取数据
@@ -19,14 +19,18 @@ function getService(service, getExtraParams = {}, transform) {
       }
     }
 
-    // 发起请求
-    const res = await service({
+    const params = {
       pageIndex: current,
       pageSize,
       ...transformedFormData,
       ...extraParams,
-      menuPath: window.location.pathname,
-    });
+    }
+
+    if (usePermission)
+      params.menuPath = window.location.pathname
+
+    // 发起请求
+    const res = await service(params);
     // 返回数据
     return {
       list: res.data || [],
@@ -50,6 +54,7 @@ function useTable(service, options) {
   const {
     useStorageQueryCriteria = true,
     usePagination = true,
+    usePermission = true,
     defaultType = "advance",
     defaultCurrent = 1,
     defaultPageSize = 20,
@@ -70,7 +75,7 @@ function useTable(service, options) {
 
   // 调用 ahooks 的 useAntdTable
   const res = useAntdTable(
-    getService(service, extraParams, transform),
+    getService(service, extraParams, transform, usePermission),
     {
       ...restRestOptions,
       defaultParams: [actualPagination, actualSearchForm],

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zy-react-library",
   "private": false,
-  "version": "1.0.145",
+  "version": "1.0.147",
   "type": "module",
   "description": "",
   "author": "LiuJiaNan",

package/utils/index.d.ts

@@ -334,9 +334,9 @@ export function validatorEndTime(timeStart: string): {
 };
 
 /**
- * 验证结束时间是否大于等于当前时间
+ * 验证时间是否大于等于当前时间
  */
-export function validatorEndTimeGTCurrentDay(): {
+export function validatorTimeGTCurrentDay(): {
   validator: (_: any, value: any) => Promise<void | string>;
 };
 

package/utils/index.js

@@ -525,13 +525,13 @@ export const validatorEndTime = (timeStart) => {
 }
 
 /**
- * 验证结束时间是否大于等于当前时间
+ * 验证时间是否大于等于当前时间
  */
-export const validatorEndTimeGTCurrentDay = () => {
+export const validatorTimeGTCurrentDay = () => {
   return {
     validator: (_, value) => {
       if (value && value <= dayjs().format("YYYY-MM-DD hh:mm:ss")) {
-        return Promise.reject("结束时间必须大于当前时间");
+        return Promise.reject("需要大于当前时间");
       }
       else {
         return Promise.resolve();