diff --git a/app/appearance/icons/ant/icon.js b/app/appearance/icons/ant/icon.js index ae854040b..350fac0c9 100644 --- a/app/appearance/icons/ant/icon.js +++ b/app/appearance/icons/ant/icon.js @@ -1,5 +1,9 @@ document.body.insertAdjacentHTML('afterbegin', ` + + + + diff --git a/app/appearance/icons/ant/icon.json b/app/appearance/icons/ant/icon.json index 367e6739e..ea9bfc75c 100644 --- a/app/appearance/icons/ant/icon.json +++ b/app/appearance/icons/ant/icon.json @@ -2,5 +2,5 @@ "name": "ant", "author": "Vanessa", "url": "https://github.com/Vanessa219", - "version": "1.34.0" + "version": "1.35.0" } diff --git a/app/appearance/icons/index.html b/app/appearance/icons/index.html index cdb5c92a7..5e3915256 100644 --- a/app/appearance/icons/index.html +++ b/app/appearance/icons/index.html @@ -28,6 +28,12 @@

SiYuan

+
+ + + + iconGroups +
diff --git a/app/appearance/icons/material/icon.js b/app/appearance/icons/material/icon.js index 821ee66c0..d135261df 100644 --- a/app/appearance/icons/material/icon.js +++ b/app/appearance/icons/material/icon.js @@ -1,5 +1,9 @@ document.body.insertAdjacentHTML('afterbegin', ` + + + + diff --git a/app/appearance/icons/material/icon.json b/app/appearance/icons/material/icon.json index 264ee759f..a0662f78a 100644 --- a/app/appearance/icons/material/icon.json +++ b/app/appearance/icons/material/icon.json @@ -2,5 +2,5 @@ "name": "material", "author": "Vanessa", "url": "https://github.com/Vanessa219", - "version": "1.34.0" + "version": "1.35.0" } diff --git a/app/src/layout/dock/Files.ts b/app/src/layout/dock/Files.ts index 4459c92ac..a2c8498a7 100644 --- a/app/src/layout/dock/Files.ts +++ b/app/src/layout/dock/Files.ts @@ -173,18 +173,6 @@ export class Files extends Model { event.stopPropagation(); event.preventDefault(); break; - } else if (type === "remove") { - confirmDialog(window.siyuan.languages.deleteOpConfirm, - `${window.siyuan.languages.confirmDelete} ${escapeHtml(target.parentElement.querySelector(".b3-list-item__text").textContent)}?`, () => { - fetchPost("/api/notebook/removeNotebook", { - notebook: target.getAttribute("data-url"), - callback: Constants.CB_MOUNT_REMOVE - }); - }, undefined, true); - window.siyuan.menus.menu.remove(); - event.stopPropagation(); - event.preventDefault(); - break; } else if (type === "open") { fetchPost("/api/notebook/openNotebook", { notebook: target.getAttribute("data-url") @@ -808,14 +796,14 @@ export class Files extends Model { private genNotebook(item: INotebook) { const emojiHTML = `${unicode2Emoji(item.icon || window.siyuan.storage[Constants.LOCAL_IMAGES].note)}`; if (item.closed) { - return `
  • + return `
  • ${emojiHTML} - ${escapeHtml(item.name)} - - + ${escapeHtml(item.name)} + +
    • `; } else { diff --git a/app/src/mobile/dock/MobileFiles.ts b/app/src/mobile/dock/MobileFiles.ts index 5bc672843..0dc7a2634 100644 --- a/app/src/mobile/dock/MobileFiles.ts +++ b/app/src/mobile/dock/MobileFiles.ts @@ -176,17 +176,6 @@ export class MobileFiles extends Model { event.stopPropagation(); event.preventDefault(); break; - } else if (type === "remove") { - confirmDialog(window.siyuan.languages.deleteOpConfirm, - `${window.siyuan.languages.confirmDelete} ${escapeHtml(target.parentElement.querySelector(".b3-list-item__text").textContent)}?`, () => { - fetchPost("/api/notebook/removeNotebook", { - notebook: target.getAttribute("data-url"), - callback: Constants.CB_MOUNT_REMOVE - }); - }, undefined, true); - event.stopPropagation(); - event.preventDefault(); - break; } else if (type === "open") { fetchPost("/api/notebook/openNotebook", { notebook: target.getAttribute("data-url") @@ -309,14 +298,14 @@ export class MobileFiles extends Model { private genNotebook(item: INotebook) { const emojiHTML = `${unicode2Emoji(item.icon || window.siyuan.storage[Constants.LOCAL_IMAGES].note)}`; if (item.closed) { - return `
  • + return `
  • ${emojiHTML} ${escapeHtml(item.name)} - - + +
    • `; } else { diff --git a/app/src/mobile/menu/search.ts b/app/src/mobile/menu/search.ts index d31efa8ec..22b11960d 100644 --- a/app/src/mobile/menu/search.ts +++ b/app/src/mobile/menu/search.ts @@ -752,7 +752,7 @@ export const popSearch = (app: App, searchConfig?: any) => {
    - + diff --git a/app/src/search/util.ts b/app/src/search/util.ts index 3fa58a10e..9d7e46d39 100644 --- a/app/src/search/util.ts +++ b/app/src/search/util.ts @@ -106,7 +106,7 @@ export const genSearch = (app: App, config: Config.IUILayoutTabSearchConfig, ele - + @@ -494,6 +494,11 @@ export const genSearch = (app: App, config: Config.IUILayoutTabSearchConfig, ele event.preventDefault(); break; } else if (target.id === "searchInclude") { + event.stopPropagation(); + event.preventDefault(); + if (target.hasAttribute("disabled")) { + return; + } const svgElement = target.firstElementChild; svgElement.classList.toggle("ft__primary"); if (!svgElement.classList.contains("ft__primary")) { @@ -511,8 +516,6 @@ export const genSearch = (app: App, config: Config.IUILayoutTabSearchConfig, ele } config.page = 1; inputEvent(element, config, edit, true); - event.stopPropagation(); - event.preventDefault(); break; } else if (target.id === "searchReplace") { // ctrl+P 不需要保存