@bit-sun/business-component 2.4.31-alpha.0 → 2.4.31-alpha.2

package/dist/index.esm.js

@@ -16512,8 +16512,47 @@ var NoFoundPage = function NoFoundPage(props) {
 
 var _excluded$g = ["route"];
 var TabPane = Tabs.TabPane;
+var getId = function getId(str) {
+  // 找到最后一个 / 的位置
+  var lastSlashIndex = str.lastIndexOf("/");
+  // 如果找到了 /，则返回它后面的部分
+  if (lastSlashIndex !== -1) {
+    return str.substring(lastSlashIndex + 1);
+  } else {
+    // 如果没有找到 /，则返回整个字符串
+    return null;
+  }
+};
+// 获取权限菜单path&通用单据id
+var getAuthMenuPathAndDocsId = function getAuthMenuPathAndDocsId(pathToRegexp) {
+  var limitedMenuData = localStorage.getItem(getLimitMenuDataKey()) ? JSON.parse(localStorage.getItem(getLimitMenuDataKey())) : [];
+  var menuKeys = [];
+  var docsId = [];
+  var getLimitedMenuKeys = function getLimitedMenuKeys(data) {
+    data.forEach(function (item) {
+      if (item.children && item.children.length > 0) {
+        getLimitedMenuKeys(item.children);
+      } else {
+        var originPath = item.path.replace(/^\/\w+\//, '/');
+        menuKeys.push(originPath);
+        if (pathToRegexp('/operation-and-maintenance-center/configuration-management/all-general-documents-specific/:id').test(originPath)) {
+          getId(originPath) && docsId.push(getId(originPath));
+        }
+      }
+    });
+  };
+  try {
+    getLimitedMenuKeys(limitedMenuData);
+  } catch (e) {}
+  return {
+    menuKeys: menuKeys,
+    docsId: docsId
+  };
+};
 var UN_LISTTEN_DRP;
 var routerArray = [];
+var authMenuPathList = [];
+var docsId = [];
 var lastTwoRouterArray = [1, 2];
 var type = 'DraggableTabNode';
 var DraggableTabNode = function DraggableTabNode(_ref) {
@@ -16706,6 +16745,7 @@ var ItemMenu = function ItemMenu(props) {
 };
 var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
   function BasicLayout(props) {
+    var _getAuthMenuPathAndDo, _getAuthMenuPathAndDo2;
     var _this;
     _classCallCheck(this, BasicLayout);
     _this = _callSuper(this, BasicLayout, [props]);
@@ -16722,29 +16762,26 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
       return queryString;
     };
     _this.updateTree = function (Tree) {
+      var authMenuKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
       var treeData = Tree;
       var treeList = [];
-      var limitedMenuData = localStorage.getItem(getLimitMenuDataKey()) ? JSON.parse(localStorage.getItem(getLimitMenuDataKey())) : [];
-      var menuKeys = [];
-      var getLimitedMenuKeys = function getLimitedMenuKeys(data) {
-        data.forEach(function (item) {
-          if (item.children && item.children.length > 0) {
-            getLimitedMenuKeys(item.children);
-          } else {
-            menuKeys.push(item.path.replace(/^\/\w+\//, '/'));
-          }
+      // 是否为权限菜单路径
+      var getLimitedMenuPath = function getLimitedMenuPath(node) {
+        return authMenuKeys.some(function (item) {
+          return (node.path || '').includes(item);
         });
       };
-      getLimitedMenuKeys(limitedMenuData);
+      // 是否为通用单据菜单路径
+      var getGenerateDocs = function getGenerateDocs(node) {
+        return (node.path || '').includes('all-general-documents');
+      };
       // 递归获取树列表
       var getTreeList = function getTreeList(data) {
         data.forEach(function (node) {
           if (node.routes && node.routes.length > 0) {
             getTreeList(node.routes);
           } else {
-            if (node.path === '/' || menuKeys.some(function (item) {
-              return (node.path || '').includes(item);
-            })) {
+            if (node.path === '/' || getLimitedMenuPath(node) || getGenerateDocs(node)) {
               treeList.push({
                 tab: node.locale,
                 key: node.path,
@@ -17097,7 +17134,9 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         });
       }
     };
-    routerArray = _this.updateTree(props.route.routes);
+    authMenuPathList = ((_getAuthMenuPathAndDo = getAuthMenuPathAndDocsId(props.pathToRegexp)) === null || _getAuthMenuPathAndDo === void 0 ? void 0 : _getAuthMenuPathAndDo.menuKeys) || [];
+    docsId = ((_getAuthMenuPathAndDo2 = getAuthMenuPathAndDocsId(props.pathToRegexp)) === null || _getAuthMenuPathAndDo2 === void 0 ? void 0 : _getAuthMenuPathAndDo2.docsId) || [];
+    routerArray = _this.updateTree(props.route.routes, authMenuPathList);
     var homeRouter = routerArray.filter(function (itemroute) {
       return itemroute.key === '/';
     })[0];
@@ -17198,6 +17237,12 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         var newListenRouterState = _toConsumableArray(listenRouterState);
         var newListenRouterKey = _toConsumableArray(listenRouterKey);
         var replaceRouter = routerArray.filter(function (itemRoute) {
+          var _route$pathname;
+          if ((_route$pathname = route.pathname) === null || _route$pathname === void 0 ? void 0 : _route$pathname.includes('all-general-documents')) {
+            return pathToRegexp(itemRoute.key || '').test(route.pathname) && docsId.some(function (item) {
+              return route.pathname.includes(item);
+            });
+          }
           return pathToRegexp(itemRoute.key || '').test(route.pathname);
         })[0];
         var currentKey = '';

package/dist/index.js

@@ -16532,8 +16532,47 @@ var NoFoundPage = function NoFoundPage(props) {
 
 var _excluded$g = ["route"];
 var TabPane = antd.Tabs.TabPane;
+var getId = function getId(str) {
+  // 找到最后一个 / 的位置
+  var lastSlashIndex = str.lastIndexOf("/");
+  // 如果找到了 /，则返回它后面的部分
+  if (lastSlashIndex !== -1) {
+    return str.substring(lastSlashIndex + 1);
+  } else {
+    // 如果没有找到 /，则返回整个字符串
+    return null;
+  }
+};
+// 获取权限菜单path&通用单据id
+var getAuthMenuPathAndDocsId = function getAuthMenuPathAndDocsId(pathToRegexp) {
+  var limitedMenuData = localStorage.getItem(getLimitMenuDataKey()) ? JSON.parse(localStorage.getItem(getLimitMenuDataKey())) : [];
+  var menuKeys = [];
+  var docsId = [];
+  var getLimitedMenuKeys = function getLimitedMenuKeys(data) {
+    data.forEach(function (item) {
+      if (item.children && item.children.length > 0) {
+        getLimitedMenuKeys(item.children);
+      } else {
+        var originPath = item.path.replace(/^\/\w+\//, '/');
+        menuKeys.push(originPath);
+        if (pathToRegexp('/operation-and-maintenance-center/configuration-management/all-general-documents-specific/:id').test(originPath)) {
+          getId(originPath) && docsId.push(getId(originPath));
+        }
+      }
+    });
+  };
+  try {
+    getLimitedMenuKeys(limitedMenuData);
+  } catch (e) {}
+  return {
+    menuKeys: menuKeys,
+    docsId: docsId
+  };
+};
 var UN_LISTTEN_DRP;
 var routerArray = [];
+var authMenuPathList = [];
+var docsId = [];
 var lastTwoRouterArray = [1, 2];
 var type = 'DraggableTabNode';
 var DraggableTabNode = function DraggableTabNode(_ref) {
@@ -16726,6 +16765,7 @@ var ItemMenu = function ItemMenu(props) {
 };
 var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
   function BasicLayout(props) {
+    var _getAuthMenuPathAndDo, _getAuthMenuPathAndDo2;
     var _this;
     _classCallCheck(this, BasicLayout);
     _this = _callSuper(this, BasicLayout, [props]);
@@ -16742,29 +16782,26 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
       return queryString;
     };
     _this.updateTree = function (Tree) {
+      var authMenuKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
       var treeData = Tree;
       var treeList = [];
-      var limitedMenuData = localStorage.getItem(getLimitMenuDataKey()) ? JSON.parse(localStorage.getItem(getLimitMenuDataKey())) : [];
-      var menuKeys = [];
-      var getLimitedMenuKeys = function getLimitedMenuKeys(data) {
-        data.forEach(function (item) {
-          if (item.children && item.children.length > 0) {
-            getLimitedMenuKeys(item.children);
-          } else {
-            menuKeys.push(item.path.replace(/^\/\w+\//, '/'));
-          }
+      // 是否为权限菜单路径
+      var getLimitedMenuPath = function getLimitedMenuPath(node) {
+        return authMenuKeys.some(function (item) {
+          return (node.path || '').includes(item);
         });
       };
-      getLimitedMenuKeys(limitedMenuData);
+      // 是否为通用单据菜单路径
+      var getGenerateDocs = function getGenerateDocs(node) {
+        return (node.path || '').includes('all-general-documents');
+      };
       // 递归获取树列表
       var getTreeList = function getTreeList(data) {
         data.forEach(function (node) {
           if (node.routes && node.routes.length > 0) {
             getTreeList(node.routes);
           } else {
-            if (node.path === '/' || menuKeys.some(function (item) {
-              return (node.path || '').includes(item);
-            })) {
+            if (node.path === '/' || getLimitedMenuPath(node) || getGenerateDocs(node)) {
               treeList.push({
                 tab: node.locale,
                 key: node.path,
@@ -17117,7 +17154,9 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         });
       }
     };
-    routerArray = _this.updateTree(props.route.routes);
+    authMenuPathList = ((_getAuthMenuPathAndDo = getAuthMenuPathAndDocsId(props.pathToRegexp)) === null || _getAuthMenuPathAndDo === void 0 ? void 0 : _getAuthMenuPathAndDo.menuKeys) || [];
+    docsId = ((_getAuthMenuPathAndDo2 = getAuthMenuPathAndDocsId(props.pathToRegexp)) === null || _getAuthMenuPathAndDo2 === void 0 ? void 0 : _getAuthMenuPathAndDo2.docsId) || [];
+    routerArray = _this.updateTree(props.route.routes, authMenuPathList);
     var homeRouter = routerArray.filter(function (itemroute) {
       return itemroute.key === '/';
     })[0];
@@ -17218,6 +17257,12 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         var newListenRouterState = _toConsumableArray(listenRouterState);
         var newListenRouterKey = _toConsumableArray(listenRouterKey);
         var replaceRouter = routerArray.filter(function (itemRoute) {
+          var _route$pathname;
+          if ((_route$pathname = route.pathname) === null || _route$pathname === void 0 ? void 0 : _route$pathname.includes('all-general-documents')) {
+            return pathToRegexp(itemRoute.key || '').test(route.pathname) && docsId.some(function (item) {
+              return route.pathname.includes(item);
+            });
+          }
           return pathToRegexp(itemRoute.key || '').test(route.pathname);
         })[0];
         var currentKey = '';

package/package.json

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

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

@@ -64,6 +64,43 @@ export type BasicLayoutContext = { [K in 'location']: BasicLayoutProps[K] } & {
   breadcrumbNameMap: Record<string, MenuDataItem>;
 };
 
+const getId = (str) => {
+  // 找到最后一个 / 的位置
+  var lastSlashIndex = str.lastIndexOf("/");
+
+  // 如果找到了 /，则返回它后面的部分
+  if (lastSlashIndex !== -1) {
+    return str.substring(lastSlashIndex + 1);
+  } else {
+    // 如果没有找到 /，则返回整个字符串
+    return null;
+  }
+}
+
+// 获取权限菜单path&通用单据id
+const getAuthMenuPathAndDocsId = (pathToRegexp) => {
+  const limitedMenuData = localStorage.getItem(getLimitMenuDataKey()) ? JSON.parse(localStorage.getItem(getLimitMenuDataKey())) : [];
+  const menuKeys = [];
+  const docsId = [];
+  const getLimitedMenuKeys = (data) => {
+    data.forEach((item) => {
+      if (item.children && item.children.length > 0) {
+        getLimitedMenuKeys(item.children);
+      } else {
+        const originPath = item.path.replace(/^\/\w+\//, '/');
+        menuKeys.push(originPath);
+        if (pathToRegexp('/operation-and-maintenance-center/configuration-management/all-general-documents-specific/:id').test(originPath)) {
+         getId(originPath) && docsId.push(getId(originPath))
+        }
+      }
+    });
+  };
+  try {
+    getLimitedMenuKeys(limitedMenuData);
+  } catch(e) {}
+  return {menuKeys, docsId};
+}
+
 const menuDataRender = (menuList: MenuDataItem[]): MenuDataItem[] =>
   menuList.map((item) => {
     return {
@@ -74,6 +111,8 @@ const menuDataRender = (menuList: MenuDataItem[]): MenuDataItem[] =>
 
 let UN_LISTTEN_DRP;
 let routerArray = [];
+let authMenuPathList = [];
+let docsId = [];
 let lastTwoRouterArray = [1, 2];
 
 let draggerTabKeys = [];
@@ -289,7 +328,9 @@ class BasicLayout extends React.PureComponent {
   }>();
   constructor(props) {
     super(props);
-    routerArray = this.updateTree(props.route.routes);
+    authMenuPathList = getAuthMenuPathAndDocsId(props.pathToRegexp)?.menuKeys || [];
+    docsId = getAuthMenuPathAndDocsId(props.pathToRegexp)?.docsId || [];
+    routerArray = this.updateTree(props.route.routes, authMenuPathList);
     const homeRouter = routerArray.filter(
       (itemroute) => itemroute.key === '/',
     )[0];
@@ -393,9 +434,12 @@ class BasicLayout extends React.PureComponent {
       let newListenRouterState = [...listenRouterState];
       let newListenRouterKey = [...listenRouterKey];
 
-      let replaceRouter = routerArray.filter((itemRoute) =>
-        pathToRegexp(itemRoute.key || '').test(route.pathname),
-      )[0];
+      let replaceRouter = routerArray.filter((itemRoute) => {
+        if (route.pathname?.includes('all-general-documents')) {
+          return pathToRegexp(itemRoute.key || '').test(route.pathname) && docsId.some(item => route.pathname.includes(item));
+        }
+        return  pathToRegexp(itemRoute.key || '').test(route.pathname);
+      })[0];
 
       let currentKey = '';
 
@@ -541,23 +585,21 @@ class BasicLayout extends React.PureComponent {
     return queryString;
   };
 
-  updateTree = (Tree) => {
+  updateTree = (Tree, authMenuKeys = []) => {
     const treeData = Tree;
     const treeList = [];
 
-    const limitedMenuData = localStorage.getItem(getLimitMenuDataKey()) ? JSON.parse(localStorage.getItem(getLimitMenuDataKey())) : [];
-    
-    const menuKeys = [];
-    const getLimitedMenuKeys = (data) => {
-      data.forEach((item) => {
-        if (item.children && item.children.length > 0) {
-          getLimitedMenuKeys(item.children);
-        } else {
-          menuKeys.push(item.path.replace(/^\/\w+\//, '/'));
-        }
-      });
-    };
-    getLimitedMenuKeys(limitedMenuData);
+   
+
+    // 是否为权限菜单路径
+    const getLimitedMenuPath = (node) => {
+      return authMenuKeys.some(item => (node.path || '').includes(item));
+    }
+
+    // 是否为通用单据菜单路径
+    const getGenerateDocs = (node) => {
+      return (node.path || '').includes('all-general-documents');
+    }
 
     // 递归获取树列表
     const getTreeList = (data) => {
@@ -565,7 +607,7 @@ class BasicLayout extends React.PureComponent {
         if (node.routes && node.routes.length > 0) {
           getTreeList(node.routes);
         } else {
-          if (node.path === '/' || menuKeys.some(item => (node.path || '').includes(item))) {
+          if (node.path === '/' || getLimitedMenuPath(node) || getGenerateDocs(node)) {
             treeList.push({
               tab: node.locale,
               key: node.path,