diff --git a/src/pages/QuickEditForm.vue b/src/pages/QuickEditForm.vue index ee28d6ec..bca317ad 100644 --- a/src/pages/QuickEditForm.vue +++ b/src/pages/QuickEditForm.vue @@ -88,7 +88,7 @@ import { openQuickEdit, getActionsForDocument } from '@/utils'; export default { name: 'QuickEditForm', - props: ['doctype', 'name', 'values', 'hideFields', 'showFields'], + props: ['doctype', 'name', 'valueJSON', 'hideFields', 'showFields'], components: { Button, FormControl, @@ -106,9 +106,13 @@ export default { }, }; }, + mounted() { + this.values = JSON.parse(this.valueJSON); + }, data() { return { doc: null, + values: null, titleField: null, imageField: null, statusText: null, diff --git a/src/pages/Report.vue b/src/pages/Report.vue index d22bffa3..d49b5de0 100644 --- a/src/pages/Report.vue +++ b/src/pages/Report.vue @@ -107,7 +107,7 @@ import WithScroll from '@/components/WithScroll'; import FormControl from '@/components/Controls/FormControl'; import DropdownWithActions from '../components/DropdownWithActions.vue'; import reportViewConfig from '@/../reports/view'; -import { h } from 'vue'; +import { h, markRaw } from 'vue'; export default { name: 'Report', @@ -165,16 +165,16 @@ export default { rows = data; } - this.reportData.columns = this.report.getColumns({ + this.reportData.columns = markRaw(this.report.getColumns({ filters: this.filters, data, - }); + })); if (!rows) { rows = []; } - this.reportData.rows = this.addTreeMeta(rows); + this.reportData.rows = markRaw(this.addTreeMeta(rows)); this.loading = false; }, diff --git a/src/utils.js b/src/utils.js index b1802f80..20313a50 100644 --- a/src/utils.js +++ b/src/utils.js @@ -163,7 +163,7 @@ export function openQuickEdit({ name, showFields: showFields ?? getShowFields(doctype), hideFields, - values: defaults, + valueJSON: stringifyCircular(defaults), lastRoute: currentRoute, }, });