新增对视频的支持
This commit is contained in:
@@ -1,3 +1,14 @@
|
||||
# anian-plugin-photos
|
||||
|
||||
> 基于原作者v1.5.1代码修改
|
||||
|
||||
#### v1.5.1-1
|
||||
1. 新增对视频的支持
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# plugin-photos
|
||||
|
||||
Halo 2.0 的相册管理插件, 支持在 Console 进行管理以及为主题端提供 `/photos` 页面路由。
|
||||
@@ -352,4 +363,4 @@ List<[#PhotoVo](#photovo)>
|
||||
| 对应模型 | group | kind |
|
||||
| ---------- | ---------------- | ---------- |
|
||||
| 图库 | core.halo.run | Photo |
|
||||
| 图库分组 | core.halo.run | PhotoGroup |
|
||||
| 图库分组 | core.halo.run | PhotoGroup |
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation platform('run.halo.tools.platform:plugin:2.17.0-SNAPSHOT')
|
||||
implementation platform('run.halo.tools.platform:plugin:2.20.11')
|
||||
compileOnly 'run.halo.app:api'
|
||||
|
||||
testImplementation 'run.halo.app:api'
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<script lang="ts" setup>
|
||||
import { onMounted, ref } from "vue";
|
||||
import { onMounted, ref, computed, watch } from "vue";
|
||||
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
@@ -17,34 +17,80 @@ const props = withDefaults(
|
||||
const isLoading = ref(false);
|
||||
const error = ref(false);
|
||||
|
||||
const loadImage = async () => {
|
||||
const image = new Image();
|
||||
image.src = props.src;
|
||||
// 更加严谨的后缀判断
|
||||
const isVideo = computed(() => {
|
||||
if (!props.src) return false;
|
||||
const videoExtensions = ['mp4', 'webm', 'ogg', 'mov', 'm4v', 'avi'];
|
||||
try {
|
||||
const url = new URL(props.src, window.location.origin);
|
||||
const pathname = url.pathname;
|
||||
const extension = pathname.split('.').pop()?.toLowerCase();
|
||||
return extension ? videoExtensions.includes(extension) : false;
|
||||
} catch (e) {
|
||||
// 如果 URL 格式不规范,回退到简单字符串判断
|
||||
return videoExtensions.some(ext => props.src.toLowerCase().includes(`.${ext}`));
|
||||
}
|
||||
});
|
||||
|
||||
const loadMedia = () => {
|
||||
if (!props.src) return Promise.reject("Empty src");
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
image.onload = () => resolve(image);
|
||||
image.onerror = (err) => reject(err);
|
||||
if (isVideo.value) {
|
||||
const video = document.createElement('video');
|
||||
video.src = props.src;
|
||||
video.preload = 'metadata';
|
||||
video.onloadeddata = () => resolve(true);
|
||||
video.onerror = () => reject(new Error("Video load error"));
|
||||
} else {
|
||||
const image = new Image();
|
||||
image.src = props.src;
|
||||
image.onload = () => resolve(true);
|
||||
image.onerror = () => reject(new Error("Image load error"));
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
onMounted(async () => {
|
||||
const init = async () => {
|
||||
if (!props.src) return;
|
||||
isLoading.value = true;
|
||||
error.value = false;
|
||||
try {
|
||||
await loadImage();
|
||||
await loadMedia();
|
||||
} catch (e) {
|
||||
console.warn("Media preview load failed:", props.src);
|
||||
error.value = true;
|
||||
} finally {
|
||||
isLoading.value = false;
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
onMounted(init);
|
||||
|
||||
// 如果 src 发生变化(比如在弹窗中切换上一张/下一张),重新加载
|
||||
watch(() => props.src, init);
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div :class="classes">
|
||||
<template v-if="isLoading">
|
||||
<slot name="loading"> loading... </slot>
|
||||
</template>
|
||||
<template v-else-if="error">
|
||||
<slot name="error"> error </slot>
|
||||
<slot name="error">
|
||||
<div class=":uno: flex items-center justify-center text-red-400 text-xs">加载失败</div>
|
||||
</slot>
|
||||
</template>
|
||||
|
||||
<video
|
||||
v-else-if="isVideo"
|
||||
class=":uno: size-full object-cover"
|
||||
:src="`${src}#t=0.1`"
|
||||
muted
|
||||
playsinline
|
||||
preload="metadata"
|
||||
></video>
|
||||
|
||||
<img v-else class=":uno: size-full object-cover" :src="src" :alt="alt" />
|
||||
</div>
|
||||
</template>
|
||||
</template>
|
||||
@@ -240,26 +240,28 @@ const onAttachmentsSelect = async (attachments: AttachmentLike[]) => {
|
||||
type?: string;
|
||||
}[];
|
||||
|
||||
for (const photo of photos) {
|
||||
const type = photo.type;
|
||||
if (!type) {
|
||||
Toast.error("只支持选择图片");
|
||||
nextTick(() => {
|
||||
attachmentModal.value = true;
|
||||
});
|
||||
for (const photo of photos) {
|
||||
const type = photo.type;
|
||||
|
||||
return;
|
||||
}
|
||||
const fileType = type.split("/")[0];
|
||||
if (fileType !== "image") {
|
||||
Toast.error("只支持选择图片");
|
||||
nextTick(() => {
|
||||
attachmentModal.value = true;
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (!type) {
|
||||
Toast.error("只支持选择图片或视频");
|
||||
nextTick(() => {
|
||||
attachmentModal.value = true;
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
const fileType = type.split("/")[0];
|
||||
|
||||
if (fileType !== "image" && fileType !== "video") {
|
||||
Toast.error("只支持选择图片或视频");
|
||||
nextTick(() => {
|
||||
attachmentModal.value = true;
|
||||
});
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
const createRequests = photos.map((photo) => {
|
||||
return axiosInstance.post<Photo>("/apis/core.halo.run/v1alpha1/photos", {
|
||||
metadata: {
|
||||
@@ -310,7 +312,7 @@ const onEditingModalClose = () => {
|
||||
</span>
|
||||
</template>
|
||||
</PhotoEditingModal>
|
||||
<AttachmentSelectorModal v-model:visible="attachmentModal" :accepts="['image/*']" @select="onAttachmentsSelect" />
|
||||
<AttachmentSelectorModal v-model:visible="attachmentModal" :accepts="['image/*', 'video/*']" @select="onAttachmentsSelect" />
|
||||
<VPageHeader title="图库">
|
||||
<template #icon>
|
||||
<RiImage2Line />
|
||||
@@ -383,7 +385,7 @@ const onEditingModalClose = () => {
|
||||
@click="handleOpenEditingModal(photo)"
|
||||
>
|
||||
<div class=":uno: group relative bg-white">
|
||||
<div class=":uno: block aspect-16/9 size-full cursor-pointer overflow-hidden bg-gray-100">
|
||||
<div class=":uno: block aspect-1/1 size-full cursor-pointer overflow-hidden bg-gray-100">
|
||||
<LazyImage
|
||||
:key="photo.metadata.name"
|
||||
:alt="photo.spec.displayName"
|
||||
@@ -443,4 +445,4 @@ const onEditingModalClose = () => {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</template>
|
||||
+1
-1
@@ -1 +1 @@
|
||||
version=1.0.0-SNAPSHOT
|
||||
version=1.5.1-1
|
||||
|
||||
@@ -8,7 +8,6 @@ metadata:
|
||||
"store.halo.run/app-id": "app-BmQJW"
|
||||
spec:
|
||||
enabled: true
|
||||
version: 1.0.0
|
||||
requires: ">=2.21.0"
|
||||
author:
|
||||
name: Halo
|
||||
|
||||
Reference in New Issue
Block a user