fan-standard-comp 3.2.1 → 3.2.3

package/es/ButtonGroup/ButtonList.d.ts

@@ -1,2 +1,3 @@
-declare const RenderButtonList: (item: any) => JSX.Element;
+import React from "react";
+declare const RenderButtonList: (item: any) => React.JSX.Element;
 export default RenderButtonList;

package/es/ButtonGroup/ButtonMenu.d.ts

@@ -1,2 +1,3 @@
-declare const RenderButtonList: (group: any) => JSX.Element;
+import React from "react";
+declare const RenderButtonList: (group: any) => React.JSX.Element;
 export default RenderButtonList;

package/es/ButtonGroup/PopConfirmTitle.js

@@ -1,9 +1,9 @@
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 import React from "react";
 // 气泡确认框标题配置
 var PopConfirmTitle = function PopConfirmTitle(propsData) {

package/es/ButtonGroup/index.d.ts

@@ -27,6 +27,8 @@ interface ButtonGroupProps {
     options?: ButtonGroupOptionsProps[];
     min?: number;
     dropdownConfig?: Object;
+    moreText?: string;
+    moreIcon?: React.ReactNode | string | number;
 }
-declare const ButtonGroup: (props: ButtonGroupProps) => JSX.Element;
+declare const ButtonGroup: (props: ButtonGroupProps) => React.JSX.Element;
 export default ButtonGroup;

package/es/ButtonGroup/index.js

@@ -4,16 +4,18 @@ import "antd/es/button/style";
 import _Button from "antd/es/button";
 import "antd/es/dropdown/style";
 import _Dropdown from "antd/es/dropdown";
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+import "antd/es/menu/style";
+import _Menu from "antd/es/menu";
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0) { ; } } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 import { __rest } from "tslib";
 import React, { useState, useEffect } from "react";
 import { IconNode } from "../components/index";
@@ -21,7 +23,8 @@ import SpecIcon from "../SpecIcon/index";
 import PopConfirmTitle from './PopConfirmTitle';
 import { funcCode } from "../data/index";
 import { DownOutlined, QuestionCircleOutlined } from "@ant-design/icons";
-import { removeNoPermission, btnIsDisabled } from '../utils/filterPermission';
+import { removeNoPermission, btnIsDisabled } from '../utils/filterPermission.js';
+import _ from 'lodash';
 import './style/index.less';
 var ButtonGroup = function ButtonGroup(props) {
   var _props$type = props.type,
@@ -32,16 +35,17 @@ var ButtonGroup = function ButtonGroup(props) {
       record: undefined,
       rowIndex: undefined
     } : _props$rowParams,
-    _props$codes = props.codes,
-    codes = _props$codes === void 0 ? funcCode.btnFuncCodes : _props$codes,
+    codes = props.codes,
     permissionCodes = props.permissionCodes,
     _props$dropdownConfig = props.dropdownConfig,
-    dropdownConfig = _props$dropdownConfig === void 0 ? {} : _props$dropdownConfig;
+    dropdownConfig = _props$dropdownConfig === void 0 ? {} : _props$dropdownConfig,
+    _props$moreText = props.moreText,
+    moreText = _props$moreText === void 0 ? '更多' : _props$moreText,
+    moreIcon = props.moreIcon;
   var _props$options = props.options,
     options = _props$options === void 0 ? [] : _props$options,
     _props$min = props.min,
     min = _props$min === void 0 ? 3 : _props$min; // 最小展示长度不能小于2
-  var moreText = '更多';
   if (!options) return null; // 没有配置list返回null
   var _useState = useState(-1),
     _useState2 = _slicedToArray(_useState, 2),
@@ -56,8 +60,11 @@ var ButtonGroup = function ButtonGroup(props) {
     resetList = _useState6[0],
     setResetList = _useState6[1];
   useEffect(function () {
+    // codes在方法内，再合并默认的权限配置
+    // 合并本地的codes
+    var codesConcat = _.unionBy(codes || [], funcCode.btnFuncCodes, 'code');
     // 重组选项options集合数据，排除：无权限（有配置code,并且不包含permissionCodes内）的数据及，isHide 为true的数据
-    setResetList(_toConsumableArray(removeNoPermission(options, permissionCodes, codes, rowParams)) || []);
+    setResetList(_toConsumableArray(removeNoPermission(options, permissionCodes, codesConcat, rowParams)) || []);
     return function () {
       setResetList([]);
     };
@@ -65,112 +72,35 @@ var ButtonGroup = function ButtonGroup(props) {
   useEffect(function () {
     setPopVisibleIndex(-1);
   }, [rowParams]);
-  /*  // 渲染按钮多层级形式 (用于筛选)
-    const buttonMenu = (group: any) => {
-      return (<Menu>
-        {
-          group.map((item: any, index: number) => {
-            if (item.children) {
-              return <Menu.SubMenu title={item.exName || item.name} key={index}>
-                {
-                  item.children.map((child: any, childIndex: number) => {
-                    return (<Menu.Item key={childIndex}>
-                      <a onClick={child.fn ? () => child.fn(child) : null}
-                      >
-                        <IconNode icon={child.icon}/> {child.exName || child.name}
-                      </a>
-                    </Menu.Item>)
-                  })
-                }
-              </Menu.SubMenu>
-            }
-            return (
-              <Menu.Item key={index}>
-                <a onClick={item.fn ? () => item.fn(item) : null}>
-                  <IconNode icon={item.icon}/> {item.exName || item.name}
-                </a>
-              </Menu.Item>
-            )
-          })
-        }
-      </Menu>)
-    };
-    // 渲染文本形式多级菜单列表（用于表格）
-    const textMenu = (group: any[]) => {
-      return (
-        <Menu className="spec-button-text-dropdown">
-          {
-            group.map((gItem: any, gIndex: number) => {
-  
-              if (gItem.children) {
-                return <Menu.SubMenu title={gItem.exName || gItem.name} key={gItem}>
-                  {
-                    gItem.children.map((child: any, childIndex: number) => <Menu.Item key={childIndex}>
-                      <a onClick={child.fn ? () => child.fn(...Object.keys(rowParams).map((pItem) => rowParams[pItem])) : null}>
-                        {child.render ? child.render(...Object.keys(rowParams).map((pItem) => rowParams[pItem])) : (child.exName || child.name)}
-                      </a>
-                    </Menu.Item>)
-                  }
-                </Menu.SubMenu>
-              }
-              return <Menu.Item key={gIndex}
-                                disabled={btnIsDisabled(gItem.disabled, rowParams)}>
-                {
-                  gItem.hasOwnProperty('confirmText') || gItem.hasOwnProperty('confirmConfig') ?
-                    // @ts-ignore
-                    <a disabled={btnIsDisabled(gItem.disabled, rowParams)}
-                       onClick={gItem.fn ? () => {
-                         setPopVisibleIndex(rowParams.rowIndex)
-                         setPopRow(gItem)
-                       } : null}>
-                      {gItem.render ? gItem.render(...Object.keys(rowParams).map((pItem) => rowParams[pItem])) : (gItem.exName || gItem.name)}
-                    </a>
-                    : <a className="spec-button-group-text"
-                         onClick={gItem.fn ? () => gItem.fn(...Object.keys(rowParams).map((pItem) => rowParams[pItem])) : null}
-                      // @ts-ignore
-                         disabled={btnIsDisabled(gItem.disabled, rowParams)}>
-                      {gItem.render ? gItem.render(...Object.keys(rowParams).map((pItem) => rowParams[pItem])) : (gItem.exName || gItem.name)}
-                    </a>
-                }
-              </Menu.Item>
-            })
-          }
-        </Menu>
-      )
-    };*/
-  // 递归转换原来的数组结构
-  var deepTransButtonMenus = function deepTransButtonMenus(groupArray) {
-    if (!Array.isArray(groupArray)) {
-      return [];
-    }
-    return groupArray.map(function (vItem, i) {
-      var code = vItem.code,
-        fn = vItem.fn,
-        exName = vItem.exName,
-        name = vItem.name,
-        children = vItem.children,
-        icon = vItem.icon,
-        others = __rest(vItem, ["code", "fn", "exName", "name", "children", "icon"]);
-      return Object.assign(Object.assign({}, others), {
-        key: code ? code + i : i,
-        icon: /*#__PURE__*/React.createElement(IconNode, {
-          icon: icon
-        }),
-        label: /*#__PURE__*/React.createElement("a", {
-          onClick: function onClick() {
-            return fn && fn(vItem);
-          }
-        }, exName || name),
-        children: children && children.length > 0 ? deepTransButtonMenus(children) : undefined
-      });
-    });
-  };
-  // {gItem.render ? gItem.render(...Object.keys(rowParams).map((pItem) => rowParams[pItem])) : (gItem.exName || gItem.name)}
-  // 自定义渲染显示的文本
-  var renderCustomLabel = function renderCustomLabel(gItem) {
-    return gItem.render ? gItem.render.apply(gItem, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
-      return rowParams[pItem];
-    }))) : /*#__PURE__*/React.createElement(React.Fragment, null, gItem.icon ? ' ' : '', gItem.exName || gItem.name);
+  // 渲染按钮多层级形式 (用于筛选)
+  var buttonMenu = function buttonMenu(group) {
+    return /*#__PURE__*/React.createElement(_Menu, null, group.map(function (item, index) {
+      if (item.children) {
+        return /*#__PURE__*/React.createElement(_Menu.SubMenu, {
+          title: item.exName || item.name,
+          key: index
+        }, item.children.map(function (child, childIndex) {
+          return /*#__PURE__*/React.createElement(_Menu.Item, {
+            key: child.name + childIndex
+          }, /*#__PURE__*/React.createElement("a", {
+            onClick: child.fn ? function () {
+              return child.fn(child);
+            } : null
+          }, /*#__PURE__*/React.createElement(IconNode, {
+            icon: child.icon
+          }), " ", child.exName || child.name));
+        }));
+      }
+      return /*#__PURE__*/React.createElement(_Menu.Item, {
+        key: item.name + index
+      }, /*#__PURE__*/React.createElement("a", {
+        onClick: item.fn ? function () {
+          return item.fn(item);
+        } : null
+      }, /*#__PURE__*/React.createElement(IconNode, {
+        icon: item.icon
+      }), " ", item.exName || item.name));
+    }));
   };
   // 渲染按钮形式 (用于筛选)
   var RenderButtonList = function RenderButtonList(item) {
@@ -187,15 +117,12 @@ var ButtonGroup = function ButtonGroup(props) {
       rowParams = item.rowParams,
       others = __rest(item, ["exName", "name", "type", "icon", "ghost", "danger", "disabled", "loading", "fn", "code", "rowParams"]);
     if (Array.isArray(item.children) && item.children.length > 0) {
-      // overlay={buttonMenu(item.children)}
       return /*#__PURE__*/React.createElement(_Dropdown, Object.assign({
-        menu: {
-          items: deepTransButtonMenus(item.children)
-        },
+        overlay: buttonMenu(item.children),
         placement: "bottomRight"
       }, (item === null || item === void 0 ? void 0 : item.dropdownConfig) || dropdownConfig || {}), /*#__PURE__*/React.createElement(_Button, {
         type: "primary"
-      }, item.exName || item.name || item.label, " ", /*#__PURE__*/React.createElement(SpecIcon, {
+      }, item.exName || item.name, " ", /*#__PURE__*/React.createElement(SpecIcon, {
         name: "down"
       })));
     }
@@ -203,6 +130,7 @@ var ButtonGroup = function ButtonGroup(props) {
       type: type || 'primary',
       danger: danger,
       ghost: ghost,
+      loading: loading,
       onClick: fn ? function () {
         return fn(item);
       } : null
@@ -211,53 +139,95 @@ var ButtonGroup = function ButtonGroup(props) {
         icon: icon
       }),
       disabled: btnIsDisabled(disabled, rowParams)
-    }), exName || name || others.label);
+    }), exName || name);
   };
-  // 递归转换原来的数组结构
-  var deepTransTextMenus = function deepTransTextMenus(groupArray) {
-    if (!Array.isArray(groupArray)) {
-      return [];
-    }
-    return groupArray.map(function (vItem, i) {
-      var code = vItem.code,
-        fn = vItem.fn,
-        exName = vItem.exName,
-        name = vItem.name,
-        children = vItem.children,
-        icon = vItem.icon,
-        confirmText = vItem.confirmText,
-        confirmConfig = vItem.confirmConfig,
-        others = __rest(vItem, ["code", "fn", "exName", "name", "children", "icon", "confirmText", "confirmConfig"]);
+  /*const textMenuItems =  (group) => {
+    return (group || []).map((gItem: any, gIndex) => {
       return {
-        danger: others.danger,
-        disabled: btnIsDisabled(others.disabled, rowParams),
-        key: code ? code + i : i,
-        // icon: <IconNode icon={icon}/>, // 不显示图标
-        label: /*#__PURE__*/React.createElement("a", {
-          onClick: function onClick() {
-            // 配置二次确认
-            if (vItem.hasOwnProperty('confirmText') || vItem.hasOwnProperty('confirmConfig')) {
-              fn ? (setPopVisibleIndex(rowParams.rowIndex), setPopRow(vItem)) : null;
-            } else {
-              fn && fn.apply(void 0, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+        disabled: btnIsDisabled(gItem.disabled, rowParams),
+        label: gItem.hasOwnProperty('confirmText') || gItem.hasOwnProperty('confirmConfig') ?
+          // @ts-ignore
+          <a disabled={btnIsDisabled(gItem.disabled, rowParams)}
+             onClick={gItem.fn ? () => {
+               setPopVisibleIndex(rowParams.rowIndex)
+               setPopRow(gItem)
+             } : null}>
+            {gItem.render ? gItem.render(...Object.keys(rowParams).map((pItem) => rowParams[pItem])) : (gItem.exName || gItem.name)}
+          </a>
+          : <a className="spec-button-group-text"
+               onClick={gItem.fn ? () => gItem.fn(...Object.keys(rowParams).map((pItem) => rowParams[pItem])) : null}
+            // @ts-ignore
+               disabled={btnIsDisabled(gItem.disabled, rowParams)}>
+            {gItem.render ? gItem.render(...Object.keys(rowParams).map((pItem) => rowParams[pItem])) : (gItem.exName || gItem.name)}
+          </a>,
+        key: gIndex + (gItem.exName || gItem.name),
+        children: gItem.children ? (gItem.children || []).map((child: any, childIndex: number) => {
+          return {
+            label: <a onClick={child.fn ? () => child.fn(...Object.keys(rowParams).map((pItem) => rowParams[pItem])) : null}>
+              {child.render ? child.render(...Object.keys(rowParams).map((pItem) => rowParams[pItem])) : (child.exName || child.name)}
+            </a>,
+            key: childIndex
+          }
+        }) : undefined
+      }
+    })
+  }*/
+  // 渲染文本形式多级菜单列表（用于表格）
+  var textMenu = function textMenu(group) {
+    return /*#__PURE__*/React.createElement(_Menu, {
+      className: "spec-button-text-dropdown"
+    }, group.map(function (gItem, gIndex) {
+      if (gItem.children) {
+        return /*#__PURE__*/React.createElement(_Menu.SubMenu, {
+          title: gItem.exName || gItem.name,
+          key: gItem.name + gIndex
+        }, gItem.children.map(function (child, childIndex) {
+          return /*#__PURE__*/React.createElement(_Menu.Item, {
+            key: child.name + childIndex
+          }, /*#__PURE__*/React.createElement("a", {
+            onClick: child.fn ? function () {
+              return child.fn.apply(child, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
                 return rowParams[pItem];
               })));
-            }
-          }
-        }, renderCustomLabel(vItem)),
-        title: vItem.exName || vItem.name,
-        children: children && children.length > 0 ? deepTransTextMenus(children) : undefined
-      };
-    });
+            } : null
+          }, child.render ? child.render.apply(child, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+            return rowParams[pItem];
+          }))) : child.exName || child.name));
+        }));
+      }
+      return /*#__PURE__*/React.createElement(_Menu.Item, {
+        key: gIndex,
+        disabled: btnIsDisabled(gItem.disabled, rowParams)
+      }, gItem.hasOwnProperty('confirmText') || gItem.hasOwnProperty('confirmConfig') ?
+      /*#__PURE__*/
+      // @ts-ignore
+      React.createElement("a", {
+        disabled: btnIsDisabled(gItem.disabled, rowParams),
+        onClick: gItem.fn ? function () {
+          setPopVisibleIndex(rowParams.rowIndex);
+          setPopRow(gItem);
+        } : null
+      }, gItem.render ? gItem.render.apply(gItem, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+        return rowParams[pItem];
+      }))) : gItem.exName || gItem.name) : /*#__PURE__*/React.createElement("a", {
+        className: "spec-button-group-text",
+        onClick: gItem.fn ? function () {
+          return gItem.fn.apply(gItem, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+            return rowParams[pItem];
+          })));
+        } : null,
+        // @ts-ignore
+        disabled: btnIsDisabled(gItem.disabled, rowParams)
+      }, gItem.render ? gItem.render.apply(gItem, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+        return rowParams[pItem];
+      }))) : gItem.exName || gItem.name));
+    }));
   };
   // 渲染文本形式 列表（用于表格）
   var RenderTextList = function RenderTextList(item) {
     if (Array.isArray(item.children) && item.children.length > 0) {
-      // overlay={textMenu(item.children)}
       return /*#__PURE__*/React.createElement(_Dropdown, Object.assign({
-        menu: {
-          items: deepTransTextMenus(item.children)
-        },
+        overlay: textMenu(item.children),
         placement: "bottomRight"
       }, (item === null || item === void 0 ? void 0 : item.dropdownConfig) || dropdownConfig || {}), /*#__PURE__*/React.createElement("a", {
         className: "spec-button-group-text"
@@ -300,7 +270,9 @@ var ButtonGroup = function ButtonGroup(props) {
       title: item.exName || item.name,
       // @ts-ignore
       disabled: btnIsDisabled(item.disabled, rowParams)
-    }, renderCustomLabel(item))) : /*#__PURE__*/React.createElement("a", {
+    }, item.render ? item.render.apply(item, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+      return rowParams[pItem];
+    }))) : item.exName || item.name)) : /*#__PURE__*/React.createElement("a", {
       className: "spec-button-group-text",
       title: item.exName || item.name,
       key: item.index,
@@ -311,7 +283,9 @@ var ButtonGroup = function ButtonGroup(props) {
           return rowParams[pItem];
         })));
       } : null
-    }, renderCustomLabel(item)));
+    }, item.render ? item.render.apply(item, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+      return rowParams[pItem];
+    }))) : item.exName || item.name));
   };
   // 渲染展示的按钮列表
   var renderDisplayButton = function renderDisplayButton(item, index) {
@@ -338,26 +312,21 @@ var ButtonGroup = function ButtonGroup(props) {
   if (resetList.length === 0) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, type !== 'button' ? '-' : null);
   }
-  // 数量超出时渲染
   if (resetList.length > min) {
-    var forGroup = resetList.slice(0, min - 1); // 平铺组合内
-    var forDrop = resetList.slice(min - 1); // 下拉组合内
+    var forGroup = resetList.slice(0, min - 1);
+    var forDrop = resetList.slice(min - 1);
     return /*#__PURE__*/React.createElement("span", {
       className: "spec-button-group"
     }, forGroup.map(function (item, index) {
       return index < min - 1 ? renderDisplayButton(item, index) : null;
     }), type === 'button' ? /*#__PURE__*/React.createElement(_Dropdown, Object.assign({
-      menu: {
-        items: deepTransButtonMenus(forDrop)
-      },
+      overlay: buttonMenu(forDrop),
       placement: "bottomRight"
     }, dropdownConfig), /*#__PURE__*/React.createElement(_Button, {
       type: "primary"
-    }, moreText, " ", /*#__PURE__*/React.createElement(SpecIcon, {
-      name: "down"
-    }))) : /*#__PURE__*/React.createElement(_Popconfirm, Object.assign({
+    }, moreText || '更多', moreIcon || /*#__PURE__*/React.createElement(DownOutlined, null))) : /*#__PURE__*/React.createElement(_Popconfirm, Object.assign({
       placement: "topRight",
-      open: popVisibleIndex === rowParams.rowIndex,
+      visible: popVisibleIndex === rowParams.rowIndex,
       icon: /*#__PURE__*/React.createElement(QuestionCircleOutlined, null),
       trigger: "click"
     }, popRow.hasOwnProperty('confirmConfig') ? popRow.confirmConfig : {}, {
@@ -389,15 +358,12 @@ var ButtonGroup = function ButtonGroup(props) {
         }
       }
     }), /*#__PURE__*/React.createElement(_Dropdown, Object.assign({
-      menu: {
-        items: deepTransTextMenus(forDrop)
-      },
+      overlay: textMenu(forDrop),
       placement: "bottomRight"
     }, dropdownConfig), /*#__PURE__*/React.createElement("a", {
       className: "spec-button-group-text"
-    }, moreText, " ", /*#__PURE__*/React.createElement(DownOutlined, null)))));
+    }, moreText || '更多', moreIcon || /*#__PURE__*/React.createElement(DownOutlined, null)))));
   }
-  // 数量不超出时渲染
   return /*#__PURE__*/React.createElement("span", {
     className: "spec-button-group"
   }, resetList.map(function (item, index) {

package/es/ButtonGroup/style/index.less

@@ -8,6 +8,9 @@
   .ant-btn + .ant-btn {
     margin-left: @padding-sm;
   }
+  .spec-button-group-text {
+    display: inline-block;
+  }
   .spec-button-group-text + .spec-button-group-text {
     position: relative;
     margin-left: @padding-sm;
@@ -15,7 +18,7 @@
       position: absolute;
       content: '';
       top: 50%;
-      left: -(@padding-sm/2);
+      left: calc(-@padding-sm/2);
       transform: translate(0, -50%);
       display: inline-block;
       height: .9em;

package/es/CalendarCoordPicker/CalendarMonthPicker.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import './index.less';
+import 'moment/locale/zh-cn';
+declare const CalendarMonthPicker: (props: any) => React.JSX.Element;
+export default CalendarMonthPicker;

package/es/CalendarCoordPicker/CalendarMonthPicker.js

@@ -0,0 +1,26 @@
+import "antd/es/calendar/style";
+import _Calendar from "antd/es/calendar";
+import { __rest } from "tslib";
+import React, { useMemo } from 'react';
+import './index.less';
+import moment from 'moment';
+import 'moment/locale/zh-cn';
+import locale from 'antd/es/date-picker/locale/zh_CN';
+var CalendarMonthPicker = function CalendarMonthPicker(props) {
+  var year = props.year,
+    month = props.month,
+    others = __rest(props, ["year", "month"]);
+  var monthRangeDays = useMemo(function () {
+    var time = (year || moment().year()) + '-01';
+    var startTime = moment(time).month(month - 1).date(1).startOf("month"); //.format('YYYY-MM-DD')
+    var endTime = moment(time).month(month - 1).date(1).endOf("month"); //.format('YYYY-MM-DD')
+    return [startTime, endTime];
+  }, [year]);
+  return /*#__PURE__*/React.createElement(_Calendar, Object.assign({
+    fullscreen: false,
+    value: moment((year || moment().year()) + '-' + month),
+    validRange: monthRangeDays,
+    locale: locale
+  }, others));
+};
+export default CalendarMonthPicker;

package/es/CalendarCoordPicker/index.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import './index.less';
+interface CalendarCoordPickerProps {
+    type: string;
+    year?: number;
+}
+declare const CalendarCoordPicker: (props: CalendarCoordPickerProps) => React.JSX.Element;
+export default CalendarCoordPicker;