@ccs-ui/rc-pro 2.3.4 → 2.3.5

package/es/dialog/button.d.ts

@@ -16,7 +16,7 @@ export type DialogButtonsProps<T> = Pick<CcsDialogModalProps, 'okText' | 'onClos
 export type DialogButtonRef = {
     onSetButtons: (e: React.ReactElement) => void;
 };
-export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "auth" | "request" | "onClose" | "onOk" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
+export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "auth" | "onClose" | "onOk" | "extraBtn" | "request" | "requestFieldNames" | "preventRequestHandle"> & {
     formRef: React.RefObject<DialogFormRef<TParams>>;
     formInitialValues: FormProps['initialValues'];
     buttonRef: RefObject<DialogButtonRef>;

package/es/layout-keep-alive/index.d.ts

@@ -1,15 +1,8 @@
+import { BreadcrumbProps } from 'antd';
 import { JSXElementConstructor, ReactElement } from 'react';
 import CCS from '..';
 import { MenuType } from '../ccs';
 import './index.less';
-type LayoutMenuType = CCS.MenuType & {
-    /** 面包屑数据 */
-    breadcrumb?: {
-        key: any;
-        title: string;
-        href?: string;
-    }[];
-};
 export type CacheComponent = {
     key: string;
     label: string;
@@ -18,7 +11,7 @@ export type CacheComponent = {
     timestamp: number;
     outlet: ReactElement<any, string | JSXElementConstructor<any>> | null;
     children?: ReactElement<any, string | JSXElementConstructor<any>> | null;
-    breadcrumb: LayoutMenuType['breadcrumb'];
+    breadcrumb: BreadcrumbProps['items'];
 };
 type PropsType = {
     maxLen?: number;

package/es/layout-keep-alive/index.js

@@ -23,7 +23,6 @@ import { useMemo, useRef } from 'react';
 import { useLocation } from 'react-router';
 import { useOutlet } from 'react-router-dom';
 import { useAppConfig } from '..';
-import CcsBreadcrumb from "../breadcrumb";
 import "./index.less";
 import Page from "./page";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -221,17 +220,15 @@ export default function KeepAliveTabs(_ref) {
     if (menu) saveHistory();
 
     // 面包屑数据
-    var breadcrumb = menus.map(function (m, index) {
+    var breadcrumb = menus.map(function (m) {
       return {
         key: m.key,
-        title: m.label,
-        href: index !== menus.length - 1 ? m.url : undefined
+        title: m.label
       };
     });
     breadcrumb.unshift({
       key: '-1',
-      title: '首页',
-      href: '/'
+      title: '首页'
     });
     return _objectSpread(_objectSpread({}, menu), {}, {
       breadcrumb: breadcrumb
@@ -344,11 +341,7 @@ export default function KeepAliveTabs(_ref) {
         onDestroy: onDestroy,
         urlAuthList: urlAuthList,
         timestamp: timestamp,
-        breadcrumbNode: /*#__PURE__*/_jsx(CcsBreadcrumb, {
-          history: history,
-          className: "ccs-breadcrumb",
-          items: breadcrumb
-        }),
+        breadcrumb: breadcrumb,
         children: outlet
       }, key);
     })]

package/es/layout-keep-alive/page.d.ts

@@ -1,13 +1,11 @@
-import { ReactNode } from 'react';
+/// <reference types="react" />
 import { Location } from 'react-router';
 import { CacheComponent } from '.';
-export type CachePageProps = Pick<CacheComponent, 'urlAuthList' | 'children' | 'timestamp'> & {
+export type CachePageProps = Pick<CacheComponent, 'breadcrumb' | 'urlAuthList' | 'children' | 'timestamp'> & {
     /** 选中状态 */
     active: boolean;
     /** router location */
     location: Location;
-    /** 面包屑 */
-    breadcrumbNode: ReactNode;
     /** 销毁页面 */
     onDestroy: (path: string) => void;
 };

package/es/layout-keep-alive/page.js

@@ -1,3 +1,4 @@
+import { Breadcrumb } from 'antd';
 import classNames from 'classnames';
 import { memo, useRef } from 'react';
 import Scrollbars from 'react-custom-scrollbars';
@@ -11,7 +12,7 @@ export default /*#__PURE__*/memo(function (props) {
     active = props.active,
     urlAuthList = props.urlAuthList,
     onDestroy = props.onDestroy,
-    breadcrumbNode = props.breadcrumbNode;
+    breadcrumb = props.breadcrumb;
   var id = "_tab_content_".concat(locationRef.current.key);
   var dialogHolderRef = useRef(null);
   return /*#__PURE__*/_jsx(PageContext.Provider, {
@@ -37,7 +38,10 @@ export default /*#__PURE__*/memo(function (props) {
         className: classNames('ccs-sticky-scroll', {
           'route-avtive': active
         }),
-        children: [breadcrumbNode, children, /*#__PURE__*/_jsx(DialogElementsHolder, {
+        children: [/*#__PURE__*/_jsx(Breadcrumb, {
+          items: breadcrumb,
+          className: "ccs-breadcrumb"
+        }), children, /*#__PURE__*/_jsx(DialogElementsHolder, {
           ref: dialogHolderRef
         }, "modal-drawer-holder")]
       })

package/es/layout-single-page/index.d.ts

@@ -4,7 +4,6 @@ type PropsType = {
     appName: string;
     menuItems: CCS.MenuType[];
     className?: string;
-    history: any;
 };
-export default function SinglePage({ appName, menuItems, className, history, }: PropsType): import("react/jsx-runtime").JSX.Element;
+export default function SinglePage({ appName, menuItems, className, }: PropsType): import("react/jsx-runtime").JSX.Element;
 export {};

package/es/layout-single-page/index.js

@@ -2,7 +2,6 @@ import classnames from 'classnames';
 import { useMemo } from 'react';
 import { useLocation } from 'react-router';
 import { useOutlet } from 'react-router-dom';
-import CcsBreadcrumb from "../breadcrumb";
 import { findMenusByUrl } from "../layout-keep-alive";
 import CcsResult from "../result";
 import "./index.less";
@@ -12,8 +11,7 @@ export default function SinglePage(_ref) {
   var appName = _ref.appName,
     _ref$menuItems = _ref.menuItems,
     menuItems = _ref$menuItems === void 0 ? [] : _ref$menuItems,
-    className = _ref.className,
-    history = _ref.history;
+    className = _ref.className;
   var location = useLocation();
   var pathname = location.pathname;
   var outlet = useOutlet();
@@ -29,17 +27,16 @@ export default function SinglePage(_ref) {
     setTimeout(function () {
       document.title = "".concat((menu === null || menu === void 0 ? void 0 : menu.label) || (menu === null || menu === void 0 ? void 0 : menu.url), " - ").concat(appName);
     }, 10);
-    var breadcrumb = menus.map(function (m, index) {
+    var breadcrumb = menus.map(function (m) {
       return {
         key: m.key,
-        title: m.label,
-        href: index !== menus.length - 1 ? m.url : undefined
+        title: m.label
+        // href: m.url,
       };
     });
     breadcrumb.unshift({
       key: '-1',
-      title: '首页',
-      href: '/'
+      title: '首页'
     });
     return {
       auth: ((_menu$btnAuth = menu.btnAuth) === null || _menu$btnAuth === void 0 ? void 0 : _menu$btnAuth.map(function (b) {
@@ -54,11 +51,7 @@ export default function SinglePage(_ref) {
     children: menuInfo !== null && menuInfo !== void 0 && menuInfo.auth ? /*#__PURE__*/_jsx(Page, {
       location: location,
       urlAuthList: menuInfo.auth,
-      breadcrumbNode: /*#__PURE__*/_jsx(CcsBreadcrumb, {
-        history: history,
-        className: "ccs-breadcrumb",
-        items: menuInfo.breadcrumb
-      }),
+      breadcrumb: menuInfo.breadcrumb,
       children: outlet
     }) : /*#__PURE__*/_jsx(CcsResult.NotFound, {
       style: {

package/es/layout-single-page/page.d.ts

@@ -1,11 +1,9 @@
-import { JSXElementConstructor, ReactElement, ReactNode } from 'react';
+import { JSXElementConstructor, ReactElement } from 'react';
 import { Location } from 'react-router';
 import { CacheComponent } from '../layout-keep-alive';
-export type SinglePageProps = Pick<CacheComponent, 'urlAuthList'> & {
+export type SinglePageProps = Pick<CacheComponent, 'breadcrumb' | 'urlAuthList'> & {
     /** router location */
     location: Location;
-    /** 面包屑 */
-    breadcrumbNode: ReactNode;
     /** children */
     children: ReactElement<any, string | JSXElementConstructor<any>> | null;
 };

package/es/layout-single-page/page.js

@@ -1,3 +1,4 @@
+import { Breadcrumb } from 'antd';
 import { memo, useRef } from 'react';
 import Scrollbars from 'react-custom-scrollbars';
 import { PageContext } from "../context";
@@ -9,7 +10,8 @@ export default /*#__PURE__*/memo(function (props) {
   var children = props.children,
     _props$urlAuthList = props.urlAuthList,
     urlAuthList = _props$urlAuthList === void 0 ? [] : _props$urlAuthList,
-    breadcrumbNode = props.breadcrumbNode;
+    _props$breadcrumb = props.breadcrumb,
+    breadcrumb = _props$breadcrumb === void 0 ? [] : _props$breadcrumb;
   var dialogHolderRef = useRef(null);
   return /*#__PURE__*/_jsx(PageContext.Provider, {
     value: {
@@ -27,7 +29,10 @@ export default /*#__PURE__*/memo(function (props) {
     children: /*#__PURE__*/_jsxs(Scrollbars, {
       autoHide: true,
       className: "ccs-sticky-scroll",
-      children: [breadcrumbNode, children, /*#__PURE__*/_jsx(DialogElementsHolder, {
+      children: [/*#__PURE__*/_jsx(Breadcrumb, {
+        items: breadcrumb,
+        className: "ccs-breadcrumb"
+      }), children, /*#__PURE__*/_jsx(DialogElementsHolder, {
         ref: dialogHolderRef
       }, "modal-drawer-holder")]
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "description": "",
   "license": "MIT",
   "author": {