Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-06 08:48:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 https://github.com/siyuan-note/siyuan/issues/10414

Browse source
This commit is contained in:
Vanessa 2025-06-20 13:44:13 +08:00
parent 6f2d6b892c
commit 343bfb2757
4 changed files with 61 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/assets/scss/business/_av.scss
View file

@ -290,8 +290,13 @@
}
}
&--select {
&--select:before {
content: "";
background-color: var(--b3-theme-primary-lightest);
height: 100%;
width: 100%;
z-index: 1;
position: absolute;
}
&.dragover__left::after,
@ -445,6 +450,7 @@
display: flex;
opacity: 0;
transition: var(--b3-transition);
z-index: 2;
}
}

2
app/src/protyle/render/av/action.ts
View file

@ -282,7 +282,7 @@ export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLEle
event.stopPropagation();
return true;
} else if (type === "av-gallery-more") {
openGalleryItemMenu({target, blockElement, protyle});
openGalleryItemMenu({target, blockElement, protyle, returnMenu: false});
event.preventDefault();
event.stopPropagation();
return true;

77
app/src/protyle/render/av/gallery/util.ts
View file

@ -3,6 +3,7 @@ import {Menu} from "../../../../plugin/Menu";
import * as dayjs from "dayjs";
import {hasClosestByClassName} from "../../../util/hasClosest";
import {genCellValueByElement} from "../cell";
import {clearSelect} from "../../../util/clearSelect";
export const setGalleryCover = (options: {
view: IAVGallery
@ -231,41 +232,57 @@ export const openGalleryItemMenu = (options: {
}) => {
const menu = new Menu();
const avID = options.blockElement.getAttribute("data-av-id");
const cardElement = hasClosestByClassName(options.target, "av__gallery-item");
if (!cardElement) {
return;
}
if (!cardElement.classList.contains("av__gallery-item--select")) {
clearSelect(["galleryItem"], options.blockElement);
cardElement.classList.add("av__gallery-item--select");
}
menu.addItem({
icon: "iconTrashcan",
warning: true,
label: window.siyuan.languages.delete,
click() {
const cardElement = hasClosestByClassName(options.target, "av__gallery-item");
if (cardElement) {
const newUpdated = dayjs().format("YYYYMMDDHHmmss");
const blockValue = genCellValueByElement("block", cardElement.querySelector(".av__cell[data-block-id]"));
transaction(options.protyle, [{
action: "removeAttrViewBlock",
srcIDs: [cardElement.dataset.id],
avID,
}, {
action: "doUpdateUpdated",
id: options.blockElement.dataset.nodeId,
data: newUpdated,
}], [{
action: "insertAttrViewBlock",
avID,
previousID: cardElement.previousElementSibling?.getAttribute("data-id") || "",
srcs: [{
id: cardElement.getAttribute("data-id"),
isDetached: blockValue.isDetached,
content: blockValue.block.content
}],
blockID: options.blockElement.dataset.nodeId
}, {
action: "doUpdateUpdated",
id: options.blockElement.dataset.nodeId,
data: options.blockElement.getAttribute("updated")
}]);
cardElement.remove();
options.blockElement.setAttribute("updated", newUpdated);
}
const srcIDs: string[] = [];
const srcs: IOperationSrcs[] = [];
let previousID = "";
options.blockElement.querySelectorAll(".av__gallery-item--select").forEach((item, index) => {
const blockValue = genCellValueByElement("block", item.querySelector(".av__cell[data-block-id]"));
const id = item.getAttribute("data-id");
srcIDs.push(id);
srcs.push({
id,
isDetached: blockValue.isDetached,
content: blockValue.block.content
});
item.remove();
if (index === 0) {
previousID = item.previousElementSibling?.getAttribute("data-id") || "";
}
});
const newUpdated = dayjs().format("YYYYMMDDHHmmss");
transaction(options.protyle, [{
action: "removeAttrViewBlock",
srcIDs,
avID,
}, {
action: "doUpdateUpdated",
id: options.blockElement.dataset.nodeId,
data: newUpdated,
}], [{
action: "insertAttrViewBlock",
avID,
previousID,
srcs,
blockID: options.blockElement.dataset.nodeId
}, {
action: "doUpdateUpdated",
id: options.blockElement.dataset.nodeId,
data: options.blockElement.getAttribute("updated")
}]);
options.blockElement.setAttribute("updated", newUpdated);
}
});
if (options.returnMenu) {

7
app/src/protyle/util/clearSelect.ts
View file

@ -1,6 +1,6 @@
import {updateHeader} from "../render/av/row";
export const clearSelect = (types: ("av" | "img" | "cell" | "row")[], element: Element) => {
export const clearSelect = (types: ("av" | "img" | "cell" | "row"|"galleryItem")[], element: Element) => {
if (types.includes("cell")) {
element.querySelectorAll(".av__cell--select, .av__cell--active").forEach((item: HTMLElement) => {
item.querySelector(".av__drag-fill")?.remove();
@ -14,6 +14,11 @@ export const clearSelect = (types: ("av" | "img" | "cell" | "row")[], element: E
updateHeader(item);
});
}
if (types.includes("galleryItem")) {
element.querySelectorAll(".av__gallery-item--select").forEach((item: HTMLElement) => {
item.classList.remove("av__gallery-item--select");
});
}
if (types.includes("av")) {
element.querySelectorAll(" .av__cell--select, .av__cell--active, .av__row--select, .av__gallery-item--select").forEach((item: HTMLElement) => {
if (item.classList.contains("av__row--select")) {