@ccs-ui/rc-pro 2.3.4 → 2.3.6-alpha-1

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

@@ -2,18 +2,16 @@ 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";
 import Page from "./page";
 import { jsx as _jsx } from "react/jsx-runtime";
-export default function SinglePage(_ref) {
+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,17 +51,14 @@ 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: {
-        marginTop: 100
-      },
-      iconWidth: 200
+    }) : /*#__PURE__*/_jsx(CcsResult.Page404, {
+      subTitle: "\u9875\u9762\u4E0D\u5B58\u5728"
     })
   });
-}
+}
+if (process.env.NODE_ENV !== 'production') {
+  SinglePage.displayName = 'CcsSinglePage';
+}
+export default SinglePage;

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'> & {
+import { CacheRouter } from '../layout-keep-alive';
+export type SinglePageProps = Pick<CacheRouter, '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/es/loading/index.d.ts

@@ -7,5 +7,8 @@ type CcsLoadingProps = {
     /** loading 文字说明 */
     loadingTip?: string;
 };
-declare const Loading: ({ loading, loadingTip }: CcsLoadingProps) => import("react/jsx-runtime").JSX.Element | null;
+declare const Loading: {
+    ({ loading, loadingTip }: CcsLoadingProps): import("react/jsx-runtime").JSX.Element | null;
+    displayName: string;
+};
 export default Loading;

package/es/loading/index.js

@@ -11,7 +11,7 @@ var Loading = function Loading(_ref) {
       position: 'absolute',
       inset: 0,
       background: 'rgba(0, 0, 0, 0.1)',
-      zIndex: 1000
+      zIndex: 9999
     },
     children: /*#__PURE__*/_jsxs("div", {
       style: {
@@ -37,4 +37,7 @@ var Loading = function Loading(_ref) {
     })
   }) : null;
 };
+if (process.env.NODE_ENV !== 'production') {
+  Loading.displayName = 'CcsLoading';
+}
 export default Loading;

package/es/pro-table/head.d.ts

@@ -1,15 +1,16 @@
-import { FormInstance } from 'antd/lib/form';
-import { ReactElement } from 'react';
-import { PropsWithElementChildren } from '../ccs';
+import { FormInstance } from 'antd';
+import React, { ReactElement } from 'react';
 import { CcsProTableProps } from './table';
-type PropsType<T> = Pick<CcsProTableProps<T>, 'toolbar' | 'formItems' | 'formInitValues' | 'expandForm' | 'title' | 'formItemLabelWidth'> & PropsWithElementChildren & {
+type PropsType<T> = Pick<CcsProTableProps<T>, 'toolbar' | 'formItems' | 'formInitValues' | 'expandForm' | 'formItemLabelWidth'> & {
     /** 更多查询条件 */
     hasMore?: boolean;
-    form: FormInstance<any>;
     /** table 操作栏 */
-    tableOperation: ReactElement;
+    tableOperation?: ReactElement;
+    /** 查询 */
     onSearch: () => void;
+    /** form */
+    formRef: React.RefObject<FormInstance<any>>;
 };
 /** 操作按钮、查询，重置、列筛选、 */
-declare function HeadComponent<T>({ form, title, toolbar, children, expandForm, formItems, formInitValues, formItemLabelWidth, tableOperation, onSearch, }: PropsType<T>): import("react/jsx-runtime").JSX.Element;
+declare function HeadComponent<T>({ toolbar, expandForm, formItems, formInitValues, formItemLabelWidth, tableOperation, formRef, onSearch, }: PropsType<T>): import("react/jsx-runtime").JSX.Element;
 export default HeadComponent;

package/es/pro-table/head.js

@@ -6,9 +6,9 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { DownOutlined, UpOutlined } from '@ant-design/icons';
 import { useUpdateEffect } from 'ahooks';
-import { Button, Card, Form, theme } from 'antd';
+import { Button, Form, theme } from 'antd';
 import _debounce from 'lodash.debounce';
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { CcsResizeObserver } from '..';
 import { getShowDpends } from "./_utils";
 import HeadFormItem from "./form-item";
@@ -17,10 +17,7 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 /** 操作按钮、查询，重置、列筛选、 */
 function HeadComponent(_ref) {
-  var form = _ref.form,
-    title = _ref.title,
-    toolbar = _ref.toolbar,
-    children = _ref.children,
+  var toolbar = _ref.toolbar,
     _ref$expandForm = _ref.expandForm,
     expandForm = _ref$expandForm === void 0 ? false : _ref$expandForm,
     _ref$formItems = _ref.formItems,
@@ -28,20 +25,29 @@ function HeadComponent(_ref) {
     formInitValues = _ref.formInitValues,
     formItemLabelWidth = _ref.formItemLabelWidth,
     tableOperation = _ref.tableOperation,
+    formRef = _ref.formRef,
     onSearch = _ref.onSearch;
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
   var formItemsRef = useRef(null);
+  // 根据位置判断是否换行ref
+  var endItemRef = useRef(null);
   // 查询条件是否展开
   var _useState = useState(expandForm),
     _useState2 = _slicedToArray(_useState, 2),
     isExpand = _useState2[0],
     setIsExpand = _useState2[1];
-  var _useState3 = useState('hidden'),
+  var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    visible = _useState4[0],
-    setVisible = _useState4[1];
+    hasMore = _useState4[0],
+    onToggle = _useState4[1];
   useUpdateEffect(function () {
     setIsExpand(expandForm);
   }, [expandForm]);
+  useImperativeHandle(formRef, function () {
+    return form;
+  });
 
   // 处理form item 依赖
   var allFormItems = useMemo(function () {
@@ -54,33 +60,26 @@ function HeadComponent(_ref) {
     return formItems;
   }, [formItems]);
 
-  // 查询条件记录数
-  var itemLen = allFormItems.length;
-  var hasItem = itemLen > 0;
-
-  // 尺寸变化重设尺寸
-  var resizeFn = _debounce(function (hm) {
-    setVisible(hm);
-  }, 500);
+  // 判断是否有更多条件无法一行显示
+  var onEventMore = function onEventMore() {
+    var _endItemRef$current, _formItemsRef$current;
+    if (!endItemRef.current || !formItemsRef.current || isExpand) return;
+    var hasMore = ((_endItemRef$current = endItemRef.current) === null || _endItemRef$current === void 0 || (_endItemRef$current = _endItemRef$current.getClientRects()[0]) === null || _endItemRef$current === void 0 ? void 0 : _endItemRef$current.top) !== ((_formItemsRef$current = formItemsRef.current) === null || _formItemsRef$current === void 0 || (_formItemsRef$current = _formItemsRef$current.getClientRects()[0]) === null || _formItemsRef$current === void 0 ? void 0 : _formItemsRef$current.top);
+    onToggle(hasMore);
+  };
 
   // 监听dom尺寸变化
-  var onResize = function onResize() {
-    var _formItemsRef$current;
-    if (visible === 'hidden') return;
-    var scrollHeight = ((_formItemsRef$current = formItemsRef.current) === null || _formItemsRef$current === void 0 ? void 0 : _formItemsRef$current.scrollHeight) || 0;
-    if (scrollHeight === 0) return;
-    var hm = scrollHeight > 40 ? 'more' : 'visible';
-    resizeFn(hm);
+  var resizeFn = function resizeFn(e) {
+    if (e.width === 0) return;
+    onEventMore();
   };
+
+  // 监听容器尺寸变化
+  var onResize = _debounce(resizeFn, 500);
   useEffect(function () {
-    var _formItemsRef$current2;
-    var scrollHeight = ((_formItemsRef$current2 = formItemsRef.current) === null || _formItemsRef$current2 === void 0 ? void 0 : _formItemsRef$current2.scrollHeight) || 0;
-    setVisible(scrollHeight > 40 ? 'more' : 'visible');
+    onEventMore();
   }, []);
 
-  // 是否有更多
-  var hasMore = itemLen > 1 && visible === 'more';
-
   // 操作按钮
   var renderSearchBtn = /*#__PURE__*/_jsxs("div", {
     style: {
@@ -102,9 +101,6 @@ function HeadComponent(_ref) {
       onClick: function onClick() {
         return form.submit();
       },
-      style: {
-        marginLeft: !hasMore ? 10 : undefined
-      },
       children: "\u67E5\u8BE2"
     }), toolbar ? null : tableOperation]
   });
@@ -170,77 +166,35 @@ function HeadComponent(_ref) {
   // 获取Input的高度
   var token = theme.useToken().token;
   var controlHeight = token.rootValue ? "".concat((token.controlHeight / token.rootValue).toFixed(3), "rem") : token.controlHeight;
-  return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [hasItem && /*#__PURE__*/_jsxs(_Fragment, {
+  return /*#__PURE__*/_jsx(_Fragment, {
+    children: allFormItems.length > 0 && /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsx(CcsResizeObserver.Target, {
         targetRef: formItemsRef,
         onResize: onResize
-      }), /*#__PURE__*/_jsx(Card, {
-        className: "ccs-pl-adaptation",
-        style: {
-          boxShadow: 'none',
-          visibility: visible === 'hidden' ? 'hidden' : 'visible'
-        },
-        styles: {
-          body: {
-            padding: 16
-          }
-        },
-        bordered: false,
-        title: title,
-        children: /*#__PURE__*/_jsxs(Form, {
-          initialValues: formInitValues,
-          form: form,
-          onFinish: onSearch,
-          layout: "inline",
-          style: formStyles,
-          children: [/*#__PURE__*/_jsxs("div", {
-            style: {
-              justifyContent: isExpand && hasMore ? 'flex-start' : 'flex-end',
-              height: isExpand ? 'auto' : controlHeight
-            },
-            className: "ccs-pl-adaptation-form",
-            ref: formItemsRef,
-            children: [renderFormItems(), isExpand && renderSearchBtn]
-          }), !isExpand && /*#__PURE__*/_jsx("div", {
-            style: {
-              flex: '0 0 auto'
-            },
-            children: renderSearchBtn
-          })]
-        })
-      })]
-    }), toolbar && /*#__PURE__*/_jsxs(Card, {
-      styles: {
-        cover: {
-          borderRadius: 0
-        },
-        body: {
-          display: 'flex',
-          justifyContent: 'space-between',
-          width: '100%',
-          padding: '12px 16px',
-          alignContent: 'center'
-        }
-      },
-      style: {
-        borderRadius: 0,
-        borderLeft: 0,
-        borderBottom: 0,
-        borderRight: 0
-      },
-      children: [/*#__PURE__*/_jsx("div", {
-        style: {
-          flex: '1 1 auto'
-        },
-        children: toolbar
-      }), /*#__PURE__*/_jsx("div", {
-        style: {
-          flex: '0 0 auto'
-        },
-        children: tableOperation
+      }), /*#__PURE__*/_jsxs(Form, {
+        initialValues: formInitValues,
+        form: form,
+        onFinish: onSearch,
+        layout: "inline",
+        style: formStyles,
+        children: [/*#__PURE__*/_jsxs("div", {
+          style: {
+            justifyContent: isExpand && hasMore ? 'flex-start' : 'flex-end',
+            height: isExpand ? 'auto' : controlHeight
+          },
+          className: "ccs-pl-adaptation-form",
+          ref: formItemsRef,
+          children: [renderFormItems(), /*#__PURE__*/_jsx("div", {
+            ref: endItemRef
+          }), isExpand && renderSearchBtn]
+        }), !isExpand && /*#__PURE__*/_jsx("div", {
+          style: {
+            flex: '0 0 auto'
+          },
+          children: renderSearchBtn
+        })]
       })]
-    }), children]
+    })
   });
 }
 export default HeadComponent;

package/es/pro-table/index.d.ts

@@ -1,14 +1,11 @@
 import './index.less';
-import { CcsProTableProps, SearchEventType } from './table';
-type TableProps<T> = Omit<CcsProTableProps<T>, 'onSearchAfter' | 'parentFieldName'> & {
-    /** 请求后格式化结果 */
-    onSearchAfter?: (data: any, eventType?: SearchEventType) => any;
-};
-type TableTreeProps<T> = Omit<CcsProTableProps<T>, 'onSearchAfter'> & {
+import SelectionAlert from './selection-alert';
+import TableSummary from './summary';
+import { CcsProTableProps } from './table';
+type TableProps<T> = Omit<CcsProTableProps<T>, 'parentFieldName'>;
+type TableTreeProps<T> = CcsProTableProps<T> & {
     /** 父级值字段 */
     parentFieldName: string;
-    /** 请求后格式化结果 */
-    onSearchAfter?: (data: any, eventType?: SearchEventType) => any;
 };
 /**
  * 查询表格组件
@@ -19,5 +16,8 @@ type TableTreeProps<T> = Omit<CcsProTableProps<T>, 'onSearchAfter'> & {
 declare const ProTable: {
     <T extends object = any>(props: TableProps<T>): import("react/jsx-runtime").JSX.Element;
     Tree: <T_1 extends object = any>(props: TableTreeProps<T_1>) => import("react/jsx-runtime").JSX.Element;
+    SelectionAlert: typeof SelectionAlert;
+    Summary: typeof TableSummary;
+    displayName: string;
 };
 export default ProTable;

package/es/pro-table/index.js

@@ -5,6 +5,8 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import "./index.less";
+import SelectionAlert from "./selection-alert";
+import TableSummary from "./summary";
 import InternalProTable from "./table";
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
@@ -24,9 +26,12 @@ var ProTable = function ProTable(props) {
  * @returns
  */
 var ProTableTree = function ProTableTree(props) {
-  return /*#__PURE__*/_jsx(InternalProTable, _objectSpread(_objectSpread({}, props), {}, {
-    onSearchAfter: props.onSearchAfter
-  }));
+  return /*#__PURE__*/_jsx(InternalProTable, _objectSpread({}, props));
 };
 ProTable.Tree = ProTableTree;
+ProTable.SelectionAlert = SelectionAlert;
+ProTable.Summary = TableSummary;
+if (process.env.NODE_ENV !== 'production') {
+  ProTable.displayName = 'CcsProTable';
+}
 export default ProTable;

package/es/pro-table/index.less

@@ -49,6 +49,10 @@
   &-table-content {
     position: relative;
     flex: auto;
+
+    .ant-table-title {
+      padding: 0 !important;
+    }
   }
 
   &-adaptation {
@@ -61,13 +65,14 @@
   &-adaptation-form {
     flex: 1 1 auto;
     display: flex;
+    justify-content: flex-end;
     flex-wrap: wrap;
     gap: 16px 10px;
     overflow: hidden;
 
-    // &::-webkit-scrollbar {
-    //   display: none;
-    // }
+    &::-webkit-scrollbar {
+      display: none;
+    }
   }
 
   .ant-form-item {

package/es/pro-table/selection-alert.d.ts

@@ -0,0 +1,18 @@
+import { TagProps } from 'antd';
+import React from 'react';
+interface PropsType {
+    data: any[];
+    color?: TagProps['color'];
+    fieldNames: {
+        key: string;
+        label: string;
+    };
+    onClear: (key?: React.Key) => void;
+}
+/**
+ * 显示table行选中项
+ * @param PropsType
+ * @returns
+ */
+export default function SelectionAlert({ data, color, fieldNames, onClear, }: PropsType): import("react/jsx-runtime").JSX.Element | undefined;
+export {};

package/es/pro-table/selection-alert.js

@@ -0,0 +1,52 @@
+import { DeleteOutlined } from '@ant-design/icons';
+import { Button, Space, Tag } from 'antd';
+import React from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * 显示table行选中项
+ * @param PropsType
+ * @returns
+ */
+export default function SelectionAlert(_ref) {
+  var data = _ref.data,
+    color = _ref.color,
+    _ref$fieldNames = _ref.fieldNames,
+    fieldNames = _ref$fieldNames === void 0 ? {
+      key: 'key',
+      label: 'label'
+    } : _ref$fieldNames,
+    onClear = _ref.onClear;
+  if (!data || data.length === 0) {
+    return undefined;
+  }
+  return /*#__PURE__*/_jsxs(Space, {
+    size: 4,
+    style: {
+      padding: '6px 12px'
+    },
+    wrap: true,
+    children: [data.map(function () {
+      var row = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      return /*#__PURE__*/_jsx(Tag, {
+        color: color,
+        closable: true,
+        onClose: function onClose(e) {
+          onClear(row[fieldNames.key]);
+          e.preventDefault();
+        },
+        children: row[fieldNames.label || 'name']
+      }, row[fieldNames.key || 'key']);
+    }), data.length > 1 && /*#__PURE__*/_jsx(Button, {
+      size: "small",
+      onClick: function onClick(e) {
+        onClear();
+        e.preventDefault();
+      },
+      icon: /*#__PURE__*/_jsx(DeleteOutlined, {}),
+      danger: true,
+      type: "text",
+      children: "\u6E05\u7A7A"
+    })]
+  });
+}

package/es/pro-table/summary.d.ts

@@ -0,0 +1,8 @@
+import CCS from '..';
+interface PropsType {
+    data: Record<string, any>;
+    columns: CCS.TableColumns;
+    hasRowSelection: boolean;
+}
+export default function TableSummary({ data, columns, hasRowSelection, }: PropsType): import("react/jsx-runtime").JSX.Element;
+export {};

package/es/pro-table/summary.js

@@ -0,0 +1,32 @@
+import { Table } from 'antd';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+var SummaryIndex = -1;
+export default function TableSummary(_ref) {
+  var _ref$data = _ref.data,
+    data = _ref$data === void 0 ? {} : _ref$data,
+    columns = _ref.columns,
+    hasRowSelection = _ref.hasRowSelection;
+  SummaryIndex = -1;
+  var renderCell = function renderCell(cs) {
+    return cs.map(function (d) {
+      if (d.children && d.children.length > 0) {
+        return renderCell(d.children);
+      }
+      SummaryIndex += 1;
+      return /*#__PURE__*/_jsx(Table.Summary.Cell, {
+        index: 0,
+        children: data[d.dataIndex]
+      }, SummaryIndex);
+    });
+  };
+  if (hasRowSelection) SummaryIndex += 1;
+  return /*#__PURE__*/_jsx(Table.Summary, {
+    fixed: true,
+    children: /*#__PURE__*/_jsxs(Table.Summary.Row, {
+      children: [hasRowSelection && /*#__PURE__*/_jsx(Table.Summary.Cell, {
+        index: SummaryIndex
+      }), renderCell(columns)]
+    })
+  });
+}