Merge pull request #151 from besscroft/v2

🐛 修复文件上传逻辑问题，以及一些样式问题。
besscroft · Nov 12, 2024 · 63cda51 · 63cda51
2 parents a40d50a + 664a12e
commit 63cda51
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/app/admin/about/page.tsx b/app/admin/about/page.tsx
@@ -53,7 +53,7 @@ export default function About() {
           />
         </svg>
 
-        <p className="whitespace-nowrap text-sm">v2.0.0</p>
+        <p className="whitespace-nowrap text-sm">v2.0.2</p>
       </span>
       <span>PicImpact 是一个摄影师专用的摄影作品展示网站，基于 Next.js + Hono.js 开发。</span>
       <div className="flex flex-col w-full">

diff --git a/app/admin/settings/password/page.tsx b/app/admin/settings/password/page.tsx
@@ -105,7 +105,7 @@ export default function PassWord() {
                   <span className="text-xs font-medium text-gray-700"> 旧密码 </span>
 
                   <input
-                    type="text"
+                    type="password"
                     id="onePassword"
                     placeholder="请输入旧密码。"
                     {...field}
@@ -130,7 +130,7 @@ export default function PassWord() {
                   <span className="text-xs font-medium text-gray-700"> 新密码 </span>
 
                   <input
-                    type="text"
+                    type="password"
                     id="twoPassword"
                     placeholder="请输入新密码。"
                     {...field}
@@ -155,7 +155,7 @@ export default function PassWord() {
                   <span className="text-xs font-medium text-gray-700"> 确认密码 </span>
 
                   <input
-                    type="text"
+                    type="password"
                     id="threePassword"
                     placeholder="请输入确认密码。"
                     {...field}

diff --git a/components/BlurImage.tsx b/components/BlurImage.tsx
@@ -14,6 +14,7 @@ export default function BlurImage({ photo, dataList }: { photo: any, dataList: a
   return (
     <img
       width={photo.width}
+      height={photo.height}
       loading="lazy"
       src={photo.src}
       alt={photo.alt}

diff --git a/components/admin/copyright/CopyrightEditSheet.tsx b/components/admin/copyright/CopyrightEditSheet.tsx
@@ -179,8 +179,8 @@ export default function CopyrightEditSheet(props : Readonly<HandleProps>) {
               </div>
             </div>
             <Switch
-              checked={copyright?.default === 0}
-              onCheckedChange={(value) => setCopyrightEditData({...copyright, default: value ? 0 : 1})}
+              checked={copyright?.show === 0}
+              onCheckedChange={(value) => setCopyrightEditData({...copyright, show: value ? 0 : 1})}
             />
           </div>
           <div className="flex flex-row items-center justify-between rounded-lg border p-3 shadow-sm">
@@ -191,8 +191,8 @@ export default function CopyrightEditSheet(props : Readonly<HandleProps>) {
               </div>
             </div>
             <Switch
-              checked={copyright?.show === 0}
-              onCheckedChange={(value) => setCopyrightEditData({...copyright, show: value ? 0 : 1})}
+              checked={copyright?.default === 0}
+              onCheckedChange={(value) => setCopyrightEditData({...copyright, default: value ? 0 : 1})}
             />
           </div>
           <Button

diff --git a/components/admin/upload/FileUpload.tsx b/components/admin/upload/FileUpload.tsx
@@ -388,8 +388,6 @@ export default function FileUpload() {
 
   async function onRemoveFile() {
     setStorageSelect(false)
-    setStorage('')
-    setAlbum('')
     setAlistMountPath('')
     setExif({} as ExifType)
     setUrl('')

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "picimpact",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "private": true,
   "author": "Bess Croft <[email protected]>",
   "packageManager": "[email protected]",