@zykj2024/much-library 1.0.11 → 1.0.12-beta.10

package/dist/McContainer/demo/actionBar.d.ts

@@ -1,6 +1,6 @@
 /**
  * title: 操作栏区域
- * description: 若未设置该项，则不显示。
+ * description: 若未设置该项，则不显示。`actionBarRender` 可自定义操作栏区域，提供批量操作按钮实例
  * transform: true
  * compact: true
  */

package/dist/McContainer/demo/actionBar.js

@@ -1,17 +1,21 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /**
  * title: 操作栏区域
- * description: 若未设置该项，则不显示。
+ * description: 若未设置该项，则不显示。`actionBarRender` 可自定义操作栏区域，提供批量操作按钮实例
  * transform: true
  * compact: true
  */
 
-import { Button } from 'antd';
+import { useToggle } from "../../../packages/hooks/src";
+import { Button, Space, Switch } from 'antd';
 import { AddOutlined } from 'much-icons';
 import { McContainer, McInput } from "../..";
+import { useState } from 'react';
 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 () {
+  var _selectedRows$length;
   var dataSource = Array.from({
     length: 5
   }, function (_, index) {
@@ -21,6 +25,14 @@ export default (function () {
       age: 18 + index
     };
   });
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    selectedRows = _useState2[0],
+    setSelectedRows = _useState2[1];
+  var _useToggle = useToggle(false),
+    _useToggle2 = _slicedToArray(_useToggle, 2),
+    showCustomActionBar = _useToggle2[0],
+    toggle = _useToggle2[1].toggle;
   var columns = [{
     title: 'ID',
     dataIndex: 'id'
@@ -58,13 +70,49 @@ export default (function () {
       children: "\u4E0A\u4F20"
     })]
   });
-  return /*#__PURE__*/_jsx(McContainer, {
-    height: "100%",
-    queryItems: queryItems,
-    actionBar: actionBar,
-    tableProps: {
-      columns: columns,
-      dataSource: dataSource
-    }
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsxs("div", {
+      style: {
+        padding: '24px 24px 0'
+      },
+      children: ["\u662F\u5426\u81EA\u5B9A\u4E49\u6E32\u67D3\u64CD\u4F5C\u533A\uFF1A", /*#__PURE__*/_jsx(Switch, {
+        checked: showCustomActionBar,
+        onChange: toggle
+      })]
+    }), /*#__PURE__*/_jsx(McContainer, {
+      height: "100%",
+      queryItems: queryItems,
+      actionBar: actionBar,
+      actionBarRender: showCustomActionBar ? function (batchEl) {
+        return /*#__PURE__*/_jsxs(Space, {
+          size: 16,
+          style: {
+            marginBottom: 16
+          },
+          children: [/*#__PURE__*/_jsx(Button, {
+            type: "primary",
+            children: "\u4E0B\u8F7D"
+          }), batchEl]
+        });
+      } : undefined,
+      batchNum: (_selectedRows$length = selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length) !== null && _selectedRows$length !== void 0 ? _selectedRows$length : 0,
+      onCancel: function onCancel() {
+        return setSelectedRows([]);
+      },
+      tableProps: {
+        columns: columns,
+        dataSource: dataSource,
+        rowKey: 'id',
+        rowSelection: {
+          selectedRowKeys: selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.map(function (item) {
+            return item.id;
+          }),
+          preserveSelectedRowKeys: true,
+          onChange: function onChange(selectedRowKeys, selectedRows) {
+            return setSelectedRows(selectedRows);
+          }
+        }
+      }
+    })]
   });
 });

package/dist/McContainer/demo/batch.d.ts

@@ -1,6 +1,6 @@
 /**
  * title: 预设批量操作
- * description: 包括多选数据的处理、展示、批量操作区，开启多选功能时，在`tableProps`中进行多选的配置，`rowKey`必须设置且唯一。`batchNum`展示批量操作数、`batchBtns`配置批量操作区、`onCancel`取消批量选中，配合实现多选功能。
+ * description: 包括多选数据的处理、展示、批量操作区，开启多选功能时，在`tableProps`中进行多选的配置，`rowKey`必须设置且唯一。`batchNum`展示批量操作数、`batchBtns`配置批量操作区、`onCancel`取消批量选中，配合实现多选功能。设置`batch`参数时，注意`actionBar`要为合法的React节点，如`<Button>操作1</Button>`、`<>只需要字符串的场景</>`，设置`batch.show`为`true`显示批量操作按钮，设置`batch.order`可以调整批量操作按钮的位置
  * transform: true
  * compact: true
  */

package/dist/McContainer/demo/batch.js

@@ -1,13 +1,14 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /**
  * title: 预设批量操作
- * description: 包括多选数据的处理、展示、批量操作区，开启多选功能时，在`tableProps`中进行多选的配置，`rowKey`必须设置且唯一。`batchNum`展示批量操作数、`batchBtns`配置批量操作区、`onCancel`取消批量选中，配合实现多选功能。
+ * description: 包括多选数据的处理、展示、批量操作区，开启多选功能时，在`tableProps`中进行多选的配置，`rowKey`必须设置且唯一。`batchNum`展示批量操作数、`batchBtns`配置批量操作区、`onCancel`取消批量选中，配合实现多选功能。设置`batch`参数时，注意`actionBar`要为合法的React节点，如`<Button>操作1</Button>`、`<>只需要字符串的场景</>`，设置`batch.show`为`true`显示批量操作按钮，设置`batch.order`可以调整批量操作按钮的位置
  * transform: true
  * compact: true
  */
 
-import { Button } from 'antd';
-import { McContainer, McInput } from "../..";
+import { useToggle } from "../../../packages/hooks/src";
+import { Button, Switch } from 'antd';
+import { McContainer, McInput, McInputNumber } from "../..";
 import { useState } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -27,6 +28,14 @@ export default (function () {
       age: 18 + index
     };
   });
+  var _useToggle = useToggle(true),
+    _useToggle2 = _slicedToArray(_useToggle, 2),
+    showBatchBtn = _useToggle2[0],
+    toggle = _useToggle2[1].toggle;
+  var _useState3 = useState(),
+    _useState4 = _slicedToArray(_useState3, 2),
+    batchBtnOrder = _useState4[0],
+    setBatchBtnOrder = _useState4[1];
   var columns = [{
     title: 'ID',
     dataIndex: 'id'
@@ -55,35 +64,66 @@ export default (function () {
       }
     })
   });
-  return /*#__PURE__*/_jsx(McContainer, {
-    height: "100%",
-    queryItems: queryItems,
-    batchNum: (_selectedRows$length = selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length) !== null && _selectedRows$length !== void 0 ? _selectedRows$length : 0,
-    onCancel: function onCancel() {
-      return setSelectedRows([]);
-    },
-    batchBtns: /*#__PURE__*/_jsxs(_Fragment, {
-      children: [/*#__PURE__*/_jsx(Button, {
-        type: "primary",
-        children: "\u6279\u91CF\u64CD\u4F5C1"
-      }), /*#__PURE__*/_jsx(Button, {
-        type: "primary",
-        children: "\u6279\u91CF\u64CD\u4F5C2"
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsxs("div", {
+      style: {
+        padding: 24
+      },
+      children: ["\u662F\u5426\u5C55\u793A\u6279\u91CF\u64CD\u4F5C\u6309\u94AE\uFF1A", /*#__PURE__*/_jsx(Switch, {
+        checked: showBatchBtn,
+        onChange: toggle
+      })]
+    }), /*#__PURE__*/_jsxs("div", {
+      style: {
+        padding: '0 0 24px 24px'
+      },
+      children: ["\u6279\u91CF\u64CD\u4F5C\u6309\u94AE\u4F4D\u7F6E\uFF1A", /*#__PURE__*/_jsx(McInputNumber, {
+        value: batchBtnOrder,
+        onChange: setBatchBtnOrder
       })]
-    }),
-    tableProps: {
-      columns: columns,
-      dataSource: dataSource,
-      rowKey: 'id',
-      rowSelection: {
-        selectedRowKeys: selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.map(function (item) {
-          return item.id;
-        }),
-        preserveSelectedRowKeys: true,
-        onChange: function onChange(selectedRowKeys, selectedRows) {
-          return setSelectedRows(selectedRows);
+    }), /*#__PURE__*/_jsx(McContainer, {
+      height: "100%",
+      queryItems: queryItems,
+      batchNum: (_selectedRows$length = selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length) !== null && _selectedRows$length !== void 0 ? _selectedRows$length : 0,
+      onCancel: function onCancel() {
+        return setSelectedRows([]);
+      },
+      actionBar: /*#__PURE__*/_jsxs(_Fragment, {
+        children: [/*#__PURE__*/_jsx(Button, {
+          type: "primary",
+          children: "\u64CD\u4F5C1"
+        }), /*#__PURE__*/_jsx(Button, {
+          type: "primary",
+          children: "\u64CD\u4F5C2"
+        })]
+      }),
+      batchBtns: /*#__PURE__*/_jsxs(_Fragment, {
+        children: [/*#__PURE__*/_jsx(Button, {
+          type: "primary",
+          children: "\u6279\u91CF\u64CD\u4F5C1"
+        }), /*#__PURE__*/_jsx(Button, {
+          type: "primary",
+          children: "\u6279\u91CF\u64CD\u4F5C2"
+        })]
+      }),
+      batch: {
+        show: showBatchBtn,
+        order: batchBtnOrder
+      },
+      tableProps: {
+        columns: columns,
+        dataSource: dataSource,
+        rowKey: 'id',
+        rowSelection: {
+          selectedRowKeys: selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.map(function (item) {
+            return item.id;
+          }),
+          preserveSelectedRowKeys: true,
+          onChange: function onChange(selectedRowKeys, selectedRows) {
+            return setSelectedRows(selectedRows);
+          }
         }
       }
-    }
+    })]
   });
 });

package/dist/McContainer/demo/standard.js

@@ -24,7 +24,6 @@ var tableData = Array.from({
   };
 });
 export default (function () {
-  var _selectedRows$length;
   var mcContainerRef = useRef();
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -138,7 +137,7 @@ export default (function () {
         icon: /*#__PURE__*/_jsx(AddOutlined, {}),
         children: "\u65B0\u589E"
       }),
-      batchNum: (_selectedRows$length = selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length) !== null && _selectedRows$length !== void 0 ? _selectedRows$length : 0,
+      batchNum: selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length,
       onCancel: function onCancel() {
         return setSelectedRows([]);
       },

package/dist/McContainer/index.css

@@ -2,17 +2,18 @@
   position: relative;
 }
 .mc-container__ceiling {
-  width: calc(100% - 48px);
+  width: calc(100% - 40px);
   height: 24px;
   position: absolute;
   top: 0;
-  left: 24px;
+  left: 16px;
   z-index: 9;
 }
 .mc-container__wrapper {
   height: 100%;
-  padding: 24px 24px 64px;
-  overflow: auto;
+  padding: 24px 24px 50px 16px;
+  overflow-y: auto;
+  border-top-right-radius: 12px;
 }
 .mc-container__query {
   display: -webkit-box;
@@ -27,7 +28,7 @@
 .mc-container__query .mc-select,
 .mc-container__query .mc-cascader,
 .mc-container__query .mc-input-number {
-  width: 280px;
+  width: 270px;
 }
 .mc-container__query .mc-date-range {
   width: 330px;
@@ -113,11 +114,11 @@
   transition: all 0.3s;
 }
 .mc-container__pagination {
-  padding: 16px 0 24px;
+  padding: 8px 0 16px;
   margin: 0 !important;
-  width: calc(100% - 48px);
+  width: calc(100% - 40px);
   position: absolute;
-  left: 24px;
+  left: 16px;
   bottom: 0;
   z-index: 9;
 }

package/dist/McContainer/index.d.ts

@@ -1,11 +1,15 @@
-import { TableProps } from 'antd';
+import { ButtonProps, TableProps } from 'antd';
 import { CSSProperties, FC, ReactElement, ReactNode } from 'react';
 import './index.less';
-export type PropsType = {
+export type McContainerPropsType = {
     style?: CSSProperties;
     className?: string;
     height?: string;
     backgroundColor?: string;
+    /**
+     * 是否展示头部遮罩，默认显示
+     */
+    showCell?: boolean;
     immediateQuery?: boolean;
     loading?: boolean;
     queryItems?: ReactElement;
@@ -24,12 +28,33 @@ export type PropsType = {
         [key: string]: any;
     }) => void;
     queryRender?: ReactNode;
-    actionBar?: ReactNode;
+    actionBar?: ReactElement;
+    /**
+     * @description 操作栏自定义渲染
+     * @param batchEl - 批量操作按钮实例
+     * @returns 操作栏元素
+     */
+    actionBarRender?: (batchEl: ReactNode) => ReactNode;
     batchNum?: number;
     batchBtns?: ReactNode;
+    /**
+     * @description 批量操作按钮配置
+     * @param show - 是否显示批量操作按钮（默认不显示 false）
+     * @param buttonText - 批量操作按钮文字
+     * @param buttonProps - 批量操作按钮属性
+     * @param order - 批量操作按钮在操作栏中的位置（默认为最后一个）
+     */
+    batch?: {
+        show?: boolean;
+        buttonText?: string;
+        buttonProps?: ButtonProps;
+        order?: number;
+    };
     onCancel?: () => void;
     tableProps?: TableProps<any>;
     tableRender?: ReactNode;
+    /** 折叠事件的回调 */
+    onCollapse?: (v: boolean) => void;
     [key: string]: any;
 };
 export type McContainerRef = {
@@ -45,5 +70,5 @@ export type McContainerRef = {
     getQueryParams: () => any;
     resetQueryParams: () => void;
 };
-declare const McContainer: FC<PropsType>;
+declare const McContainer: FC<McContainerPropsType>;
 export default McContainer;

package/dist/McContainer/index.js

@@ -2,10 +2,12 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { Button, Spin, Table } from 'antd';
+import { isNumber } from 'lodash';
 import { CaretDownFilled, DoubleLeftOutlined } from 'much-icons';
-import { Children, cloneElement, forwardRef, useEffect, useImperativeHandle, useRef, useState } from 'react';
+import { Children, cloneElement, forwardRef, isValidElement, useEffect, useImperativeHandle, useRef, useState } from 'react';
 import "./index.css";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var McContainer = /*#__PURE__*/forwardRef(function (props, ref) {
   var _tableProps$dataSourc;
@@ -15,6 +17,8 @@ var McContainer = /*#__PURE__*/forwardRef(function (props, ref) {
     height = _props$height === void 0 ? 'calc(100vh - 88px)' : _props$height,
     _props$backgroundColo = props.backgroundColor,
     backgroundColor = _props$backgroundColo === void 0 ? '#ffffff' : _props$backgroundColo,
+    _props$showCell = props.showCell,
+    showCell = _props$showCell === void 0 ? true : _props$showCell,
     _props$immediateQuery = props.immediateQuery,
     immediateQuery = _props$immediateQuery === void 0 ? true : _props$immediateQuery,
     _props$loading = props.loading,
@@ -34,9 +38,12 @@ var McContainer = /*#__PURE__*/forwardRef(function (props, ref) {
     _props$batchNum = props.batchNum,
     batchNum = _props$batchNum === void 0 ? 0 : _props$batchNum,
     batchBtns = props.batchBtns,
+    batch = props.batch,
+    actionBarRender = props.actionBarRender,
     onCancel = props.onCancel,
     tableProps = props.tableProps,
-    tableRender = props.tableRender;
+    tableRender = props.tableRender,
+    onCollapse = props.onCollapse;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     collapse = _useState2[0],
@@ -50,12 +57,25 @@ var McContainer = /*#__PURE__*/forwardRef(function (props, ref) {
   var defaultQueryParamsRef = useRef({});
   var initializedRef = useRef(false);
 
+  /* 批量操作相关 */
+  var _ref = batch || {},
+    _ref$buttonText = _ref.buttonText,
+    buttonText = _ref$buttonText === void 0 ? '批量操作' : _ref$buttonText,
+    buttonProps = _ref.buttonProps,
+    _ref$show = _ref.show,
+    batchShow = _ref$show === void 0 ? false : _ref$show,
+    batchOrder = _ref.order;
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    showBatchBar = _useState6[0],
+    setShowBatchBar = _useState6[1];
+
   /* 获取actionBar高度 */
   var actionBarRef = useRef();
-  var _useState5 = useState(0),
-    _useState6 = _slicedToArray(_useState5, 2),
-    actionBarHeight = _useState6[0],
-    setActionBarHeight = _useState6[1];
+  var _useState7 = useState(0),
+    _useState8 = _slicedToArray(_useState7, 2),
+    actionBarHeight = _useState8[0],
+    setActionBarHeight = _useState8[1];
   var actionBarResizeObserver = new ResizeObserver(function (entries) {
     setActionBarHeight(entries[0].contentRect.height + 40);
   });
@@ -67,6 +87,9 @@ var McContainer = /*#__PURE__*/forwardRef(function (props, ref) {
       return actionBarResizeObserver.disconnect();
     };
   }, []);
+  useEffect(function () {
+    onCollapse === null || onCollapse === void 0 || onCollapse(collapse);
+  }, [collapse]);
 
   // 为设置过name属性的查询项添加value属性和onChange事件，从而收集查询项的值（查询项自身已绑定value属性的除外，需自行编写相关业务逻辑代码进行状态管理）
   var mapQuerys = function mapQuerys(items) {
@@ -102,6 +125,45 @@ var McContainer = /*#__PURE__*/forwardRef(function (props, ref) {
     return ELs;
   };
 
+  // 批量操作按钮
+  var handelBatchClick = function handelBatchClick() {
+    if (showBatchBar) {
+      onCancel === null || onCancel === void 0 || onCancel();
+    }
+    setShowBatchBar(!showBatchBar);
+  };
+
+  // 批量操作按钮
+  var batchEl = /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
+    onClick: handelBatchClick
+  }, buttonProps), {}, {
+    children: buttonText
+  }));
+
+  // 生成 actionBar
+  var mapActionBar = function mapActionBar() {
+    var Els;
+    // 是否展示批量操作按钮
+    if (batchShow) {
+      // 是否配置actionBar
+      if (actionBar) {
+        var _actionBar$props;
+        // 判断是否为合法的React节点
+        var itemsCount = /*#__PURE__*/isValidElement(actionBar) ? Children.count(actionBar === null || actionBar === void 0 || (_actionBar$props = actionBar.props) === null || _actionBar$props === void 0 ? void 0 : _actionBar$props.children) : 1;
+        var newEls = Children.toArray(itemsCount > 1 ? actionBar.props.children : actionBar);
+        var _batchOrder = isNumber(batchOrder) && batchOrder >= 0 && batchOrder <= itemsCount ? batchOrder : itemsCount;
+        // 插入批量操作按钮，默认放在actionBar操作项后面
+        newEls.splice(_batchOrder, 0, batchEl);
+        Els = /*#__PURE__*/cloneElement(itemsCount > 1 ? actionBar : /*#__PURE__*/_jsx(_Fragment, {}), {}, newEls);
+      } else {
+        Els = batchEl;
+      }
+    } else {
+      Els = actionBar;
+    }
+    return Els;
+  };
+
   // 格式化查询参数（返回当前可见的查询项的参数集）
   var formatQueryParams = function formatQueryParams() {
     var _tableProps$paginatio;
@@ -132,10 +194,10 @@ var McContainer = /*#__PURE__*/forwardRef(function (props, ref) {
     if (params) {
       var _params = _objectSpread({}, queryParamsRef.current);
       // 仅支持设置过name属性的查询项（和current、pageSize）
-      Object.entries(params).forEach(function (_ref) {
-        var _ref2 = _slicedToArray(_ref, 2),
-          key = _ref2[0],
-          value = _ref2[1];
+      Object.entries(params).forEach(function (_ref2) {
+        var _ref3 = _slicedToArray(_ref2, 2),
+          key = _ref3[0],
+          value = _ref3[1];
         if (allNamesRef.current.includes(key)) {
           _params[key] = value;
         }
@@ -188,10 +250,10 @@ var McContainer = /*#__PURE__*/forwardRef(function (props, ref) {
       return !allNamesRef.current.includes(k) && allNamesRef.current.push(k);
     });
     // 仅支持设置过name属性的查询项（和current、pageSize）
-    Object.entries(params).forEach(function (_ref3) {
-      var _ref4 = _slicedToArray(_ref3, 2),
-        key = _ref4[0],
-        value = _ref4[1];
+    Object.entries(params).forEach(function (_ref4) {
+      var _ref5 = _slicedToArray(_ref4, 2),
+        key = _ref5[0],
+        value = _ref5[1];
       if (allNamesRef.current.includes(key)) {
         _params[key] = value;
       }
@@ -230,6 +292,9 @@ var McContainer = /*#__PURE__*/forwardRef(function (props, ref) {
     queryParamsRef.current = _params;
     setQueryParams(_params);
   };
+  useEffect(function () {
+    setShowBatchBar(batchNum > 0);
+  }, [batchNum]);
 
   // 监听immediateQuery，初始设置默认查询参数并判断是否触发首次查询
   useEffect(function () {
@@ -265,7 +330,7 @@ var McContainer = /*#__PURE__*/forwardRef(function (props, ref) {
         height: height,
         backgroundColor: backgroundColor
       }, style),
-      children: [/*#__PURE__*/_jsx("div", {
+      children: [showCell && /*#__PURE__*/_jsx("div", {
         className: "mc-container__ceiling",
         style: {
           backgroundColor: backgroundColor
@@ -273,7 +338,7 @@ var McContainer = /*#__PURE__*/forwardRef(function (props, ref) {
       }), /*#__PURE__*/_jsxs("div", {
         className: "mc-container__wrapper",
         style: {
-          paddingBottom: tableRender || tableRender === null || (tableProps === null || tableProps === void 0 ? void 0 : tableProps.pagination) === false ? 24 : 64
+          paddingBottom: tableRender || tableRender === null || (tableProps === null || tableProps === void 0 ? void 0 : tableProps.pagination) === false ? 16 : 50
         },
         children: [queryRender || queryRender === null ? queryRender : /*#__PURE__*/_jsxs("div", {
           className: "mc-container__query",
@@ -300,7 +365,8 @@ var McContainer = /*#__PURE__*/forwardRef(function (props, ref) {
               style: {
                 marginLeft: 16,
                 fontSize: 12,
-                padding: 0
+                padding: 0,
+                gap: 4
               },
               onClick: function onClick() {
                 return setCollapse(function (os) {
@@ -309,8 +375,7 @@ var McContainer = /*#__PURE__*/forwardRef(function (props, ref) {
               },
               children: [collapse ? '展开' : '收起', /*#__PURE__*/_jsx(DoubleLeftOutlined, {
                 style: {
-                  fontSize: 12,
-                  marginLeft: 2
+                  fontSize: 12
                 },
                 rotate: collapse ? -90 : 90
               })]
@@ -318,14 +383,14 @@ var McContainer = /*#__PURE__*/forwardRef(function (props, ref) {
           })]
         }), queryRender !== null && /*#__PURE__*/_jsx("div", {
           className: "mc-container__divider"
-        }), actionBar && /*#__PURE__*/_jsx("div", {
+        }), actionBarRender ? actionBarRender(batchEl) : (!!actionBar || !!batchShow) && /*#__PURE__*/_jsx("div", {
           ref: actionBarRef,
           className: "mc-container__action-bar",
           style: {
             backgroundColor: backgroundColor
           },
-          children: actionBar
-        }), batchNum > 0 && /*#__PURE__*/_jsx("div", {
+          children: mapActionBar()
+        }), showBatchBar && /*#__PURE__*/_jsx("div", {
           className: "mc-container__batch-bar",
           style: {
             backgroundColor: backgroundColor,
@@ -343,7 +408,10 @@ var McContainer = /*#__PURE__*/forwardRef(function (props, ref) {
               style: {
                 marginLeft: 'auto'
               },
-              onClick: onCancel,
+              onClick: function onClick() {
+                onCancel === null || onCancel === void 0 || onCancel();
+                setShowBatchBar(false);
+              },
               children: "\u53D6\u6D88"
             })]
           })
@@ -373,13 +441,13 @@ var McContainer = /*#__PURE__*/forwardRef(function (props, ref) {
             pageSize: queryParams.pageSize
           }, tableProps === null || tableProps === void 0 ? void 0 : tableProps.pagination),
           expandable: _objectSpread({
-            expandIcon: function expandIcon(_ref5) {
+            expandIcon: function expandIcon(_ref6) {
               var _tableProps$dataSourc2, _record$children;
-              var expanded = _ref5.expanded,
-                onExpand = _ref5.onExpand,
-                record = _ref5.record;
-              return tableProps !== null && tableProps !== void 0 && (_tableProps$dataSourc2 = tableProps.dataSource) !== null && _tableProps$dataSourc2 !== void 0 && _tableProps$dataSourc2.some(function (_ref6) {
-                var children = _ref6.children;
+              var expanded = _ref6.expanded,
+                onExpand = _ref6.onExpand,
+                record = _ref6.record;
+              return tableProps !== null && tableProps !== void 0 && (_tableProps$dataSourc2 = tableProps.dataSource) !== null && _tableProps$dataSourc2 !== void 0 && _tableProps$dataSourc2.some(function (_ref7) {
+                var children = _ref7.children;
                 return (children === null || children === void 0 ? void 0 : children.length) > 0;
               }) ? ((_record$children = record.children) === null || _record$children === void 0 ? void 0 : _record$children.length) > 0 ? /*#__PURE__*/_jsx(CaretDownFilled, {
                 className: "mc-container__table__expand-icon",

package/dist/McDateRange/index.d.ts

@@ -10,7 +10,7 @@ declare const shortcutValueMap: {
     last60days: string[];
     last90days: string[];
 };
-export declare const SHORTCUTprivateValue_MAP: typeof shortcutValueMap & {
+export declare const SHORTCUT_VALUE_MAP: typeof shortcutValueMap & {
     [key: string]: any;
 };
 export type McDateRangeProps = Omit<RangePickerProps, 'value' | 'onChange'> & {

package/dist/McDateRange/index.js

@@ -18,7 +18,7 @@ var shortcutValueMap = {
   last60days: [dayjs().add(-59, 'd').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')],
   last90days: [dayjs().add(-89, 'd').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')]
 };
-export var SHORTCUTprivateValue_MAP = shortcutValueMap;
+export var SHORTCUT_VALUE_MAP = shortcutValueMap;
 var McDateRange = /*#__PURE__*/forwardRef(function (props, ref) {
   var style = props.style,
     className = props.className,

package/dist/McEllipsisMiddle/demo/base.d.ts

@@ -0,0 +1,6 @@
+/**
+ * title: 基础用法
+ * description: 中间省略号，超出时展示省略号，并且移入会有tooltip
+ */
+declare const _default: () => import("react/jsx-runtime").JSX.Element;
+export default _default;

package/dist/McEllipsisMiddle/demo/base.js

@@ -0,0 +1,25 @@
+/**
+ * title: 基础用法
+ * description: 中间省略号，超出时展示省略号，并且移入会有tooltip
+ */
+
+import { McEllipsisMiddle } from "../..";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+export default (function () {
+  return /*#__PURE__*/_jsxs("div", {
+    children: [/*#__PURE__*/_jsx(McEllipsisMiddle, {
+      style: {
+        width: 250
+      },
+      text: "\u8FD9\u662F\u4E00\u6BB5\u6CA1\u6709\u6EA2\u51FA\u7684\u6587\u5B57",
+      suffixCount: 4
+    }), /*#__PURE__*/_jsx(McEllipsisMiddle, {
+      style: {
+        width: 250
+      },
+      text: "\u8FD9\u662F\u4E00\u6BB5\u6709\u6EA2\u51FA\u7684\u6587\u5B57\uFF0C\u8FD9\u662F\u4E00\u6BB5\u6709\u6EA2\u51FA\u7684\u6587\u5B57",
+      suffixCount: 4
+    })]
+  });
+});