fan-standard-comp 3.2.0 → 3.2.2

package/lib/ButtonGroup/index.js

@@ -11,6 +11,8 @@ require("antd/es/button/style");
 var _button = _interopRequireDefault(require("antd/es/button"));
 require("antd/es/dropdown/style");
 var _dropdown = _interopRequireDefault(require("antd/es/dropdown"));
+require("antd/es/menu/style");
+var _menu = _interopRequireDefault(require("antd/es/menu"));
 var _tslib = require("tslib");
 var _react = _interopRequireWildcard(require("react"));
 var _index = require("../components/index");
@@ -18,21 +20,22 @@ var _index2 = _interopRequireDefault(require("../SpecIcon/index"));
 var _PopConfirmTitle = _interopRequireDefault(require("./PopConfirmTitle"));
 var _index3 = require("../data/index");
 var _icons = require("@ant-design/icons");
-var _filterPermission = require("../utils/filterPermission");
+var _filterPermission = require("../utils/filterPermission.js");
+var _lodash = _interopRequireDefault(require("lodash"));
 require("./style/index.less");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+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; }
 var ButtonGroup = function ButtonGroup(props) {
   var _props$type = props.type,
     type = _props$type === void 0 ? 'button' : _props$type,
@@ -42,16 +45,17 @@ var ButtonGroup = function ButtonGroup(props) {
       record: undefined,
       rowIndex: undefined
     } : _props$rowParams,
-    _props$codes = props.codes,
-    codes = _props$codes === void 0 ? _index3.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 = (0, _react.useState)(-1),
     _useState2 = _slicedToArray(_useState, 2),
@@ -66,8 +70,11 @@ var ButtonGroup = function ButtonGroup(props) {
     resetList = _useState6[0],
     setResetList = _useState6[1];
   (0, _react.useEffect)(function () {
+    // codes在方法内，再合并默认的权限配置
+    // 合并本地的codes
+    var codesConcat = _lodash.default.unionBy(codes || [], _index3.funcCode.btnFuncCodes, 'code');
     // 重组选项options集合数据，排除：无权限（有配置code,并且不包含permissionCodes内）的数据及，isHide 为true的数据
-    setResetList(_toConsumableArray((0, _filterPermission.removeNoPermission)(options, permissionCodes, codes, rowParams)) || []);
+    setResetList(_toConsumableArray((0, _filterPermission.removeNoPermission)(options, permissionCodes, codesConcat, rowParams)) || []);
     return function () {
       setResetList([]);
     };
@@ -75,111 +82,35 @@ var ButtonGroup = function ButtonGroup(props) {
   (0, _react.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 = (0, _tslib.__rest)(vItem, ["code", "fn", "exName", "name", "children", "icon"]);
-      return Object.assign(Object.assign({}, others), {
-        key: code ? code + i : i,
-        icon: /*#__PURE__*/_react.default.createElement(_index.IconNode, {
-          icon: icon
-        }),
-        label: /*#__PURE__*/_react.default.createElement("a", {
-          onClick: function onClick() {
-            return fn && fn(vItem);
-          }
-        }, exName || name),
-        children: children && children.length > 0 ? deepTransButtonMenus(children) : undefined
-      });
-    });
-  };
-  // 自定义渲染显示的文本
-  var renderCustomLabel = function renderCustomLabel(gItem) {
-    return gItem.render ? gItem.render.apply(gItem, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
-      return rowParams[pItem];
-    }))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, gItem.icon ? ' ' : '', gItem.exName || gItem.name);
+  // 渲染按钮多层级形式 (用于筛选)
+  var buttonMenu = function buttonMenu(group) {
+    return /*#__PURE__*/_react.default.createElement(_menu.default, null, group.map(function (item, index) {
+      if (item.children) {
+        return /*#__PURE__*/_react.default.createElement(_menu.default.SubMenu, {
+          title: item.exName || item.name,
+          key: index
+        }, item.children.map(function (child, childIndex) {
+          return /*#__PURE__*/_react.default.createElement(_menu.default.Item, {
+            key: child.name + childIndex
+          }, /*#__PURE__*/_react.default.createElement("a", {
+            onClick: child.fn ? function () {
+              return child.fn(child);
+            } : null
+          }, /*#__PURE__*/_react.default.createElement(_index.IconNode, {
+            icon: child.icon
+          }), " ", child.exName || child.name));
+        }));
+      }
+      return /*#__PURE__*/_react.default.createElement(_menu.default.Item, {
+        key: item.name + index
+      }, /*#__PURE__*/_react.default.createElement("a", {
+        onClick: item.fn ? function () {
+          return item.fn(item);
+        } : null
+      }, /*#__PURE__*/_react.default.createElement(_index.IconNode, {
+        icon: item.icon
+      }), " ", item.exName || item.name));
+    }));
   };
   // 渲染按钮形式 (用于筛选)
   var RenderButtonList = function RenderButtonList(item) {
@@ -196,15 +127,12 @@ var ButtonGroup = function ButtonGroup(props) {
       rowParams = item.rowParams,
       others = (0, _tslib.__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.default.createElement(_dropdown.default, 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.default.createElement(_button.default, {
         type: "primary"
-      }, item.exName || item.name || item.label, " ", /*#__PURE__*/_react.default.createElement(_index2.default, {
+      }, item.exName || item.name, " ", /*#__PURE__*/_react.default.createElement(_index2.default, {
         name: "down"
       })));
     }
@@ -212,6 +140,7 @@ var ButtonGroup = function ButtonGroup(props) {
       type: type || 'primary',
       danger: danger,
       ghost: ghost,
+      loading: loading,
       onClick: fn ? function () {
         return fn(item);
       } : null
@@ -220,51 +149,95 @@ var ButtonGroup = function ButtonGroup(props) {
         icon: icon
       }),
       disabled: (0, _filterPermission.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 = (0, _tslib.__rest)(vItem, ["code", "fn", "exName", "name", "children", "icon", "confirmText", "confirmConfig"]);
+  /*const textMenuItems =  (group) => {
+    return (group || []).map((gItem: any, gIndex) => {
       return {
-        danger: others.danger,
-        disabled: (0, _filterPermission.btnIsDisabled)(others.disabled, rowParams),
-        key: code ? code + i : i,
-        // icon: <IconNode icon={icon}/>, // 不显示图标
-        label: /*#__PURE__*/_react.default.createElement("a", {
-          onClick: function onClick() {
-            // 配置二次确认
-            if (vItem.hasOwnProperty('confirmText') || vItem.hasOwnProperty('confirmConfig')) {
-              fn ? (setPopVisibleIndex(rowParams.rowIndex), setPopRow(vItem)) : null;
-            } else {
-              fn && fn(vItem);
-            }
+        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
           }
-        }, renderCustomLabel(vItem)),
-        title: vItem.exName || vItem.name,
-        children: children && children.length > 0 ? deepTransTextMenus(children) : undefined
-      };
-    });
+        }) : undefined
+      }
+    })
+  }*/
+  // 渲染文本形式多级菜单列表（用于表格）
+  var textMenu = function textMenu(group) {
+    return /*#__PURE__*/_react.default.createElement(_menu.default, {
+      className: "spec-button-text-dropdown"
+    }, group.map(function (gItem, gIndex) {
+      if (gItem.children) {
+        return /*#__PURE__*/_react.default.createElement(_menu.default.SubMenu, {
+          title: gItem.exName || gItem.name,
+          key: gItem.name + gIndex
+        }, gItem.children.map(function (child, childIndex) {
+          return /*#__PURE__*/_react.default.createElement(_menu.default.Item, {
+            key: child.name + childIndex
+          }, /*#__PURE__*/_react.default.createElement("a", {
+            onClick: child.fn ? function () {
+              return child.fn.apply(child, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+                return rowParams[pItem];
+              })));
+            } : null
+          }, child.render ? child.render.apply(child, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+            return rowParams[pItem];
+          }))) : child.exName || child.name));
+        }));
+      }
+      return /*#__PURE__*/_react.default.createElement(_menu.default.Item, {
+        key: gIndex,
+        disabled: (0, _filterPermission.btnIsDisabled)(gItem.disabled, rowParams)
+      }, gItem.hasOwnProperty('confirmText') || gItem.hasOwnProperty('confirmConfig') ?
+      /*#__PURE__*/
+      // @ts-ignore
+      _react.default.createElement("a", {
+        disabled: (0, _filterPermission.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.default.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: (0, _filterPermission.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.default.createElement(_dropdown.default, 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.default.createElement("a", {
         className: "spec-button-group-text"
@@ -307,7 +280,9 @@ var ButtonGroup = function ButtonGroup(props) {
       title: item.exName || item.name,
       // @ts-ignore
       disabled: (0, _filterPermission.btnIsDisabled)(item.disabled, rowParams)
-    }, renderCustomLabel(item))) : /*#__PURE__*/_react.default.createElement("a", {
+    }, item.render ? item.render.apply(item, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+      return rowParams[pItem];
+    }))) : item.exName || item.name)) : /*#__PURE__*/_react.default.createElement("a", {
       className: "spec-button-group-text",
       title: item.exName || item.name,
       key: item.index,
@@ -318,7 +293,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) {
@@ -345,26 +322,21 @@ var ButtonGroup = function ButtonGroup(props) {
   if (resetList.length === 0) {
     return /*#__PURE__*/_react.default.createElement(_react.default.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.default.createElement("span", {
       className: "spec-button-group"
     }, forGroup.map(function (item, index) {
       return index < min - 1 ? renderDisplayButton(item, index) : null;
     }), type === 'button' ? /*#__PURE__*/_react.default.createElement(_dropdown.default, Object.assign({
-      menu: {
-        items: deepTransButtonMenus(forDrop)
-      },
+      overlay: buttonMenu(forDrop),
       placement: "bottomRight"
     }, dropdownConfig), /*#__PURE__*/_react.default.createElement(_button.default, {
       type: "primary"
-    }, moreText, " ", /*#__PURE__*/_react.default.createElement(_index2.default, {
-      name: "down"
-    }))) : /*#__PURE__*/_react.default.createElement(_popconfirm.default, Object.assign({
+    }, moreText || '更多', moreIcon || /*#__PURE__*/_react.default.createElement(_icons.DownOutlined, null))) : /*#__PURE__*/_react.default.createElement(_popconfirm.default, Object.assign({
       placement: "topRight",
-      open: popVisibleIndex === rowParams.rowIndex,
+      visible: popVisibleIndex === rowParams.rowIndex,
       icon: /*#__PURE__*/_react.default.createElement(_icons.QuestionCircleOutlined, null),
       trigger: "click"
     }, popRow.hasOwnProperty('confirmConfig') ? popRow.confirmConfig : {}, {
@@ -396,20 +368,16 @@ var ButtonGroup = function ButtonGroup(props) {
         }
       }
     }), /*#__PURE__*/_react.default.createElement(_dropdown.default, Object.assign({
-      menu: {
-        items: deepTransTextMenus(forDrop)
-      },
+      overlay: textMenu(forDrop),
       placement: "bottomRight"
     }, dropdownConfig), /*#__PURE__*/_react.default.createElement("a", {
       className: "spec-button-group-text"
-    }, moreText, " ", /*#__PURE__*/_react.default.createElement(_icons.DownOutlined, null)))));
+    }, moreText || '更多', moreIcon || /*#__PURE__*/_react.default.createElement(_icons.DownOutlined, null)))));
   }
-  // 数量不超出时渲染
   return /*#__PURE__*/_react.default.createElement("span", {
     className: "spec-button-group"
   }, resetList.map(function (item, index) {
     return renderDisplayButton(item, index);
   }));
 };
-var _default = ButtonGroup;
-exports.default = _default;
+var _default = exports.default = ButtonGroup;

package/lib/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/lib/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/lib/CalendarCoordPicker/CalendarMonthPicker.js

@@ -0,0 +1,36 @@
+"use strict";
+
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+require("antd/es/calendar/style");
+var _calendar = _interopRequireDefault(require("antd/es/calendar"));
+var _tslib = require("tslib");
+var _react = _interopRequireWildcard(require("react"));
+require("./index.less");
+var _moment = _interopRequireDefault(require("moment"));
+require("moment/locale/zh-cn");
+var _zh_CN = _interopRequireDefault(require("antd/es/date-picker/locale/zh_CN"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+var CalendarMonthPicker = function CalendarMonthPicker(props) {
+  var year = props.year,
+    month = props.month,
+    others = (0, _tslib.__rest)(props, ["year", "month"]);
+  var monthRangeDays = (0, _react.useMemo)(function () {
+    var time = (year || (0, _moment.default)().year()) + '-01';
+    var startTime = (0, _moment.default)(time).month(month - 1).date(1).startOf("month"); //.format('YYYY-MM-DD')
+    var endTime = (0, _moment.default)(time).month(month - 1).date(1).endOf("month"); //.format('YYYY-MM-DD')
+    return [startTime, endTime];
+  }, [year]);
+  return /*#__PURE__*/_react.default.createElement(_calendar.default, Object.assign({
+    fullscreen: false,
+    value: (0, _moment.default)((year || (0, _moment.default)().year()) + '-' + month),
+    validRange: monthRangeDays,
+    locale: _zh_CN.default
+  }, others));
+};
+var _default = exports.default = CalendarMonthPicker;

package/lib/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;