From 5eed4944013bb7bc3ae0efd2147429e5809b24c3 Mon Sep 17 00:00:00 2001 From: Hooray <304327508@qq.com> Date: Mon, 24 Mar 2025 18:29:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=86=E8=A7=92=E7=B3=BB?= =?UTF-8?q?=E6=95=B0=E7=B1=BB=E5=9E=8B=E4=B8=BA=20`number`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- pnpm-lock.yaml | 17 +++++++++------ src/layouts/components/AppSetting/index.vue | 23 +++++++++------------ src/types/global.d.ts | 4 ++-- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 4e1bf264..7a6ce58a 100755 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "print-js": "^1.6.0", "qrcode": "^1.5.4", "qs": "^6.14.0", - "reka-ui": "^2.0.2", + "reka-ui": "^2.1.1", "scule": "^1.3.0", "splitpanes": "^3.2.0", "swiper": "^11.2.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0c461285..81397657 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -114,8 +114,8 @@ importers: specifier: ^6.14.0 version: 6.14.0 reka-ui: - specifier: ^2.0.2 - version: 2.0.2(typescript@5.8.2)(vue@3.5.13(typescript@5.8.2)) + specifier: ^2.1.1 + version: 2.1.1(typescript@5.8.2)(vue@3.5.13(typescript@5.8.2)) scule: specifier: ^1.3.0 version: 1.3.0 @@ -5358,6 +5358,9 @@ packages: ohash@1.1.6: resolution: {integrity: sha512-TBu7PtV8YkAZn0tSxobKY2n2aAQva936lhRrj6957aDaCf9IEtqsKbgMzXE/F/sjqYOwmrukeORHNLe5glk7Cg==} + ohash@2.0.11: + resolution: {integrity: sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==} + once@1.4.0: resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} @@ -5864,8 +5867,8 @@ packages: rehype-stringify@9.0.4: resolution: {integrity: sha512-Uk5xu1YKdqobe5XpSskwPvo1XeHUUucWEQSl8hTrXt5selvca1e8K1EZ37E6YoZ4BT8BCqCdVfQW7OfHfthtVQ==} - reka-ui@2.0.2: - resolution: {integrity: sha512-pC2UF6Z+kJF96aJvIErhkSO4DJYIeq9pgvh3pntNqcZb3zFGMzw8h2uny+GnLX2CKiQV54kZNYXxecYIiPMGyg==} + reka-ui@2.1.1: + resolution: {integrity: sha512-awvpQ041LPXAvf2uRVFwedsyz9SwsuoWlRql1fg4XimUCxEI2GOfHo6FIdL44dSPb/eG/gWbdGhoGHLlbX5gPA==} peerDependencies: vue: '>= 3.2.0' @@ -13357,6 +13360,8 @@ snapshots: ohash@1.1.6: {} + ohash@2.0.11: {} + once@1.4.0: dependencies: wrappy: 1.0.2 @@ -13921,7 +13926,7 @@ snapshots: hast-util-to-html: 8.0.4 unified: 10.1.2 - reka-ui@2.0.2(typescript@5.8.2)(vue@3.5.13(typescript@5.8.2)): + reka-ui@2.1.1(typescript@5.8.2)(vue@3.5.13(typescript@5.8.2)): dependencies: '@floating-ui/dom': 1.6.13 '@floating-ui/vue': 1.1.6(vue@3.5.13(typescript@5.8.2)) @@ -13932,7 +13937,7 @@ snapshots: '@vueuse/shared': 12.8.2(typescript@5.8.2) aria-hidden: 1.2.4 defu: 6.1.4 - ohash: 1.1.6 + ohash: 2.0.11 vue: 3.5.13(typescript@5.8.2) transitivePeerDependencies: - '@vue/composition-api' diff --git a/src/layouts/components/AppSetting/index.vue b/src/layouts/components/AppSetting/index.vue index 7708d1ab..ce16acf4 100755 --- a/src/layouts/components/AppSetting/index.vue +++ b/src/layouts/components/AppSetting/index.vue @@ -18,6 +18,15 @@ const menuStore = useMenuStore() const isShow = ref(false) +const appRadius = computed({ + get() { + return [settingsStore.settings.app.radius] + }, + set(value) { + settingsStore.settings.app.radius = value[0] + }, +}) + watch(() => settingsStore.settings.menu.mode, (value) => { if (value === 'single') { menuStore.setActived(0) @@ -70,19 +79,7 @@ function handleCopy() {
圆角系数
-
- - {{ item.label }} - -
+
diff --git a/src/types/global.d.ts b/src/types/global.d.ts index d5b1dfc1..aa7ed714 100755 --- a/src/types/global.d.ts +++ b/src/types/global.d.ts @@ -19,9 +19,9 @@ declare namespace Settings { /** * 圆角系数 * @默认值 `0.5` - * @可选值 `0` / `0.25` / `0.5` / `0.75` / `1` + * @可选值 `0到1区间的任意值` */ - radius?: 0 | 0.25 | 0.5 | 0.75 | 1 + radius?: number /** * 是否开启哀悼模式 * @默认值 `false`