@bit-sun/business-component 3.0.0-alpha.1 → 3.0.0-alpha.2

package/dist/components/Business/DetailPageWrapper/utils.d.ts

@@ -5,4 +5,7 @@ export declare const doDetailPageAction: (config: actionItem) => void;
 export declare const getBreadcrumbNameMap: (menuData: any) => {};
 export declare const judgeIsEmpty: (value: any) => boolean;
 export declare const getMainCrumbNameMap: (menuData: any) => {};
+export declare const getModeTypeText: (path: any) => "编辑" | "查看" | "新增" | "--";
+export declare function matchRoute(path: any, routeObj: any, hideRouteObj: any): any;
+export declare const getDetailMatchRoute: (path: any, routeObj: any, hideRouteArray: any) => any;
 export {};

package/dist/index.esm.js

@@ -12240,6 +12240,57 @@ var getMainCrumbNameMap = function getMainCrumbNameMap(menuData) {
   flattenMenuData(menuData, {});
   return routerMap;
 };
+// mode类型判断
+var getModeTypeText = function getModeTypeText(path) {
+  if (path.includes('edit')) {
+    return '编辑';
+  }
+  if (path.includes('view')) {
+    return '查看';
+  }
+  if (path.includes('create') || path.includes('add')) {
+    return '新增';
+  }
+  return '--';
+};
+function matchRoute(path, routeObj, hideRouteObj) {
+  // 检查是否为特殊路由（add/view/edit）
+  var specialMatch = path.match(/(.*)(\/add|\/create|\/view\/([^\/](.*))+|\/edit\/([^\/](.*))+)$/);
+  if (specialMatch) {
+    // 截取关键部分进行匹配
+    var basePath = specialMatch[1];
+    var matchedRoute = routeObj[basePath];
+    return matchedRoute ? matchedRoute : null; // 如果找到匹配的路由则返回，否则返回null
+  }
+  // 检查是否为action路由
+  var actionMatch = path.match(/.*\/action\/.*/);
+  if (actionMatch) {
+    // 从hideRouteObj中进行全量匹配
+    var _matchedRoute = hideRouteObj[path];
+    return _matchedRoute ? _matchedRoute : null; // 如果找到匹配的路由则返回，否则返回null
+  }
+  // 如果都不匹配，返回null
+  return null;
+}
+var getDetailMatchRoute = function getDetailMatchRoute(path, routeObj, hideRouteArray) {
+  var newPath = path.split('?')[0];
+  var hideRouteObj = _defineProperty({}, newPath, hideRouteArray.find(function (itemRoute) {
+    return pathToRegexp(itemRoute.path).test(newPath);
+  }));
+  var matchedRoute = matchRoute(newPath, routeObj, hideRouteObj);
+  if (matchedRoute) {
+    var modeTypeText = path.match(/.*\/action\/.*/) ? '' : getModeTypeText(path);
+    var detailName = matchedRoute.name + modeTypeText;
+    var listNameMap = (matchedRoute === null || matchedRoute === void 0 ? void 0 : matchedRoute.nameMap) || [];
+    listNameMap.pop();
+    return _objectSpread2(_objectSpread2({}, matchedRoute), {}, {
+      path: path,
+      name: detailName,
+      nameMap: listNameMap.concat([detailName])
+    });
+  }
+  return undefined;
+};
 
 var css_248z$b = ".detail_page_head {\n  height: 54px;\n  display: flex;\n  align-items: center;\n  background-color: #FFFFFF;\n  border-bottom: 1px solid #f0f0f0;\n}\n.detail_page_head .ant-breadcrumb {\n  display: block !important;\n}\n.detail_page_head .ant-breadcrumb .ant-breadcrumb-separator {\n  margin: 0 2px;\n}\n.detail_page_head .ant-breadcrumb li .bread_name {\n  color: #8A8F8D;\n  font-size: 12px;\n  cursor: pointer;\n}\n.detail_page_head .ant-breadcrumb li .bread_name:hover {\n  color: #000000d9;\n}\n.back_home_img_content {\n  display: inline-block;\n  height: 28px;\n  width: 28px;\n  border: 1px solid #BABABA;\n  margin: 0 12px 0 20px;\n  border-radius: 14px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  cursor: pointer;\n}\n.back_home_img_content .anticon-arrow-left {\n  color: #BABABA;\n}\n.back_home_img_content:hover {\n  background-color: #005CFF;\n  border: 1px solid #005CFF;\n}\n.back_home_img_content:hover .anticon-arrow-left {\n  color: #FFFFFF;\n}\n.detail_page_title_box {\n  flex-grow: 1;\n}\n.detail_page_title {\n  height: 20px;\n  font-family: PingFangSC;\n  font-weight: 600;\n  font-size: 16px;\n  margin-top: 2px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 20px;\n}\n.detail_page_btns {\n  display: flex;\n  gap: 8px;\n  margin-right: 20px;\n}\n.detail_page_btns button {\n  height: 32px !important;\n  display: flex;\n  align-items: center;\n  gap: 2px;\n  border-radius: 3px;\n  padding: 0 10px;\n}\n.detail_page_btns .ant-btn-dangerous {\n  background-color: #EC5246 !important;\n}\n";
 styleInject(css_248z$b);
@@ -12349,7 +12400,7 @@ var DetailWrapper = /*#__PURE__*/React.memo(function (_ref) {
     return pathKey ? breadcrumbNameMap[pathKey] : undefined;
   };
   var getPageTitle = function getPageTitle(pathname) {
-    var currRouterData = matchParamsPath("".concat(basePath).concat(pathname), breadcrumbNameMap);
+    var currRouterData = matchParamsPath("".concat(basePath).concat(pathname), breadcrumbNameMap) || getDetailMatchRoute("".concat(basePath).concat(pathname), breadcrumbNameMap, []);
     if (!currRouterData) {
       return '';
     }

package/dist/index.js

@@ -12262,6 +12262,57 @@ var getMainCrumbNameMap = function getMainCrumbNameMap(menuData) {
   flattenMenuData(menuData, {});
   return routerMap;
 };
+// mode类型判断
+var getModeTypeText = function getModeTypeText(path) {
+  if (path.includes('edit')) {
+    return '编辑';
+  }
+  if (path.includes('view')) {
+    return '查看';
+  }
+  if (path.includes('create') || path.includes('add')) {
+    return '新增';
+  }
+  return '--';
+};
+function matchRoute(path, routeObj, hideRouteObj) {
+  // 检查是否为特殊路由（add/view/edit）
+  var specialMatch = path.match(/(.*)(\/add|\/create|\/view\/([^\/](.*))+|\/edit\/([^\/](.*))+)$/);
+  if (specialMatch) {
+    // 截取关键部分进行匹配
+    var basePath = specialMatch[1];
+    var matchedRoute = routeObj[basePath];
+    return matchedRoute ? matchedRoute : null; // 如果找到匹配的路由则返回，否则返回null
+  }
+  // 检查是否为action路由
+  var actionMatch = path.match(/.*\/action\/.*/);
+  if (actionMatch) {
+    // 从hideRouteObj中进行全量匹配
+    var _matchedRoute = hideRouteObj[path];
+    return _matchedRoute ? _matchedRoute : null; // 如果找到匹配的路由则返回，否则返回null
+  }
+  // 如果都不匹配，返回null
+  return null;
+}
+var getDetailMatchRoute = function getDetailMatchRoute(path, routeObj, hideRouteArray) {
+  var newPath = path.split('?')[0];
+  var hideRouteObj = _defineProperty({}, newPath, hideRouteArray.find(function (itemRoute) {
+    return pathToRegexp(itemRoute.path).test(newPath);
+  }));
+  var matchedRoute = matchRoute(newPath, routeObj, hideRouteObj);
+  if (matchedRoute) {
+    var modeTypeText = path.match(/.*\/action\/.*/) ? '' : getModeTypeText(path);
+    var detailName = matchedRoute.name + modeTypeText;
+    var listNameMap = (matchedRoute === null || matchedRoute === void 0 ? void 0 : matchedRoute.nameMap) || [];
+    listNameMap.pop();
+    return _objectSpread2(_objectSpread2({}, matchedRoute), {}, {
+      path: path,
+      name: detailName,
+      nameMap: listNameMap.concat([detailName])
+    });
+  }
+  return undefined;
+};
 
 var css_248z$b = ".detail_page_head {\n  height: 54px;\n  display: flex;\n  align-items: center;\n  background-color: #FFFFFF;\n  border-bottom: 1px solid #f0f0f0;\n}\n.detail_page_head .ant-breadcrumb {\n  display: block !important;\n}\n.detail_page_head .ant-breadcrumb .ant-breadcrumb-separator {\n  margin: 0 2px;\n}\n.detail_page_head .ant-breadcrumb li .bread_name {\n  color: #8A8F8D;\n  font-size: 12px;\n  cursor: pointer;\n}\n.detail_page_head .ant-breadcrumb li .bread_name:hover {\n  color: #000000d9;\n}\n.back_home_img_content {\n  display: inline-block;\n  height: 28px;\n  width: 28px;\n  border: 1px solid #BABABA;\n  margin: 0 12px 0 20px;\n  border-radius: 14px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  cursor: pointer;\n}\n.back_home_img_content .anticon-arrow-left {\n  color: #BABABA;\n}\n.back_home_img_content:hover {\n  background-color: #005CFF;\n  border: 1px solid #005CFF;\n}\n.back_home_img_content:hover .anticon-arrow-left {\n  color: #FFFFFF;\n}\n.detail_page_title_box {\n  flex-grow: 1;\n}\n.detail_page_title {\n  height: 20px;\n  font-family: PingFangSC;\n  font-weight: 600;\n  font-size: 16px;\n  margin-top: 2px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 20px;\n}\n.detail_page_btns {\n  display: flex;\n  gap: 8px;\n  margin-right: 20px;\n}\n.detail_page_btns button {\n  height: 32px !important;\n  display: flex;\n  align-items: center;\n  gap: 2px;\n  border-radius: 3px;\n  padding: 0 10px;\n}\n.detail_page_btns .ant-btn-dangerous {\n  background-color: #EC5246 !important;\n}\n";
 styleInject(css_248z$b);
@@ -12371,7 +12422,7 @@ var DetailWrapper = /*#__PURE__*/React__default['default'].memo(function (_ref)
     return pathKey ? breadcrumbNameMap[pathKey] : undefined;
   };
   var getPageTitle = function getPageTitle(pathname) {
-    var currRouterData = matchParamsPath("".concat(basePath).concat(pathname), breadcrumbNameMap);
+    var currRouterData = matchParamsPath("".concat(basePath).concat(pathname), breadcrumbNameMap) || getDetailMatchRoute("".concat(basePath).concat(pathname), breadcrumbNameMap, []);
     if (!currRouterData) {
       return '';
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "3.0.0-alpha.1",
+  "version": "3.0.0-alpha.2",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -28,8 +28,8 @@
   },
   "peerDependencies": {
     "antd": "^4.17.2",
-    "bssula": "3.0.0-alpha.1",
-    "umi-plugin-bssula": "3.0.0-alpha.1",
+    "bssula": "3.0.0-y.0",
+    "umi-plugin-bssula": "3.0.0-y.0",
     "umi": "^3.5.20",
     "@ant-design/pro-layout": "^6.5.0",
     "react-dnd": "^16.0.1",

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

@@ -5,7 +5,7 @@ import {
 import { Anchor, Tooltip, Button, Menu, Dropdown, Breadcrumb } from 'antd';
 import React, { useEffect, useState, useMemo } from 'react';
 import { history } from 'umi';
-import { getMainCrumbNameMap, doDetailPageAction, judgeIsEmpty } from './utils';
+import { getMainCrumbNameMap, doDetailPageAction, judgeIsEmpty, getDetailMatchRoute } from './utils';
 import { memoizeOneFormatter, go2BackAndClose } from '@/utils/utils';
 import './index.less';
 import quanping from '../../../assets/icon-quanping.svg';
@@ -89,7 +89,7 @@ const DetailWrapper = React.memo(
       const currRouterData = matchParamsPath(
         `${basePath}${pathname}`,
         breadcrumbNameMap,
-      );
+      ) || getDetailMatchRoute(`${basePath}${pathname}`,breadcrumbNameMap,[]);
 
       if (!currRouterData) {
         return '';

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

@@ -98,4 +98,63 @@ export const getMainCrumbNameMap = (menuData) => {
   };
   flattenMenuData(menuData, {});
   return routerMap;
-}
+}
+
+
+// mode类型判断
+export const getModeTypeText = (path: any) => {
+  if (path.includes('edit')) {
+    return '编辑';
+  }
+  if (path.includes('view')) {
+    return '查看';
+  }
+  if (path.includes('create') || path.includes('add')) {
+    return '新增';
+  }
+  return '--';
+};
+
+export function matchRoute(path, routeObj, hideRouteObj) {
+  // 检查是否为特殊路由（add/view/edit）
+  const specialMatch = path.match(/(.*)(\/add|\/create|\/view\/([^\/](.*))+|\/edit\/([^\/](.*))+)$/);
+
+  if (specialMatch) {
+    // 截取关键部分进行匹配
+    const basePath = specialMatch[1];
+    const matchedRoute = routeObj[basePath];
+    return matchedRoute ? matchedRoute : null; // 如果找到匹配的路由则返回，否则返回null
+  }
+
+  // 检查是否为action路由
+  const actionMatch = path.match(/.*\/action\/.*/);
+  if (actionMatch) {
+    // 从hideRouteObj中进行全量匹配
+    const matchedRoute = hideRouteObj[path]
+    return matchedRoute ? matchedRoute : null; // 如果找到匹配的路由则返回，否则返回null
+  }
+
+  // 如果都不匹配，返回null
+  return null;
+}
+
+export const getDetailMatchRoute = (path, routeObj, hideRouteArray) => {
+  const newPath = path.split('?')[0]
+  const hideRouteObj = {
+    [newPath]: hideRouteArray.find((itemRoute) => pathToRegexp(itemRoute.path).test(newPath))
+  }
+  const matchedRoute = matchRoute(newPath, routeObj, hideRouteObj);
+  if (matchedRoute) {
+    const modeTypeText = path.match(/.*\/action\/.*/) ? '' : getModeTypeText(path);
+    const detailName = matchedRoute.name + modeTypeText;
+    const listNameMap = matchedRoute?.nameMap||[];
+    listNameMap.pop()
+    return {
+      ...matchedRoute,
+      path,
+      name: detailName,
+      nameMap: listNameMap.concat([detailName])
+    };
+  }
+  return undefined
+}