aldehyde 0.2.479 → 0.2.481

package/src/aldehyde/locale/LocaleProvider.tsx

@@ -1,265 +1,265 @@
-
-import React, { ReactNode, createContext, useEffect, useState } from "react";
-import { useNavigatorLanguage } from "./useLocale";
-import { getLangWithLangApiMp, getLangWithLangMp } from "./langMp";
-import { LocaleType } from "./langMp";
-import HcserviceV3 from "../tmpl/hcservice-v3";
-
-export const LocaleContext = createContext<{
-  locale: LocaleType;
-  langPkg: any;
-  availableLang: string[];
-  changeLocale: (locale: LocaleType) => void;
-  siderCollapsed: boolean;
-  changeSiderCollapsed: () => void;
-  t: (...strs: string[]) => string;
-  translate: (...strs: string[]) => string;
-  getServiceLangStr?: () => string;
-  compactTheme?: boolean;
-  changeCompactTheme?: () => void;
-  screenfull?: boolean;
-  changeScreenfull?: () => void;
-}>({
-  locale: undefined,
-  availableLang: [],
-  langPkg: {},
-  changeLocale: () => { },
-  siderCollapsed: false,
-  changeSiderCollapsed: () => { },
-  compactTheme: false,
-  changeCompactTheme: () => { },
-  t: (...str) => str.join(""),
-  translate: (str) => {
-    let res = [],
-      tres = "";
-
-    let matchStr = "",
-      enableMatch = false;
-
-    for (const char of str) {
-      if (char === "$") {
-        enableMatch = true;
-        res.push(tres);
-        tres = "";
-      } else if (enableMatch && char === "{") {
-        continue;
-      } else if (enableMatch && char === "}") {
-        res.push(matchStr);
-        enableMatch = false;
-        matchStr = "";
-      } else if (enableMatch) matchStr += char;
-      else tres += char;
-    }
-
-    res.push(tres);
-    return res.join("");
-  },
-  screenfull: false,
-  changeScreenfull: () => { },
-});
-
-const getLocaleWithServer = async (lang: string, serverKey?: string) => {
-  const langStr = getLangWithLangApiMp(lang);
-  if (langStr === "zh") return;
-
-  const { value, status } = await HcserviceV3.getLocale(langStr, serverKey);
-
-  if (status === "success") {
-    return value;
-  }
-  return {};
-};
-
-interface Props {
-  serverKey?: string | string[];
-  children: ReactNode;
-  languages?: string[];
-  defaultLanguage?: LocaleType
-}
-
-export const LocaleProvider = (props: Props) => {
-  const { navigatorLanguage } = useNavigatorLanguage();
-  const { serverKey = "", children, languages = [], defaultLanguage } = props;
-  const localeStorageLang: LocaleType = window.localStorage.getItem("locale") as LocaleType;
-  const localeStorageLangPkg: object = JSON.parse(window.localStorage.getItem("langPkg"));
-
-  const [locale, setLocale] = useState<LocaleType>(localeStorageLang);
-
-  const [siderCollapsed, setSiderCollapsed] = useState<boolean>(false);
-
-  const [compactTheme, setCompactTheme] = useState<boolean>(localStorage.getItem("compactTheme") === "true");
-
-  const [langPkg, setLangPkg] = useState(
-    localeStorageLangPkg ? localeStorageLangPkg : {}
-  );
-  const [availableLang, setAvailableLang] = useState([]);
-  // 是否全屏
-  const [screenfull, setScreenfull] = useState<boolean>(false);
-
-  const changeLocale = async (locale: LocaleType) => {
-    setLocale(locale);
-  };
-
-  const changeSiderCollapsed = () => {
-    setSiderCollapsed(!siderCollapsed);
-  };
-
-  const changeCompactTheme = () => {
-    setCompactTheme(!compactTheme);
-    localStorage.setItem("compactTheme", `${!compactTheme}`);
-  };
-
-  const getServiceLangStr = () => {
-    const langStr = getLangWithLangApiMp(locale);
-    return langStr;
-  };
-
-  const getAllLocale = async (serverKey: string[]) => {
-    const newLangPkg = {
-      ...langPkg,
-    };
-    for (const key of serverKey) {
-      let res;
-      if (key === "") {
-        res = await getLocaleWithServer(locale);
-      } else {
-        res = await getLocaleWithServer(locale, key);
-      }
-
-      if (newLangPkg[locale] !== undefined)
-        Object.assign(newLangPkg[locale], res);
-      else newLangPkg[locale] = res;
-    }
-
-    window.localStorage.setItem("locale", locale);
-    setLangPkg(newLangPkg);
-  };
-
-  useEffect(() => {
-    if (locale) {
-      let temServerKey = serverKey;
-      if (!Array.isArray(serverKey)) temServerKey = [...new Set(["", serverKey])];
-      getAllLocale([...new Set(["", ...temServerKey])]);
-    }
-  }, [locale]);
-
-  useEffect(() => {
-    // 使用主题中配置支持语言(主题未配置，则默认返回的后端配置的语言)
-    if ("languages" in props) { // 判断props是否有传参languages
-      setAvailableLang(languages?.filter(r => r !== "zh")?.map((i) => getLangWithLangMp(i)) || []);
-    } else {
-      // 兼容旧版本语言获取
-      HcserviceV3.getAllLang().then((res) => {
-        if (res.status === "success") {
-          setAvailableLang(res.languages ? res.languages.map((i) => getLangWithLangMp(i)) : []);
-        }
-      });
-    }
-  }, [languages?.length]);
-
-  useEffect(() => {
-    if ("defaultLanguage" in props && !locale) { // 判断props是否传参defaultLanguage
-      setLocale(defaultLanguage); // 存在defaultLanguage且无本地缓存，设置defaultLanguage
-    } else {
-      setLocale(localeStorageLang || getLangWithLangMp(navigatorLanguage))
-    }
-  }, [defaultLanguage]);
-
-  useEffect(() => {
-    window.localStorage.setItem("langPkg", JSON.stringify(langPkg));
-  }, [langPkg]);
-
-  const t = (...strs: string[]) => {
-    if (locale === "zh") return strs.join("");
-
-    let res = "",
-      flag = false;
-
-    for (const str of strs) {
-      const tStr =
-        langPkg[locale] === undefined ? undefined : langPkg[locale][str];
-      if (tStr === undefined) {
-        flag = true;
-        break;
-      } else {
-        res += tStr + " ";
-      }
-    }
-    return flag ? strs.join("") : res.slice(0, res.length - 1);
-  };
-
-  const translate = (str) => {
-    let res = [],
-      resMp = [],
-      flag = false,
-      tres = "";
-
-    let matchStr = "",
-      enableMatch = false;
-
-    for (const char of str) {
-      if (char === "$" && !enableMatch) {
-        enableMatch = true;
-        if (tres !== "") {
-          res.push(tres);
-          tres = "";
-          resMp.push(false);
-        }
-      } else if (enableMatch && char === "{") {
-        continue;
-      } else if (enableMatch && char === "}") {
-        const tStr =
-          langPkg[locale] === undefined ? undefined : langPkg[locale][matchStr];
-        if (tStr === undefined) {
-          flag = true;
-        }
-        res.push(matchStr);
-        resMp.push(true);
-        enableMatch = false;
-        matchStr = "";
-      } else if (enableMatch) matchStr += char;
-      else tres += char;
-    }
-
-    if (tres !== "") {
-      res.push(tres);
-      resMp.push(false);
-    }
-
-    if (flag) return res.join("");
-    let resStr = "";
-    for (let i = 0; i < res.length; i++) {
-      if (resMp[i]) resStr += (i !== 0 ? " " : "") + langPkg[locale][res[i]];
-      else resStr += res[i];
-    }
-    return resStr;
-  };
-
-  const changeScreenfull = () => {
-    if (!screenfull || !document.fullscreenElement) {
-      document.body.requestFullscreen();
-    } else {
-      document.exitFullscreen();
-    }
-  };
-
-  // 全屏状态改变
-  const fullscreenChange = () => {
-    setScreenfull(!!document.fullscreenElement);
-  };
-
-  useEffect(() => {
-    document.addEventListener('fullscreenchange', fullscreenChange);
-    return () => {
-      document.removeEventListener('fullscreenchange', fullscreenChange);
-    }
-  }, []);
-
-  return (
-    <LocaleContext.Provider
-      value={{ locale, availableLang, langPkg, changeLocale, siderCollapsed, changeSiderCollapsed, t, translate, getServiceLangStr, compactTheme, changeCompactTheme, screenfull, changeScreenfull }}
-    >
-      {children}
-    </LocaleContext.Provider>
-  );
-};
+
+import React, { ReactNode, createContext, useEffect, useState } from "react";
+import { useNavigatorLanguage } from "./useLocale";
+import { getLangWithLangApiMp, getLangWithLangMp } from "./langMp";
+import { LocaleType } from "./langMp";
+import HcserviceV3 from "../tmpl/hcservice-v3";
+
+export const LocaleContext = createContext<{
+  locale: LocaleType;
+  langPkg: any;
+  availableLang: string[];
+  changeLocale: (locale: LocaleType) => void;
+  siderCollapsed: boolean;
+  changeSiderCollapsed: () => void;
+  t: (...strs: string[]) => string;
+  translate: (...strs: string[]) => string;
+  getServiceLangStr?: () => string;
+  compactTheme?: boolean;
+  changeCompactTheme?: () => void;
+  screenfull?: boolean;
+  changeScreenfull?: () => void;
+}>({
+  locale: undefined,
+  availableLang: [],
+  langPkg: {},
+  changeLocale: () => { },
+  siderCollapsed: false,
+  changeSiderCollapsed: () => { },
+  compactTheme: false,
+  changeCompactTheme: () => { },
+  t: (...str) => str.join(""),
+  translate: (str) => {
+    let res = [],
+      tres = "";
+
+    let matchStr = "",
+      enableMatch = false;
+
+    for (const char of str) {
+      if (char === "$") {
+        enableMatch = true;
+        res.push(tres);
+        tres = "";
+      } else if (enableMatch && char === "{") {
+        continue;
+      } else if (enableMatch && char === "}") {
+        res.push(matchStr);
+        enableMatch = false;
+        matchStr = "";
+      } else if (enableMatch) matchStr += char;
+      else tres += char;
+    }
+
+    res.push(tres);
+    return res.join("");
+  },
+  screenfull: false,
+  changeScreenfull: () => { },
+});
+
+const getLocaleWithServer = async (lang: string, serverKey?: string) => {
+  const langStr = getLangWithLangApiMp(lang);
+  if (langStr === "zh") return;
+
+  const { value, status } = await HcserviceV3.getLocale(langStr, serverKey);
+
+  if (status === "success") {
+    return value;
+  }
+  return {};
+};
+
+interface Props {
+  serverKey?: string | string[];
+  children: ReactNode;
+  languages?: string[];
+  defaultLanguage?: LocaleType
+}
+
+export const LocaleProvider = (props: Props) => {
+  const { navigatorLanguage } = useNavigatorLanguage();
+  const { serverKey = "", children, languages = [], defaultLanguage } = props;
+  const localeStorageLang: LocaleType = window.localStorage.getItem("locale") as LocaleType;
+  const localeStorageLangPkg: object = JSON.parse(window.localStorage.getItem("langPkg"));
+
+  const [locale, setLocale] = useState<LocaleType>(localeStorageLang);
+
+  const [siderCollapsed, setSiderCollapsed] = useState<boolean>(false);
+
+  const [compactTheme, setCompactTheme] = useState<boolean>(localStorage.getItem("compactTheme") === "true");
+
+  const [langPkg, setLangPkg] = useState(
+    localeStorageLangPkg ? localeStorageLangPkg : {}
+  );
+  const [availableLang, setAvailableLang] = useState([]);
+  // 是否全屏
+  const [screenfull, setScreenfull] = useState<boolean>(false);
+
+  const changeLocale = async (locale: LocaleType) => {
+    setLocale(locale);
+  };
+
+  const changeSiderCollapsed = () => {
+    setSiderCollapsed(!siderCollapsed);
+  };
+
+  const changeCompactTheme = () => {
+    setCompactTheme(!compactTheme);
+    localStorage.setItem("compactTheme", `${!compactTheme}`);
+  };
+
+  const getServiceLangStr = () => {
+    const langStr = getLangWithLangApiMp(locale);
+    return langStr;
+  };
+
+  const getAllLocale = async (serverKey: string[]) => {
+    const newLangPkg = {
+      ...langPkg,
+    };
+    for (const key of serverKey) {
+      let res;
+      if (key === "") {
+        res = await getLocaleWithServer(locale);
+      } else {
+        res = await getLocaleWithServer(locale, key);
+      }
+
+      if (newLangPkg[locale] !== undefined)
+        Object.assign(newLangPkg[locale], res);
+      else newLangPkg[locale] = res;
+    }
+
+    window.localStorage.setItem("locale", locale);
+    setLangPkg(newLangPkg);
+  };
+
+  useEffect(() => {
+    if (locale) {
+      let temServerKey = serverKey;
+      if (!Array.isArray(serverKey)) temServerKey = [...new Set(["", serverKey])];
+      getAllLocale([...new Set(["", ...temServerKey])]);
+    }
+  }, [locale]);
+
+  useEffect(() => {
+    // 使用主题中配置支持语言(主题未配置，则默认返回的后端配置的语言)
+    if ("languages" in props) { // 判断props是否有传参languages
+      setAvailableLang(languages?.filter(r => r !== "zh")?.map((i) => getLangWithLangMp(i)) || []);
+    } else {
+      // 兼容旧版本语言获取
+      HcserviceV3.getAllLang().then((res) => {
+        if (res.status === "success") {
+          setAvailableLang(res.languages ? res.languages.map((i) => getLangWithLangMp(i)) : []);
+        }
+      });
+    }
+  }, [languages?.length]);
+
+  useEffect(() => {
+    if ("defaultLanguage" in props && !locale) { // 判断props是否传参defaultLanguage
+      setLocale(defaultLanguage); // 存在defaultLanguage且无本地缓存，设置defaultLanguage
+    } else {
+      setLocale(localeStorageLang || getLangWithLangMp(navigatorLanguage))
+    }
+  }, [defaultLanguage]);
+
+  useEffect(() => {
+    window.localStorage.setItem("langPkg", JSON.stringify(langPkg));
+  }, [langPkg]);
+
+  const t = (...strs: string[]) => {
+    if (locale === "zh") return strs.join("");
+
+    let res = "",
+      flag = false;
+
+    for (const str of strs) {
+      const tStr =
+        langPkg[locale] === undefined ? undefined : langPkg[locale][str];
+      if (tStr === undefined) {
+        flag = true;
+        break;
+      } else {
+        res += tStr + " ";
+      }
+    }
+    return flag ? strs.join("") : res.slice(0, res.length - 1);
+  };
+
+  const translate = (str) => {
+    let res = [],
+      resMp = [],
+      flag = false,
+      tres = "";
+
+    let matchStr = "",
+      enableMatch = false;
+
+    for (const char of str) {
+      if (char === "$" && !enableMatch) {
+        enableMatch = true;
+        if (tres !== "") {
+          res.push(tres);
+          tres = "";
+          resMp.push(false);
+        }
+      } else if (enableMatch && char === "{") {
+        continue;
+      } else if (enableMatch && char === "}") {
+        const tStr =
+          langPkg[locale] === undefined ? undefined : langPkg[locale][matchStr];
+        if (tStr === undefined) {
+          flag = true;
+        }
+        res.push(matchStr);
+        resMp.push(true);
+        enableMatch = false;
+        matchStr = "";
+      } else if (enableMatch) matchStr += char;
+      else tres += char;
+    }
+
+    if (tres !== "") {
+      res.push(tres);
+      resMp.push(false);
+    }
+
+    if (flag) return res.join("");
+    let resStr = "";
+    for (let i = 0; i < res.length; i++) {
+      if (resMp[i]) resStr += (i !== 0 ? " " : "") + langPkg[locale][res[i]];
+      else resStr += res[i];
+    }
+    return resStr;
+  };
+
+  const changeScreenfull = () => {
+    if (!screenfull || !document.fullscreenElement) {
+      document.body.requestFullscreen();
+    } else {
+      document.exitFullscreen();
+    }
+  };
+
+  // 全屏状态改变
+  const fullscreenChange = () => {
+    setScreenfull(!!document.fullscreenElement);
+  };
+
+  useEffect(() => {
+    document.addEventListener('fullscreenchange', fullscreenChange);
+    return () => {
+      document.removeEventListener('fullscreenchange', fullscreenChange);
+    }
+  }, []);
+
+  return (
+    <LocaleContext.Provider
+      value={{ locale, availableLang, langPkg, changeLocale, siderCollapsed, changeSiderCollapsed, t, translate, getServiceLangStr, compactTheme, changeCompactTheme, screenfull, changeScreenfull }}
+    >
+      {children}
+    </LocaleContext.Provider>
+  );
+};

package/src/aldehyde/locale/langMp.ts

@@ -1,45 +1,45 @@
-import frFr from "antd/locale/fr_FR";
-import zhCN from "antd/locale/zh_CN";
-import enUS from "antd/locale/en_US";
-import ptPT from 'antd/locale/pt_PT';
-import ruRU from 'antd/locale/ru_RU';
-
-export type LocaleType = "zh" | "en" | "fr" | "pt" | "ru" | string;
-
-export const langMp = {
-  fr: ["fra", "fr-FR"],
-  zh: ["zh", "zh-CN"],
-  en: ["en"],
-  pt: ["pt"],
-  ru: ["ru"],
-};
-
-export const langApiMp = {
-  fra: ["fr", "fr-FR"],
-  zh: ["zh", "zh-CN"],
-  en: ["en"],
-  pt: ["pt"],
-  ru: ["ru"],
-};
-
-export const getLangWithLangMp: (lang: any) => LocaleType = (lang) => {
-  for (const [key, value] of Object.entries(langMp)) {
-    if (value.findIndex((i) => i === lang) > -1) return key as LocaleType;
-  }
-  return "zh" as LocaleType;
-};
-
-export const getLangWithLangApiMp = (lang) => {
-  for (const [key, value] of Object.entries(langApiMp)) {
-    if (value.findIndex((i) => i === lang) > -1) return key;
-  }
-  return "zh";
-};
-
-export const antdLangMp = {
-  zh: zhCN,
-  fr: frFr,
-  en: enUS,
-  pt: ptPT,
-  ru: ruRU
-};
+import frFr from "antd/locale/fr_FR";
+import zhCN from "antd/locale/zh_CN";
+import enUS from "antd/locale/en_US";
+import ptPT from 'antd/locale/pt_PT';
+import ruRU from 'antd/locale/ru_RU';
+
+export type LocaleType = "zh" | "en" | "fr" | "pt" | "ru" | string;
+
+export const langMp = {
+  fr: ["fra", "fr-FR"],
+  zh: ["zh", "zh-CN"],
+  en: ["en"],
+  pt: ["pt"],
+  ru: ["ru"],
+};
+
+export const langApiMp = {
+  fra: ["fr", "fr-FR"],
+  zh: ["zh", "zh-CN"],
+  en: ["en"],
+  pt: ["pt"],
+  ru: ["ru"],
+};
+
+export const getLangWithLangMp: (lang: any) => LocaleType = (lang) => {
+  for (const [key, value] of Object.entries(langMp)) {
+    if (value.findIndex((i) => i === lang) > -1) return key as LocaleType;
+  }
+  return "zh" as LocaleType;
+};
+
+export const getLangWithLangApiMp = (lang) => {
+  for (const [key, value] of Object.entries(langApiMp)) {
+    if (value.findIndex((i) => i === lang) > -1) return key;
+  }
+  return "zh";
+};
+
+export const antdLangMp = {
+  zh: zhCN,
+  fr: frFr,
+  en: enUS,
+  pt: ptPT,
+  ru: ruRU
+};