@sugarat/theme 0.2.26 → 0.2.28

package/node.d.ts

@@ -412,11 +412,24 @@ declare namespace Theme {
         liClass?: string;
     }
     type RSSOptions = RSSPluginOptions;
+    interface FooterItem {
+        text: string;
+        link?: string;
+        icon?: boolean | string;
+    }
     interface Footer {
         /**
-         * 自定义补充信息（支持配置为HTML）
+         * 自定义补充信息（支持配置为HTML），在内置的 footer 上方
          */
         message?: string | string[];
+        /**
+         * 自定义补充信息（支持配置为HTML），在内置的 footer 下方
+         */
+        bottomMessage?: string | string[];
+        /**
+         * 自定义补充信息（支持配置为HTML），紧随内置的后方
+         */
+        list?: string | string[] | FooterItem | FooterItem[];
         /**
          * 是否展示主题版本信息
          */
@@ -468,4 +481,6 @@ declare function getThemeConfig(cfg?: Partial<Theme.BlogConfig>): any;
  */
 declare function defineConfig(config: UserConfig<Theme.Config>): any;
 
-export { defineConfig, getThemeConfig };
+declare function footerHTML(footerData: Theme.FooterItem | Theme.FooterItem[]): string;
+
+export { defineConfig, footerHTML, getThemeConfig };

package/node.js

@@ -31,6 +31,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var node_exports = {};
 __export(node_exports, {
   defineConfig: () => defineConfig,
+  footerHTML: () => footerHTML,
   getThemeConfig: () => getThemeConfig,
   tabsMarkdownPlugin: () => tabsPlugin
 });
@@ -39,7 +40,7 @@ module.exports = __toCommonJS(node_exports);
 // src/utils/node/mdPlugins.ts
 var import_module = require("module");
 
-// ../../node_modules/.pnpm/vitepress-plugin-tabs@0.2.0_vitepress@1.0.0-rc.45_vue@3.4.21/node_modules/vitepress-plugin-tabs/dist/index.js
+// ../../node_modules/.pnpm/vitepress-plugin-tabs@0.2.0_vitepress@1.0.1_vue@3.4.21/node_modules/vitepress-plugin-tabs/dist/index.js
 var tabsMarker = "=tabs";
 var tabsMarkerLen = tabsMarker.length;
 var ruleBlockTabs = (state, startLine, endLine, silent) => {
@@ -456,6 +457,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 +565,7 @@ function coverImgTransform() {
 
 // src/node.ts
 function getThemeConfig(cfg) {
+  checkConfig(cfg);
   const pagesData = getArticles(cfg);
   const extraVPConfig = {};
   const vitePlugins = getVitePlugins(cfg);
@@ -585,9 +589,20 @@ function getThemeConfig(cfg) {
 function defineConfig(config) {
   return config;
 }
+function footerHTML(footerData) {
+  const data = [footerData || []].flat();
+  return data.map((d) => {
+    const { icon, text, link } = d;
+    return `<span class="footer-item">
+    ${icon ? `<i>${icon}</i>` : ""}
+    ${link ? `<a href="${link}" target="_blank" rel="noopener noreferrer">${text}</a>` : `<span>${text}</span>`}
+</span>`;
+  }).join("");
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   defineConfig,
+  footerHTML,
   getThemeConfig,
   tabsMarkdownPlugin
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sugarat/theme",
-  "version": "0.2.26",
+  "version": "0.2.28",
   "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.13.0",
     "swiper": "^11.0.5",
     "vitepress-markdown-timeline": "^1.2.1",
     "vitepress-plugin-mermaid": "2.0.13",
@@ -57,7 +57,7 @@
     "pagefind": "1.0.3",
     "sass": "^1.56.1",
     "typescript": "^4.8.2",
-    "vitepress": "1.0.0-rc.45",
+    "vitepress": "1.0.1",
     "vue": "^3.4.21"
   },
   "scripts": {

package/src/components/BlogFooter.vue

@@ -3,6 +3,7 @@ import { computed } from 'vue'
 import { useHomeFooterConfig } from '../composables/config/blog'
 import packageJSON from '../../package.json'
 import { copyrightSVG, icpSVG, themeSVG } from '../constants/svg'
+import { vOuterHtml } from '../directives'
 
 const footerData = useHomeFooterConfig()
 
@@ -12,14 +13,15 @@ const renderData = computed(() => {
   }
   const flatData = [footerData].flat()
   return flatData.flat().map((footer, idx) => {
-    const { icpRecord, securityRecord, copyright, version, message } = footer
-    const data: {
+    const { icpRecord, securityRecord, copyright, version, message, bottomMessage, list } = footer
+    const data: ({
       name: string
       link?: string
       icon?: string | boolean
-    }[] = []
+    } | string) [] = []
     // message
-    const messageData: string[] = [message || []].flat()
+    const messageData = [message || []].flat()
+    const bottomMessageData = [bottomMessage || []].flat()
 
     // version
     const isLast = idx === flatData.length - 1
@@ -58,9 +60,23 @@ const renderData = computed(() => {
         ...securityRecord
       })
     }
+    if (list) {
+      const listData = [list || []].flat()
+      data.push(...listData.map((v) => {
+        if (typeof v === 'string') {
+          return v
+        }
+        return {
+          name: v.text,
+          icon: v.icon,
+          link: v.link
+        }
+      }))
+    }
     return {
       data,
-      messageData
+      messageData,
+      bottomMessageData
     }
   })
 })
@@ -70,20 +86,27 @@ const renderData = computed(() => {
   <footer v-if="renderData.length" class="blog-footer">
     <!-- eslint-disable vue/require-v-for-key -->
     <!-- see https://cn.vuejs.org/guide/essentials/list.html#v-for-on-template -->
-    <template v-for="({ data, messageData }) in renderData">
+    <template v-for="({ data, messageData, bottomMessageData }) in renderData">
+      <!-- 在内置footer上方渲染 -->
       <p v-for="message in messageData" v-html="message" />
+      <!-- 内置的列表 -->
       <p class="footer-item-list">
-        <span v-for="item in data" class="footer-item">
-          <i v-if="item.icon === 'security'">
-            <img src="./../styles/gongan.png" alt="公网安备">
-          </i>
-          <i v-else-if="item.icon" v-html="item.icon" />
-          <a v-if="item.link" :href="item.link" target="_blank" rel="noopener noreferrer">
-            {{ item.name }}
-          </a>
-          <span v-else>{{ item.name }}</span>
-        </span>
+        <template v-for="item in data">
+          <span v-if="typeof item !== 'string'" class="footer-item">
+            <i v-if="item.icon === 'security'">
+              <img src="./../styles/gongan.png" alt="公网安备">
+            </i>
+            <i v-else-if="item.icon" v-html="item.icon" />
+            <a v-if="item.link" :href="item.link" target="_blank" rel="noopener noreferrer">
+              {{ item.name }}
+            </a>
+            <span v-else>{{ item.name }}</span>
+          </span>
+          <span v-else v-outer-html="item" />
+        </template>
       </p>
+      <!-- 在内置的footer下方渲染 -->
+      <p v-for="message in bottomMessageData" v-html="message" />
     </template>
   </footer>
 </template>
@@ -124,6 +147,7 @@ footer.blog-footer {
 
   i {
     margin-right: 4px;
+    font-style: normal;
   }
 
   i :deep(svg) {

package/src/composables/config/index.ts

@@ -450,11 +450,25 @@ export namespace Theme {
 
   export type RSSOptions = RSSPluginOptions
 
+  export interface FooterItem {
+    text: string
+    link?: string
+    icon?: boolean | string
+  }
+
   export interface Footer {
     /**
-     * 自定义补充信息（支持配置为HTML）
+     * 自定义补充信息（支持配置为HTML），在内置的 footer 上方
      */
     message?: string | string[]
+    /**
+     * 自定义补充信息（支持配置为HTML），在内置的 footer 下方
+     */
+    bottomMessage?: string | string[]
+    /**
+     * 自定义补充信息（支持配置为HTML），紧随内置的后方
+     */
+    list?: string | string[] | FooterItem | FooterItem[]
     /**
      * 是否展示主题版本信息
      */

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 = {}
@@ -53,3 +56,15 @@ export function defineConfig(config: UserConfig<Theme.Config>): any {
 
 // 重新导包 tabsMarkdownPlugin 导出CJS格式支持
 export { tabsMarkdownPlugin } from 'vitepress-plugin-tabs'
+
+export function footerHTML(footerData: Theme.FooterItem | Theme.FooterItem[]) {
+  const data = [footerData || []].flat()
+  return data.map((d) => {
+    const { icon, text, link } = d
+
+    return `<span class="footer-item">
+    ${icon ? `<i>${icon}</i>` : ''}
+    ${link ? `<a href="${link}" target="_blank" rel="noopener noreferrer">${text}</a>` : `<span>${text}</span>`}
+</span>`
+  }).join('')
+}

package/src/utils/node/theme.ts

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