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

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

Browse source
This commit is contained in:
Vanessa 2025-09-30 21:32:48 +08:00
parent 34ee895445
commit 333eaf5f8b
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/src/protyle/render/av/cell.ts
View file

@ -4,7 +4,7 @@ import {openMenuPanel} from "./openMenuPanel";
import {updateAttrViewCellAnimation} from "./action"; import {updateAttrViewCellAnimation} from "./action";
import {isNotCtrl} from "../../util/compatibility"; import {isNotCtrl} from "../../util/compatibility";
import {isDynamicRef, objEquals} from "../../../util/functions"; import {isDynamicRef, objEquals} from "../../../util/functions";
import {fetchPost} from "../../../util/fetch"; import {fetchPost, fetchSyncPost} from "../../../util/fetch";
import {focusBlock, focusByRange} from "../../util/selection"; import {focusBlock, focusByRange} from "../../util/selection";
import * as dayjs from "dayjs"; import * as dayjs from "dayjs";
import {unicode2Emoji} from "../../../emoji"; import {unicode2Emoji} from "../../../emoji";
@ -705,8 +705,8 @@ const updateCellValueByInput = (protyle: IProtyle, type: TAVCol, blockElement: H
}); });
}; };
export const updateCellsValue = (protyle: IProtyle, nodeElement: HTMLElement, value?: any, export const updateCellsValue = async (protyle: IProtyle, nodeElement: HTMLElement, value?: any,
cElements?: HTMLElement[], columns?: IAVColumn[], html?: string, getOperations = false) => { cElements?: HTMLElement[], columns?: IAVColumn[], html?: string, getOperations = false) => {
const doOperations: IOperation[] = []; const doOperations: IOperation[] = [];
const undoOperations: IOperation[] = []; const undoOperations: IOperation[] = [];
@ -729,7 +729,8 @@ export const updateCellsValue = (protyle: IProtyle, nodeElement: HTMLElement, va
} }
const isCustomAttr = hasClosestByClassName(cellElements[0], "custom-attr"); const isCustomAttr = hasClosestByClassName(cellElements[0], "custom-attr");
const viewType = nodeElement.getAttribute("data-av-type") as TAVView; const viewType = nodeElement.getAttribute("data-av-type") as TAVView;
cellElements.forEach((item: HTMLElement, elementIndex) => { for (let elementIndex = 0; elementIndex < cellElements.length; elementIndex++) {
let item = cellElements[elementIndex] as HTMLElement;
const rowID = getFieldIdByCellElement(item, viewType); const rowID = getFieldIdByCellElement(item, viewType);
if (!rowID) { if (!rowID) {
return; return;
@ -866,6 +867,11 @@ export const updateCellsValue = (protyle: IProtyle, nodeElement: HTMLElement, va
} }
// formattedContent 在单元格渲染时没有用到，需对比保持一致 // formattedContent 在单元格渲染时没有用到，需对比保持一致
if (type === "date") { if (type === "date") {
if (!(value && typeof value === "object" && typeof value.isNotTime === "boolean")) {
const response = await fetchSyncPost("/api/av/getAttributeViewKeysByID", {avID: avID, keyIDs: [colId]});
cellValue.date.isNotTime = true;
}
cellValue.date.formattedContent = oldValue.date.formattedContent; cellValue.date.formattedContent = oldValue.date.formattedContent;
} }
if (objEquals(cellValue, oldValue)) { if (objEquals(cellValue, oldValue)) {
@ -894,7 +900,7 @@ export const updateCellsValue = (protyle: IProtyle, nodeElement: HTMLElement, va
} else { } else {
updateAttrViewCellAnimation(item, cellValue); updateAttrViewCellAnimation(item, cellValue);
} }
}); }
if (getOperations) { if (getOperations) {
return {doOperations, undoOperations}; return {doOperations, undoOperations};
} }

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

@ -1405,7 +1405,7 @@ export const openMenuPanel = (options: {
content: null, content: null,
content2: null, content2: null,
hasEndDate: false, hasEndDate: false,
isNotTime: !colData.date.fillSpecificTime, isNotTime: colData.date ? !colData.date.fillSpecificTime : true,
}, options.cellElements); }, options.cellElements);
avPanelElement.remove(); avPanelElement.remove();
event.preventDefault(); event.preventDefault();