github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-18 01:50:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vanessa 2023-01-31 21:05:45 +08:00
parent 713b31788a
commit 2b9a618133
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/protyle/util/paste.ts
View File

@ -31,7 +31,7 @@ const filterClipboardHint = (protyle: IProtyle, textPlain: string) => {
}; };
export const pasteAsPlainText = async (protyle: IProtyle) => { export const pasteAsPlainText = async (protyle: IProtyle) => {
/// #if !BROWSER && !MOBILE /// #if !BROWSER
let localFiles: string[] = []; let localFiles: string[] = [];
if ("darwin" === window.siyuan.config.system.os) { if ("darwin" === window.siyuan.config.system.os) {
const xmlString = clipboard.read("NSFilenamesPboardType"); const xmlString = clipboard.read("NSFilenamesPboardType");
@ -49,9 +49,9 @@ export const pasteAsPlainText = async (protyle: IProtyle) => {
if (localFiles.length > 0) { if (localFiles.length > 0) {
uploadLocalFiles(localFiles, protyle, false); uploadLocalFiles(localFiles, protyle, false);
writeText(""); writeText("");
} else {
getCurrentWindow().webContents.pasteAndMatchStyle();
} }
/// #else
getCurrentWindow().webContents.pasteAndMatchStyle();
/// #endif /// #endif
}; };
@ -101,10 +101,10 @@ export const paste = async (protyle: IProtyle, event: (ClipboardEvent | DragEven
if (textPlain.endsWith(Constants.ZWSP) && !textHTML) { if (textPlain.endsWith(Constants.ZWSP) && !textHTML) {
textHTML = textPlain; textHTML = textPlain;
} }
/// #if !MOBILE /// #if !BROWSER
// 不再支持 PC 浏览器 https://github.com/siyuan-note/siyuan/issues/7206
if (!textHTML && !textPlain && ("clipboardData" in event)) { if (!textHTML && !textPlain && ("clipboardData" in event)) {
if ("darwin" === window.siyuan.config.system.os) { if ("darwin" === window.siyuan.config.system.os) {
/// #if !BROWSER
const xmlString = clipboard.read("NSFilenamesPboardType"); const xmlString = clipboard.read("NSFilenamesPboardType");
const domParser = new DOMParser(); const domParser = new DOMParser();
const xmlDom = domParser.parseFromString(xmlString, "application/xml"); const xmlDom = domParser.parseFromString(xmlString, "application/xml");
@ -117,7 +117,6 @@ export const paste = async (protyle: IProtyle, event: (ClipboardEvent | DragEven
writeText(""); writeText("");
return; return;
} }
/// #endif
} else { } else {
const xmlString = await fetchSyncPost("/api/clipboard/readFilePaths", {}); const xmlString = await fetchSyncPost("/api/clipboard/readFilePaths", {});
if (xmlString.data.length > 0) { if (xmlString.data.length > 0) {