mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-12-19 08:00:13 +01:00
🚨
This commit is contained in:
Vanessa
parent
7557c77b9f
commit
671f182d5c
6 changed files with 26 additions and 28 deletions
|
|
@ -146,7 +146,7 @@ export const openCardByData = (cardsData: {
|
|||
const actionElements = dialog.element.querySelectorAll(".card__action");
|
||||
const filterElement = dialog.element.querySelector('[data-type="filter"]');
|
||||
const fetchNewRound = () => {
|
||||
const currentCardType = filterElement.getAttribute("data-cardtype")
|
||||
const currentCardType = filterElement.getAttribute("data-cardtype");
|
||||
fetchPost(currentCardType === "all" ? "/api/riff/getRiffDueCards" :
|
||||
(currentCardType === "doc" ? "/api/riff/getTreeRiffDueCards" : "/api/riff/getNotebookRiffDueCards"), {
|
||||
rootID: filterElement.getAttribute("data-id"),
|
||||
|
|
@ -167,7 +167,7 @@ export const openCardByData = (cardsData: {
|
|||
allDone(countElement, editor, actionElements);
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
dialog.element.addEventListener("click", (event) => {
|
||||
const target = event.target as HTMLElement;
|
||||
|
|
@ -212,9 +212,9 @@ export const openCardByData = (cardsData: {
|
|||
iconHTML: Constants.ZWSP,
|
||||
label: window.siyuan.languages.all,
|
||||
click() {
|
||||
filterElement.setAttribute("data-id", "")
|
||||
filterElement.setAttribute("data-cardtype", "all")
|
||||
fetchNewRound()
|
||||
filterElement.setAttribute("data-id", "");
|
||||
filterElement.setAttribute("data-cardtype", "all");
|
||||
fetchNewRound();
|
||||
},
|
||||
}).element);
|
||||
window.siyuan.menus.menu.append(new MenuItem({
|
||||
|
|
@ -222,10 +222,10 @@ export const openCardByData = (cardsData: {
|
|||
label: window.siyuan.languages.fileTree,
|
||||
click() {
|
||||
movePathTo((toPath, toNotebook) => {
|
||||
filterElement.setAttribute("data-id", toPath[0] === "/" ? toNotebook[0] : getDisplayName(toPath[0], true, true))
|
||||
filterElement.setAttribute("data-cardtype", toPath[0] === "/" ? "notebook" : "doc")
|
||||
filterElement.setAttribute("data-id", toPath[0] === "/" ? toNotebook[0] : getDisplayName(toPath[0], true, true));
|
||||
filterElement.setAttribute("data-cardtype", toPath[0] === "/" ? "notebook" : "doc");
|
||||
fetchNewRound();
|
||||
}, [], undefined, window.siyuan.languages.specifyPath, true)
|
||||
}, [], undefined, window.siyuan.languages.specifyPath, true);
|
||||
}
|
||||
}).element);
|
||||
window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);
|
||||
|
|
@ -234,9 +234,9 @@ export const openCardByData = (cardsData: {
|
|||
iconHTML: Constants.ZWSP,
|
||||
label: escapeHtml(title),
|
||||
click() {
|
||||
filterElement.setAttribute("data-id", id)
|
||||
filterElement.setAttribute("data-cardtype", cardType)
|
||||
fetchNewRound()
|
||||
filterElement.setAttribute("data-id", id);
|
||||
filterElement.setAttribute("data-cardtype", cardType);
|
||||
fetchNewRound();
|
||||
},
|
||||
}).element);
|
||||
window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);
|
||||
|
|
@ -246,13 +246,13 @@ export const openCardByData = (cardsData: {
|
|||
iconHTML: Constants.ZWSP,
|
||||
label: escapeHtml(deck.name),
|
||||
click() {
|
||||
filterElement.setAttribute("data-id", deck.id)
|
||||
filterElement.setAttribute("data-cardtype", "all")
|
||||
fetchNewRound()
|
||||
filterElement.setAttribute("data-id", deck.id);
|
||||
filterElement.setAttribute("data-cardtype", "all");
|
||||
fetchNewRound();
|
||||
},
|
||||
}).element);
|
||||
});
|
||||
const filterRect = filterTempElement.getBoundingClientRect()
|
||||
const filterRect = filterTempElement.getBoundingClientRect();
|
||||
window.siyuan.menus.menu.popup({x: filterRect.left, y: filterRect.bottom});
|
||||
});
|
||||
event.stopPropagation();
|
||||
|
|
@ -326,7 +326,7 @@ export const openCardByData = (cardsData: {
|
|||
/// #endif
|
||||
index++;
|
||||
if (index > blocks.length - 1) {
|
||||
const currentCardType = filterElement.getAttribute("data-cardtype")
|
||||
const currentCardType = filterElement.getAttribute("data-cardtype");
|
||||
fetchPost(currentCardType === "all" ? "/api/riff/getRiffDueCards" :
|
||||
(currentCardType === "doc" ? "/api/riff/getTreeRiffDueCards" : "/api/riff/getNotebookRiffDueCards"), {
|
||||
rootID: filterElement.getAttribute("data-id"),
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ import {countBlockWord, countSelectWord} from "../layout/status";
|
|||
import {showMessage} from "../dialog/message";
|
||||
import {getSearch} from "../util/functions";
|
||||
|
||||
export const openFileById = (options: {
|
||||
export const openFileById = async (options: {
|
||||
id: string,
|
||||
position?: string,
|
||||
mode?: TEditorMode,
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ import {getDockByType} from "../layout/util";
|
|||
import {Files} from "../layout/dock/Files";
|
||||
import {openNewWindowById} from "../window/openNewWindow";
|
||||
import {openCardByData} from "../card/openCard";
|
||||
import {escapeHtml} from "../util/escape";
|
||||
/// #if MOBILE
|
||||
import {closePanel} from "../mobile/util/closePanel";
|
||||
/// #endif
|
||||
|
|
|
|||
|
|
@ -598,7 +598,7 @@ export const imgMenu = (protyle: IProtyle, range: Range, assetElement: HTMLEleme
|
|||
fetchPost("/api/asset/getImageOCRText", {
|
||||
path: imgElement.getAttribute("src"),
|
||||
force: true
|
||||
})
|
||||
});
|
||||
}
|
||||
}, {
|
||||
iconHTML: Constants.ZWSP,
|
||||
|
|
@ -608,8 +608,8 @@ export const imgMenu = (protyle: IProtyle, range: Range, assetElement: HTMLEleme
|
|||
path: imgElement.getAttribute("src"),
|
||||
force: false
|
||||
}, (response) => {
|
||||
element.querySelector("textarea").value = response.data.text
|
||||
})
|
||||
element.querySelector("textarea").value = response.data.text;
|
||||
});
|
||||
}
|
||||
}],
|
||||
}).element);
|
||||
|
|
@ -708,7 +708,7 @@ export const imgMenu = (protyle: IProtyle, range: Range, assetElement: HTMLEleme
|
|||
const textElements = window.siyuan.menus.menu.element.querySelectorAll("textarea");
|
||||
textElements[0].focus();
|
||||
window.siyuan.menus.menu.removeCB = () => {
|
||||
const ocrElemennt = window.siyuan.menus.menu.element.querySelector('[data-type="ocr"]') as HTMLTextAreaElement
|
||||
const ocrElemennt = window.siyuan.menus.menu.element.querySelector('[data-type="ocr"]') as HTMLTextAreaElement;
|
||||
if (ocrElemennt) {
|
||||
fetchPost("/api/asset/setImageOCRText", {
|
||||
path: imgElement.getAttribute("src"),
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ import {getCurrentWindow} from "@electron/remote";
|
|||
import {Constants} from "../../constants";
|
||||
import {matchHotKey} from "../util/hotKey";
|
||||
import {readText, updateHotkeyTip, writeText} from "../util/compatibility";
|
||||
import {escapeHtml} from "../../util/escape";
|
||||
import * as dayjs from "dayjs";
|
||||
import {setPanelFocus} from "../../layout/util";
|
||||
import {updatePanelByEditor} from "../../editor/util";
|
||||
|
|
|
|||
|
|
@ -187,8 +187,8 @@ export class WYSIWYG {
|
|||
|
||||
private emojiToMd(element:HTMLElement) {
|
||||
element.querySelectorAll(".emoji").forEach((item: HTMLElement) => {
|
||||
item.outerHTML = `:${item.getAttribute("alt")}:`
|
||||
})
|
||||
item.outerHTML = `:${item.getAttribute("alt")}:`;
|
||||
});
|
||||
}
|
||||
|
||||
private bindCommonEvent(protyle: IProtyle) {
|
||||
|
|
@ -263,11 +263,11 @@ export class WYSIWYG {
|
|||
} else if (!["DIV", "TD", "TH", "TR"].includes(range.startContainer.parentElement.tagName)) {
|
||||
// 复制行内元素 https://github.com/siyuan-note/insider/issues/191
|
||||
tempElement.append(range.startContainer.parentElement.cloneNode(true));
|
||||
this.emojiToMd(tempElement)
|
||||
this.emojiToMd(tempElement);
|
||||
} else {
|
||||
// 直接复制块 https://github.com/siyuan-note/insider/issues/318
|
||||
tempElement.append(range.cloneContents());
|
||||
this.emojiToMd(tempElement)
|
||||
this.emojiToMd(tempElement);
|
||||
}
|
||||
html = tempElement.innerHTML;
|
||||
} else if (selectImgElement) {
|
||||
|
|
@ -289,7 +289,7 @@ export class WYSIWYG {
|
|||
html = spanElement.outerHTML;
|
||||
} else {
|
||||
tempElement.append(range.cloneContents());
|
||||
this.emojiToMd(tempElement)
|
||||
this.emojiToMd(tempElement);
|
||||
const inlineMathElement = hasClosestByAttribute(range.commonAncestorContainer, "data-type", "inline-math");
|
||||
if (inlineMathElement) {
|
||||
// 表格内复制数学公式 https://ld246.com/article/1631708573504
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue