fan-standard-comp 3.2.8 → 3.2.9

package/es/ButtonGroup/index.d.ts

@@ -29,8 +29,11 @@ interface ButtonGroupProps {
     dropdownConfig?: Object;
     moreText?: string;
     moreIcon?: React.ReactNode | string | number;
+    size?: any;
+    showTextIcon?: boolean;
     className?: string;
     style?: object;
+    [k: string]: any;
 }
 declare const ButtonGroup: (props: ButtonGroupProps) => React.JSX.Element;
 export default ButtonGroup;

package/es/ButtonGroup/index.js

@@ -17,13 +17,14 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 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 React, { useState, useEffect, Fragment } from "react";
 import { IconNode } from "../components/index";
 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.js';
+import { convertToArray } from '../utils/index';
 import _ from 'lodash';
 import './style/index.less';
 var ButtonGroup = function ButtonGroup(props) {
@@ -42,6 +43,8 @@ var ButtonGroup = function ButtonGroup(props) {
     _props$moreText = props.moreText,
     moreText = _props$moreText === void 0 ? '更多' : _props$moreText,
     moreIcon = props.moreIcon,
+    _props$showTextIcon = props.showTextIcon,
+    showTextIcon = _props$showTextIcon === void 0 ? false : _props$showTextIcon,
     className = props.className,
     style = props.style;
   var _props$options = props.options,
@@ -57,10 +60,18 @@ var ButtonGroup = function ButtonGroup(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     popRow = _useState4[0],
     setPopRow = _useState4[1];
-  var _useState5 = useState([]),
+  var _useState5 = useState(-1),
     _useState6 = _slicedToArray(_useState5, 2),
-    resetList = _useState6[0],
-    setResetList = _useState6[1];
+    popSubVisibleIndex = _useState6[0],
+    setPopSubVisibleIndex = _useState6[1];
+  var _useState7 = useState({}),
+    _useState8 = _slicedToArray(_useState7, 2),
+    popSubRow = _useState8[0],
+    setPopSubRow = _useState8[1];
+  var _useState9 = useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    resetList = _useState10[0],
+    setResetList = _useState10[1];
   useEffect(function () {
     // codes在方法内，再合并默认的权限配置
     // 合并本地的codes
@@ -73,6 +84,7 @@ var ButtonGroup = function ButtonGroup(props) {
   }, [options, codes, permissionCodes]);
   useEffect(function () {
     setPopVisibleIndex(-1);
+    setPopSubVisibleIndex(-1);
   }, [rowParams]);
   // 渲染按钮多层级形式 (用于筛选)
   var buttonMenu = function buttonMenu(group) {
@@ -174,8 +186,41 @@ var ButtonGroup = function ButtonGroup(props) {
       }
     })
   }*/
+  // 自定义渲染显示的文本
+  var renderCustomLabel = function renderCustomLabel(gItem, hideIcon) {
+    return gItem.render ? gItem.render.apply(gItem, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+      return rowParams[pItem];
+    }))) : (/*#__PURE__*/React.createElement(React.Fragment, null, !hideIcon && gItem.icon && showTextIcon ? /*#__PURE__*/React.createElement(IconNode, {
+      icon: gItem.icon
+    }) : '', " ", gItem.exName || gItem.name));
+  };
   // 渲染文本形式多级菜单列表（用于表格）
-  var textMenu = function textMenu(group) {
+  var textMenu = function textMenu(group, source) {
+    var menuTitle = function menuTitle(gItem, displayClass) {
+      return gItem.hasOwnProperty('confirmText') || gItem.hasOwnProperty('confirmConfig') ?
+      /*#__PURE__*/
+      // @ts-ignore
+      React.createElement("a", {
+        disabled: btnIsDisabled(gItem.disabled, rowParams),
+        onClick: gItem.fn ? function () {
+          // console.log('带二次确认节点点击区分处理更多里面还是直接展示里面的按钮')
+          setPopVisibleIndex(source === 'isMoreChild' ? rowParams.rowIndex : -1);
+          setPopRow(source === 'isMoreChild' ? gItem : {});
+          setPopSubVisibleIndex(source === 'isMoreChild' ? -1 : rowParams.rowIndex);
+          setPopSubRow(source === 'isMoreChild' ? {} : gItem);
+        } : null
+      }, renderCustomLabel(gItem)) : /*#__PURE__*/React.createElement("a", {
+        className: displayClass,
+        // 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)
+      }, renderCustomLabel(gItem));
+    };
     return /*#__PURE__*/React.createElement(_Menu, {
       className: "spec-button-text-dropdown"
     }, group.map(function (gItem, gIndex) {
@@ -186,48 +231,71 @@ var ButtonGroup = function ButtonGroup(props) {
         }, 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];
-              })));
-            } : null
-          }, child.render ? child.render.apply(child, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
-            return rowParams[pItem];
-          }))) : child.exName || child.name));
+          }, menuTitle(child));
         }));
       }
       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));
+      }, menuTitle(gItem, "spec-button-group-text"));
     }));
   };
   // 渲染文本形式 列表（用于表格）
   var RenderTextList = function RenderTextList(item) {
     if (Array.isArray(item.children) && item.children.length > 0) {
+      var hasConfirmText = [];
+      item.children.forEach(function (child) {
+        hasConfirmText = hasConfirmText.concat(convertToArray([child]));
+      });
+      if (hasConfirmText.filter(function (hcItem) {
+        return hcItem.hasOwnProperty('confirmText') || hcItem.hasOwnProperty('confirmConfig');
+      }).length) {
+        // 子项有二次确认文本，需要显示浮层
+        return /*#__PURE__*/React.createElement(_Popconfirm, Object.assign({
+          key: (item === null || item === void 0 ? void 0 : item.index) || JSON.stringify(item),
+          placement: "topRight",
+          open: popSubVisibleIndex === rowParams.rowIndex,
+          icon: /*#__PURE__*/React.createElement(QuestionCircleOutlined, null),
+          trigger: "click"
+        }, popSubRow.hasOwnProperty('confirmConfig') ? popSubRow.confirmConfig : {}, {
+          title: /*#__PURE__*/React.createElement(PopConfirmTitle, Object.assign({}, popSubRow, {
+            extraRow: rowParams
+          })),
+          onCancel: function onCancel() {
+            setPopSubVisibleIndex(-1);
+            // 优先调用其 confirmConfig 配置的 onCancel 事件
+            if (popSubRow.hasOwnProperty('confirmConfig') && popSubRow.confirmConfig.onCancel) {
+              var _popSubRow$confirmCon;
+              (_popSubRow$confirmCon = popSubRow.confirmConfig).onCancel.apply(_popSubRow$confirmCon, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+                return rowParams[pItem];
+              })));
+            }
+          },
+          onConfirm: function onConfirm() {
+            setPopSubVisibleIndex(-1);
+            // 优先调用其 confirmConfig 配置的 onConfirm 事件
+            if (popSubRow.hasOwnProperty('confirmConfig') && popSubRow.confirmConfig.onConfirm) {
+              var _popSubRow$confirmCon2;
+              (_popSubRow$confirmCon2 = popSubRow.confirmConfig).onConfirm.apply(_popSubRow$confirmCon2, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+                return rowParams[pItem];
+              })));
+            } else if (popSubRow.fn) {
+              popSubRow.fn.apply(popSubRow, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+                return rowParams[pItem];
+              })));
+            }
+          }
+        }), /*#__PURE__*/React.createElement(_Dropdown, Object.assign({
+          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"
+        }, item.render ? item.render.apply(item, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+          return rowParams[pItem];
+        }))) : item.exName || item.name, " ", /*#__PURE__*/React.createElement(SpecIcon, {
+          name: "down"
+        }))));
+      }
       return /*#__PURE__*/React.createElement(_Dropdown, Object.assign({
         overlay: textMenu(item.children),
         placement: "bottomRight"
@@ -293,7 +361,9 @@ var ButtonGroup = function ButtonGroup(props) {
   var renderDisplayButton = function renderDisplayButton(item, index) {
     /*渲染自定义*/
     if (item.render) {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, typeof item.render === 'function' ? item.render.apply(item, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
+      return /*#__PURE__*/React.createElement(Fragment, {
+        key: index
+      }, typeof item.render === 'function' ? item.render.apply(item, _toConsumableArray(Object.keys(rowParams).map(function (pItem) {
         return rowParams[pItem];
       }))) : item.render);
     }
@@ -329,7 +399,7 @@ var ButtonGroup = function ButtonGroup(props) {
       type: "primary"
     }, moreText || '更多', moreIcon || /*#__PURE__*/React.createElement(DownOutlined, null))) : /*#__PURE__*/React.createElement(_Popconfirm, Object.assign({
       placement: "topRight",
-      visible: popVisibleIndex === rowParams.rowIndex,
+      open: popVisibleIndex === rowParams.rowIndex,
       icon: /*#__PURE__*/React.createElement(QuestionCircleOutlined, null),
       trigger: "click"
     }, popRow.hasOwnProperty('confirmConfig') ? popRow.confirmConfig : {}, {
@@ -338,6 +408,7 @@ var ButtonGroup = function ButtonGroup(props) {
       })),
       onCancel: function onCancel() {
         setPopVisibleIndex(-1);
+        setPopSubVisibleIndex(-1);
         // 优先调用其 confirmConfig 配置的 onCancel 事件
         if (popRow.hasOwnProperty('confirmConfig') && popRow.confirmConfig.onCancel) {
           var _popRow$confirmConfig;
@@ -348,6 +419,7 @@ var ButtonGroup = function ButtonGroup(props) {
       },
       onConfirm: function onConfirm() {
         setPopVisibleIndex(-1);
+        setPopSubVisibleIndex(-1);
         // 优先调用其 confirmConfig 配置的 onConfirm 事件
         if (popRow.hasOwnProperty('confirmConfig') && popRow.confirmConfig.onConfirm) {
           var _popRow$confirmConfig2;
@@ -361,7 +433,7 @@ var ButtonGroup = function ButtonGroup(props) {
         }
       }
     }), /*#__PURE__*/React.createElement(_Dropdown, Object.assign({
-      overlay: textMenu(forDrop),
+      overlay: textMenu(forDrop, 'isMoreChild'),
       placement: "bottomRight"
     }, dropdownConfig), /*#__PURE__*/React.createElement("a", {
       className: "spec-button-group-text"

package/es/ButtonGroup/index3.d.ts

@@ -0,0 +1,39 @@
+import React from "react";
+import './style/index.less';
+interface ButtonGroupRowParamsProps {
+    text?: any;
+    record?: object;
+    rowIndex?: number;
+}
+export interface ButtonGroupOptionsProps {
+    name?: string;
+    code?: string;
+    exName?: string;
+    isHide?: boolean;
+    disabled?: boolean;
+    icon?: React.ReactNode | string | string[];
+    fn?: any;
+    children?: ButtonGroupOptionsProps[];
+    render?: (() => React.ReactNode) | React.ReactNode;
+    confirmText?: any;
+    confirmConfig?: any;
+    dropdownConfig?: any;
+}
+interface ButtonGroupProps {
+    type?: 'button' | 'text';
+    rowParams?: ButtonGroupRowParamsProps;
+    codes?: object[];
+    permissionCodes?: string[];
+    options?: ButtonGroupOptionsProps[];
+    min?: number;
+    dropdownConfig?: Object;
+    moreText?: string;
+    moreIcon?: React.ReactNode | string | number;
+    size?: any;
+    showTextIcon?: boolean;
+    className?: string;
+    style?: object;
+    [k: string]: any;
+}
+declare const ButtonGroup: (props: ButtonGroupProps) => React.JSX.Element;
+export default ButtonGroup;