ls-pro-common 3.1.8 → 3.1.10

package/es/http/index.js

@@ -53,7 +53,7 @@ export var isCrossDomain = function isCrossDomain(url) {
 };
 /** 请求拦截器,统一添加token */
 request.interceptors.request.use(function (url, options) {
-  var _options$params;
+  var _window$crypto$random, _window$crypto, _options$params;
   options.headers = options.headers || {};
   // 处理浏览器指纹
   if (browserId) {
@@ -92,7 +92,8 @@ request.interceptors.request.use(function (url, options) {
   url = url.replace('&noToken=1', '').replace('noToken=1', '');
   var resCode = getUrlQuery('resCode', url) || getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId');
   var param = {
-    _t1: Date.now()
+    _t1: Date.now(),
+    __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()
   };
   // 当没有明文参数resCode的时候，添加resCode参数为资源Id
   //@ts-ignore

package/es/utils/index.d.ts

@@ -3,6 +3,7 @@ export * from './modal';
 export * from './array';
 export * from './format';
 export * from './size';
+export * from './promise';
 export { getBrowserId } from 'ls-pro-tools';
 /**
  * 获取 url 参数

package/es/utils/index.js

@@ -6,6 +6,7 @@ export * from './modal';
 export * from './array';
 export * from './format';
 export * from './size';
+export * from './promise';
 export { getBrowserId } from 'ls-pro-tools';
 /**
  * 获取 url 参数
@@ -41,9 +42,10 @@ export var getResourceProps = function getResourceProps(name) {
     obj = resList.find(function (o) {
       return o.resourceId === id;
     });
-  } else if (location.pathname && location.pathname.length > 2) {
+  } else if (location.pathname && location.pathname.length > 3) {
+    var url = location.pathname + location.hash;
     obj = resList.find(function (o) {
-      return o.microUrl === location.pathname;
+      return o.microUrl && o.microUrl === location.pathname || o.url === url;
     });
   }
   if (!obj) return '';
@@ -398,9 +400,14 @@ export var appPath = function appPath() {
     return window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__;
   }
   if (path) return path;
+  //本地开发环境，判断是否hash路由，如果是hash路由，则返回./
+  if (isDev) {
+    return location.hash ? './' : '/';
+  }
+  // 生产环境，返回当前路径
   var p = location.pathname || '';
-  var idx = p.indexOf('/', 1);
-  return idx > 0 ? p.slice(0, idx + 1) : p.length > 1 ? p + '/' : './';
+  if (p === '/') return location.origin + '/';
+  return location.origin + '/' + p.split('/')[1] + '/';
 };
 /**
  * 深度复制对象

package/es/utils/promise.d.ts

@@ -0,0 +1,15 @@
+/**
+ * 执行promise，返回结果和错误数组，结果在前，错误在后
+ *
+ * @example
+ *   const [result, error] = await execPromise(httpGet('/api'));
+ *   if (error) {
+ *     console.error('请求数据异常', error);
+ *   } else {
+ *     console.log(result);
+ *   }
+ *
+ * @param promise
+ * @returns Result, Error
+ */
+export declare function execPromise<T>(promise: Promise<T>): Promise<[T | null, Error | null]>;

package/es/utils/promise.js

@@ -0,0 +1,21 @@
+/**
+ * 执行promise，返回结果和错误数组，结果在前，错误在后
+ *
+ * @example
+ *   const [result, error] = await execPromise(httpGet('/api'));
+ *   if (error) {
+ *     console.error('请求数据异常', error);
+ *   } else {
+ *     console.log(result);
+ *   }
+ *
+ * @param promise
+ * @returns Result, Error
+ */
+export function execPromise(promise) {
+  return promise.then(function (res) {
+    return [res, null];
+  }).catch(function (err) {
+    return [null, err];
+  });
+}

package/lib/http/index.js

@@ -53,7 +53,7 @@ export var isCrossDomain = function isCrossDomain(url) {
 };
 /** 请求拦截器,统一添加token */
 request.interceptors.request.use(function (url, options) {
-  var _options$params;
+  var _window$crypto$random, _window$crypto, _options$params;
   options.headers = options.headers || {};
   // 处理浏览器指纹
   if (browserId) {
@@ -92,7 +92,8 @@ request.interceptors.request.use(function (url, options) {
   url = url.replace('&noToken=1', '').replace('noToken=1', '');
   var resCode = getUrlQuery('resCode', url) || getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId');
   var param = {
-    _t1: Date.now()
+    _t1: Date.now(),
+    __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()
   };
   // 当没有明文参数resCode的时候，添加resCode参数为资源Id
   //@ts-ignore

package/lib/utils/index.d.ts

@@ -3,6 +3,7 @@ export * from './modal';
 export * from './array';
 export * from './format';
 export * from './size';
+export * from './promise';
 export { getBrowserId } from 'ls-pro-tools';
 /**
  * 获取 url 参数

package/lib/utils/index.js

@@ -6,6 +6,7 @@ export * from './modal';
 export * from './array';
 export * from './format';
 export * from './size';
+export * from './promise';
 export { getBrowserId } from 'ls-pro-tools';
 /**
  * 获取 url 参数
@@ -41,9 +42,10 @@ export var getResourceProps = function getResourceProps(name) {
     obj = resList.find(function (o) {
       return o.resourceId === id;
     });
-  } else if (location.pathname && location.pathname.length > 2) {
+  } else if (location.pathname && location.pathname.length > 3) {
+    var url = location.pathname + location.hash;
     obj = resList.find(function (o) {
-      return o.microUrl === location.pathname;
+      return o.microUrl && o.microUrl === location.pathname || o.url === url;
     });
   }
   if (!obj) return '';
@@ -398,9 +400,14 @@ export var appPath = function appPath() {
     return window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__;
   }
   if (path) return path;
+  //本地开发环境，判断是否hash路由，如果是hash路由，则返回./
+  if (isDev) {
+    return location.hash ? './' : '/';
+  }
+  // 生产环境，返回当前路径
   var p = location.pathname || '';
-  var idx = p.indexOf('/', 1);
-  return idx > 0 ? p.slice(0, idx + 1) : p.length > 1 ? p + '/' : './';
+  if (p === '/') return location.origin + '/';
+  return location.origin + '/' + p.split('/')[1] + '/';
 };
 /**
  * 深度复制对象

package/lib/utils/promise.d.ts

@@ -0,0 +1,15 @@
+/**
+ * 执行promise，返回结果和错误数组，结果在前，错误在后
+ *
+ * @example
+ *   const [result, error] = await execPromise(httpGet('/api'));
+ *   if (error) {
+ *     console.error('请求数据异常', error);
+ *   } else {
+ *     console.log(result);
+ *   }
+ *
+ * @param promise
+ * @returns Result, Error
+ */
+export declare function execPromise<T>(promise: Promise<T>): Promise<[T | null, Error | null]>;

package/lib/utils/promise.js

@@ -0,0 +1,21 @@
+/**
+ * 执行promise，返回结果和错误数组，结果在前，错误在后
+ *
+ * @example
+ *   const [result, error] = await execPromise(httpGet('/api'));
+ *   if (error) {
+ *     console.error('请求数据异常', error);
+ *   } else {
+ *     console.log(result);
+ *   }
+ *
+ * @param promise
+ * @returns Result, Error
+ */
+export function execPromise(promise) {
+  return promise.then(function (res) {
+    return [res, null];
+  }).catch(function (err) {
+    return [null, err];
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "3.1.8",
+  "version": "3.1.10",
   "description": "ls-pro-common",
   "license": "MIT",
   "sideEffects": [