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

🐛 fix https://github.com/siyuan-note/siyuan/issues/5973

Browse source
This commit is contained in:
Vanessa 2022-09-26 21:47:35 +08:00
parent d85ede2b48
commit 5162792372
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -127,7 +127,7 @@ export class Toolbar {
});
const types = this.getCurrentType();
types.forEach(item => {
if (["a", "block-ref", "virtual-block-ref", "text", "file-annotation-ref", "inline-math", "inline-memo", ""].includes(item)) {
if (["search-mark", "a", "block-ref", "virtual-block-ref", "text", "file-annotation-ref", "inline-math", "inline-memo", ""].includes(item)) {
return;
}
this.element.querySelector(`[data-type="${item}"]`).classList.add("protyle-toolbar__item--current");
@ -427,18 +427,18 @@ export class Toolbar {
return true;
}
});
} else if (type === "block-ref" && (types.includes("virtual-block-ref") || types.includes("a"))) {
// 虚拟引用和引用、链接不能同时存在
} else if (type === "block-ref" && (types.includes("virtual-block-ref") || types.includes("a") || types.includes("search-mark"))) {
// 虚拟引用和引用、链接、搜索高亮不能同时存在
types.find((item, index) => {
if (item === "virtual-block-ref" || item === "a") {
if (item === "virtual-block-ref" || item === "a" || item === "search-mark") {
types.splice(index, 1);
return true;
}
});
} else if (type === "a" && (types.includes("virtual-block-ref") || types.includes("block-ref"))) {
// 链接和引用、虚拟引用不能同时存在
} else if (type === "a" && (types.includes("virtual-block-ref") || types.includes("block-ref") || types.includes("search-mark"))) {
// 链接和引用、虚拟引用、搜索高亮不能同时存在
types.find((item, index) => {
if (item === "virtual-block-ref" || item === "block-ref") {
if (item === "virtual-block-ref" || item === "block-ref" || item === "search-mark") {
types.splice(index, 1);
return true;
}