github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into feat-v4

pull/6349/head
tangjinzhou 2023-03-08 13:44:43 +08:00
parent d241a06f9d 6fb47874a3
commit 23a213acda
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/vc-image/src/Image.tsx
View File

@ -81,6 +81,7 @@ const ImageInternal = defineComponent({
? mergeDefaultValue(props.preview, defaultValues)
: defaultValues;
});
const src = computed(() => preview.value.src ?? props.src);
const isCustomPlaceholder = computed(
() => (props.placeholder && props.placeholder !== true) || slots.placeholder,
);
@ -171,14 +172,14 @@ const ImageInternal = defineComponent({
let unRegister = () => {};
onMounted(() => {
watch(
[() => props.src, canPreview],
[src, canPreview],
() => {
unRegister();
if (!isPreviewGroup.value) {
return () => {};
}
unRegister = registerImage(currentId.value, props.src, canPreview.value);
unRegister = registerImage(currentId.value, src.value, canPreview.value);
if (!canPreview.value) {
unRegister();
@ -216,12 +217,12 @@ const ImageInternal = defineComponent({
class: cls,
style,
} = attrs as ImgHTMLAttributes;
const { icons, maskClassName, src: previewSrc, ...dialogProps } = preview.value;
const { icons, maskClassName, ...dialogProps } = preview.value;
const wrappperClass = cn(prefixCls, wrapperClassName, rootClassName, {
[`${prefixCls}-error`]: isError.value,
});
const mergedSrc = isError.value && fallback ? fallback : previewSrc ?? imgSrc;
const mergedSrc = isError.value && fallback ? fallback : src.value;
const imgCommonProps = {
crossorigin,
decoding,