zova-core 5.1.85 → 5.1.87

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zova-core",
-  "version": "5.1.85",
-  "gitHead": "75a09e6a22891e958802ee649ed454db38f90c16",
+  "version": "5.1.87",
+  "gitHead": "ad6f4a6afb4c6f0ba968b84152fcf888b0450e3e",
   "description": "A vue3 framework with ioc",
   "keywords": [
     "ioc",

package/src/bean/resource/locale/type.ts

@@ -1,4 +1,5 @@
 export const LocaleModuleNameSeparator = '::';
+export const LocalePattern = '[a-z]{2}-[a-z]{2}|[a-z]{2}';
 
 export interface IModuleLocale {
   (...args: any[]): string;

package/src/core/component/locale.ts

@@ -26,14 +26,17 @@ export class AppLocale extends BeanSimple {
 
   get current(): keyof ILocaleRecord {
     let locale = this[SymbolLocaleCurrent].value;
-    if (!locale && this._cookieEnabled()) {
+    // always parse locale from cookie
+    // if (!locale && this._cookieEnabled()) {
+    if (!locale) {
       locale = this.metaCookie.getItem(this.sys.config.locale.storeKey);
     }
     if (!locale) locale = this.sys.config.locale.default;
     return locale as keyof ILocaleRecord;
   }
 
-  set current(value: keyof ILocaleRecord) {
+  set current(value: keyof ILocaleRecord | '' | undefined) {
+    if (!value) value = this.sys.config.locale.default;
     if (this[SymbolLocaleCurrent].value === value) return;
     this[SymbolLocaleCurrent].value = value;
     if (this._cookieEnabled()) {
@@ -47,7 +50,11 @@ export class AppLocale extends BeanSimple {
 
   get tz(): string {
     let tz = this[SymbolTzCurrent].value;
-    if (!tz && this._cookieEnabled()) tz = this.metaCookie.getItem(this.sys.config.tz.storeKey);
+    // always parse tz from cookie
+    // if (!tz && this._cookieEnabled()) {
+    if (!tz) {
+      tz = this.metaCookie.getItem(this.sys.config.tz.storeKey);
+    }
     if (!tz) tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
     return tz;
   }

package/src/core/sys/util.ts

@@ -263,3 +263,9 @@ export function throwErrorComponentUnmounted() {
   error.code = 600;
   throw error;
 }
+
+export function ssr_load_local(key, defaultValue?) {
+  const __ssr_local = localStorage.getItem(key);
+  const value = __ssr_local ? JSON.parse(__ssr_local) : undefined;
+  return value ?? defaultValue;
+}