fix(iotdb): correct timestamp display and table editing

This commit is contained in:
zipg authored and GitHub committed 2026-08-18 23:24:57 +08:00
1 parent fa4238c5d3
commit b7338518d1
16 files changed
+1031 -73

No files matched your search

+87 -13
View File
@@ -147,7 +147,21 @@ import {
import { buildBinaryHexViewRows } from "@/lib/dataGrid/binaryHexViewer";
import { canFormatCellDetailJson, cellDetailEditorText, compactJsonText, defaultCellDetailTab, formatJsonText, isGeometryColumnType, linkedCellDetailTarget, looksLikeJsonContainerText, valueEditorActions, visibleCellDetailTabs, type CellDetailTab } from "@/lib/dataGrid/cellDetailPresentation";
import { buildDataGridCellDetail, buildDataGridColumnDetail, buildDataGridRowDetail, CELL_DETAIL_VALUE_PREVIEW_MAX_LENGTH, dataGridColumnDetailJson, dataGridColumnDetailTsv, dataGridRowDetailJson, dataGridRowDetailTsv, type DataGridCellDetail } from "@/lib/dataGrid/dataGridDetail";
import { applyColumnFormatter, buildColumnFormatterKey, getSupportedTimeZoneOptions, normalizeColumnFormatter, resolveColumnFormatter, type ColumnFormatterConfig, type DateTimeFormatterUnit, DateTimePatterns } from "@/lib/dataGrid/columnFormatter";
import {
applyColumnFormatter,
buildColumnFormatterKey,
defaultIoTDBTimestampFormatter,
formatIoTDBTimestampEditorValue,
getSupportedTimeZoneOptions,
iotdbTimestampFractionDigits,
iotdbTimestampPrecision,
normalizeColumnFormatter,
parseIoTDBTimestampEditorValue,
resolveColumnFormatter,
type ColumnFormatterConfig,
type DateTimeFormatterUnit,
DateTimePatterns,
} from "@/lib/dataGrid/columnFormatter";
import { temporalCellEditorConfig, type TemporalCellEditorConfig } from "@/lib/dataGrid/dataGridTemporalEditor";
import { BOOLEAN_CELL_EDITOR_VALUES, booleanCellEditorValue, isBooleanCellValue, isBooleanColumnType, isPointInBooleanCheckbox, nextBooleanCellValue, normalizeBooleanCellValue, parseBooleanCellEditorValue } from "@/lib/dataGrid/dataGridBooleanColumn";
import { resolveDataGridColumnNullability, resolveDataGridColumnsByResultIndex } from "@/lib/dataGrid/dataGridColumnMetadata";
@@ -910,7 +924,7 @@ const filterEditorView = computed(() => settingsStore.editorSettings.dataGridFil
const structuredFilterCount = computed(() => structuredFilterRules.value.filter((rule) => !rule.disabled && !!rule.columnName && filterModeHasCompleteValue(rule.mode, rule.rawValue, rule.rawEndValue)).length);
const hasStructuredFilters = computed(() => !!combineWhereInputs(undefined, appliedStructuredWhereInput.value));
const formatterOpenColumn = ref<number | null>(null);
type FormatterDraftKind = Exclude<ColumnFormatterConfig["kind"], "custom-ref">;
type FormatterDraftKind = Exclude<ColumnFormatterConfig["kind"], "custom-ref" | "iotdb-timestamp">;
const CUSTOM_FORMATTER_NEW = "__new";
const formatterKind = ref<FormatterDraftKind>("datetime");
const formatterDateUnit = ref<DateTimeFormatterUnit>("auto");
@@ -1274,10 +1288,14 @@ function columnFormatter(columnIndex: number): ColumnFormatterConfig | undefined
const column = props.result.columns[columnIndex];
if (!column) return undefined;
const key = formatterKeyForColumn(column);
return resolveColumnFormatter(key ? settingsStore.editorSettings.columnFormatters[key] : undefined, settingsStore.editorSettings.customColumnFormatters, {
const columnType = props.result.column_types?.[columnIndex] ?? tableColumnForGridColumn(columnIndex)?.data_type;
const savedFormatter = key ? settingsStore.editorSettings.columnFormatters[key] : undefined;
const configured = resolveColumnFormatter(savedFormatter, settingsStore.editorSettings.customColumnFormatters, {
pattern: settingsStore.editorSettings.globalDateTimeDisplayFormat,
columnType: props.result.column_types?.[columnIndex] ?? tableColumnForGridColumn(columnIndex)?.data_type,
columnType,
});
if (savedFormatter && configured) return configured;
return defaultIoTDBTimestampFormatter(resolvedDatabaseType.value, columnType, resolvedConnectionConfig.value?.url_params) ?? configured;
}
function savedColumnFormatter(columnIndex: number): ColumnFormatterConfig | undefined {
@@ -1332,11 +1350,15 @@ function loadFormatterDraft(formatter: ColumnFormatterConfig | undefined) {
pattern: "YYYY-MM-DD HH:mm:ss" as const,
timezone: dayjs.tz.guess(),
};
formatterKind.value = draft.kind === "custom-ref" ? "custom-template" : draft.kind;
formatterKind.value = draft.kind === "custom-ref" ? "custom-template" : draft.kind === "iotdb-timestamp" ? "datetime" : draft.kind;
if (draft.kind === "datetime") {
formatterDateUnit.value = draft.unit;
formatterDatetimePattern.value = draft.pattern;
formatterDateTimezone.value = draft.timezone || dayjs.tz.guess() || "UTC";
} else if (draft.kind === "iotdb-timestamp") {
formatterDateUnit.value = "milliseconds";
formatterDatetimePattern.value = "YYYY-MM-DDTHH:mm:ss.SSSZ";
formatterDateTimezone.value = draft.timezone;
} else if (draft.kind === "json-path") {
formatterJsonPath.value = draft.path;
} else if (draft.kind === "mask") {
@@ -2316,6 +2338,11 @@ function measureColumnHeaderText(text: string): number | undefined {
return Math.ceil(columnHeaderMeasureContext.measureText(text).width);
}
function columnWidthDisplayValue(value: CellValue, columnIndex: number): CellValue {
const formatter = columnFormatter(columnIndex);
return formatter ? applyColumnFormatter(value, formatter) : value;
}
const { initColumnWidths, onResizeStart, autoFitColumn, renderedColumnWidths, totalWidth, columnVars, getIsResizing } = useDataGridColumnResize({
columns: visibleColumns,
sourceRows: computed(() => props.result.rows),
@@ -2328,6 +2355,7 @@ const { initColumnWidths, onResizeStart, autoFitColumn, renderedColumnWidths, to
measureHeaderText: measureColumnHeaderText,
headerMeasurementKey: columnHeaderMeasurementKey,
rowNumberWidth,
displayValue: columnWidthDisplayValue,
});
const gridStyle = computed(() => ({
...columnVars.value,
@@ -3596,7 +3624,9 @@ async function startCellEdit(rowId: number, columnIndex: number, expanded: boole
if (!(await hydrateLargeValueCell(rowId, columnIndex))) return;
closeReadonlyCellTextSelection();
expandedCellEditor.value = expanded ? { rowId, col: columnIndex } : null;
const item = getRowItem(rowId);
startEdit(rowId, columnIndex);
if (item) editValue.value = inlineCellEditorText(item.data[columnIndex] ?? null, columnIndex);
}
async function startDomCellEdit(rowId: number, columnIndex: number, displayText: string, event: MouseEvent) {
@@ -3716,9 +3746,44 @@ function resultColumnInfoForGridColumn(columnIndex: number): Pick<ColumnInfo, "d
}
function temporalEditorConfigForColumn(columnIndex: number): TemporalCellEditorConfig | undefined {
if (resolvedDatabaseType.value === "iotdb") {
const resultType = props.result.column_types?.[columnIndex];
const tableType = tableColumnForGridColumn(columnIndex)?.data_type;
if ((resultType ?? tableType)?.trim().toUpperCase().startsWith("TIMESTAMP")) {
const precision = iotdbTimestampPrecision(resolvedDatabaseType.value, resultType);
return precision ? { kind: "datetime", fractionPrecision: iotdbTimestampFractionDigits(precision) } : undefined;
}
}
return temporalCellEditorConfig(tableColumnForGridColumn(columnIndex), props.databaseType);
}
function isIoTDBTimestampColumn(columnIndex: number): boolean {
const columnType = props.result.column_types?.[columnIndex] ?? tableColumnForGridColumn(columnIndex)?.data_type;
return !!iotdbTimestampPrecision(resolvedDatabaseType.value, columnType);
}
function inlineCellEditorText(value: CellValue, columnIndex: number): string {
const columnInfo = tableColumnForGridColumn(columnIndex);
const columnType = props.result.column_types?.[columnIndex] ?? columnInfo?.data_type;
return (
formatIoTDBTimestampEditorValue(value, resolvedDatabaseType.value, columnType, resolvedConnectionConfig.value?.url_params) ??
dataGridCellEditorText({
value,
databaseType: resolvedDatabaseType.value,
columnInfo,
})
);
}
function normalizeTemporalCellEditorValue(value: string, columnIndex: number): string {
if (!isIoTDBTimestampColumn(columnIndex)) return value;
const columnType = props.result.column_types?.[columnIndex] ?? tableColumnForGridColumn(columnIndex)?.data_type;
const timestamp = parseIoTDBTimestampEditorValue(value, resolvedDatabaseType.value, columnType, resolvedConnectionConfig.value?.url_params);
if (timestamp === null) return "NULL";
if (timestamp === undefined) return value;
return formatIoTDBTimestampEditorValue(timestamp, resolvedDatabaseType.value, columnType, resolvedConnectionConfig.value?.url_params) ?? value;
}
function enumValuesForGridColumn(columnIndex: number): string[] {
return tableColumnForGridColumn(columnIndex)?.enum_values ?? [];
}
@@ -5162,11 +5227,7 @@ const hasPendingInlineEditorDraft = computed(() => {
if (!cell) return false;
const item = getRowItem(cell.rowId);
if (!item || item.isDeleted) return false;
const originalValue = dataGridCellEditorText({
value: item.data[cell.col] ?? null,
databaseType: resolvedDatabaseType.value,
columnInfo: tableColumnForGridColumn(cell.col),
});
const originalValue = inlineCellEditorText(item.data[cell.col] ?? null, cell.col);
return editValue.value !== originalValue;
});
const hasPendingDataEditorDraft = computed(() => hasPendingDetailEditorDraft.value || hasPendingInlineEditorDraft.value);
@@ -5285,7 +5346,7 @@ watch(activeCellDetail, (detail) => {
const detailTemporalEditorConfig = computed(() => {
const detail = activeCellDetail.value;
return detail ? temporalEditorConfigForColumn(detail.colIndex) : undefined;
return detail && !isIoTDBTimestampColumn(detail.colIndex) ? temporalEditorConfigForColumn(detail.colIndex) : undefined;
});
const sideDetailValueFillsHeight = computed(() => cellDetailPanelIsBottom.value || isEditingDetail.value || (!cellDetailPanelIsBottom.value && !activeCellDetail.value?.imagePreviewUrl));
const canCompactDetailJson = computed(() => {
@@ -7871,7 +7932,15 @@ function deleteCurrentRow(): boolean {
return true;
}
function currentIoTDBTimestampEditValue(): CellValue | undefined {
const cell = editingCell.value;
if (!cell || !isIoTDBTimestampColumn(cell.col)) return undefined;
const columnType = props.result.column_types?.[cell.col] ?? tableColumnForGridColumn(cell.col)?.data_type;
return parseIoTDBTimestampEditorValue(editValue.value, resolvedDatabaseType.value, columnType, resolvedConnectionConfig.value?.url_params);
}
function commitGridEdit(value?: CellValue) {
if (value === undefined) value = currentIoTDBTimestampEditValue();
void commitEditAndMaybeAutoSave(value === undefined ? undefined : { explicitValue: value }).finally(() => nextTick(() => gridRef.value?.focus({ preventScroll: true })));
}
@@ -7891,15 +7960,17 @@ function commitBooleanGridEdit(value?: string | null) {
async function commitEditFromCellBlur() {
const target = pendingQuickEntryDraftCellFocus.value;
pendingQuickEntryDraftCellFocus.value = null;
const timestamp = currentIoTDBTimestampEditValue();
const timestampOptions = timestamp === undefined ? {} : { explicitValue: timestamp };
if (target && editingCell.value?.rowId === quickEntryDraftRowId && target.rowId === quickEntryDraftRowId) {
await commitEditFromBlur({ promoteDraft: false });
await commitEditFromBlur({ ...timestampOptions, promoteDraft: false });
nextTick(() => {
const item = getRowItem(target.rowId);
if (item && canEditCellItem(item, target.col)) void startCellEdit(target.rowId, target.col, false);
});
return;
}
await commitEditFromBlur();
await commitEditFromBlur(timestampOptions);
}
function onRowNumberMouseDown(item: RowItem, event: MouseEvent) {
@@ -10905,6 +10976,7 @@ function currentGridContextMenuItems(): ContextMenuItem[] {
v-model="editValue"
:kind="temporalEditorConfigForColumn(cell.valueIndex)!.kind"
:fraction-precision="temporalEditorConfigForColumn(cell.valueIndex)!.fractionPrecision"
:normalize-value="(value) => normalizeTemporalCellEditorValue(value, cell.valueIndex)"
cell-layout="transpose"
@cancel="cancelEdit"
@commit="commitGridEdit"
@@ -11495,6 +11567,7 @@ function currentGridContextMenuItems(): ContextMenuItem[] {
v-model="editValue"
:kind="temporalEditorConfigForColumn(canvasEditingCell.actualColIdx)!.kind"
:fraction-precision="temporalEditorConfigForColumn(canvasEditingCell.actualColIdx)!.fractionPrecision"
:normalize-value="(value) => normalizeTemporalCellEditorValue(value, canvasEditingCell!.actualColIdx)"
@cancel="cancelEdit"
@commit="commitGridEdit"
/>
@@ -11700,6 +11773,7 @@ function currentGridContextMenuItems(): ContextMenuItem[] {
v-model="editValue"
:kind="temporalEditorConfigForColumn(col.actualColIdx)!.kind"
:fraction-precision="temporalEditorConfigForColumn(col.actualColIdx)!.fractionPrecision"
:normalize-value="(value) => normalizeTemporalCellEditorValue(value, col.actualColIdx)"
@cancel="cancelEdit"
@commit="commitGridEdit"
/>
@@ -14,6 +14,7 @@ const props = withDefaults(
cellLayout?: "grid" | "transpose";
commitOnClose?: boolean;
fractionPrecision?: number;
normalizeValue?: (value: string) => string;
}>(),
{
variant: "cell",
@@ -99,9 +100,10 @@ function setOpen(value: boolean) {
if (!value && props.commitOnClose && !closeHandled && !skipCommitOnClose) finishCommit();
}
function setModelValue(value: string) {
localValue.value = value;
emit("update:modelValue", value);
function setModelValue(value: string, normalize = false) {
const nextValue = normalize ? (props.normalizeValue?.(value) ?? value) : value;
localValue.value = nextValue;
emit("update:modelValue", nextValue);
}
function updateTextInput(event: Event) {
@@ -125,14 +127,14 @@ function updateDateFromInput(part: "day" | "month" | "year", event: Event) {
}
function stepDate(part: "day" | "month" | "year", delta: number) {
setModelValue(stepTemporalInputValue(localValue.value, props.kind, part, delta));
setModelValue(stepTemporalInputValue(localValue.value, props.kind, part, delta), true);
}
function updateTime(part: "hour" | "minute" | "second", rawValue: string | number) {
const parts = { ...timeParts.value, [part]: normalizeTimePart(rawValue, part === "hour" ? 23 : 59) };
const nextTime = `${parts.hour}:${parts.minute}:${parts.second}${fractionSuffix.value}`;
if (props.kind === "time") {
setModelValue(nextTime);
setModelValue(nextTime, true);
return;
}
setDateTimeValue(dateParts.value.year, dateParts.value.month, dateParts.value.day, nextTime);
@@ -143,7 +145,7 @@ function updateTimeFromInput(part: "hour" | "minute" | "second", event: Event) {
}
function stepTime(part: "hour" | "minute" | "second", delta: number) {
setModelValue(stepTemporalInputValue(localValue.value, props.kind, part, delta));
setModelValue(stepTemporalInputValue(localValue.value, props.kind, part, delta), true);
}
const fractionSuffix = computed(() => {
@@ -160,7 +162,7 @@ function updateFractionValue(rawValue: string) {
const digits = rawValue.replace(/\D/g, "").slice(0, maxLength);
const nextTime = `${timeParts.value.hour}:${timeParts.value.minute}:${timeParts.value.second}${digits ? `.${digits}` : ""}`;
if (props.kind === "time") {
setModelValue(nextTime);
setModelValue(nextTime, true);
return;
}
setDateTimeValue(dateParts.value.year, dateParts.value.month, dateParts.value.day, nextTime);
@@ -179,20 +181,20 @@ function flushInputValue(target: EventTarget | null) {
}
function normalizeTextInputValue() {
setModelValue(parseTemporalInputValue(localValue.value, props.kind) ?? "");
setModelValue(parseTemporalInputValue(localValue.value, props.kind) ?? "", true);
}
function setNull() {
setModelValue("NULL");
setModelValue("NULL", true);
}
function setNow() {
const now = new Date();
const dateText = [String(now.getFullYear()).padStart(4, "0"), String(now.getMonth() + 1).padStart(2, "0"), String(now.getDate()).padStart(2, "0")].join("-");
const nextTime = [String(now.getHours()).padStart(2, "0"), String(now.getMinutes()).padStart(2, "0"), String(now.getSeconds()).padStart(2, "0")].join(":") + nowFractionSuffix(now);
if (props.kind === "date") setModelValue(dateText);
else if (props.kind === "time") setModelValue(nextTime);
else setModelValue(`${dateText} ${nextTime}`);
if (props.kind === "date") setModelValue(dateText, true);
else if (props.kind === "time") setModelValue(nextTime, true);
else setModelValue(`${dateText} ${nextTime}`, true);
}
function finishCommit() {
@@ -264,8 +266,8 @@ function normalizeTimePart(value: string | number, max: number): string {
function setDateTimeValue(year: number, month: number, day: number, time: string) {
const dateText = [String(year).padStart(4, "0"), String(month).padStart(2, "0"), String(day).padStart(2, "0")].join("-");
if (props.kind === "date") setModelValue(dateText);
else setModelValue(`${dateText} ${time}`);
if (props.kind === "date") setModelValue(dateText, true);
else setModelValue(`${dateText} ${time}`, true);
}
function parseFractionDigits(value: string): string {