Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 15:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 8a1ac8c568 into 7217c66636

Browse source
This commit is contained in:
Jeffrey Chen 2025-12-16 17:04:19 +08:00 • committed by GitHub
commit b4ac1c30ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/src/protyle/util/compatibility.ts
View file

@ -27,6 +27,21 @@ export const encodeBase64 = (text: string): string => {
}; };
export const getTextSiyuanFromTextHTML = (html: string) => { export const getTextSiyuanFromTextHTML = (html: string) => {
const trimmedHtml = html.trimStart();
if (trimmedHtml.startsWith("<html")) {
const htmlTagEnd = trimmedHtml.indexOf(">");
if (htmlTagEnd > 0) {
const htmlTag = trimmedHtml.substring(0, htmlTagEnd);
// 兼容 Microsoft Excel 应用，HTML 以包含 Excel 命名空间声明的 html 元素开头（备注：从 WPS 复制也有这个命名空间）
if (htmlTag.includes('xmlns:x="urn:schemas-microsoft-com:office:excel"')) {
// 粘贴表格不需要解析 textSiyuan https://ld246.com/article/1763027417781/comment/1763032527460#comments
return {
textSiyuan: "",
textHtml: html.replace(/<!--data-siyuan='[^']+'-->/g, "")
};
}
}
}
const siyuanMatch = html.match(/<!--data-siyuan='([^']+)'-->/); const siyuanMatch = html.match(/<!--data-siyuan='([^']+)'-->/);
let textSiyuan = ""; let textSiyuan = "";
let textHtml = html; let textHtml = html;
@ -41,7 +56,7 @@ export const getTextSiyuanFromTextHTML = (html: string) => {
textSiyuan = decoder.decode(bytes); textSiyuan = decoder.decode(bytes);
} }
// 移除注释节点，保持原有的 text/html 内容 // 移除注释节点，保持原有的 text/html 内容
textHtml = html.replace(/<!--data-siyuan='[^']+'-->/, ""); textHtml = html.replace(/<!--data-siyuan='[^']+'-->/g, "");
} catch (e) { } catch (e) {
console.log("Failed to decode siyuan data from HTML comment:", e); console.log("Failed to decode siyuan data from HTML comment:", e);
} }