@blueking/bk-user-selector 0.0.16 → 0.0.18

package/vue3/index.es.min.js

@@ -3110,9 +3110,8 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     const groupedUsers = computed(() => {
       const groups = {};
       if (Array.isArray(props.userGroup) && props.userGroup.length > 0) {
-        groups[props.userGroupName] = props.userGroup.map((group) => ({
-          id: group.id,
-          name: group.name,
+        groups[props.userGroupName] = props.userGroup.filter((group) => !group.hidden).map((group) => ({
+          ...group,
           tenantId: "",
           type: "userGroup"
         }));
@@ -3199,26 +3198,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
@@ -3240,7 +3241,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 = {
@@ -3321,7 +3322,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 }) {
@@ -3766,7 +3769,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   }
 });
 const MultipleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-1b988eae"]]);
-const _withScopeId = (n) => (pushScopeId("data-v-b9296528"), n = n(), popScopeId(), n);
+const _withScopeId = (n) => (pushScopeId("data-v-5040d42f"), n = n(), popScopeId(), n);
 const _hoisted_1$1 = { class: "input-container" };
 const _hoisted_2 = {
   key: 0,
@@ -3795,7 +3798,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 }) {
@@ -3810,9 +3815,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     const showDropdown = ref(false);
     const selectedUserInfo = computed(() => {
       const userGroup = (props.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);
@@ -3830,8 +3835,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
           if (props.userGroup.length > 0) {
             const groupResult = props.userGroup.filter((group) => group.id == props.modelValue);
             options.value = groupResult.map((group) => ({
-              id: group.id,
-              name: group.name,
+              ...group,
               tenantId: "",
               type: "userGroup"
             }));
@@ -3964,7 +3968,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"
@@ -3985,7 +3989,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 }) {
@@ -4000,11 +4006,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const initSelectedUsers = async () => {
       if (props.multiple) {
         const ids = Array.isArray(props.modelValue) ? props.modelValue : [];
+        let selected = [];
         if (props.userGroup.length > 0) {
           const result = props.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"
           }));
@@ -4012,7 +4018,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (ids.length > 0) {
           try {
             const result = await lookupUsers(props.apiBaseUrl, props.tenantId, props.exactSearchKey, ids);
-            selectedUsers.value = [...selectedUsers.value, ...formatUsers(result)];
+            selectedUsers.value = [...selected, ...formatUsers(result)];
           } catch (error) {
             console.error("获取选中用户信息失败:", error);
           }
@@ -4037,6 +4043,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         emit("update:modelValue", newVal);
       }
     });
+    watch(
+      () => props.userGroup,
+      () => {
+        initSelectedUsers();
+      }
+    );
     onBeforeMount(() => {
       initSelectedUsers();
     });
@@ -4055,12 +4067,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 },
             [
@@ -4074,13 +4088,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 */
@@ -4092,7 +4108,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"]]);
 export {
   BkUserSelector,
   BkUserSelector as default