aldehyde 0.2.477 → 0.2.479

package/src/aldehyde/lowcode-components/base-image/index.tsx

@@ -16,7 +16,7 @@ const handleImgUrl = (basePath: string) => {
         ProgramConfig.joinPath(ProgramConfig.api(), "/v3/files"),
         basePath
     )) +
-        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}`;
+        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}&@applicationToken=${ProgramConfig.applicationCode()}`;
     return url;
 }
 

package/src/aldehyde/lowcode-components/base-map/index.tsx

@@ -19,7 +19,7 @@ const handleImgUrl = (basePath: string) => {
         ProgramConfig.joinPath(ProgramConfig.api(), "/v3/files"),
         basePath
     )) +
-        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}`;
+        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}&@applicationToken=${ProgramConfig.applicationCode()}`;
     return url;
 }
 

package/src/aldehyde/lowcode-components/base-table/index.tsx

@@ -235,7 +235,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
                             <tbody style={{ ...bodyStyle, animation: carousel.enable && data?.length > bodyStyle.pageSize ? `scroll ${carousel.speed || 3}s linear infinite` : `none` }} className="scroll-body" >
                                 {data?.map((item: Record<string, any>, index: number) => <tr key={index} className={'base-table-tr'}>
                                     {columns?.map((column: ITableColumn, i: number) =>
-                                        <td key={i} style={{ textAlign: column.valueAlign, border: borderStyle.show ? `1px solid ${borderStyle.color}` : "none" }}>
+                                        <td key={i} style={{ width: column.colWidth || 100, textAlign: column.valueAlign, border: borderStyle.show ? `1px solid ${borderStyle.color}` : "none" }}>
                                             <ViewControl
                                                 serverKey={dataConfig?.serverKey}
                                                 fieldConfig={column}
@@ -249,7 +249,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
                                 <tbody style={{ ...bodyStyle, animation: `scroll ${carousel.speed || 3}s linear infinite` }} className="scroll-body" >
                                     {data?.map((item: Record<string, any>, index: number) => <tr key={index} className={'base-table-tr'}>
                                         {columns?.map((column: ITableColumn, i: number) =>
-                                            <td key={i} style={{ textAlign: column.valueAlign, border: borderStyle.show ? `1px solid ${borderStyle.color}` : "none" }}>
+                                            <td key={i} style={{ width: column.colWidth || 100, textAlign: column.valueAlign, border: borderStyle.show ? `1px solid ${borderStyle.color}` : "none" }}>
                                                 <ViewControl
                                                     serverKey={dataConfig?.serverKey}
                                                     fieldConfig={column}

package/src/aldehyde/lowcode-components/base-tabs/index.tsx

@@ -21,7 +21,7 @@ const handleImgUrl = (basePath: string) => {
         ProgramConfig.joinPath(ProgramConfig.api(), "/v3/files"),
         basePath
     )) +
-        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}`;
+        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}&@applicationToken=${ProgramConfig.applicationCode()}`;
     return url;
 }
 

package/src/aldehyde/lowcode-components/carousel/index.tsx

@@ -27,7 +27,7 @@ const handleLocalImgUrl = (basePath: string) => {
         ProgramConfig.joinPath(ProgramConfig.api(), "/v3/files"),
         basePath
     )) +
-        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}`;
+        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}&@applicationToken=${ProgramConfig.applicationCode()}`;
     return url;
 }
 

package/src/aldehyde/lowcode-components/effectScatter-map/index.tsx

@@ -19,7 +19,7 @@ const handleImgUrl = (basePath: string) => {
         ProgramConfig.joinPath(ProgramConfig.api(), "/v3/files"),
         basePath
     )) +
-        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}`;
+        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}&@applicationToken=${ProgramConfig.applicationCode()}`;
     return url;
 }
 

package/src/aldehyde/lowcode-components/effectScatter-map-3d/index.tsx

@@ -19,7 +19,7 @@ const handleImgUrl = (basePath: string) => {
         ProgramConfig.joinPath(ProgramConfig.api(), "/v3/files"),
         basePath
     )) +
-        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}`;
+        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}&@applicationToken=${ProgramConfig.applicationCode()}`;
     return url;
 }
 

package/src/aldehyde/lowcode-components/lowcode-view/index.tsx

@@ -28,7 +28,7 @@ const handleImgUrl = (basePath: string) => {
         ProgramConfig.joinPath(ProgramConfig.api(), "/v3/files"),
         basePath
     )) +
-        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}`;
+        `?@token=${ProgramConfig.hydrocarbonToken()}&@programToken=${ProgramConfig.programCode()}&@applicationToken=${ProgramConfig.applicationCode()}`;
     return url;
 }
 

package/src/aldehyde/lowcode-components/radar-chart/index.tsx

@@ -255,7 +255,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
         const { grid, legend, tooltip, color, lineStyle, isArea, areaStyle, shape, splitAreaColor, axisName, axisLineColor, splitLineColor } = config;
         const option = _.cloneDeep(defOption);
         // 编辑态无数据显示默认数据
-        const temData = isDesignMode ? option.series : data;
+        const temData = isDesignMode && !data?.length ? option.series : data;
         const temMax = Math.max(...data.map(r => r.data?.map(item => item[1]) || []).flat());
         const temIndicator = data?.[0]?.data?.map(r => ({ name: r[0], max: temMax }));
         option.shape = shape;
@@ -264,7 +264,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
         option.tooltip = tooltip ? {} : undefined;
         option.title.text = translate("${暂无数据}");
         option.title.show = !temData?.length;
-        option.radar = isDesignMode ? option.radar : {
+        option.radar = isDesignMode && !data?.length ? option.radar : {
             ...option.radar,
             splitArea: {
                 areaStyle: {
@@ -288,7 +288,7 @@ const Index = forwardRef((props: ComponentProps, ref: ForwardedRef<ComponentRef>
             },
             indicator: temIndicator
         };
-        option.series = temData.map((r, index) => ({
+        option.series = isDesignMode && !data?.length ? option.series : temData.map((r, index) => ({
             name: r.name,
             type: "radar",
             lineStyle: { ...lineStyle, color: color[index] },

package/src/aldehyde/sso-Login/index.tsx

@@ -22,13 +22,14 @@ const Index = (props: Props) => {
         const programCode = temParams.get("programCode");
         const token = temParams.get("token");
         const sourceId = temParams.get("sourceId");
-        return { username, ssoToken, programCode, token, sourceId };
+        const applicationCode = temParams.get("applicationCode");
+        return { username, ssoToken, programCode, token, sourceId, applicationCode };
     }, [search]);
 
     const ssoTokenLogin = async () => {
         setLoading(true);
-        const { username, ssoToken, programCode, sourceId } = params;
-        const res = await HCserviceV3.ssoTokenLogin({ username, ssoToken }, programCode, serverKey);
+        const { username, ssoToken, programCode, sourceId, applicationCode } = params;
+        const res = await HCserviceV3.ssoTokenLogin({ username, ssoToken }, programCode, applicationCode, serverKey);
         const { defaultStyleTheme } = await ProgramConfig.getThemeConfig() || {};
         if (res.status === "success") {
             HCDataSource.clear();

package/src/aldehyde/sso-Login/service/index.js

@@ -5,9 +5,10 @@ const Password = "";
 const SourceId = ""; // 菜单SourceId
 const Path = "";
 const ProgramCode = "";
+const ApplicationCode = "";
 
 export const getUrl = async () => {
-    const token = await handleLogin({ path: Path, username: Username, password: Password, programCode: ProgramCode });
+    const token = await handleLogin({ path: Path, username: Username, password: Password, programCode: ProgramCode, applicationCode: ApplicationCode });
     if (!token) {
         return null;
     }

package/src/aldehyde/sso-Login/service/login.js

@@ -3,7 +3,7 @@ import JSEncrypt from 'jsencrypt';
 import superagent from "superagent";
 
 export const handleLogin = async (params) => {
-    const { username, password, programCode, path } = params || {};
+    const { username, password, programCode, path, applicationCode } = params || {};
     if (!username || !password || !programCode || !path) {
         return null;
     }
@@ -11,7 +11,7 @@ export const handleLogin = async (params) => {
     if (!pubkey) {
         return null;
     }
-    const res = await login({ loginData: { username, password }, pubkey, programCode, path });
+    const res = await login({ loginData: { username, password }, pubkey, programCode, path, applicationCode });
     if (res.status === "success") {
         return res.token;
     } else {
@@ -21,11 +21,11 @@ export const handleLogin = async (params) => {
 }
 
 const getPubkey = async (params) => {
-    const { programCode, path } = params || {};
+    const { programCode, path, applicationCode } = params || {};
     if (!programCode) {
         return null;
     }
-    const res = await request({ url: "/v3/auth/ras-pubkey", programCode, method: "GET", path });
+    const res = await request({ url: "/v3/auth/ras-pubkey", programCode, applicationCode, method: "GET", path });
     return res?.status === "success" ? res.rasPubkey : null;
 };
 
@@ -36,19 +36,20 @@ const rsaEncrypt = (word, keyStr) => {
 }
 
 const login = async (params) => {
-    const { loginData, pubkey, programCode, serverKey, path } = params;
+    const { loginData, pubkey, programCode, applicationCode, serverKey, path } = params;
     let datetime = dayjs(new Date()).tz("Europe/London").format("YYYY-MM-DD HH:mm:ss");
     let userInfo = rsaEncrypt(JSON.stringify({ ...loginData, datetime }), pubkey);
-    let res = await request({ url: "/v3/auth/hctoken", serverKey, programCode, query: { userInfo }, method: "GET", path });
+    let res = await request({ url: "/v3/auth/hctoken", serverKey, programCode, applicationCode, query: { userInfo }, method: "GET", path });
     return { status: res.status, token: res.token };
 }
 
 const request = (params) => {
-    const { programCode, method, path, query, data, url } = params;
+    const { programCode, method, path, query, data, url, applicationCode } = params;
     return new Promise((resolve, reject) => {
         superagent(method || "POST", path + url)
             .type("form")
             .set("hydrocarbon-program-token", programCode)
+            .set("hydrocarbon-application-token", applicationCode)
             .query(query || "")
             .send(data)
             .end((req, res) => {

package/src/aldehyde/tmpl/hcservice-v3.tsx

@@ -944,6 +944,7 @@ export default class HcserviceV3 {
   static getFileUrl(serverKey: string, path: string) {
     const hydrocarbonToken = Units.serverHydrocarbonToken(serverKey);
     const programCode = Units.programCode(serverKey);
+    const applicationCode = Units.applicationCode(serverKey);
     let root;
     let url;
     //判断是否为全URL
@@ -951,15 +952,15 @@ export default class HcserviceV3 {
       root = path;
       if (path.indexOf("?") > 0) {
         url = root +
-          `&@token=${hydrocarbonToken}&@programToken=${programCode}`;
+          `&@token=${hydrocarbonToken}&@programToken=${programCode}&@applicationToken=${applicationCode}`;
       } else {
         url = root +
-          `?@token=${hydrocarbonToken}&@programToken=${programCode}`;
+          `?@token=${hydrocarbonToken}&@programToken=${programCode}&@applicationToken=${applicationCode}`;
       }
     } else {
       root = Units.joinPath(Units.api(serverKey), Units.joinPath("/v3/files", path));
       url = root +
-        `?@token=${hydrocarbonToken}&@programToken=${programCode}`;
+        `?@token=${hydrocarbonToken}&@programToken=${programCode}&@applicationToken=${applicationCode}`;
     }
 
     let encodeUri = encodeURI(url);
@@ -981,12 +982,13 @@ export default class HcserviceV3 {
     l2MenuId: string,
     blockId: string,
     programCode?: string,
+    applicationCode?: string
   ): Promise<MenuConfigAPIType> {
     let url = `/v3/menu/blocks`;
     let res = await Super.super({
       url: url,
       method: "GET",
-      header: { programCode },
+      header: { programCode, applicationCode },
       query: {
         l2MenuId,
         blockId,
@@ -1131,7 +1133,8 @@ export default class HcserviceV3 {
     kaptchaText,
     pubkey,
     programCode?: string,
-    serverKey?: string
+    serverKey?: string,
+    applicationCode?: string
   ) {
     let datetime = dayjs(new Date())
       .tz("Europe/London")
@@ -1143,7 +1146,7 @@ export default class HcserviceV3 {
     let res = await Super.super({
       url: "/v3/auth/hctoken",
       serverKey,
-      header: { programCode },
+      header: { programCode, applicationCode },
       query: {
         userInfo,
         kaptchaToken,
@@ -1181,10 +1184,10 @@ export default class HcserviceV3 {
     return res;
   }
 
-  static async getKaptchaToken(programCode?: string) {
+  static async getKaptchaToken(programCode?: string, applicationCode?: string) {
     let res = await Super.super({
       url: "/v3/auth/kaptcha",
-      header: { programCode },
+      header: { programCode, applicationCode },
       method: "POST",
     });
     if (res && res.status === "success") {
@@ -1194,10 +1197,10 @@ export default class HcserviceV3 {
     }
   }
 
-  static async getRasPubkey(serverKey?: string, programCode?: string) {
+  static async getRasPubkey(serverKey?: string, programCode?: string, applicationCode?: string) {
     let res = await Super.super({
       url: "/v3/auth/ras-pubkey",
-      header: { programCode },
+      header: { programCode, applicationCode },
       serverKey,
       method: "GET",
     });
@@ -1208,9 +1211,9 @@ export default class HcserviceV3 {
     }
   }
 
-  static async getUser(programCode?: string, hydrocarbonToken?: string) {
+  static async getUser(programCode?: string, hydrocarbonToken?: string, applicationCode?: string) {
     let res = await Super.super({
-      header: { programCode, hydrocarbonToken },
+      header: { programCode, hydrocarbonToken, applicationCode },
       url: "/v3/current-user",
     });
     return res ? res.user : null;
@@ -1265,6 +1268,9 @@ export default class HcserviceV3 {
     if (ProgramConfigJson["programCode"]) {
       ProgramConfig.setProgramCode(ProgramConfigJson["programCode"]);
     }
+    if (ProgramConfigJson["applicationCode"]) {
+      ProgramConfig.setApplicationCode(ProgramConfigJson["applicationCode"]);
+    }
     if (ProgramConfigJson["hydrocarbonServer"]) {
       ProgramConfig.setHydrocarbonServer(
         ProgramConfigJson["hydrocarbonServer"]
@@ -1300,6 +1306,7 @@ export default class HcserviceV3 {
       //console.log('result',result)
       //先放入programCode
       ProgramConfig.setProgramCode(result.programCode);
+      ProgramConfig.setApplicationCode(result.applicationCode);
       ProgramConfig.setHydrocarbonServer(result.hydrocarbonServer);
       ProgramConfig.setProgramName(result.programName);
       ProgramConfig.setProgramName_sub(result.programName_sub);
@@ -1334,21 +1341,21 @@ export default class HcserviceV3 {
     return res;
   }
 
-  static async ssoTokenLogin(json: { username: string, ssoToken: string }, programCode?: string, serverKey?: string) {
+  static async ssoTokenLogin(json: { username: string, ssoToken: string }, programCode?: string, serverKey?: string, applicationCode?: string) {
     let res = await Super.super({
       url: "/v3/auth/sso/token",
       serverKey,
-      header: { programCode },
+      header: { programCode, applicationCode },
       query: json,
       method: "GET",
     });
     return res;
   }
 
-  static async getThemeConfig(serverKey?: string, programCode?: string) {
+  static async getThemeConfig(serverKey?: string, programCode?: string, applicationCode?: string) {
     let res = await Super.super({
       url: "/v3/theme-config",
-      header: { programCode },
+      header: { programCode, applicationCode },
       serverKey,
       method: "GET",
     });

package/src/aldehyde/tmpl/interface.tsx

@@ -913,6 +913,7 @@ export interface ThemeConfig {
   styleTheme?: string;
   themeColor?: string;
   homeSourceId?: string; // 首页菜单
+  homePageUrl?: string; // 首页自定义链接
   supportedLanguages?: string[]; // 支持语言
   defaultLanguage?: string; // 默认语言
   wsTypes?: ("sys-messages" | "user-notification")[];

package/src/aldehyde/tmpl/superagent.js

@@ -12,14 +12,15 @@ export default class Superagent {
         } else {
             programCode = Units.programCode(serverKey);
         }
+        let applicationCode = options.header?.applicationCode ? options.header?.applicationCode : Units.applicationCode(serverKey);
 
         let hydrocarbonToken = null;
         if (options.header && options.header.hydrocarbonToken) {
             hydrocarbonToken = options.header.hydrocarbonToken;
         } else if (serverKey) {
             hydrocarbonToken = Units.serverHydrocarbonToken(serverKey)
-        } else if (Units.hydrocarbonToken(programCode)) {
-            hydrocarbonToken = Units.hydrocarbonToken(programCode);
+        } else if (Units.hydrocarbonToken(programCode, applicationCode)) {
+            hydrocarbonToken = Units.hydrocarbonToken(programCode, applicationCode);
         } else {
             hydrocarbonToken = Units.getAnoHydrocarbonToken()
         }
@@ -47,6 +48,7 @@ export default class Superagent {
                 .type(ty)
                 .set("hydrocarbon-token", hydrocarbonToken)
                 .set("hydrocarbon-program-token", programCode)
+                .set("hydrocarbon-application-token", applicationCode)
                 .query(options.query || "")
                 .send(options.data)
                 .end((req, res) => {
@@ -129,6 +131,7 @@ export default class Superagent {
             return {
                 "hydrocarbon-token": Units.serverHydrocarbonToken(serverKey),
                 "hydrocarbon-program-token": Units.programCode(serverKey),
+                "hydrocarbon-application-token": Units.applicationCode(serverKey)
             }
         } else {
             return {
@@ -136,6 +139,7 @@ export default class Superagent {
                     ? Units.hydrocarbonToken()
                     : Units.getAnoHydrocarbonToken(),
                 "hydrocarbon-program-token": Units.programCode(),
+                "hydrocarbon-application-token": Units.applicationCode(serverKey)
             };
         }
     }

package/src/aldehyde/units/index.tsx

@@ -244,6 +244,35 @@ export default {
     }
     return programCode;
   },
+  setApplicationCode(applicationCode_: string, key?: string) {
+    if (applicationCode_) {
+      if (key) {
+        window.localStorage.setItem(key + "applicationCode", applicationCode_);
+      } else {
+        window.localStorage.setItem("applicationCode", applicationCode_);
+        window.sessionStorage.setItem("applicationCode", applicationCode_);
+      }
+    }
+  },
+  setSessionApplicationCode(applicationCode_: string) {
+    if (applicationCode_) {
+      window.sessionStorage.setItem("applicationCode", applicationCode_);
+    }
+  },
+  applicationCode(key?: string) {
+    let applicationCode = null;
+    if (key) {
+      applicationCode = window.localStorage.getItem(key + "applicationCode");
+    } else {
+      applicationCode = window.sessionStorage.getItem("applicationCode");
+    }
+
+    if (!applicationCode) {
+      applicationCode = window.localStorage.getItem("applicationCode");
+      this.setSessionProgramCode(applicationCode);
+    }
+    return applicationCode;
+  },
   setHydrocarbonServer(url: string, key?: string) {
     if (key) {
       window.localStorage.setItem(key + "hydrocarbonServer", url);
@@ -302,23 +331,24 @@ export default {
     }
     return appi;
   },
-  hydrocarbonToken(programCode_?: string) {
+  hydrocarbonToken(programCode_?: string, applicationCode_?: string) {
     let programCode = programCode_ ? programCode_ : this.programCode();
+    let applicationCode = applicationCode_ || this.applicationCode() || "";
     let hydrocarbonToken = window.sessionStorage.getItem(
-      programCode + "hydrocarbonToken"
+      programCode + applicationCode + "hydrocarbonToken"
     );
     if (!hydrocarbonToken) {
       hydrocarbonToken = window.sessionStorage.getItem("hydrocarbonToken");
     }
     if (!hydrocarbonToken) {
       hydrocarbonToken = window.localStorage.getItem(
-        programCode + "hydrocarbonToken"
+        programCode + applicationCode + "hydrocarbonToken"
       );
       if (!hydrocarbonToken) {
         hydrocarbonToken = window.localStorage.getItem("hydrocarbonToken");
       }
       if (hydrocarbonToken) {
-        this.setSessionHydrocarbonToken(hydrocarbonToken, programCode);
+        this.setSessionHydrocarbonToken(hydrocarbonToken, programCode, applicationCode);
       }
     }
     return hydrocarbonToken;
@@ -330,15 +360,11 @@ export default {
     this.setHydrocarbonToken(token, serverkey);
   },
   serverHydrocarbonToken(serverKey: string) {
-    let hydrocarbonToken = window.sessionStorage.getItem(
-      serverKey + "hydrocarbonToken"
-    );
+    let hydrocarbonToken = window.sessionStorage.getItem(serverKey + "hydrocarbonToken");
     if (!hydrocarbonToken) {
-      hydrocarbonToken = window.localStorage.getItem(
-        serverKey + "hydrocarbonToken"
-      );
+      hydrocarbonToken = window.localStorage.getItem(serverKey + "hydrocarbonToken");
     }
-    if (!hydrocarbonToken) {
+    if (!serverKey) { // serverKey不存在
       hydrocarbonToken = this.hydrocarbonToken();
     }
     return hydrocarbonToken;
@@ -357,18 +383,20 @@ export default {
   },
   setHydrocarbonToken(token: string, serverkey?: string) {
     let programCode = this.programCode(serverkey);
-    this.setLocalHydrocarbonToken(token, programCode);
-    this.setSessionHydrocarbonToken(token, programCode);
+    let applicationCode = this.applicationCode(serverkey);
+    this.setLocalHydrocarbonToken(token, programCode, applicationCode);
+    this.setSessionHydrocarbonToken(token, programCode, applicationCode);
   },
-  setLocalHydrocarbonToken(token: string, programCode_?: string) {
+  setLocalHydrocarbonToken(token: string, programCode_?: string, applicationCode_?: string) {
     if (!programCode_) {
       // if(!window.localStorage.getItem('hydrocarbonToken')){
       window.localStorage.setItem("hydrocarbonToken", token);
       //}
     }
     let programCode = programCode_ ? programCode_ : this.programCode();
+    let applicationCode = applicationCode_ || this.applicationCode() || "";
     if (programCode) {
-      window.localStorage.setItem(programCode + "hydrocarbonToken", token);
+      window.localStorage.setItem(programCode + applicationCode + "hydrocarbonToken", token);
       //初次设为默认
       if (!window.localStorage.getItem("hydrocarbonToken")) {
         window.localStorage.setItem("hydrocarbonToken", token);
@@ -378,7 +406,7 @@ export default {
     //     window.localStorage.setItem('hydrocarbonToken',token);
     // }
   },
-  setSessionHydrocarbonToken(token: string, programCode_?: string) {
+  setSessionHydrocarbonToken(token: string, programCode_?: string, applicationCode_?: string) {
     if (!programCode_) {
       //初次设为默认
       //if(!window.sessionStorage.getItem('hydrocarbonToken')){
@@ -386,8 +414,9 @@ export default {
       // }
     }
     let programCode = programCode_ ? programCode_ : this.programCode();
+    let applicationCode = applicationCode_ || this.applicationCode() || "";
     if (programCode) {
-      window.sessionStorage.setItem(programCode + "hydrocarbonToken", token);
+      window.sessionStorage.setItem(programCode + applicationCode + "hydrocarbonToken", token);
       if (!window.sessionStorage.getItem("hydrocarbonToken")) {
         window.sessionStorage.setItem("hydrocarbonToken", token);
       }
@@ -588,11 +617,12 @@ export default {
   },
   toLogin() {
     let programCode = this.programCode();
+    let applicationCode = this.applicationCode();
     const version = localStorage.getItem("version");
     const themes = this.getAllThemes();
     const loginPath = themes[version]?.loginPath || "login2";
     if (programCode && programCode != "null" && programCode != "undefined") {
-      window.location.hash = `#/${loginPath}/${programCode}`;
+      window.location.hash = applicationCode && applicationCode != "null" && applicationCode != "undefined" ? `#/${loginPath}/${programCode}/${applicationCode}` : `#/${loginPath}/${programCode}`;
     } else {
       window.location.hash = `#/${loginPath}`;
     }
@@ -1141,21 +1171,23 @@ export default {
   //     }
   // },
   setProgramCode4RoutePath(pathParams) {
-    let programCode = pathParams.programCode;
+    const { programCode, applicationCode } = pathParams;
     this.setProgramCode(programCode);
+    this.setApplicationCode(applicationCode);
   },
   setSessionProgramCode4RoutePath(pathParams) {
-    let programCode = pathParams.programCode;
+    const { programCode, applicationCode } = pathParams;
     this.setSessionProgramCode(programCode);
+    this.setSessionApplicationCode(applicationCode);
   },
   getReactKey() {
     return new Date().getTime().toString();
   },
-  async getUserInfo(programCode?: string, token?: string) {
+  async getUserInfo(programCode?: string, token?: string, applicationCode?: string) {
     if (currentUser?.name) {
       return currentUser;
     }
-    let user = await HcserviceV3.getUser(programCode, token);
+    let user = await HcserviceV3.getUser(programCode, token, applicationCode);
     if (user?.orgGtmplSourceId && !["null"].includes(user.orgGtmplSourceId)) {
       const { ltmplConfig } = await HcserviceV3.requestLtmplConfig(null, user.orgGtmplSourceId) || {};
       const { entities } = await HcserviceV3.requestLtmplQueryTop(null, user.orgGtmplSourceId, { top: 1 }) || {};
@@ -1212,10 +1244,11 @@ export default {
       return themeConfig;
     }
     const programCode = this.programCode();
+    const applicationCode = this.applicationCode();
     const server = this.api(serverKey);
     const { themeConfig: temConfig } = await HcserviceV3.getThemeConfig(serverKey, programCode) || {};
-    const loginMainPicture = temConfig?.loginMainPicture ? this.joinPath(server, `/v3/theme-files/${temConfig?.loginMainPicture}?@programToken=${programCode}`) : null;
-    const programIcon = temConfig?.programIcon ? this.joinPath(server, `/v3/theme-files/${temConfig?.programIcon}?@programToken=${programCode}`) : null;
+    const loginMainPicture = temConfig?.loginMainPicture ? this.joinPath(server, `/v3/theme-files/${temConfig?.loginMainPicture}?@programToken=${programCode}&@applicationToken=${applicationCode}`) : null;
+    const programIcon = temConfig?.programIcon ? this.joinPath(server, `/v3/theme-files/${temConfig?.programIcon}?@programToken=${programCode}&@applicationToken=${applicationCode}`) : null;
     themeConfig = { ...temConfig, loginMainPicture, programIcon };
     return themeConfig;
   },
@@ -1226,14 +1259,16 @@ export default {
     const currentUser = this.getCurrentUserInfo();
     if (!setting || !currentUser) return;
     const programCode = this.programCode();
-    const localKey = `${currentUser.id}-${programCode}-userPageConfig`;
+    const applicationCode = this.applicationCode();
+    const localKey = `${currentUser.id}-${programCode}${applicationCode ? `-${applicationCode}` : ""}-userPageConfig`;
     localStorage.setItem(localKey, JSON.stringify(setting));
   },
   setUserPageConfig(key: string, setting: { [key: string]: any }) { // 页面配置(视图、列、分页等)存本地
     const currentUser = this.getCurrentUserInfo();
     if (!key || !setting || !currentUser) return;
     const programCode = this.programCode();
-    const localKey = `${currentUser.id}-${programCode}-userPageConfig`;
+    const applicationCode = this.applicationCode();
+    const localKey = `${currentUser.id}-${programCode}${applicationCode ? `-${applicationCode}` : ""}-userPageConfig`;
     const userPageConfig = localStorage.getItem(localKey) || "{}";
     let config = {};
     try {
@@ -1249,7 +1284,8 @@ export default {
     const currentUser = await this.getUserInfo();
     if (!key || !currentUser) return;
     const programCode = this.programCode();
-    const localKey = `${currentUser.id}-${programCode}-userPageConfig`;
+    const applicationCode = this.applicationCode();
+    const localKey = `${currentUser.id}-${programCode}${applicationCode ? `-${applicationCode}` : ""}-userPageConfig`;
     const userPageConfig = localStorage.getItem(localKey) || "{}";
     try {
       const config = JSON.parse(userPageConfig);
@@ -1262,7 +1298,8 @@ export default {
     const currentUser = this.getCurrentUserInfo();
     if (!key || !currentUser) return;
     const programCode = this.programCode();
-    const localKey = `${currentUser.id}-${programCode}-userPageConfig`;
+    const applicationCode = this.applicationCode();
+    const localKey = `${currentUser.id}-${programCode}${applicationCode ? `-${applicationCode}` : ""}-userPageConfig`;
     const userPageConfig = localStorage.getItem(localKey) || "{}";
     try {
       const config = JSON.parse(userPageConfig);

package/src/aldehyde/welcome/HCWelcome.js

@@ -321,14 +321,15 @@ const handleImgUrl = (basePath) => {
     Units.joinPath(Units.api(), "/v3/files"),
     basePath
   )) +
-    `?@token=${Units.hydrocarbonToken()}&@programToken=${Units.programCode()}`;
+    `?@token=${Units.hydrocarbonToken()}&@programToken=${Units.programCode()}&@applicationToken=${Units.applicationCode()}`;
   return url;
 }
 
 const HCWelcome = (props) => {
   const { layoutRootPath, homeImg, showHomeImg = true, showFastMenu = true } = props;
-  const { programCode } = useParams();
+  const { programCode, applicationCode } = useParams();
   if (programCode) Units.setProgramCode(programCode);
+  if (applicationCode) Units.setApplicationCode(applicationCode);
   const [orgHomeImg, setOrgHomeImg] = useState();
   const [menus, setMenus] = useState([]);
   const [leafMenus, setLeafMenus] = useState([]);