@blueking/bk-user-selector 0.0.33 → 0.0.35-beta.1

package/package.json

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

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

@@ -3,10 +3,14 @@ declare const _default: import("vue").DefineComponent<MultipleSelectorProps, {},
     "update:selectedUsers": (...args: any[]) => void;
     "add-user": (...args: any[]) => void;
     "remove-user": (...args: any[]) => void;
+    dragStart: (...args: any[]) => void;
+    dragEnd: (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<MultipleSelectorProps> & Readonly<{
     "onUpdate:selectedUsers"?: ((...args: any[]) => any) | undefined;
     "onAdd-user"?: ((...args: any[]) => any) | undefined;
     "onRemove-user"?: ((...args: any[]) => any) | undefined;
+    onDragStart?: ((...args: any[]) => any) | undefined;
+    onDragEnd?: ((...args: any[]) => any) | undefined;
 }>, {
     tenantId: string;
     apiBaseUrl: string;

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

@@ -1,9 +1,13 @@
 import { UserSelectorProps } from '../types';
 declare const _default: import("vue").DefineComponent<UserSelectorProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     change: (...args: any[]) => void;
+    dragStart: (...args: any[]) => void;
+    dragEnd: (...args: any[]) => void;
     "update:modelValue": (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<UserSelectorProps> & Readonly<{
     onChange?: ((...args: any[]) => any) | undefined;
+    onDragStart?: ((...args: any[]) => any) | undefined;
+    onDragEnd?: ((...args: any[]) => any) | undefined;
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
 }>, {
     tenantId: string;

package/vue2/index.es.min.js

@@ -4546,10 +4546,6 @@ __webpack_require__$7.d(__webpack_exports__$7, {
     /* reexport */
     lang_en
   ),
-  jp: () => (
-    /* reexport */
-    ja_jp
-  ),
   zhCn: () => (
     /* reexport */
     zh_cn
@@ -4737,145 +4733,6 @@ var en = {
   }
 };
 const lang_en = en;
-var jp = {
-  lang: "ja",
-  steps: {
-    step1: "ステップ1",
-    step2: "ステップ2",
-    step3: "ステップ3"
-  },
-  datePicker: {
-    selectDate: "日付を選択",
-    selectTime: "時間を選択",
-    clear: "クリア",
-    ok: "OK",
-    weekdays: {
-      sun: "日",
-      mon: "月",
-      tue: "火",
-      wed: "水",
-      thu: "木",
-      fri: "金",
-      sat: "土"
-    },
-    hour: "時間",
-    min: "分",
-    sec: "秒",
-    toNow: "現在まで"
-  },
-  dialog: {
-    ok: "OK",
-    cancel: "キャンセル",
-    prev: "前へ",
-    next: "次へ"
-  },
-  popConfirm: {
-    ok: "OK",
-    cancel: "キャンセル"
-  },
-  form: {
-    notBeEmpty: "空にできません",
-    incorrectFormat: "形式が正しくありません",
-    max: "最大値",
-    min: "最小値",
-    maxLen: "最大長",
-    verifyError: "検証エラー"
-  },
-  pagination: {
-    eachPage: "各ページ",
-    strip: "",
-    total: "合計"
-  },
-  process: {
-    step1: "ステップ1",
-    step2: "ステップ2",
-    step3: "ステップ3",
-    step4: "ステップ4"
-  },
-  searchSelect: {
-    pleaseSelect: "選択してください",
-    loading: "ロード中...",
-    filterQueryMustHasValue: "フィルタークエリに値を含める必要があります",
-    ok: "OK",
-    cancel: "キャンセル",
-    or: "または",
-    and: "そして",
-    logical: "論理:"
-  },
-  select: {
-    noData: "データなし",
-    noMatchedData: "一致するデータがありません",
-    loading: "読み込み中...",
-    pleaseSelect: "選んでください",
-    enterKeywords: "キーワードを入力してください",
-    all: "すべて",
-    selectAll: "すべて選択"
-  },
-  table: {
-    emptyText: "データがありません",
-    confirm: "確認",
-    reset: "リセット",
-    sort: "ソート",
-    setting: {
-      title: "テーブル設定",
-      fields: {
-        title: "表示フィールド設定",
-        subtitle: function subtitle2(max2) {
-          return "（".concat(max2, "フィールド最大）");
-        },
-        selectAll: "すべて選択"
-      },
-      lineHeight: {
-        title: "テーブル行の高さ",
-        small: "小",
-        medium: "中",
-        large: "大"
-      },
-      options: {
-        ok: "OK",
-        cancel: "キャンセル"
-      }
-    }
-  },
-  transfer: {
-    sourceList: "ソースリスト",
-    targetList: "ターゲットリスト",
-    removeAll: "すべて削除",
-    selectAll: "すべて選択",
-    noData: "データがありません",
-    noSelected: "選択されていません",
-    search: "検索"
-  },
-  upload: {
-    uploadSuccess: "アップロード成功",
-    uploadFailed: "アップロード失敗",
-    drapFileOr: "ここにファイルをドラッグまたは",
-    clickUpload: "クリックしてアップロード",
-    uploadLabel: "ファイルをアップロード"
-  },
-  input: {
-    placeholder: "入力してください",
-    maxlengthLimitTips: "文字数制限に達しました"
-  },
-  tagInput: {
-    placeholder: "入力してEnterキーで終了"
-  },
-  message: {
-    assistant: "アシスタント",
-    details: "詳細",
-    copySuccess: "コピー成功",
-    copyFailed: "コピー失敗"
-  },
-  cascader: {
-    pleaseSelect: "選択してください",
-    noData: "データがありません",
-    emptyText: "データがありません"
-  },
-  versionLog: {
-    current: "現在のバージョン"
-  }
-};
-const ja_jp = jp;
 var zhCn = {
   lang: "zh-cn",
   steps: {
@@ -4960,7 +4817,7 @@ var zhCn = {
       title: "表格设置",
       fields: {
         title: "字段显示设置",
-        subtitle: function subtitle3(max2) {
+        subtitle: function subtitle2(max2) {
           return "（最多".concat(max2, "项）");
         },
         selectAll: "全选"
@@ -5059,7 +4916,6 @@ var zhCn = {
 };
 const zh_cn = zhCn;
 __webpack_exports__$7.en;
-__webpack_exports__$7.jp;
 var __webpack_exports__zhCn = __webpack_exports__$7.zhCn;
 var __webpack_require__$6 = {};
 (() => {
@@ -10617,6 +10473,9 @@ var __webpack_exports__ = {};
             hide2(el);
           }, 100);
         });
+        el.addEventListener("click", function() {
+          hide2(el);
+        });
         popper2.addEventListener("mouseleave", function() {
           clearTimeout(delayTimeout);
           hideTimeout = setTimeout(function() {
@@ -10630,7 +10489,7 @@ var __webpack_exports__ = {};
               show(el);
               clearTimeout(delayTimeout);
             }, opts.delay);
-          } else if (!el.contains(event.target) && popper2.hasAttribute("data-show")) {
+          } else if (popper2.hasAttribute("data-show")) {
             hide2(el);
           }
         });
@@ -14338,7 +14197,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SelectionPopover = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-561a8644"]]);
+const SelectionPopover = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-e11d7af7"]]);
 const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   ...{
     name: "UserTag"
@@ -14414,7 +14273,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     enableMultiTenantMode: { type: Boolean },
     allowCreate: { type: Boolean, default: false }
   },
-  emits: ["update:selectedUsers", "add-user", "remove-user"],
+  emits: ["update:selectedUsers", "add-user", "remove-user", "dragStart", "dragEnd"],
   setup(__props, { emit: __emit }) {
     const props2 = __props;
     const emit = __emit;
@@ -14459,6 +14318,9 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       sortableInstance.value = new Sortable(sortableContainerRef.value, {
         animation: 150,
         draggable: ".tag-wrapper",
+        onStart: (event) => {
+          emit("dragStart", event);
+        },
         onEnd: (evt) => {
           const { oldIndex, newIndex } = evt;
           if (oldIndex === newIndex || oldIndex === void 0 || newIndex === void 0) return;
@@ -14466,6 +14328,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
           const [movedUser] = updatedUsers.splice(oldIndex, 1);
           updatedUsers.splice(newIndex, 0, movedUser);
           emit("update:selectedUsers", updatedUsers);
+          emit("dragEnd", evt);
         }
       });
     };
@@ -14488,7 +14351,11 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
     const handleFocus = () => {
       isFocused.value = true;
-      showDropdown.value = false;
+      if (props2.userGroup.length > 0) {
+        showDropdown.value = true;
+      } else {
+        showDropdown.value = false;
+      }
       activeTagIndex.value = -1;
       nextTick(() => {
         if (lastInputRef.value) {
@@ -14582,13 +14449,19 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
           const result = await lookupUsers({
             apiBaseUrl: props2.apiBaseUrl,
             tenantId: props2.tenantId,
-            exactSearchKey: props2.exactSearchKey,
+            exactSearchKey: "login_name",
             usersList: users,
             enableMultiTenantMode: props2.enableMultiTenantMode
           });
           const formattedUsers = formatUsers(result, props2.enableMultiTenantMode);
           if (formattedUsers.length > 0) {
-            const updatedUsers = [...props2.selectedUsers, ...formattedUsers];
+            const userMap = /* @__PURE__ */ new Map();
+            [...props2.selectedUsers, ...formattedUsers].forEach((user) => {
+              if (!userMap.has(user.id)) {
+                userMap.set(user.id, user);
+              }
+            });
+            const updatedUsers = Array.from(userMap.values());
             emit("update:selectedUsers", updatedUsers);
           }
         } catch (error3) {
@@ -14910,7 +14783,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const MultipleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-d8aff9ea"]]);
+const MultipleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-7515c7a3"]]);
 const _hoisted_1 = { class: "input-container" };
 const _hoisted_2 = ["placeholder"];
 const _sfc_main$1 = /* @__PURE__ */ defineComponent({
@@ -15193,7 +15066,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     enableMultiTenantMode: { type: Boolean, default: true },
     allowCreate: { type: Boolean, default: false }
   },
-  emits: ["update:modelValue", "change"],
+  emits: ["update:modelValue", "change", "dragStart", "dragEnd"],
   setup(__props, { emit: __emit }) {
     const { t: t2 } = useI18n();
     __webpack_exports__provideGlobalConfig({
@@ -15273,6 +15146,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     watch(
       () => props2.modelValue,
       () => {
+        initSelectedUsers();
       }
     );
     onBeforeMount(() => {
@@ -15291,8 +15165,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             key: 0,
             modelValue: selectedUser.value,
             "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => selectedUser.value = $event),
-            "api-base-url": _ctx.apiBaseUrl,
             "allow-create": _ctx.allowCreate,
+            "api-base-url": _ctx.apiBaseUrl,
             "current-user-id": _ctx.currentUserId,
             disabled: _ctx.disabled,
             "empty-text": emptyText.value,
@@ -15307,7 +15181,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             "user-group": _ctx.userGroup,
             "user-group-name": userGroupName.value,
             onChange: handleUpdateUser
-          }, null, 8, ["modelValue", "api-base-url", "allow-create", "current-user-id", "disabled", "empty-text", "enable-multi-tenant-mode", "exact-search-key", "exclude-user-ids", "placeholder", "render-list-item", "render-tag", "tenant-id", "tenants", "user-group", "user-group-name"])) : (openBlock(), createElementBlock(
+          }, null, 8, ["modelValue", "allow-create", "api-base-url", "current-user-id", "disabled", "empty-text", "enable-multi-tenant-mode", "exact-search-key", "exclude-user-ids", "placeholder", "render-list-item", "render-tag", "tenant-id", "tenants", "user-group", "user-group-name"])) : (openBlock(), createElementBlock(
             Fragment,
             { key: 1 },
             [
@@ -15315,8 +15189,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               createVNode(MultipleSelector, {
                 modelValue: selectedUserIds.value,
                 "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => selectedUserIds.value = $event),
-                "api-base-url": _ctx.apiBaseUrl,
                 "allow-create": _ctx.allowCreate,
+                "api-base-url": _ctx.apiBaseUrl,
                 "current-user-id": _ctx.currentUserId,
                 disabled: _ctx.disabled,
                 draggable: _ctx.draggable,
@@ -15332,8 +15206,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 tenants: unref(tenants),
                 "user-group": _ctx.userGroup,
                 "user-group-name": userGroupName.value,
+                onDragEnd: _cache[2] || (_cache[2] = ($event) => _ctx.$emit("dragEnd", $event)),
+                onDragStart: _cache[3] || (_cache[3] = ($event) => _ctx.$emit("dragStart", $event)),
                 "onUpdate:selectedUsers": handleUpdateSelectedUsers
-              }, null, 8, ["modelValue", "api-base-url", "allow-create", "current-user-id", "disabled", "draggable", "empty-text", "enable-multi-tenant-mode", "exact-search-key", "exclude-user-ids", "placeholder", "render-list-item", "render-tag", "selected-users", "tenant-id", "tenants", "user-group", "user-group-name"])
+              }, null, 8, ["modelValue", "allow-create", "api-base-url", "current-user-id", "disabled", "draggable", "empty-text", "enable-multi-tenant-mode", "exact-search-key", "exclude-user-ids", "placeholder", "render-list-item", "render-tag", "selected-users", "tenant-id", "tenants", "user-group", "user-group-name"])
             ],
             2112
             /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
@@ -15345,7 +15221,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BkUserSelector = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8a402cb7"]]);
+const BkUserSelector = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-20d45a5c"]]);
 const vue2 = {
   model: {
     prop: "modelValue",
@@ -15369,6 +15245,12 @@ const vue2 = {
             emit("update:modelValue", ...arguments);
             emit("change", ...arguments);
           },
+          onDragStart: (event) => {
+            emit("dragStart", event);
+          },
+          onDragEnd: (event) => {
+            emit("dragEnd", event);
+          },
           ref: "userSelectorRef"
         });
       }