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

🐛 "backslash", "virtual-block-ref", "search-mark" 只能单独存在

Browse source
This commit is contained in:
Vanessa 2022-09-26 22:11:36 +08:00
parent e323f07ccc
commit eca37cc255
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/src/protyle/toolbar/index.ts
View file

@ -409,6 +409,13 @@ export class Toolbar {
}
} else {
let types = (item.getAttribute("data-type") || "").split(" ");
for (let i = 0; i < types.length; i++) {
// "backslash", "virtual-block-ref", "search-mark" 只能单独存在
if (["backslash", "virtual-block-ref", "search-mark"].includes(types[i])) {
types.splice(i, 1);
i--;
}
}
types.push(type);
// 上标和下标不能同时存在 https://github.com/siyuan-note/insider/issues/1049
if (type === "sub" && types.includes("sup")) {
@ -431,18 +438,18 @@ export class Toolbar {
return true;
}
});
} else if (type === "block-ref" && (types.includes("virtual-block-ref") || types.includes("a") || types.includes("search-mark"))) {
// 虚拟引用和引用、链接、搜索高亮不能同时存在
} else if (type === "block-ref" && types.includes("a")) {
// 虚拟引用和链接不能同时存在
types.find((item, index) => {
if (item === "virtual-block-ref" || item === "a" || item === "search-mark") {
if (item === "a") {
types.splice(index, 1);
return true;
}
});
} else if (type === "a" && (types.includes("virtual-block-ref") || types.includes("block-ref") || types.includes("search-mark"))) {
// 链接和引用、虚拟引用、搜索高亮不能同时存在
} else if (type === "a" && types.includes("block-ref")) {
// 链接和引用不能同时存在
types.find((item, index) => {
if (item === "virtual-block-ref" || item === "block-ref" || item === "search-mark") {
if (item === "block-ref") {
types.splice(index, 1);
return true;
}