From b77211a119c7e4d6d6c9247e22ec2e90fb4f50ec Mon Sep 17 00:00:00 2001 From: hanyuxinting Date: Fri, 8 Nov 2024 20:42:38 +0800 Subject: [PATCH 1/2] fix: merge next --- src/packages/input/input.harmony.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/packages/input/input.harmony.css b/src/packages/input/input.harmony.css index f505097aab..47289dbf35 100644 --- a/src/packages/input/input.harmony.css +++ b/src/packages/input/input.harmony.css @@ -43,4 +43,8 @@ background: none; opacity: 1; -webkit-text-fill-color: #c2c4cc; +} + +.nut-input-clear { + flex: 0; } \ No newline at end of file From c7d021311b52cf38fc8c822e5a1638aed102d4bb Mon Sep 17 00:00:00 2001 From: hanyuxinting Date: Sat, 9 Nov 2024 22:53:57 +0800 Subject: [PATCH 2/2] fix: lock --- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 6f630c0265..3c19edfd15 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "dependencies": { "@babel/runtime": "^7.23.9", "@nutui/icons-react": "^1.0.5", - "@nutui/icons-react-taro": "2.0.0-beta.0", + "@nutui/icons-react-taro": "^2.0.0-beta.2", "@nutui/jdesign-icons-react-taro": "1.0.6-beta.2", "@nutui/touch-emulator": "^1.0.0", "@react-spring/web": "~9.6.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7b08e62173..59b31f0615 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,8 +19,8 @@ importers: specifier: ^1.0.5 version: 1.0.5 '@nutui/icons-react-taro': - specifier: 2.0.0-beta.0 - version: 2.0.0-beta.0 + specifier: ^2.0.0-beta.2 + version: 2.0.0-beta.2 '@nutui/jdesign-icons-react-taro': specifier: 1.0.6-beta.2 version: 1.0.6-beta.2 @@ -1615,8 +1615,8 @@ packages: resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==, tarball: https://r2.cnpmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz} engines: {node: '>= 8'} - '@nutui/icons-react-taro@2.0.0-beta.0': - resolution: {integrity: sha512-Wca6RWjy76fT9Co4T8PTjZCB/nzUxxyBR6efYl5tSKUJEvc6FPGHuA2FL6F0Gs9BBHo6ppTs02DRcSohX6UFWQ==} + '@nutui/icons-react-taro@2.0.0-beta.2': + resolution: {integrity: sha512-2wT+3TVJ8Gab9B27nfxpQZQUWOi8NQ2+rpH9q4XXlSg/9Sa1nLpwjtK3QB/7PsEpqXwpNMf4h4AdfWyyOZ09Rw==} '@nutui/icons-react@1.0.5': resolution: {integrity: sha512-0TYl3Fk+sVz95DKqn/7isYAvaK5YGnaBwMMib4rqYLoqi9GGFwgU9rp2hYXu/X5IYdWgshj0xiuGMK75/vUYbQ==} @@ -9914,7 +9914,7 @@ snapshots: '@nodelib/fs.scandir': 2.1.5 fastq: 1.17.1 - '@nutui/icons-react-taro@2.0.0-beta.0': {} + '@nutui/icons-react-taro@2.0.0-beta.2': {} '@nutui/icons-react@1.0.5': {}