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/6864

Browse source
This commit is contained in:
Vanessa 2022-12-29 15:13:37 +08:00
parent 5f2f97db79
commit 6148e5fd29
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/menus/protyle.ts
View file

@ -1063,12 +1063,13 @@ export const tableMenu = (protyle: IProtyle, nodeElement: Element, cellElement:
});
}
const thMatchElement = nodeElement.querySelectorAll("col")[colIndex];
if (thMatchElement.style.width) {
if (thMatchElement.style.width || thMatchElement.style.minWidth) {
menus.push({
label: window.siyuan.languages.useDefaultWidth,
click: () => {
const html = nodeElement.outerHTML;
thMatchElement.style.width = "";
thMatchElement.style.minWidth = "";
updateTransaction(protyle, nodeElement.getAttribute("data-node-id"), nodeElement.outerHTML, html);
}
});

4
app/src/protyle/hint/index.ts
View file

@ -593,7 +593,7 @@ ${unicode2Emoji(emoji.unicode, true)}</button>`;
// https://github.com/siyuan-note/siyuan/issues/6864
if (nodeElement.getAttribute("data-type") === "NodeTable") {
nodeElement.querySelectorAll("colgroup col").forEach((item: HTMLElement) => {
item.style.width = "80px";
item.style.minWidth = "60px";
});
newHTML = nodeElement.outerHTML;
}
@ -610,7 +610,7 @@ ${unicode2Emoji(emoji.unicode, true)}</button>`;
// https://github.com/siyuan-note/siyuan/issues/6864
if (nodeElement.getAttribute("data-type") === "NodeTable") {
nodeElement.querySelectorAll("colgroup col").forEach((item: HTMLElement) => {
item.style.width = "80px";
item.style.minWidth = "60px";
});
}
transaction(protyle, [{

5
app/src/protyle/wysiwyg/index.ts
View file

@ -389,6 +389,11 @@ export class WYSIWYG {
const id = nodeElement.getAttribute("data-node-id");
const x = event.clientX;
const colElement = nodeElement.querySelectorAll("table col")[parseInt(target.getAttribute("data-col-index"))] as HTMLElement;
// 清空初始化 table 时的最小宽度
if (colElement.style.minWidth) {
colElement.style.width = colElement.style.minWidth;
colElement.style.minWidth = "";
}
// 兼容 1.8.2
(nodeElement.querySelectorAll("table th")[parseInt(target.getAttribute("data-col-index"))] as HTMLElement).style.width = "";
const oldWidth = colElement.clientWidth;