diff --git a/packages/datalib/src/PerspectiveConfig.ts b/packages/datalib/src/PerspectiveConfig.ts index b9039fa73..1f8ec5a89 100644 --- a/packages/datalib/src/PerspectiveConfig.ts +++ b/packages/datalib/src/PerspectiveConfig.ts @@ -61,6 +61,7 @@ export interface PerspectiveNodeConfig { expandedColumns: string[]; checkedColumns: string[]; + columnDisplays: {}; // uncheckedColumns: string[]; sort: { @@ -107,6 +108,7 @@ export function createPerspectiveNodeConfig(name: { schemaName?: string; pureNam expandedColumns: [], checkedColumns: [], + columnDisplays: {}, sort: [], filters: {}, diff --git a/packages/datalib/src/PerspectiveDisplay.ts b/packages/datalib/src/PerspectiveDisplay.ts index 692c478f0..7bf8d3e14 100644 --- a/packages/datalib/src/PerspectiveDisplay.ts +++ b/packages/datalib/src/PerspectiveDisplay.ts @@ -16,6 +16,7 @@ function getJoinId(): number { export class PerspectiveDisplayColumn { title: string; dataField: string; + displayType: string; parentNodes: PerspectiveTreeNode[] = []; colSpanAtLevel = {}; columnIndex = 0; @@ -140,6 +141,7 @@ export class PerspectiveDisplay { column.display = this; column.columnIndex = this.columns.length; column.dataNode = node; + column.displayType = node.parentNodeConfig?.columnDisplays?.[node.columnName]; this.columns.push(column); } diff --git a/packages/web/src/jsontree/JSONTree.svelte b/packages/web/src/jsontree/JSONTree.svelte index ee031f95d..ef8071050 100644 --- a/packages/web/src/jsontree/JSONTree.svelte +++ b/packages/web/src/jsontree/JSONTree.svelte @@ -15,9 +15,9 @@ export let expanded = expandAll; export let labelOverride = null; - export let isDeleted; - export let isInserted; - export let isModified; + export let isDeleted = false; + export let isInserted = false; + export let isModified = false; setContext('json-tree-default-expanded', expandAll); diff --git a/packages/web/src/perspectives/PerspectiveCell.svelte b/packages/web/src/perspectives/PerspectiveCell.svelte index 01ca6aa42..2cf0ab987 100644 --- a/packages/web/src/perspectives/PerspectiveCell.svelte +++ b/packages/web/src/perspectives/PerspectiveCell.svelte @@ -1,15 +1,23 @@