@blueking/bk-user-selector 0.0.8 → 0.0.10

package/vue2/index.es.min.js

@@ -16776,7 +16776,6 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     const emit = __emit;
     const groupedUsers = computed(() => {
       const groups = {};
-      console.log("props.options", props2.options);
       if (Array.isArray(props2.userGroup) && props2.userGroup.length > 0) {
         groups[props2.userGroupName] = props2.userGroup.map((group) => ({
           id: group.id,
@@ -16830,9 +16829,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 +16855,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
                       ],
                       32
                       /* NEED_HYDRATION */
-                    ),
+                    )) : createCommentVNode("v-if", true),
                     (openBlock(true), createElementBlock(
                       Fragment,
                       null,
@@ -16900,7 +16900,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-01b75e6e"]]);
 const _hoisted_1$3 = { class: "tag-content" };
 const _hoisted_2$2 = { class: "user-name" };
 const _hoisted_3$2 = {
@@ -16970,83 +16970,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 +17243,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 +17251,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 +17285,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 +17301,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 +17331,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 +17359,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 +17369,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 +17395,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 +17407,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-22d9b76f"), n2 = n2(), popScopeId(), n2);
 const _hoisted_1$1 = { class: "input-container" };
 const _hoisted_2 = {
   key: 0,
@@ -17494,15 +17428,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 }) {
@@ -17563,7 +17497,6 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       try {
         const result = await searchUsers(props2.apiBaseUrl, props2.tenantId, keyword);
         options.value = formatUsers(result).filter((user) => !selectedUser.value || user.id !== selectedUser.value);
-        console.log("options.value", options.value);
       } catch (error3) {
         console.error("获取用户列表失败:", error3);
         options.value = [];
@@ -17572,7 +17505,6 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       }
     };
     const addUser = (user) => {
-      console.log("addUser", user);
       selectedUser.value = user.id;
       searchQuery.value = "";
       showDropdown.value = false;
@@ -17587,7 +17519,6 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       }
     };
     const handleInput = () => {
-      console.log("handleInput", searchQuery.value);
       fetchUsers(searchQuery.value);
       showDropdown.value = searchQuery.value.length >= 2;
     };
@@ -17595,7 +17526,6 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       showDropdown.value = false;
     };
     watch(selectedUser, (newVal) => {
-      console.log("selectedUser", newVal);
       emit("update:modelValue", newVal);
     });
     return (_ctx, _cache) => {
@@ -17641,10 +17571,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,8 +17595,11 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SingleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-8b8dd0fd"]]);
-const _hoisted_1 = { class: "bk-user-selector" };
+const SingleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-22d9b76f"]]);
+const _hoisted_1 = {
+  ref: "containerRef",
+  class: "bk-user-selector"
+};
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{
     name: "BkUserSelector"
@@ -17699,7 +17632,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         const ids = Array.isArray(props2.modelValue) ? props2.modelValue : [];
         if (ids.length > 0) {
           try {
-            console.log(props2.exactSearchKey);
             const result = await lookupUsers(props2.apiBaseUrl, props2.tenantId, props2.exactSearchKey, ids);
             selectedUsers.value = formatUsers(result);
           } catch (error3) {
@@ -17730,51 +17662,61 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       initSelectedUsers();
     });
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("section", _hoisted_1, [
-        createCommentVNode(" 单选模式 "),
-        !_ctx.multiple ? (openBlock(), createBlock(SingleSelector, {
-          key: 0,
-          modelValue: selectedUser.value,
-          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => selectedUser.value = $event),
-          "api-base-url": _ctx.apiBaseUrl,
-          "current-user-id": _ctx.currentUserId,
-          "exact-search-key": _ctx.exactSearchKey,
-          placeholder: _ctx.placeholder,
-          "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", "exact-search-key", "placeholder", "tenant-id", "tenants", "user-group", "user-group-name"])) : (openBlock(), createElementBlock(
-          Fragment,
-          { key: 1 },
-          [
-            createCommentVNode(" 多选模式 "),
-            createVNode(MultipleSelector, {
-              modelValue: selectedUserIds.value,
-              "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => selectedUserIds.value = $event),
-              "api-base-url": _ctx.apiBaseUrl,
-              "current-user-id": _ctx.currentUserId,
-              draggable: _ctx.draggable,
-              "exact-search-key": _ctx.exactSearchKey,
-              placeholder: _ctx.placeholder,
-              "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", "exact-search-key", "placeholder", "selected-users", "tenant-id", "tenants", "user-group", "user-group-name"])
-          ],
-          2112
-          /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
-        ))
-      ]);
+      return openBlock(), createElementBlock(
+        "section",
+        _hoisted_1,
+        [
+          createCommentVNode(" 单选模式 "),
+          !_ctx.multiple ? (openBlock(), createBlock(SingleSelector, {
+            key: 0,
+            modelValue: selectedUser.value,
+            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => selectedUser.value = $event),
+            "api-base-url": _ctx.apiBaseUrl,
+            "current-user-id": _ctx.currentUserId,
+            "exact-search-key": _ctx.exactSearchKey,
+            placeholder: _ctx.placeholder,
+            "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", "exact-search-key", "placeholder", "tenant-id", "tenants", "user-group", "user-group-name"])) : (openBlock(), createElementBlock(
+            Fragment,
+            { key: 1 },
+            [
+              createCommentVNode(" 多选模式 "),
+              createVNode(MultipleSelector, {
+                modelValue: selectedUserIds.value,
+                "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => selectedUserIds.value = $event),
+                "api-base-url": _ctx.apiBaseUrl,
+                "current-user-id": _ctx.currentUserId,
+                draggable: _ctx.draggable,
+                "exact-search-key": _ctx.exactSearchKey,
+                placeholder: _ctx.placeholder,
+                "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", "exact-search-key", "placeholder", "selected-users", "tenant-id", "tenants", "user-group", "user-group-name"])
+            ],
+            2112
+            /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
+          ))
+        ],
+        512
+        /* NEED_PATCH */
+      );
     };
   }
 });
-const BkUserSelector = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-bc7b4ccd"]]);
+const BkUserSelector = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-84252deb"]]);
 const vue2 = {
+  model: {
+    prop: "modelValue",
+    event: "change"
+  },
   beforeDestroy() {
     var _a;
     this.unWatchStack.forEach((unWatch) => unWatch == null ? void 0 : unWatch());