@aloudata/aloudata-design 2.13.14 → 2.13.16

package/dist/MemberPicker/components/Panel.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { ReactNode } from 'react';
 import { IUserGroup, TUser, TUserGroupValue, TUserValue } from '../../ConfigProvider/getUserList';
 import { EMemberPicker, IUser } from '../interface';
 interface IPanelProps {
@@ -13,6 +13,7 @@ interface IPanelProps {
     loading: boolean;
     className?: string;
     lockedIds: Array<TUserValue | TUserGroupValue>;
+    footer?: ReactNode;
 }
 export declare const userDisplayNameIsRepeated: (userList: TUser, displayName?: string) => boolean;
 export default function Panel(props: IPanelProps): React.JSX.Element;

package/dist/MemberPicker/components/Panel.js

@@ -42,7 +42,9 @@ export default function Panel(props) {
     dataList = props.dataList,
     onSearchValueChange = props.onSearchValueChange,
     className = props.className,
-    lockedIds = props.lockedIds;
+    lockedIds = props.lockedIds,
+    footer = props.footer,
+    onCancel = props.onCancel;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     selectedUsers = _useState2[0],
@@ -80,9 +82,6 @@ export default function Panel(props) {
       return 160;
     }
   }, [dropdownWidth, multiple]);
-  var onOk = useCallback(function () {
-    onChange === null || onChange === void 0 ? void 0 : onChange(selectedUsers);
-  }, [onChange, selectedUsers]);
   useEffect(function () {
     if (value) {
       if (Array.isArray(value)) {
@@ -154,8 +153,11 @@ export default function Panel(props) {
     userList: dataList
   }), /*#__PURE__*/React.createElement(SelectorFooter, {
     className: 'ald-member-picker-selector-footer',
-    onCancel: props.onCancel,
-    onOk: onOk
+    onCancel: onCancel,
+    onOk: function onOk() {
+      onChange === null || onChange === void 0 ? void 0 : onChange(selectedUsers);
+    },
+    footer: footer
   })) : /*#__PURE__*/React.createElement(React.Fragment, null, type === EMemberPicker.USER && /*#__PURE__*/React.createElement(MemberSelection, {
     className: 'ald-member-picker-member-selection-single',
     userList: dataList.filter(isUser),

package/dist/MemberPicker/components/PanelWrapper.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { ReactNode } from 'react';
 import { IUserGroup, TUser, TUserGroupValue, TUserValue } from '../../ConfigProvider/getUserList';
 import { EMemberPicker, IUser, TMemberPickerValue } from '../interface';
 interface IProps {
@@ -11,6 +11,7 @@ interface IProps {
     onCancel?: () => void;
     lockedIds?: Array<TUserValue | TUserGroupValue>;
     showUserId?: boolean;
+    footer?: ReactNode;
 }
-export declare const PanelWrapper: ({ type, value, multiple, dropdownWidth, onChange, onCancel, className, lockedIds, }: IProps) => React.JSX.Element;
+export declare const PanelWrapper: ({ type, value, multiple, dropdownWidth, onChange, onCancel, className, footer, lockedIds, }: IProps) => React.JSX.Element;
 export default PanelWrapper;

package/dist/MemberPicker/components/PanelWrapper.js

@@ -22,6 +22,7 @@ export var PanelWrapper = function PanelWrapper(_ref) {
     onChange = _ref.onChange,
     onCancel = _ref.onCancel,
     className = _ref.className,
+    footer = _ref.footer,
     _ref$lockedIds = _ref.lockedIds,
     lockedIds = _ref$lockedIds === void 0 ? [] : _ref$lockedIds;
   var _useContext = useContext(LocaleContext),
@@ -134,7 +135,8 @@ export var PanelWrapper = function PanelWrapper(_ref) {
     onChange: onSelectedChange,
     className: className,
     onCancel: onCancel,
-    lockedIds: lockedIds
+    lockedIds: lockedIds,
+    footer: footer
   });
 };
 export default PanelWrapper;

package/dist/MemberPicker/components/SelectorFooter.d.ts

@@ -1,8 +1,9 @@
-import React from 'react';
+import React, { ReactNode } from 'react';
 interface ISelectorFooterProps {
     className?: string;
     onOk?: () => void;
     onCancel?: () => void;
+    footer?: ReactNode;
 }
 export default function SelectorFooter(props: ISelectorFooterProps): React.JSX.Element;
 export {};

package/dist/MemberPicker/components/SelectorFooter.js

@@ -6,14 +6,38 @@ export default function SelectorFooter(props) {
   var _useContext = useContext(LocaleContext),
     locale = _useContext.locale;
   var t = getTranslator(locale);
-  var className = props.className;
-  return /*#__PURE__*/React.createElement("div", {
+  var className = props.className,
+    _onOk = props.onOk,
+    _onCancel = props.onCancel;
+  var footer = props.footer ? /*#__PURE__*/React.cloneElement(props.footer, {
+    onCancel: function onCancel() {
+      // 如果自定义 footer 有 onCancel，则先执行自定义的 onCancel
+      if (typeof props.footer.props.onCancel === 'function') {
+        props.footer.props.onCancel();
+      }
+      // 然后执行组件的 onCancel
+      if (typeof _onCancel === 'function') {
+        _onCancel();
+      }
+    },
+    onOk: function onOk() {
+      // 如果自定义 footer 有 onCancel，则先执行自定义的 onCancel
+      if (typeof props.footer.props.onOk === 'function') {
+        props.footer.props.onOk();
+      }
+      // 然后执行组件的 onOk
+      if (typeof _onOk === 'function') {
+        _onOk();
+      }
+    }
+  }) : /*#__PURE__*/React.createElement("div", {
     className: classNames(className, 'ald-member-picker-footer')
   }, /*#__PURE__*/React.createElement(Button, {
-    onClick: props.onCancel,
+    onClick: _onCancel,
     type: "secondary"
   }, t.MemberPicker.cancel), /*#__PURE__*/React.createElement(Button, {
-    onClick: props.onOk,
+    onClick: _onOk,
     type: "primary"
   }, t.MemberPicker.confirm));
+  return footer;
 }

package/dist/MemberPicker/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["value", "type", "onChange", "multiple", "dropdownWidth", "open", "onOpenChange", "placeholder", "className", "allowClear", "disabled", "onClear", "size", "selectType", "prefix", "lockedIds"];
+var _excluded = ["value", "type", "onChange", "multiple", "dropdownWidth", "open", "onOpenChange", "placeholder", "className", "allowClear", "disabled", "onClear", "size", "selectType", "prefix", "lockedIds", "footer", "onCancel"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -53,6 +53,8 @@ var Component = function Component(props) {
     propPrefix = props.prefix,
     _props$lockedIds = props.lockedIds,
     lockedIds = _props$lockedIds === void 0 ? [] : _props$lockedIds,
+    footer = props.footer,
+    _onCancel = props.onCancel,
     restProps = _objectWithoutProperties(props, _excluded);
   var _ConfigProvider$useGe = ConfigProvider.useGetUserList(),
     getUsersByIds = _ConfigProvider$useGe.getUsersByIds,
@@ -289,6 +291,7 @@ var Component = function Component(props) {
         ref: triggerRef
       }, /*#__PURE__*/React.createElement(Panel, {
         type: type,
+        footer: footer,
         value: selectedUserList,
         dataList: totalUserList,
         lockedIds: lockedIds,
@@ -298,7 +301,10 @@ var Component = function Component(props) {
         dropdownWidth: dropdownContentWidth,
         onSearchValueChange: onSearchValueChange,
         onChange: onSelectedChange,
-        onCancel: setDropdownOpen.bind(null, false)
+        onCancel: function onCancel() {
+          _onCancel === null || _onCancel === void 0 ? void 0 : _onCancel();
+          setDropdownOpen(false);
+        }
       }));
     }
   }));

package/dist/MemberPicker/interface.d.ts

@@ -1,3 +1,4 @@
+import { ReactNode } from 'react';
 import { IUser, IUserGroup, TUser } from '../ConfigProvider/getUserList';
 import { ISelectProps } from '../Select';
 import { RequiredProperties } from '../_utils/type';
@@ -17,6 +18,8 @@ export interface IBaseMemberSelectorProps extends Omit<ISelectProps, 'type'> {
     type?: EMemberPicker;
     selectType?: ISelectProps['type'];
     lockedIds?: Array<TUserValue | TUserGroupValue>;
+    footer?: ReactNode;
+    onCancel?: () => void;
 }
 export interface IMultipleMemberSelectorProps extends IBaseMemberSelectorProps {
     multiple: true;

package/dist/Modal/index.js

@@ -150,7 +150,7 @@ var OriginModal = function OriginModal(props) {
     className: classNames('ald-modal', className, {
       'ald-modal-padding-less': paddingLess,
       'ald-modal-virtual-scroll-bar': virtualScrollBar,
-      'ald-modal-show-header-bottom-border': hideHeaderBottomBorder,
+      'ald-modal-hide-header-bottom-border': hideHeaderBottomBorder,
       'ald-modal-responsive-bounds': responsiveBounds
     }),
     okButtonProps: getButtonProps(okButtonProps, 'primary', okType),

package/dist/Radio/components/Radio/index.js

@@ -115,7 +115,7 @@ export default function Radio(props) {
     }
   }), /*#__PURE__*/React.createElement("span", {
     className: "ald-radio-inner"
-  })), /*#__PURE__*/React.createElement("span", {
+  })), props.children && /*#__PURE__*/React.createElement("span", {
     className: "ald-radio-desc"
   }, props.children));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aloudata/aloudata-design",
-  "version": "2.13.14",
+  "version": "2.13.16",
   "description": "",
   "license": "MIT",
   "module": "dist/index.js",