ls-pro-common 3.1.8 → 3.1.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. package/dist/common.js +1 -1
  2. package/dist/common.min.js +1 -1
  3. package/es/http/index.js +3 -2
  4. package/es/utils/index.d.ts +1 -0
  5. package/es/utils/index.js +1 -0
  6. package/es/utils/promise.d.ts +15 -0
  7. package/es/utils/promise.js +21 -0
  8. package/lib/http/index.js +3 -2
  9. package/lib/utils/index.d.ts +1 -0
  10. package/lib/utils/index.js +1 -0
  11. package/lib/utils/promise.d.ts +15 -0
  12. package/lib/utils/promise.js +21 -0
  13. package/package.json +1 -1
package/es/http/index.js CHANGED
@@ -53,7 +53,7 @@ export var isCrossDomain = function isCrossDomain(url) {
53
53
  };
54
54
  /** 请求拦截器,统一添加token */
55
55
  request.interceptors.request.use(function (url, options) {
56
- var _options$params;
56
+ var _window$crypto$random, _window$crypto, _options$params;
57
57
  options.headers = options.headers || {};
58
58
  // 处理浏览器指纹
59
59
  if (browserId) {
@@ -92,7 +92,8 @@ request.interceptors.request.use(function (url, options) {
92
92
  url = url.replace('&noToken=1', '').replace('noToken=1', '');
93
93
  var resCode = getUrlQuery('resCode', url) || getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId');
94
94
  var param = {
95
- _t1: Date.now()
95
+ _t1: Date.now(),
96
+ __r: ((_window$crypto$random = (_window$crypto = window.crypto)['randomUUID']) === null || _window$crypto$random === void 0 ? void 0 : _window$crypto$random.call(_window$crypto)) || Math.random()
96
97
  };
97
98
  // 当没有明文参数resCode的时候，添加resCode参数为资源Id
98
99
  //@ts-ignore
package/es/utils/index.d.ts CHANGED
@@ -3,6 +3,7 @@ export * from './modal';
3
3
  export * from './array';
4
4
  export * from './format';
5
5
  export * from './size';
6
+ export * from './promise';
6
7
  export { getBrowserId } from 'ls-pro-tools';
7
8
  /**
8
9
  * 获取 url 参数
package/es/utils/index.js CHANGED
@@ -6,6 +6,7 @@ export * from './modal';
6
6
  export * from './array';
7
7
  export * from './format';
8
8
  export * from './size';
9
+ export * from './promise';
9
10
  export { getBrowserId } from 'ls-pro-tools';
10
11
  /**
11
12
  * 获取 url 参数
package/es/utils/promise.d.ts ADDED
@@ -0,0 +1,15 @@
1
+ /**
2
+ * 执行promise，返回结果和错误数组，结果在前，错误在后
3
+ *
4
+ * @example
5
+ * const [result, error] = await execPromise(httpGet('/api'));
6
+ * if (error) {
7
+ * console.error('请求数据异常', error);
8
+ * } else {
9
+ * console.log(result);
10
+ * }
11
+ *
12
+ * @param promise
13
+ * @returns Result, Error
14
+ */
15
+ export declare function execPromise<T>(promise: Promise<T>): Promise<[T | null, Error | null]>;
package/es/utils/promise.js ADDED
@@ -0,0 +1,21 @@
1
+ /**
2
+ * 执行promise，返回结果和错误数组，结果在前，错误在后
3
+ *
4
+ * @example
5
+ * const [result, error] = await execPromise(httpGet('/api'));
6
+ * if (error) {
7
+ * console.error('请求数据异常', error);
8
+ * } else {
9
+ * console.log(result);
10
+ * }
11
+ *
12
+ * @param promise
13
+ * @returns Result, Error
14
+ */
15
+ export function execPromise(promise) {
16
+ return promise.then(function (res) {
17
+ return [res, null];
18
+ }).catch(function (err) {
19
+ return [null, err];
20
+ });
21
+ }
package/lib/http/index.js CHANGED
@@ -53,7 +53,7 @@ export var isCrossDomain = function isCrossDomain(url) {
53
53
  };
54
54
  /** 请求拦截器,统一添加token */
55
55
  request.interceptors.request.use(function (url, options) {
56
- var _options$params;
56
+ var _window$crypto$random, _window$crypto, _options$params;
57
57
  options.headers = options.headers || {};
58
58
  // 处理浏览器指纹
59
59
  if (browserId) {
@@ -92,7 +92,8 @@ request.interceptors.request.use(function (url, options) {
92
92
  url = url.replace('&noToken=1', '').replace('noToken=1', '');
93
93
  var resCode = getUrlQuery('resCode', url) || getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId');
94
94
  var param = {
95
- _t1: Date.now()
95
+ _t1: Date.now(),
96
+ __r: ((_window$crypto$random = (_window$crypto = window.crypto)['randomUUID']) === null || _window$crypto$random === void 0 ? void 0 : _window$crypto$random.call(_window$crypto)) || Math.random()
96
97
  };
97
98
  // 当没有明文参数resCode的时候，添加resCode参数为资源Id
98
99
  //@ts-ignore
package/lib/utils/index.d.ts CHANGED
@@ -3,6 +3,7 @@ export * from './modal';
3
3
  export * from './array';
4
4
  export * from './format';
5
5
  export * from './size';
6
+ export * from './promise';
6
7
  export { getBrowserId } from 'ls-pro-tools';
7
8
  /**
8
9
  * 获取 url 参数
package/lib/utils/index.js CHANGED
@@ -6,6 +6,7 @@ export * from './modal';
6
6
  export * from './array';
7
7
  export * from './format';
8
8
  export * from './size';
9
+ export * from './promise';
9
10
  export { getBrowserId } from 'ls-pro-tools';
10
11
  /**
11
12
  * 获取 url 参数
package/lib/utils/promise.d.ts ADDED
@@ -0,0 +1,15 @@
1
+ /**
2
+ * 执行promise，返回结果和错误数组，结果在前，错误在后
3
+ *
4
+ * @example
5
+ * const [result, error] = await execPromise(httpGet('/api'));
6
+ * if (error) {
7
+ * console.error('请求数据异常', error);
8
+ * } else {
9
+ * console.log(result);
10
+ * }
11
+ *
12
+ * @param promise
13
+ * @returns Result, Error
14
+ */
15
+ export declare function execPromise<T>(promise: Promise<T>): Promise<[T | null, Error | null]>;
package/lib/utils/promise.js ADDED
@@ -0,0 +1,21 @@
1
+ /**
2
+ * 执行promise，返回结果和错误数组，结果在前，错误在后
3
+ *
4
+ * @example
5
+ * const [result, error] = await execPromise(httpGet('/api'));
6
+ * if (error) {
7
+ * console.error('请求数据异常', error);
8
+ * } else {
9
+ * console.log(result);
10
+ * }
11
+ *
12
+ * @param promise
13
+ * @returns Result, Error
14
+ */
15
+ export function execPromise(promise) {
16
+ return promise.then(function (res) {
17
+ return [res, null];
18
+ }).catch(function (err) {
19
+ return [null, err];
20
+ });
21
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ls-pro-common",
3
- "version": "3.1.8",
3
+ "version": "3.1.9",
4
4
  "description": "ls-pro-common",
5
5
  "license": "MIT",
6
6
  "sideEffects": [