0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🐛 fix https://github.com/siyuan-note/siyuan/issues/5751

Browse source
This commit is contained in:
Vanessa 2022-08-30 20:24:54 +08:00
parent a165cac78e
commit 107711469b
3 changed files with 6 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
app/src/editor/getIcon.ts
View file

@ -66,54 +66,3 @@ export const getIconByType = (type: string, sub?: string) => {
}
return iconName;
};
export const getIconByElement = (blockElement: HTMLElement) => {
let iconName = "iconParagraph";
let iconTitle = window.siyuan.languages.paragraph;
if (blockElement.tagName.indexOf("H") > -1) {
iconName = "icon" + blockElement.tagName;
iconTitle = window.siyuan.languages.headings;
} else if (blockElement.tagName === "BLOCKQUOTE") {
iconName = "iconQuote";
iconTitle = window.siyuan.languages.quote;
} else if (blockElement.tagName === "TABLE") {
iconName = "iconTable";
iconTitle = window.siyuan.languages.table;
} else if (blockElement.tagName === "UL" || blockElement.tagName === "OL") {
if (blockElement.firstElementChild.classList.contains("protyle-task")) {
iconName = "iconCheck";
iconTitle = window.siyuan.languages.check;
} else if (blockElement.tagName === "UL") {
iconName = "iconList";
iconTitle = window.siyuan.languages.list;
} else if (blockElement.tagName === "OL") {
iconName = "iconOrderedList";
iconTitle = window.siyuan.languages["ordered-list"];
}
} else if (blockElement.tagName === "LI") {
iconName = "iconMenu";
iconTitle = window.siyuan.languages.listItem;
} else {
switch (blockElement.getAttribute("data-type")) {
case "math-block":
iconName = "iconMath";
iconTitle = window.siyuan.languages.math;
break;
case "block-query-embed":
iconName = "iconSQL";
iconTitle = window.siyuan.languages.blockEmbed;
break;
case "super-block":
iconName = "iconSuper";
iconTitle = window.siyuan.languages.superBlock;
break;
case "html-block":
case "code-block":
case "yaml-front-matter":
iconName = "iconCode";
iconTitle = window.siyuan.languages.code;
break;
}
}
return {iconName, iconTitle};
};

5
app/src/protyle/util/hotKey.ts
View file

@ -56,7 +56,7 @@ export const matchHotKey = (hotKey: string, event: KeyboardEvent) => {
const keyCode = hotKeys.length === 3 ? hotKeys[2] : hotKeys[1];
if ((hotKeys.length === 3 ? isCtrl(event) : !isCtrl(event)) && event.altKey && !event.shiftKey &&
(
(/^[0-9]$/.test(keyCode) ? (event.code === "Digit" + keyCode || event.code === "Numpad" + keyCode) : event.code === "Key" + keyCode) ||
(/^[0-9]$/.test(keyCode) ? (event.code === "Digit" + keyCode || event.code === "Numpad" + keyCode) : event.code === "Key" + keyCode) ||
event.code === keyCode ||
(event.code === "Period" && keyCode === ".") ||
(event.code === "BracketLeft" && keyCode === "[") || (event.code === "BracketRight" && keyCode === "]")
@ -69,7 +69,8 @@ export const matchHotKey = (hotKey: string, event: KeyboardEvent) => {
// 是否匹配 ⇧⌘[] / ⌘[]
const hasShift = hotKeys.length > 2 && (hotKeys[0] === "⇧");
let key = (hasShift ? hotKeys[2] : hotKeys[1]);
if (hasShift && !/Mac/.test(navigator.platform)) {
if (hasShift // 更新 electron 后不需要判断 mac && !/Mac/.test(navigator.platform)
) {
if (key === "-") {
key = "_";
} else if (key === "=") {

5
app/src/protyle/util/paste.ts
View file

@ -208,7 +208,8 @@ export const paste = async (protyle: IProtyle, event: (ClipboardEvent | DragEven
const tempElement = document.createElement("div");
if (textHTML.startsWith(Constants.ZWSP)) {
// 剪切块内容后粘贴
tempElement.innerHTML = textHTML.substr(1);
// mac 复制后会带有 <meta charset="utf-8"> https://github.com/siyuan-note/siyuan/issues/5751
tempElement.innerHTML = textHTML.substr(1).replace('<meta charset="utf-8">', "");
let isBlock = false;
tempElement.querySelectorAll("[data-node-id]").forEach((e) => {
e.classList.remove("protyle-wysiwyg--select", "protyle-wysiwyg--hl");
@ -224,7 +225,7 @@ export const paste = async (protyle: IProtyle, event: (ClipboardEvent | DragEven
filterClipboardHint(protyle, tempMd);
} else if (textHTML.endsWith(Constants.ZWSP)) {
// 编辑器内部粘贴
tempElement.innerHTML = textHTML.substr(0, textHTML.length - 1);
tempElement.innerHTML = textHTML.substr(0, textHTML.length - 1).replace('<meta charset="utf-8">', "");
tempElement.querySelectorAll("[data-node-id]").forEach((e) => {
const newId = Lute.NewNodeID();
e.setAttribute("data-node-id", newId);