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

package/src/component/partner-switcher/service/impl/PartnerSwitcherServiceImpl.ts

@@ -1,47 +1,97 @@
 import { SYSTEM_MODULE_NAME } from '@oinone/kunlun-meta';
 import { GQL } from '@oinone/kunlun-request';
 import { SPI } from '@oinone/kunlun-spi';
+import { type PartnerInfoSession, PartnerInfoSessionToken, type PartnerSessionStore } from '../../session';
 import type { PartnerInfo, PartnerItem } from '../../typing';
 import { type PartnerSwitcherService, PartnerSwitcherServiceToken } from '../PartnerSwitcherService';
 
-const SHOW_PARTNERS_MODEL_NAME = 'showPartners';
+const BUSINESS_SUBJECT_SWITCHER_MODEL = 'businessSubjectSwitcher';
 
-export type QueryShowPartnersResult = {
-  partner: { code: string; name: string };
-  partnerList: { code: string; name: string }[];
+export type QueryBusinessSubjectSwitcherResult = {
+  current: { partnerId: string; code: string; name: string };
+  switchList: { partnerId: string; code: string; name: string }[];
 };
 
 @SPI.Service(PartnerSwitcherServiceToken)
 export class PartnerSwitcherServiceImpl implements PartnerSwitcherService {
+  protected partnerInfoSession = SPI.RawInstantiate(PartnerInfoSessionToken) as PartnerInfoSession<PartnerSessionStore>;
+
   public async queryPartnerInfo(): Promise<PartnerInfo | undefined> {
-    return GQL.query(SHOW_PARTNERS_MODEL_NAME, 'queryAllPartners')
-      .buildResponse((builder) => builder.parameter(['partner', ['code', 'name']], ['partnerList', ['code', 'name']]))
-      .request<QueryShowPartnersResult>(SYSTEM_MODULE_NAME.COMMON)
+    const cached = this.getCachedPartner();
+    return GQL.query(BUSINESS_SUBJECT_SWITCHER_MODEL, 'querySwitchList')
+      .buildRequest((builder) => {
+        builder.buildObjectParameter('data', (builder) => {
+          builder.stringParameter('scope', 'company');
+          if (cached?.id || cached?.code) {
+            builder.buildObjectParameter('current', (builder) => {
+              if (cached.id) {
+                builder.stringParameter('partnerId', cached.id);
+              }
+              if (cached.code) {
+                builder.stringParameter('code', cached.code);
+              }
+            });
+          }
+        });
+      })
+      .buildResponse((builder) =>
+        builder.parameter(['current', ['partnerId', 'code', 'name']], ['switchList', ['partnerId', 'code', 'name']])
+      )
+      .request<QueryBusinessSubjectSwitcherResult>(SYSTEM_MODULE_NAME.COMMON)
       .then((data) => this.convert(data));
   }
 
+  protected getCachedPartner(): { id?: string; code?: string } | undefined {
+    const store = this.partnerInfoSession?.getCurrentPartnerStore();
+    if (!store) {
+      return undefined;
+    }
+    const id = store.sid || store.lid || undefined;
+    const code = store.scode || store.lcode || undefined;
+    if (!id && !code) {
+      return undefined;
+    }
+    return { id, code };
+  }
+
   public async changePartner(target: PartnerItem): Promise<PartnerInfo | undefined> {
-    return GQL.mutation(SHOW_PARTNERS_MODEL_NAME, 'changePartner')
+    return GQL.mutation(BUSINESS_SUBJECT_SWITCHER_MODEL, 'togglePartner')
       .buildRequest((builder) => {
-        builder.buildObjectParameter('currentPartner', (builder) => {
-          builder.stringParameter('code', target.id);
-          builder.stringParameter('name', target.name);
+        builder.buildObjectParameter('data', (builder) => {
+          builder.stringParameter('scope', 'company');
+          builder.buildObjectParameter('current', (builder) => {
+            builder.stringParameter('partnerId', target.id);
+            builder.stringParameter('code', target.code || target.id);
+            builder.stringParameter('name', target.name);
+          });
         });
       })
-      .buildResponse((builder) => builder.parameter(['partner', ['code', 'name']], ['partnerList', ['code', 'name']]))
-      .request<QueryShowPartnersResult>(SYSTEM_MODULE_NAME.COMMON)
+      .buildResponse((builder) =>
+        builder.parameter(['current', ['partnerId', 'code', 'name']], ['switchList', ['partnerId', 'code', 'name']])
+      )
+      .request<QueryBusinessSubjectSwitcherResult>(SYSTEM_MODULE_NAME.COMMON)
       .then((data) => this.convert(data));
   }
 
-  protected convert(data: QueryShowPartnersResult): PartnerInfo | undefined {
-    const { partner, partnerList } = data;
-    if (partner && partner.code) {
+  protected convert(data: QueryBusinessSubjectSwitcherResult): PartnerInfo | undefined {
+    const { current, switchList } = data || ({} as QueryBusinessSubjectSwitcherResult);
+    const partnerList =
+      switchList?.map((v) => ({
+        id: v.partnerId || v.code,
+        code: v.code,
+        name: v.name
+      })) || [];
+    const currentId = current?.partnerId || current?.code;
+    const matched = currentId
+      ? partnerList.find((v) => v.id === currentId || v.code === currentId || v.code === current?.code)
+      : undefined;
+    const currentPartner =
+      matched ||
+      (currentId ? { id: currentId, code: current?.code || currentId, name: current?.name || '' } : partnerList[0]);
+    if (currentPartner?.id) {
       return {
-        currentPartner: {
-          id: partner.code,
-          name: partner.name
-        },
-        partnerList: partnerList?.map((v) => ({ id: v.code, name: v.name })) || []
+        currentPartner,
+        partnerList
       };
     }
   }

package/src/component/partner-switcher/session/impl/DefaultPartnerInfoSession.ts

@@ -5,12 +5,16 @@ import { type PartnerInfoSession, PartnerInfoSessionToken } from '../PartnerInfo
 export interface PartnerSessionStore {
   sid: string | null | undefined;
   lid: string | null | undefined;
+  scode: string | null | undefined;
+  lcode: string | null | undefined;
 }
 
 @SPI.Service(PartnerInfoSessionToken)
 export class DefaultPartnerInfoSession implements PartnerInfoSession<PartnerSessionStore> {
   private static readonly CACHE_KEY = 'pamirs_partner_id';
 
+  private static readonly CACHE_CODE_KEY = 'pamirs_partner_code';
+
   private partnerInfo: PartnerInfo | undefined;
 
   public getCurrentPartner(): PartnerItem | undefined {
@@ -23,8 +27,12 @@ export class DefaultPartnerInfoSession implements PartnerInfoSession<PartnerSess
 
   public setPartnerInfo(target: PartnerInfo | undefined): void {
     if (target) {
+      this.partnerInfo = target;
       sessionStorage.setItem(DefaultPartnerInfoSession.CACHE_KEY, target.currentPartner.id);
       localStorage.setItem(DefaultPartnerInfoSession.CACHE_KEY, target.currentPartner.id);
+      const code = target.currentPartner.code || '';
+      sessionStorage.setItem(DefaultPartnerInfoSession.CACHE_CODE_KEY, code);
+      localStorage.setItem(DefaultPartnerInfoSession.CACHE_CODE_KEY, code);
     } else {
       this.clear();
     }
@@ -33,14 +41,19 @@ export class DefaultPartnerInfoSession implements PartnerInfoSession<PartnerSess
   public getCurrentPartnerStore(): PartnerSessionStore | undefined {
     const sid = sessionStorage.getItem(DefaultPartnerInfoSession.CACHE_KEY);
     const lid = localStorage.getItem(DefaultPartnerInfoSession.CACHE_KEY);
-    if (sid || lid) {
-      return { sid, lid };
+    const scode = sessionStorage.getItem(DefaultPartnerInfoSession.CACHE_CODE_KEY);
+    const lcode = localStorage.getItem(DefaultPartnerInfoSession.CACHE_CODE_KEY);
+    if (sid || lid || scode || lcode) {
+      return { sid, lid, scode, lcode };
     }
     return undefined;
   }
 
   public clear(): void {
+    this.partnerInfo = undefined;
     sessionStorage.removeItem(DefaultPartnerInfoSession.CACHE_KEY);
     localStorage.removeItem(DefaultPartnerInfoSession.CACHE_KEY);
+    sessionStorage.removeItem(DefaultPartnerInfoSession.CACHE_CODE_KEY);
+    localStorage.removeItem(DefaultPartnerInfoSession.CACHE_CODE_KEY);
   }
 }

package/src/component/partner-switcher/typing/partner.ts

@@ -4,6 +4,7 @@
 export interface PartnerItem {
   id: string;
   name: string;
+  code?: string;
 }
 
 /**