合并分支 '3.x' 到 'dev'

3.x

查看合并请求 !56

package.json

@@ -82,8 +82,8 @@
         "@dcloudio/uni-ui": "^1.4.28",
         "@faker-js/faker": "^8.0.2",
         "@vue/runtime-core": "~3.2.47",
-        "@vueuse/core": "^10.3.0",
-        "axios": "^1.4.0",
+        "@vueuse/core": "^10.4.1",
+        "axios": "^1.5.0",
         "crypto-js": "^4.1.1",
         "dayjs": "^1.11.9",
         "lodash-es": "^4.17.21",
@@ -98,7 +98,7 @@
         "vue-types": "^5.1.1"
     },
     "devDependencies": {
-        "@antfu/eslint-config": "^0.40.2",
+        "@antfu/eslint-config": "^0.41.0",
         "@commitlint/cli": "^17.7.1",
         "@commitlint/config-conventional": "^17.7.0",
         "@dcloudio/types": "^3.3.3",
@@ -107,23 +107,23 @@
         "@dcloudio/uni-helper-json": "^1.0.13",
         "@dcloudio/uni-stacktracey": "3.0.0-3081220230817001",
         "@dcloudio/vite-plugin-uni": "3.0.0-3081220230817001",
-        "@iconify/json": "^2.2.102",
+        "@iconify/json": "^2.2.108",
         "@types/crypto-js": "^4.1.1",
-        "@types/lodash-es": "^4.17.8",
-        "@types/node": "^20.5.0",
-        "@types/qs": "^6.9.7",
+        "@types/lodash-es": "^4.17.9",
+        "@types/node": "^20.5.7",
+        "@types/qs": "^6.9.8",
         "@types/stompjs": "^2.3.5",
-        "@types/urijs": "^1.19.19",
-        "@typescript-eslint/eslint-plugin": "^6.4.0",
-        "@typescript-eslint/parser": "^6.4.0",
+        "@types/urijs": "^1.19.20",
+        "@typescript-eslint/eslint-plugin": "^6.5.0",
+        "@typescript-eslint/parser": "^6.5.0",
         "commitizen": "^4.3.0",
-        "conventional-changelog-cli": "^3.0.0",
+        "conventional-changelog-cli": "^4.0.0",
         "cz-conventional-changelog": "^3.3.0",
         "cz-customizable": "^7.0.0",
         "cz-git": "^1.7.1",
         "czg": "^1.7.1",
         "dotenv": "^16.3.1",
-        "eslint": "^8.47.0",
+        "eslint": "^8.48.0",
         "eslint-config-prettier": "^9.0.0",
         "eslint-plugin-prettier": "^5.0.0",
         "eslint-plugin-vue": "^9.17.0",
@@ -131,27 +131,27 @@
         "jest": "27.0.4",
         "jest-environment-node": "27.5.1",
         "less": "^4.2.0",
-        "lint-staged": "^14.0.0",
+        "lint-staged": "^14.0.1",
         "npm-run-all": "^4.1.5",
         "picocolors": "^1.0.0",
         "pont-engine": "^1.5.12",
-        "postcss": "^8.4.28",
+        "postcss": "^8.4.29",
         "postcss-html": "^1.5.0",
         "postcss-less": "^6.0.0",
-        "prettier": "^3.0.2",
+        "prettier": "^3.0.3",
         "rimraf": "^5.0.1",
-        "sass": "^1.65.1",
+        "sass": "^1.66.1",
         "sort-package-json": "^2.5.1",
-        "stylelint": "^15.10.2",
+        "stylelint": "^15.10.3",
         "stylelint-config-html": "^1.1.0",
         "stylelint-config-recommended": "^13.0.0",
         "stylelint-config-standard": "^34.0.0",
         "stylelint-order": "^6.0.3",
         "typescript": "~5.1.6",
-        "unocss": "^0.54.3",
-        "unocss-preset-weapp": "^0.54.0",
+        "unocss": "^0.55.3",
+        "unocss-preset-weapp": "^0.55.2",
         "unplugin-auto-import": "^0.16.6",
-        "unplugin-vue-components": "^0.25.1",
+        "unplugin-vue-components": "^0.25.2",
         "vite": "^4.4.9",
         "vue-eslint-parser": "^9.3.1"
     },

src/App.vue

@@ -47,11 +47,4 @@
 
     // 全局样式
     @import url('./common/public.less');
-
-    /** #ifdef H5 */
-    uni-page-body,
-    page {
-        height: 100%;
-    }
-    /** #endif */
 </style>

src/common/fui-app.css

@@ -4,7 +4,8 @@ page {
     font-size: 32rpx;
     font-weight: 500;
     color: var(--fui-color-title, #181818);
-    font-family: -apple-system-font, 'Helvetica Neue', Helvetica, sans-serif;
+    font-family: -apple-system-font, BlinkMacSystemFont, 'Droid Sans', 'Noto Sans', 'PingFang SC', 'Heiti SC',
+        'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', SimSun, sans-serif;
 }
 /* #endif */
 

src/common/message.ts

@@ -68,7 +68,7 @@ export const Message = {
             // #ifdef APP-PLUS
             plus.nativeUI.confirm(content, ({ index }) => resolve(index === 0), {
                 title,
-                buttons: ['确认', '取消'],
+                buttons: [confirmText, '取消'],
                 verticalAlign: 'center',
             })
             // #endif

src/pages.json

@@ -8,13 +8,20 @@
             }
         },
 
+        // === Webview ===
+        {
+            "path": "pages/common/webview/index",
+            "style": {
+                "titleNView": true,
+                "navigationBarTitleText": ""
+            }
+        },
         // === PDF 文件预览 ===
         {
             "path": "pages/common/viewer/pdf",
             "style": {
                 "titleNView": true,
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
+                "navigationBarTitleText": ""
             }
         },
         // === 空页面（开发中...） ===
@@ -64,7 +71,14 @@
         "navigationBarTextStyle": "black",
         "navigationBarTitleText": "uni-app",
         "navigationBarBackgroundColor": "#F8F8F8",
-        "backgroundColor": "#F8F8F8"
+        "backgroundColor": "#F8F8F8",
+        "pageOrientation": "portrait",
+        "app-plus": {
+            "scrollIndicator": "none",
+            "titleNView": {
+                "titleSize": "20"
+            }
+        }
     },
     "resizable": true
 }

src/pages/common/webview/index.vue

+<script lang="ts" setup>
+    const page = reactive({
+        title: '',
+        link: '',
+        styles: {
+            progress: {
+                color: '#42c02e',
+                height: '1%',
+            },
+        },
+    })
+
+    onLoad(({ title, link }) => {
+        page.title = title ? decodeURI(title) : ''
+        page.link = decodeURIComponent(link)
+
+        if (!link) {
+            Message.toast('页面打开失败，参数错误')
+            uni.navigateBack()
+            return
+        }
+
+        // 设置标题栏为文件名
+        if (page.title && page.title !== 'undefined') {
+            uni.setNavigationBarTitle({
+                title: page.title,
+            })
+        }
+    })
+</script>
+
+<template>
+    <view class="wrap" v-if="page.link">
+        <web-view :src="page.link" :update-title="!page.title" :webview-styles="page.styles" />
+    </view>
+</template>

types/auto-imports.d.ts

@@ -91,5 +91,5 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, InjectionKey, PropType, Ref, VNode } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
 }