zova-suite-a-devui 5.0.13 → 5.0.15

package/modules/a-devui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-devui",
-  "version": "5.0.13",
+  "version": "5.0.15",
   "title": "a-devui",
   "zovaModule": {
     "capabilities": {
@@ -31,5 +31,5 @@
     "dist"
   ],
   "scripts": {},
-  "gitHead": "6ab950f2066f8feb2dfddb94575fcbb2cf07afe7"
+  "gitHead": "5fd1484d04f43c3f32e49c989fc55373087a1957"
 }

package/modules/a-devui/src/bean/local.ssr.ts

@@ -13,16 +13,12 @@ export class LocalSSR extends BeanBase<ScopeModule> {
     // ssr theme
     if (process.env.SERVER) {
       this.ctx.meta.ssr.context.onRendered(() => {
-        this.ctx.meta.ssr.context._meta.bodyTags += `<script id="__prefersColorSchemeDarkJS">
-    const __Themes = { 'a-demo.theme.orange': 'orange', 'home-theme.theme.default': '' };
-    const __names = [];
-    const __name = __Themes[window.ssr_local_themename];
-    if (__name) __names.push(__name);
-    __names.push(window.ssr_local_themedark ? 'dark' : 'light');
-    const themeName = __names.join('-');
-    document.body.setAttribute('data-theme', themeName);
-    document.querySelector('#__prefersColorSchemeDarkJS').remove();
-</script>`.replaceAll('\n', '');
+        if (!this.app.config.ssr.cookieThemeDark) {
+          this.ctx.meta.ssr.context._meta.bodyTags += `<script id="__prefersColorSchemeDarkJS">
+            document.body.setAttribute('data-theme', window.ssr_local_themedark_data);
+            document.querySelector('#__prefersColorSchemeDarkJS').remove();
+          </script>`.replaceAll('\n', '');
+        }
       });
     }
   }

package/modules/a-devui/src/bean/tool.themeHandler.ts

@@ -15,13 +15,18 @@ export class ToolThemeHandler extends BeanBase<ScopeModule> implements ThemeHand
     const themeName = _names.join('-');
     // data-theme
     if (process.env.CLIENT) {
+      // client
       const body = window?.document?.body;
       if (body) {
         body.setAttribute('data-theme', themeName);
       }
     } else {
-      // meta
-      this.$useMeta({ bodyAttr: { 'data-theme': themeName } });
+      // server
+      if (!this.app.config.ssr.cookieThemeDark) {
+        this.$useMeta({ bodyAttr: { [`data-ssr-theme-dark-${dark}`]: themeName } });
+      } else {
+        this.$useMeta({ bodyAttr: { 'data-theme': themeName } });
+      }
     }
   }
 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "zova-suite-a-devui",
-  "version": "5.0.13",
+  "version": "5.0.15",
   "title": "a-devui",
   "type": "module",
   "description": "devui",
   "author": "zhennann",
   "dependencies": {
-    "zova-module-a-devui": "^5.0.13"
+    "zova-module-a-devui": "^5.0.15"
   },
-  "gitHead": "6ab950f2066f8feb2dfddb94575fcbb2cf07afe7"
+  "gitHead": "5fd1484d04f43c3f32e49c989fc55373087a1957"
 }