ls-pro-common 3.1.30 → 3.1.32

package/es/http/index.js

@@ -57,12 +57,10 @@ request.interceptors.request.use(function (url, options) {
   options.headers = options.headers || {};
   // 处理浏览器指纹
   if (browserId) {
-    // @ts-ignore
     options.headers.browserId = browserId;
   } else {
     if (getCache('browserId')) {
       browserId = getCache('browserId');
-      // @ts-ignore
       options.headers.browserId = browserId;
     } else {
       getBrowserId().then(function (id) {
@@ -73,45 +71,37 @@ request.interceptors.request.use(function (url, options) {
   // 处理门店
   var shopNo = getCacheSessionFirst('shopNo');
   if (shopNo) {
-    // @ts-ignore
     options.headers.shopNo = shopNo;
   }
   // 处理门店
   var shopCode = getCacheSessionFirst('shopCode');
   if (shopCode) {
-    // @ts-ignore
     options.headers.shopCode = shopCode;
   }
   // 处理仓库
   var storeNo = getCacheSessionFirst('storeNo');
   if (storeNo) {
-    // @ts-ignore
     options.headers.storeNo = storeNo;
   }
   var tag = getCookie('x-asm-prefer-tag');
   if (tag) {
-    // @ts-ignore
     options.headers['x-asm-prefer-tag'] = tag; //灰度发版标识
   }
-  // @ts-ignore
+
   options.headers['terminal'] = 'PC';
-  // wms 提示，是否排班标识
   var expireWarnFlag = getCache('expireWarnFlag', true);
-  // @ts-ignore
   options.headers.expireWarnFlag = expireWarnFlag === '1' ? '1' : '0';
   var token = getCookie('token');
   if (token && url.indexOf('noToken=1') === -1) {
-    //@ts-ignore
     options.headers.token = token;
   }
   url = url.replace('&noToken=1', '').replace('noToken=1', '');
-  var resCode = getUrlQuery('resCode', url) || getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId');
+  var resCode = getUrlQuery('resCode', url) || window.__currentResCode__ || getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId');
   var param = {
     _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
   if (resCode && !((_options$params = options.params) === null || _options$params === void 0 ? void 0 : _options$params.resCode)) {
     param.resCode = resCode;
   }

package/es/http/mdmRequest.d.ts

@@ -152,6 +152,7 @@ export declare const getSeason: (params?: any) => Promise<any>;
  * @returns
  */
 export declare const getCategory: (params?: any) => Promise<any>;
+export declare const getSupplier: (params?: any) => Promise<any>;
 declare const mdmMap: {
     owner: (params?: any) => Promise<any>;
     store: (params?: any) => Promise<any>;
@@ -178,6 +179,7 @@ declare const mdmMap: {
     year: (params?: any) => Promise<any>;
     season: (params?: any) => Promise<any>;
     category: (params?: any) => Promise<any>;
+    supplier: (params?: any) => Promise<any>;
 };
 export declare type MdmType = keyof typeof mdmMap;
 export declare const getMdmData: (type: MdmType, params?: any) => Promise<any>;

package/es/http/mdmRequest.js

@@ -335,6 +335,12 @@ export var getCategory = function getCategory() {
   var url = '/lesoon-mdm-center-api/bmCategory/page';
   return httpGetWithCache('category', url, params);
 };
+export var getSupplier = function getSupplier() {
+  var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  setPageSize(params);
+  var url = '/lesoon-mdm-center-api/bmSupplier/page';
+  return httpGetWithCache('supplier', url, params);
+};
 var mdmMap = {
   owner: getOwner,
   store: getStore,
@@ -360,7 +366,8 @@ var mdmMap = {
   gender: getGender,
   year: getYear,
   season: getSeason,
-  category: getCategory
+  category: getCategory,
+  supplier: getSupplier
 };
 export var getMdmData = function getMdmData(type) {
   var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};

package/es/utils/index.d.ts

@@ -229,3 +229,9 @@ export declare const urlDownloadDomain: (url: string) => string;
  * @param isBlank 是否新开窗口下载，默认新开窗口，不影响原页面展示
  */
 export declare const downloadFile: (url: string, fileName?: string | undefined, isBlank?: boolean) => void;
+/**
+ * 微前端主工程注入子工程时，子工程调用此方法设置资源Id，权限等参数
+ *
+ * @param props
+ */
+export declare const setCurrentResCode: (props: any) => void;

package/es/utils/index.js

@@ -28,7 +28,7 @@ export var getUrlQuery = function getUrlQuery(name) {
 };
 export var getResourceProps = function getResourceProps(name) {
   if (!name) return '';
-  var id = getUrlQuery('resCode');
+  var id = window.__currentResCode__ || getUrlQuery('resCode');
   var obj;
   // window.lsResourceList 为主工程写入的资源
   // @ts-ignore
@@ -510,4 +510,20 @@ export var downloadFile = function downloadFile(url, fileName) {
   document.body.appendChild(a);
   a.click();
   document.body.removeChild(a);
+};
+/**
+ * 微前端主工程注入子工程时，子工程调用此方法设置资源Id，权限等参数
+ *
+ * @param props
+ */
+export var setCurrentResCode = function setCurrentResCode(props) {
+  var _props$history;
+  var initialValue = props === null || props === void 0 ? void 0 : (_props$history = props.history) === null || _props$history === void 0 ? void 0 : _props$history.initialEntries;
+  if (Array.isArray(initialValue) && initialValue.length > 0) {
+    var parentParams = initialValue[0];
+    window.__initVal__ = parentParams;
+    window.__currentResCode__ = getUrlQuery('resCode', parentParams);
+    window.__currentRight__ = getUrlQuery('right', parentParams);
+    window.__currentResRight__ = getUrlQuery('resRight', parentParams);
+  }
 };

package/lib/http/index.js

@@ -57,12 +57,10 @@ request.interceptors.request.use(function (url, options) {
   options.headers = options.headers || {};
   // 处理浏览器指纹
   if (browserId) {
-    // @ts-ignore
     options.headers.browserId = browserId;
   } else {
     if (getCache('browserId')) {
       browserId = getCache('browserId');
-      // @ts-ignore
       options.headers.browserId = browserId;
     } else {
       getBrowserId().then(function (id) {
@@ -73,45 +71,37 @@ request.interceptors.request.use(function (url, options) {
   // 处理门店
   var shopNo = getCacheSessionFirst('shopNo');
   if (shopNo) {
-    // @ts-ignore
     options.headers.shopNo = shopNo;
   }
   // 处理门店
   var shopCode = getCacheSessionFirst('shopCode');
   if (shopCode) {
-    // @ts-ignore
     options.headers.shopCode = shopCode;
   }
   // 处理仓库
   var storeNo = getCacheSessionFirst('storeNo');
   if (storeNo) {
-    // @ts-ignore
     options.headers.storeNo = storeNo;
   }
   var tag = getCookie('x-asm-prefer-tag');
   if (tag) {
-    // @ts-ignore
     options.headers['x-asm-prefer-tag'] = tag; //灰度发版标识
   }
-  // @ts-ignore
+
   options.headers['terminal'] = 'PC';
-  // wms 提示，是否排班标识
   var expireWarnFlag = getCache('expireWarnFlag', true);
-  // @ts-ignore
   options.headers.expireWarnFlag = expireWarnFlag === '1' ? '1' : '0';
   var token = getCookie('token');
   if (token && url.indexOf('noToken=1') === -1) {
-    //@ts-ignore
     options.headers.token = token;
   }
   url = url.replace('&noToken=1', '').replace('noToken=1', '');
-  var resCode = getUrlQuery('resCode', url) || getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId');
+  var resCode = getUrlQuery('resCode', url) || window.__currentResCode__ || getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId');
   var param = {
     _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
   if (resCode && !((_options$params = options.params) === null || _options$params === void 0 ? void 0 : _options$params.resCode)) {
     param.resCode = resCode;
   }

package/lib/http/mdmRequest.d.ts

@@ -152,6 +152,7 @@ export declare const getSeason: (params?: any) => Promise<any>;
  * @returns
  */
 export declare const getCategory: (params?: any) => Promise<any>;
+export declare const getSupplier: (params?: any) => Promise<any>;
 declare const mdmMap: {
     owner: (params?: any) => Promise<any>;
     store: (params?: any) => Promise<any>;
@@ -178,6 +179,7 @@ declare const mdmMap: {
     year: (params?: any) => Promise<any>;
     season: (params?: any) => Promise<any>;
     category: (params?: any) => Promise<any>;
+    supplier: (params?: any) => Promise<any>;
 };
 export declare type MdmType = keyof typeof mdmMap;
 export declare const getMdmData: (type: MdmType, params?: any) => Promise<any>;

package/lib/http/mdmRequest.js

@@ -335,6 +335,12 @@ export var getCategory = function getCategory() {
   var url = '/lesoon-mdm-center-api/bmCategory/page';
   return httpGetWithCache('category', url, params);
 };
+export var getSupplier = function getSupplier() {
+  var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  setPageSize(params);
+  var url = '/lesoon-mdm-center-api/bmSupplier/page';
+  return httpGetWithCache('supplier', url, params);
+};
 var mdmMap = {
   owner: getOwner,
   store: getStore,
@@ -360,7 +366,8 @@ var mdmMap = {
   gender: getGender,
   year: getYear,
   season: getSeason,
-  category: getCategory
+  category: getCategory,
+  supplier: getSupplier
 };
 export var getMdmData = function getMdmData(type) {
   var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};

package/lib/utils/index.d.ts

@@ -229,3 +229,9 @@ export declare const urlDownloadDomain: (url: string) => string;
  * @param isBlank 是否新开窗口下载，默认新开窗口，不影响原页面展示
  */
 export declare const downloadFile: (url: string, fileName?: string | undefined, isBlank?: boolean) => void;
+/**
+ * 微前端主工程注入子工程时，子工程调用此方法设置资源Id，权限等参数
+ *
+ * @param props
+ */
+export declare const setCurrentResCode: (props: any) => void;

package/lib/utils/index.js

@@ -28,7 +28,7 @@ export var getUrlQuery = function getUrlQuery(name) {
 };
 export var getResourceProps = function getResourceProps(name) {
   if (!name) return '';
-  var id = getUrlQuery('resCode');
+  var id = window.__currentResCode__ || getUrlQuery('resCode');
   var obj;
   // window.lsResourceList 为主工程写入的资源
   // @ts-ignore
@@ -510,4 +510,20 @@ export var downloadFile = function downloadFile(url, fileName) {
   document.body.appendChild(a);
   a.click();
   document.body.removeChild(a);
+};
+/**
+ * 微前端主工程注入子工程时，子工程调用此方法设置资源Id，权限等参数
+ *
+ * @param props
+ */
+export var setCurrentResCode = function setCurrentResCode(props) {
+  var _props$history;
+  var initialValue = props === null || props === void 0 ? void 0 : (_props$history = props.history) === null || _props$history === void 0 ? void 0 : _props$history.initialEntries;
+  if (Array.isArray(initialValue) && initialValue.length > 0) {
+    var parentParams = initialValue[0];
+    window.__initVal__ = parentParams;
+    window.__currentResCode__ = getUrlQuery('resCode', parentParams);
+    window.__currentRight__ = getUrlQuery('right', parentParams);
+    window.__currentResRight__ = getUrlQuery('resRight', parentParams);
+  }
 };

package/package.json

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