Compare commits

..

No commits in common. "9f4019cb948eb261f558a9ba3dacf34779b02339" and "e5f0512f05e7182943f72a5068e58a995a49fa58" have entirely different histories.

2 changed files with 5 additions and 1 deletions

View File

@ -74,6 +74,9 @@ export function WeatherSearchForm() {
<div className='flex gap-2'> <div className='flex gap-2'>
<Button type="submit" disabled={isLoading || !city.trim()} className="mt-4 w-full"> <Button type="submit" disabled={isLoading || !city.trim()} className="mt-4 w-full">
{isLoading ? <> {isLoading ? <>
<Loader2 className="animate-spin w-5 h-5 text-white" /> <Loader2 className="animate-spin w-5 h-5 text-white" />
<span>...</span> <span>...</span>
@ -82,6 +85,7 @@ export function WeatherSearchForm() {
<span></span> <span></span>
</>)} </>)}
</Button> </Button>
{currentWeather && ( {currentWeather && (
<Button type="button" variant="outline" onClick={refreshWeather} disabled={isLoading} className="mt-4 w-full" title='刷新数据'> <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")} /> <RefreshCw className={cn("w-5 h-5", isLoading && "animate-spin")} />

View File

@ -89,7 +89,7 @@ export const useWeatherStore = create<WeatherStore>()(
return{weatherCache:newCache} return{weatherCache:newCache}
}), }),
setLoading:(loading)=>set({isLoading:loading}), setLoading:(loading)=>set({isLoading:loading}),
setError:(error)=>set({error,isLoading:false}), setError:(error)=>set({error}),
reset:()=>set({currentWeather:null,weatherCache:new Map(),isLoading:false,error:null}), reset:()=>set({currentWeather:null,weatherCache:new Map(),isLoading:false,error:null}),
searchWeather:async(city:string)=>{ searchWeather:async(city:string)=>{
try{ try{