Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support partial update for stanzas built with Vue #42

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions stanzas/pagination-table/SliderPagination.vue
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,10 @@ export default defineComponent({
const paginationNumList = ref(null);
function drawKnobArrow() {
setTimeout(() => {
if (!canvas.value) {
return;
}

const totalPages = props.totalPages;
if (totalPages <= 5) {
return;
Expand Down
61 changes: 42 additions & 19 deletions stanzas/pagination-table/app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
{ hide: cell.hide },
cell.column.align,
{ fixed: cell.column.fixed },
cell.column.class
cell.column.class,
]"
:style="
cell.column.fixed
Expand All @@ -212,15 +212,20 @@
<span v-if="cell.href && cell.column.unescape">
<a
:href="cell.href"
:target="cell.column.target ? `_${cell.column.target}` : '_blank'"
:target="
cell.column.target ? `_${cell.column.target}` : '_blank'
"
v-html="cell.value"
></a>
</span>
<span v-else-if="cell.href">
<a
:href="cell.href"
:target="cell.column.target ? `_${cell.column.target}` : '_blank'"
>{{ cell.value }}</a>
:target="
cell.column.target ? `_${cell.column.target}` : '_blank'
"
>{{ cell.value }}</a
>
</span>
<span v-else-if="cell.column.unescape" v-html="cell.value">
</span>
Expand Down Expand Up @@ -255,8 +260,8 @@ import {
ref,
computed,
watch,
onMounted,
onRenderTriggered,
toRefs,
} from "vue";

import SliderPagination from "./SliderPagination.vue";
Expand Down Expand Up @@ -291,8 +296,16 @@ export default defineComponent({
props: metadata["stanza:parameter"].map((p) => p["stanza:key"]),

setup(params) {
const {
pageSlider,
pageSizeOption: pageSizeOptionStr,
dataUrl,
dataType,
} = toRefs(params);
const sliderPagination = ref();
const pageSizeOption = params.pageSizeOption.split(",").map(Number);
const pageSizeOption = computed(() =>
pageSizeOptionStr.value.split(",").map(Number)
);

const state = reactive({
responseJSON: null, // for download. may consume extra memory
Expand All @@ -308,8 +321,8 @@ export default defineComponent({

pagination: {
currentPage: 1,
perPage: pageSizeOption[0],
isSliderOn: params.pageSlider,
perPage: pageSizeOption.value[0],
isSliderOn: pageSlider,
},

isMenuOn: false,
Expand Down Expand Up @@ -414,8 +427,8 @@ export default defineComponent({
const reversedRows = rows.reverse().map((row, rowIndex) => {
return row.map((cell, colIndex) => {
if (cell.column.rowspan) {
delete cell.hide
delete cell.rowspanCount
delete cell.hide;
delete cell.rowspanCount;
const aboveValue = rows[rowIndex + 1]
? rows[rowIndex + 1][colIndex].value
: null;
Expand Down Expand Up @@ -475,10 +488,18 @@ export default defineComponent({
state.pagination.currentPage = currentPage;
}

async function fetchData() {
const data = await loadData(params.dataUrl, params.dataType);
watch(
[dataUrl, dataType],
async ([dataUrl, dataType]) => {
state.responseJSON = null;
state.responseJSON = await loadData(dataUrl, dataType);
},
{ immediate: true }
);

state.columns = computed(() => {
const data = state.responseJSON || [];

state.responseJSON = data;
let columns;
if (params.columns) {
columns = JSON.parse(params.columns).map((column, index) => {
Expand All @@ -498,12 +519,16 @@ export default defineComponent({
columns = [];
}

state.columns = columns.map((column) => {
return columns.map((column) => {
const values = data.map((obj) => obj[column.id]);
return createColumnState(column, values);
});
});

state.allRows = computed(() => {
const data = state.responseJSON || [];

state.allRows = data.map((row) => {
return data.map((row) => {
return state.columns.map((column) => {
return {
column,
Expand All @@ -512,9 +537,7 @@ export default defineComponent({
};
});
});
}

onMounted(fetchData);
});

const thead = ref(null);
onRenderTriggered(() => {
Expand All @@ -525,7 +548,7 @@ export default defineComponent({
});

return {
width: params.width ? params.width + 'px' : '100%',
width: computed(() => (params.width ? params.width + "px" : "100%")),
sliderPagination,
pageSizeOption,
state,
Expand Down
24 changes: 20 additions & 4 deletions stanzas/pagination-table/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Stanza from "togostanza/stanza";
import { createApp } from "vue";
import { createApp, h } from "vue";
import App from "./app.vue";

import { appendCustomCss } from "@/lib/metastanza_utils.js";
Expand All @@ -11,10 +11,26 @@ export default class PaginationTable extends Stanza {
const main = this.root.querySelector("main");
main.parentNode.style.backgroundColor =
"var(--togostanza-background-color)";
this._setMainPadding();

const self = this;
this._app = createApp({
render() {
return h(App, self.params);
},
});
this._component = this._app.mount(main);
}

_setMainPadding() {
const main = this.root.querySelector("main");
main.parentNode.style.padding = this.params["padding"];
}

this._app?.unmount();
this._app = createApp(App, this.params);
this._app.mount(main);
handleAttributeChange(name) {
if (name === "padding") {
this._setMainPadding();
}
this._component?.$forceUpdate();
}
}
24 changes: 13 additions & 11 deletions stanzas/scroll-table/app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ import {
onMounted,
onRenderTriggered,
ref,
toRefs,
} from "vue";

import loadData from "@/lib/load-data";
Expand All @@ -70,6 +71,7 @@ export default defineComponent({
props: metadata["stanza:parameter"].map((p) => p["stanza:key"]),

setup(params) {
params = toRefs(params)
const state = reactive({
columns: [],
allRows: [],
Expand All @@ -84,20 +86,20 @@ export default defineComponent({
async function fetchData() {
state.isFetching = true;
let urlParams = {
limit: params.pageSize,
limit: params.pageSize.value,
offset: state.offset,
};
urlParams = new URLSearchParams(urlParams);
const { dataUrl } = params;
const dataUrl = params.dataUrl.value;
const connectCharacter = new URL(dataUrl) ? "&" : "?";
const data = await loadData(
`${dataUrl}${connectCharacter}${urlParams}`,
params.dataType
params.dataType.value
);

if (params.columns) {
state.columns = JSON.parse(params.columns).map((column, index) => {
column.fixed = index < params.fixedColumns;
if (params.columns.value) {
state.columns = JSON.parse(params.columns.value).map((column, index) => {
column.fixed = index < params.fixedColumns.value;
return column;
});
} else if (data.length > 0) {
Expand All @@ -106,7 +108,7 @@ export default defineComponent({
return {
id: key,
label: key,
fixed: index < params.fixedColumns,
fixed: index < params.fixedColumns.value,
};
});
} else {
Expand Down Expand Up @@ -137,7 +139,7 @@ export default defineComponent({
e.path[0].firstChild.clientHeight - e.path[0].clientHeight &&
!state.isFetching
) {
state.offset = state.offset + params.pageSize;
state.offset = state.offset + params.pageSize.value;
fetchData();
}
}
Expand All @@ -157,9 +159,9 @@ export default defineComponent({
return {
state,
handleScroll,
width: params.width,
height: params.height,
padding: params.padding,
width: params.width.value,
height: params.height.value,
padding: params.padding.value,
thead,
};
},
Expand Down
16 changes: 12 additions & 4 deletions stanzas/scroll-table/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Stanza from "togostanza/stanza";

import { appendCustomCss } from "@/lib/metastanza_utils.js";

import { createApp } from "vue";
import { createApp, h } from "vue";
import App from "./app.vue";

export default class ScrollTable extends Stanza {
Expand All @@ -14,8 +14,16 @@ export default class ScrollTable extends Stanza {
"var(--togostanza-background-color)";
main.parentNode.style.padding = this.params["padding"];

this._app?.unmount();
this._app = createApp(App, this.params);
this._app.mount(main);
const self = this;
this._app = createApp({
render() {
return h(App, self.params);
},
});
this._component = this._app.mount(main);
}

handleAttributeChange() {
this._component?.$forceUpdate();
}
}