@blueking/bk-user-selector 0.0.22 → 0.0.23-beta.1

package/package.json

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

package/typings/components/me-tag.vue.d.ts

@@ -1,4 +1,4 @@
-declare const _default: import("vue").DefineComponent<{
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     /**
      * 当前用户ID
      */
@@ -13,7 +13,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-}, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     click: (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     /**
@@ -30,10 +30,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-}>> & {
+}>> & Readonly<{
     onClick?: ((...args: any[]) => any) | undefined;
-}, {
+}>, {
     currentUserId: string;
     isDisabled: boolean;
-}, {}>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

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

@@ -1,39 +1,13 @@
 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;
-    emptyText: string;
-}>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+declare const _default: import("vue").DefineComponent<MultipleSelectorProps, {}, {}, {}, {}, 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<__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;
-    emptyText: string;
-}>>> & {
+}, 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;
-}, {
+}>, {
     tenantId: string;
     currentUserId: string;
     tenants: Record<string, string>;
@@ -54,22 +28,5 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
     apiBaseUrl: string;
     placeholder: string;
     exactSearchKey: string;
-}, {}>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 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/selection-popover.vue.d.ts

@@ -3,7 +3,7 @@
  */
 import { createVNode, VNode } from 'vue';
 import { FormattedUser } from '../types';
-declare const _default: import("vue").DefineComponent<{
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     /**
      * 是否显示下拉菜单
      */
@@ -91,7 +91,7 @@ declare const _default: import("vue").DefineComponent<{
     renderListItem: {
         type: () => (h: typeof createVNode, item: FormattedUser) => VNode;
     };
-}, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "select-user": (...args: any[]) => void;
     "click-outside": (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
@@ -182,10 +182,10 @@ declare const _default: import("vue").DefineComponent<{
     renderListItem: {
         type: () => (h: typeof createVNode, item: FormattedUser) => VNode;
     };
-}>> & {
+}>> & Readonly<{
     "onSelect-user"?: ((...args: any[]) => any) | undefined;
     "onClick-outside"?: ((...args: any[]) => any) | undefined;
-}, {
+}>, {
     tenantId: string;
     tenants: Record<string, string>;
     isShow: boolean;
@@ -201,5 +201,5 @@ declare const _default: import("vue").DefineComponent<{
     }[];
     userGroupName: string;
     emptyText: string;
-}, {}>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

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

@@ -1,31 +1,11 @@
 import { SingleSelectorProps } from '../types';
-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;
-    emptyText: string;
-}>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+declare const _default: import("vue").DefineComponent<SingleSelectorProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     change: (...args: any[]) => void;
     "update:modelValue": (...args: any[]) => void;
-}, 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;
-    emptyText: string;
-}>>> & {
+}, string, import("vue").PublicProps, Readonly<SingleSelectorProps> & Readonly<{
     onChange?: ((...args: any[]) => any) | undefined;
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
-}, {
+}>, {
     tenantId: string;
     currentUserId: string;
     userGroup: {
@@ -43,22 +23,5 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
     apiBaseUrl: string;
     placeholder: string;
     exactSearchKey: string;
-}, {}>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 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/user-render.d.ts

@@ -1,5 +1,5 @@
 import type { FormattedUser } from '../types';
-declare const _default: import("vue").DefineComponent<{
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     user: {
         type: () => FormattedUser;
         required: true;
@@ -16,7 +16,7 @@ declare const _default: import("vue").DefineComponent<{
         type: FunctionConstructor;
         required: false;
     };
-}, () => any, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}>, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     user: {
         type: () => FormattedUser;
         required: true;
@@ -33,5 +33,5 @@ declare const _default: import("vue").DefineComponent<{
         type: FunctionConstructor;
         required: false;
     };
-}>>, {}, {}>;
+}>> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

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

@@ -1,35 +1,11 @@
 import { UserSelectorProps } from '../types';
-declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<UserSelectorProps>, {
-    apiBaseUrl: string;
-    tenantId: string;
-    placeholder: string;
-    modelValue: string;
-    draggable: boolean;
-    multiple: boolean;
-    currentUserId: string;
-    exactSearchKey: string;
-    userGroup: () => never[];
-    userGroupName: string;
-    emptyText: string;
-}>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+declare const _default: import("vue").DefineComponent<UserSelectorProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     change: (...args: any[]) => void;
     "update:modelValue": (...args: any[]) => void;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<UserSelectorProps>, {
-    apiBaseUrl: string;
-    tenantId: string;
-    placeholder: string;
-    modelValue: string;
-    draggable: boolean;
-    multiple: boolean;
-    currentUserId: string;
-    exactSearchKey: string;
-    userGroup: () => never[];
-    userGroupName: string;
-    emptyText: string;
-}>>> & {
+}, string, import("vue").PublicProps, Readonly<UserSelectorProps> & Readonly<{
     onChange?: ((...args: any[]) => any) | undefined;
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
-}, {
+}>, {
     tenantId: string;
     currentUserId: string;
     userGroup: {
@@ -50,22 +26,5 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
     placeholder: string;
     exactSearchKey: string;
     multiple: boolean;
-}, {}>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 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/user-tag.vue.d.ts

@@ -1,6 +1,9 @@
 import { createVNode, VNode } from 'vue';
 import { FormattedUser } from '../types';
-declare const _default: import("vue").DefineComponent<__VLS_TypePropsToOption<{
+/**
+ * 组件属性
+ */
+type __VLS_Props = {
     /**
      * 用户信息
      */
@@ -29,49 +32,12 @@ declare const _default: import("vue").DefineComponent<__VLS_TypePropsToOption<{
      * 渲染标签
      */
     renderTag?: (h: typeof createVNode, userInfo: FormattedUser) => VNode;
-}>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+};
+declare const _default: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     click: (...args: any[]) => void;
     close: (...args: any[]) => void;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<{
-    /**
-     * 用户信息
-     */
-    user: FormattedUser;
-    /**
-     * 租户数据映射
-     */
-    tenants: Record<string, string>;
-    /**
-     * 当前租户ID
-     */
-    currentTenantId: string;
-    /**
-     * 是否可拖拽
-     */
-    draggable?: boolean;
-    /**
-     * 是否激活状态
-     */
-    active?: boolean;
-    /**
-     * 是否显示租户信息
-     */
-    showTenant?: boolean;
-    /**
-     * 渲染标签
-     */
-    renderTag?: (h: typeof createVNode, userInfo: FormattedUser) => VNode;
-}>>> & {
+}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
     onClick?: ((...args: any[]) => any) | undefined;
     onClose?: ((...args: any[]) => any) | undefined;
-}, {}, {}>;
+}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 export default _default;
-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;
-    };
-};

package/typings/hooks/useTenantData.d.ts

@@ -10,7 +10,7 @@ import { type Ref } from 'vue';
  * @returns 租户数据和加载状态
  */
 export declare const useTenantData: (apiBaseUrl: string, tenantId: string) => {
-    tenants: Ref<Record<string, string>>;
-    loading: Ref<boolean>;
+    tenants: Ref<Record<string, string>, Record<string, string>>;
+    loading: Ref<boolean, boolean>;
     fetchTenants: () => Promise<void>;
 };

package/typings/hooks/useUserSearch.d.ts

@@ -11,9 +11,9 @@ import { type FormattedUser } from '../types';
  * @returns 用户搜索相关状态和方法
  */
 export declare const useUserSearch: (apiBaseUrl: string, tenantId: string) => {
-    searchResults: Ref<FormattedUser[]>;
-    loading: Ref<boolean>;
-    searchQuery: Ref<string>;
+    searchResults: Ref<FormattedUser[], FormattedUser[]>;
+    loading: Ref<boolean, boolean>;
+    searchQuery: Ref<string, string>;
     performSearch: (keyword: string) => Promise<void>;
     handleSearchInput: (value: string) => void;
     clearSearch: () => void;

package/typings/vue2.d.ts

@@ -1,16 +1,10 @@
 import BkUserSelector from './components/user-selector.vue';
 declare const _default: {
+    created(): void;
     model: {
         prop: string;
         event: string;
     };
-    beforeDestroy(): void;
-    created(): void;
-    data(): {
-        app: null;
-        unWatchStack: never[];
-    };
-    mounted(): void;
     name: string;
     props: any;
     render(createElement: any): any;

package/vue2/index.es.min.js

@@ -1,5 +1,5 @@
 import * as __WEBPACK_EXTERNAL_MODULE_vue__ from "@blueking/bkui-library";
-import { ref, onBeforeMount, defineComponent, createElementBlock, createCommentVNode, openBlock, withModifiers, normalizeClass, h as h$1, computed, createBlock, unref, withCtx, createVNode, createElementVNode, toDisplayString, Fragment, renderList, watch, nextTick, onMounted, withDirectives, isRef, vModelText, createTextVNode, createApp } from "@blueking/bkui-library";
+import { ref, onBeforeMount, defineComponent, createElementBlock, createCommentVNode, openBlock, withModifiers, normalizeClass, h as h$1, computed, createBlock, unref, withCtx, createVNode, createElementVNode, toDisplayString, Fragment, renderList, watch, nextTick, onMounted, withDirectives, isRef, vModelText, createTextVNode, createApp, getCurrentInstance, onBeforeUnmount } from "@blueking/bkui-library";
 const getTenants = async (apiBaseUrl, tenantId) => {
   if (!apiBaseUrl || !tenantId) {
     console.warn("获取租户信息需要提供有效的apiBaseUrl和租户ID");
@@ -17005,7 +17005,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const UserTag = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-655f7a5a"]]);
+const UserTag = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-487799ec"]]);
 const _hoisted_1$2 = ["onClick"];
 const _hoisted_2$1 = ["placeholder"];
 const _hoisted_3 = ["placeholder"];
@@ -17497,7 +17497,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const MultipleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-d9743f6d"]]);
+const MultipleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-95b69442"]]);
 const _hoisted_1$1 = { class: "input-container" };
 const _hoisted_2 = ["placeholder"];
 const _sfc_main$1 = /* @__PURE__ */ defineComponent({
@@ -17540,9 +17540,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         type: "userGroup"
       }));
       const list = [...options.value, ...userGroup];
-      const selectedUserInfo2 = list.find((user) => user.id === selectedUser.value);
-      emit("change", selectedUserInfo2 || null);
-      return selectedUserInfo2;
+      return list.find((user) => user.id === selectedUser.value);
     });
     onBeforeMount(async () => {
       if (typeof props2.modelValue === "string" && props2.modelValue) {
@@ -17617,9 +17615,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     const handleClickOutside = () => {
       showDropdown.value = false;
     };
-    watch(selectedUser, (newVal) => {
-      emit("update:modelValue", newVal);
-    });
+    watch(selectedUserInfo, (newVal) => {
+      emit("change", newVal || null);
+    }, { immediate: true });
     return (_ctx, _cache) => {
       return withDirectives((openBlock(), createElementBlock("div", {
         ref_key: "containerRef",
@@ -17680,7 +17678,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SingleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-b20a7499"]]);
+const SingleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-4fec9d7c"]]);
 const _hoisted_1 = {
   ref: "containerRef",
   class: "bk-user-selector"
@@ -17753,13 +17751,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     watch(selectedUser, (newVal) => {
       if (!props2.multiple) {
         emit("update:modelValue", newVal);
+        emit("change", newVal);
       }
-    });
+    }, { immediate: true });
     watch(
       () => props2.userGroup,
       () => {
         initSelectedUsers();
-      }
+      },
+      { immediate: true }
     );
     onBeforeMount(() => {
       initSelectedUsers();
@@ -17820,54 +17820,52 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BkUserSelector = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-c23f5bc9"]]);
+const BkUserSelector = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-78f5783f"]]);
 const vue2 = {
-  model: {
-    prop: "modelValue",
-    event: "change"
-  },
-  beforeDestroy() {
-    var _a;
-    this.unWatchStack.forEach((unWatch) => unWatch == null ? void 0 : unWatch());
-    (_a = this.app) == null ? void 0 : _a.unmount();
-  },
   created() {
-    const props2 = this.$props;
-    const emit = this.$emit.bind(this);
-    let userSelectorInstance;
-    this.app = createApp({
-      render() {
-        userSelectorInstance = this;
-        return h$1(BkUserSelector, {
-          ...props2,
-          "onUpdate:modelValue"() {
-            emit("update:modelValue", ...arguments);
-            emit("change", ...arguments);
+    const that = this;
+    let app = createApp({
+      setup() {
+        const currentInstance = getCurrentInstance();
+        const unwatchList = Object.keys(that.$props).map((key) => {
+          return that.$watch(key, () => {
+            currentInstance.proxy.$forceUpdate();
+          });
+        });
+        onBeforeUnmount(() => {
+          unwatchList.forEach((unwatch) => unwatch());
+        });
+        return () => h$1(BkUserSelector, {
+          ...that.$props,
+          "onUpdate:modelValue": (value) => {
+            that.$emit("update:modelValue", value);
+            that.$emit("change", value);
           },
-          ref: "userSelectorRef"
+          onChange: (value) => {
+            console.info("onChange", value);
+            that.$emit("change", value);
+          }
         });
       }
     });
-    this.unWatchStack = Object.keys(this.$props).map((k2) => {
-      return this.$watch(k2, (v2) => {
-        userSelectorInstance[k2] = v2;
-        userSelectorInstance.$forceUpdate();
-      });
+    this.$once("hook:mounted", () => {
+      app.mount(this.$el);
+      console.info("app", app);
+    });
+    this.$once("hook:beforeDestroy", () => {
+      app.unmount();
+      console.info("unmount", app);
+      app = null;
     });
   },
-  data() {
-    return {
-      app: null,
-      unWatchStack: []
-    };
-  },
-  mounted() {
-    var _a;
-    (_a = this.app) == null ? void 0 : _a.mount(this.$el);
+  model: {
+    prop: "modelValue",
+    event: "change"
   },
   name: "BkUserSelector",
   props: BkUserSelector.props || {},
   render(createElement) {
+    console.info("render", createElement);
     return createElement("div");
   }
 };