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

🎨 https://github.com/siyuan-note/siyuan/issues/11166

Browse source
This commit is contained in:
Vanessa 2024-04-27 11:25:03 +08:00
parent 2e525a3e44
commit f3a9ae4456
1 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -341,7 +341,7 @@ export const bazaar = {
response.data.widgets.forEach((item: IBazaarItem) => { response.data.widgets.forEach((item: IBazaarItem) => {
html += this._genUpdateItemHTML(item, "widgets"); html += this._genUpdateItemHTML(item, "widgets");
}); });
this._data.update = response.data;
const allCount = response.data.themes.length + response.data.icons.length + response.data.widgets.length + response.data.plugins.length + response.data.templates.length; const allCount = response.data.themes.length + response.data.icons.length + response.data.widgets.length + response.data.plugins.length + response.data.templates.length;
if (allCount === 0) { if (allCount === 0) {
this.element.querySelector('[data-type="downloaded-update"]').innerHTML = ""; this.element.querySelector('[data-type="downloaded-update"]').innerHTML = "";
@ -357,6 +357,9 @@ export const bazaar = {
}); });
}, },
_genMyHTML(bazaarType: TBazaarType, app: App, updateUpdate = true) { _genMyHTML(bazaarType: TBazaarType, app: App, updateUpdate = true) {
if (updateUpdate) {
this._getUpdate();
}
const contentElement = bazaar.element.querySelector("#configBazaarDownloaded"); const contentElement = bazaar.element.querySelector("#configBazaarDownloaded");
if (contentElement.getAttribute("data-loading") === "true" || if (contentElement.getAttribute("data-loading") === "true" ||
contentElement.previousElementSibling.querySelector(`[data-type="my${bazaarType.replace(bazaarType[0], bazaarType[0].toUpperCase()).substring(0, bazaarType.length - 1)}"]`).classList.contains("b3-button--outline")) { contentElement.previousElementSibling.querySelector(`[data-type="my${bazaarType.replace(bazaarType[0], bazaarType[0].toUpperCase()).substring(0, bazaarType.length - 1)}"]`).classList.contains("b3-button--outline")) {
@ -451,9 +454,6 @@ export const bazaar = {
} }
contentElement.innerHTML = html ? html : `<div class="fn__hr"></div><ul class="b3-list b3-list--background"><li class="b3-list--empty">${window.siyuan.languages.emptyContent}</li></ul>`; contentElement.innerHTML = html ? html : `<div class="fn__hr"></div><ul class="b3-list b3-list--background"><li class="b3-list--empty">${window.siyuan.languages.emptyContent}</li></ul>`;
}); });
if (updateUpdate) {
this._getUpdate();
}
}, },
_data: { _data: {
themes: [] as IBazaarItem[], themes: [] as IBazaarItem[],
@ -462,16 +462,22 @@ export const bazaar = {
widgets: [] as IBazaarItem[], widgets: [] as IBazaarItem[],
plugins: [] as IBazaarItem[], plugins: [] as IBazaarItem[],
downloaded: [] as IBazaarItem[], downloaded: [] as IBazaarItem[],
update: {
themes: [] as IBazaarItem[],
templates: [] as IBazaarItem[],
icons: [] as IBazaarItem[],
widgets: [] as IBazaarItem[],
plugins: [] as IBazaarItem[],
}
}, },
_renderReadme(cardElement: HTMLElement, bazaarType: TBazaarType) { _renderReadme(cardElement: HTMLElement, bazaarType: TBazaarType) {
const dataObj = JSON.parse(cardElement.getAttribute("data-obj")); const dataObj = JSON.parse(cardElement.getAttribute("data-obj"));
let data: IBazaarItem; let data: IBazaarItem;
(dataObj.downloaded ? bazaar._data.downloaded : bazaar._data[bazaarType]).find((item: IBazaarItem) => { if (hasClosestByAttribute(cardElement, "data-type", "downloaded-update")) {
if (item.repoURL === dataObj.repoURL) { data = bazaar._data.update[bazaarType].find((item: IBazaarItem) => item.repoURL === dataObj.repoURL);
data = item; } else {
return true; data = (dataObj.downloaded ? bazaar._data.downloaded : bazaar._data[bazaarType]).find((item: IBazaarItem) => item.repoURL === dataObj.repoURL);
} }
});
const readmeElement = bazaar.element.querySelector("#configBazaarReadme") as HTMLElement; const readmeElement = bazaar.element.querySelector("#configBazaarReadme") as HTMLElement;
const urls = data.repoURL.split("/"); const urls = data.repoURL.split("/");
urls.pop(); urls.pop();
@ -526,8 +532,8 @@ export const bazaar = {
<div class="ft__on-surface ft__smaller" style="line-height: 20px;">${dataObj.downloaded ? window.siyuan.languages.installDate : window.siyuan.languages.releaseDate}<br>${dataObj.downloaded ? data.hInstallDate : data.hUpdated}</div> <div class="ft__on-surface ft__smaller" style="line-height: 20px;">${dataObj.downloaded ? window.siyuan.languages.installDate : window.siyuan.languages.releaseDate}<br>${dataObj.downloaded ? data.hInstallDate : data.hUpdated}</div>
<div class="fn__hr"></div> <div class="fn__hr"></div>
<div class="ft__on-surface ft__smaller" style="line-height: 20px;">${dataObj.downloaded ? window.siyuan.languages.installSize : window.siyuan.languages.pkgSize}<br>${dataObj.downloaded ? data.hInstallSize : data.hSize}</div> <div class="ft__on-surface ft__smaller" style="line-height: 20px;">${dataObj.downloaded ? window.siyuan.languages.installSize : window.siyuan.languages.pkgSize}<br>${dataObj.downloaded ? data.hInstallSize : data.hSize}</div>
<div class="fn__hr--b${(data.installed || dataObj.downloaded) ? " fn__none" : ""}"></div> <div class="fn__hr--b"></div>
<div class="fn__hr--b${(data.installed || dataObj.downloaded) ? " fn__none" : ""}"></div> <div class="fn__hr--b"></div>
<div${(data.installed || dataObj.downloaded) ? ' class="fn__none"' : ""}> <div${(data.installed || dataObj.downloaded) ? ' class="fn__none"' : ""}>
<button class="b3-button" style="width: 168px" data-type="install">${window.siyuan.languages.download}</button> <button class="b3-button" style="width: 168px" data-type="install">${window.siyuan.languages.download}</button>
</div> </div>
@ -569,8 +575,8 @@ export const bazaar = {
</div> </div>
</div> </div>
</div> </div>
<div class="item__readme b3-typography b3-typography--default""> <div class="item__readme b3-typography b3-typography--default">
<img data-type="img-loading" style="position: absolute;top: 0;left: 0;height: 100%;width: 100%;padding: 48px;box-sizing: border-box;" src="/stage/loading-pure.svg"> <img data-type="img-loading" style="height: 64px;width: 100%;padding: 16px 0;" src="/stage/loading-pure.svg">
</div> </div>
</div>`; </div>`;
if (dataObj.downloaded) { if (dataObj.downloaded) {
@ -732,7 +738,7 @@ export const bazaar = {
url = "/api/bazaar/installBazaarPlugin"; url = "/api/bazaar/installBazaarPlugin";
} }
if (!target.classList.contains("b3-button")) { if (!target.classList.contains("b3-button")) {
target.parentElement.insertAdjacentHTML("afterend", '<img data-type="img-loading" style="position: absolute;top: 0;left: 0;height: 100%;width: 100%;padding: 48px;box-sizing: border-box;" src="/stage/loading-pure.svg">'); target.parentElement.insertAdjacentHTML("afterend", '<img data-type="img-loading" style="position: absolute;top: 0;left: 0;height: 100%;width: 100%;padding: 16px;box-sizing: border-box;" src="/stage/loading-pure.svg">');
} }
fetchPost(url, { fetchPost(url, {
repoURL: dataObj.repoURL, repoURL: dataObj.repoURL,