mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-12-23 01:50:12 +01:00
🎨 Android 端图片复制 PNG 粘贴问题 https://github.com/siyuan-note/siyuan/issues/5494
This commit is contained in:
parent
4d48e8c613
commit
7399e531e0
3 changed files with 11 additions and 7 deletions
|
|
@ -7,7 +7,9 @@ import {
|
||||||
focusSideBlock,
|
focusSideBlock,
|
||||||
getEditorRange,
|
getEditorRange,
|
||||||
getSelectionOffset,
|
getSelectionOffset,
|
||||||
getSelectionPosition, setFirstNodeRange, setLastNodeRange
|
getSelectionPosition,
|
||||||
|
setFirstNodeRange,
|
||||||
|
setLastNodeRange
|
||||||
} from "../util/selection";
|
} from "../util/selection";
|
||||||
import {hasClosestBlock, hasClosestByAttribute, hasClosestByClassName, hasClosestByMatchTag} from "../util/hasClosest";
|
import {hasClosestBlock, hasClosestByAttribute, hasClosestByClassName, hasClosestByMatchTag} from "../util/hasClosest";
|
||||||
import {Link} from "./Link";
|
import {Link} from "./Link";
|
||||||
|
|
@ -18,11 +20,7 @@ import {mathRender} from "../markdown/mathRender";
|
||||||
import {getEventName} from "../util/compatibility";
|
import {getEventName} from "../util/compatibility";
|
||||||
import {upDownHint} from "../../util/upDownHint";
|
import {upDownHint} from "../../util/upDownHint";
|
||||||
import {highlightRender} from "../markdown/highlightRender";
|
import {highlightRender} from "../markdown/highlightRender";
|
||||||
import {
|
import {getContenteditableElement, hasNextSibling, hasPreviousSibling} from "../wysiwyg/getBlock";
|
||||||
getContenteditableElement,
|
|
||||||
hasNextSibling,
|
|
||||||
hasPreviousSibling
|
|
||||||
} from "../wysiwyg/getBlock";
|
|
||||||
import {processRender} from "../util/processCode";
|
import {processRender} from "../util/processCode";
|
||||||
import {BlockRef} from "./BlockRef";
|
import {BlockRef} from "./BlockRef";
|
||||||
import {hintMoveBlock, hintRef, hintRenderAssets, hintRenderTemplate, hintRenderWidget} from "../hint/extend";
|
import {hintMoveBlock, hintRef, hintRenderAssets, hintRenderTemplate, hintRenderWidget} from "../hint/extend";
|
||||||
|
|
@ -746,6 +744,12 @@ export class Toolbar {
|
||||||
});
|
});
|
||||||
}, 100);
|
}, 100);
|
||||||
/// #endif
|
/// #endif
|
||||||
|
|
||||||
|
// TODO: V,Android 端图片复制 PNG 粘贴问题 https://github.com/siyuan-note/siyuan/issues/5494
|
||||||
|
// if ("android" === window.siyuan.config.system.container && window.JSAndroid) {
|
||||||
|
// window.JSAndroid.writeImageClipboard(uri);
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@ export const writeText = async (text: string) => {
|
||||||
try {
|
try {
|
||||||
// navigator.clipboard.writeText 抛出异常不进入 catch,这里需要先处理移动端复制
|
// navigator.clipboard.writeText 抛出异常不进入 catch,这里需要先处理移动端复制
|
||||||
if ("android" === window.siyuan.config.system.container && window.JSAndroid) {
|
if ("android" === window.siyuan.config.system.container && window.JSAndroid) {
|
||||||
|
|
||||||
window.JSAndroid.writeClipboard(text);
|
window.JSAndroid.writeClipboard(text);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
1
app/src/types/index.d.ts
vendored
1
app/src/types/index.d.ts
vendored
|
|
@ -16,6 +16,7 @@ interface Window {
|
||||||
openExternal(url: string): void
|
openExternal(url: string): void
|
||||||
changeStatusBarColor(color: string, mode: number): void
|
changeStatusBarColor(color: string, mode: number): void
|
||||||
writeClipboard(text: string): void
|
writeClipboard(text: string): void
|
||||||
|
writeImageClipboard(uri: string): void
|
||||||
}
|
}
|
||||||
|
|
||||||
goBack(): void
|
goBack(): void
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue