diff --git a/src/qqq/components/widgets/misc/RecordGridWidget.tsx b/src/qqq/components/widgets/misc/RecordGridWidget.tsx index 2c90096..5f9e8a6 100644 --- a/src/qqq/components/widgets/misc/RecordGridWidget.tsx +++ b/src/qqq/components/widgets/misc/RecordGridWidget.tsx @@ -111,7 +111,7 @@ function RecordGridWidget({widgetMetaData, data, addNewRecordCallback, disableRo } const tableMetaData = data.childTableMetaData instanceof QTableMetaData ? data.childTableMetaData as QTableMetaData : new QTableMetaData(data.childTableMetaData); - const rows = DataGridUtils.makeRows(records, tableMetaData); + const rows = DataGridUtils.makeRows(records, tableMetaData, undefined, true); ///////////////////////////////////////////////////////////////////////////////// // note - tablePath may be null, if the user doesn't have access to the table. // @@ -255,14 +255,14 @@ function RecordGridWidget({widgetMetaData, data, addNewRecordCallback, disableRo disabledFields = data.defaultValuesForNewChildRecords; } - const defaultValuesForNewChildRecords = data.defaultValuesForNewChildRecords || {} + const defaultValuesForNewChildRecords = data.defaultValuesForNewChildRecords || {}; /////////////////////////////////////////////////////////////////////////////////////// // copy values from specified fields in the parent record down into the child record // /////////////////////////////////////////////////////////////////////////////////////// - if(data.defaultValuesForNewChildRecordsFromParentFields) + if (data.defaultValuesForNewChildRecordsFromParentFields) { - for(let childField in data.defaultValuesForNewChildRecordsFromParentFields) + for (let childField in data.defaultValuesForNewChildRecordsFromParentFields) { const parentField = data.defaultValuesForNewChildRecordsFromParentFields[childField]; defaultValuesForNewChildRecords[childField] = parentRecord?.values?.get(parentField); diff --git a/src/qqq/utils/DataGridUtils.tsx b/src/qqq/utils/DataGridUtils.tsx index b7effe7..9ee5fa4 100644 --- a/src/qqq/utils/DataGridUtils.tsx +++ b/src/qqq/utils/DataGridUtils.tsx @@ -71,7 +71,7 @@ export default class DataGridUtils /******************************************************************************* ** *******************************************************************************/ - public static makeRows = (results: QRecord[], tableMetaData: QTableMetaData, tableVariant?: QTableVariant): GridRowsProp[] => + public static makeRows = (results: QRecord[], tableMetaData: QTableMetaData, tableVariant?: QTableVariant, allowEmptyId = false): GridRowsProp[] => { const fields = [...tableMetaData.fields.values()]; const rows = [] as any[]; @@ -112,7 +112,7 @@ export default class DataGridUtils ///////////////////////////////////////////////////////////////////////////////////////// // DataGrid gets very upset about a null or undefined here, so, try to make it happier // ///////////////////////////////////////////////////////////////////////////////////////// - if (!tableVariant) + if (!allowEmptyId) { row["id"] = "--"; } @@ -242,20 +242,6 @@ export default class DataGridUtils cellValues.value ? e.stopPropagation()}>{cellValues.value} : "" ); } - /* todo wip ... not sure if/how to get tooltipFieldName set in the row... */ - /* - else if (field.hasAdornment(AdornmentType.TOOLTIP)) - { - const tooltipAdornment = field.getAdornment(AdornmentType.TOOLTIP); - const tooltipFieldName: string = tooltipAdornment.getValue("tooltipFieldName"); - if(tooltipFieldName) - { - column.renderCell = (cellValues: any) => ( - cellValues.value ? {cellValues.value} : "" - ); - } - } - */ }); } diff --git a/src/qqq/utils/qqq/ValueUtils.tsx b/src/qqq/utils/qqq/ValueUtils.tsx index 73fa993..3d90a67 100644 --- a/src/qqq/utils/qqq/ValueUtils.tsx +++ b/src/qqq/utils/qqq/ValueUtils.tsx @@ -255,11 +255,6 @@ class ValueUtils return (); } - // todo if(field.hasAdornment(AdornmentType.CODE)) - // todo { - // todo return {ValueUtils.getUnadornedValueForDisplay(field, rawValue, displayValue)} - // todo } - return (ValueUtils.getUnadornedValueForDisplay(field, rawValue, displayValue)); }