jclib-ui 1.0.51 → 1.0.53

package/dist/jclib-ui.es.js

@@ -7677,7 +7677,7 @@ const initialRequestInfo = {
   report: false,
   onBefore: null
 };
-function useApi(initialConfig) {
+function useApi(initialConfig = {}) {
   const history = useHistory();
   const controller = new AbortController();
   const { globalApiConfig } = useLibContext();
@@ -7697,7 +7697,7 @@ function useApi(initialConfig) {
       username: globalApiConfig.auth.username,
       password: globalApiConfig.auth.password
     };
-    initialConfig.headers = {};
+    initialConfig.headers = { ...initialConfig.headers, ...localConfig == null ? void 0 : localConfig.headers };
     if (globalApiConfig.getToken) {
       let token = globalApiConfig.getToken();
       if (token) {
@@ -7711,25 +7711,30 @@ function useApi(initialConfig) {
     initialConfig.cache = Boolean(
       globalApiConfig.isProductionMode && (!initialConfig.method || initialConfig.method == "get")
     );
-    if (initialConfig == null ? void 0 : initialConfig.cache)
+    if (initialConfig.cache) {
       await cache.init(initialConfig);
+    }
     let finalConfig = {
       baseURL: globalApiConfig.baseURL,
       timeout: globalApiConfig.timeout,
       auth,
       validateStatus: (status) => status >= 200 && status < 400,
       ...initialConfig,
-      ...localConfig
+      ...localConfig,
+      headers: initialConfig.headers
     };
-    if (finalConfig.report)
+    if (finalConfig.report) {
       finalConfig = { ...finalConfig, responseType: "blob", timeout: 0 };
+    }
     setRequestInfo({ ...initialRequestInfo, loading: true });
-    if (finalConfig.onBefore)
+    if (finalConfig.onBefore) {
       finalConfig.onBefore(finalConfig);
+    }
     try {
       const res = await axios({ ...finalConfig, signal: controller.signal });
-      if (globalApiConfig.afterRequest)
+      if (globalApiConfig.afterRequest) {
         globalApiConfig.afterRequest(res);
+      }
       response = {
         ...initialRequestInfo,
         data: res.data,