Compare commits
2 Commits
8c3bfc9b4a
...
39ac8592c3
| Author | SHA1 | Date |
|---|---|---|
|
|
39ac8592c3 | |
|
|
d42096efed |
|
|
@ -14,6 +14,7 @@ export function WeatherSearchForm() {
|
|||
setCity(e.target.value);
|
||||
if (inputError) {
|
||||
setInputError('');
|
||||
};
|
||||
}
|
||||
|
||||
const handleFormSubmit = async (e: FormEvent<HTMLFormElement>) => {
|
||||
|
|
@ -33,6 +34,18 @@ export function WeatherSearchForm() {
|
|||
}
|
||||
await searchWeather(trimmedCity);
|
||||
|
||||
if (trimmedCity.length < 2) {
|
||||
setInputError('请输入至少2个字符');
|
||||
return;
|
||||
}
|
||||
|
||||
if (!/^[a-zA-Z\s]+$/.test(trimmedCity)) {
|
||||
setInputError('请输入字母和空格');
|
||||
return;
|
||||
}
|
||||
await searchWeather(trimmedCity);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className='p-6 border-6 border-b-slate-200/50 '>
|
||||
<form onSubmit={handleFormSubmit} className="space-by-3">
|
||||
|
|
@ -54,10 +67,16 @@ export function WeatherSearchForm() {
|
|||
<AlertCircle className="inline w-4 h-4 text-red-500 mt-0.5" />
|
||||
<p className="text-red-500 text-xs">{inputError}</p>
|
||||
</div>
|
||||
|
||||
|
||||
)
|
||||
}
|
||||
|
||||
<div className='flex gap-2'>
|
||||
<Button type="submit" disabled={isLoading || !city.trim()} className="mt-4 w-full">
|
||||
|
||||
|
||||
|
||||
{isLoading ? <>
|
||||
<Loader2 className="animate-spin w-5 h-5 text-white" />
|
||||
<span>搜索中...</span>
|
||||
|
|
@ -66,15 +85,22 @@ export function WeatherSearchForm() {
|
|||
<span>搜索天气</span>
|
||||
</>)}
|
||||
</Button>
|
||||
|
||||
{currentWeather && (
|
||||
<Button type="button" variant="outline" onClick={refreshWeather} disabled={isLoading} className="mt-4 w-full" title='刷新数据'>
|
||||
<RefreshCw className={cn("w-5 h-5", isLoading && "animate-spin")} />
|
||||
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
|
||||
|
||||
</form>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue