github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-17 09:30:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

🚨

Browse Source
This commit is contained in:
Vanessa 2023-10-31 09:46:19 +08:00
parent 98692c85df
commit 22a4fd9285
9 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/ai/actions.ts
View File

@ -49,7 +49,7 @@ export const AIActions = (elements: Element[], protyle: IProtyle) => {
</div>`, </div>`,
width: isMobile() ? "92vw" : "520px", width: isMobile() ? "92vw" : "520px",
}); });
const nameElement = dialog.element.querySelector("input") const nameElement = dialog.element.querySelector("input");
const customElement = dialog.element.querySelector("textarea"); const customElement = dialog.element.querySelector("textarea");
const btnsElement = dialog.element.querySelectorAll(".b3-button"); const btnsElement = dialog.element.querySelectorAll(".b3-button");
dialog.bindInput(customElement, () => { dialog.bindInput(customElement, () => {
@ -60,8 +60,8 @@ export const AIActions = (elements: Element[], protyle: IProtyle) => {
}); });
btnsElement[1].addEventListener("click", () => { btnsElement[1].addEventListener("click", () => {
if (!customElement.value) { if (!customElement.value) {
showMessage(window.siyuan.languages["_kernel"][142]) showMessage(window.siyuan.languages["_kernel"][142]);
return return;
} }
fetchPost("/api/ai/chatGPTWithAction", { fetchPost("/api/ai/chatGPTWithAction", {
ids, ids,
@ -73,8 +73,8 @@ export const AIActions = (elements: Element[], protyle: IProtyle) => {
}); });
btnsElement[2].addEventListener("click", () => { btnsElement[2].addEventListener("click", () => {
if (!nameElement.value && !customElement.value) { if (!nameElement.value && !customElement.value) {
showMessage(window.siyuan.languages["_kernel"][142]) showMessage(window.siyuan.languages["_kernel"][142]);
return return;
} }
window.siyuan.storage[Constants.LOCAL_AI].push({ window.siyuan.storage[Constants.LOCAL_AI].push({
name: nameElement.value, name: nameElement.value,
@ -149,7 +149,7 @@ export const AIActions = (elements: Element[], protyle: IProtyle) => {
}); });
dialog.destroy(); dialog.destroy();
}); });
nameElement.focus() nameElement.focus();
} else { } else {
fetchPost("/api/ai/chatGPTWithAction", { fetchPost("/api/ai/chatGPTWithAction", {
ids, ids,

4
app/src/block/util.ts
View File

@ -88,9 +88,9 @@ export const jumpToParentNext = (protyle: IProtyle, nodeElement: Element) => {
zoomOut({ zoomOut({
protyle, protyle,
id: response.data.id, id: response.data.id,
}) });
} }
}) });
} }
} }
}; };

1
app/src/boot/onGetConfig.ts
View File

@ -29,7 +29,6 @@ import {App} from "../index";
import {initWindowEvent} from "./globalEvent/event"; import {initWindowEvent} from "./globalEvent/event";
import {sendGlobalShortcut} from "./globalEvent/keydown"; import {sendGlobalShortcut} from "./globalEvent/keydown";
import {closeWindow} from "../window/closeWin"; import {closeWindow} from "../window/closeWin";
import {loadPlugins} from "../plugin/loader";
const matchKeymap = (keymap: Record<string, IKeymapItem>, key1: "general" | "editor", key2?: "general" | "insert" | "heading" | "list" | "table") => { const matchKeymap = (keymap: Record<string, IKeymapItem>, key1: "general" | "editor", key2?: "general" | "insert" | "heading" | "list" | "table") => {
if (key1 === "general") { if (key1 === "general") {

2
app/src/layout/dock/Files.ts
View File

@ -926,7 +926,7 @@ export class Files extends Model {
item.removeAttribute("style"); item.removeAttribute("style");
}); });
if (typeof scrollTop === "number") { if (typeof scrollTop === "number") {
this.element.scroll({top: scrollTop, behavior: "smooth"}) this.element.scroll({top: scrollTop, behavior: "smooth"});
} }
}, 120); }, 120);
}, 2); }, 2);

2
app/src/mobile/menu/search.ts
View File

@ -676,7 +676,7 @@ export const popSearch = (app: App, config = window.siyuan.storage[Constants.LOC
bindEvent(element) { bindEvent(element) {
document.querySelector("#toolbarSearchNew").addEventListener("click", () => { document.querySelector("#toolbarSearchNew").addEventListener("click", () => {
newFileByName(app, (document.querySelector("#toolbarSearch") as HTMLInputElement).value); newFileByName(app, (document.querySelector("#toolbarSearch") as HTMLInputElement).value);
}) });
initSearchEvent(app, element.firstElementChild, config); initSearchEvent(app, element.firstElementChild, config);
updateSearchResult(config, element); updateSearchResult(config, element);
} }

10
app/src/protyle/header/Background.ts
View File

@ -266,10 +266,10 @@ export class Background {
event.stopPropagation(); event.stopPropagation();
break; break;
} else if (type === "show-random") { } else if (type === "show-random") {
let html = "" let html = "";
bgs.forEach((item: string, index: number) => { bgs.forEach((item: string, index: number) => {
html += `<div data-index="${index}" style="height: 148px;width: 148px;${item}" class="b3-card"></div>` html += `<div data-index="${index}" style="height: 148px;width: 148px;${item}" class="b3-card"></div>`;
}) });
const dialog = new Dialog({ const dialog = new Dialog({
title: window.siyuan.languages.random, title: window.siyuan.languages.random,
content: `<div class="b3-cards" style="margin-right: 0">${html}</div>`, content: `<div class="b3-cards" style="margin-right: 0">${html}</div>`,
@ -277,7 +277,7 @@ export class Background {
height: isMobile() ? "80vh" : "70vh", height: isMobile() ? "80vh" : "70vh",
}); });
dialog.element.addEventListener("click", (event) => { dialog.element.addEventListener("click", (event) => {
const target = event.target as HTMLElement const target = event.target as HTMLElement;
if (target.classList.contains("b3-card")) { if (target.classList.contains("b3-card")) {
this.ial["title-img"] = bgs[parseInt(target.getAttribute("data-index"))]; this.ial["title-img"] = bgs[parseInt(target.getAttribute("data-index"))];
this.render(this.ial, protyle.block.rootID); this.render(this.ial, protyle.block.rootID);
@ -287,7 +287,7 @@ export class Background {
}); });
dialog.destroy(); dialog.destroy();
} }
}) });
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
break; break;

2
app/src/protyle/hint/index.ts
View File

@ -350,7 +350,7 @@ ${genHintItemHTML(item)}
searchHTML = `<button style="width: calc(100% - 16px)" class="b3-list-item b3-list-item--two" data-value="">${window.siyuan.languages.emptyContent}</button>`; searchHTML = `<button style="width: calc(100% - 16px)" class="b3-list-item b3-list-item--two" data-value="">${window.siyuan.languages.emptyContent}</button>`;
} }
this.element.lastElementChild.innerHTML = searchHTML; this.element.lastElementChild.innerHTML = searchHTML;
setPosition(this.element, parseInt(this.element.style.left), parseInt(this.element.style.right)) setPosition(this.element, parseInt(this.element.style.left), parseInt(this.element.style.right));
}); });
} }

14
app/src/protyle/render/av/asset.ts
View File

@ -334,24 +334,24 @@ export const dragUpload = (files: string[], protyle: IProtyle, cellElement: HTML
id: protyle.block.rootID id: protyle.block.rootID
}, (response) => { }, (response) => {
hideMessage(msgId); hideMessage(msgId);
const addUpdateValue: IAVCellAssetValue[] = [] const addUpdateValue: IAVCellAssetValue[] = [];
Object.keys(response.data.succMap).forEach(key => { Object.keys(response.data.succMap).forEach(key => {
const type = pathPosix().extname(key).toLowerCase(); const type = pathPosix().extname(key).toLowerCase();
const name = key.substring(0, key.length - type.length) const name = key.substring(0, key.length - type.length);
if (Constants.SIYUAN_ASSETS_IMAGE.includes(type)) { if (Constants.SIYUAN_ASSETS_IMAGE.includes(type)) {
addUpdateValue.push({ addUpdateValue.push({
type: "image", type: "image",
name, name,
content: response.data.succMap[key], content: response.data.succMap[key],
}) });
} else { } else {
addUpdateValue.push({ addUpdateValue.push({
type: "file", type: "file",
name, name,
content: response.data.succMap[key], content: response.data.succMap[key],
}) });
} }
}) });
fetchPost("/api/av/renderAttributeView", { fetchPost("/api/av/renderAttributeView", {
id: avID, id: avID,
}, (response) => { }, (response) => {
@ -362,6 +362,6 @@ export const dragUpload = (files: string[], protyle: IProtyle, cellElement: HTML
type: "addUpdate", type: "addUpdate",
addUpdateValue addUpdateValue
}); });
})
}); });
} });
};

6
app/src/protyle/util/editorCommonEvent.ts
View File

@ -990,7 +990,7 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
} else if (!window.siyuan.dragElement && (event.dataTransfer.types[0] === "Files" || event.dataTransfer.types.includes("text/html"))) { } else if (!window.siyuan.dragElement && (event.dataTransfer.types[0] === "Files" || event.dataTransfer.types.includes("text/html"))) {
// 外部文件拖入编辑器中或者编辑器内选中文字拖拽 // 外部文件拖入编辑器中或者编辑器内选中文字拖拽
// https://github.com/siyuan-note/siyuan/issues/9544 // https://github.com/siyuan-note/siyuan/issues/9544
const avElement = hasClosestByClassName(event.target, 'av') const avElement = hasClosestByClassName(event.target, "av");
if (!avElement) { if (!avElement) {
focusByRange(getRangeByPoint(event.clientX, event.clientY)); focusByRange(getRangeByPoint(event.clientX, event.clientY));
if (event.dataTransfer.types[0] === "Files" && !isBrowser()) { if (event.dataTransfer.types[0] === "Files" && !isBrowser()) {
@ -1003,9 +1003,9 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
paste(protyle, event); paste(protyle, event);
} }
} else { } else {
const cellElement = hasClosestByClassName(event.target, 'av__cell') const cellElement = hasClosestByClassName(event.target, "av__cell");
if (cellElement) { if (cellElement) {
const cellType = avElement.querySelector(`.av__row--header [data-col-id="${cellElement.dataset.colId}"]`)?.getAttribute("data-dtype") const cellType = avElement.querySelector(`.av__row--header [data-col-id="${cellElement.dataset.colId}"]`)?.getAttribute("data-dtype");
if (cellType === "mAsset" && event.dataTransfer.types[0] === "Files" && !isBrowser()) { if (cellType === "mAsset" && event.dataTransfer.types[0] === "Files" && !isBrowser()) {
const files: string[] = []; const files: string[] = [];
for (let i = 0; i < event.dataTransfer.files.length; i++) { for (let i = 0; i < event.dataTransfer.files.length; i++) {