usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into watermark

This commit is contained in:
syuilo 2025-06-03 16:56:19 +09:00
parent 7bff6cccb7 5537558fa7
commit d322a59c59
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -5,6 +5,7 @@
### Client ### Client
- Feat: 画像にウォーターマークを付与できるようになりました - Feat: 画像にウォーターマークを付与できるようになりました
- Fix: ドライブファイルの選択が不安定な問題を修正
### Server ### Server
- -

2
packages/frontend/src/components/MkDrive.vue
View File

@ -185,7 +185,7 @@ const isRootSelected = ref(false);
watch(selectedFiles, () => { watch(selectedFiles, () => {
emit('changeSelectedFiles', selectedFiles.value); emit('changeSelectedFiles', selectedFiles.value);
}); }, { deep: true });
watch([selectedFolders, isRootSelected], () => { watch([selectedFolders, isRootSelected], () => {
emit('changeSelectedFolders', isRootSelected.value ? [null, ...selectedFolders.value] : selectedFolders.value); emit('changeSelectedFolders', isRootSelected.value ? [null, ...selectedFolders.value] : selectedFolders.value);