From 127d60d3fd4d6674941376d59137fc48133f3926 Mon Sep 17 00:00:00 2001 From: EthanShen10086 Date: Sun, 24 Aug 2025 21:45:31 +0800 Subject: [PATCH 01/12] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=9A=84trigger=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/common | 2 +- .../components/image-viewer/image-viewer.tsx | 33 +++++++++++++++++-- packages/components/image-viewer/props.ts | 2 +- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/packages/common b/packages/common index 6baed1be34..fcbb0bbdcf 160000 --- a/packages/common +++ b/packages/common @@ -1 +1 @@ -Subproject commit 6baed1be3426c881829d37d983fa5f355694383d +Subproject commit fcbb0bbdcfaa4e67d85a90db30b01bbda54e31d4 diff --git a/packages/components/image-viewer/image-viewer.tsx b/packages/components/image-viewer/image-viewer.tsx index 2b8b982c4d..1af9e67eef 100644 --- a/packages/components/image-viewer/image-viewer.tsx +++ b/packages/components/image-viewer/image-viewer.tsx @@ -1,4 +1,4 @@ -import { ChevronDownIcon, ChevronLeftIcon, CloseIcon } from 'tdesign-icons-vue-next'; +import { BrowseIcon, ChevronDownIcon, ChevronLeftIcon, CloseIcon } from 'tdesign-icons-vue-next'; import { Teleport, Transition, computed, defineComponent, nextTick, ref, toRefs, watch } from 'vue'; import { @@ -226,11 +226,38 @@ export default defineComponent({ ); }; + // 渲染默认trigger + // 原本需要手动配置 需要添加完template插槽之后设置DOM元素,现在添加默认DOM + const renderDefaultTrigger = () => { + if (props.trigger) { + return renderTNodeJSX('trigger', { params: { open: openHandler } }); + } + + // 如果没有提供trigger,则渲染默认的图片预览按钮 + const firstImage = images.value[0]; + if (!firstImage) return null; + + const imageSrc = + typeof firstImage === 'string' ? firstImage : (firstImage as any).mainImage || (firstImage as any).thumbnail; + + return ( +
+ preview +
+ + + 预览 + +
+
+ ); + }; + return () => { if (props.mode === 'modeless') { return ( <> - {renderTNodeJSX('trigger', { params: { open: openHandler } })} + {renderDefaultTrigger()} - {renderTNodeJSX('trigger', { params: { open: openHandler } })} + {renderDefaultTrigger()} {(visibleValue.value || !animationEnd.value) && ( diff --git a/packages/components/image-viewer/props.ts b/packages/components/image-viewer/props.ts index 1171399808..bc49a55d8a 100644 --- a/packages/components/image-viewer/props.ts +++ b/packages/components/image-viewer/props.ts @@ -54,7 +54,7 @@ export default { /** 图片数组。`mainImage` 表示主图,必传;`thumbnail` 表示缩略图,如果不存在,则使用主图显示;`download` 是否允许下载图片,默认允许下载。示例: `['img_url_1', 'img_url_2']`,`[{ thumbnail: 'small_image_url', mainImage: 'big_image_url', download: false }]` */ images: { type: Array as PropType, - default: (): TdImageViewerProps['images'] => [], + default: (): TdImageViewerProps['images'] => ['https://tdesign.gtimg.com/demo/demo-image-1.png'], }, /** 当前预览图片所在的下标 */ index: { From 68bdb48c68cdd8d3b2bba2acde95c709fadd321a Mon Sep 17 00:00:00 2001 From: EthanShen10086 Date: Sun, 7 Sep 2025 22:12:16 +0800 Subject: [PATCH 02/12] =?UTF-8?q?feat:=20=E6=A0=B9=E6=8D=AECR=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DdefaultTrigger=E9=80=BB=E8=BE=91=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E6=A0=B9=E6=8D=AECR=E4=BF=AE=E5=A4=8DBEM=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84class=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/components/image-viewer/image-viewer.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/components/image-viewer/image-viewer.tsx b/packages/components/image-viewer/image-viewer.tsx index 1af9e67eef..59d9e66029 100644 --- a/packages/components/image-viewer/image-viewer.tsx +++ b/packages/components/image-viewer/image-viewer.tsx @@ -242,10 +242,10 @@ export default defineComponent({ return (
- preview -
+ preview +
- + 预览
@@ -257,7 +257,7 @@ export default defineComponent({ if (props.mode === 'modeless') { return ( <> - {renderDefaultTrigger()} + {renderTNodeJSX('trigger', { params: { open: openHandler } }) || renderDefaultTrigger()} - {renderDefaultTrigger()} + {renderTNodeJSX('trigger', { params: { open: openHandler } }) || renderDefaultTrigger()} {(visibleValue.value || !animationEnd.value) && ( From 1bb42f8494003829f4c09ea0cf7270a8239cc5f8 Mon Sep 17 00:00:00 2001 From: EthanShen10086 Date: Mon, 8 Sep 2025 07:44:36 +0800 Subject: [PATCH 03/12] =?UTF-8?q?feat:=20renderDefaultTrigger=E4=BD=BF?= =?UTF-8?q?=E7=94=A8t-image=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/image-viewer/image-viewer.tsx | 16 ++++------------ packages/components/image-viewer/props.ts | 2 +- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/packages/components/image-viewer/image-viewer.tsx b/packages/components/image-viewer/image-viewer.tsx index 59d9e66029..9d3bf2dcf7 100644 --- a/packages/components/image-viewer/image-viewer.tsx +++ b/packages/components/image-viewer/image-viewer.tsx @@ -226,23 +226,15 @@ export default defineComponent({ ); }; - // 渲染默认trigger - // 原本需要手动配置 需要添加完template插槽之后设置DOM元素,现在添加默认DOM const renderDefaultTrigger = () => { - if (props.trigger) { - return renderTNodeJSX('trigger', { params: { open: openHandler } }); - } - - // 如果没有提供trigger,则渲染默认的图片预览按钮 - const firstImage = images.value[0]; - if (!firstImage) return null; - + // 如果不存在图片 使用t-image 展示无法展示图片的错误 + // images 的 vo 是 ImageInfo + const firstImage = images.value[0] || 'error url'; const imageSrc = typeof firstImage === 'string' ? firstImage : (firstImage as any).mainImage || (firstImage as any).thumbnail; - return (
- preview +
diff --git a/packages/components/image-viewer/props.ts b/packages/components/image-viewer/props.ts index bc49a55d8a..1171399808 100644 --- a/packages/components/image-viewer/props.ts +++ b/packages/components/image-viewer/props.ts @@ -54,7 +54,7 @@ export default { /** 图片数组。`mainImage` 表示主图,必传;`thumbnail` 表示缩略图,如果不存在,则使用主图显示;`download` 是否允许下载图片,默认允许下载。示例: `['img_url_1', 'img_url_2']`,`[{ thumbnail: 'small_image_url', mainImage: 'big_image_url', download: false }]` */ images: { type: Array as PropType, - default: (): TdImageViewerProps['images'] => ['https://tdesign.gtimg.com/demo/demo-image-1.png'], + default: (): TdImageViewerProps['images'] => [], }, /** 当前预览图片所在的下标 */ index: { From ac72120a96d2673f53d97a0f3e2a4f28e77f3b04 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 8 Sep 2025 02:20:05 +0000 Subject: [PATCH 04/12] chore: update snapshot --- .../__snapshots__/upload.test.tsx.snap | 170 +++++++++++++++++- 1 file changed, 168 insertions(+), 2 deletions(-) diff --git a/packages/components/upload/__tests__/__snapshots__/upload.test.tsx.snap b/packages/components/upload/__tests__/__snapshots__/upload.test.tsx.snap index d34c31c088..e7b37e1cc7 100644 --- a/packages/components/upload/__tests__/__snapshots__/upload.test.tsx.snap +++ b/packages/components/upload/__tests__/__snapshots__/upload.test.tsx.snap @@ -1117,7 +1117,90 @@ exports[`Upload Component > props.theme: theme=file-flow works fine 1`] = ` - +
+
+ + + + preview +
+
+ + +
+ + + +
+ + + +
+ 图片加载中 +
+ + + +
+
+ + +
+
+ + + + + + + 预览 + +
+
props.theme: theme=image-flow works fine 1`] = ` - +
+
+ + + + preview +
+
+ + +
+ + + +
+ + + +
+ 图片加载中 +
+ + + +
+
+ + +
+
+ + + + + + + 预览 + +
+
Date: Mon, 8 Sep 2025 11:40:27 +0000 Subject: [PATCH 05/12] chore: update common --- packages/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/common b/packages/common index fcbb0bbdcf..adb567085e 160000 --- a/packages/common +++ b/packages/common @@ -1 +1 @@ -Subproject commit fcbb0bbdcfaa4e67d85a90db30b01bbda54e31d4 +Subproject commit adb567085e1b813b2f01e9fba3e3f4398b84fb4c From fa0a01207d549c3af9e17db14c92b8f74653463e Mon Sep 17 00:00:00 2001 From: Wesley <985189328@qq.com> Date: Tue, 9 Sep 2025 12:34:53 +0800 Subject: [PATCH 06/12] chore: optimize --- .../components/image-viewer/image-viewer.tsx | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/components/image-viewer/image-viewer.tsx b/packages/components/image-viewer/image-viewer.tsx index 9d3bf2dcf7..b3e23dfb34 100644 --- a/packages/components/image-viewer/image-viewer.tsx +++ b/packages/components/image-viewer/image-viewer.tsx @@ -227,15 +227,18 @@ export default defineComponent({ }; const renderDefaultTrigger = () => { - // 如果不存在图片 使用t-image 展示无法展示图片的错误 - // images 的 vo 是 ImageInfo - const firstImage = images.value[0] || 'error url'; - const imageSrc = - typeof firstImage === 'string' ? firstImage : (firstImage as any).mainImage || (firstImage as any).thumbnail; + const firstImage = images.value[0] || ''; + const imageSrc = typeof firstImage === 'string' ? firstImage : firstImage.mainImage || firstImage.thumbnail; return (
- -
+ preview +
预览 From 7b99a0e4ab8599524289395e658f3e0c6b735e23 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 9 Sep 2025 04:44:20 +0000 Subject: [PATCH 07/12] chore: update snapshot --- .../__tests__/__snapshots__/upload.test.tsx.snap | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/components/upload/__tests__/__snapshots__/upload.test.tsx.snap b/packages/components/upload/__tests__/__snapshots__/upload.test.tsx.snap index e7b37e1cc7..d9db9ad88a 100644 --- a/packages/components/upload/__tests__/__snapshots__/upload.test.tsx.snap +++ b/packages/components/upload/__tests__/__snapshots__/upload.test.tsx.snap @@ -1130,9 +1130,9 @@ exports[`Upload Component > props.theme: theme=file-flow works fine 1`] = ` preview
props.theme: theme=file-flow works fine 1`] = `
props.theme: theme=image-flow works fine 1`] = ` preview
props.theme: theme=image-flow works fine 1`] = `
Date: Fri, 19 Sep 2025 05:41:20 +0000 Subject: [PATCH 08/12] chore: update common --- packages/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/common b/packages/common index adb567085e..bdb417c8c6 160000 --- a/packages/common +++ b/packages/common @@ -1 +1 @@ -Subproject commit adb567085e1b813b2f01e9fba3e3f4398b84fb4c +Subproject commit bdb417c8c61f90734ed11a9519a6cf0816c635c0 From a8ce5571289693356d87769faadfd410d64418d8 Mon Sep 17 00:00:00 2001 From: Uyarn Date: Thu, 25 Sep 2025 15:50:00 +0800 Subject: [PATCH 09/12] chore: update demo --- .../image-viewer/_example-ts/base.vue | 12 +- .../components/image-viewer/_example/base.vue | 13 +- .../__snapshots__/upload.test.tsx.snap | 130 +++++++++++++++--- 3 files changed, 114 insertions(+), 41 deletions(-) diff --git a/packages/components/image-viewer/_example-ts/base.vue b/packages/components/image-viewer/_example-ts/base.vue index ec342fece2..40cb24a6ad 100644 --- a/packages/components/image-viewer/_example-ts/base.vue +++ b/packages/components/image-viewer/_example-ts/base.vue @@ -1,21 +1,11 @@
- - - +