@blueking/bk-user-selector 0.0.8 → 0.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blueking/bk-user-selector",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "蓝鲸用户选择器",
   "license": "MIT",
   "author": "Tencent BlueKing",

package/typings/components/multiple-selector.vue.d.ts

@@ -1,171 +1,33 @@
-import { FormattedUser } from '../types';
-declare const _default: import("vue").DefineComponent<{
-    /**
-     * 绑定值
-     */
-    modelValue: {
-        type: ArrayConstructor;
-        default: () => never[];
-    };
-    /**
-     * 占位文本
-     */
-    placeholder: {
-        type: StringConstructor;
-        default: string;
-    };
-    /**
-     * 是否可拖拽
-     */
-    draggable: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    /**
-     * API 基础 URL
-     */
-    apiBaseUrl: {
-        type: StringConstructor;
-        default: string;
-    };
-    /**
-     * 租户 ID
-     */
-    tenantId: {
-        type: StringConstructor;
-        default: string;
-    };
-    /**
-     * 已选用户
-     */
-    selectedUsers: {
-        type: () => FormattedUser[];
-        default: () => never[];
-    };
-    /**
-     * 租户信息映射
-     */
-    tenants: {
-        type: () => Record<string, string>;
-        default: () => {};
-    };
-    /**
-     * 当前用户ID
-     */
-    currentUserId: {
-        type: StringConstructor;
-        default: string;
-    };
-    /**
-     * 精确查找key
-     */
-    exactSearchKey: {
-        type: StringConstructor;
-        default: string;
-    };
-    /**
-     * 用户组
-     */
-    userGroup: {
-        type: () => {
-            id: string;
-            name: string;
-        }[];
-        default: () => never[];
-    };
-    /**
-     * 用户组名称
-     */
-    userGroupName: {
-        type: StringConstructor;
-        default: string;
-    };
-}, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+import { FormattedUser, MultipleSelectorProps } from '../types';
+declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<MultipleSelectorProps>, {
+    modelValue: () => never[];
+    placeholder: string;
+    draggable: boolean;
+    apiBaseUrl: string;
+    tenantId: string;
+    selectedUsers: () => never[];
+    tenants: () => {};
+    currentUserId: string;
+    exactSearchKey: string;
+    userGroup: () => never[];
+    userGroupName: string;
+}>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:selectedUsers": (...args: any[]) => void;
     "add-user": (...args: any[]) => void;
     "remove-user": (...args: any[]) => void;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-    /**
-     * 绑定值
-     */
-    modelValue: {
-        type: ArrayConstructor;
-        default: () => never[];
-    };
-    /**
-     * 占位文本
-     */
-    placeholder: {
-        type: StringConstructor;
-        default: string;
-    };
-    /**
-     * 是否可拖拽
-     */
-    draggable: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    /**
-     * API 基础 URL
-     */
-    apiBaseUrl: {
-        type: StringConstructor;
-        default: string;
-    };
-    /**
-     * 租户 ID
-     */
-    tenantId: {
-        type: StringConstructor;
-        default: string;
-    };
-    /**
-     * 已选用户
-     */
-    selectedUsers: {
-        type: () => FormattedUser[];
-        default: () => never[];
-    };
-    /**
-     * 租户信息映射
-     */
-    tenants: {
-        type: () => Record<string, string>;
-        default: () => {};
-    };
-    /**
-     * 当前用户ID
-     */
-    currentUserId: {
-        type: StringConstructor;
-        default: string;
-    };
-    /**
-     * 精确查找key
-     */
-    exactSearchKey: {
-        type: StringConstructor;
-        default: string;
-    };
-    /**
-     * 用户组
-     */
-    userGroup: {
-        type: () => {
-            id: string;
-            name: string;
-        }[];
-        default: () => never[];
-    };
-    /**
-     * 用户组名称
-     */
-    userGroupName: {
-        type: StringConstructor;
-        default: string;
-    };
-}>> & {
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<MultipleSelectorProps>, {
+    modelValue: () => never[];
+    placeholder: string;
+    draggable: boolean;
+    apiBaseUrl: string;
+    tenantId: string;
+    selectedUsers: () => never[];
+    tenants: () => {};
+    currentUserId: string;
+    exactSearchKey: string;
+    userGroup: () => never[];
+    userGroupName: string;
+}>>> & {
     "onUpdate:selectedUsers"?: ((...args: any[]) => any) | undefined;
     "onAdd-user"?: ((...args: any[]) => any) | undefined;
     "onRemove-user"?: ((...args: any[]) => any) | undefined;
@@ -179,10 +41,27 @@ declare const _default: import("vue").DefineComponent<{
     }[];
     userGroupName: string;
     draggable: boolean;
-    modelValue: unknown[];
-    placeholder: string;
-    apiBaseUrl: string;
+    modelValue: string[];
     selectedUsers: FormattedUser[];
+    apiBaseUrl: string;
+    placeholder: string;
     exactSearchKey: string;
 }, {}>;
 export default _default;
+type __VLS_WithDefaults<P, D> = {
+    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_PrettifyLocal<P[K] & {
+        default: D[K];
+    }> : P[K];
+};
+type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
+type __VLS_TypePropsToOption<T> = {
+    [K in keyof T]-?: {} extends Pick<T, K> ? {
+        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
+    } : {
+        type: import('vue').PropType<T[K]>;
+        required: true;
+    };
+};
+type __VLS_PrettifyLocal<T> = {
+    [K in keyof T]: T[K];
+} & {};

package/typings/components/single-selector.vue.d.ts

@@ -1,12 +1,47 @@
 import { SingleSelectorProps } from '../types';
-declare const _default: import("vue").DefineComponent<__VLS_TypePropsToOption<SingleSelectorProps>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<SingleSelectorProps>, {
+    apiBaseUrl: string;
+    tenantId: string;
+    placeholder: string;
+    modelValue: string;
+    currentUserId: string;
+    exactSearchKey: string;
+    userGroup: () => never[];
+    userGroupName: string;
+}>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     change: (...args: any[]) => void;
     "update:modelValue": (...args: any[]) => void;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<SingleSelectorProps>>> & {
+}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<SingleSelectorProps>, {
+    apiBaseUrl: string;
+    tenantId: string;
+    placeholder: string;
+    modelValue: string;
+    currentUserId: string;
+    exactSearchKey: string;
+    userGroup: () => never[];
+    userGroupName: string;
+}>>> & {
     onChange?: ((...args: any[]) => any) | undefined;
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
-}, {}, {}>;
+}, {
+    tenantId: string;
+    currentUserId: string;
+    userGroup: {
+        id: string;
+        name: string;
+    }[];
+    userGroupName: string;
+    modelValue: string;
+    apiBaseUrl: string;
+    placeholder: string;
+    exactSearchKey: string;
+}, {}>;
 export default _default;
+type __VLS_WithDefaults<P, D> = {
+    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_PrettifyLocal<P[K] & {
+        default: D[K];
+    }> : P[K];
+};
 type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
 type __VLS_TypePropsToOption<T> = {
     [K in keyof T]-?: {} extends Pick<T, K> ? {
@@ -16,3 +51,6 @@ type __VLS_TypePropsToOption<T> = {
         required: true;
     };
 };
+type __VLS_PrettifyLocal<T> = {
+    [K in keyof T]: T[K];
+} & {};

package/typings/components/user-selector.vue.d.ts

@@ -37,8 +37,8 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
     userGroupName: string;
     draggable: boolean;
     modelValue: string | string[];
-    placeholder: string;
     apiBaseUrl: string;
+    placeholder: string;
     exactSearchKey: string;
     multiple: boolean;
 }, {}>;

package/typings/types/index.d.ts

@@ -127,4 +127,25 @@ export interface SingleSelectorProps extends BaseSelectorProps {
      */
     tenants: Record<string, string>;
 }
+/**
+ * 多选模式属性
+ */
+export interface MultipleSelectorProps extends BaseSelectorProps {
+    /**
+     * 选中的用户ID列表
+     */
+    modelValue: string[];
+    /**
+     * 是否支持拖拽排序
+     */
+    draggable?: boolean;
+    /**
+     * 已选用户列表
+     */
+    selectedUsers: FormattedUser[];
+    /**
+     * 租户信息映射
+     */
+    tenants: Record<string, string>;
+}
 export {};

package/vue2/index.es.min.js

@@ -16830,9 +16830,10 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
                     class: "user-group",
                     key: groupName
                   }, [
-                    createElementVNode(
+                    Object.keys(groupedUsers.value).length > 1 ? (openBlock(), createElementBlock(
                       "div",
                       {
+                        key: 0,
                         class: "group-header",
                         onMousedown: _cache[0] || (_cache[0] = withModifiers(() => {
                         }, ["prevent"]))
@@ -16855,7 +16856,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
                       ],
                       32
                       /* NEED_HYDRATION */
-                    ),
+                    )) : createCommentVNode("v-if", true),
                     (openBlock(true), createElementBlock(
                       Fragment,
                       null,
@@ -16900,7 +16901,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SelectionPopover = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-c68dfcac"]]);
+const SelectionPopover = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-13504557"]]);
 const _hoisted_1$3 = { class: "tag-content" };
 const _hoisted_2$2 = { class: "user-name" };
 const _hoisted_3$2 = {
@@ -16970,83 +16971,17 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   },
   __name: "multiple-selector",
   props: {
-    /**
-     * 绑定值
-     */
-    modelValue: {
-      type: Array,
-      default: () => []
-    },
-    /**
-     * 占位文本
-     */
-    placeholder: {
-      type: String,
-      default: "请输入人员名称搜索"
-    },
-    /**
-     * 是否可拖拽
-     */
-    draggable: {
-      type: Boolean,
-      default: false
-    },
-    /**
-     * API 基础 URL
-     */
-    apiBaseUrl: {
-      type: String,
-      default: ""
-    },
-    /**
-     * 租户 ID
-     */
-    tenantId: {
-      type: String,
-      default: ""
-    },
-    /**
-     * 已选用户
-     */
-    selectedUsers: {
-      type: Array,
-      default: () => []
-    },
-    /**
-     * 租户信息映射
-     */
-    tenants: {
-      type: Object,
-      default: () => ({})
-    },
-    /**
-     * 当前用户ID
-     */
-    currentUserId: {
-      type: String,
-      default: ""
-    },
-    /**
-     * 精确查找key
-     */
-    exactSearchKey: {
-      type: String,
-      default: "bk_username"
-    },
-    /**
-     * 用户组
-     */
-    userGroup: {
-      type: Array,
-      default: () => []
-    },
-    /**
-     * 用户组名称
-     */
-    userGroupName: {
-      type: String,
-      default: "用户群组"
-    }
+    modelValue: { default: () => [] },
+    draggable: { type: Boolean, default: false },
+    selectedUsers: { default: () => [] },
+    tenants: { default: () => ({}) },
+    apiBaseUrl: { default: "" },
+    tenantId: { default: "" },
+    placeholder: { default: "请输入人员名称搜索" },
+    currentUserId: { default: "" },
+    exactSearchKey: { default: "bk_username" },
+    userGroup: { default: () => [] },
+    userGroupName: { default: "用户群组" }
   },
   emits: ["update:selectedUsers", "add-user", "remove-user"],
   setup(__props, { emit: __emit }) {
@@ -17309,7 +17244,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                 (openBlock(true), createElementBlock(
                   Fragment,
                   null,
-                  renderList(__props.selectedUsers, (user, index) => {
+                  renderList(_ctx.selectedUsers, (user, index) => {
                     return openBlock(), createElementBlock("div", {
                       class: "tag-wrapper",
                       key: user.id,
@@ -17317,15 +17252,15 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                     }, [
                       createVNode(UserTag, {
                         active: index === activeTagIndex.value,
-                        "current-tenant-id": __props.tenantId,
-                        draggable: __props.draggable,
-                        tenants: __props.tenants,
+                        "current-tenant-id": _ctx.tenantId,
+                        draggable: _ctx.draggable,
+                        tenants: _ctx.tenants,
                         user,
                         onClick: ($event) => handleTagClick(index),
                         onClose: ($event) => removeUser(user)
                       }, null, 8, ["active", "current-tenant-id", "draggable", "tenants", "user", "onClick", "onClose"]),
                       createCommentVNode(" 在当前激活标签后插入输入框 "),
-                      index === activeTagIndex.value && activeTagIndex.value !== __props.selectedUsers.length - 1 ? withDirectives((openBlock(), createElementBlock(
+                      index === activeTagIndex.value && activeTagIndex.value !== _ctx.selectedUsers.length - 1 ? withDirectives((openBlock(), createElementBlock(
                         "input",
                         {
                           key: 0,
@@ -17351,13 +17286,13 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                   /* KEYED_FRAGMENT */
                 )),
                 createCommentVNode(" 最后一个输入框 "),
-                activeTagIndex.value === -1 || activeTagIndex.value === __props.selectedUsers.length - 1 ? withDirectives((openBlock(), createElementBlock("input", {
+                activeTagIndex.value === -1 || activeTagIndex.value === _ctx.selectedUsers.length - 1 ? withDirectives((openBlock(), createElementBlock("input", {
                   key: 0,
                   ref_key: "lastInputRef",
                   ref: lastInputRef,
                   class: "search-input last",
                   "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => isRef(searchQuery) ? searchQuery.value = $event : null),
-                  placeholder: !__props.selectedUsers.length ? __props.placeholder : "",
+                  placeholder: !_ctx.selectedUsers.length ? _ctx.placeholder : "",
                   onFocus: handleInputFocus,
                   onInput: handleInput,
                   onKeydown: handleKeyDown,
@@ -17367,8 +17302,8 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                 ]) : createCommentVNode("v-if", true),
                 createCommentVNode(' "我"标签 '),
                 createVNode(MeTag, {
-                  "current-user-id": __props.currentUserId,
-                  "is-disabled": !!__props.currentUserId && __props.selectedUsers.some((user) => user.id === __props.currentUserId),
+                  "current-user-id": _ctx.currentUserId,
+                  "is-disabled": !!_ctx.currentUserId && _ctx.selectedUsers.some((user) => user.id === _ctx.currentUserId),
                   onClick: addCurrentUser
                 }, null, 8, ["current-user-id", "is-disabled"])
               ],
@@ -17397,10 +17332,10 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                   null,
                   renderList(visibleUsers.value, (user) => {
                     return openBlock(), createBlock(UserTag, {
-                      "current-tenant-id": __props.tenantId,
+                      "current-tenant-id": _ctx.tenantId,
                       key: user.id,
                       "show-tenant": true,
-                      tenants: __props.tenants,
+                      tenants: _ctx.tenants,
                       user,
                       onClick: handleFocus,
                       onClose: ($event) => removeUser(user)
@@ -17425,7 +17360,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                   /* STABLE */
                 })), [
                   [unref(__webpack_exports__bkTooltips), {
-                    content: __props.selectedUsers.slice(visibleUsers.value.length).map((user) => user.display_name).join(","),
+                    content: _ctx.selectedUsers.slice(visibleUsers.value.length).map((user) => user.display_name).join(","),
                     placement: "top"
                   }]
                 ]) : createCommentVNode("v-if", true),
@@ -17435,15 +17370,15 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                   ref: collapsedInputRef,
                   class: "search-input collapsed",
                   "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => isRef(searchQuery) ? searchQuery.value = $event : null),
-                  placeholder: !__props.selectedUsers.length ? __props.placeholder : "",
+                  placeholder: !_ctx.selectedUsers.length ? _ctx.placeholder : "",
                   onFocus: handleFocus
                 }, null, 40, _hoisted_3$1), [
                   [vModelText, unref(searchQuery)]
                 ]),
                 createCommentVNode(' 未聚焦状态下的"我"标签 '),
                 createVNode(MeTag, {
-                  "current-user-id": __props.currentUserId,
-                  "is-disabled": !!__props.currentUserId && __props.selectedUsers.some((user) => user[props2.exactSearchKey] === __props.currentUserId),
+                  "current-user-id": _ctx.currentUserId,
+                  "is-disabled": !!_ctx.currentUserId && _ctx.selectedUsers.some((user) => user[props2.exactSearchKey] === _ctx.currentUserId),
                   onClick: addCurrentUser
                 }, null, 8, ["current-user-id", "is-disabled"])
               ],
@@ -17461,10 +17396,10 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
           loading: unref(searchLoading),
           options: options.value,
           "search-query": unref(searchQuery),
-          "tenant-id": __props.tenantId,
-          tenants: __props.tenants,
-          "user-group": __props.userGroup,
-          "user-group-name": __props.userGroupName,
+          "tenant-id": _ctx.tenantId,
+          tenants: _ctx.tenants,
+          "user-group": _ctx.userGroup,
+          "user-group-name": _ctx.userGroupName,
           onSelectUser: addUser
         }, null, 8, ["container-width", "is-show", "loading", "options", "search-query", "tenant-id", "tenants", "user-group", "user-group-name"])
       ])), [
@@ -17473,8 +17408,8 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const MultipleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-a09f11c3"]]);
-const _withScopeId = (n2) => (pushScopeId("data-v-8b8dd0fd"), n2 = n2(), popScopeId(), n2);
+const MultipleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-1a376d26"]]);
+const _withScopeId = (n2) => (pushScopeId("data-v-3926de45"), n2 = n2(), popScopeId(), n2);
 const _hoisted_1$1 = { class: "input-container" };
 const _hoisted_2 = {
   key: 0,
@@ -17494,15 +17429,15 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   },
   __name: "single-selector",
   props: {
-    modelValue: {},
+    modelValue: { default: "" },
     tenants: {},
-    apiBaseUrl: {},
-    tenantId: {},
-    placeholder: {},
-    currentUserId: {},
-    exactSearchKey: {},
-    userGroup: {},
-    userGroupName: {}
+    apiBaseUrl: { default: "" },
+    tenantId: { default: "" },
+    placeholder: { default: "请输入人员名称搜索" },
+    currentUserId: { default: "" },
+    exactSearchKey: { default: "bk_username" },
+    userGroup: { default: () => [] },
+    userGroupName: { default: "用户群组" }
   },
   emits: ["update:modelValue", "change"],
   setup(__props, { emit: __emit }) {
@@ -17641,10 +17576,10 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
           ]),
           createCommentVNode(' "我"标签 '),
           createVNode(MeTag, {
-            "is-disabled": !!_ctx.currentUserId && !!selectedUserInfo.value && selectedUserInfo.value[_ctx.exactSearchKey || "bk_username"] === _ctx.currentUserId,
             "current-user-id": _ctx.currentUserId,
+            "is-disabled": !!_ctx.currentUserId && !!selectedUserInfo.value && selectedUserInfo.value[_ctx.exactSearchKey] === _ctx.currentUserId,
             onClick: addCurrentUser
-          }, null, 8, ["is-disabled", "current-user-id"])
+          }, null, 8, ["current-user-id", "is-disabled"])
         ]),
         createCommentVNode(" 使用新的公共下拉选项组件 "),
         createVNode(SelectionPopover, {
@@ -17665,7 +17600,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SingleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-8b8dd0fd"]]);
+const SingleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-3926de45"]]);
 const _hoisted_1 = { class: "bk-user-selector" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{