diff --git a/app/src/protyle/render/av/gallery/render.ts b/app/src/protyle/render/av/gallery/render.ts index f1bc0febb..8adb57110 100644 --- a/app/src/protyle/render/av/gallery/render.ts +++ b/app/src/protyle/render/av/gallery/render.ts @@ -60,32 +60,27 @@ export const renderGallery = (options: { viewID: newViewID, query: query.trim() }, (response) => { - const data = response.data.view as IAVTable; + const data = response.data; if (!options.blockElement.dataset.pageSize) { - options.blockElement.dataset.pageSize = data.pageSize.toString(); + options.blockElement.dataset.pageSize = data.view.pageSize.toString(); } let galleryHTML = ""; // body - debugger - data.rows.forEach((row: IAVRow, rowIndex: number) => { - row.cells.forEach((cell, index) => { - if (data.columns[index].hidden) { - return; - } - // https://github.com/siyuan-note/siyuan/issues/10262 + data.view.cards.forEach((item: IAVGalleryItem, rowIndex: number) => { + galleryHTML += `"; }); let tabHTML = ""; let viewData: IAVView; @@ -99,18 +94,7 @@ ${cell.color ? `color:${cell.color};` : ""}">${renderCell(cell.value, rowIndex)} } }); if (options.renderAll) { - let hasFilter = false; - data.columns.forEach((item) => { - if (!hasFilter) { - data.filters.find(filterItem => { - if (filterItem.value.type === item.type && item.id === filterItem.column) { - hasFilter = true; - return true; - } - }); - } - }); - options.blockElement.firstElementChild.outerHTML = `
+ options.blockElement.firstElementChild.outerHTML = `
@@ -122,17 +106,17 @@ ${cell.color ? `color:${cell.color};` : ""}">${renderCell(cell.value, rowIndex)}
- + - ${response.data.views.length} + ${data.views.length}
- +
- +
@@ -151,10 +135,10 @@ ${cell.color ? `color:${cell.color};` : ""}">${renderCell(cell.value, rowIndex)}
- ${response.data.isMirror ? ` + ${data.isMirror ? `
` : ""}
-
${response.data.name || ""}
+
${data.name || ""}