@deppon/deppon-request 1.2.0 → 1.11.1

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2022 xingxing
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2022 xingxing
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,222 +1,222 @@
-# `@deppon/deppon-request`
-
-德邦前端 http 请求包
-
-## 安装
-
-```bash
-npm install @deppon/deppon-request
-```
-
-## 基础使用
-
-### JavaScript/TypeScript 项目
-
-```javascript
-import request from '@deppon/deppon-request';
-
-// 发送 GET 请求
-request({
-    url: '/api/data',
-    method: 'get',
-    params: {
-        id: 1,
-    },
-})
-    .then(res => {
-        console.log(res);
-    })
-    .catch(err => {
-        console.error(err);
-    });
-
-// 发送 POST 请求
-request({
-    url: '/api/data',
-    method: 'post',
-    data: {
-        name: 'test',
-    },
-})
-    .then(res => {
-        console.log(res);
-    })
-    .catch(err => {
-        console.error(err);
-    });
-```
-
-## Vue 3 使用
-
-### 1. 安装插件
-
-在 Vue 应用中安装插件：
-
-```javascript
-import { createApp } from 'vue';
-import { VuePlugin } from '@deppon/deppon-request';
-
-const app = createApp(App);
-
-// 安装插件
-app.use(VuePlugin);
-
-app.mount('#app');
-```
-
-### 2. 在 Composition API 中使用
-
-```vue
-<script setup>
-import { useRequest } from '@deppon/deppon-request';
-import { ref } from 'vue';
-
-const request = useRequest();
-const data = ref(null);
-const loading = ref(false);
-
-const fetchData = async () => {
-    loading.value = true;
-    try {
-        const res = await request({
-            url: '/api/data',
-            method: 'get',
-            params: {
-                id: 1,
-            },
-        });
-        data.value = res;
-    } catch (error) {
-        console.error(error);
-    } finally {
-        loading.value = false;
-    }
-};
-
-const submitData = async () => {
-    try {
-        const res = await request({
-            url: '/api/submit',
-            method: 'post',
-            data: {
-                name: 'test',
-            },
-        });
-        console.log(res);
-    } catch (error) {
-        console.error(error);
-    }
-};
-</script>
-
-<template>
-    <div>
-        <button @click="fetchData" :disabled="loading">
-            {{ loading ? '加载中...' : '获取数据' }}
-        </button>
-        <button @click="submitData">提交数据</button>
-    </div>
-</template>
-```
-
-### 3. 在 Options API 中使用
-
-```vue
-<script>
-export default {
-    data() {
-        return {
-            loading: false,
-            data: null,
-        };
-    },
-    methods: {
-        async fetchData() {
-            this.loading = true;
-            try {
-                // 通过 this.$request 访问
-                const res = await this.$request({
-                    url: '/api/data',
-                    method: 'get',
-                    params: {
-                        id: 1,
-                    },
-                });
-                this.data = res;
-            } catch (error) {
-                console.error(error);
-            } finally {
-                this.loading = false;
-            }
-        },
-        async submitData() {
-            try {
-                const res = await this.$request({
-                    url: '/api/submit',
-                    method: 'post',
-                    data: {
-                        name: 'test',
-                    },
-                });
-                console.log(res);
-            } catch (error) {
-                console.error(error);
-            }
-        },
-    },
-};
-</script>
-```
-
-## API
-
-### Composition API
-
--   `useRequest()` - 获取 request 实例
-
-### 请求方法
-
--   `request(options)` - 发送 HTTP 请求
-
-#### 请求参数
-
--   `url` - 请求的地址（必填）
--   `method` - 请求方法，默认为 `'get'`
--   `data` - POST 请求的数据
--   `params` - GET 请求的查询参数
--   `headers` - 自定义请求头
--   `once` - 控制接口只执行一次（可选）
-
-#### 使用示例
-
-```javascript
-// GET 请求
-request({
-    url: '/api/users',
-    method: 'get',
-    params: {
-        page: 1,
-        size: 10,
-    },
-});
-
-// POST 请求
-request({
-    url: '/api/users',
-    method: 'post',
-    data: {
-        name: 'John',
-        age: 30,
-    },
-});
-
-// 只执行一次的请求
-request({
-    url: '/api/submit',
-    method: 'post',
-    data: { name: 'test' },
-    once: true,
-});
-```
-
-更多 API 请参考源码。
+# `@deppon/deppon-request`
+
+德邦前端 http 请求包
+
+## 安装
+
+```bash
+npm install @deppon/deppon-request
+```
+
+## 基础使用
+
+### JavaScript/TypeScript 项目
+
+```javascript
+import request from '@deppon/deppon-request';
+
+// 发送 GET 请求
+request({
+    url: '/api/data',
+    method: 'get',
+    params: {
+        id: 1,
+    },
+})
+    .then(res => {
+        console.log(res);
+    })
+    .catch(err => {
+        console.error(err);
+    });
+
+// 发送 POST 请求
+request({
+    url: '/api/data',
+    method: 'post',
+    data: {
+        name: 'test',
+    },
+})
+    .then(res => {
+        console.log(res);
+    })
+    .catch(err => {
+        console.error(err);
+    });
+```
+
+## Vue 3 使用
+
+### 1. 安装插件
+
+在 Vue 应用中安装插件：
+
+```javascript
+import { createApp } from 'vue';
+import { VuePlugin } from '@deppon/deppon-request';
+
+const app = createApp(App);
+
+// 安装插件
+app.use(VuePlugin);
+
+app.mount('#app');
+```
+
+### 2. 在 Composition API 中使用
+
+```vue
+<script setup>
+import { useRequest } from '@deppon/deppon-request';
+import { ref } from 'vue';
+
+const request = useRequest();
+const data = ref(null);
+const loading = ref(false);
+
+const fetchData = async () => {
+    loading.value = true;
+    try {
+        const res = await request({
+            url: '/api/data',
+            method: 'get',
+            params: {
+                id: 1,
+            },
+        });
+        data.value = res;
+    } catch (error) {
+        console.error(error);
+    } finally {
+        loading.value = false;
+    }
+};
+
+const submitData = async () => {
+    try {
+        const res = await request({
+            url: '/api/submit',
+            method: 'post',
+            data: {
+                name: 'test',
+            },
+        });
+        console.log(res);
+    } catch (error) {
+        console.error(error);
+    }
+};
+</script>
+
+<template>
+    <div>
+        <button @click="fetchData" :disabled="loading">
+            {{ loading ? '加载中...' : '获取数据' }}
+        </button>
+        <button @click="submitData">提交数据</button>
+    </div>
+</template>
+```
+
+### 3. 在 Options API 中使用
+
+```vue
+<script>
+export default {
+    data() {
+        return {
+            loading: false,
+            data: null,
+        };
+    },
+    methods: {
+        async fetchData() {
+            this.loading = true;
+            try {
+                // 通过 this.$request 访问
+                const res = await this.$request({
+                    url: '/api/data',
+                    method: 'get',
+                    params: {
+                        id: 1,
+                    },
+                });
+                this.data = res;
+            } catch (error) {
+                console.error(error);
+            } finally {
+                this.loading = false;
+            }
+        },
+        async submitData() {
+            try {
+                const res = await this.$request({
+                    url: '/api/submit',
+                    method: 'post',
+                    data: {
+                        name: 'test',
+                    },
+                });
+                console.log(res);
+            } catch (error) {
+                console.error(error);
+            }
+        },
+    },
+};
+</script>
+```
+
+## API
+
+### Composition API
+
+-   `useRequest()` - 获取 request 实例
+
+### 请求方法
+
+-   `request(options)` - 发送 HTTP 请求
+
+#### 请求参数
+
+-   `url` - 请求的地址（必填）
+-   `method` - 请求方法，默认为 `'get'`
+-   `data` - POST 请求的数据
+-   `params` - GET 请求的查询参数
+-   `headers` - 自定义请求头
+-   `once` - 控制接口只执行一次（可选）
+
+#### 使用示例
+
+```javascript
+// GET 请求
+request({
+    url: '/api/users',
+    method: 'get',
+    params: {
+        page: 1,
+        size: 10,
+    },
+});
+
+// POST 请求
+request({
+    url: '/api/users',
+    method: 'post',
+    data: {
+        name: 'John',
+        age: 30,
+    },
+});
+
+// 只执行一次的请求
+request({
+    url: '/api/submit',
+    method: 'post',
+    data: { name: 'test' },
+    once: true,
+});
+```
+
+更多 API 请参考源码。

package/es/composable.d.ts

@@ -1,28 +1,28 @@
-/**
- * Composition API: useRequest
- * 在 Vue 3 Composition API 中使用 request
- *
- * @example
- * import { useRequest } from '@deppon/deppon-request/vue'
- *
- * export default {
- *     setup() {
- *         const request = useRequest()
- *
- *         const fetchData = async () => {
- *             try {
- *                 const res = await request({
- *                     url: '/api/data',
- *                     method: 'get'
- *                 })
- *                 console.log(res)
- *             } catch (error) {
- *                 console.error(error)
- *             }
- *         }
- *
- *         return { fetchData }
- *     }
- * }
- */
-export function useRequest(): any;
+/**
+ * Composition API: useRequest
+ * 在 Vue 3 Composition API 中使用 request
+ *
+ * @example
+ * import { useRequest } from '@deppon/deppon-request/vue'
+ *
+ * export default {
+ *     setup() {
+ *         const request = useRequest()
+ *
+ *         const fetchData = async () => {
+ *             try {
+ *                 const res = await request({
+ *                     url: '/api/data',
+ *                     method: 'get'
+ *                 })
+ *                 console.log(res)
+ *             } catch (error) {
+ *                 console.error(error)
+ *             }
+ *         }
+ *
+ *         return { fetchData }
+ *     }
+ * }
+ */
+export function useRequest(): any;

package/es/composable.js

@@ -2,32 +2,32 @@ import './_virtual/_rollup-plugin-inject-process-env.js';
 import { inject, getCurrentInstance } from 'vue';
 import CBKRquest from './request/request.js';
 
-/**
- * Composition API: useRequest
- * 在 Vue 3 Composition API 中使用 request
- *
- * @example
- * import { useRequest } from '@deppon/deppon-request/vue'
- *
- * export default {
- *     setup() {
- *         const request = useRequest()
- *
- *         const fetchData = async () => {
- *             try {
- *                 const res = await request({
- *                     url: '/api/data',
- *                     method: 'get'
- *                 })
- *                 console.log(res)
- *             } catch (error) {
- *                 console.error(error)
- *             }
- *         }
- *
- *         return { fetchData }
- *     }
- * }
+/**
+ * Composition API: useRequest
+ * 在 Vue 3 Composition API 中使用 request
+ *
+ * @example
+ * import { useRequest } from '@deppon/deppon-request/vue'
+ *
+ * export default {
+ *     setup() {
+ *         const request = useRequest()
+ *
+ *         const fetchData = async () => {
+ *             try {
+ *                 const res = await request({
+ *                     url: '/api/data',
+ *                     method: 'get'
+ *                 })
+ *                 console.log(res)
+ *             } catch (error) {
+ *                 console.error(error)
+ *             }
+ *         }
+ *
+ *         return { fetchData }
+ *     }
+ * }
  */
 function useRequest() {
   // 优先从 provide 获取

package/es/index.d.ts

@@ -1,4 +1,4 @@
-export default request;
-export { default as VuePlugin } from "./vue";
-export { useRequest } from "./composable";
-import request from "./request";
+export default request;
+export { default as VuePlugin } from "./vue";
+export { useRequest } from "./composable";
+import request from "./request";

package/es/request/adapterAjax.d.ts

@@ -1 +1 @@
-export default function optionsAdapter(options: any, instance: any, resolveOptions: any): any;
+export default function optionsAdapter(options: any, instance: any, resolveOptions: any): any;

package/es/request/adapterAjax.js

@@ -59,17 +59,17 @@ function dataTypeForAxios(options) {
   }
 }
 
-/**
- * jquery中beforeSend有3个参数
- * callbackContext
- * jqXHR
- * s
- * return false 会终止请求
- * 对应axios有2个
- * data
- * headers
- *
- * return false的话不会终止请求。但是ajax会终止，不过目前没有人用这个规则
+/**
+ * jquery中beforeSend有3个参数
+ * callbackContext
+ * jqXHR
+ * s
+ * return false 会终止请求
+ * 对应axios有2个
+ * data
+ * headers
+ *
+ * return false的话不会终止请求。但是ajax会终止，不过目前没有人用这个规则
  */
 
 function beforeSendForAxios(options) {

package/es/request/cancel.d.ts

@@ -1 +1 @@
-export default function _default(options: any): void;
+export default function _default(options: any): void;

package/es/request/cancel.js

@@ -15,7 +15,7 @@ var Cancel = /*#__PURE__*/function () {
     this.keyTsMap = {};
     this.clearTime = null;
   }
-  _createClass(Cancel, [{
+  return _createClass(Cancel, [{
     key: "autoClear",
     value: function autoClear() {
       var _this = this;
@@ -97,7 +97,6 @@ var Cancel = /*#__PURE__*/function () {
       });
     }
   }]);
-  return Cancel;
 }();
 var cancelController = new Cancel();
 if (!window.cancelController) {

package/es/request/headers.d.ts

@@ -1,15 +1,15 @@
-export default function setHeaders(options: any): void;
-/**
- * 获取head信息
- * @param {string} name  要匹配的关键字
- * @param {boolean} vague  是否模糊搜索
- * @return object
- *
- **/
-export function getHeaderItem(name: string, vague?: boolean): {};
-/**
- * 不重复随机数
- * @params toString参数范围(2-36)
- *
- **/
-export function random(): string;
+export default function setHeaders(options: any): void;
+/**
+ * 获取head信息
+ * @param {string} name  要匹配的关键字
+ * @param {boolean} vague  是否模糊搜索
+ * @return object
+ *
+ **/
+export function getHeaderItem(name: string, vague?: boolean): {};
+/**
+ * 不重复随机数
+ * @params toString参数范围(2-36)
+ *
+ **/
+export function random(): string;

package/es/request/headers.js

@@ -57,12 +57,12 @@ function getEnvHeader() {
   }
 }
 
-/**
- * 获取head信息
- * @param {string} name  要匹配的关键字
- * @param {boolean} vague  是否模糊搜索
- * @return object
- *
+/**
+ * 获取head信息
+ * @param {string} name  要匹配的关键字
+ * @param {boolean} vague  是否模糊搜索
+ * @return object
+ *
  **/
 function getHeaderItem(name) {
   var vague = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -89,13 +89,13 @@ function getHeaderItem(name) {
   return list;
 }
 
-/**
- * 加密逻辑
- * 随机数:rm  平台号:mstatic  时间戳:time  密钥:key
- * x-app-nonce: 随机字符串
- * x-app-timestamp: 时间戳
- * DEV、PRE:(@vs9jV]ykdnbjE7M) pro:(pro:8Wfy(kX7Gj$uhEUT)
- * x-app-encrypt-text: 随机字符串 + 时间戳 + mstatic + md5
+/**
+ * 加密逻辑
+ * 随机数:rm  平台号:mstatic  时间戳:time  密钥:key
+ * x-app-nonce: 随机字符串
+ * x-app-timestamp: 时间戳
+ * DEV、PRE:(@vs9jV]ykdnbjE7M) pro:(pro:8Wfy(kX7Gj$uhEUT)
+ * x-app-encrypt-text: 随机字符串 + 时间戳 + mstatic + md5
  */
 function getEncryptHeader() {
   var devpre = '@vs9jV]ykdnbjE7M';
@@ -119,10 +119,10 @@ function getEncryptHeader() {
   }, headers);
 }
 
-/**
- * 不重复随机数
- * @params toString参数范围(2-36)
- *
+/**
+ * 不重复随机数
+ * @params toString参数范围(2-36)
+ *
  **/
 function random() {
   return (Math.random() * 10000000).toString(16).substr(0, 4) + new Date().getTime() + Math.random().toString().substr(2, 5);

package/es/request/index.d.ts

@@ -1,2 +1,2 @@
-export default request;
-import request from "./request";
+export default request;
+import request from "./request";

package/es/request/instance.d.ts

@@ -1 +1 @@
-export default function appInstance(options: any): Promise<import("axios").AxiosResponse<any, any, {}>>;
+export default function appInstance(options: any): import("axios").AxiosPromise<any>;

package/es/request/reqInterceptor.d.ts

@@ -1,2 +1,2 @@
-export function req(config: any, options: any): any;
-export function reqErr(e: any): any;
+export function req(config: any, options: any): any;
+export function reqErr(e: any): any;

package/es/request/request.d.ts

@@ -1,2 +1,2 @@
-export default CBKRquest;
-declare function CBKRquest(options: any): any;
+export default CBKRquest;
+declare function CBKRquest(options: any): any;

package/es/request/request.js

@@ -7,12 +7,12 @@ import cancelApi from './cancel.js';
 
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-/**
- * deppon-request说明
- * @params options.url 请求的地址
- * @params options.data 请求数据
- * @params options.async 是否同步(废弃)
- * @params options.headers 自定义请求头
+/**
+ * deppon-request说明
+ * @params options.url 请求的地址
+ * @params options.data 请求数据
+ * @params options.async 是否同步(废弃)
+ * @params options.headers 自定义请求头
  */
 if (!window.onceList) {
   window.onceList = [];

package/es/request/resInterceptor.d.ts

@@ -1,2 +1,2 @@
-export function res(res: any, options: any): Promise<any>;
-export function resErr(res: any, options: any): Promise<never>;
+export function res(res: any, options: any): Promise<any>;
+export function resErr(res: any, options: any): Promise<never>;

package/es/request/resInterceptor.js

@@ -21,11 +21,11 @@ function ResponseInterceptor(res, options) {
     });
   };
   if (resSuccess) {
-    /**
-     * 捕获code
-     * 如果传true的话会捕获所有code
-     * 传数组或者Number类型的code也可以捕获指定code
-     * 但凡传了options.catchCode，就一定会捕获，并且不走默认校验流程
+    /**
+     * 捕获code
+     * 如果传true的话会捕获所有code
+     * 传数组或者Number类型的code也可以捕获指定code
+     * 但凡传了options.catchCode，就一定会捕获，并且不走默认校验流程
      */
     if (options.catchCode) {
       if (typeof options.catchCode === 'boolean' || Array.isArray(options.catchCode) && options.catchCode.indexOf(resData.code) >= 0 || options.catchCode === resData.code) {

package/es/vue.d.ts

@@ -1,10 +1,10 @@
-declare namespace _default {
-    export { install };
-}
-export default _default;
-export { useRequest } from "./composable";
-/**
- * Vue 插件安装函数
- * @param {Object} app - Vue 应用实例
- */
-declare function install(app: Object): void;
+declare namespace _default {
+    export { install };
+}
+export default _default;
+export { useRequest } from "./composable";
+/**
+ * Vue 插件安装函数
+ * @param {Object} app - Vue 应用实例
+ */
+declare function install(app: Object): void;

package/es/vue.js

@@ -1,9 +1,9 @@
 import './_virtual/_rollup-plugin-inject-process-env.js';
 import CBKRquest from './request/request.js';
 
-/**
- * Vue 插件安装函数
- * @param {Object} app - Vue 应用实例
+/**
+ * Vue 插件安装函数
+ * @param {Object} app - Vue 应用实例
  */
 function install(app) {
   // 注册全局属性

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@deppon/deppon-request",
-    "version": "1.2.0",
+    "version": "1.11.1",
     "description": "德邦前端 http 请求包",
     "license": "MIT",
     "homepage": "",
@@ -36,8 +36,8 @@
     "dependencies": {
         "@babel/runtime": "^7.17.7",
         "@deppon/deppon-bridge": "1.1.2",
-        "@deppon/deppon-ui": "1.2.0",
-        "@deppon/deppon-utils": "1.2.0",
+        "@deppon/deppon-ui": "1.11.1",
+        "@deppon/deppon-utils": "1.11.1",
         "axios": "^0.26.0",
         "md5": "^2.3.0",
         "qs": "^6.10.3"
@@ -45,5 +45,5 @@
     "peerDependencies": {
         "vue": "^3.0.0"
     },
-    "gitHead": "a8c002bc49a329259c1f5522313c9370de74dcbe"
+    "gitHead": "a2eb8252d816644242f8eaec16e428020aa3fd8e"
 }