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

🚨

Browse source
This commit is contained in:
Vanessa 2023-02-21 09:22:38 +08:00
parent 06b7dfd1e2
commit 2c393a52f9
2 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/src/config/bazaar.ts
View file

@ -1,7 +1,6 @@
import {appearance} from "./appearance"; import {appearance} from "./appearance";
import {showMessage} from "../dialog/message"; import {showMessage} from "../dialog/message";
import {fetchPost} from "../util/fetch"; import {fetchPost} from "../util/fetch";
import {hasClosestByClassName} from "../protyle/util/hasClosest";
import {confirmDialog} from "../dialog/confirmDialog"; import {confirmDialog} from "../dialog/confirmDialog";
import {highlightRender} from "../protyle/markdown/highlightRender"; import {highlightRender} from "../protyle/markdown/highlightRender";
import {exportLayout} from "../layout/util"; import {exportLayout} from "../layout/util";
@ -151,7 +150,7 @@ export const bazaar = {
repoURL: item.repoURL, repoURL: item.repoURL,
repoHash: item.repoHash, repoHash: item.repoHash,
downloaded: false, downloaded: false,
} };
return `<div data-obj='${JSON.stringify(dataObj)}' class="b3-card${hide ? " fn__none" : ""}${item.current ? " b3-card--current" : ""}"> return `<div data-obj='${JSON.stringify(dataObj)}' class="b3-card${hide ? " fn__none" : ""}${item.current ? " b3-card--current" : ""}">
<div class="b3-card__img"><img src="${item.previewURLThumb}"/></div> <div class="b3-card__img"><img src="${item.previewURLThumb}"/></div>
<div class="b3-card__info fn__flex"> <div class="b3-card__info fn__flex">
@ -202,7 +201,7 @@ export const bazaar = {
repoURL: item.repoURL, repoURL: item.repoURL,
repoHash: item.repoHash, repoHash: item.repoHash,
downloaded: true downloaded: true
} };
html += `<div data-obj='${JSON.stringify(dataObj)}' class="b3-card${item.current ? " b3-card--current" : ""}"> html += `<div data-obj='${JSON.stringify(dataObj)}' class="b3-card${item.current ? " b3-card--current" : ""}">
<div class="b3-card__img"><img src="${item.previewURLThumb}"/></div> <div class="b3-card__img"><img src="${item.previewURLThumb}"/></div>
<div class="b3-card__info"> <div class="b3-card__info">
@ -270,7 +269,7 @@ export const bazaar = {
repoURL: data.repoURL, repoURL: data.repoURL,
repoHash: data.repoHash, repoHash: data.repoHash,
downloaded: true downloaded: true
} };
readmeElement.innerHTML = ` <div class="item__side" data-obj='${JSON.stringify(dataObj1)}'> readmeElement.innerHTML = ` <div class="item__side" data-obj='${JSON.stringify(dataObj1)}'>
<div class="fn__flex"> <div class="fn__flex">
<button class="b3-button b3-button--outline" data-type="goBack" title="Go back"><svg><use xlink:href="#iconLeft"></use></svg></button> <button class="b3-button b3-button--outline" data-type="goBack" title="Go back"><svg><use xlink:href="#iconLeft"></use></svg></button>
@ -415,7 +414,7 @@ export const bazaar = {
} else if (type === "install-t") { } else if (type === "install-t") {
if (!target.classList.contains("b3-button--progress")) { if (!target.classList.contains("b3-button--progress")) {
confirmDialog(window.siyuan.languages.update, window.siyuan.languages.exportTplTip, () => { confirmDialog(window.siyuan.languages.update, window.siyuan.languages.exportTplTip, () => {
const dataObj = JSON.parse(target.parentElement.parentElement.getAttribute("data-obj")) const dataObj = JSON.parse(target.parentElement.parentElement.getAttribute("data-obj"));
const bazaarType: TBazaarType = dataObj.bazaarType; const bazaarType: TBazaarType = dataObj.bazaarType;
let url = "/api/bazaar/installBazaarTemplate"; let url = "/api/bazaar/installBazaarTemplate";
if (bazaarType === "themes") { if (bazaarType === "themes") {
@ -457,7 +456,7 @@ export const bazaar = {
event.stopPropagation(); event.stopPropagation();
break; break;
} else if (type === "uninstall") { } else if (type === "uninstall") {
const dataObj = JSON.parse(target.parentElement.parentElement.getAttribute("data-obj")) const dataObj = JSON.parse(target.parentElement.parentElement.getAttribute("data-obj"));
const bazaarType: TBazaarType = dataObj.bazaarType; const bazaarType: TBazaarType = dataObj.bazaarType;
let url = "/api/bazaar/uninstallBazaarTemplate"; let url = "/api/bazaar/uninstallBazaarTemplate";
if (bazaarType === "themes") { if (bazaarType === "themes") {
@ -485,7 +484,7 @@ export const bazaar = {
event.stopPropagation(); event.stopPropagation();
break; break;
} else if (type === "switch") { } else if (type === "switch") {
const dataObj = JSON.parse(target.parentElement.parentElement.getAttribute("data-obj")) const dataObj = JSON.parse(target.parentElement.parentElement.getAttribute("data-obj"));
const bazaarType: TBazaarType = dataObj.bazaarType; const bazaarType: TBazaarType = dataObj.bazaarType;
const packageName = dataObj.name; const packageName = dataObj.name;
const mode = dataObj.themeMode === "dark" ? 1 : 0; const mode = dataObj.themeMode === "dark" ? 1 : 0;
@ -495,7 +494,7 @@ export const bazaar = {
}), (appearanceResponse) => { }), (appearanceResponse) => {
this._genMyHTML(bazaarType); this._genMyHTML(bazaarType);
fetchPost("/api/bazaar/getBazaarIcon", {}, response => { fetchPost("/api/bazaar/getBazaarIcon", {}, response => {
response.data.appearance = appearanceResponse.data response.data.appearance = appearanceResponse.data;
bazaar._onBazaar(response, "icons", true); bazaar._onBazaar(response, "icons", true);
bazaar._data.icons = response.data.packages; bazaar._data.icons = response.data.packages;
}); });
@ -515,7 +514,7 @@ export const bazaar = {
} else { } else {
this._genMyHTML("themes"); this._genMyHTML("themes");
fetchPost("/api/bazaar/getBazaarTheme", {}, response => { fetchPost("/api/bazaar/getBazaarTheme", {}, response => {
response.data.appearance = appearanceResponse.data response.data.appearance = appearanceResponse.data;
bazaar._onBazaar(response, "themes", true); bazaar._onBazaar(response, "themes", true);
bazaar._data.themes = response.data.packages; bazaar._data.themes = response.data.packages;
}); });

12
app/src/layout/util.ts
View file

@ -488,7 +488,7 @@ export const resizeTabs = () => {
if (!item.element.classList.contains("fn__none") && item.editor.protyle.toolbar.range) { if (!item.element.classList.contains("fn__none") && item.editor.protyle.toolbar.range) {
let rangeRect = item.editor.protyle.toolbar.range.getBoundingClientRect(); let rangeRect = item.editor.protyle.toolbar.range.getBoundingClientRect();
if (rangeRect.height === 0) { if (rangeRect.height === 0) {
const blockElement = hasClosestBlock(item.editor.protyle.toolbar.range.startContainer) const blockElement = hasClosestBlock(item.editor.protyle.toolbar.range.startContainer);
if (blockElement) { if (blockElement) {
rangeRect = blockElement.getBoundingClientRect(); rangeRect = blockElement.getBoundingClientRect();
} }
@ -613,17 +613,17 @@ export const addResize = (obj: Layout | Wnd) => {
const getMinSize = (element: HTMLElement) => { const getMinSize = (element: HTMLElement) => {
let minSize = 220; let minSize = 220;
Array.from(element.querySelectorAll('.file-tree')).find((item) => { Array.from(element.querySelectorAll(".file-tree")).find((item) => {
if (item.classList.contains("sy__backlink") || item.classList.contains("sy__graph") if (item.classList.contains("sy__backlink") || item.classList.contains("sy__graph")
|| item.classList.contains("sy__globalGraph") || item.classList.contains("sy__inbox")) { || item.classList.contains("sy__globalGraph") || item.classList.contains("sy__inbox")) {
if (!item.classList.contains("fn__none") && !hasClosestByClassName(item, "fn__none")) { if (!item.classList.contains("fn__none") && !hasClosestByClassName(item, "fn__none")) {
minSize = 320 minSize = 320;
return true; return true;
} }
} }
}) });
return minSize return minSize;
} };
const resizeWnd = (resizeElement: HTMLElement, direction: string) => { const resizeWnd = (resizeElement: HTMLElement, direction: string) => {
const setSize = (item: HTMLElement, direction: string) => { const setSize = (item: HTMLElement, direction: string) => {
if (item.classList.contains("fn__flex-1")) { if (item.classList.contains("fn__flex-1")) {