Refactor styles and improve preview URL handling in Upload and Image …

…components
YaoApp · Nov 1, 2024 · df1d396 · df1d396
1 parent 3baccda
commit df1d396
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/packages/xgen/components/edit/Upload/index.less b/packages/xgen/components/edit/Upload/index.less
@@ -92,9 +92,7 @@
 				width: auto;
 				color: var(--color_title);
 				background: var(--color_bg_nav);
-				border-top-left-radius: 6px;
-				border-bottom-right-radius: 6px;
-				border-bottom-left-radius: 6px;
+				border-radius: 6px;
 				z-index: 99;
 				filter: drop-shadow(0 4px 3px rgb(0 0 0 / 0.07)) drop-shadow(0 2px 2px rgb(0 0 0 / 0.06));
 

diff --git a/packages/xgen/components/edit/Upload/request/storages/utils.ts b/packages/xgen/components/edit/Upload/request/storages/utils.ts
@@ -46,11 +46,16 @@ export function GetData(xhr: XMLHttpRequest, customPreviewURL: boolean = false):
 
 export function GetPreviewURL(params: PreviewParams): string {
 	const { response, token, useAppRoot } = params
-	let { previewURL } = params
+	let { previewURL } = params || {}
+
+	// Validate response
+	if (response.path && typeof response.path !== 'string') {
+		return ''
+	}
 
 	// Http Request
 	if (!previewURL && response.path?.startsWith('http')) {
-		return response.path
+		return response.path || ''
 	}
 
 	// Default preview URL

diff --git a/packages/xgen/components/view/Image/index.less b/packages/xgen/components/view/Image/index.less
@@ -23,7 +23,6 @@
 				box-sizing: border-box;
 				border: 1px solid var(--color_border);
 				border-radius: 6px;
-
 				object-fit: cover;
 			}
 

diff --git a/packages/xgen/components/view/Image/index.tsx b/packages/xgen/components/view/Image/index.tsx
@@ -25,7 +25,7 @@ const Index = (props: IProps) => {
 		const values = Array.isArray(__value) ? __value : [__value]
 		values.forEach((item) => {
 			const url = GetPreviewURL({
-				response: { path: item },
+				response: { path: item || '' },
 				previewURL,
 				useAppRoot,
 				token,

diff --git a/packages/xgen/public/components/edit/Upload/chunk.1.css b/packages/xgen/public/components/edit/Upload/chunk.1.css
@@ -76,9 +76,7 @@
   width: auto;
   color: var(--color_title);
   background: var(--color_bg_nav);
-  border-top-left-radius: 6px;
-  border-bottom-right-radius: 6px;
-  border-bottom-left-radius: 6px;
+  border-radius: 6px;
   z-index: 99;
   filter: drop-shadow(0 4px 3px rgba(0, 0, 0, 0.07)) drop-shadow(0 2px 2px rgba(0, 0, 0, 0.06));
 }