@sugarat/theme 0.2.26 → 0.2.27

package/node.js

@@ -456,6 +456,8 @@ function patchVPThemeConfig(cfg, vpThemeConfig = {}) {
   vpThemeConfig.sidebar = patchDefaultThemeSideBar(cfg)?.sidebar;
   return vpThemeConfig;
 }
+function checkConfig(cfg) {
+}
 
 // src/utils/node/vitePlugins.ts
 var import_node_path3 = __toESM(require("path"));
@@ -562,6 +564,7 @@ function coverImgTransform() {
 
 // src/node.ts
 function getThemeConfig(cfg) {
+  checkConfig(cfg);
   const pagesData = getArticles(cfg);
   const extraVPConfig = {};
   const vitePlugins = getVitePlugins(cfg);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sugarat/theme",
-  "version": "0.2.26",
+  "version": "0.2.27",
   "description": "简约风的 Vitepress 博客主题，sugarat vitepress blog theme",
   "author": "sugar",
   "license": "MIT",
@@ -42,7 +42,7 @@
     "gray-matter": "^4.0.3",
     "markdown-it-task-checkbox": "^1.0.6",
     "mermaid": "^10.2.4",
-    "oh-my-live2d": "^0.9.0",
+    "oh-my-live2d": "^0.10.0",
     "swiper": "^11.0.5",
     "vitepress-markdown-timeline": "^1.2.1",
     "vitepress-plugin-mermaid": "2.0.13",

package/src/hooks/useOml2d.ts

@@ -1,12 +1,77 @@
 import { onMounted } from 'vue'
+import type { Options } from 'oh-my-live2d'
 import { useOml2dOptions } from '../composables/config/blog'
 
+const defaultModelOptions: any = {
+  scale: 0.08,
+  position: [-30, 0],
+  stageStyle: {
+    width: 220
+  },
+  mobilePosition: [-10, 0],
+  mobileScale: 0.05,
+  mobileStageStyle: {
+    width: 150
+  },
+}
+const defaultOptions: Options = {
+  tips: {
+    copyTips: {
+      duration: 2000,
+      message: ['复制成功，感谢您的支持！'],
+    },
+    style: {
+      top: '-50px',
+      fontSize: '14px',
+      padding: '10px',
+      width: '200px'
+    },
+    mobileStyle: {
+      top: '-80px',
+      left: '80px',
+      fontSize: '14px',
+      padding: '4px 10px',
+      width: '110px'
+    }
+  }
+}
 export function useOml2d() {
   const oml2dOptions = useOml2dOptions()
   onMounted(async () => {
     if (oml2dOptions) {
       const { loadOml2d } = await import('oh-my-live2d')
-      loadOml2d(oml2dOptions)
+      loadOml2d({
+        ...defaultOptions,
+        ...oml2dOptions,
+        models: oml2dOptions?.models?.map(model => ({
+          ...defaultModelOptions,
+          ...model,
+          stageStyle: {
+            ...defaultModelOptions.stageStyle,
+            ...model.stageStyle
+          },
+          mobileStageStyle: {
+            ...defaultModelOptions.mobileStageStyle,
+            ...model.mobileStageStyle
+          }
+        })),
+        tips: {
+          ...defaultOptions.tips,
+          ...oml2dOptions.tips,
+          style: {
+            ...defaultOptions?.tips?.style,
+            ...oml2dOptions?.tips?.style
+          },
+          mobileStyle: {
+            ...defaultOptions?.tips?.mobileStyle,
+            ...oml2dOptions?.tips?.mobileStyle
+          },
+          copyTips: {
+            ...defaultOptions?.tips?.copyTips,
+            ...oml2dOptions?.tips?.copyTips
+          }
+        }
+      })
     }
   })
 }

package/src/node.ts

@@ -6,7 +6,7 @@ import {
   patchOptimizeDeps,
   registerMdPlugins,
 } from './utils/node/mdPlugins'
-import { getArticles, patchVPThemeConfig } from './utils/node/theme'
+import { checkConfig, getArticles, patchVPThemeConfig } from './utils/node/theme'
 import { getVitePlugins, registerVitePlugins } from './utils/node/vitePlugins'
 
 /**
@@ -14,6 +14,9 @@ import { getVitePlugins, registerVitePlugins } from './utils/node/vitePlugins'
  * @param cfg 主题配置
  */
 export function getThemeConfig(cfg?: Partial<Theme.BlogConfig>) {
+  // 配置校验
+  checkConfig(cfg)
+
   // 文章数据
   const pagesData = getArticles(cfg)
   const extraVPConfig: any = {}

package/src/utils/node/theme.ts

@@ -137,3 +137,7 @@ export function patchVPThemeConfig(
 
   return vpThemeConfig
 }
+
+export function checkConfig(cfg?: Partial<Theme.BlogConfig>) {
+  // TODO：保留
+}