aldehyde 0.2.478 → 0.2.480

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 || !hydrocarbonToken) { // 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}`;
     }
@@ -789,8 +819,8 @@ export default {
       name = name.substring(2);
     }
     let cs: CriteriaConfig[] = [];
-    if (ltmplConfig.criterias) {
-      cs.push(...ltmplConfig.criterias);
+    if (ltmplConfig.criteria) {
+      cs.push(...ltmplConfig.criteria);
     }
     if (ltmplConfig.updrillButtonConfigs) {
       cs.push(...ltmplConfig.updrillButtonConfigs);
@@ -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([]);