From 119ead6186b93d47506a3c5d76de378eb8eb54da Mon Sep 17 00:00:00 2001 From: Aybrea Date: Fri, 20 Jun 2025 16:34:10 +0800 Subject: [PATCH 1/2] chore: format code --- package.json | 2 +- packages/varlet-cli/package.json | 2 +- packages/varlet-icons/package.json | 2 +- packages/varlet-import-resolver/package.json | 2 +- packages/varlet-preset-tailwindcss/package.json | 2 +- packages/varlet-preset-unocss/package.json | 2 +- packages/varlet-shared/package.json | 2 +- packages/varlet-touch-emulator/package.json | 2 +- packages/varlet-ui-playground/package.json | 2 +- packages/varlet-ui-playground/tsconfig.json | 2 +- packages/varlet-ui/package.json | 2 +- packages/varlet-use/package.json | 2 +- packages/varlet-vite-plugins/package.json | 2 +- packages/varlet-vscode-extension/package.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 85ae79d75a4..d24c35194d9 100644 --- a/package.json +++ b/package.json @@ -64,4 +64,4 @@ "tinyexec": "npm:tinyexec@^0.3.0" } } -} \ No newline at end of file +} diff --git a/packages/varlet-cli/package.json b/packages/varlet-cli/package.json index 3459568a6f6..4434765ecbe 100644 --- a/packages/varlet-cli/package.json +++ b/packages/varlet-cli/package.json @@ -94,4 +94,4 @@ "engines": { "node": "^14.18.0 || >=16.0.0" } -} \ No newline at end of file +} diff --git a/packages/varlet-icons/package.json b/packages/varlet-icons/package.json index b37ecae103f..2e9473514ba 100644 --- a/packages/varlet-icons/package.json +++ b/packages/varlet-icons/package.json @@ -29,4 +29,4 @@ "devDependencies": { "@varlet/cli": "workspace:*" } -} \ No newline at end of file +} diff --git a/packages/varlet-import-resolver/package.json b/packages/varlet-import-resolver/package.json index bb597584538..e6847101473 100644 --- a/packages/varlet-import-resolver/package.json +++ b/packages/varlet-import-resolver/package.json @@ -46,4 +46,4 @@ "tsup": "catalog:", "typescript": "catalog:" } -} \ No newline at end of file +} diff --git a/packages/varlet-preset-tailwindcss/package.json b/packages/varlet-preset-tailwindcss/package.json index 3d09b367e22..dd237bbcedf 100644 --- a/packages/varlet-preset-tailwindcss/package.json +++ b/packages/varlet-preset-tailwindcss/package.json @@ -44,4 +44,4 @@ "peerDependencies": { "tailwindcss": "^3.4.1" } -} \ No newline at end of file +} diff --git a/packages/varlet-preset-unocss/package.json b/packages/varlet-preset-unocss/package.json index 6c7213e41bb..14883d59a46 100644 --- a/packages/varlet-preset-unocss/package.json +++ b/packages/varlet-preset-unocss/package.json @@ -44,4 +44,4 @@ "peerDependencies": { "unocss": "^0.58.5" } -} \ No newline at end of file +} diff --git a/packages/varlet-shared/package.json b/packages/varlet-shared/package.json index de3d5a9c372..f23feb0dda1 100644 --- a/packages/varlet-shared/package.json +++ b/packages/varlet-shared/package.json @@ -43,4 +43,4 @@ "tsup": "catalog:", "typescript": "catalog:" } -} \ No newline at end of file +} diff --git a/packages/varlet-touch-emulator/package.json b/packages/varlet-touch-emulator/package.json index d9305d81b02..00dd777c4ca 100644 --- a/packages/varlet-touch-emulator/package.json +++ b/packages/varlet-touch-emulator/package.json @@ -29,4 +29,4 @@ "devDependencies": { "tsup": "catalog:" } -} \ No newline at end of file +} diff --git a/packages/varlet-ui-playground/package.json b/packages/varlet-ui-playground/package.json index 250486a7fff..1cd15c1c9c2 100644 --- a/packages/varlet-ui-playground/package.json +++ b/packages/varlet-ui-playground/package.json @@ -31,4 +31,4 @@ "typescript": "catalog:", "vite": "catalog:" } -} \ No newline at end of file +} diff --git a/packages/varlet-ui-playground/tsconfig.json b/packages/varlet-ui-playground/tsconfig.json index 75a64afe69e..0c71d5796ac 100644 --- a/packages/varlet-ui-playground/tsconfig.json +++ b/packages/varlet-ui-playground/tsconfig.json @@ -3,6 +3,6 @@ "compilerOptions": { "allowSyntheticDefaultImports": true, "isolatedModules": true, - "types": ["vite/client"], + "types": ["vite/client"] } } diff --git a/packages/varlet-ui/package.json b/packages/varlet-ui/package.json index dce2ef03868..c1591d96d41 100644 --- a/packages/varlet-ui/package.json +++ b/packages/varlet-ui/package.json @@ -81,4 +81,4 @@ "vue": "^3.2.0" }, "web-types": "highlight/web-types.en-US.json" -} \ No newline at end of file +} diff --git a/packages/varlet-use/package.json b/packages/varlet-use/package.json index a9ffcf2e981..5e52b267299 100644 --- a/packages/varlet-use/package.json +++ b/packages/varlet-use/package.json @@ -47,4 +47,4 @@ "peerDependencies": { "vue": "^3.2.0" } -} \ No newline at end of file +} diff --git a/packages/varlet-vite-plugins/package.json b/packages/varlet-vite-plugins/package.json index ee653aa2ca7..5cdaf77ee32 100644 --- a/packages/varlet-vite-plugins/package.json +++ b/packages/varlet-vite-plugins/package.json @@ -46,4 +46,4 @@ "peerDependencies": { "vite": "catalog:" } -} \ No newline at end of file +} diff --git a/packages/varlet-vscode-extension/package.json b/packages/varlet-vscode-extension/package.json index fe75e76c66a..357116c241b 100644 --- a/packages/varlet-vscode-extension/package.json +++ b/packages/varlet-vscode-extension/package.json @@ -104,4 +104,4 @@ "vscode": "^1.56.0" }, "icon": "assets/icon.png" -} \ No newline at end of file +} From 3c9c9e9a9ead3cde9d303e8a70d555d1bdcc0d2e Mon Sep 17 00:00:00 2001 From: Aybrea Date: Sat, 19 Jul 2025 21:36:57 +0800 Subject: [PATCH 2/2] feat(ui/field-decorator): filled variant --- .../src/field-decorator/FieldDecorator.vue | 18 +++ .../src/field-decorator/fieldDecorator.less | 121 ++++++++++++++++++ .../varlet-ui/src/field-decorator/props.ts | 2 +- .../varlet-ui/src/input/example/index.vue | 62 ++++++++- .../src/input/example/locale/en-US.ts | 1 + .../src/input/example/locale/zh-CN.ts | 1 + .../src/themes/md3-dark/fieldDecorator.ts | 2 + .../src/themes/md3-light/fieldDecorator.ts | 2 + 8 files changed, 207 insertions(+), 2 deletions(-) diff --git a/packages/varlet-ui/src/field-decorator/FieldDecorator.vue b/packages/varlet-ui/src/field-decorator/FieldDecorator.vue index d10eafc68d3..291842a960b 100644 --- a/packages/varlet-ui/src/field-decorator/FieldDecorator.vue +++ b/packages/varlet-ui/src/field-decorator/FieldDecorator.vue @@ -88,6 +88,24 @@ +
+
+
+
@@ -65,7 +80,6 @@ onThemeChange() - diff --git a/packages/varlet-ui/src/input/example/locale/en-US.ts b/packages/varlet-ui/src/input/example/locale/en-US.ts index 749c597fa79..be975a3603e 100644 --- a/packages/varlet-ui/src/input/example/locale/en-US.ts +++ b/packages/varlet-ui/src/input/example/locale/en-US.ts @@ -1,6 +1,7 @@ export default { standard: 'Standard Variant', outlined: 'Outlined Variant', + filled: 'Filled Variant', smallSize: 'Small Size', plainMode: 'Plain Mode', textarea: 'Textarea', diff --git a/packages/varlet-ui/src/input/example/locale/zh-CN.ts b/packages/varlet-ui/src/input/example/locale/zh-CN.ts index 636c278ed31..728c7541ec7 100644 --- a/packages/varlet-ui/src/input/example/locale/zh-CN.ts +++ b/packages/varlet-ui/src/input/example/locale/zh-CN.ts @@ -1,6 +1,7 @@ export default { standard: '标准外观', outlined: '外边框外观', + filled: '填充外观', smallSize: '小尺寸', plainMode: '朴素模式', textarea: '文本域', diff --git a/packages/varlet-ui/src/themes/md3-dark/fieldDecorator.ts b/packages/varlet-ui/src/themes/md3-dark/fieldDecorator.ts index 1b38666842b..3ee912c5caa 100644 --- a/packages/varlet-ui/src/themes/md3-dark/fieldDecorator.ts +++ b/packages/varlet-ui/src/themes/md3-dark/fieldDecorator.ts @@ -33,4 +33,6 @@ export default { '--field-decorator-outlined-small-placeholder-space': '2px', '--field-decorator-outlined-small-icon-margin-top': '8px', '--field-decorator-outlined-small-icon-margin-bottom': '8px', + '--field-decorator-filled-color': '#2f2e33', + '--field-decorator-filled-hover-color': '#3c3a40', } diff --git a/packages/varlet-ui/src/themes/md3-light/fieldDecorator.ts b/packages/varlet-ui/src/themes/md3-light/fieldDecorator.ts index 13d3ea71c35..7fd9a781736 100644 --- a/packages/varlet-ui/src/themes/md3-light/fieldDecorator.ts +++ b/packages/varlet-ui/src/themes/md3-light/fieldDecorator.ts @@ -33,4 +33,6 @@ export default { '--field-decorator-outlined-small-placeholder-space': '2px', '--field-decorator-outlined-small-icon-margin-top': '8px', '--field-decorator-outlined-small-icon-margin-bottom': '8px', + '--field-decorator-filled-color': '#e2dce5', + '--field-decorator-filled-hover-color': '#d0cad3', }