@bit-sun/business-component 3.0.0-alpha.34 → 3.0.0-alpha.35

package/dist/index.esm.js

@@ -698,20 +698,34 @@ function handleUserPhone() {
 function getCurrentTargetBgId() {
   return localStorage.getItem('target_bg_id');
 }
-// 菜单按钮权限 存储/获取key 函数
-var getMenuAuthDataKey = function getMenuAuthDataKey(channel) {
+/*******      公用localstorage存取 开始      *****/
+// 获取存储的最终key--加前缀是为了解决命名空间重复覆盖问题 【适用：主应用、子应用单独使用】
+var getLastKey = function getLastKey(prefix, key) {
+  return prefix ? "".concat(prefix, ":").concat(key) : "".concat(key);
+};
+// 存储/获取key 函数---如果没有channel，则使用主应用所属的业务应用编码作为前缀   【适用：主应用、子应用结合使用】
+var getLocalStorageSaveKey = function getLocalStorageSaveKey(key, channel) {
   var prefix = channel;
   // 传入channel 则使用传入的channel 作为前缀，一般存储key使用
   // 否则使用下面页面路径处理后的变量为前缀，一般获取key使用
   if (!channel) {
     var _window$top, _window$top$location;
     var channelPlat = (_window$top = window.top) === null || _window$top === void 0 ? void 0 : (_window$top$location = _window$top.location) === null || _window$top$location === void 0 ? void 0 : _window$top$location.pathname;
-    var defaultPrefix = 'CONFIG_PC';
     var mapping = ENUM.MAIN_AUTH_MAPPING;
-    prefix = channelPlat && (mapping === null || mapping === void 0 ? void 0 : mapping[channelPlat]) || defaultPrefix;
+    prefix = channelPlat && (mapping === null || mapping === void 0 ? void 0 : mapping[channelPlat]);
   }
-  return "".concat(prefix, ":").concat(ENUM.BROWSER_CACHE.MAIN_AUTH_CODES);
+  // 兼容旧版本
+  return getLastKey(prefix, key);
+};
+// 按钮资源权限集合  存储/获取key 函数
+var getMenuAuthDataKey = function getMenuAuthDataKey(channel) {
+  return getLocalStorageSaveKey(ENUM.BROWSER_CACHE.MAIN_AUTH_CODES, channel);
+};
+// 权限过滤后的菜单数据  存储/获取key 函数
+var getLimitMenuDataKey = function getLimitMenuDataKey(channel) {
+  return getLocalStorageSaveKey(ENUM.BROWSER_CACHE.LIMIT_MENU_DATA, channel);
 };
+/*******      公用localstorage结束      *****/
 
 var resposne$1 = JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.USER_INFO) || '{}');
 //--------赢家项目登录信息---------
@@ -2174,7 +2188,8 @@ var handleJudgeAuthButtons = function handleJudgeAuthButtons(buttonCodeArray, is
   var authButton = localStorage.getItem(getMenuAuthDataKey()) ? JSON.parse(localStorage.getItem(getMenuAuthDataKey())) : [];
   buttonCodeArray.forEach(function (item, index) {
     if (!authButton.filter(function (itemInner) {
-      return item.indexOf(itemInner) >= 0;
+      var _item$indexOf;
+      return (item === null || item === void 0 ? void 0 : (_item$indexOf = item.indexOf) === null || _item$indexOf === void 0 ? void 0 : _item$indexOf.call(item, itemInner)) >= 0;
     }).length) {
       if (buttonCodeArray.length > 1) {
         // @ts-ignore
@@ -13488,7 +13503,7 @@ var DetailWrapper = /*#__PURE__*/React$1.memo(function (_ref) {
   var basePath = window.top == window ? '' : "/".concat(itemPath);
   var menuRoutes = window.top == window ? ((_routes$find = routes.find(function (item) {
     return item.path === '/';
-  })) === null || _routes$find === void 0 ? void 0 : _routes$find.routes) || [] : JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.LIMIT_MENU_DATA) || '[]');
+  })) === null || _routes$find === void 0 ? void 0 : _routes$find.routes) || [] : JSON.parse(localStorage.getItem(getLimitMenuDataKey()) || '[]');
   var breadcrumbNameMap = getMainCrumbNameMap(memoizeOneFormatter(menuRoutes, ''));
   var matchParamsPath = function matchParamsPath(pathname, breadcrumbNameMap) {
     var pathKey = Object.keys(breadcrumbNameMap).find(function (key) {
@@ -13704,7 +13719,7 @@ var HeaderWrapper = /*#__PURE__*/React$1.memo(function (_ref) {
   var basePath = window.top == window ? '' : "/".concat(itemPath);
   var menuRoutes = window.top == window ? ((_routes$find = routes.find(function (item) {
     return item.path === '/';
-  })) === null || _routes$find === void 0 ? void 0 : _routes$find.routes) || [] : JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.LIMIT_MENU_DATA) || '[]');
+  })) === null || _routes$find === void 0 ? void 0 : _routes$find.routes) || [] : JSON.parse(localStorage.getItem(getLimitMenuDataKey()) || '[]');
   var breadcrumbNameMap = getMainCrumbNameMap(memoizeOneFormatter(menuRoutes, ''));
   var matchParamsPath = function matchParamsPath(pathname, breadcrumbNameMap) {
     var pathKey = Object.keys(breadcrumbNameMap).find(function (key) {
@@ -34232,4 +34247,4 @@ var index$8 = /*#__PURE__*/forwardRef(function (props, ref) {
   })));
 });
 
-export { AddSelect, AddSkcSelect, AddSkuSelect, AddSpuSelect, BillEntry, BsCascader, index$6 as BsLayout, BsSulaQueryTable, BusinessSearchSelect$1 as BusinessSearchSelect, BusinessTreeSearchSelect$1 as BusinessTreeSearchSelect, index$2 as CheckOneUser, ColumnSettingTable, ColumnsEdit, CommodityEntry, DataImport, DataValidation, index$4 as DetailPageWrapper, EllipsisTooltip, ExportIcon, GuideWrapper, HandleTotalCount, index$5 as HomePageWrapper, JsonQueryTable, index$7 as MoreTreeTable, QueryMutipleInput, RuleObjectComponent as RuleComponent, index$8 as RuleSetter, SearchSelect, index$3 as StateFlow, ColumnSettingSulaTable as SulaColumnSettingTable, TableColumnSetting, TreeSearchSelect, authFunc, calculateValidPeriod, checkQuantityAccuracy, createUniqID, downloadExcel, ergodicMenuRoutes, formatter, getAccountID, getAccountId, getBreadcrumbNameMap, getConfigTableColumns, getCurrentTargetBgId, getCurrentTenantId, getDictionarySource, getDictionaryTextByValue, getEmployeeCode, getEmployeeId, getItemDefaultWidth, getJoinDictionaryText, getMenuAuthDataKey, getSessionId, getSkuImg, getTenantList, getUserId, getUserName, go2BackAndClose, handleAntdColumnsSpecialParams, handleBaseUrlPre, handleBeforeUpload, handleBssulaColumnsSpecialParams, handleCommonTimeRender, handleError, handleExport, handleExportBarCode, handleJudgeAuthButtons, handleOssUrl, handleRequestAuthHeader, handleRequestUrl, handleStatusBadge, handleTextBreakSpaces, handleTextDouble, handleTextDoubleOrId, handleTextLineFeed, handleTextOverflow, handleTextTooltip, handleTextWarp, handleTextWarpCustom, handleTooltip, handleTooltipHours, handleUserPhone, judgeIsEmpty, judgeIsRequestError, judgeIsRequestSuccess, memoizeOneFormatter, noEmptyArr, paramsControl, precisionQuantity, randomString, removeCurrentTenantId, removeTenantList, renderFixed2, renderNumberText, saveCurrentTenantId, saveTenantList, setConfigTableColumns, socketFunctions, sulaTableRenderTooltip, tableColumnsImage, textIcon, updateGuanDate, userColumns, userInfoCard, uuid };
+export { AddSelect, AddSkcSelect, AddSkuSelect, AddSpuSelect, BillEntry, BsCascader, index$6 as BsLayout, BsSulaQueryTable, BusinessSearchSelect$1 as BusinessSearchSelect, BusinessTreeSearchSelect$1 as BusinessTreeSearchSelect, index$2 as CheckOneUser, ColumnSettingTable, ColumnsEdit, CommodityEntry, DataImport, DataValidation, index$4 as DetailPageWrapper, EllipsisTooltip, ExportIcon, GuideWrapper, HandleTotalCount, index$5 as HomePageWrapper, JsonQueryTable, index$7 as MoreTreeTable, QueryMutipleInput, RuleObjectComponent as RuleComponent, index$8 as RuleSetter, SearchSelect, index$3 as StateFlow, ColumnSettingSulaTable as SulaColumnSettingTable, TableColumnSetting, TreeSearchSelect, authFunc, calculateValidPeriod, checkQuantityAccuracy, createUniqID, downloadExcel, ergodicMenuRoutes, formatter, getAccountID, getAccountId, getBreadcrumbNameMap, getConfigTableColumns, getCurrentTargetBgId, getCurrentTenantId, getDictionarySource, getDictionaryTextByValue, getEmployeeCode, getEmployeeId, getItemDefaultWidth, getJoinDictionaryText, getLastKey, getLimitMenuDataKey, getLocalStorageSaveKey, getMenuAuthDataKey, getSessionId, getSkuImg, getTenantList, getUserId, getUserName, go2BackAndClose, handleAntdColumnsSpecialParams, handleBaseUrlPre, handleBeforeUpload, handleBssulaColumnsSpecialParams, handleCommonTimeRender, handleError, handleExport, handleExportBarCode, handleJudgeAuthButtons, handleOssUrl, handleRequestAuthHeader, handleRequestUrl, handleStatusBadge, handleTextBreakSpaces, handleTextDouble, handleTextDoubleOrId, handleTextLineFeed, handleTextOverflow, handleTextTooltip, handleTextWarp, handleTextWarpCustom, handleTooltip, handleTooltipHours, handleUserPhone, judgeIsEmpty, judgeIsRequestError, judgeIsRequestSuccess, memoizeOneFormatter, noEmptyArr, paramsControl, precisionQuantity, randomString, removeCurrentTenantId, removeTenantList, renderFixed2, renderNumberText, saveCurrentTenantId, saveTenantList, setConfigTableColumns, socketFunctions, sulaTableRenderTooltip, tableColumnsImage, textIcon, updateGuanDate, userColumns, userInfoCard, uuid };

package/dist/index.js

@@ -720,20 +720,34 @@ function handleUserPhone() {
 function getCurrentTargetBgId() {
   return localStorage.getItem('target_bg_id');
 }
-// 菜单按钮权限 存储/获取key 函数
-var getMenuAuthDataKey = function getMenuAuthDataKey(channel) {
+/*******      公用localstorage存取 开始      *****/
+// 获取存储的最终key--加前缀是为了解决命名空间重复覆盖问题 【适用：主应用、子应用单独使用】
+var getLastKey = function getLastKey(prefix, key) {
+  return prefix ? "".concat(prefix, ":").concat(key) : "".concat(key);
+};
+// 存储/获取key 函数---如果没有channel，则使用主应用所属的业务应用编码作为前缀   【适用：主应用、子应用结合使用】
+var getLocalStorageSaveKey = function getLocalStorageSaveKey(key, channel) {
   var prefix = channel;
   // 传入channel 则使用传入的channel 作为前缀，一般存储key使用
   // 否则使用下面页面路径处理后的变量为前缀，一般获取key使用
   if (!channel) {
     var _window$top, _window$top$location;
     var channelPlat = (_window$top = window.top) === null || _window$top === void 0 ? void 0 : (_window$top$location = _window$top.location) === null || _window$top$location === void 0 ? void 0 : _window$top$location.pathname;
-    var defaultPrefix = 'CONFIG_PC';
     var mapping = ENUM.MAIN_AUTH_MAPPING;
-    prefix = channelPlat && (mapping === null || mapping === void 0 ? void 0 : mapping[channelPlat]) || defaultPrefix;
+    prefix = channelPlat && (mapping === null || mapping === void 0 ? void 0 : mapping[channelPlat]);
   }
-  return "".concat(prefix, ":").concat(ENUM.BROWSER_CACHE.MAIN_AUTH_CODES);
+  // 兼容旧版本
+  return getLastKey(prefix, key);
+};
+// 按钮资源权限集合  存储/获取key 函数
+var getMenuAuthDataKey = function getMenuAuthDataKey(channel) {
+  return getLocalStorageSaveKey(ENUM.BROWSER_CACHE.MAIN_AUTH_CODES, channel);
+};
+// 权限过滤后的菜单数据  存储/获取key 函数
+var getLimitMenuDataKey = function getLimitMenuDataKey(channel) {
+  return getLocalStorageSaveKey(ENUM.BROWSER_CACHE.LIMIT_MENU_DATA, channel);
 };
+/*******      公用localstorage结束      *****/
 
 var resposne$1 = JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.USER_INFO) || '{}');
 //--------赢家项目登录信息---------
@@ -2196,7 +2210,8 @@ var handleJudgeAuthButtons = function handleJudgeAuthButtons(buttonCodeArray, is
   var authButton = localStorage.getItem(getMenuAuthDataKey()) ? JSON.parse(localStorage.getItem(getMenuAuthDataKey())) : [];
   buttonCodeArray.forEach(function (item, index) {
     if (!authButton.filter(function (itemInner) {
-      return item.indexOf(itemInner) >= 0;
+      var _item$indexOf;
+      return (item === null || item === void 0 ? void 0 : (_item$indexOf = item.indexOf) === null || _item$indexOf === void 0 ? void 0 : _item$indexOf.call(item, itemInner)) >= 0;
     }).length) {
       if (buttonCodeArray.length > 1) {
         // @ts-ignore
@@ -13510,7 +13525,7 @@ var DetailWrapper = /*#__PURE__*/React__default['default'].memo(function (_ref)
   var basePath = window.top == window ? '' : "/".concat(itemPath);
   var menuRoutes = window.top == window ? ((_routes$find = routes.find(function (item) {
     return item.path === '/';
-  })) === null || _routes$find === void 0 ? void 0 : _routes$find.routes) || [] : JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.LIMIT_MENU_DATA) || '[]');
+  })) === null || _routes$find === void 0 ? void 0 : _routes$find.routes) || [] : JSON.parse(localStorage.getItem(getLimitMenuDataKey()) || '[]');
   var breadcrumbNameMap = getMainCrumbNameMap(memoizeOneFormatter(menuRoutes, ''));
   var matchParamsPath = function matchParamsPath(pathname, breadcrumbNameMap) {
     var pathKey = Object.keys(breadcrumbNameMap).find(function (key) {
@@ -13726,7 +13741,7 @@ var HeaderWrapper = /*#__PURE__*/React__default['default'].memo(function (_ref)
   var basePath = window.top == window ? '' : "/".concat(itemPath);
   var menuRoutes = window.top == window ? ((_routes$find = routes.find(function (item) {
     return item.path === '/';
-  })) === null || _routes$find === void 0 ? void 0 : _routes$find.routes) || [] : JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.LIMIT_MENU_DATA) || '[]');
+  })) === null || _routes$find === void 0 ? void 0 : _routes$find.routes) || [] : JSON.parse(localStorage.getItem(getLimitMenuDataKey()) || '[]');
   var breadcrumbNameMap = getMainCrumbNameMap(memoizeOneFormatter(menuRoutes, ''));
   var matchParamsPath = function matchParamsPath(pathname, breadcrumbNameMap) {
     var pathKey = Object.keys(breadcrumbNameMap).find(function (key) {
@@ -34305,6 +34320,9 @@ exports.getEmployeeCode = getEmployeeCode;
 exports.getEmployeeId = getEmployeeId;
 exports.getItemDefaultWidth = getItemDefaultWidth;
 exports.getJoinDictionaryText = getJoinDictionaryText;
+exports.getLastKey = getLastKey;
+exports.getLimitMenuDataKey = getLimitMenuDataKey;
+exports.getLocalStorageSaveKey = getLocalStorageSaveKey;
 exports.getMenuAuthDataKey = getMenuAuthDataKey;
 exports.getSessionId = getSessionId;
 exports.getSkuImg = getSkuImg;

package/dist/utils/LocalstorageUtils.d.ts

@@ -15,4 +15,9 @@ export declare function getAccountID(): any;
 export declare function getUserName(): any;
 export declare function handleUserPhone(): any;
 export declare function getCurrentTargetBgId(): string | null;
+/*******      公用localstorage存取 开始      *****/
+export declare const getLastKey: (prefix: any, key: string) => string;
+export declare const getLocalStorageSaveKey: (key: string, channel?: string) => string;
 export declare const getMenuAuthDataKey: (channel?: string) => string;
+export declare const getLimitMenuDataKey: (channel?: string) => string;
+/*******      公用localstorage结束      *****/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "3.0.0-alpha.34",
+  "version": "3.0.0-alpha.35",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/DetailPageWrapper/index.tsx

@@ -17,7 +17,7 @@ import CommonAlert from '../CommonAlert';
 import ENUM from '@/utils/enumConfig';
 import { debounce } from 'lodash';
 import { useSize } from 'ahooks';
-import { getMenuAuthDataKey } from '@/utils/LocalstorageUtils';
+import { getMenuAuthDataKey, getLimitMenuDataKey } from '@/utils/LocalstorageUtils';
 
 interface actionItem {
   type?: string;
@@ -78,9 +78,7 @@ const DetailWrapper = React.memo(
     const menuRoutes =
       window.top == window
         ? routes.find((item) => item.path === '/')?.routes || []
-        : JSON.parse(
-            localStorage.getItem(ENUM.BROWSER_CACHE.LIMIT_MENU_DATA) || '[]',
-          );
+        : JSON.parse(localStorage.getItem(getLimitMenuDataKey()) || '[]');
 
     const breadcrumbNameMap = getMainCrumbNameMap(
       memoizeOneFormatter(menuRoutes, ''),

package/src/components/Business/HomePageWrapper/index.tsx

@@ -6,7 +6,7 @@ import { Breadcrumb, Space } from 'antd';
 import './index.less';
 import { useLocation, formatMessage } from 'umi';
 import CommonAlert from '../CommonAlert';
-import ENUM from '@/utils/enumConfig';
+import { getLimitMenuDataKey } from '@/utils/LocalstorageUtils'
 
 export default (props: any) => {
   const { pathname } = useLocation();
@@ -15,11 +15,11 @@ export default (props: any) => {
 
   return (
     <div id={id} className={'home_page_wrapper'}>
-      <HeaderWrapper 
+      <HeaderWrapper
         pathname={pathname}
         {
           ...restProps
-        } 
+        }
       />
       {props.children}
     </div>
@@ -27,9 +27,9 @@ export default (props: any) => {
 };
 
 const HeaderWrapper = React.memo(
-  ({ 
-    pathname, 
-    routes=[], 
+  ({
+    pathname,
+    routes=[],
     itemPath,
     alertProps,
     extra,
@@ -41,7 +41,7 @@ const HeaderWrapper = React.memo(
     const menuRoutes =
       window.top == window
         ? routes.find((item) => item.path === '/')?.routes || []
-        : JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.LIMIT_MENU_DATA) || '[]');
+        : JSON.parse(localStorage.getItem(getLimitMenuDataKey()) || '[]');
 
     const breadcrumbNameMap = getMainCrumbNameMap(
       memoizeOneFormatter(menuRoutes, ''),
@@ -133,7 +133,7 @@ const HeaderWrapper = React.memo(
             </Breadcrumb>
           </div>
           {
-            extra ? 
+            extra ?
             <Space>
               {
                 extra

package/src/utils/LocalstorageUtils.ts

@@ -94,18 +94,36 @@ export function getCurrentTargetBgId() {
   return localStorage.getItem('target_bg_id');
 }
 
-// 菜单按钮权限 存储/获取key 函数
-export const getMenuAuthDataKey = (channel?: string) => {
+/*******      公用localstorage存取 开始      *****/
+
+// 获取存储的最终key--加前缀是为了解决命名空间重复覆盖问题 【适用：主应用、子应用单独使用】
+export const getLastKey = (prefix: any,key: string) => {
+  return prefix ? `${prefix}:${key}` : `${key}`;
+}
+
+// 存储/获取key 函数---如果没有channel，则使用主应用所属的业务应用编码作为前缀   【适用：主应用、子应用结合使用】
+export const getLocalStorageSaveKey = (key: string,channel?: string) => {
   let prefix = channel
 
   // 传入channel 则使用传入的channel 作为前缀，一般存储key使用
   // 否则使用下面页面路径处理后的变量为前缀，一般获取key使用
   if(!channel) {
     const channelPlat: string | undefined = window.top?.location?.pathname
-    const defaultPrefix = 'CONFIG_PC';
     const mapping: any = ENUM.MAIN_AUTH_MAPPING;
-    prefix = channelPlat && mapping?.[channelPlat] || defaultPrefix
+    prefix = channelPlat && mapping?.[channelPlat]
   }
 
-  return `${prefix}:${ENUM.BROWSER_CACHE.MAIN_AUTH_CODES}`
+  // 兼容旧版本
+  return getLastKey(prefix,key);
+}
+
+// 按钮资源权限集合  存储/获取key 函数
+export const getMenuAuthDataKey = (channel?: string) => {
+  return getLocalStorageSaveKey(ENUM.BROWSER_CACHE.MAIN_AUTH_CODES, channel)
+}
+
+// 权限过滤后的菜单数据  存储/获取key 函数
+export const getLimitMenuDataKey = (channel?: string) => {
+  return getLocalStorageSaveKey(ENUM.BROWSER_CACHE.LIMIT_MENU_DATA, channel)
 }
+/*******      公用localstorage结束      *****/

package/src/utils/businessUtils.ts

@@ -232,7 +232,7 @@ const handleJudgeAuthButtons = (buttonCodeArray: any[], isAccess?: boolean) => {
     : [];
   buttonCodeArray.forEach((item: any, index: number) => {
     if (
-      !authButton.filter((itemInner: any) => item.indexOf(itemInner) >= 0)
+      !authButton.filter((itemInner: any) => item?.indexOf?.(itemInner) >= 0)
         .length
     ) {
       if (buttonCodeArray.length > 1) {