This commit is contained in:
rgrgogu
2026-05-20 13:22:29 +08:00
parent 6907e9bb2d
commit 6a5145f553
26 changed files with 2615 additions and 221 deletions
+6 -3
View File
@@ -72,6 +72,7 @@ function flattenJsonb(jsonbSchema = {}, prefix = "", exclude = []) {
field: path,
order: value?.order ?? Infinity, // ← carry order from schema
hidden: value?.hidden ?? false, // ← carry hidden flag
filterable: value.filterable ?? true,
options: {},
});
}
@@ -141,14 +142,15 @@ function modelToAttributes(model, { jsonbSchemas = {}, exclude = [], timestampLa
name: defaultTimestampLabels[field] ?? def.label ?? toLabel(field),
type,
field,
order: def.order ?? Infinity, // ← carry order from model
hidden: def.hidden ?? false, // ← carry hidden flag
order: def.order ?? Infinity,
hidden: def.hidden ?? false,
filterable: def.filterable ?? true,
options: resolveOptions(def.type)
});
}
// ── Audit fields in correct sequence ────────────────────────────────────────
for (const { field, type, order, hiddenOnList, hiddenOnArchived } of auditSequence) {
for (const { field, type, order, hiddenOnList, hiddenOnArchived, filterable } of auditSequence) {
if (exclude.includes(field)) continue;
if (!rawAttrs[field]) continue; // skip if field doesn't exist on model
@@ -161,6 +163,7 @@ function modelToAttributes(model, { jsonbSchemas = {}, exclude = [], timestampLa
order,
hidden: isArchived ? hiddenOnArchived : hiddenOnList,
options: resolveOptions(rawAttrs[field]?.type),
filterable: filterable ?? true,
});
}