npm - @oinone/kunlun-vue-admin-layout - Versions diffs - 7.2.3 → 7.2.5 - Mend

@oinone/kunlun-vue-admin-layout 7.2.3 → 7.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/dist/types/src/component/partner-switcher/PartnerSwitcher.vue.d.ts CHANGED Viewed

@@ -1,4 +1,3 @@
-import { MenuItem as AMenuItem } from 'ant-design-vue';
 import { type PropType } from 'vue';
 import type { PartnerItem } from './typing';
 declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
@@ -12,9 +11,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: PropType<(item: PartnerItem) => void>;
     };
 }>, {
-    onSelect: (e: {
-        key: string;
-    }) => void;
+    onSelect: (item: PartnerItem) => void;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     currentPartner: {
         type: PropType<PartnerItem>;
@@ -26,402 +23,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: PropType<(item: PartnerItem) => void>;
     };
 }>> & Readonly<{}>, {}, {}, {
-    AMenu: {
-        new (...args: any[]): import("vue").CreateComponentPublicInstanceWithMixins<Readonly<import("vue").ExtractPropTypes<{
-            id: StringConstructor;
-            prefixCls: StringConstructor;
-            items: import("vue").PropType<import("ant-design-vue").ItemType[]>;
-            disabled: BooleanConstructor;
-            inlineCollapsed: BooleanConstructor;
-            disabledOverflow: BooleanConstructor;
-            forceSubMenuRender: BooleanConstructor;
-            openKeys: import("vue").PropType<import("ant-design-vue/es/_util/type").Key[]>;
-            selectedKeys: import("vue").PropType<import("ant-design-vue/es/_util/type").Key[]>;
-            activeKey: StringConstructor;
-            selectable: {
-                type: BooleanConstructor;
-                default: boolean;
-            };
-            multiple: {
-                type: BooleanConstructor;
-                default: boolean;
-            };
-            tabindex: {
-                type: (StringConstructor | NumberConstructor)[];
-            };
-            motion: import("vue").PropType<import("ant-design-vue/es/_util/transition").CSSMotionProps>;
-            role: StringConstructor;
-            theme: {
-                type: import("vue").PropType<import("ant-design-vue").MenuTheme>;
-                default: string;
-            };
-            mode: {
-                type: import("vue").PropType<import("ant-design-vue").MenuMode>;
-                default: string;
-            };
-            inlineIndent: {
-                type: NumberConstructor;
-                default: number;
-            };
-            subMenuOpenDelay: {
-                type: NumberConstructor;
-                default: number;
-            };
-            subMenuCloseDelay: {
-                type: NumberConstructor;
-                default: number;
-            };
-            builtinPlacements: {
-                type: import("vue").PropType<import("ant-design-vue/es/menu/src/interface").BuiltinPlacements>;
-            };
-            triggerSubMenuAction: {
-                type: import("vue").PropType<import("ant-design-vue/es/menu/src/interface").TriggerSubMenuAction>;
-                default: string;
-            };
-            getPopupContainer: import("vue").PropType<(node: HTMLElement) => HTMLElement>;
-            expandIcon: import("vue").PropType<(p?: {
-                [key: string]: any;
-                isOpen: boolean;
-            }) => any>;
-            onOpenChange: import("vue").PropType<(keys: import("ant-design-vue/es/_util/type").Key[]) => void>;
-            onSelect: import("vue").PropType<import("ant-design-vue/es/menu/src/interface").SelectEventHandler>;
-            onDeselect: import("vue").PropType<import("ant-design-vue/es/menu/src/interface").SelectEventHandler>;
-            onClick: import("vue").PropType<import("ant-design-vue/es/menu/src/interface").MenuClickEventHandler>;
-            onFocus: import("vue").PropType<import("ant-design-vue/es/_util/EventInterface").FocusEventHandler>;
-            onBlur: import("vue").PropType<import("ant-design-vue/es/_util/EventInterface").FocusEventHandler>;
-            onMousedown: import("vue").PropType<import("ant-design-vue/es/_util/EventInterface").MouseEventHandler>;
-            "onUpdate:openKeys": import("vue").PropType<(keys: import("ant-design-vue/es/_util/type").Key[]) => void>;
-            "onUpdate:selectedKeys": import("vue").PropType<(keys: import("ant-design-vue/es/_util/type").Key[]) => void>;
-            "onUpdate:activeKey": import("vue").PropType<(key: import("ant-design-vue/es/_util/type").Key) => void>;
-        }>> & Readonly<{}>, () => import("ant-design-vue/es/_util/type").VueNode, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, import("vue").PublicProps, {
-            mode: import("ant-design-vue").MenuMode;
-            multiple: boolean;
-            disabled: boolean;
-            theme: import("ant-design-vue").MenuTheme;
-            inlineIndent: number;
-            inlineCollapsed: boolean;
-            subMenuOpenDelay: number;
-            subMenuCloseDelay: number;
-            triggerSubMenuAction: import("ant-design-vue/es/menu/src/interface").TriggerSubMenuAction;
-            forceSubMenuRender: boolean;
-            disabledOverflow: boolean;
-            selectable: boolean;
-        }, true, {}, import("ant-design-vue/es/_util/type").CustomSlotsType<{
-            expandIcon?: {
-                [key: string]: any;
-                isOpen: boolean;
-            };
-            overflowedIndicator?: any;
-            default: any;
-        }>, import("vue").GlobalComponents, import("vue").GlobalDirectives, string, {}, any, import("vue").ComponentProvideOptions, {
-            P: {};
-            B: {};
-            D: {};
-            C: {};
-            M: {};
-            Defaults: {};
-        }, Readonly<import("vue").ExtractPropTypes<{
-            id: StringConstructor;
-            prefixCls: StringConstructor;
-            items: import("vue").PropType<import("ant-design-vue").ItemType[]>;
-            disabled: BooleanConstructor;
-            inlineCollapsed: BooleanConstructor;
-            disabledOverflow: BooleanConstructor;
-            forceSubMenuRender: BooleanConstructor;
-            openKeys: import("vue").PropType<import("ant-design-vue/es/_util/type").Key[]>;
-            selectedKeys: import("vue").PropType<import("ant-design-vue/es/_util/type").Key[]>;
-            activeKey: StringConstructor;
-            selectable: {
-                type: BooleanConstructor;
-                default: boolean;
-            };
-            multiple: {
-                type: BooleanConstructor;
-                default: boolean;
-            };
-            tabindex: {
-                type: (StringConstructor | NumberConstructor)[];
-            };
-            motion: import("vue").PropType<import("ant-design-vue/es/_util/transition").CSSMotionProps>;
-            role: StringConstructor;
-            theme: {
-                type: import("vue").PropType<import("ant-design-vue").MenuTheme>;
-                default: string;
-            };
-            mode: {
-                type: import("vue").PropType<import("ant-design-vue").MenuMode>;
-                default: string;
-            };
-            inlineIndent: {
-                type: NumberConstructor;
-                default: number;
-            };
-            subMenuOpenDelay: {
-                type: NumberConstructor;
-                default: number;
-            };
-            subMenuCloseDelay: {
-                type: NumberConstructor;
-                default: number;
-            };
-            builtinPlacements: {
-                type: import("vue").PropType<import("ant-design-vue/es/menu/src/interface").BuiltinPlacements>;
-            };
-            triggerSubMenuAction: {
-                type: import("vue").PropType<import("ant-design-vue/es/menu/src/interface").TriggerSubMenuAction>;
-                default: string;
-            };
-            getPopupContainer: import("vue").PropType<(node: HTMLElement) => HTMLElement>;
-            expandIcon: import("vue").PropType<(p?: {
-                [key: string]: any;
-                isOpen: boolean;
-            }) => any>;
-            onOpenChange: import("vue").PropType<(keys: import("ant-design-vue/es/_util/type").Key[]) => void>;
-            onSelect: import("vue").PropType<import("ant-design-vue/es/menu/src/interface").SelectEventHandler>;
-            onDeselect: import("vue").PropType<import("ant-design-vue/es/menu/src/interface").SelectEventHandler>;
-            onClick: import("vue").PropType<import("ant-design-vue/es/menu/src/interface").MenuClickEventHandler>;
-            onFocus: import("vue").PropType<import("ant-design-vue/es/_util/EventInterface").FocusEventHandler>;
-            onBlur: import("vue").PropType<import("ant-design-vue/es/_util/EventInterface").FocusEventHandler>;
-            onMousedown: import("vue").PropType<import("ant-design-vue/es/_util/EventInterface").MouseEventHandler>;
-            "onUpdate:openKeys": import("vue").PropType<(keys: import("ant-design-vue/es/_util/type").Key[]) => void>;
-            "onUpdate:selectedKeys": import("vue").PropType<(keys: import("ant-design-vue/es/_util/type").Key[]) => void>;
-            "onUpdate:activeKey": import("vue").PropType<(key: import("ant-design-vue/es/_util/type").Key) => void>;
-        }>> & Readonly<{}>, () => import("ant-design-vue/es/_util/type").VueNode, {}, {}, {}, {
-            mode: import("ant-design-vue").MenuMode;
-            multiple: boolean;
-            disabled: boolean;
-            theme: import("ant-design-vue").MenuTheme;
-            inlineIndent: number;
-            inlineCollapsed: boolean;
-            subMenuOpenDelay: number;
-            subMenuCloseDelay: number;
-            triggerSubMenuAction: import("ant-design-vue/es/menu/src/interface").TriggerSubMenuAction;
-            forceSubMenuRender: boolean;
-            disabledOverflow: boolean;
-            selectable: boolean;
-        }>;
-        __isFragment?: never;
-        __isTeleport?: never;
-        __isSuspense?: never;
-    } & import("vue").ComponentOptionsBase<Readonly<import("vue").ExtractPropTypes<{
-        id: StringConstructor;
-        prefixCls: StringConstructor;
-        items: import("vue").PropType<import("ant-design-vue").ItemType[]>;
-        disabled: BooleanConstructor;
-        inlineCollapsed: BooleanConstructor;
-        disabledOverflow: BooleanConstructor;
-        forceSubMenuRender: BooleanConstructor;
-        openKeys: import("vue").PropType<import("ant-design-vue/es/_util/type").Key[]>;
-        selectedKeys: import("vue").PropType<import("ant-design-vue/es/_util/type").Key[]>;
-        activeKey: StringConstructor;
-        selectable: {
-            type: BooleanConstructor;
-            default: boolean;
-        };
-        multiple: {
-            type: BooleanConstructor;
-            default: boolean;
-        };
-        tabindex: {
-            type: (StringConstructor | NumberConstructor)[];
-        };
-        motion: import("vue").PropType<import("ant-design-vue/es/_util/transition").CSSMotionProps>;
-        role: StringConstructor;
-        theme: {
-            type: import("vue").PropType<import("ant-design-vue").MenuTheme>;
-            default: string;
-        };
-        mode: {
-            type: import("vue").PropType<import("ant-design-vue").MenuMode>;
-            default: string;
-        };
-        inlineIndent: {
-            type: NumberConstructor;
-            default: number;
-        };
-        subMenuOpenDelay: {
-            type: NumberConstructor;
-            default: number;
-        };
-        subMenuCloseDelay: {
-            type: NumberConstructor;
-            default: number;
-        };
-        builtinPlacements: {
-            type: import("vue").PropType<import("ant-design-vue/es/menu/src/interface").BuiltinPlacements>;
-        };
-        triggerSubMenuAction: {
-            type: import("vue").PropType<import("ant-design-vue/es/menu/src/interface").TriggerSubMenuAction>;
-            default: string;
-        };
-        getPopupContainer: import("vue").PropType<(node: HTMLElement) => HTMLElement>;
-        expandIcon: import("vue").PropType<(p?: {
-            [key: string]: any;
-            isOpen: boolean;
-        }) => any>;
-        onOpenChange: import("vue").PropType<(keys: import("ant-design-vue/es/_util/type").Key[]) => void>;
-        onSelect: import("vue").PropType<import("ant-design-vue/es/menu/src/interface").SelectEventHandler>;
-        onDeselect: import("vue").PropType<import("ant-design-vue/es/menu/src/interface").SelectEventHandler>;
-        onClick: import("vue").PropType<import("ant-design-vue/es/menu/src/interface").MenuClickEventHandler>;
-        onFocus: import("vue").PropType<import("ant-design-vue/es/_util/EventInterface").FocusEventHandler>;
-        onBlur: import("vue").PropType<import("ant-design-vue/es/_util/EventInterface").FocusEventHandler>;
-        onMousedown: import("vue").PropType<import("ant-design-vue/es/_util/EventInterface").MouseEventHandler>;
-        'onUpdate:openKeys': import("vue").PropType<(keys: import("ant-design-vue/es/_util/type").Key[]) => void>;
-        'onUpdate:selectedKeys': import("vue").PropType<(keys: import("ant-design-vue/es/_util/type").Key[]) => void>;
-        'onUpdate:activeKey': import("vue").PropType<(key: import("ant-design-vue/es/_util/type").Key) => void>;
-    }>> & Readonly<{}>, () => import("ant-design-vue/es/_util/type").VueNode, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {
-        mode: import("ant-design-vue").MenuMode;
-        multiple: boolean;
-        disabled: boolean;
-        theme: import("ant-design-vue").MenuTheme;
-        inlineIndent: number;
-        inlineCollapsed: boolean;
-        subMenuOpenDelay: number;
-        subMenuCloseDelay: number;
-        triggerSubMenuAction: import("ant-design-vue/es/menu/src/interface").TriggerSubMenuAction;
-        forceSubMenuRender: boolean;
-        disabledOverflow: boolean;
-        selectable: boolean;
-    }, {}, string, import("ant-design-vue/es/_util/type").CustomSlotsType<{
-        expandIcon?: {
-            [key: string]: any;
-            isOpen: boolean;
-        };
-        overflowedIndicator?: any;
-        default: any;
-    }>, import("vue").GlobalComponents, import("vue").GlobalDirectives, string, import("vue").ComponentProvideOptions> & import("vue").VNodeProps & (import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & (import("vue").Plugin<any[]> & {
-        readonly Item: typeof AMenuItem;
-        readonly SubMenu: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-            icon: import("vue-types").VueTypeValidableDef<any>;
-            title: import("vue-types").VueTypeValidableDef<any>;
-            disabled: BooleanConstructor;
-            level: NumberConstructor;
-            popupClassName: StringConstructor;
-            popupOffset: PropType<[number, number]>;
-            internalPopupClose: BooleanConstructor;
-            eventKey: StringConstructor;
-            expandIcon: PropType<(p?: {
-                [key: string]: any;
-                isOpen: boolean;
-            }) => any>;
-            theme: PropType<import("ant-design-vue").MenuTheme>;
-            onMouseenter: PropType<import("ant-design-vue/es/_util/EventInterface").MouseEventHandler>;
-            onMouseleave: PropType<import("ant-design-vue/es/_util/EventInterface").MouseEventHandler>;
-            onTitleClick: PropType<(e: MouseEvent, key: import("ant-design-vue/es/_util/type").Key) => void>;
-            originItemValue: {
-                type: PropType<import("ant-design-vue/es/menu/src/interface").ItemType>;
-                default: import("ant-design-vue/es/menu/src/interface").ItemType;
-            };
-        }>, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-            icon: import("vue-types").VueTypeValidableDef<any>;
-            title: import("vue-types").VueTypeValidableDef<any>;
-            disabled: BooleanConstructor;
-            level: NumberConstructor;
-            popupClassName: StringConstructor;
-            popupOffset: PropType<[number, number]>;
-            internalPopupClose: BooleanConstructor;
-            eventKey: StringConstructor;
-            expandIcon: PropType<(p?: {
-                [key: string]: any;
-                isOpen: boolean;
-            }) => any>;
-            theme: PropType<import("ant-design-vue").MenuTheme>;
-            onMouseenter: PropType<import("ant-design-vue/es/_util/EventInterface").MouseEventHandler>;
-            onMouseleave: PropType<import("ant-design-vue/es/_util/EventInterface").MouseEventHandler>;
-            onTitleClick: PropType<(e: MouseEvent, key: import("ant-design-vue/es/_util/type").Key) => void>;
-            originItemValue: {
-                type: PropType<import("ant-design-vue/es/menu/src/interface").ItemType>;
-                default: import("ant-design-vue/es/menu/src/interface").ItemType;
-            };
-        }>> & Readonly<{}>, {
-            disabled: boolean;
-            originItemValue: import("ant-design-vue/es/menu/src/interface").ItemType;
-            internalPopupClose: boolean;
-        }, import("ant-design-vue/es/_util/type").CustomSlotsType<{
-            icon?: any;
-            title?: any;
-            expandIcon?: {
-                [key: string]: any;
-                isOpen: boolean;
-            };
-            default?: any;
-        }>, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-        readonly Divider: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-            prefixCls: StringConstructor;
-            dashed: BooleanConstructor;
-        }>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-            prefixCls: StringConstructor;
-            dashed: BooleanConstructor;
-        }>> & Readonly<{}>, {
-            dashed: boolean;
-        }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-        readonly ItemGroup: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-            title: import("vue-types").VueTypeValidableDef<any>;
-            originItemValue: {
-                type: import("vue").PropType<import("ant-design-vue/es/menu/src/interface").ItemType>;
-                default: import("ant-design-vue/es/menu/src/interface").ItemType;
-            };
-        }>, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-            title: import("vue-types").VueTypeValidableDef<any>;
-            originItemValue: {
-                type: import("vue").PropType<import("ant-design-vue/es/menu/src/interface").ItemType>;
-                default: import("ant-design-vue/es/menu/src/interface").ItemType;
-            };
-        }>> & Readonly<{}>, {
-            originItemValue: import("ant-design-vue/es/menu/src/interface").ItemType;
-        }, import("ant-design-vue/es/_util/type").CustomSlotsType<{
-            title?: any;
-            default?: any;
-        }>, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-    }));
-    AMenuItem: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
-        id: StringConstructor;
-        role: StringConstructor;
-        disabled: BooleanConstructor;
-        danger: BooleanConstructor;
-        title: {
-            type: (BooleanConstructor | StringConstructor)[];
-            default: any;
-        };
-        icon: import("vue-types").VueTypeValidableDef<any>;
-        onMouseenter: PropType<import("ant-design-vue/es/_util/EventInterface").MouseEventHandler>;
-        onMouseleave: PropType<import("ant-design-vue/es/_util/EventInterface").MouseEventHandler>;
-        onClick: PropType<import("ant-design-vue/es/_util/EventInterface").MouseEventHandler>;
-        onKeydown: PropType<import("ant-design-vue/es/_util/EventInterface").MouseEventHandler>;
-        onFocus: PropType<import("ant-design-vue/es/_util/EventInterface").MouseEventHandler>;
-        originItemValue: {
-            type: PropType<import("ant-design-vue/es/menu/src/interface").ItemType>;
-            default: import("ant-design-vue/es/menu/src/interface").ItemType;
-        };
-    }>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-        id: StringConstructor;
-        role: StringConstructor;
-        disabled: BooleanConstructor;
-        danger: BooleanConstructor;
-        title: {
-            type: (BooleanConstructor | StringConstructor)[];
-            default: any;
-        };
-        icon: import("vue-types").VueTypeValidableDef<any>;
-        onMouseenter: PropType<import("ant-design-vue/es/_util/EventInterface").MouseEventHandler>;
-        onMouseleave: PropType<import("ant-design-vue/es/_util/EventInterface").MouseEventHandler>;
-        onClick: PropType<import("ant-design-vue/es/_util/EventInterface").MouseEventHandler>;
-        onKeydown: PropType<import("ant-design-vue/es/_util/EventInterface").MouseEventHandler>;
-        onFocus: PropType<import("ant-design-vue/es/_util/EventInterface").MouseEventHandler>;
-        originItemValue: {
-            type: PropType<import("ant-design-vue/es/menu/src/interface").ItemType>;
-            default: import("ant-design-vue/es/menu/src/interface").ItemType;
-        };
-    }>> & Readonly<{}>, {
-        title: string | boolean;
-        disabled: boolean;
-        danger: boolean;
-        originItemValue: import("ant-design-vue/es/menu/src/interface").ItemType;
-    }, import("ant-design-vue/es/_util/type").CustomSlotsType<{
-        icon?: any;
-        title?: any;
-        default?: any;
-    }>, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
     CaretDownOutlined: import("@ant-design/icons-vue/lib/icons/CaretDownOutlined").CaretDownOutlinedIconType;
     OioDropdown: any;
 }, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;

package/dist/types/src/component/partner-switcher/service/impl/PartnerSwitcherServiceImpl.d.ts CHANGED Viewed

@@ -1,17 +1,25 @@
+import { type PartnerInfoSession, type PartnerSessionStore } from '../../session';
 import type { PartnerInfo, PartnerItem } from '../../typing';
 import { type PartnerSwitcherService } from '../PartnerSwitcherService';
-export type QueryShowPartnersResult = {
-    partner: {
+export type QueryBusinessSubjectSwitcherResult = {
+    current: {
+        partnerId: string;
         code: string;
         name: string;
     };
-    partnerList: {
+    switchList: {
+        partnerId: string;
         code: string;
         name: string;
     }[];
 };
 export declare class PartnerSwitcherServiceImpl implements PartnerSwitcherService {
+    protected partnerInfoSession: PartnerInfoSession<PartnerSessionStore>;
     queryPartnerInfo(): Promise<PartnerInfo | undefined>;
+    protected getCachedPartner(): {
+        id?: string;
+        code?: string;
+    } | undefined;
     changePartner(target: PartnerItem): Promise<PartnerInfo | undefined>;
-    protected convert(data: QueryShowPartnersResult): PartnerInfo | undefined;
+    protected convert(data: QueryBusinessSubjectSwitcherResult): PartnerInfo | undefined;
 }

package/dist/types/src/component/partner-switcher/session/impl/DefaultPartnerInfoSession.d.ts CHANGED Viewed

@@ -3,9 +3,12 @@ import { type PartnerInfoSession } from '../PartnerInfoSession';
 export interface PartnerSessionStore {
     sid: string | null | undefined;
     lid: string | null | undefined;
+    scode: string | null | undefined;
+    lcode: string | null | undefined;
 }
 export declare class DefaultPartnerInfoSession implements PartnerInfoSession<PartnerSessionStore> {
     private static readonly CACHE_KEY;
+    private static readonly CACHE_CODE_KEY;
     private partnerInfo;
     getCurrentPartner(): PartnerItem | undefined;
     getPartnerInfo(): PartnerInfo | undefined;

package/dist/types/src/component/partner-switcher/typing/partner.d.ts CHANGED Viewed

@@ -4,6 +4,7 @@
 export interface PartnerItem {
     id: string;
     name: string;
+    code?: string;
 }
 /**
  * 合作伙伴信息

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@oinone/kunlun-vue-admin-layout",
-  "version": "7.2.3",
+  "version": "7.2.5",
   "type": "module",
   "main": "dist/oinone-kunlun-vue-admin-layout.esm.js",
   "scripts": {
@@ -17,14 +17,16 @@
     "doc": "typedoc --out docs src/index.ts"
   },
   "dependencies": {
-    "@oinone/kunlun-vue-router": "7.2.3",
-    "@oinone/kunlun-vue-ui": "7.2.3",
-    "@oinone/kunlun-vue-ui-antd": "7.2.3",
-    "@oinone/kunlun-vue-ui-common": "7.2.3",
-    "@oinone/kunlun-vue-widget": "7.2.3",
-    "vue-json-pretty": "^2.4.0"
+    "@oinone/kunlun-vue-router": "7.2.5",
+    "@oinone/kunlun-vue-ui": "7.2.5",
+    "@oinone/kunlun-vue-ui-antd": "7.2.5",
+    "@oinone/kunlun-vue-ui-common": "7.2.5",
+    "@oinone/kunlun-vue-widget": "7.2.5",
+    "vue-json-pretty": "^2.4.0",
+    "vue-types": "^3.0.0"
   },
   "devDependencies": {
+    "@ant-design/icons-vue": "7.0.1",
     "@oinone/kunlun-dsl": "~7.2.0",
     "@oinone/kunlun-engine": "~7.2.0",
     "@oinone/kunlun-environment": "~7.2.0",
@@ -37,15 +39,14 @@
     "@oinone/kunlun-shared": "~7.2.0",
     "@oinone/kunlun-spi": "~7.2.0",
     "@oinone/kunlun-state": "~7.2.0",
-    "@types/lodash": "4.17.21",
     "@types/lodash-es": "4.17.6",
-    "lodash": "4.17.21",
+    "ant-design-vue": "4.2.6",
+    "graphql": "15.8.0",
+    "graphql-tag": "2.12.6",
     "lodash-es": "4.17.21",
     "sass": "1.97.0",
-    "sass-loader": "16.0.6"
-  },
-  "peerDependencies": {
-    "vue": ">=3.5.26"
+    "sass-loader": "16.0.6",
+    "vue": "3.5.26"
   },
   "gitHead": "2b4c0c7911626c105ca71c2d41e54af470e2e079",
   "module": "dist/oinone-kunlun-vue-admin-layout.esm.js",

package/src/component/partner-switcher/PartnerSwitcher.vue CHANGED Viewed

@@ -1,28 +1,34 @@
 <template>
   <oio-dropdown v-if="currentPartner" :trigger="['click']" placement="bottomCenter">
     <div class="k-layout-partner-switcher">
-      <span>{{ currentPartner.name }}</span>
+      <span :title="currentPartner.name">{{ currentPartner.name }}</span>
       <caret-down-outlined :style="{ fontSize: '12px', color: '#c3c4c6' }" />
     </div>
     <template #overlay>
-      <a-menu class="k-layout-partner-switcher-overlay" @click="onSelect">
-        <a-menu-item v-for="item in partnerList" :key="item.id" :title="item.name">{{ item.name }}</a-menu-item>
-      </a-menu>
+      <div class="k-layout-partner-switcher-overlay">
+        <div
+          v-for="item in partnerList"
+          :key="item.id"
+          class="k-layout-partner-switcher-item"
+          :class="{ 'is-selected': item.id === currentPartner?.id }"
+          :title="item.name"
+          @click="onSelect(item)"
+        >
+          {{ item.name }}
+        </div>
+      </div>
     </template>
   </oio-dropdown>
 </template>
 <script lang="ts">
 import { CaretDownOutlined } from '@ant-design/icons-vue';
 import { OioDropdown } from '@oinone/kunlun-vue-ui-antd';
-import { Menu as AMenu, MenuItem as AMenuItem } from 'ant-design-vue';
 import { defineComponent, type PropType } from 'vue';
 import type { PartnerItem } from './typing';
 export default defineComponent({
   name: 'PartnerSwitcher',
   components: {
-    AMenu,
-    AMenuItem,
     CaretDownOutlined,
     OioDropdown
   },
@@ -39,12 +45,11 @@ export default defineComponent({
     }
   },
   setup(props) {
-    const onSelect = (e: { key: string }) => {
-      const { key } = e;
-      const target = props.partnerList?.find((v) => v.id === key);
-      if (target) {
-        props.onChangePartner?.(target);
+    const onSelect = (item: PartnerItem) => {
+      if (item.id === props.currentPartner?.id) {
+        return;
       }
+      props.onChangePartner?.(item);
     };
     return {
@@ -62,6 +67,10 @@ export default defineComponent({
   span {
     margin-left: 10px;
+    max-width: 180px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
   }
   &:hover {
@@ -69,7 +78,37 @@ export default defineComponent({
   }
 }
+/* 自定义下拉列表，避免 ant-menu 选中左侧蓝条 */
 .k-layout-partner-switcher-overlay {
-  max-height: 500px !important;
+  min-width: 140px;
+  max-width: 280px;
+  max-height: 500px;
+  overflow-y: auto;
+  padding: 4px 0;
+  background: var(--oio-dropdown-background-color, #fff);
+  border-radius: var(--oio-border-radius, 4px);
+  box-shadow: var(--oio-dropdown-box-shadow, 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08));
+}
+.k-layout-partner-switcher-item {
+  padding: 5px 12px;
+  line-height: 22px;
+  font-size: 14px;
+  color: var(--oio-select-dropdown-color, rgba(0, 0, 0, 0.85));
+  cursor: pointer;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  &:hover {
+    color: var(--oio-select-dropdown-hover-color, rgba(0, 0, 0, 0.85));
+    background-color: var(--oio-select-dropdown-hover-background, #f5f5f5);
+  }
+  &.is-selected {
+    color: var(--oio-select-dropdown-selected-color, #606cee);
+    background-color: var(--oio-select-dropdown-selected, rgba(96, 108, 238, 0.1));
+    font-weight: 500;
+  }
 }
 </style>

package/src/component/partner-switcher/PartnerSwitcherWidget.ts CHANGED Viewed

@@ -32,8 +32,15 @@ export class PartnerSwitcherWidget extends MaskWidget {
   @Widget.Method()
   public async onChangePartner(item: PartnerItem) {
+    if (item.id && item.id === this.currentPartner?.id) {
+      return;
+    }
     const partnerInfo = await this.partnerSwitcherService?.changePartner(item);
     this.reloadPartnerInfo(partnerInfo);
+    // 组织上下文变更后刷新页面，确保业务数据按新主体重新加载
+    if (partnerInfo?.currentPartner?.id) {
+      window.location.reload();
+    }
   }
   protected reloadPartnerInfo(target: PartnerInfo | undefined, predict?: (target: PartnerInfo) => boolean) {