@ccs-ui/rc-pro 2.3.3-beta-11 → 2.3.4

package/es/breadcrumb.d.ts

@@ -0,0 +1,8 @@
+import { BreadcrumbProps } from 'antd/lib';
+import { CSSProperties } from 'react';
+export default function CcsBreadcrumb({ items, style, className, history, }: {
+    style?: CSSProperties;
+    className?: string;
+    history: any;
+    items: BreadcrumbProps['items'];
+}): import("react/jsx-runtime").JSX.Element;

package/es/breadcrumb.js

@@ -0,0 +1,40 @@
+import { Space } from 'antd';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+export default function CcsBreadcrumb(_ref) {
+  var _ref$items = _ref.items,
+    items = _ref$items === void 0 ? [] : _ref$items,
+    style = _ref.style,
+    className = _ref.className,
+    history = _ref.history;
+  var _onClick = function onClick(href) {
+    if (!href || !history) return;
+    history.push(href);
+  };
+  return /*#__PURE__*/_jsx(Space, {
+    className: className,
+    style: style,
+    children: items.map(function (item, index) {
+      var isLast = index === items.length - 1;
+      var grayColor = 'rgba(0, 0, 0, 0.45)';
+      return /*#__PURE__*/_jsxs(_Fragment, {
+        children: [/*#__PURE__*/_jsx("div", {
+          style: {
+            color: !isLast ? grayColor : undefined,
+            cursor: !!item.href ? 'pointer' : 'unset'
+          },
+          onClick: function onClick() {
+            return _onClick(item.href);
+          },
+          children: item.title
+        }, index), !isLast && /*#__PURE__*/_jsx("div", {
+          style: {
+            color: grayColor
+          },
+          children: "/"
+        })]
+      });
+    })
+  });
+}

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>, "onClose" | "onOk" | "auth" | "extraBtn" | "request" | "requestFieldNames" | "preventRequestHandle"> & {
+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"> & {
     formRef: React.RefObject<DialogFormRef<TParams>>;
     formInitialValues: FormProps['initialValues'];
     buttonRef: RefObject<DialogButtonRef>;

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

@@ -23,6 +23,7 @@ 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";
@@ -220,11 +221,11 @@ export default function KeepAliveTabs(_ref) {
     if (menu) saveHistory();
 
     // 面包屑数据
-    var breadcrumb = menus.map(function (m) {
+    var breadcrumb = menus.map(function (m, index) {
       return {
         key: m.key,
         title: m.label,
-        href: m.url
+        href: index !== menus.length - 1 ? m.url : undefined
       };
     });
     breadcrumb.unshift({
@@ -343,7 +344,11 @@ export default function KeepAliveTabs(_ref) {
         onDestroy: onDestroy,
         urlAuthList: urlAuthList,
         timestamp: timestamp,
-        breadcrumb: breadcrumb,
+        breadcrumbNode: /*#__PURE__*/_jsx(CcsBreadcrumb, {
+          history: history,
+          className: "ccs-breadcrumb",
+          items: breadcrumb
+        }),
         children: outlet
       }, key);
     })]

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

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

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

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

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

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

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

@@ -2,6 +2,7 @@ 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";
@@ -11,7 +12,8 @@ export default function SinglePage(_ref) {
   var appName = _ref.appName,
     _ref$menuItems = _ref.menuItems,
     menuItems = _ref$menuItems === void 0 ? [] : _ref$menuItems,
-    className = _ref.className;
+    className = _ref.className,
+    history = _ref.history;
   var location = useLocation();
   var pathname = location.pathname;
   var outlet = useOutlet();
@@ -27,11 +29,11 @@ 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) {
+    var breadcrumb = menus.map(function (m, index) {
       return {
         key: m.key,
         title: m.label,
-        href: m.url
+        href: index !== menus.length - 1 ? m.url : undefined
       };
     });
     breadcrumb.unshift({
@@ -52,7 +54,11 @@ export default function SinglePage(_ref) {
     children: menuInfo !== null && menuInfo !== void 0 && menuInfo.auth ? /*#__PURE__*/_jsx(Page, {
       location: location,
       urlAuthList: menuInfo.auth,
-      breadcrumb: menuInfo.breadcrumb,
+      breadcrumbNode: /*#__PURE__*/_jsx(CcsBreadcrumb, {
+        history: history,
+        className: "ccs-breadcrumb",
+        items: menuInfo.breadcrumb
+      }),
       children: outlet
     }) : /*#__PURE__*/_jsx(CcsResult.NotFound, {
       style: {

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

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

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

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

package/es/pro-table/table.js

@@ -18,7 +18,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import CcsUtils from '@ccs-ui/utils';
 import { useSize, useUpdateEffect } from 'ahooks';
-import { Empty, Form, theme as antTheme } from 'antd';
+import { theme as antTheme, Empty, Form } from 'antd';
 import classNames from 'classnames';
 import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { useAppConfig, useCcsPage } from '..';
@@ -76,8 +76,32 @@ var InternalProTable = function InternalProTable(props) {
     rowKey = _ref.rowKey;
   // table sticky
   var stickyRef = useRef(false);
+
+  // 字段默认过滤，排序值
+  var defaultColumnValues = useMemo(function () {
+    var defaultValue = {
+      filters: {},
+      orderProps: []
+    };
+    columns === null || columns === void 0 || columns.forEach(function (c) {
+      // 排序
+      if (c.sorter && c.defaultSortOrder !== undefined) {
+        defaultValue.orderProps.push({
+          prop: c.dataIndex,
+          ascending: c.defaultSortOrder === 'ascend'
+        });
+      }
+
+      // 过滤
+      if (c.filters && c.defaultFilteredValue !== undefined) {
+        defaultValue.filters[c.dataIndex] = c.defaultFilteredValue;
+      }
+    });
+    return defaultValue;
+  }, []);
+
   // column filter
-  var filtersRef = useRef({});
+  var filtersRef = useRef(defaultColumnValues);
   // table content
   var tableContentRef = useRef(null);
   // container
@@ -333,14 +357,14 @@ var InternalProTable = function InternalProTable(props) {
     // 清空columns显示filter和sort值
     columns === null || columns === void 0 || columns.forEach(function (c) {
       if (c.filterDropdown || c.filters) {
-        c.filteredValue = null;
+        c.filteredValue = c.defaultFilteredValue;
       }
       if (c.sorter) {
-        c.sortOrder = undefined;
+        c.sortOrder = c.defaultSortOrder;
       }
     });
     // 清空filter请求值
-    filtersRef.current = {};
+    filtersRef.current = defaultColumnValues;
     onRequest('reset');
   };
 
@@ -389,18 +413,17 @@ var InternalProTable = function InternalProTable(props) {
         filters: filters
       });
     }
-
-    // @ts-ignore
     if (sorter) {
       columns === null || columns === void 0 || columns.forEach(function (c) {
         if (c.sorter) {
+          var curSorter = Array.isArray(sorter) ?
           // @ts-ignore
-          if (c.dataIndex !== sorter.field) {
-            c.sortOrder = undefined;
-            return;
-          }
+          sorter.find(function (sort) {
+            return sort.field === c.dataIndex;
+          }) : sorter;
+
           // @ts-ignore
-          c.sortOrder = sorter === null || sorter === void 0 ? void 0 : sorter.order;
+          c.sortOrder = curSorter === null || curSorter === void 0 ? void 0 : curSorter.order;
         }
       });
 

package/package.json

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