@blueking/bk-user-selector 0.0.16 → 0.0.18

package/package.json

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

package/typings/components/render-tag.d.ts

@@ -0,0 +1,8 @@
+declare const _default: import("vue").DefineComponent<{
+    renderTag: FunctionConstructor;
+    userInfo: ObjectConstructor;
+}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    renderTag: FunctionConstructor;
+    userInfo: ObjectConstructor;
+}>>, {}, {}>;
+export default _default;

package/typings/components/selection-popover.vue.d.ts

@@ -56,6 +56,7 @@ declare const _default: import("vue").DefineComponent<{
         type: () => {
             id: string;
             name: string;
+            hidden?: boolean;
         }[];
         default: () => never[];
     };
@@ -132,6 +133,7 @@ declare const _default: import("vue").DefineComponent<{
         type: () => {
             id: string;
             name: string;
+            hidden?: boolean;
         }[];
         default: () => never[];
     };
@@ -162,6 +164,7 @@ declare const _default: import("vue").DefineComponent<{
     userGroup: {
         id: string;
         name: string;
+        hidden?: boolean;
     }[];
     userGroupName: string;
     emptyText: string;

package/typings/types/index.d.ts

@@ -1,3 +1,5 @@
+import { type createVNode } from 'vue';
+import type { VNode } from 'vue';
 /**
  * 用户对象接口
  */
@@ -43,10 +45,14 @@ export interface FormattedUser {
      * 租户ID
      */
     tenantId: string;
+    /**
+     * 是否隐藏
+     */
+    hidden?: boolean;
     /**
      * 其他属性
      */
-    [key: string]: string;
+    [key: string]: boolean | string | undefined;
 }
 /**
  * 租户信息
@@ -100,6 +106,14 @@ interface BaseSelectorProps {
      * 无匹配人员时的提示文本
      */
     emptyText?: string;
+    /**
+     * 渲染列表项
+     */
+    renderListItem?: (h: typeof createVNode, userInfo: FormattedUser) => VNode;
+    /**
+     * 渲染标签
+     */
+    renderTag?: (h: typeof createVNode, userInfo: FormattedUser) => VNode;
 }
 /**
  * 用户选择器属性

package/vue2/index.es.min.js

@@ -16787,9 +16787,8 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     const groupedUsers = computed(() => {
       const groups = {};
       if (Array.isArray(props2.userGroup) && props2.userGroup.length > 0) {
-        groups[props2.userGroupName] = props2.userGroup.map((group) => ({
-          id: group.id,
-          name: group.name,
+        groups[props2.userGroupName] = props2.userGroup.filter((group) => !group.hidden).map((group) => ({
+          ...group,
           tenantId: "",
           type: "userGroup"
         }));
@@ -16876,26 +16875,28 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
                           key: user.id,
                           onMousedown: withModifiers(($event) => selectUser(user), ["prevent"])
                         }, [
-                          user.login_name ? (openBlock(), createElementBlock(
-                            "span",
-                            _hoisted_5,
-                            toDisplayString(user.login_name) + "(" + toDisplayString(user.name) + ")",
-                            1
-                            /* TEXT */
-                          )) : (openBlock(), createElementBlock(
-                            "span",
-                            _hoisted_6,
-                            toDisplayString(user.name),
-                            1
-                            /* TEXT */
-                          )),
-                          user.tenantId !== __props.tenantId && user.tenantId && __props.tenants[user.tenantId] ? (openBlock(), createElementBlock(
-                            "span",
-                            _hoisted_7,
-                            "@" + toDisplayString(__props.tenants[user.tenantId]),
-                            1
-                            /* TEXT */
-                          )) : createCommentVNode("v-if", true)
+                          createElementVNode("div", null, [
+                            user.login_name ? (openBlock(), createElementBlock(
+                              "span",
+                              _hoisted_5,
+                              toDisplayString(user.login_name) + "(" + toDisplayString(user.name) + ")",
+                              1
+                              /* TEXT */
+                            )) : (openBlock(), createElementBlock(
+                              "span",
+                              _hoisted_6,
+                              toDisplayString(user.name),
+                              1
+                              /* TEXT */
+                            )),
+                            user.tenantId !== __props.tenantId && user.tenantId && __props.tenants[user.tenantId] ? (openBlock(), createElementBlock(
+                              "span",
+                              _hoisted_7,
+                              "@" + toDisplayString(__props.tenants[user.tenantId]),
+                              1
+                              /* TEXT */
+                            )) : createCommentVNode("v-if", true)
+                          ])
                         ], 40, _hoisted_4$1);
                       }),
                       128
@@ -16917,7 +16918,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SelectionPopover = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-8489ef3d"]]);
+const SelectionPopover = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-7bcec2be"]]);
 const _hoisted_1$3 = { class: "tag-content" };
 const _hoisted_2$2 = { class: "user-name" };
 const _hoisted_3$2 = {
@@ -16998,7 +16999,9 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     exactSearchKey: { default: "bk_username" },
     userGroup: { default: () => [] },
     userGroupName: { default: "用户群组" },
-    emptyText: { default: "无匹配人员" }
+    emptyText: { default: "无匹配人员" },
+    renderListItem: {},
+    renderTag: {}
   },
   emits: ["update:selectedUsers", "add-user", "remove-user"],
   setup(__props, { emit: __emit }) {
@@ -17443,7 +17446,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   }
 });
 const MultipleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-1b988eae"]]);
-const _withScopeId = (n2) => (pushScopeId("data-v-b9296528"), n2 = n2(), popScopeId(), n2);
+const _withScopeId = (n2) => (pushScopeId("data-v-5040d42f"), n2 = n2(), popScopeId(), n2);
 const _hoisted_1$1 = { class: "input-container" };
 const _hoisted_2 = {
   key: 0,
@@ -17472,7 +17475,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     exactSearchKey: { default: "bk_username" },
     userGroup: { default: () => [] },
     userGroupName: { default: "用户群组" },
-    emptyText: { default: "无匹配人员" }
+    emptyText: { default: "无匹配人员" },
+    renderListItem: {},
+    renderTag: {}
   },
   emits: ["update:modelValue", "change"],
   setup(__props, { emit: __emit }) {
@@ -17487,9 +17492,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     const showDropdown = ref(false);
     const selectedUserInfo = computed(() => {
       const userGroup = (props2.userGroup || []).map((group) => ({
-        id: group.id,
-        name: group.name,
-        tenantId: ""
+        ...group,
+        tenantId: "",
+        type: "userGroup"
       }));
       const list = [...options.value, ...userGroup];
       const selectedUserInfo2 = list.find((user) => user.id === selectedUser.value);
@@ -17507,8 +17512,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
           if (props2.userGroup.length > 0) {
             const groupResult = props2.userGroup.filter((group) => group.id == props2.modelValue);
             options.value = groupResult.map((group) => ({
-              id: group.id,
-              name: group.name,
+              ...group,
               tenantId: "",
               type: "userGroup"
             }));
@@ -17641,7 +17645,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SingleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-b9296528"]]);
+const SingleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-5040d42f"]]);
 const _hoisted_1 = {
   ref: "containerRef",
   class: "bk-user-selector"
@@ -17662,7 +17666,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     exactSearchKey: { default: "bk_username" },
     userGroup: { default: () => [] },
     userGroupName: { default: "用户群组" },
-    emptyText: { default: "无匹配人员" }
+    emptyText: { default: "无匹配人员" },
+    renderListItem: {},
+    renderTag: {}
   },
   emits: ["update:modelValue", "change"],
   setup(__props, { emit: __emit }) {
@@ -17677,11 +17683,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const initSelectedUsers = async () => {
       if (props2.multiple) {
         const ids = Array.isArray(props2.modelValue) ? props2.modelValue : [];
+        let selected = [];
         if (props2.userGroup.length > 0) {
           const result = props2.userGroup.filter((group) => ids.includes(group.id));
-          selectedUsers.value = result.map((group) => ({
-            id: group.id,
-            name: group.name,
+          selected = result.map((group) => ({
+            ...group,
             tenantId: "",
             type: "userGroup"
           }));
@@ -17689,7 +17695,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (ids.length > 0) {
           try {
             const result = await lookupUsers(props2.apiBaseUrl, props2.tenantId, props2.exactSearchKey, ids);
-            selectedUsers.value = [...selectedUsers.value, ...formatUsers(result)];
+            selectedUsers.value = [...selected, ...formatUsers(result)];
           } catch (error3) {
             console.error("获取选中用户信息失败:", error3);
           }
@@ -17714,6 +17720,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         emit("update:modelValue", newVal);
       }
     });
+    watch(
+      () => props2.userGroup,
+      () => {
+        initSelectedUsers();
+      }
+    );
     onBeforeMount(() => {
       initSelectedUsers();
     });
@@ -17732,12 +17744,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             "empty-text": _ctx.emptyText,
             "exact-search-key": _ctx.exactSearchKey,
             placeholder: _ctx.placeholder,
+            "render-list-item": _ctx.renderListItem,
+            "render-tag": _ctx.renderTag,
             "tenant-id": _ctx.tenantId,
             tenants: unref(tenants),
             "user-group": _ctx.userGroup,
             "user-group-name": _ctx.userGroupName,
             onChange: handleUpdateUser
-          }, null, 8, ["modelValue", "api-base-url", "current-user-id", "empty-text", "exact-search-key", "placeholder", "tenant-id", "tenants", "user-group", "user-group-name"])) : (openBlock(), createElementBlock(
+          }, null, 8, ["modelValue", "api-base-url", "current-user-id", "empty-text", "exact-search-key", "placeholder", "render-list-item", "render-tag", "tenant-id", "tenants", "user-group", "user-group-name"])) : (openBlock(), createElementBlock(
             Fragment,
             { key: 1 },
             [
@@ -17751,13 +17765,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 "empty-text": _ctx.emptyText,
                 "exact-search-key": _ctx.exactSearchKey,
                 placeholder: _ctx.placeholder,
+                "render-list-item": _ctx.renderListItem,
+                "render-tag": _ctx.renderTag,
                 "selected-users": selectedUsers.value,
                 "tenant-id": _ctx.tenantId,
                 tenants: unref(tenants),
                 "user-group": _ctx.userGroup,
                 "user-group-name": _ctx.userGroupName,
                 "onUpdate:selectedUsers": handleUpdateSelectedUsers
-              }, null, 8, ["modelValue", "api-base-url", "current-user-id", "draggable", "empty-text", "exact-search-key", "placeholder", "selected-users", "tenant-id", "tenants", "user-group", "user-group-name"])
+              }, null, 8, ["modelValue", "api-base-url", "current-user-id", "draggable", "empty-text", "exact-search-key", "placeholder", "render-list-item", "render-tag", "selected-users", "tenant-id", "tenants", "user-group", "user-group-name"])
             ],
             2112
             /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
@@ -17769,7 +17785,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BkUserSelector = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-5dcf7617"]]);
+const BkUserSelector = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-c23f5bc9"]]);
 const vue2 = {
   model: {
     prop: "modelValue",