@bit-sun/business-component 2.4.27 → 2.4.29

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

@@ -1,105 +1,164 @@
-// @ts-nocheck
-import { request } from 'bssula';
-import { Modal } from 'antd';
-import { ExclamationCircleOutlined } from '@ant-design/icons';
-import React from 'react';
-import { history } from 'umi';
-import { handleError } from '@/utils/requestUtils';
-
-interface actionItem {
-  [propName: string]: any;
-}
-
-export const doDetailPageAction = (config: actionItem) => {
-  if (config?.type == 'modal') {
-    const { confirm } = Modal;
-    let requestConfig = {
-      url: config.url,
-      method: config.method,
-      params: config.params || {},
-      successMessage: config?.successMessage,
-    };
-
-
-    const onOk = () => {
-      return new Promise((resolve, reject) => { 
-        request(requestConfig).then((res) => {
-            resolve(res);
-            if (config.backPath) {
-              history.push({
-                pathname: config.backPath
-              })
-            }
-            // 是否执行成功之后的回调
-            if (typeof (config.successCb) === 'function') {
-              config.successCb(res);
-            }
-        }).catch(error => reject(error));
-      })
-    };
-
-    if (config.noConfirm) {
-      onOk();
-    } else {
-      confirm({
-        title: config.title,
-        icon: <ExclamationCircleOutlined />,
-        content: config.content,
-        okText: '确定',
-        okType: 'danger',
-        cancelText: '取消',
-        onOk,
-        onCancel() {
-          console.log('Cancel');
-        },
-      });
-    }
-  }
-}
-
-export const getBreadcrumbNameMap = (menuData) => {
-  const routerMap = {};
-
-  const flattenMenuData = (data) => {
-    data.forEach((menuItem) => {
-      if (menuItem.children) {
-        flattenMenuData(menuItem.children);
-      }
-      // Reduce memory usage
-      routerMap[menuItem.path] = menuItem;
-    });
-  };
-  flattenMenuData(menuData);
-  return routerMap;
-};
-
-export const judgeIsEmpty = (value: any) => {
-  if (value == null || value == undefined || String(value).trim() == '') {
-    return true;
-  }
-  return false;
-};
-
-export const getMainCrumbNameMap = (menuData) => {
-  const routerMap = {};
-
-  const flattenMenuData = (data, parent) => {
-    let pNameMap = parent.nameMap ? [...parent.nameMap] : [];
-    data.forEach((menuItem) => {
-      let newMenuItem = {
-        ...menuItem,
-        nameMap: [...pNameMap, menuItem.name]
-      }
-      if (newMenuItem.children) {
-        flattenMenuData(newMenuItem.children, newMenuItem);
-      }
-      
-      // Reduce memory usage
-      routerMap[menuItem.path] = {
-        ...newMenuItem,
-      };
-    });
-  };
-  flattenMenuData(menuData, {});
-  return routerMap;
-}
+// @ts-nocheck
+import { request } from 'bssula';
+import { Modal } from 'antd';
+import { ExclamationCircleOutlined } from '@ant-design/icons';
+import React from 'react';
+import { history } from 'umi';
+import { handleError } from '@/utils/requestUtils';
+
+interface actionItem {
+  [propName: string]: any;
+}
+
+export const doDetailPageAction = (config: actionItem) => {
+  if (config?.type == 'modal') {
+    const { confirm } = Modal;
+    let requestConfig = {
+      url: config.url,
+      method: config.method,
+      params: config.params || {},
+      successMessage: config?.successMessage,
+    };
+
+
+    const onOk = () => {
+      return new Promise((resolve, reject) => { 
+        request(requestConfig).then((res) => {
+            resolve(res);
+            if (config.backPath) {
+              history.push({
+                pathname: config.backPath
+              })
+            }
+            // 是否执行成功之后的回调
+            if (typeof (config.successCb) === 'function') {
+              config.successCb(res);
+            }
+        }).catch(error => reject(error));
+      })
+    };
+
+    if (config.noConfirm) {
+      onOk();
+    } else {
+      confirm({
+        title: config.title,
+        icon: <ExclamationCircleOutlined />,
+        content: config.content,
+        okText: '确定',
+        okType: 'danger',
+        cancelText: '取消',
+        onOk,
+        onCancel() {
+          console.log('Cancel');
+        },
+      });
+    }
+  }
+}
+
+export const getBreadcrumbNameMap = (menuData) => {
+  const routerMap = {};
+
+  const flattenMenuData = (data) => {
+    data.forEach((menuItem) => {
+      if (menuItem.children) {
+        flattenMenuData(menuItem.children);
+      }
+      // Reduce memory usage
+      routerMap[menuItem.path] = menuItem;
+    });
+  };
+  flattenMenuData(menuData);
+  return routerMap;
+};
+
+export const judgeIsEmpty = (value: any) => {
+  if (value == null || value == undefined || String(value).trim() == '') {
+    return true;
+  }
+  return false;
+};
+
+export const getMainCrumbNameMap = (menuData) => {
+  const routerMap = {};
+
+  const flattenMenuData = (data, parent) => {
+    let pNameMap = parent.nameMap ? [...parent.nameMap] : [];
+    data.forEach((menuItem) => {
+      let newMenuItem = {
+        ...menuItem,
+        nameMap: [...pNameMap, menuItem.name]
+      }
+      if (newMenuItem.children) {
+        flattenMenuData(newMenuItem.children, newMenuItem);
+      }
+
+      // Reduce memory usage
+      routerMap[menuItem.path] = {
+        ...newMenuItem,
+      };
+    });
+  };
+  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) {
+  // 检查是否为action路由
+  const actionMatch = path.match(/.*\/action\/.*/);
+  if (actionMatch) {
+    // 从hideRouteObj中进行全量匹配
+    const matchedRoute = hideRouteObj[path]
+    return matchedRoute ? matchedRoute : null; // 如果找到匹配的路由则返回，否则返回null
+  }
+
+  // 检查是否为特殊路由（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
+  }
+
+  // 如果都不匹配，返回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
+}

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

@@ -1,33 +1,33 @@
-.home_page_head {
-  height: 54px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  background-color: #FFFFFF;
-  border-bottom: 1px solid #f0f0f0;
-  padding: 0 20px;
-  .home_page_title {
-    height: 20px;
-    font-family: PingFangSC-Medium;
-    font-weight: 600;
-    font-size: 16px;
-    color: #000000;
-    letter-spacing: 0;
-    line-height: 20px;
-    flex-grow: 1;
-    margin-top: 2px;
-  }
-  .ant-breadcrumb {
-    display: block !important;
-    .ant-breadcrumb-separator {
-      margin: 0 2px;
-    }
-    li .bread_name {
-      
-      color: #8A8F8D;
-      font-size: 12px;
-      line-height: 16px;
-      cursor: pointer;
-    }
-  }
-}
+.home_page_head {
+  height: 54px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #FFFFFF;
+  border-bottom: 1px solid #f0f0f0;
+  padding: 0 20px;
+  .home_page_title {
+    height: 20px;
+    font-family: PingFangSC-Medium;
+    font-weight: 600;
+    font-size: 16px;
+    color: #000000;
+    letter-spacing: 0;
+    line-height: 20px;
+    flex-grow: 1;
+    margin-top: 2px;
+  }
+  .ant-breadcrumb {
+    display: block !important;
+    .ant-breadcrumb-separator {
+      margin: 0 2px;
+    }
+    li .bread_name {
+      
+      color: #8A8F8D;
+      font-size: 12px;
+      line-height: 16px;
+      cursor: pointer;
+    }
+  }
+}

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

@@ -1,45 +1,45 @@
----
-nav:
-  title: '组件'
-  order: 1
-group:
-  title: 业务组件
-  order: 1
-title: 标题组件
-order: 1
----
-
-# HomePageWrapper
-
-
-## 首页标题组件
-
-```tsx
-import { HomePageWrapper } from '../../../index.ts';
-import React, { useState } from 'react';
-
-export default () => {
-  const routes = [
-    {
-      path: '/',
-      name: 'welcome',
-      routes: [
-        {
-           path: '/components',
-           name: '组件',
-           routes: [
-            {
-              path: '/components/business/home-page-wrapper',
-              name: '标题组件',
-              component: 'aaa'
-            }
-           ]
-        }
-      ]
-    }
-  ]
-  return (
-    <HomePageWrapper routes={routes} />
-  );
-};
-```
+---
+nav:
+  title: '组件'
+  order: 1
+group:
+  title: 业务组件
+  order: 1
+title: 标题组件
+order: 1
+---
+
+# HomePageWrapper
+
+
+## 首页标题组件
+
+```tsx
+import { HomePageWrapper } from '../../../index.ts';
+import React, { useState } from 'react';
+
+export default () => {
+  const routes = [
+    {
+      path: '/',
+      name: 'welcome',
+      routes: [
+        {
+           path: '/components',
+           name: '组件',
+           routes: [
+            {
+              path: '/components/business/home-page-wrapper',
+              name: '标题组件',
+              component: 'aaa'
+            }
+           ]
+        }
+      ]
+    }
+  ]
+  return (
+    <HomePageWrapper routes={routes} />
+  );
+};
+```