fix(grid): keep JSON format reachable after compacting
This commit is contained in:
7 files changed
+86
No files matched your search
@@ -152,4 +152,44 @@ describe("useDataGridCellDetailEdit", () => {
|
||||
expect(editor.isEditingDetail.value).toBe(false);
|
||||
expect(editor.detailEditValue.value).toBe("");
|
||||
});
|
||||
|
||||
// issue #9832:单元格详情面板的「格式化 JSON」只重排编辑器草稿,不触发
|
||||
// 「正在编辑格式化后的 JSON」提示,也不改动原始值。
|
||||
it("expands a compacted JSON draft without warning about formatted JSON", async () => {
|
||||
const compact = '{"owner":"zipg","tags":["a"]}';
|
||||
const activeDetail = ref<DataGridCellDetail | null>(detail(compact));
|
||||
const syncEditor = vi.fn();
|
||||
const warnFormattedJsonEdit = vi.fn();
|
||||
const editor = useDataGridCellDetailEdit({
|
||||
activeDetail: computed(() => activeDetail.value),
|
||||
activeTab: ref("valueEditor"),
|
||||
jsonFormatted: computed(() => false),
|
||||
databaseType: computed(() => "mongodb"),
|
||||
resultRows: computed(() => [["id", compact]]),
|
||||
getColumnInfo: () => undefined,
|
||||
getRowItem: () => ({ sourceIndex: 0, isNew: false, isDeleted: false }),
|
||||
hydrateLargeValueCell: async () => true,
|
||||
applyCellValue: vi.fn(),
|
||||
restoreCellValue: vi.fn(),
|
||||
syncEditor,
|
||||
refreshDetail: vi.fn(),
|
||||
warnFormattedJsonEdit,
|
||||
});
|
||||
|
||||
await editor.startDetailEdit();
|
||||
syncEditor.mockClear();
|
||||
warnFormattedJsonEdit.mockClear();
|
||||
editor.formatDetailJsonDraft();
|
||||
|
||||
expect(editor.detailEditValue.value).toBe('{\n "owner": "zipg",\n "tags": [\n "a"\n ]\n}');
|
||||
expect(editor.detailEditOriginalValue.value).toBe(compact);
|
||||
expect(syncEditor).toHaveBeenLastCalledWith('{\n "owner": "zipg",\n "tags": [\n "a"\n ]\n}', "");
|
||||
expect(warnFormattedJsonEdit).not.toHaveBeenCalled();
|
||||
|
||||
syncEditor.mockClear();
|
||||
editor.detailEditValue.value = "not json";
|
||||
editor.formatDetailJsonDraft();
|
||||
expect(editor.detailEditValue.value).toBe("not json");
|
||||
expect(syncEditor).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -203,6 +203,15 @@ export function useDataGridCellDetailEdit(options: UseDataGridCellDetailEditOpti
|
||||
options.warnFormattedJsonEdit(detail, true);
|
||||
}
|
||||
|
||||
// 与 formatValueEditorJson 相同的草稿格式化,但不弹「正在编辑格式化后的 JSON」
|
||||
// 提示:用户是在单元格详情面板里主动点「格式化 JSON」展开草稿(issue #9832)。
|
||||
function formatDetailJsonDraft() {
|
||||
const detail = options.activeDetail.value;
|
||||
if (!detail || !canFormatCellDetailJson(detailEditValue.value, detail.type)) return;
|
||||
detailEditValue.value = formatJsonText(detailEditValue.value) ?? detailEditValue.value;
|
||||
syncEditorFromDetailEdit();
|
||||
}
|
||||
|
||||
function compactDetailJson() {
|
||||
const detail = options.activeDetail.value;
|
||||
if (!detail || !canFormatCellDetailJson(detailEditValue.value, detail.type)) return;
|
||||
@@ -250,6 +259,7 @@ export function useDataGridCellDetailEdit(options: UseDataGridCellDetailEditOpti
|
||||
restoreDetailOriginalValue,
|
||||
setValueEditorNull,
|
||||
formatValueEditorJson,
|
||||
formatDetailJsonDraft,
|
||||
compactDetailJson,
|
||||
openDetailJsonCompare,
|
||||
setDetailNull,
|
||||
|
||||
Reference in new issue
Block a user