Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-05 23:21:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 fix https://github.com/siyuan-note/siyuan/issues/10796

Browse source
This commit is contained in:
Vanessa 2024-03-30 12:11:34 +08:00
parent 9a6e8d4220
commit 28a790f7eb
1 changed files with 42 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
import {Menu} from "../../../plugin/Menu";
import {transaction} from "../../wysiwyg/transaction";
import {hasClosestBlock, hasClosestByClassName} from "../../util/hasClosest";
import {fetchSyncPost} from "../../../util/fetch";
const calcItem = (options: {
menu: Menu,
@ -74,17 +75,17 @@ const calcItem = (options: {
});
};
export const openCalcMenu = (protyle: IProtyle, calcElement: HTMLElement, panelData?: {
export const openCalcMenu = async (protyle: IProtyle, calcElement: HTMLElement, panelData?: {
data: IAV,
colId: string,
blockID: string
}) => {
let rowElement: HTMLElement | false;
let type;
let colId;
let avId;
let oldOperator;
let blockID;
let colId: string;
let avId: string;
let oldOperator: string;
let blockID: string;
if (panelData) {
avId = panelData.data.id;
type = calcElement.dataset.colType as TAVCol;
@ -250,7 +251,42 @@ export const openCalcMenu = (protyle: IProtyle, calcElement: HTMLElement, panelD
target: calcElement
});
}
if (["number", "template"].includes(type)) {
let rollupIsNumber = false
if (type === "rollup") {
let relationKeyID: string
let keyID: string
let avData = panelData?.data
if (!avData) {
const avResponse = await fetchSyncPost("api/av/renderAttributeView", {id: avId});
avData = avResponse.data;
}
avData.view.columns.find((item) => {
if (item.id === colId) {
relationKeyID = item.rollup?.relationKeyID;
keyID = item.rollup?.keyID;
return true
}
})
if (relationKeyID && keyID) {
let relationAvId: string
avData.view.columns.find((item) => {
if (item.id === relationKeyID) {
relationAvId = item.relation?.avID;
return true
}
})
if (relationAvId) {
const colResponse = await fetchSyncPost("api/av/getAttributeView", {id: relationAvId})
colResponse.data.av.keyValues.find((item: { key: { id: string, name: string, type: TAVCol } }) => {
if (item.key.id === keyID) {
rollupIsNumber = item.key.type === "number"
return true
}
})
}
}
}
if (["number", "template"].includes(type) || rollupIsNumber) {
calcItem({
menu,
protyle,