style: 用回 lodash-es

package.json

@@ -23,6 +23,7 @@
   ],
   "dependencies": {
     "@alifd/next": "^1.26.22",
+    "lodash-es": "^4.17.21",
     "moment": "^2.29.4",
     "react-router-dom6": "npm:react-router-dom@^6.14.2",
     "tree-lodash": "^0.3.1"
@@ -77,6 +78,7 @@
     "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^14.0.0",
     "@types/jest": "^29.5.3",
+    "@types/lodash-es": "^4.17.8",
     "@types/node": "^16.18.39",
     "@types/react": "^18.2.18",
     "@types/react-dom": "^18.2.7",

src/core/hooks/useAuthData.ts

@@ -1,10 +1,10 @@
+import { defaults, omit } from "lodash-es";
 import { useContext } from "react";
 import { filter, map } from "tree-lodash";
 
 import { ProviderContext } from "../components/Provider";
 import { ProxyContext } from "../components/Proxy";
 import { ValidatorContext } from "../components/Validator";
-import { omit } from "../utils";
 import { isMatchAuth } from "../utils";
 
 /** 配置项 */
@@ -31,13 +31,7 @@ export function useAuthData(data?: any[], options?: Options) {
   if (!Array.isArray(data)) {
     return data;
   }
-  const combineOptions: Required<Options> = {
-    isTree: options?.isTree ?? defaultOptions.isTree,
-    childrenKey: options?.childrenKey ?? defaultOptions.childrenKey,
-    authKey: options?.authKey ?? defaultOptions.authKey,
-    isPreserveAuthKey:
-      options?.isPreserveAuthKey ?? defaultOptions.isPreserveAuthKey,
-  };
+  const combineOptions = defaults(options, defaultOptions);
   const { auth, disabled } = useContext(ProviderContext);
   const { authProxy } = useContext(ProxyContext);
   const { validator } = useContext(ValidatorContext);
@@ -56,7 +50,7 @@ export function useAuthData(data?: any[], options?: Options) {
   }
 
   function mapFn(item: any) {
-    return omit(item, [combineOptions.authKey]);
+    return omit(item, combineOptions.authKey);
   }
 
   const authorizedData = combineOptions?.isTree

src/core/hooks/useDetect.ts

@@ -1,7 +1,7 @@
+import { has } from "lodash-es";
 import { useContext } from "react";
 
 import { ProviderContext } from "../components/Provider";
-import { has } from "../utils";
 
 /** 检测组件使用是否合法 */
 export function useDetect(componentName: string) {

src/core/utils/index.ts

@@ -1,3 +1 @@
-export { has } from "./has";
 export { isMatchAuth } from "./isMatchAuth";
-export { omit } from "./omit";

src/core/utils/isMatchAuth.ts

@@ -1,5 +1,6 @@
+import { isRegExp } from "lodash-es";
+
 import type { ProviderProps } from "../index";
-import { isRegExp } from "./isRegExp";
 
 interface Options extends Omit<ProviderProps, "children"> {
   /** 权限代理 */

src/test/useAuthData.test.tsx

@@ -335,7 +335,7 @@ describe("useAuthData", () => {
     );
     expect(result.current).toEqual(EXPECT_DATA_FOR_TEST_4);
   });
-  test("Check if auth should be preserve if isPreserveAuthKey is false", () => {
+  test("Check if auth should not be preserve if isPreserveAuthKey is false", () => {
     const { result } = renderHook(
       () => useAuthData(MOCK_AUTH_DATA, { isPreserveAuthKey: false }),
       {