Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-28 04:18:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Vanessa 2025-06-15 10:40:33 +08:00
parent 92aa808182
commit cd1a4b6ffb
4 changed files with 28 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/protyle/render/av/calc.ts
View file

@ -2,6 +2,7 @@ import {Menu} from "../../../plugin/Menu";
import {transaction} from "../../wysiwyg/transaction";
import {hasClosestBlock, hasClosestByClassName} from "../../util/hasClosest";
import {fetchSyncPost} from "../../../util/fetch";
import {getFieldsByData} from "./view";
const calcItem = (options: {
menu: Menu,
@ -38,7 +39,7 @@ const calcItem = (options: {
}]);
} else {
options.target.querySelector(".b3-menu__accelerator").textContent = getNameByOperator(options.operator, true);
const colData = (options.data.view as IAVTable).columns.find((item) => {
const colData = getFieldsByData(options.data).find((item) => {
if (item.id === options.colId) {
if (!item.rollup) {
item.rollup = {};
@ -274,7 +275,8 @@ export const openCalcMenu = async (protyle: IProtyle, calcElement: HTMLElement,
const avResponse = await fetchSyncPost("api/av/renderAttributeView", {id: avId});
avData = avResponse.data;
}
(avData.view as IAVTable).columns.find((item) => {
getFieldsByData(avData).find((item) => {
if (item.id === colId) {
relationKeyID = item.rollup?.relationKeyID;
keyID = item.rollup?.keyID;
@ -283,7 +285,7 @@ export const openCalcMenu = async (protyle: IProtyle, calcElement: HTMLElement,
});
if (relationKeyID && keyID) {
let relationAvId: string;
(avData.view as IAVTable).columns.find((item) => {
getFieldsByData(avData).find((item) => {
if (item.id === relationKeyID) {
relationAvId = item.relation?.avID;
return true;

23
app/src/protyle/render/av/relation.ts
View file

@ -9,6 +9,9 @@ import {updateAttrViewCellAnimation} from "./action";
import {focusBlock} from "../../util/selection";
import {setPosition} from "../../../util/setPosition";
import * as dayjs from "dayjs";
import {getFieldsByData} from "./view";
import {getColId} from "./col";
import {getFieldIdByCellElement} from "./row";
const genSearchList = (element: Element, keyword: string, avId?: string, excludes = true, cb?: () => void) => {
fetchPost("/api/av/searchAttributeView", {
@ -329,8 +332,8 @@ ${html || genSelectItemHTML("empty")}`;
export const getRelationHTML = (data: IAV, cellElements?: HTMLElement[]) => {
let colRelationData: IAVColumnRelation;
data.view.columns.find(item => {
if (item.id === cellElements[0].dataset.colId) {
getFieldsByData(data).find(item => {
if (item.id === getColId(cellElements[0], data.viewType)) {
colRelationData = item.relation;
return true;
}
@ -359,14 +362,18 @@ export const setRelationCell = (protyle: IProtyle, nodeElement: HTMLElement, tar
if (menuElement.querySelector(".dragover__bottom, .dragover__top")) {
return;
}
const rowElement = hasClosestByClassName(cellElements[0], "av__row");
if (!rowElement) {
return;
}
if (!nodeElement.contains(cellElements[0])) {
cellElements[0] = (nodeElement.querySelector(`.av__row[data-id="${rowElement.dataset.id}"] .av__cell[data-col-id="${cellElements[0].dataset.colId}"]`) ||
nodeElement.querySelector(`.fn__flex-1[data-col-id="${cellElements[0].dataset.colId}"]`)) as HTMLElement;
const viewType = nodeElement.getAttribute("data-av-type") as TAVView;
const rowID = getFieldIdByCellElement(cellElements[0], viewType);
if (viewType === "table") {
cellElements[0] = (nodeElement.querySelector(`.av__row[data-id="${rowID}"] .av__cell[data-col-id="${cellElements[0].dataset.colId}"]`) ||
nodeElement.querySelector(`.fn__flex-1[data-col-id="${cellElements[0].dataset.colId}"]`)) as HTMLElement;
} else {
cellElements[0] = (nodeElement.querySelector(`.av__gallery-item[data-id="${rowID}"] .av__cell[data-field-id="${cellElements[0].dataset.fieldId}"]`)) as HTMLElement;
}
}
const newValue: IAVCellRelationValue = {blockIDs: [], contents: []};
menuElement.querySelectorAll('[draggable="true"]').forEach(item => {
const id = item.getAttribute("data-id");

11
app/src/protyle/render/av/rollup.ts
View file

@ -5,9 +5,10 @@ import {fetchPost} from "../../../util/fetch";
import {escapeHtml} from "../../../util/escape";
import {transaction} from "../../wysiwyg/transaction";
import {unicode2Emoji} from "../../../emoji";
import {getColIconByType} from "./col";
import {getColIconByType, getColId} from "./col";
import {showMessage} from "../../../dialog/message";
import {getNameByOperator} from "./calc";
import {getFieldsByData} from "./view";
const updateCol = (options: {
target: HTMLElement,
@ -20,7 +21,7 @@ const updateCol = (options: {
return;
}
options.target.querySelector(".b3-menu__accelerator").textContent = itemElement.querySelector(".b3-list-item__text").textContent;
const colData = options.data.view.columns.find((item) => {
const colData = getFieldsByData(options.data).find((item) => {
if (item.id === options.colId) {
if (!item.rollup) {
item.rollup = {};
@ -166,8 +167,8 @@ export const getRollupHTML = (options: { data?: IAV, cellElements?: HTMLElement[
if (options.colData) {
colData = options.colData;
} else {
options.data.view.columns.find((item) => {
if (item.id === options.cellElements[0].dataset.colId) {
getFieldsByData(options.data).find((item) => {
if (item.id === getColId(options.cellElements[0], options.data.viewType)) {
colData = item;
return true;
}
@ -201,7 +202,7 @@ export const bindRollupData = (options: {
const goSearchRollupTargetElement = options.menuElement.querySelector('[data-type="goSearchRollupTarget"]') as HTMLElement;
let targetKeyAVId = "";
if (oldValue.relationKeyID) {
options.data.view.columns.find((item) => {
getFieldsByData(options.data).find((item) => {
if (item.id === oldValue.relationKeyID) {
goSearchRollupColElement.querySelector(".b3-menu__accelerator").textContent = item.name;
targetKeyAVId = item.relation.avID;

4
app/src/protyle/render/av/row.ts
View file

@ -16,9 +16,9 @@ import * as dayjs from "dayjs";
import {Constants} from "../../../constants";
import {insertGalleryItemAnimation} from "./gallery/item";
export const getFieldIdByCellElement = (cellElement: Element, viewType:TAVView): string => {
export const getFieldIdByCellElement = (cellElement: Element, viewType: TAVView): string => {
return (hasClosestByClassName(cellElement, viewType === "table" ? "av__row" : "av__gallery-item") as HTMLElement).dataset.id;
}
};
export const selectRow = (checkElement: Element, type: "toggle" | "select" | "unselect" | "unselectAll") => {
const rowElement = hasClosestByClassName(checkElement, "av__row");