fan-standard-comp 3.1.10 → 3.2.1

package/lib/ButtonGroup/index.js

@@ -1,108 +1,70 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
+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/popconfirm/style");
-
 var _popconfirm = _interopRequireDefault(require("antd/es/popconfirm"));
-
 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");
-
 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.js");
-
+var _filterPermission = require("../utils/filterPermission");
 require("./style/index.less");
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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 _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 _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" && Symbol.iterator in Object(iter)) return Array.from(iter); }
-
+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 _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(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+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; }
-
 var ButtonGroup = function ButtonGroup(props) {
   var _props$type = props.type,
-      type = _props$type === void 0 ? 'button' : _props$type,
-      _props$rowParams = props.rowParams,
-      rowParams = _props$rowParams === void 0 ? {
-    text: undefined,
-    record: undefined,
-    rowIndex: undefined
-  } : _props$rowParams,
-      _props$codes = props.codes,
-      codes = _props$codes === void 0 ? _index3.funcCode.btnFuncCodes : _props$codes,
-      permissionCodes = props.permissionCodes,
-      _props$dropdownConfig = props.dropdownConfig,
-      dropdownConfig = _props$dropdownConfig === void 0 ? {} : _props$dropdownConfig;
+    type = _props$type === void 0 ? 'button' : _props$type,
+    _props$rowParams = props.rowParams,
+    rowParams = _props$rowParams === void 0 ? {
+      text: undefined,
+      record: undefined,
+      rowIndex: undefined
+    } : _props$rowParams,
+    _props$codes = props.codes,
+    codes = _props$codes === void 0 ? _index3.funcCode.btnFuncCodes : _props$codes,
+    permissionCodes = props.permissionCodes,
+    _props$dropdownConfig = props.dropdownConfig,
+    dropdownConfig = _props$dropdownConfig === void 0 ? {} : _props$dropdownConfig;
   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
-
+    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),
-      popVisibleIndex = _useState2[0],
-      setPopVisibleIndex = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    popVisibleIndex = _useState2[0],
+    setPopVisibleIndex = _useState2[1];
   var _useState3 = (0, _react.useState)({}),
-      _useState4 = _slicedToArray(_useState3, 2),
-      popRow = _useState4[0],
-      setPopRow = _useState4[1];
-
+    _useState4 = _slicedToArray(_useState3, 2),
+    popRow = _useState4[0],
+    setPopRow = _useState4[1];
   var _useState5 = (0, _react.useState)([]),
-      _useState6 = _slicedToArray(_useState5, 2),
-      resetList = _useState6[0],
-      setResetList = _useState6[1];
-
+    _useState6 = _slicedToArray(_useState5, 2),
+    resetList = _useState6[0],
+    setResetList = _useState6[1];
   (0, _react.useEffect)(function () {
     // 重组选项options集合数据，排除：无权限（有配置code,并且不包含permissionCodes内）的数据及，isHide 为true的数据
     setResetList(_toConsumableArray((0, _filterPermission.removeNoPermission)(options, permissionCodes, codes, rowParams)) || []);
@@ -112,65 +74,141 @@ var ButtonGroup = function ButtonGroup(props) {
   }, [options, codes, permissionCodes]);
   (0, _react.useEffect)(function () {
     setPopVisibleIndex(-1);
-  }, [rowParams]); // 渲染按钮多层级形式 (用于筛选)
-
-  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: 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: 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));
-    }));
-  }; // 渲染按钮形式 (用于筛选)
-
-
+  }, [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
+      });
+    });
+  };
+  // {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.default.createElement(_react.default.Fragment, null, gItem.icon ? ' ' : '', gItem.exName || gItem.name);
+  };
+  // 渲染按钮形式 (用于筛选)
   var RenderButtonList = function RenderButtonList(item) {
     var exName = item.exName,
-        name = item.name,
-        type = item.type,
-        icon = item.icon,
-        ghost = item.ghost,
-        danger = item.danger,
-        disabled = item.disabled,
-        loading = item.loading,
-        fn = item.fn,
-        code = item.code,
-        rowParams = item.rowParams,
-        others = (0, _tslib.__rest)(item, ["exName", "name", "type", "icon", "ghost", "danger", "disabled", "loading", "fn", "code", "rowParams"]);
-
+      name = item.name,
+      type = item.type,
+      icon = item.icon,
+      ghost = item.ghost,
+      danger = item.danger,
+      disabled = item.disabled,
+      loading = item.loading,
+      fn = item.fn,
+      code = item.code,
+      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({
-        overlay: buttonMenu(item.children),
+        menu: {
+          items: deepTransButtonMenus(item.children)
+        },
         placement: "bottomRight"
       }, (item === null || item === void 0 ? void 0 : item.dropdownConfig) || dropdownConfig || {}), /*#__PURE__*/_react.default.createElement(_button.default, {
         type: "primary"
-      }, "ss", item.exName || item.name, " ", /*#__PURE__*/_react.default.createElement(_index2.default, {
+      }, item.exName || item.name || item.label, " ", /*#__PURE__*/_react.default.createElement(_index2.default, {
         name: "down"
       })));
     }
-
     return /*#__PURE__*/_react.default.createElement(_button.default, Object.assign({
       type: type || 'primary',
       danger: danger,
@@ -183,99 +221,53 @@ var ButtonGroup = function ButtonGroup(props) {
         icon: icon
       }),
       disabled: (0, _filterPermission.btnIsDisabled)(disabled, rowParams)
-    }), exName || name);
+    }), exName || name || others.label);
   };
-  /*const textMenuItems =  (group) => {
-    return (group || []).map((gItem: any, gIndex) => {
+  // 递归转换原来的数组结构
+  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"]);
       return {
-        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.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
-        }, gItem.children.map(function (child, childIndex) {
-          return /*#__PURE__*/_react.default.createElement(_menu.default.Item, {
-            key: childIndex
-          }, /*#__PURE__*/_react.default.createElement("a", {
-            onClick: child.fn ? function () {
-              return child.fn.apply(child, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+        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.apply(void 0, _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));
-    }));
-  }; // 渲染文本形式 列表（用于表格）
-
-
+            }
+          }
+        }, renderCustomLabel(vItem)),
+        title: vItem.exName || vItem.name,
+        children: children && children.length > 0 ? deepTransTextMenus(children) : undefined
+      };
+    });
+  };
+  // 渲染文本形式 列表（用于表格）
   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({
-        overlay: textMenu(item.children),
+        menu: {
+          items: deepTransTextMenus(item.children)
+        },
         placement: "bottomRight"
       }, (item === null || item === void 0 ? void 0 : item.dropdownConfig) || dropdownConfig || {}), /*#__PURE__*/_react.default.createElement("a", {
         className: "spec-button-group-text"
@@ -285,7 +277,6 @@ var ButtonGroup = function ButtonGroup(props) {
         name: "down"
       })));
     }
-
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, item.hasOwnProperty('confirmText') || item.hasOwnProperty('confirmConfig') ? /*#__PURE__*/_react.default.createElement(_popconfirm.default, Object.assign({
       placement: "topRight",
       icon: /*#__PURE__*/_react.default.createElement(_icons.QuestionCircleOutlined, null)
@@ -296,7 +287,6 @@ var ButtonGroup = function ButtonGroup(props) {
       onCancel: function onCancel() {
         if (item.hasOwnProperty('confirmConfig') && item.confirmConfig.onCancel) {
           var _item$confirmConfig;
-
           (_item$confirmConfig = item.confirmConfig).onCancel.apply(_item$confirmConfig, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
             return rowParams[pItem];
           })));
@@ -305,7 +295,6 @@ var ButtonGroup = function ButtonGroup(props) {
       onConfirm: function onConfirm() {
         if (item.hasOwnProperty('confirmConfig') && item.confirmConfig.onConfirm) {
           var _item$confirmConfig2;
-
           (_item$confirmConfig2 = item.confirmConfig).onConfirm.apply(_item$confirmConfig2, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
             return rowParams[pItem];
           })));
@@ -321,9 +310,7 @@ var ButtonGroup = function ButtonGroup(props) {
       title: item.exName || item.name,
       // @ts-ignore
       disabled: (0, _filterPermission.btnIsDisabled)(item.disabled, rowParams)
-    }, 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", {
+    }, renderCustomLabel(item))) : /*#__PURE__*/_react.default.createElement("a", {
       className: "spec-button-group-text",
       title: item.exName || item.name,
       key: item.index,
@@ -334,12 +321,9 @@ var ButtonGroup = function ButtonGroup(props) {
           return rowParams[pItem];
         })));
       } : null
-    }, item.render ? item.render.apply(item, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
-      return rowParams[pItem];
-    }))) : item.exName || item.name));
-  }; // 渲染展示的按钮列表
-
-
+    }, renderCustomLabel(item)));
+  };
+  // 渲染展示的按钮列表
   var renderDisplayButton = function renderDisplayButton(item, index) {
     /*渲染自定义*/
     if (item.render) {
@@ -348,8 +332,6 @@ var ButtonGroup = function ButtonGroup(props) {
       }))) : item.render);
     }
     /*渲染按钮形式*/
-
-
     if (type === 'button') {
       return /*#__PURE__*/_react.default.createElement(RenderButtonList, Object.assign({
         key: index
@@ -358,36 +340,34 @@ var ButtonGroup = function ButtonGroup(props) {
       }));
     }
     /*渲染文本形式*/
-
-
     return /*#__PURE__*/_react.default.createElement(RenderTextList, Object.assign({
       key: index
     }, item));
   };
-
   if (min < 2) min = 2;
-
   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({
-      overlay: buttonMenu(forDrop),
+      menu: {
+        items: deepTransButtonMenus(forDrop)
+      },
       placement: "bottomRight"
     }, dropdownConfig), /*#__PURE__*/_react.default.createElement(_button.default, {
       type: "primary"
-    }, "\u66F4\u591A ", /*#__PURE__*/_react.default.createElement(_index2.default, {
+    }, moreText, " ", /*#__PURE__*/_react.default.createElement(_index2.default, {
       name: "down"
     }))) : /*#__PURE__*/_react.default.createElement(_popconfirm.default, Object.assign({
       placement: "topRight",
-      visible: popVisibleIndex === rowParams.rowIndex,
+      open: popVisibleIndex === rowParams.rowIndex,
       icon: /*#__PURE__*/_react.default.createElement(_icons.QuestionCircleOutlined, null),
       trigger: "click"
     }, popRow.hasOwnProperty('confirmConfig') ? popRow.confirmConfig : {}, {
@@ -395,22 +375,20 @@ var ButtonGroup = function ButtonGroup(props) {
         extraRow: rowParams
       })),
       onCancel: function onCancel() {
-        setPopVisibleIndex(-1); // 优先调用其 confirmConfig 配置的 onCancel 事件
-
+        setPopVisibleIndex(-1);
+        // 优先调用其 confirmConfig 配置的 onCancel 事件
         if (popRow.hasOwnProperty('confirmConfig') && popRow.confirmConfig.onCancel) {
           var _popRow$confirmConfig;
-
           (_popRow$confirmConfig = popRow.confirmConfig).onCancel.apply(_popRow$confirmConfig, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
             return rowParams[pItem];
           })));
         }
       },
       onConfirm: function onConfirm() {
-        setPopVisibleIndex(-1); // 优先调用其 confirmConfig 配置的 onConfirm 事件
-
+        setPopVisibleIndex(-1);
+        // 优先调用其 confirmConfig 配置的 onConfirm 事件
         if (popRow.hasOwnProperty('confirmConfig') && popRow.confirmConfig.onConfirm) {
           var _popRow$confirmConfig2;
-
           (_popRow$confirmConfig2 = popRow.confirmConfig).onConfirm.apply(_popRow$confirmConfig2, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
             return rowParams[pItem];
           })));
@@ -421,19 +399,20 @@ var ButtonGroup = function ButtonGroup(props) {
         }
       }
     }), /*#__PURE__*/_react.default.createElement(_dropdown.default, Object.assign({
-      overlay: textMenu(forDrop),
+      menu: {
+        items: deepTransTextMenus(forDrop)
+      },
       placement: "bottomRight"
     }, dropdownConfig), /*#__PURE__*/_react.default.createElement("a", {
       className: "spec-button-group-text"
-    }, "\u66F4\u591A ", /*#__PURE__*/_react.default.createElement(_icons.DownOutlined, null)))));
+    }, moreText, " ", /*#__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;

package/lib/ButtonGroup/style/index.less

@@ -15,7 +15,7 @@
       position: absolute;
       content: '';
       top: 50%;
-      left: -@padding-sm/2;
+      left: -(@padding-sm/2);
       transform: translate(0, -50%);
       display: inline-block;
       height: .9em;