wui-components-v2 1.1.69 → 1.1.71

package/store/manualThemeStore.ts

@@ -1,143 +1,143 @@
-import { defineStore } from 'pinia'
-import type { LocaleOption, ThemeColorOption, ThemeMode, ThemeState } from '../composables/types/theme'
-import { LocaleOptions, themeColorOptions } from '../composables/types/theme'
-/**
- * 完整版主题状态管理
- * 支持手动切换主题、主题色选择、跟随系统主题等完整功能
- */
-export const useManualThemeStore = defineStore('manualTheme', {
-  state: (): ThemeState => ({
-    theme: 'light',
-    followSystem: true, // 是否跟随系统主题
-    hasUserSet: false, // 用户是否手动设置过主题
-    currentThemeColor: themeColorOptions[0],
-    Locale: LocaleOptions[0],
-    themeVars: {
-      darkBackground: '#1B1B1E',
-      darkBackground2: '#141414',
-      darkBackground3: '#1c1c1c',
-      darkBackground4: '#262626',
-      darkBackground5: '#333333',
-      darkBackground6: '#4a4a4a',
-      darkBackground7: '#606060',
-      darkColor: '#ffffff',
-      darkColor2: '#e8e8e8',
-      darkColor3: '#999999',
-      colorTheme: themeColorOptions[0].primary,
-      colorPrimary: themeColorOptions[0].primary, // 添加主色调变量，用于 tabbar 等组件
-    },
-  }),
-
-  getters: {
-    isDark: state => state.theme === 'dark',
-  },
-
-  actions: {
-    /**
-     * 手动切换主题
-     * @param mode 指定主题模式，不传则自动切换
-     */
-    toggleTheme(mode?: ThemeMode) {
-      this.theme = mode || (this.theme === 'light' ? 'dark' : 'light')
-      this.hasUserSet = true // 标记用户已手动设置
-      this.followSystem = false // 不再跟随系统
-      this.setNavigationBarColor()
-    },
-
-    /**
-     * 设置是否跟随系统主题
-     * @param follow 是否跟随系统
-     */
-    setFollowSystem(follow: boolean) {
-      this.followSystem = follow
-      if (follow) {
-        this.hasUserSet = false
-        this.initTheme() // 重新获取系统主题
-      }
-    },
-
-    /**
-     * 设置导航栏颜色
-     */
-    setNavigationBarColor() {
-      uni.setNavigationBarColor({
-        frontColor: this.theme === 'light' ? '#ffffff' : '#ffffff',
-        backgroundColor: this.theme === 'light' ? this.themeVars.colorTheme : '#000000',
-      })
-    },
-
-    /**
-     * 设置主题色
-     * @param color 主题色选项
-     */
-    setCurrentThemeColor(color: ThemeColorOption) {
-      this.currentThemeColor = color
-      this.themeVars.colorTheme = color.primary
-      this.themeVars.colorPrimary = color.primary // 同步更新主色调变量
-    },
-
-    /**
-     * 设置语言
-     */
-    setLocale(locale: LocaleOption) {
-      this.Locale = locale
-    },
-    /**
-     * 获取系统主题
-     * @returns 系统主题模式
-     */
-    getSystemTheme(): ThemeMode {
-      try {
-        // #ifdef MP-WEIXIN
-        // 微信小程序使用 getAppBaseInfo
-        const appBaseInfo = uni.getAppBaseInfo()
-        if (appBaseInfo && appBaseInfo.theme) {
-          return appBaseInfo.theme as ThemeMode
-        }
-        // #endif
-
-        // #ifndef MP-WEIXIN
-        // 其他平台使用 getSystemInfoSync
-        const systemInfo = uni.getSystemInfoSync()
-        if (systemInfo && systemInfo.theme) {
-          return systemInfo.theme as ThemeMode
-        }
-        // #endif
-      }
-      catch (error) {
-        console.warn('获取系统主题失败:', error)
-      }
-      return 'light' // 默认返回 light
-    },
-
-    /**
-     * 初始化主题
-     */
-    initTheme() {
-      // 如果用户已手动设置且不跟随系统，保持当前主题
-      if (this.hasUserSet && !this.followSystem) {
-        console.log('使用用户设置的主题:', this.theme)
-        this.setNavigationBarColor()
-        return
-      }
-
-      // 获取系统主题
-      const systemTheme = this.getSystemTheme()
-
-      // 如果是首次启动或跟随系统，使用系统主题
-      if (!this.hasUserSet || this.followSystem) {
-        this.theme = systemTheme
-        if (!this.hasUserSet) {
-          this.followSystem = true
-          // console.log('首次启动，使用系统主题:', this.theme)
-        }
-        else {
-          console.log('跟随系统主题:', this.theme)
-        }
-      }
-
-      this.setNavigationBarColor()
-    },
-
-  },
-})
+import { defineStore } from 'pinia'
+import type { LocaleOption, ThemeColorOption, ThemeMode, ThemeState } from '../composables/types/theme'
+import { LocaleOptions, themeColorOptions } from '../composables/types/theme'
+/**
+ * 完整版主题状态管理
+ * 支持手动切换主题、主题色选择、跟随系统主题等完整功能
+ */
+export const useManualThemeStore = defineStore('manualTheme', {
+  state: (): ThemeState => ({
+    theme: 'light',
+    followSystem: true, // 是否跟随系统主题
+    hasUserSet: false, // 用户是否手动设置过主题
+    currentThemeColor: themeColorOptions[0],
+    Locale: LocaleOptions[0],
+    themeVars: {
+      darkBackground: '#1B1B1E',
+      darkBackground2: '#141414',
+      darkBackground3: '#1c1c1c',
+      darkBackground4: '#262626',
+      darkBackground5: '#333333',
+      darkBackground6: '#4a4a4a',
+      darkBackground7: '#606060',
+      darkColor: '#ffffff',
+      darkColor2: '#e8e8e8',
+      darkColor3: '#999999',
+      colorTheme: themeColorOptions[0].primary,
+      colorPrimary: themeColorOptions[0].primary, // 添加主色调变量，用于 tabbar 等组件
+    },
+  }),
+
+  getters: {
+    isDark: state => state.theme === 'dark',
+  },
+
+  actions: {
+    /**
+     * 手动切换主题
+     * @param mode 指定主题模式，不传则自动切换
+     */
+    toggleTheme(mode?: ThemeMode) {
+      this.theme = mode || (this.theme === 'light' ? 'dark' : 'light')
+      this.hasUserSet = true // 标记用户已手动设置
+      this.followSystem = false // 不再跟随系统
+      this.setNavigationBarColor()
+    },
+
+    /**
+     * 设置是否跟随系统主题
+     * @param follow 是否跟随系统
+     */
+    setFollowSystem(follow: boolean) {
+      this.followSystem = follow
+      if (follow) {
+        this.hasUserSet = false
+        this.initTheme() // 重新获取系统主题
+      }
+    },
+
+    /**
+     * 设置导航栏颜色
+     */
+    setNavigationBarColor() {
+      uni.setNavigationBarColor({
+        frontColor: this.theme === 'light' ? '#ffffff' : '#ffffff',
+        backgroundColor: this.theme === 'light' ? this.themeVars.colorTheme : '#000000',
+      })
+    },
+
+    /**
+     * 设置主题色
+     * @param color 主题色选项
+     */
+    setCurrentThemeColor(color: ThemeColorOption) {
+      this.currentThemeColor = color
+      this.themeVars.colorTheme = color.primary
+      this.themeVars.colorPrimary = color.primary // 同步更新主色调变量
+    },
+
+    /**
+     * 设置语言
+     */
+    setLocale(locale: LocaleOption) {
+      this.Locale = locale
+    },
+    /**
+     * 获取系统主题
+     * @returns 系统主题模式
+     */
+    getSystemTheme(): ThemeMode {
+      try {
+        // #ifdef MP-WEIXIN
+        // 微信小程序使用 getAppBaseInfo
+        const appBaseInfo = uni.getAppBaseInfo()
+        if (appBaseInfo && appBaseInfo.theme) {
+          return appBaseInfo.theme as ThemeMode
+        }
+        // #endif
+
+        // #ifndef MP-WEIXIN
+        // 其他平台使用 getSystemInfoSync
+        const systemInfo = uni.getSystemInfoSync()
+        if (systemInfo && systemInfo.theme) {
+          return systemInfo.theme as ThemeMode
+        }
+        // #endif
+      }
+      catch (error) {
+        console.warn('获取系统主题失败:', error)
+      }
+      return 'light' // 默认返回 light
+    },
+
+    /**
+     * 初始化主题
+     */
+    initTheme() {
+      // 如果用户已手动设置且不跟随系统，保持当前主题
+      if (this.hasUserSet && !this.followSystem) {
+        console.log('使用用户设置的主题:', this.theme)
+        this.setNavigationBarColor()
+        return
+      }
+
+      // 获取系统主题
+      const systemTheme = this.getSystemTheme()
+
+      // 如果是首次启动或跟随系统，使用系统主题
+      if (!this.hasUserSet || this.followSystem) {
+        this.theme = systemTheme
+        if (!this.hasUserSet) {
+          this.followSystem = true
+          // console.log('首次启动，使用系统主题:', this.theme)
+        }
+        else {
+          console.log('跟随系统主题:', this.theme)
+        }
+      }
+
+      this.setNavigationBarColor()
+    },
+
+  },
+})

package/store/persist.ts

@@ -1,41 +1,41 @@
-/*
- * @Author: weisheng
- * @Date: 2025-06-23 22:23:05
- * @LastEditTime: 2025-06-24 19:03:21
- * @LastEditors: weisheng
- * @Description:
- * @FilePath: /wot-demo/src/store/persist.ts
- * 记得注释
- */
-import type { PiniaPluginContext } from 'pinia'
-import { CommonUtil } from '@wot-ui/ui'
-
-function persist({ store }: PiniaPluginContext, excludedIds: string[]) {
-  // 检查当前store的id是否在排除列表中
-  const isExcluded = excludedIds.includes(store.$id)
-
-  // 如果当前store的id在排除列表中，则不进行持久化
-  if (isExcluded) {
-    return
-  }
-
-  // 暂存State
-  let persistState = CommonUtil.deepClone(store.$state)
-  // 从缓存中读取
-  const storageState = uni.getStorageSync(store.$id)
-  if (storageState) {
-    persistState = storageState
-  }
-  store.$state = persistState
-  store.$subscribe(() => {
-    // 在存储变化的时候将store缓存
-    uni.setStorageSync(store.$id, CommonUtil.deepClone(store.$state))
-  })
-}
-
-export function persistPlugin(list: string[]) {
-  return (context: PiniaPluginContext) => {
-    // 调用persist函数，并传入排除列表
-    persist(context, list)
-  }
-}
+/*
+ * @Author: weisheng
+ * @Date: 2025-06-23 22:23:05
+ * @LastEditTime: 2025-06-24 19:03:21
+ * @LastEditors: weisheng
+ * @Description:
+ * @FilePath: /wot-demo/src/store/persist.ts
+ * 记得注释
+ */
+import type { PiniaPluginContext } from 'pinia'
+import { CommonUtil } from '@wot-ui/ui'
+
+function persist({ store }: PiniaPluginContext, excludedIds: string[]) {
+  // 检查当前store的id是否在排除列表中
+  const isExcluded = excludedIds.includes(store.$id)
+
+  // 如果当前store的id在排除列表中，则不进行持久化
+  if (isExcluded) {
+    return
+  }
+
+  // 暂存State
+  let persistState = CommonUtil.deepClone(store.$state)
+  // 从缓存中读取
+  const storageState = uni.getStorageSync(store.$id)
+  if (storageState) {
+    persistState = storageState
+  }
+  store.$state = persistState
+  store.$subscribe(() => {
+    // 在存储变化的时候将store缓存
+    uni.setStorageSync(store.$id, CommonUtil.deepClone(store.$state))
+  })
+}
+
+export function persistPlugin(list: string[]) {
+  return (context: PiniaPluginContext) => {
+    // 调用persist函数，并传入排除列表
+    persist(context, list)
+  }
+}

package/store/themeStore.ts

@@ -1,74 +1,74 @@
-import { defineStore } from 'pinia'
-import type { SystemThemeState, ThemeMode } from '../composables/types/theme'
-import { themeColorOptions } from '../composables/types/theme'
-
-/**
- * 简化版系统主题状态管理
- * 仅支持跟随系统主题，不提供手动切换功能
- * 导航栏颜色通过 theme.json 自动处理
- */
-export const useThemeStore = defineStore('theme', {
-  state: (): SystemThemeState => ({
-    theme: 'light',
-    themeVars: {
-      darkBackground: '#0f0f0f',
-      darkBackground2: '#1a1a1a',
-      darkBackground3: '#242424',
-      darkBackground4: '#2f2f2f',
-      darkBackground5: '#3d3d3d',
-      darkBackground6: '#4a4a4a',
-      darkBackground7: '#606060',
-      darkColor: '#ffffff',
-      darkColor2: '#e0e0e0',
-      darkColor3: '#a0a0a0',
-      colorTheme: themeColorOptions[0].primary,
-    },
-  }),
-
-  getters: {
-    isDark: state => state.theme === 'dark',
-  },
-
-  actions: {
-    /**
-     * 获取系统主题
-     * @returns 系统主题模式
-     */
-    getSystemTheme(): ThemeMode {
-      // #ifdef MP-WEIXIN
-      // 微信小程序使用 getAppBaseInfo
-      const appBaseInfo = uni.getAppBaseInfo()
-      if (appBaseInfo && appBaseInfo.theme) {
-        return appBaseInfo.theme as ThemeMode
-      }
-      // #endif
-
-      // #ifndef MP-WEIXIN
-      // 其他平台使用 getSystemInfoSync
-      const systemInfo = uni.getSystemInfoSync()
-      if (systemInfo && systemInfo.theme) {
-        return systemInfo.theme as ThemeMode
-      }
-      // #endif
-
-      return 'light' // 默认返回 light
-    },
-
-    /**
-     * 设置主题（仅内部使用）
-     * @param theme 主题模式
-     */
-    setTheme(theme: ThemeMode) {
-      this.theme = theme
-    },
-
-    /**
-     * 初始化系统主题
-     */
-    initSystemTheme() {
-      const systemTheme = this.getSystemTheme()
-      this.theme = systemTheme
-      console.log('初始化系统主题:', this.theme)
-    },
-  },
-})
+import { defineStore } from 'pinia'
+import type { SystemThemeState, ThemeMode } from '../composables/types/theme'
+import { themeColorOptions } from '../composables/types/theme'
+
+/**
+ * 简化版系统主题状态管理
+ * 仅支持跟随系统主题，不提供手动切换功能
+ * 导航栏颜色通过 theme.json 自动处理
+ */
+export const useThemeStore = defineStore('theme', {
+  state: (): SystemThemeState => ({
+    theme: 'light',
+    themeVars: {
+      darkBackground: '#0f0f0f',
+      darkBackground2: '#1a1a1a',
+      darkBackground3: '#242424',
+      darkBackground4: '#2f2f2f',
+      darkBackground5: '#3d3d3d',
+      darkBackground6: '#4a4a4a',
+      darkBackground7: '#606060',
+      darkColor: '#ffffff',
+      darkColor2: '#e0e0e0',
+      darkColor3: '#a0a0a0',
+      colorTheme: themeColorOptions[0].primary,
+    },
+  }),
+
+  getters: {
+    isDark: state => state.theme === 'dark',
+  },
+
+  actions: {
+    /**
+     * 获取系统主题
+     * @returns 系统主题模式
+     */
+    getSystemTheme(): ThemeMode {
+      // #ifdef MP-WEIXIN
+      // 微信小程序使用 getAppBaseInfo
+      const appBaseInfo = uni.getAppBaseInfo()
+      if (appBaseInfo && appBaseInfo.theme) {
+        return appBaseInfo.theme as ThemeMode
+      }
+      // #endif
+
+      // #ifndef MP-WEIXIN
+      // 其他平台使用 getSystemInfoSync
+      const systemInfo = uni.getSystemInfoSync()
+      if (systemInfo && systemInfo.theme) {
+        return systemInfo.theme as ThemeMode
+      }
+      // #endif
+
+      return 'light' // 默认返回 light
+    },
+
+    /**
+     * 设置主题（仅内部使用）
+     * @param theme 主题模式
+     */
+    setTheme(theme: ThemeMode) {
+      this.theme = theme
+    },
+
+    /**
+     * 初始化系统主题
+     */
+    initSystemTheme() {
+      const systemTheme = this.getSystemTheme()
+      this.theme = systemTheme
+      console.log('初始化系统主题:', this.theme)
+    },
+  },
+})

package/store/userStore.ts

@@ -1,22 +1,22 @@
-import { defineStore } from 'pinia'
-
-const useUserStore = defineStore('userInfo', {
-  state: () => ({
-    id: '',
-    name: '',
-    nickName: '',
-  }),
-  getters: {
-
-  },
-  actions: {
-    setUserInfo(userInfo: any) {
-      this.id = userInfo.id
-      this.name = userInfo.name
-      this.nickName = userInfo.nickName
-    },
-
-  },
-})
-
-export default useUserStore
+import { defineStore } from 'pinia'
+
+const useUserStore = defineStore('userInfo', {
+  state: () => ({
+    id: '',
+    name: '',
+    nickName: '',
+  }),
+  getters: {
+
+  },
+  actions: {
+    setUserInfo(userInfo: any) {
+      this.id = userInfo.id
+      this.name = userInfo.name
+      this.nickName = userInfo.nickName
+    },
+
+  },
+})
+
+export default useUserStore