@aloudata/aloudata-design 1.10.10 → 1.10.11

package/dist/ConfigProvider/getUserList.d.ts

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { TUserGroupValue, TUserValue } from '../MemberPicker/interface';
 export declare enum EUserType {
     USER = "USER",
     USER_GROUP = "USER_GROUP"
@@ -24,7 +25,8 @@ export interface IGetUserListParams {
     name?: string;
     id?: string;
 }
-export type getUsersByIdsType = ((params: string[]) => Promise<TUser>) | undefined;
+export type { TUserValue, TUserGroupValue };
+export type getUsersByIdsType = ((params: Array<TUserValue | TUserGroupValue>) => Promise<TUser>) | undefined;
 export type getUsersByKeywordsType = ((params: string) => Promise<TUser>) | undefined;
 export type getUserListType = {
     getUsersByIds?: getUsersByIdsType;

package/dist/MemberPicker/index.js

@@ -121,18 +121,18 @@ var Component = function Component(_ref) {
     } else if (isUser(value) || isUserGroup(value)) {
       setSelectedUserList([value]);
     } else {
-      var id = [];
+      var param = [];
       if (!value) return;
       if (Array.isArray(value) && value.length === 0) {
         setSelectedUserList([]);
         return;
       }
       if (!Array.isArray(value)) {
-        id = [value];
+        param = [value];
       } else {
-        id = value;
+        param = value;
       }
-      queryByIds(id).then(function (result) {
+      queryByIds(param).then(function (result) {
         setSelectedUserList(result);
       });
     }

package/dist/MemberPicker/interface.d.ts

@@ -1,13 +1,16 @@
 import { IUser, IUserGroup, TUser } from '../ConfigProvider/getUserList';
 import { ISelectProps } from '../Select';
-export type MemberPickerValue = IUser | IUser[] | string | string[] | IUserGroup | IUserGroup[];
+import { RequiredProperties } from '../_utils/type';
+export type TUserValue = RequiredProperties<IUser, 'type' | 'userId'>;
+export type TUserGroupValue = RequiredProperties<IUserGroup, 'type' | 'groupId'>;
+export type TMemberPickerValue = TUserValue | TUserGroupValue | Array<TUserValue | TUserGroupValue>;
 export declare enum EMemberPicker {
     GROUP = "GROUP",
     USER = "USER",
     BOTH = "BOTH"
 }
 export interface IBaseMemberSelectorProps extends Pick<ISelectProps, 'allowClear' | 'disabled' | 'prefix' | 'placeholder' | 'className' | 'size' | 'onClear' | 'prefixWidth'> {
-    value?: MemberPickerValue;
+    value?: TMemberPickerValue;
     dropdownWidth?: number;
     open?: boolean;
     onOpenChange?: (open: boolean) => void;

package/dist/MemberPicker/utils/getUsersWithUserId.js

@@ -1,10 +1,10 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 import { EUserType } from "../../ConfigProvider/getUserList";
 export function isUser(value) {
-  return value && _typeof(value) === 'object' && value.type === EUserType.USER;
+  return value && _typeof(value) === 'object' && value.type === EUserType.USER && (value.nickname || value.name);
 }
 export function isUserGroup(value) {
-  return value && _typeof(value) === 'object' && value.type === EUserType.USER_GROUP;
+  return value && _typeof(value) === 'object' && value.type === EUserType.USER_GROUP && value.name;
 }
 function getUsersWithUserId(obj) {
   var users = [];

package/dist/_utils/type.d.ts

@@ -7,3 +7,6 @@ export declare const tupleNum: <T extends number[]>(...args: T) => T;
 export type ElementOf<T> = T extends (infer E)[] ? E : T extends readonly (infer F)[] ? F : never;
 /** https://github.com/Microsoft/TypeScript/issues/29729 */
 export type LiteralUnion<T extends U, U> = T | (U & object);
+export type RequiredProperties<T, K extends keyof T> = {
+    [P in K]-?: T[P];
+} & Partial<T>;

package/dist/_utils/type.js

@@ -17,4 +17,6 @@ export var tupleNum = function tupleNum() {
  * performing indexing
  */
 
-/** https://github.com/Microsoft/TypeScript/issues/29729 */
+/** https://github.com/Microsoft/TypeScript/issues/29729 */
+
+// 定义一个交叉类型，包括必选属性和可选属性

package/dist/index.d.ts

@@ -45,7 +45,7 @@ export type { IInputNumberProps as InputNumberProps } from './InputNumber';
 export { default as Layout } from './Layout';
 export type { LayoutProps } from './Layout';
 export { default as MemberPicker } from './MemberPicker';
-export type { IUser, IMemberPickerProps as MemberPickerProps, MemberPickerValue, } from './MemberPicker/interface';
+export type { IUser, IMemberPickerProps as MemberPickerProps, TMemberPickerValue as MemberPickerValue, } from './MemberPicker/interface';
 export { default as Menu } from './Menu';
 export type { ItemType, IMenuProps as MenuProps } from './Menu';
 export { default as Modal } from './Modal';

package/package.json

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