@hlw-uni/mp-vue 2.1.97 → 2.1.99

package/dist/index.js

@@ -1,6 +1,6 @@
 (function(global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("vue"), require("@dcloudio/uni-app"), require("pinia")) : typeof define === "function" && define.amd ? define(["exports", "vue", "@dcloudio/uni-app", "pinia"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.HlwUniVue = {}, global.vue, global.uniApp, global.pinia));
-})(this, function(exports2, vue, uniApp, pinia) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("vue"), require("pinia"), require("@dcloudio/uni-app")) : typeof define === "function" && define.amd ? define(["exports", "vue", "pinia", "@dcloudio/uni-app"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.HlwUniVue = {}, global.vue, global.pinia, global.uniApp));
+})(this, function(exports2, vue, pinia, uniApp) {
   "use strict";var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => {
@@ -98,31 +98,6 @@ var __publicField = (obj, key, value) => {
   function useTheme() {
     const store = useThemeStore();
     const theme = vue.computed(() => store.theme);
-    const updateNavbarColor = (targetTheme) => {
-      const isDarkTheme = ["mono-theme", "color-theme"].includes(targetTheme);
-      uni.setNavigationBarColor({
-        frontColor: isDarkTheme ? "#ffffff" : "#000000",
-        backgroundColor: isDarkTheme ? "#3b82f6" : "#ffffff",
-        fail: () => {
-        }
-      });
-    };
-    vue.watch(
-      theme,
-      (newTheme) => {
-        updateNavbarColor(newTheme);
-      }
-    );
-    vue.onMounted(() => {
-      updateNavbarColor(store.theme);
-    });
-    try {
-      uniApp.onShow(() => {
-        updateNavbarColor(store.theme);
-      });
-    } catch (e) {
-    }
-    updateNavbarColor(store.theme);
     const fontSize = vue.computed(() => store.fontSize);
     const fontSizeClass = vue.computed(() => {
       const found = fontSizePresets.find((p) => p.id === store.fontSize);

package/dist/index.mjs

@@ -4,9 +4,9 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-import { computed, watch, onMounted, ref, onBeforeUpdate, onUnmounted, createSSRApp } from "vue";
-import { onShow, onShareAppMessage, onShareTimeline } from "@dcloudio/uni-app";
+import { computed, ref, onBeforeUpdate, onUnmounted, createSSRApp } from "vue";
 import { defineStore } from "pinia";
+import { onShareAppMessage, onShareTimeline } from "@dcloudio/uni-app";
 const themePresets = [
   {
     id: "white-theme",
@@ -97,31 +97,6 @@ const useThemeStore = defineStore("theme", {
 function useTheme() {
   const store = useThemeStore();
   const theme = computed(() => store.theme);
-  const updateNavbarColor = (targetTheme) => {
-    const isDarkTheme = ["mono-theme", "color-theme"].includes(targetTheme);
-    uni.setNavigationBarColor({
-      frontColor: isDarkTheme ? "#ffffff" : "#000000",
-      backgroundColor: isDarkTheme ? "#3b82f6" : "#ffffff",
-      fail: () => {
-      }
-    });
-  };
-  watch(
-    theme,
-    (newTheme) => {
-      updateNavbarColor(newTheme);
-    }
-  );
-  onMounted(() => {
-    updateNavbarColor(store.theme);
-  });
-  try {
-    onShow(() => {
-      updateNavbarColor(store.theme);
-    });
-  } catch (e) {
-  }
-  updateNavbarColor(store.theme);
   const fontSize = computed(() => store.fontSize);
   const fontSizeClass = computed(() => {
     const found = fontSizePresets.find((p) => p.id === store.fontSize);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hlw-uni/mp-vue",
-    "version": "2.1.97",
+    "version": "2.1.99",
     "description": "hlw-uni 小程序运行时 — Vue 组件 + composables + theme + http + 工具集（合并自原 mp-core）",
     "main": "dist/index.js",
     "module": "dist/index.mjs",

package/src/components/hlw-nav-bar/index.vue

@@ -23,7 +23,7 @@
  * @props
  *   title   - 导航栏标题文字
  *   isBack  - 是否显示返回按钮，默认 false；点击自动回退或回到首页
- *   isBar   - 是否占用状态栏高度，默认 false
+ *   isBar   - 是否占用状态栏高度，默认 true
  *
  * @example
  * ```vue
@@ -41,7 +41,7 @@ const menuButtonInfo = uni.getMenuButtonBoundingClientRect();
 const props = defineProps({
     isBar: {
         type: Boolean,
-        default: false,
+        default: true,
     },
     title: {
         type: String,

package/src/components/hlw-page/index.vue

@@ -1,7 +1,8 @@
 <template>
     <view :class="[theme, fontSizeClass, fontFamilyClass]">
-        <hlw-nav-bar v-if="props.isBar" :is-back="props.isBack" :title="title" :is-bar="props.isBar"></hlw-nav-bar>
+        <hlw-nav-bar v-if="props.isNav" :is-back="props.isBack" :title="title" :is-bar="props.isBar"></hlw-nav-bar>
         <slot></slot>
+        <view class="h-[50rpx]"></view>
     </view>
 </template>
 
@@ -13,13 +14,14 @@
  * 可以快捷集成自定义导航栏（HlwNavBar），保持整个页面结构的一致性。
  *
  * @props
- *   isBar  - 是否显示并使用自定义导航栏，默认 false
- *   title  - 自定义导航栏标题文字（在 isBar 为 true 时生效）
- *   isBack - 是否显示自定义导航栏的返回键（在 isBar 为 true 时生效），默认 false
+ *   isNav  - 是否显示自定义导航栏，默认 false
+ *   isBar  - 是否占用状态栏高度，默认 true
+ *   title  - 自定义导航栏标题文字
+ *   isBack - 是否显示自定义导航栏的返回键，默认 false
  *
  * @example
  * ```vue
- * <hlw-page is-bar is-back title="个人中心">
+ * <hlw-page is-nav is-back title="个人中心">
  *     <view>页面内容...</view>
  * </hlw-page>
  * ```
@@ -30,10 +32,14 @@ import { ref } from "vue";
 const { theme, fontSizeClass, fontFamilyClass } = useTheme();
 
 const props = defineProps({
-    isBar: {
+    isNav: {
         type: Boolean,
         default: false,
     },
+    isBar: {
+        type: Boolean,
+        default: true,
+    },
     title: {
         type: String,
         default: "",
@@ -95,46 +101,46 @@ const title = ref(props.title);
         Roboto,
         Helvetica,
         Arial,
-        sans-serif !important;
+        sans-serif;
     view,
     text,
     button,
     input,
     textarea {
-        font-family: inherit !important;
+        font-family: inherit;
     }
 }
 
 .font-family-sans {
-    font-family: "PingFang SC", "Helvetica Neue", "Microsoft YaHei", sans-serif !important;
+    font-family: "PingFang SC", "Helvetica Neue", "Microsoft YaHei", sans-serif;
     view,
     text,
     button,
     input,
     textarea {
-        font-family: inherit !important;
+        font-family: inherit;
     }
 }
 
 .font-family-serif {
-    font-family: "Songti SC", "STSong", "SimSun", "Georgia", serif !important;
+    font-family: "Songti SC", "STSong", "SimSun", "Georgia", serif;
     view,
     text,
     button,
     input,
     textarea {
-        font-family: inherit !important;
+        font-family: inherit;
     }
 }
 
 .font-family-kaiti {
-    font-family: "Kaiti SC", "STKaiti", "KaiTi", "SimKai", serif !important;
+    font-family: "Kaiti SC", "STKaiti", "KaiTi", "SimKai", serif;
     view,
     text,
     button,
     input,
     textarea {
-        font-family: inherit !important;
+        font-family: inherit;
     }
 }
 </style>

package/src/core/theme/index.ts

@@ -1,6 +1,5 @@
-import { computed, watch, onMounted } from "vue";
+import { computed } from "vue";
 import type { ComputedRef } from "vue";
-import { onShow } from "@dcloudio/uni-app";
 import { 
     useThemeStore, 
     themePresets, 
@@ -28,41 +27,6 @@ export function useTheme() {
     
     // 主题
     const theme: ComputedRef<string> = computed(() => store.theme);
-
-    // 辅助方法：设置系统状态栏/导航栏前景色（mono-theme 和 color-theme 设为白色，其余为黑色）
-    const updateNavbarColor = (targetTheme: string) => {
-        const isDarkTheme = ["mono-theme", "color-theme"].includes(targetTheme);
-        uni.setNavigationBarColor({
-            frontColor: isDarkTheme ? "#ffffff" : "#000000",
-            backgroundColor: isDarkTheme ? "#3b82f6" : "#ffffff",
-            fail: () => {}
-        });
-    };
-
-    // 1. 监控主题属性改变时，动态刷新
-    watch(
-        theme,
-        (newTheme) => {
-            updateNavbarColor(newTheme);
-        }
-    );
-
-    // 2. 组件/页面挂载完成时，执行一次设定
-    onMounted(() => {
-        updateNavbarColor(store.theme);
-    });
-
-    // 3. 页面显示或回退时，强行重刷前景色（try-catch 规避非 Page 的报错）
-    try {
-        onShow(() => {
-            updateNavbarColor(store.theme);
-        });
-    } catch (e) {
-        // 忽略非 Page 组件的绑定失败
-    }
-
-    // 4. 在 setup 初始化同步阶段以最快速度设定一次，尽可能规避生命周期滞后导致的闪烁
-    updateNavbarColor(store.theme);
     
     // 字体大小
     const fontSize: ComputedRef<string> = computed(() => store.fontSize);