@jetlinks-web/core 2.1.3 → 2.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetlinks-web/core",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "main": "index.ts",
   "module": "index.ts",
   "keywords": [
@@ -21,9 +21,9 @@
   "dependencies": {
     "axios": "^1.7.4",
     "rxjs": "^7.8.1",
-    "@jetlinks-web/types": "^1.0.2",
-    "@jetlinks-web/constants": "^1.0.8",
-    "@jetlinks-web/utils": "^1.2.7"
+    "@jetlinks-web/constants": "^1.0.9",
+    "@jetlinks-web/utils": "^1.2.8",
+    "@jetlinks-web/types": "^1.0.2"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

package/src/axios.ts

@@ -1,4 +1,4 @@
-import { TOKEN_KEY, BASE_API } from '@jetlinks-web/constants'
+import { TOKEN_KEY, BASE_API, LOCAL_BASE_API } from '@jetlinks-web/constants'
 import { getToken } from '@jetlinks-web/utils'
 import axios from 'axios'
 import type {
@@ -66,11 +66,17 @@ const controller = new AbortController();
 const handleRequest = (config: InternalAxiosRequestConfig) => {
   const token = getToken()
   const lang = localStorage.getItem(_options.langKey)
+  const env = localStorage.getItem(LOCAL_BASE_API)
 
   if (lang) {
     config.headers[_options.langKey] = lang
   }
 
+  if (!config.url.startsWith(env)) {
+    const _url = config.url.startsWith('/') ? config.url : `/${config.url}`
+    config.url = env + _url
+  }
+
   // 没有token，并且该接口需要token校验
   if (!token && !_options.filter_url?.some((url) => config.url?.includes(url))) {
     // 跳转登录页
@@ -244,7 +250,7 @@ export class Request {
    * @param {object} options 请求配置
    * @returns {Promise<AxiosResponse<any>>} 分页查询结果
    */
-  page(data: any, options: RequestOptions= {
+  page(data: any={}, options: RequestOptions= {
     url: undefined,
     method: undefined,
   }) {
@@ -258,7 +264,7 @@ export class Request {
    * @param {object} options 请求配置
    * @returns {Promise<AxiosResponse<any>>} 不分页查询结果
    */
-  noPage(data?: any, options: RequestOptions = {
+  noPage(data: any={}, options: RequestOptions = {
     url: undefined,
     method: undefined,
   }) {
@@ -287,25 +293,25 @@ export class Request {
    * @param {object} options 请求配置
    * @returns {Promise<AxiosResponse<any>>} 保存结果
    */
-  save(data: any, options: RequestOptions = {
+  save(data: any={}, options: RequestOptions = {
     url: undefined,
     method: undefined,
   }) {
     const { url=``, method = 'post', ...rest } = options
     return request[method](`${this.modulePath}${url}`, data, rest)
   }
-  
+
   /**
    * 更新
    * @param {object} data 更新参数
    * @param {object} options 请求配置
    * @returns {Promise<AxiosResponse<any>>} 更新结果
    */
-  update(data: any, options: RequestOptions = {
+  update(data: any={}, options: RequestOptions = {
     url: undefined,
     method: undefined,
   }) {
-    const { url=``, method = 'post', ...rest } = options
+    const { url=``, method = 'patch', ...rest } = options
     return patch(`${this.modulePath}${url}`, data, rest)
   }