From e5a0d7ece5b68a010750fad0049a3673d63680b9 Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Wed, 28 Oct 2026 11:03:19 +0800
Subject: [PATCH 01/23] feat(orm): store PropertyDefinition labels as lang maps

ResolveProperties unwraps string/selection labels for the request
language so schema chrome can ship without TranslationTerm scopes.
---
 modules/core/service/orm/model/index.ts       |   7 +
 .../orm/model/properties_label_i18n.test.ts   | 124 +++++++++++
 .../orm/model/properties_label_i18n.ts        | 197 ++++++++++++++++++
 .../orm/model/properties_resolve.test.ts      |  42 ++++
 .../service/orm/model/properties_resolve.ts   |   6 +-
 .../service/orm/model/properties_types.ts     |  32 ++-
 6 files changed, 404 insertions(+), 4 deletions(-)
 create mode 100644 modules/core/service/orm/model/properties_label_i18n.test.ts
 create mode 100644 modules/core/service/orm/model/properties_label_i18n.ts

diff --git a/modules/core/service/orm/model/index.ts b/modules/core/service/orm/model/index.ts
index 3fb6c6c61..0a121bb95 100644
--- a/modules/core/service/orm/model/index.ts
+++ b/modules/core/service/orm/model/index.ts
@@ -24,8 +24,15 @@ export {
   normalizePropertiesMap,
   isPlainPropertiesMap,
   type PropertyItemDefinition,
+  type PropertyLabel,
   type ResolvedPropertyItem,
 } from './properties_types';
+export {
+  mergePropertyLabelWrite,
+  mergeSelectionLabelsWrite,
+  translatePropertyDefinitionItems,
+  unwrapPropertyLabel,
+} from './properties_label_i18n';
 export {
   lookupPropertyDefinitionModel,
   __setLookupPropertyDefinitionModelForTest,
diff --git a/modules/core/service/orm/model/properties_label_i18n.test.ts b/modules/core/service/orm/model/properties_label_i18n.test.ts
new file mode 100644
index 000000000..71da5aba6
--- /dev/null
+++ b/modules/core/service/orm/model/properties_label_i18n.test.ts
@@ -0,0 +1,124 @@
+// SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
+// SPDX-License-Identifier: Apache-2.0
+
+import {
+  mergePropertyLabelWrite,
+  mergeSelectionLabelsWrite,
+  normalizePropertyLabelForStorage,
+  parsePropertyLabelMap,
+  translatePropertyDefinitionItems,
+  unwrapPropertyLabel,
+} from './properties_label_i18n';
+import { assertValidPropertyDefinitionItems } from './properties_types';
+
+test('parsePropertyLabelMap treats plain string as en_US', () => {
+  expect(parsePropertyLabelMap('Priority')).toEqual({ en_US: 'Priority' });
+  expect(parsePropertyLabelMap({ en_US: 'Priority', zh_CN: '优先级' })).toEqual({
+    en_US: 'Priority',
+    zh_CN: '优先级',
+  });
+  expect(parsePropertyLabelMap(null)).toBeNull();
+  expect(parsePropertyLabelMap(['x'])).toBeNull();
+});
+
+test('unwrapPropertyLabel falls back to en_US and keeps explicit empty', () => {
+  expect(unwrapPropertyLabel({ en_US: 'Priority', zh_CN: '优先级' }, 'zh_CN')).toBe('优先级');
+  expect(unwrapPropertyLabel({ en_US: 'Priority' }, 'zh_CN')).toBe('Priority');
+  expect(unwrapPropertyLabel({ en_US: 'Priority', zh_CN: '' }, 'zh_CN')).toBe('');
+  expect(unwrapPropertyLabel('Priority', 'zh_CN')).toBe('Priority');
+  expect(unwrapPropertyLabel(undefined, 'zh_CN')).toBe('');
+});
+
+test('normalizePropertyLabelForStorage keeps string and cleans maps', () => {
+  expect(normalizePropertyLabelForStorage('Priority')).toBe('Priority');
+  expect(normalizePropertyLabelForStorage({ en_US: 'Priority' })).toBe('Priority');
+  expect(normalizePropertyLabelForStorage({ en_US: 'Priority', zh_CN: '优先级' })).toEqual({
+    en_US: 'Priority',
+    zh_CN: '优先级',
+  });
+  expect(() => normalizePropertyLabelForStorage({ 'zh-CN': 'x' })).toThrow(/terminology code/);
+  expect(() => normalizePropertyLabelForStorage({ en_US: { nested: 1 } as any })).toThrow(/must be a string/);
+});
+
+test('mergePropertyLabelWrite preserves other langs and seeds en_US', () => {
+  expect(mergePropertyLabelWrite({ en_US: 'Priority', zh_CN: '旧' }, '优先级', 'zh_CN')).toEqual({
+    en_US: 'Priority',
+    zh_CN: '优先级',
+  });
+  expect(mergePropertyLabelWrite(undefined, '优先级', 'zh_CN')).toEqual({
+    en_US: '优先级',
+    zh_CN: '优先级',
+  });
+  expect(mergePropertyLabelWrite('Priority', '优先级', 'zh_CN')).toEqual({
+    en_US: 'Priority',
+    zh_CN: '优先级',
+  });
+});
+
+test('mergeSelectionLabelsWrite merges by option value', () => {
+  const merged = mergeSelectionLabelsWrite(
+    [
+      ['high', { en_US: 'High', zh_CN: '高' }],
+      ['low', 'Low'],
+    ],
+    [
+      { value: 'high', label: '很高' },
+      { value: 'mid', label: '中' },
+    ],
+    'zh_CN'
+  );
+  expect(merged).toEqual([
+    ['high', { en_US: 'High', zh_CN: '很高' }],
+    ['mid', { en_US: '中', zh_CN: '中' }],
+  ]);
+});
+
+test('translatePropertyDefinitionItems unwraps string and selection labels only', () => {
+  const items = translatePropertyDefinitionItems(
+    [
+      {
+        name: 'priority',
+        type: 'selection',
+        string: { en_US: 'Priority', zh_CN: '优先级' },
+        selection: [
+          ['high', { en_US: 'High', zh_CN: '高' }],
+          { value: 'low', label: { en_US: 'Low', zh_CN: '低' } },
+        ],
+        default: 'high',
+      },
+    ],
+    'zh_CN'
+  );
+  expect(items[0].string).toBe('优先级');
+  expect(items[0].default).toBe('high');
+  expect(items[0].selection).toEqual([
+    ['high', '高'],
+    { value: 'low', label: '低' },
+  ]);
+});
+
+test('assertValidPropertyDefinitionItems accepts lang-map labels', () => {
+  const out = assertValidPropertyDefinitionItems([
+    {
+      name: 'priority',
+      type: 'selection',
+      string: { en_US: 'Priority', zh_CN: '优先级' },
+      selection: [['high', { en_US: 'High', zh_CN: '高' }]],
+      default: 'high',
+    },
+    {
+      name: 'code',
+      type: 'char',
+      string: 'External Code',
+    },
+  ]);
+  expect(out[0].string).toEqual({ en_US: 'Priority', zh_CN: '优先级' });
+  expect(out[0].selection).toEqual([['high', { en_US: 'High', zh_CN: '高' }]]);
+  expect(out[1].string).toBe('External Code');
+});
+
+test('assertValidPropertyDefinitionItems rejects invalid label maps', () => {
+  expect(() =>
+    assertValidPropertyDefinitionItems([{ name: 'x', type: 'char', string: { en_US: { bad: 1 } as any } }])
+  ).toThrow(/must be a string/);
+});
diff --git a/modules/core/service/orm/model/properties_label_i18n.ts b/modules/core/service/orm/model/properties_label_i18n.ts
new file mode 100644
index 000000000..60601d763
--- /dev/null
+++ b/modules/core/service/orm/model/properties_label_i18n.ts
@@ -0,0 +1,197 @@
+// SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
+// SPDX-License-Identifier: Apache-2.0
+
+import {
+  TRANSLATED_BASE_LANG,
+  assertTranslatedLangKey,
+  isTranslatedLangMap,
+  unwrapTranslatedValue,
+} from '../repository/projection/translated_field_codec';
+import type { PropertyItemDefinition, PropertyLabel } from './properties_types';
+
+function hasOwn(map: object, key: string): boolean {
+  return Object.prototype.hasOwnProperty.call(map, key);
+}
+
+/** Parse a stored property label into a lang map (plain string → `{ en_US: s }`). */
+export function parsePropertyLabelMap(value: unknown): Record<string, string> | null {
+  if (value == null) return null;
+  if (typeof value === 'string') {
+    return { [TRANSLATED_BASE_LANG]: value };
+  }
+  if (!isTranslatedLangMap(value)) return null;
+  const out: Record<string, string> = {};
+  for (const [rawKey, rawVal] of Object.entries(value)) {
+    const lang = String(rawKey || '').trim();
+    if (!lang || lang.includes('-')) continue;
+    if (rawVal == null) {
+      out[lang] = '';
+      continue;
+    }
+    if (typeof rawVal === 'string' || typeof rawVal === 'number' || typeof rawVal === 'boolean') {
+      out[lang] = String(rawVal);
+    }
+  }
+  return Object.keys(out).length ? out : null;
+}
+
+/**
+ * Normalize a label for Definition write storage.
+ * Plain strings are kept; lang maps are cleaned (string values only).
+ * Returns `undefined` when the label should be omitted.
+ */
+export function normalizePropertyLabelForStorage(value: unknown, fieldHint = 'string'): PropertyLabel | undefined {
+  if (value == null) return undefined;
+  if (typeof value === 'string') {
+    return value;
+  }
+  if (!isTranslatedLangMap(value) || Array.isArray(value)) {
+    throw new Error(`PropertyDefinition label "${fieldHint}" must be a string or lang map`);
+  }
+  const out: Record<string, string> = {};
+  for (const [rawKey, rawVal] of Object.entries(value)) {
+    const lang = assertTranslatedLangKey(rawKey, fieldHint);
+    if (rawVal == null) {
+      out[lang] = '';
+      continue;
+    }
+    if (typeof rawVal !== 'string' && typeof rawVal !== 'number' && typeof rawVal !== 'boolean') {
+      throw new Error(`PropertyDefinition label "${fieldHint}" lang map value for "${lang}" must be a string`);
+    }
+    out[lang] = String(rawVal);
+  }
+  if (!Object.keys(out).length) return undefined;
+  // Single en_US-only map collapses to plain string for compact storage.
+  const keys = Object.keys(out);
+  if (keys.length === 1 && keys[0] === TRANSLATED_BASE_LANG) {
+    return out[TRANSLATED_BASE_LANG];
+  }
+  return out;
+}
+
+/** Unwrap a stored label for a request language (missing → en_US → ''). */
+export function unwrapPropertyLabel(label: unknown, lang: string): string {
+  const map = parsePropertyLabelMap(label);
+  if (!map) return '';
+  const unwrapped = unwrapTranslatedValue(map, lang);
+  return unwrapped == null ? '' : unwrapped;
+}
+
+/**
+ * Merge a current-language label write into a previous PropertyLabel.
+ * Preserves other language keys; seeds en_US on first write when missing.
+ */
+export function mergePropertyLabelWrite(
+  previous: unknown,
+  currentLangValue: string,
+  lang: string,
+): PropertyLabel {
+  const key = assertTranslatedLangKey(lang, 'string');
+  const current = String(currentLangValue ?? '');
+  const prevMap = parsePropertyLabelMap(previous) || {};
+  const next: Record<string, string> = { ...prevMap, [key]: current };
+  if (!hasOwn(next, TRANSLATED_BASE_LANG)) {
+    next[TRANSLATED_BASE_LANG] = current;
+  }
+  return normalizePropertyLabelForStorage(next, 'string') ?? current;
+}
+
+function selectionOptionValue(opt: unknown): string | null {
+  if (Array.isArray(opt) && typeof opt[0] === 'string') return opt[0];
+  if (opt && typeof opt === 'object' && !Array.isArray(opt) && typeof (opt as { value?: unknown }).value === 'string') {
+    return String((opt as { value: string }).value);
+  }
+  return null;
+}
+
+function selectionOptionLabel(opt: unknown): unknown {
+  if (Array.isArray(opt)) return opt[1] ?? opt[0];
+  if (opt && typeof opt === 'object' && !Array.isArray(opt)) {
+    return (opt as { label?: unknown }).label ?? (opt as { value?: unknown }).value;
+  }
+  return undefined;
+}
+
+/** Normalize selection options; labels may be string or lang map. */
+export function normalizeSelectionLabelsForStorage(
+  selection: unknown,
+  itemName: string
+): PropertyItemDefinition['selection'] {
+  if (!Array.isArray(selection)) {
+    throw new Error(`PropertyDefinition.Definition item "${itemName}" selection options are invalid`);
+  }
+  const out: NonNullable<PropertyItemDefinition['selection']> = [];
+  for (let i = 0; i < selection.length; i++) {
+    const opt = selection[i];
+    const value = selectionOptionValue(opt);
+    if (value == null) {
+      throw new Error(`PropertyDefinition.Definition item "${itemName}" selection options are invalid`);
+    }
+    const rawLabel = selectionOptionLabel(opt);
+    const label =
+      rawLabel === undefined || rawLabel === null
+        ? value
+        : (normalizePropertyLabelForStorage(rawLabel, `${itemName}.selection.${value}`) ?? value);
+    if (Array.isArray(opt)) {
+      out.push([value, label] as [string, PropertyLabel]);
+    } else {
+      out.push({ value, label });
+    }
+  }
+  return out;
+}
+
+/**
+ * Merge current-lang selection labels into previous options (by value).
+ * Used by the definition editor so saving does not wipe other languages.
+ */
+export function mergeSelectionLabelsWrite(
+  previous: PropertyItemDefinition['selection'] | undefined,
+  incoming: Array<{ value: string; label: string }>,
+  lang: string
+): PropertyItemDefinition['selection'] {
+  const prevByValue = new Map<string, unknown>();
+  for (const opt of previous || []) {
+    const value = selectionOptionValue(opt);
+    if (value == null) continue;
+    prevByValue.set(value, selectionOptionLabel(opt));
+  }
+  return incoming.map(opt => {
+    const prevLabel = prevByValue.get(opt.value);
+    const merged = mergePropertyLabelWrite(prevLabel, opt.label, lang);
+    return [opt.value, merged] as [string, PropertyLabel];
+  });
+}
+
+/**
+ * Expand item `string` / selection labels to the request language.
+ * Returns a new array; does not mutate input. Selection values are unchanged.
+ */
+export function translatePropertyDefinitionItems(
+  items: PropertyItemDefinition[],
+  lang: string
+): PropertyItemDefinition[] {
+  const code = String(lang || '').trim() || TRANSLATED_BASE_LANG;
+  return (items || []).map(item => {
+    const next: PropertyItemDefinition = { ...item };
+    if (Object.prototype.hasOwnProperty.call(item, 'string')) {
+      next.string = unwrapPropertyLabel(item.string, code);
+    }
+    if (Array.isArray(item.selection)) {
+      next.selection = item.selection.map(opt => {
+        if (Array.isArray(opt) && typeof opt[0] === 'string') {
+          const value = opt[0];
+          const label = unwrapPropertyLabel(opt[1] ?? value, code) || value;
+          return [value, label] as [string, string];
+        }
+        if (opt && typeof opt === 'object' && !Array.isArray(opt) && typeof (opt as { value?: unknown }).value === 'string') {
+          const value = String((opt as { value: string }).value);
+          const label = unwrapPropertyLabel((opt as { label?: unknown }).label ?? value, code) || value;
+          return { value, label };
+        }
+        return opt;
+      }) as PropertyItemDefinition['selection'];
+    }
+    return next;
+  });
+}
diff --git a/modules/core/service/orm/model/properties_resolve.test.ts b/modules/core/service/orm/model/properties_resolve.test.ts
index 334126973..4d560ff46 100644
--- a/modules/core/service/orm/model/properties_resolve.test.ts
+++ b/modules/core/service/orm/model/properties_resolve.test.ts
@@ -3,6 +3,10 @@
 
 import { Model } from '../decorator/model';
 import { Field } from '../decorator/field';
+import {
+  clearGlobalRequestContextProvider,
+  setGlobalRequestContextProvider,
+} from '../../../rpc/context';
 import BaseModel from './model';
 import PropertyDefinitionBaseModel from './property_definition_base_model';
 import {
@@ -132,6 +136,44 @@ test('properties resolve: App-level merges schema ⊕ value', async () => {
   }
 });
 
+test('properties resolve: unwraps Definition label lang maps by request lang', async () => {
+  installDefinitionRows([
+    {
+      TargetModel: 'Pp1Partner',
+      PropertiesField: 'PartnerProperties',
+      ContainerId: null,
+      Definition: [
+        {
+          name: 'priority',
+          type: 'selection',
+          string: { en_US: 'Priority', zh_CN: '优先级' },
+          selection: [
+            ['high', { en_US: 'High', zh_CN: '高' }],
+            ['low', 'Low'],
+          ],
+          default: 'high',
+        },
+        { name: 'code', type: 'char', string: 'External Code' },
+      ],
+    },
+  ]);
+  setGlobalRequestContextProvider({ lang: 'zh_CN' });
+  try {
+    const items = await resolveProperties(Pp1Partner as any, { PartnerProperties: { priority: 'high' } }, 'PartnerProperties');
+    expect(items[0]?.string).toBe('优先级');
+    expect(items[0]?.selection).toEqual([
+      ['high', '高'],
+      ['low', 'Low'],
+    ]);
+    expect(items[0]?.value).toBe('high');
+    expect(items[0]?.default).toBe('high');
+    expect(items[1]?.string).toBe('External Code');
+  } finally {
+    clearGlobalRequestContextProvider();
+    __clearLookupPropertyDefinitionModelForTest();
+  }
+});
+
 test('properties resolve: empty parent id → [] without App-level fallback (PP2)', async () => {
   installDefinitionRows([
     {
diff --git a/modules/core/service/orm/model/properties_resolve.ts b/modules/core/service/orm/model/properties_resolve.ts
index e357223bc..32a3bec7a 100644
--- a/modules/core/service/orm/model/properties_resolve.ts
+++ b/modules/core/service/orm/model/properties_resolve.ts
@@ -7,7 +7,9 @@ import { asObjectRecord } from '../../../utils/object';
 import type { ObjectRecord } from '../../../utils/types';
 import type BaseModel from './model';
 import type { ModelCtor } from './types';
+import { resolveTranslatedFieldLang } from '../repository/projection/translated_field_codec';
 import { lookupPropertyDefinitionModel } from './properties_lookup';
+import { translatePropertyDefinitionItems } from './properties_label_i18n';
 import {
   filterReadablePropertyDefinitionItems,
   normalizePropertiesMap,
@@ -153,7 +155,9 @@ export async function resolveProperties(
     items = await loadDefinitionItems(application, targetModel, fieldName, 'parent', containerModel, containerId);
   }
 
-  return items.map(item => {
+  // Expand Definition label lang maps for the request language; do not cache translated items.
+  const localized = translatePropertyDefinitionItems(items, resolveTranslatedFieldLang());
+  return localized.map(item => {
     const resolved: ResolvedPropertyItem = { ...item };
     if (Object.prototype.hasOwnProperty.call(valueMap, item.name)) {
       resolved.value = valueMap[item.name];
diff --git a/modules/core/service/orm/model/properties_types.ts b/modules/core/service/orm/model/properties_types.ts
index cabe0d289..2b4a56e50 100644
--- a/modules/core/service/orm/model/properties_types.ts
+++ b/modules/core/service/orm/model/properties_types.ts
@@ -1,6 +1,8 @@
 // SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
 // SPDX-License-Identifier: Apache-2.0
 
+import { normalizePropertyLabelForStorage, normalizeSelectionLabelsForStorage } from './properties_label_i18n';
+
 /** V1 property item types (PP7). */
 export const PROPERTIES_V1_TYPES = new Set([
   'boolean',
@@ -13,13 +15,16 @@ export const PROPERTIES_V1_TYPES = new Set([
   'selection',
 ]);
 
+/** Definition item label: plain string (≡ `{ en_US: s }`) or lang map. */
+export type PropertyLabel = string | Record<string, string>;
+
 export type PropertyItemDefinition = {
   name: string;
   type: string;
-  string?: string;
+  string?: PropertyLabel;
   default?: unknown;
   readonly?: boolean;
-  selection?: Array<{ value: string; label?: string } | [string, string]>;
+  selection?: Array<{ value: string; label?: PropertyLabel } | [string, PropertyLabel]>;
   [key: string]: unknown;
 };
 
@@ -132,6 +137,19 @@ export function assertValidPropertyDefinitionItems(raw: unknown): PropertyItemDe
       );
     }
     const normalized = { ...rec, name, type } as PropertyItemDefinition;
+    if (Object.prototype.hasOwnProperty.call(rec, 'string')) {
+      try {
+        const label = normalizePropertyLabelForStorage(rec.string, `${name}.string`);
+        if (label === undefined) delete normalized.string;
+        else normalized.string = label;
+      } catch (err) {
+        throw new Error(
+          err instanceof Error
+            ? err.message
+            : `PropertyDefinition.Definition item "${name}" string label is invalid`
+        );
+      }
+    }
     if (type === 'selection') {
       const values = selectionOptionValues(rec.selection);
       if (values.length === 0) {
@@ -141,7 +159,15 @@ export function assertValidPropertyDefinitionItems(raw: unknown): PropertyItemDe
       if (values.length !== (rec.selection as unknown[]).length) {
         throw new Error(`PropertyDefinition.Definition item "${name}" selection options are invalid`);
       }
-      normalized.selection = rec.selection as PropertyItemDefinition['selection'];
+      try {
+        normalized.selection = normalizeSelectionLabelsForStorage(rec.selection, name);
+      } catch (err) {
+        throw new Error(
+          err instanceof Error
+            ? err.message
+            : `PropertyDefinition.Definition item "${name}" selection options are invalid`
+        );
+      }
     }
     if (Object.prototype.hasOwnProperty.call(rec, 'default') && !propertyValueMatchesType(normalized, rec.default)) {
       throw new Error(`PropertyDefinition.Definition item "${name}" default does not match type "${type}"`);

From 557dc04cc7995f53dca9974bb67a8f44df98ea89 Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Wed, 28 Oct 2026 11:03:28 +0800
Subject: [PATCH 02/23] feat(web): merge-safe Properties definition label
 editing

Drop secondary schema _t on the value field, merge current-lang writes
into Definition lang maps, and add an in-memory translate dialog.
---
 modules/web/i18n/web.pot                      |  98 +++++---
 modules/web/i18n/zh_CN.po                     |  94 +++++---
 .../field/ChoyPropertiesDefinitionEditor.vue  | 130 ++++++++++-
 .../components/field/ChoyPropertiesField.vue  |  24 +-
 .../ChoyPropertyLabelTranslationsDialog.vue   | 169 ++++++++++++++
 .../field/propertiesDefinitionHelpers.test.ts | 215 ++++++++++++------
 .../field/propertiesDefinitionHelpers.ts      | 148 +++++++++++-
 7 files changed, 723 insertions(+), 155 deletions(-)
 create mode 100644 modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.vue

diff --git a/modules/web/i18n/web.pot b/modules/web/i18n/web.pot
index 64661e8dc..250636bd5 100644
--- a/modules/web/i18n/web.pot
+++ b/modules/web/i18n/web.pot
@@ -780,45 +780,45 @@ msgctxt "web/components/field/ChoyOneToManyField"
 msgid "Delete"
 msgstr ""
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:143
+#: web/components/field/ChoyOneToManyKanbanField.vue:186
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Add a line…"
 msgstr ""
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:384
+#: web/components/field/ChoyOneToManyKanbanField.vue:429
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Are you sure you want to delete this record? This action cannot be undone."
 msgstr ""
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:389
+#: web/components/field/ChoyOneToManyKanbanField.vue:434
 #: web/components/field/ChoyOneToManyKanbanField.vue:93
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Cancel"
 msgstr ""
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:385
+#: web/components/field/ChoyOneToManyKanbanField.vue:430
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Confirm delete"
 msgstr ""
 
 #: web/components/field/ChoyOneToManyKanbanField.vue:20
-#: web/components/field/ChoyOneToManyKanbanField.vue:388
+#: web/components/field/ChoyOneToManyKanbanField.vue:433
 #: web/components/field/ChoyOneToManyKanbanField.vue:90
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Delete"
 msgstr ""
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:146
+#: web/components/field/ChoyOneToManyKanbanField.vue:189
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Edit record"
 msgstr ""
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:145
+#: web/components/field/ChoyOneToManyKanbanField.vue:188
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "New record"
 msgstr ""
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:144
+#: web/components/field/ChoyOneToManyKanbanField.vue:187
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "No data"
 msgstr ""
@@ -838,12 +838,12 @@ msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Save"
 msgstr ""
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:323
+#: web/components/field/ChoyOneToManyKanbanField.vue:368
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Untitled"
 msgstr ""
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:147
+#: web/components/field/ChoyOneToManyKanbanField.vue:190
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "View record"
 msgstr ""
@@ -853,12 +853,14 @@ msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
 msgid "Add property"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:33
+#: web/components/field/ChoyPropertiesDefinitionEditor.vue:38
 msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
 msgid "Default"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:32
+#: web/components/field/ChoyPropertiesDefinitionEditor.vue:183
+#: web/components/field/ChoyPropertiesDefinitionEditor.vue:193
+#: web/components/field/ChoyPropertiesDefinitionEditor.vue:33
 msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
 msgid "Label"
 msgstr ""
@@ -873,18 +875,18 @@ msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
 msgid "No properties defined"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:143
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:89
+#: web/components/field/ChoyPropertiesDefinitionEditor.vue:126
+#: web/components/field/ChoyPropertiesDefinitionEditor.vue:221
 msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
 msgid "PropertyDefinition store is unavailable"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:36
+#: web/components/field/ChoyPropertiesDefinitionEditor.vue:41
 msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
 msgid "Readonly"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:41
+#: web/components/field/ChoyPropertiesDefinitionEditor.vue:51
 msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
 msgid "Remove"
 msgstr ""
@@ -894,22 +896,32 @@ msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
 msgid "Save"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:38
+#: web/components/field/ChoyPropertiesDefinitionEditor.vue:43
 msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
 msgid "Selection JSON"
 msgstr ""
 
+#: web/components/field/ChoyPropertiesDefinitionEditor.vue:35
+msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+msgid "Translate"
+msgstr ""
+
+#: web/components/field/ChoyPropertiesDefinitionEditor.vue:46
+msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+msgid "Translate %s"
+msgstr ""
+
 #: web/components/field/ChoyPropertiesDefinitionEditor.vue:25
 msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
 msgid "Type"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesField.vue:239
+#: web/components/field/ChoyPropertiesField.vue:243
 msgctxt "web/components/field/ChoyPropertiesField"
 msgid "+%s more"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesField.vue:223
+#: web/components/field/ChoyPropertiesField.vue:227
 msgctxt "web/components/field/ChoyPropertiesField"
 msgid "No"
 msgstr ""
@@ -920,7 +932,7 @@ msgctxt "web/components/field/ChoyPropertiesField"
 msgid "No properties defined"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesField.vue:223
+#: web/components/field/ChoyPropertiesField.vue:227
 msgctxt "web/components/field/ChoyPropertiesField"
 msgid "Yes"
 msgstr ""
@@ -930,7 +942,7 @@ msgctxt "web/components/field/ChoySelectionField"
 msgid "Clear"
 msgstr ""
 
-#: web/components/field/ChoySelectionField.vue:343
+#: web/components/field/ChoySelectionField.vue:355
 msgctxt "web/components/field/ChoySelectionField"
 msgid "Invalid option value: %s"
 msgstr ""
@@ -955,7 +967,7 @@ msgctxt "web/components/field/ChoySelectionField"
 msgid "Search…"
 msgstr ""
 
-#: web/components/field/ChoySelectionField.vue:341
+#: web/components/field/ChoySelectionField.vue:353
 msgctxt "web/components/field/ChoySelectionField"
 msgid "Value must be a string"
 msgstr ""
@@ -995,32 +1007,32 @@ msgctxt "web/components/field/ChoyTimeField"
 msgid "Select time"
 msgstr ""
 
-#: web/components/field/ChoyVarcharField.vue:154
+#: web/components/field/ChoyVarcharField.vue:168
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Copied"
 msgstr ""
 
-#: web/components/field/ChoyVarcharField.vue:124
+#: web/components/field/ChoyVarcharField.vue:138
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Copy"
 msgstr ""
 
-#: web/components/field/ChoyVarcharField.vue:156
+#: web/components/field/ChoyVarcharField.vue:170
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Copy failed"
 msgstr ""
 
-#: web/components/field/ChoyVarcharField.vue:280
+#: web/components/field/ChoyVarcharField.vue:294
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Length must not exceed %s"
 msgstr ""
 
-#: web/components/field/ChoyVarcharField.vue:274
+#: web/components/field/ChoyVarcharField.vue:288
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Value is required"
 msgstr ""
 
-#: web/components/field/ChoyVarcharField.vue:276
+#: web/components/field/ChoyVarcharField.vue:290
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Value must be a string"
 msgstr ""
@@ -1100,6 +1112,36 @@ msgctxt "web/components/field/FieldTranslationsDialog"
 msgid "Translations saved"
 msgstr ""
 
+#: web/components/field/ChoyPropertyLabelTranslationsDialog.vue:12
+msgctxt "web/components/field/PropertyLabelTranslationsDialog"
+msgid "Base language (cannot be deleted)"
+msgstr ""
+
+#: web/components/field/ChoyPropertyLabelTranslationsDialog.vue:19
+msgctxt "web/components/field/PropertyLabelTranslationsDialog"
+msgid "Cancel"
+msgstr ""
+
+#: web/components/field/ChoyPropertyLabelTranslationsDialog.vue:96
+msgctxt "web/components/field/PropertyLabelTranslationsDialog"
+msgid "Failed to load translations"
+msgstr ""
+
+#: web/components/field/ChoyPropertyLabelTranslationsDialog.vue:21
+msgctxt "web/components/field/PropertyLabelTranslationsDialog"
+msgid "Save translations"
+msgstr ""
+
+#: web/components/field/ChoyPropertyLabelTranslationsDialog.vue:42
+msgctxt "web/components/field/PropertyLabelTranslationsDialog"
+msgid "Translate label"
+msgstr ""
+
+#: web/components/field/ChoyPropertyLabelTranslationsDialog.vue:42
+msgctxt "web/components/field/PropertyLabelTranslationsDialog"
+msgid "Translate: %s"
+msgstr ""
+
 #: web/components/field/relationCountSummary.ts:14
 msgctxt "web/components/field/relationCountSummary@formatRelationCountSummary"
 msgid "%s record"
diff --git a/modules/web/i18n/zh_CN.po b/modules/web/i18n/zh_CN.po
index 59cd3f57f..df862f93a 100644
--- a/modules/web/i18n/zh_CN.po
+++ b/modules/web/i18n/zh_CN.po
@@ -761,42 +761,42 @@ msgctxt "web/components/field/ChoyOneToManyField"
 msgid "Delete"
 msgstr "删除"
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:143
+#: web/components/field/ChoyOneToManyKanbanField.vue:186
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Add a line…"
 msgstr "添加一行…"
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:384
+#: web/components/field/ChoyOneToManyKanbanField.vue:429
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Are you sure you want to delete this record? This action cannot be undone."
 msgstr "确定要删除此记录吗？此操作无法撤销。"
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:389 web/components/field/ChoyOneToManyKanbanField.vue:93
+#: web/components/field/ChoyOneToManyKanbanField.vue:434 web/components/field/ChoyOneToManyKanbanField.vue:93
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Cancel"
 msgstr "取消"
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:385
+#: web/components/field/ChoyOneToManyKanbanField.vue:430
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Confirm delete"
 msgstr "确认删除"
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:20 web/components/field/ChoyOneToManyKanbanField.vue:388 web/components/field/ChoyOneToManyKanbanField.vue:90
+#: web/components/field/ChoyOneToManyKanbanField.vue:20 web/components/field/ChoyOneToManyKanbanField.vue:433 web/components/field/ChoyOneToManyKanbanField.vue:90
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Delete"
 msgstr "删除"
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:146
+#: web/components/field/ChoyOneToManyKanbanField.vue:189
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Edit record"
 msgstr "编辑记录"
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:145
+#: web/components/field/ChoyOneToManyKanbanField.vue:188
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "New record"
 msgstr "新建记录"
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:144
+#: web/components/field/ChoyOneToManyKanbanField.vue:187
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "No data"
 msgstr "暂无数据"
@@ -816,12 +816,12 @@ msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Save"
 msgstr "保存"
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:323
+#: web/components/field/ChoyOneToManyKanbanField.vue:368
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Untitled"
 msgstr "未命名"
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:147
+#: web/components/field/ChoyOneToManyKanbanField.vue:190
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "View record"
 msgstr "查看记录"
@@ -831,12 +831,12 @@ msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
 msgid "Add property"
 msgstr "添加属性"
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:33
+#: web/components/field/ChoyPropertiesDefinitionEditor.vue:38
 msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
 msgid "Default"
 msgstr "默认"
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:32
+#: web/components/field/ChoyPropertiesDefinitionEditor.vue:183 web/components/field/ChoyPropertiesDefinitionEditor.vue:193 web/components/field/ChoyPropertiesDefinitionEditor.vue:33
 msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
 msgid "Label"
 msgstr "标签"
@@ -851,17 +851,17 @@ msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
 msgid "No properties defined"
 msgstr "未定义属性"
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:143 web/components/field/ChoyPropertiesDefinitionEditor.vue:89
+#: web/components/field/ChoyPropertiesDefinitionEditor.vue:126 web/components/field/ChoyPropertiesDefinitionEditor.vue:221
 msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
 msgid "PropertyDefinition store is unavailable"
 msgstr "PropertyDefinition 存储不可用"
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:36
+#: web/components/field/ChoyPropertiesDefinitionEditor.vue:41
 msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
 msgid "Readonly"
 msgstr "只读"
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:41
+#: web/components/field/ChoyPropertiesDefinitionEditor.vue:51
 msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
 msgid "Remove"
 msgstr "移除"
@@ -871,22 +871,32 @@ msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
 msgid "Save"
 msgstr "保存"
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:38
+#: web/components/field/ChoyPropertiesDefinitionEditor.vue:43
 msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
 msgid "Selection JSON"
 msgstr "选择项 JSON"
 
+#: web/components/field/ChoyPropertiesDefinitionEditor.vue:35
+msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+msgid "Translate"
+msgstr "翻译"
+
+#: web/components/field/ChoyPropertiesDefinitionEditor.vue:46
+msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+msgid "Translate %s"
+msgstr "翻译 %s"
+
 #: web/components/field/ChoyPropertiesDefinitionEditor.vue:25
 msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
 msgid "Type"
 msgstr "类型"
 
-#: web/components/field/ChoyPropertiesField.vue:239
+#: web/components/field/ChoyPropertiesField.vue:243
 msgctxt "web/components/field/ChoyPropertiesField"
 msgid "+%s more"
 msgstr "+%s 项"
 
-#: web/components/field/ChoyPropertiesField.vue:223
+#: web/components/field/ChoyPropertiesField.vue:227
 msgctxt "web/components/field/ChoyPropertiesField"
 msgid "No"
 msgstr "否"
@@ -896,7 +906,7 @@ msgctxt "web/components/field/ChoyPropertiesField"
 msgid "No properties defined"
 msgstr "暂无属性定义"
 
-#: web/components/field/ChoyPropertiesField.vue:223
+#: web/components/field/ChoyPropertiesField.vue:227
 msgctxt "web/components/field/ChoyPropertiesField"
 msgid "Yes"
 msgstr "是"
@@ -906,7 +916,7 @@ msgctxt "web/components/field/ChoySelectionField"
 msgid "Clear"
 msgstr "清除"
 
-#: web/components/field/ChoySelectionField.vue:343
+#: web/components/field/ChoySelectionField.vue:355
 msgctxt "web/components/field/ChoySelectionField"
 msgid "Invalid option value: %s"
 msgstr "无效的选项值：%s"
@@ -931,7 +941,7 @@ msgctxt "web/components/field/ChoySelectionField"
 msgid "Search…"
 msgstr "搜索…"
 
-#: web/components/field/ChoySelectionField.vue:341
+#: web/components/field/ChoySelectionField.vue:353
 msgctxt "web/components/field/ChoySelectionField"
 msgid "Value must be a string"
 msgstr "值必须为字符串"
@@ -971,32 +981,32 @@ msgctxt "web/components/field/ChoyTimeField"
 msgid "Select time"
 msgstr "选择时间"
 
-#: web/components/field/ChoyVarcharField.vue:154
+#: web/components/field/ChoyVarcharField.vue:168
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Copied"
 msgstr "已复制"
 
-#: web/components/field/ChoyVarcharField.vue:124
+#: web/components/field/ChoyVarcharField.vue:138
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Copy"
 msgstr "复制"
 
-#: web/components/field/ChoyVarcharField.vue:156
+#: web/components/field/ChoyVarcharField.vue:170
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Copy failed"
 msgstr "复制失败"
 
-#: web/components/field/ChoyVarcharField.vue:280
+#: web/components/field/ChoyVarcharField.vue:294
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Length must not exceed %s"
 msgstr "长度不得超过 %s"
 
-#: web/components/field/ChoyVarcharField.vue:274
+#: web/components/field/ChoyVarcharField.vue:288
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Value is required"
 msgstr "值为必填项"
 
-#: web/components/field/ChoyVarcharField.vue:276
+#: web/components/field/ChoyVarcharField.vue:290
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Value must be a string"
 msgstr "值必须为字符串"
@@ -1076,6 +1086,36 @@ msgctxt "web/components/field/FieldTranslationsDialog"
 msgid "Translations saved"
 msgstr "翻译已保存"
 
+#: web/components/field/ChoyPropertyLabelTranslationsDialog.vue:12
+msgctxt "web/components/field/PropertyLabelTranslationsDialog"
+msgid "Base language (cannot be deleted)"
+msgstr "基础语言（不可删除）"
+
+#: web/components/field/ChoyPropertyLabelTranslationsDialog.vue:19
+msgctxt "web/components/field/PropertyLabelTranslationsDialog"
+msgid "Cancel"
+msgstr "取消"
+
+#: web/components/field/ChoyPropertyLabelTranslationsDialog.vue:96
+msgctxt "web/components/field/PropertyLabelTranslationsDialog"
+msgid "Failed to load translations"
+msgstr "加载翻译失败"
+
+#: web/components/field/ChoyPropertyLabelTranslationsDialog.vue:21
+msgctxt "web/components/field/PropertyLabelTranslationsDialog"
+msgid "Save translations"
+msgstr "保存翻译"
+
+#: web/components/field/ChoyPropertyLabelTranslationsDialog.vue:42
+msgctxt "web/components/field/PropertyLabelTranslationsDialog"
+msgid "Translate label"
+msgstr "翻译标签"
+
+#: web/components/field/ChoyPropertyLabelTranslationsDialog.vue:42
+msgctxt "web/components/field/PropertyLabelTranslationsDialog"
+msgid "Translate: %s"
+msgstr "翻译：%s"
+
 #: web/components/field/relationCountSummary.ts:14
 msgctxt "web/components/field/relationCountSummary@formatRelationCountSummary"
 msgid "%s record"
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionEditor.vue b/modules/web/web/components/field/ChoyPropertiesDefinitionEditor.vue
index fa94ca9e0..3ce10ddc8 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionEditor.vue
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionEditor.vue
@@ -76,13 +76,24 @@ SPDX-License-Identifier: Apache-2.0
           </SelectItem>
         </SelectContent>
       </Select>
-      <Input
-        v-model="item.string"
-        class="w-full"
-        :disabled="readonly"
-        :placeholder="_t('Label')"
-        data-testid="choy-properties-definition-string"
-      />
+      <div class="flex min-w-0 items-center gap-2">
+        <Input
+          v-model="item.string"
+          class="min-w-0 flex-1"
+          :disabled="readonly"
+          :placeholder="_t('Label')"
+          data-testid="choy-properties-definition-string"
+        />
+        <ChoyButton
+          size="sm"
+          variant="outline"
+          :disabled="readonly"
+          data-testid="choy-properties-definition-translate-string"
+          @click="openStringTranslate(index)"
+        >
+          {{ _t('Translate') }}
+        </ChoyButton>
+      </div>
       <Input
         v-model="item.default"
         class="w-full"
@@ -108,6 +119,19 @@ SPDX-License-Identifier: Apache-2.0
         :placeholder="_t('Selection JSON')"
         data-testid="choy-properties-definition-selection"
       />
+      <div v-if="item.type === 'selection'" class="flex flex-wrap gap-2 sm:col-span-2">
+        <ChoyButton
+          v-for="opt in selectionOptionValues(item)"
+          :key="opt"
+          size="sm"
+          variant="outline"
+          :disabled="readonly"
+          :data-testid="`choy-properties-definition-translate-option-${opt}`"
+          @click="openSelectionTranslate(index, opt)"
+        >
+          {{ _t('Translate %s', opt) }}
+        </ChoyButton>
+      </div>
       <div class="sm:col-span-2">
         <ChoyButton
           size="sm"
@@ -120,13 +144,24 @@ SPDX-License-Identifier: Apache-2.0
         </ChoyButton>
       </div>
     </div>
+
+    <ChoyPropertyLabelTranslationsDialog
+      v-model="translateOpen"
+      :label-title="translateTitle"
+      :translations="translateMap"
+      @saved="onTranslateSaved"
+    />
   </div>
 </template>
 
 <script setup lang="ts">
 import { computed, ref, watch } from 'vue';
+import { getActivePinia } from 'pinia';
+import type { PropertyItemDefinition } from '@/core/service/orm/model/properties_types';
+import { TRANSLATED_BASE_LANG } from '@/core/service/orm/repository/projection/translated_field_codec';
 import { createTranslate } from '@/web/web/i18n';
 import { createStoreByModel } from '@/web/web/stores/registry';
+import { useI18nStore } from '@/web/web/stores/i18nStore';
 import type { WebModelStore } from '@/web/web/stores/modelStore';
 import ChoyButton from '@/web/web/components/layout/ChoyButton.vue';
 import Checkbox from '../vendor/ui/checkbox/Checkbox.vue';
@@ -136,12 +171,16 @@ import Select from '../vendor/ui/select/Select.vue';
 import SelectContent from '../vendor/ui/select/SelectContent.vue';
 import SelectItem from '../vendor/ui/select/SelectItem.vue';
 import SelectTrigger from '../vendor/ui/select/SelectTrigger.vue';
+import ChoyPropertyLabelTranslationsDialog from './ChoyPropertyLabelTranslationsDialog.vue';
+import { normalizeSelectionOptions } from './propertiesHelpers';
 import {
   PROPERTY_DEFINITION_V1_TYPE_OPTIONS,
+  applyDraftCurrentLangToMaps,
   buildDefinitionScopeCondition,
   definitionItemsToDrafts,
   draftsToDefinitionItems,
   emptyDraftItem,
+  syncDraftLabelsForLang,
   type DefinitionEditorDraftItem,
 } from './propertiesDefinitionHelpers';
 
@@ -174,6 +213,7 @@ const emit = defineEmits<{
 
 const typeOptions = PROPERTY_DEFINITION_V1_TYPE_OPTIONS;
 const drafts = ref<DefinitionEditorDraftItem[]>([]);
+const previousItems = ref<PropertyItemDefinition[]>([]);
 const definitionId = ref<string | null>(null);
 const loading = ref(false);
 const saving = ref(false);
@@ -181,6 +221,14 @@ const loadError = ref('');
 const saveError = ref('');
 let reloadSeq = 0;
 
+const translateOpen = ref(false);
+const translateTitle = ref('');
+const translateMap = ref<Record<string, string>>({});
+type TranslateTarget =
+  | { kind: 'string'; index: number }
+  | { kind: 'selection'; index: number; value: string };
+const translateTarget = ref<TranslateTarget | null>(null);
+
 const canSave = computed(
   () =>
     Boolean(String(props.application || '').trim()) &&
@@ -188,6 +236,25 @@ const canSave = computed(
     Boolean(String(props.propertiesField || '').trim()),
 );
 
+function editorLang(): string {
+  if (!getActivePinia()) return TRANSLATED_BASE_LANG;
+  try {
+    const lang = String(useI18nStore().terminologyLang || '').trim();
+    return lang || TRANSLATED_BASE_LANG;
+  } catch {
+    return TRANSLATED_BASE_LANG;
+  }
+}
+
+function selectionOptionValues(item: DefinitionEditorDraftItem): string[] {
+  try {
+    const parsed = item.selectionText ? JSON.parse(item.selectionText) : [];
+    return normalizeSelectionOptions(parsed).map(o => o.value);
+  } catch {
+    return Object.keys(item.selectionLabelMaps || {});
+  }
+}
+
 function resolveStore(): WebModelStore<any> | null {
   if (props.store) return props.store;
   const app = String(props.application || '').trim();
@@ -206,6 +273,7 @@ async function reload() {
   saveError.value = '';
   definitionId.value = null;
   drafts.value = [];
+  previousItems.value = [];
   if (!canSave.value) return;
 
   const store = resolveStore();
@@ -235,9 +303,12 @@ async function reload() {
     const row = Array.isArray(rows) && rows[0] ? rows[0] : null;
     if (row) {
       definitionId.value = String(row.Id || '').trim() || null;
-      drafts.value = definitionItemsToDrafts(row.Definition);
+      const raw = Array.isArray(row.Definition) ? (row.Definition as PropertyItemDefinition[]) : [];
+      previousItems.value = raw;
+      drafts.value = definitionItemsToDrafts(raw, editorLang());
     } else {
       definitionId.value = null;
+      previousItems.value = [];
       drafts.value = [];
     }
   } catch (e) {
@@ -260,6 +331,44 @@ function onRemove(index: number) {
   drafts.value = drafts.value.filter((_, i) => i !== index);
 }
 
+function openStringTranslate(index: number) {
+  const item = drafts.value[index];
+  if (!item || props.readonly) return;
+  applyDraftCurrentLangToMaps(item, editorLang());
+  translateTarget.value = { kind: 'string', index };
+  translateTitle.value = item.name || _t('Label');
+  translateMap.value = { ...item.stringMap };
+  translateOpen.value = true;
+}
+
+function openSelectionTranslate(index: number, value: string) {
+  const item = drafts.value[index];
+  if (!item || props.readonly) return;
+  applyDraftCurrentLangToMaps(item, editorLang());
+  translateTarget.value = { kind: 'selection', index, value };
+  translateTitle.value = `${item.name || _t('Label')}.${value}`;
+  translateMap.value = { ...(item.selectionLabelMaps[value] || {}) };
+  translateOpen.value = true;
+}
+
+function onTranslateSaved(next: Record<string, string>) {
+  const target = translateTarget.value;
+  if (!target) return;
+  const item = drafts.value[target.index];
+  if (!item) return;
+  if (target.kind === 'string') {
+    item.stringMap = { ...next };
+    syncDraftLabelsForLang(item, editorLang());
+  } else {
+    item.selectionLabelMaps = {
+      ...item.selectionLabelMaps,
+      [target.value]: { ...next },
+    };
+    syncDraftLabelsForLang(item, editorLang());
+  }
+  translateTarget.value = null;
+}
+
 async function onSave() {
   saveError.value = '';
   if (props.readonly || loading.value || saving.value || !canSave.value) return;
@@ -271,7 +380,7 @@ async function onSave() {
 
   let definition: unknown[];
   try {
-    definition = draftsToDefinitionItems(drafts.value);
+    definition = draftsToDefinitionItems(drafts.value, editorLang(), previousItems.value);
   } catch (e) {
     saveError.value = e instanceof Error ? e.message : String(e);
     return;
@@ -314,6 +423,7 @@ watch(
     props.containerModel,
     props.containerId,
     props.store,
+    editorLang(),
   ],
   () => {
     void reload();
@@ -321,5 +431,5 @@ watch(
   { immediate: true },
 );
 
-defineExpose({ reload, drafts, definitionId });
+defineExpose({ reload, drafts, definitionId, previousItems });
 </script>
diff --git a/modules/web/web/components/field/ChoyPropertiesField.vue b/modules/web/web/components/field/ChoyPropertiesField.vue
index e2abda3ad..1a561bab9 100644
--- a/modules/web/web/components/field/ChoyPropertiesField.vue
+++ b/modules/web/web/components/field/ChoyPropertiesField.vue
@@ -114,7 +114,7 @@ SPDX-License-Identifier: Apache-2.0
                   :key="opt.value"
                   :value="opt.value"
                 >
-                  {{ translateText(opt.label) }}
+                  {{ opt.label }}
                 </SelectItem>
               </SelectContent>
             </Select>
@@ -169,7 +169,9 @@ import { computed, ref, watch, type WritableComputedRef } from 'vue';
 import { useField } from '@/web/web/composables/useField';
 import type { UseField } from '@/web/web/composables/useField';
 import ChoyFieldBase, { type FieldStateExpr, type FormItemProps } from './ChoyFieldBase.vue';
+import { getActivePinia } from 'pinia';
 import { createTranslate } from '@/web/web/i18n';
+import { useI18nStore } from '@/web/web/stores/i18nStore';
 import Input from '../vendor/ui/input/Input.vue';
 import Textarea from '../vendor/ui/textarea/Textarea.vue';
 import Switch from '../vendor/ui/switch/Switch.vue';
@@ -206,6 +208,12 @@ const { _t } = createTranslate('web', { scope: 'web/components/field/ChoyPropert
 
 defineOptions({ name: 'ChoyPropertiesField' });
 
+/** Request-lang fingerprint for Resolve; empty when Pinia is unavailable (unit stubs). */
+function currentTerminologyLang(): string {
+  if (!getActivePinia()) return '';
+  return String(useI18nStore().terminologyLang || '').trim();
+}
+
 defineSlots<{
   /** Optional empty-state chrome (e.g. link to a definition editor). */
   empty?: () => unknown;
@@ -290,14 +298,10 @@ function setNumberInputHost(name: string, el: unknown) {
   else numberInputHosts.delete(name);
 }
 
-/** Schema / selection labels are msgid-shaped; missing catalog entries fall back to the source string. */
-function translateText(text: unknown): string {
-  const s = String(text ?? '').trim();
-  return s ? _t(s) : '';
-}
-
+/** ResolveProperties already unwraps Definition labels for the request lang — display as-is. */
 function itemLabel(item: ResolvedPropertyItem): string {
-  return translateText(item.string || item.name) || String(item.name);
+  const s = item.string == null ? '' : String(item.string).trim();
+  return s || String(item.name);
 }
 
 function controlId(item: ResolvedPropertyItem): string {
@@ -385,7 +389,7 @@ function displayItemValue(map: unknown, item: ResolvedPropertyItem): string {
   if (item.type === 'boolean') return v === true ? _t('Yes') : _t('No');
   if (item.type === 'selection') {
     const opt = selectionOptions(item).find(o => o.value === v);
-    return translateText(opt?.label ?? v);
+    return String(opt?.label ?? v);
   }
   if (item.type === 'date') return propertyDateToDisplay(v);
   if (item.type === 'datetime') return propertyDatetimeToDisplay(v);
@@ -528,6 +532,8 @@ watch(
       isTableLike.value,
       JSON.stringify(map ?? null),
       propertiesRecordWatchFingerprint(rec, name),
+      // Re-resolve when UI terminology lang changes (labels come from Resolve, not FE _t).
+      currentTerminologyLang(),
     ] as const;
   },
   () => {
diff --git a/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.vue b/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.vue
new file mode 100644
index 000000000..ca69e74b6
--- /dev/null
+++ b/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.vue
@@ -0,0 +1,169 @@
+<!--
+SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
+SPDX-License-Identifier: Apache-2.0
+-->
+
+<template>
+  <ChoyDialog v-model:open="visible">
+    <ChoyDialogContent class="choy-property-label-translations-dialog max-w-xl" @open-auto-focus.prevent>
+      <ChoyDialogTitle>{{ dialogTitle }}</ChoyDialogTitle>
+      <div class="min-h-[120px]" :aria-busy="loading || undefined">
+        <form class="flex flex-col gap-3.5" @submit.prevent>
+          <div
+            v-for="row in rows"
+            :key="row.code"
+            class="grid grid-cols-[168px_1fr] items-start gap-3"
+          >
+            <label class="leading-8 text-foreground">{{ row.label }}</label>
+            <div>
+              <ChoyInput
+                v-model="row.value"
+                class="box-border min-h-8 w-full min-w-0"
+                data-testid="choy-property-label-translation-input"
+              />
+              <div
+                v-if="row.code === 'en_US'"
+                class="mt-1 text-xs leading-snug text-muted-foreground"
+              >
+                {{ _t('Base language (cannot be deleted)') }}
+              </div>
+            </div>
+          </div>
+        </form>
+      </div>
+      <div class="mt-4 flex justify-end gap-2">
+        <ChoyButton type="button" variant="outline" @click="visible = false">{{ _t('Cancel') }}</ChoyButton>
+        <ChoyButton type="button" data-testid="choy-property-label-translations-save" @click="handleSave">
+          {{ _t('Save translations') }}
+        </ChoyButton>
+      </div>
+    </ChoyDialogContent>
+  </ChoyDialog>
+</template>
+
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue';
+import { ChoyDialog, ChoyDialogContent, ChoyDialogTitle } from '@/web/web/components/layout/choyDialog';
+import ChoyButton from '@/web/web/components/layout/ChoyButton.vue';
+import ChoyInput from '@/web/web/components/vendor/ui/input/Input.vue';
+import { ChoyMessage } from '../../composables/useChoyMessage';
+import { createTranslate } from '@/web/web/i18n';
+import { createStoreByModel } from '@/web/web/stores/registry';
+import { TRANSLATED_BASE_LANG } from '@/core/service/orm/repository/projection/translated_field_codec';
+
+defineOptions({ name: 'ChoyPropertyLabelTranslationsDialog' });
+
+type TranslationRow = {
+  code: string;
+  label: string;
+  value: string;
+};
+
+const props = defineProps<{
+  modelValue: boolean;
+  /** Dialog title suffix (property name / option value). */
+  labelTitle?: string;
+  /** Current lang map being edited (in-memory; not a DB translate field). */
+  translations?: Record<string, string> | null;
+}>();
+
+const emit = defineEmits<{
+  'update:modelValue': [boolean];
+  saved: [translations: Record<string, string>];
+  closed: [];
+}>();
+
+const { _t } = createTranslate('web', { scope: 'web/components/field/PropertyLabelTranslationsDialog' });
+
+const visible = computed({
+  get: () => props.modelValue,
+  set: v => emit('update:modelValue', v),
+});
+
+const dialogTitle = computed(() => {
+  const label = String(props.labelTitle || '').trim();
+  return label ? _t('Translate: %s', label) : _t('Translate label');
+});
+
+const loading = ref(false);
+const rows = ref<TranslationRow[]>([]);
+
+function formatLanguageLabel(name: unknown, code: string): string {
+  const display = String(name ?? '').trim();
+  return display || code;
+}
+
+async function loadRows() {
+  loading.value = true;
+  try {
+    const current = props.translations && typeof props.translations === 'object' ? { ...props.translations } : {};
+    let list: Array<{ Code?: string; Name?: string }> = [];
+    try {
+      const languageStore = createStoreByModel('base.Language');
+      list = (await (languageStore as any).GetActiveLanguages()) as Array<{ Code?: string; Name?: string }>;
+    } catch {
+      list = [];
+    }
+    const byCode = new Map<string, TranslationRow>();
+    for (const lang of Array.isArray(list) ? list : []) {
+      const code = String(lang?.Code || '').trim();
+      if (!code) continue;
+      byCode.set(code, {
+        code,
+        label: formatLanguageLabel(lang?.Name, code),
+        value: Object.prototype.hasOwnProperty.call(current, code) ? String(current[code] ?? '') : '',
+      });
+    }
+    if (!byCode.has(TRANSLATED_BASE_LANG)) {
+      byCode.set(TRANSLATED_BASE_LANG, {
+        code: TRANSLATED_BASE_LANG,
+        label: formatLanguageLabel('English (US)', TRANSLATED_BASE_LANG),
+        value: Object.prototype.hasOwnProperty.call(current, TRANSLATED_BASE_LANG)
+          ? String(current[TRANSLATED_BASE_LANG] ?? '')
+          : '',
+      });
+    }
+    // Include any extra keys already present on the map.
+    for (const [code, value] of Object.entries(current)) {
+      if (byCode.has(code)) continue;
+      byCode.set(code, { code, label: code, value: String(value ?? '') });
+    }
+    const ordered = Array.from(byCode.values());
+    ordered.sort((a, b) => {
+      if (a.code === TRANSLATED_BASE_LANG) return -1;
+      if (b.code === TRANSLATED_BASE_LANG) return 1;
+      return a.label.localeCompare(b.label);
+    });
+    rows.value = ordered;
+  } catch (err: any) {
+    ChoyMessage.error(String(err?.message || err || _t('Failed to load translations')));
+    rows.value = [];
+  } finally {
+    loading.value = false;
+  }
+}
+
+watch(
+  () => props.modelValue,
+  (open, wasOpen) => {
+    if (open && !wasOpen) void loadRows();
+    if (!open && wasOpen) emit('closed');
+  },
+  { immediate: true },
+);
+
+function handleSave() {
+  const next: Record<string, string> = {};
+  for (const row of rows.value) {
+    const value = String(row.value ?? '');
+    if (row.code === TRANSLATED_BASE_LANG || value !== '') {
+      next[row.code] = value;
+    }
+  }
+  if (!Object.prototype.hasOwnProperty.call(next, TRANSLATED_BASE_LANG)) {
+    next[TRANSLATED_BASE_LANG] = '';
+  }
+  emit('saved', next);
+  visible.value = false;
+}
+</script>
diff --git a/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts b/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
index adecd8dba..c753161b8 100644
--- a/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
+++ b/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
@@ -3,23 +3,26 @@
 
 import {
   PROPERTY_DEFINITION_V1_TYPE_OPTIONS,
+  applyDraftCurrentLangToMaps,
   buildDefinitionScopeCondition,
   definitionItemsToDrafts,
   draftsToDefinitionItems,
   emptyDraftItem,
+  syncDraftLabelsForLang,
 } from './propertiesDefinitionHelpers';
 
 describe('propertiesDefinitionHelpers', () => {
   test('emptyDraftItem defaults to char', () => {
     expect(PROPERTY_DEFINITION_V1_TYPE_OPTIONS).toContain('char');
     expect(emptyDraftItem().type).toBe('char');
+    expect(emptyDraftItem().stringMap).toEqual({});
   });
 
-  test('definitionItemsToDrafts skips non-items and stringifies selection', () => {
+  test('definitionItemsToDrafts unwraps lang maps for the requested lang', () => {
     expect(definitionItemsToDrafts(null)).toEqual([]);
     expect(definitionItemsToDrafts('x' as unknown as unknown[])).toEqual([]);
-    expect(
-      definitionItemsToDrafts([
+    const drafts = definitionItemsToDrafts(
+      [
         null,
         [],
         { name: '' },
@@ -27,31 +30,41 @@ describe('propertiesDefinitionHelpers', () => {
         {
           name: 'sel',
           type: 'selection',
+          string: { en_US: 'Priority', zh_CN: '优先级' },
           selection: [
-            ['a', 'A'],
+            ['a', { en_US: 'A', zh_CN: '甲' }],
             { value: 'b', label: 'B' },
           ],
         },
-      ]),
-    ).toEqual([
+      ],
+      'zh_CN',
+    );
+    expect(drafts).toEqual([
       {
         name: 'ok',
         type: 'char',
         string: '',
+        stringMap: {},
         default: '',
         readonly: false,
         selectionText: '',
+        selectionLabelMaps: {},
       },
       {
         name: 'sel',
         type: 'selection',
-        string: '',
+        string: '优先级',
+        stringMap: { en_US: 'Priority', zh_CN: '优先级' },
         default: '',
         readonly: false,
         selectionText: JSON.stringify([
-          ['a', 'A'],
-          { value: 'b', label: 'B' },
+          ['a', '甲'],
+          ['b', 'B'],
         ]),
+        selectionLabelMaps: {
+          a: { en_US: 'A', zh_CN: '甲' },
+          b: { en_US: 'B' },
+        },
       },
     ]);
   });
@@ -77,28 +90,63 @@ describe('propertiesDefinitionHelpers', () => {
     expect(definitionItemsToDrafts([{ name: 'emptytype', type: '' }])[0]?.type).toBe('char');
   });
 
-  test('definitionItemsToDrafts / draftsToDefinitionItems round-trip', () => {
-    const drafts = definitionItemsToDrafts([
-      { name: 'tier', type: 'selection', string: 'Tier', selection: [['a', 'A'], ['b', 'B']] },
-      { name: 'flag', type: 'boolean', default: true, readonly: true },
+  test('draftsToDefinitionItems merges current lang without wiping other langs', () => {
+    const previous = [
+      {
+        name: 'tier',
+        type: 'selection',
+        string: { en_US: 'Tier', zh_CN: '等级' },
+        selection: [
+          ['a', { en_US: 'A', zh_CN: '甲' }],
+          ['b', { en_US: 'B', zh_CN: '乙' }],
+        ],
+      },
+    ];
+    const drafts = definitionItemsToDrafts(previous, 'zh_CN');
+    drafts[0]!.string = '级别';
+    drafts[0]!.selectionText = JSON.stringify([
+      ['a', '甲级'],
+      ['b', '乙'],
     ]);
+    const items = draftsToDefinitionItems(drafts, 'zh_CN', previous as any);
+    expect(items[0]!.string).toEqual({ en_US: 'Tier', zh_CN: '级别' });
+    expect(items[0]!.selection).toEqual([
+      ['a', { en_US: 'A', zh_CN: '甲级' }],
+      ['b', { en_US: 'B', zh_CN: '乙' }],
+    ]);
+  });
+
+  test('definitionItemsToDrafts / draftsToDefinitionItems round-trip', () => {
+    const drafts = definitionItemsToDrafts(
+      [
+        { name: 'tier', type: 'selection', string: 'Tier', selection: [['a', 'A'], ['b', 'B']] },
+        { name: 'flag', type: 'boolean', default: true, readonly: true },
+      ],
+      'en_US',
+    );
     expect(drafts).toHaveLength(2);
-    const items = draftsToDefinitionItems(drafts);
+    const items = draftsToDefinitionItems(drafts, 'en_US');
     expect(items[0]!.name).toBe('tier');
-    expect(items[0]!.selection).toEqual([['a', 'A'], ['b', 'B']]);
+    expect(items[0]!.selection).toEqual([
+      ['a', 'A'],
+      ['b', 'B'],
+    ]);
     expect(items[1]!.readonly).toBe(true);
     expect(items[1]!.default).toBe(true);
   });
 
   test('draftsToDefinitionItems persists only normalized selection options', () => {
-    const items = draftsToDefinitionItems([
-      {
-        ...emptyDraftItem(),
-        name: 'tier',
-        type: 'selection',
-        selectionText: JSON.stringify([['a', 'A'], 1, { value: 'b', label: 'B' }, { value: 2 }]),
-      },
-    ]);
+    const items = draftsToDefinitionItems(
+      [
+        {
+          ...emptyDraftItem(),
+          name: 'tier',
+          type: 'selection',
+          selectionText: JSON.stringify([['a', 'A'], 1, { value: 'b', label: 'B' }, { value: 2 }]),
+        },
+      ],
+      'en_US',
+    );
     expect(items[0]!.selection).toEqual([
       ['a', 'A'],
       ['b', 'B'],
@@ -106,19 +154,22 @@ describe('propertiesDefinitionHelpers', () => {
   });
 
   test('draftsToDefinitionItems coerces defaults and skips blank names', () => {
-    const items = draftsToDefinitionItems([
-      { ...emptyDraftItem(), name: '  ' },
-      { ...emptyDraftItem(), name: 'flag', type: 'boolean', default: 'false' },
-      { ...emptyDraftItem(), name: 'flag2', type: 'boolean', default: '0' },
-      { ...emptyDraftItem(), name: 'flag3', type: 'boolean', default: '1' },
-      { ...emptyDraftItem(), name: 'flag4', type: 'boolean', default: 'maybe' },
-      { ...emptyDraftItem(), name: 'n', type: 'integer', default: '3.9' },
-      { ...emptyDraftItem(), name: 'n2', type: 'integer', default: 'nope' },
-      { ...emptyDraftItem(), name: 'f', type: 'float', default: '1.5' },
-      { ...emptyDraftItem(), name: 'f2', type: 'float', default: 'nope' },
-      { ...emptyDraftItem(), name: 'c', type: 'char', default: 'x', string: ' Label ' },
-      { ...emptyDraftItem(), name: 'ws', type: 'integer', default: '   ' },
-    ]);
+    const items = draftsToDefinitionItems(
+      [
+        { ...emptyDraftItem(), name: '  ' },
+        { ...emptyDraftItem(), name: 'flag', type: 'boolean', default: 'false' },
+        { ...emptyDraftItem(), name: 'flag2', type: 'boolean', default: '0' },
+        { ...emptyDraftItem(), name: 'flag3', type: 'boolean', default: '1' },
+        { ...emptyDraftItem(), name: 'flag4', type: 'boolean', default: 'maybe' },
+        { ...emptyDraftItem(), name: 'n', type: 'integer', default: '3.9' },
+        { ...emptyDraftItem(), name: 'n2', type: 'integer', default: 'nope' },
+        { ...emptyDraftItem(), name: 'f', type: 'float', default: '1.5' },
+        { ...emptyDraftItem(), name: 'f2', type: 'float', default: 'nope' },
+        { ...emptyDraftItem(), name: 'c', type: 'char', default: 'x', string: ' Label ' },
+        { ...emptyDraftItem(), name: 'ws', type: 'integer', default: '   ' },
+      ],
+      'en_US',
+    );
     expect(items.find(i => i.name === 'flag')!.default).toBe(false);
     expect(items.find(i => i.name === 'flag2')!.default).toBe(false);
     expect(items.find(i => i.name === 'flag3')!.default).toBe(true);
@@ -135,57 +186,83 @@ describe('propertiesDefinitionHelpers', () => {
 
   test('draftsToDefinitionItems rejects bad selection and unsupported types', () => {
     expect(() =>
-      draftsToDefinitionItems([{ ...emptyDraftItem(), name: 's', type: 'selection', selectionText: '' }]),
+      draftsToDefinitionItems([{ ...emptyDraftItem(), name: 's', type: 'selection', selectionText: '' }], 'en_US'),
     ).toThrow(/requires selection JSON/);
     expect(() =>
-      draftsToDefinitionItems([
-        { ...emptyDraftItem(), name: 's', type: 'selection', selectionText: '{' },
-      ]),
+      draftsToDefinitionItems(
+        [{ ...emptyDraftItem(), name: 's', type: 'selection', selectionText: '{' }],
+        'en_US',
+      ),
     ).toThrow(/invalid JSON/);
     expect(() =>
-      draftsToDefinitionItems([
-        { ...emptyDraftItem(), name: 's', type: 'selection', selectionText: '[]' },
-      ]),
+      draftsToDefinitionItems(
+        [{ ...emptyDraftItem(), name: 's', type: 'selection', selectionText: '[]' }],
+        'en_US',
+      ),
     ).toThrow(/non-empty selection array/);
     expect(() =>
-      draftsToDefinitionItems([
-        { ...emptyDraftItem(), name: 's', type: 'selection', selectionText: '[1]' },
-      ]),
+      draftsToDefinitionItems(
+        [{ ...emptyDraftItem(), name: 's', type: 'selection', selectionText: '[1]' }],
+        'en_US',
+      ),
     ).toThrow(/no usable options/);
     expect(() =>
-      draftsToDefinitionItems([
-        {
-          ...emptyDraftItem(),
-          name: 's',
-          type: 'selection',
-          default: 'missing',
-          selectionText: JSON.stringify([['a', 'A']]),
-        },
-      ]),
+      draftsToDefinitionItems(
+        [
+          {
+            ...emptyDraftItem(),
+            name: 's',
+            type: 'selection',
+            default: 'missing',
+            selectionText: JSON.stringify([['a', 'A']]),
+          },
+        ],
+        'en_US',
+      ),
     ).toThrow(/default is not one of the options/);
     expect(
-      draftsToDefinitionItems([
-        {
-          ...emptyDraftItem(),
-          name: 's',
-          type: 'selection',
-          default: 'a',
-          selectionText: JSON.stringify([['a', 'A']]),
-        },
-      ])[0]!.default,
+      draftsToDefinitionItems(
+        [
+          {
+            ...emptyDraftItem(),
+            name: 's',
+            type: 'selection',
+            default: 'a',
+            selectionText: JSON.stringify([['a', 'A']]),
+          },
+        ],
+        'en_US',
+      )[0]!.default,
     ).toBe('a');
     expect(() =>
-      draftsToDefinitionItems([{ ...emptyDraftItem(), name: 'x', type: 'binary' }]),
+      draftsToDefinitionItems([{ ...emptyDraftItem(), name: 'x', type: 'binary' }], 'en_US'),
     ).toThrow(/unsupported property type/);
     expect(() =>
-      draftsToDefinitionItems([
-        { ...emptyDraftItem(), name: 'dup', type: 'char' },
-        { ...emptyDraftItem(), name: 'dup', type: 'integer' },
-      ]),
+      draftsToDefinitionItems(
+        [
+          { ...emptyDraftItem(), name: 'dup', type: 'char' },
+          { ...emptyDraftItem(), name: 'dup', type: 'integer' },
+        ],
+        'en_US',
+      ),
     ).toThrow(/duplicate property name/);
     expect(draftsToDefinitionItems(null)).toEqual([]);
   });
 
+  test('applyDraftCurrentLangToMaps / syncDraftLabelsForLang round-trip UI fields', () => {
+    const draft = emptyDraftItem();
+    draft.name = 'prio';
+    draft.type = 'selection';
+    draft.stringMap = { en_US: 'Priority', zh_CN: '优先级' };
+    draft.selectionLabelMaps = { high: { en_US: 'High', zh_CN: '高' } };
+    syncDraftLabelsForLang(draft, 'zh_CN');
+    expect(draft.string).toBe('优先级');
+    expect(draft.selectionText).toBe(JSON.stringify([['high', '高']]));
+    draft.string = '优先';
+    applyDraftCurrentLangToMaps(draft, 'zh_CN');
+    expect(draft.stringMap).toEqual({ en_US: 'Priority', zh_CN: '优先' });
+  });
+
   test('buildDefinitionScopeCondition', () => {
     expect(
       buildDefinitionScopeCondition({
diff --git a/modules/web/web/components/field/propertiesDefinitionHelpers.ts b/modules/web/web/components/field/propertiesDefinitionHelpers.ts
index 6b2acb40d..c96fefc18 100644
--- a/modules/web/web/components/field/propertiesDefinitionHelpers.ts
+++ b/modules/web/web/components/field/propertiesDefinitionHelpers.ts
@@ -1,7 +1,14 @@
 // SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
 // SPDX-License-Identifier: Apache-2.0
 
-import { PROPERTIES_V1_TYPES, type PropertyItemDefinition } from '@/core/service/orm/model/properties_types';
+import {
+  mergePropertyLabelWrite,
+  mergeSelectionLabelsWrite,
+  parsePropertyLabelMap,
+  unwrapPropertyLabel,
+} from '@/core/service/orm/model/properties_label_i18n';
+import { TRANSLATED_BASE_LANG } from '@/core/service/orm/repository/projection/translated_field_codec';
+import { PROPERTIES_V1_TYPES, type PropertyItemDefinition, type PropertyLabel } from '@/core/service/orm/model/properties_types';
 
 import { normalizeSelectionOptions } from './propertiesHelpers';
 
@@ -10,10 +17,16 @@ export const PROPERTY_DEFINITION_V1_TYPE_OPTIONS = [...PROPERTIES_V1_TYPES].sort
 export type DefinitionEditorDraftItem = {
   name: string;
   type: string;
+  /** Current-language label shown in the main input. */
   string: string;
+  /** Full label lang map (source of truth for Save / translate dialog). */
+  stringMap: Record<string, string>;
   default: string;
   readonly: boolean;
+  /** Selection JSON with current-language labels for the textarea. */
   selectionText: string;
+  /** Option value → label lang map (survives current-lang textarea edits via merge). */
+  selectionLabelMaps: Record<string, Record<string, string>>;
 };
 
 export function emptyDraftItem(): DefinitionEditorDraftItem {
@@ -21,25 +34,119 @@ export function emptyDraftItem(): DefinitionEditorDraftItem {
     name: '',
     type: 'char',
     string: '',
+    stringMap: {},
     default: '',
     readonly: false,
     selectionText: '',
+    selectionLabelMaps: {},
   };
 }
 
-export function definitionItemsToDrafts(items: unknown): DefinitionEditorDraftItem[] {
+function asLabelMap(value: unknown): Record<string, string> {
+  return parsePropertyLabelMap(value) || {};
+}
+
+function selectionRawLabel(opt: unknown): unknown {
+  if (Array.isArray(opt)) return opt[1] ?? opt[0];
+  if (opt && typeof opt === 'object' && !Array.isArray(opt)) {
+    return (opt as { label?: unknown }).label ?? (opt as { value?: unknown }).value;
+  }
+  return undefined;
+}
+
+function selectionRawValue(opt: unknown): string | null {
+  if (Array.isArray(opt) && typeof opt[0] === 'string') return opt[0];
+  if (opt && typeof opt === 'object' && !Array.isArray(opt) && typeof (opt as { value?: unknown }).value === 'string') {
+    return String((opt as { value: string }).value);
+  }
+  return null;
+}
+
+/** Sync the current-lang `string` / selectionText views from stored maps. */
+export function syncDraftLabelsForLang(draft: DefinitionEditorDraftItem, lang: string): void {
+  const code = String(lang || '').trim() || TRANSLATED_BASE_LANG;
+  draft.string = unwrapPropertyLabel(draft.stringMap, code);
+  if (draft.type !== 'selection') return;
+  const options = normalizeSelectionOptions(
+    (() => {
+      try {
+        return draft.selectionText ? JSON.parse(draft.selectionText) : [];
+      } catch {
+        return [];
+      }
+    })(),
+  );
+  const values = options.length
+    ? options.map(o => o.value)
+    : Object.keys(draft.selectionLabelMaps);
+  const display = values.map(value => {
+    const map = draft.selectionLabelMaps[value] || {};
+    return [value, unwrapPropertyLabel(map, code) || value] as [string, string];
+  });
+  try {
+    draft.selectionText = display.length ? JSON.stringify(display) : '';
+  } catch {
+    draft.selectionText = '';
+  }
+}
+
+/** Apply the current-lang UI fields into the draft maps (before Save / before opening translate dialog). */
+export function applyDraftCurrentLangToMaps(draft: DefinitionEditorDraftItem, lang: string): void {
+  const code = String(lang || '').trim() || TRANSLATED_BASE_LANG;
+  draft.string = String(draft.string || '').trim();
+  draft.stringMap = asLabelMap(mergePropertyLabelWrite(draft.stringMap, draft.string, code));
+  if (draft.type !== 'selection') return;
+  const text = String(draft.selectionText || '').trim();
+  if (!text) return;
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(text);
+  } catch {
+    return;
+  }
+  const options = normalizeSelectionOptions(parsed);
+  if (!options.length) return;
+  const merged = mergeSelectionLabelsWrite(
+    Object.entries(draft.selectionLabelMaps).map(([value, labelMap]) => [value, labelMap] as [string, PropertyLabel]),
+    options,
+    code,
+  );
+  const nextMaps: Record<string, Record<string, string>> = {};
+  for (const opt of merged || []) {
+    const value = selectionRawValue(opt);
+    if (value == null) continue;
+    nextMaps[value] = asLabelMap(selectionRawLabel(opt));
+  }
+  draft.selectionLabelMaps = nextMaps;
+}
+
+export function definitionItemsToDrafts(
+  items: unknown,
+  lang: string = TRANSLATED_BASE_LANG,
+): DefinitionEditorDraftItem[] {
   if (!Array.isArray(items)) return [];
+  const code = String(lang || '').trim() || TRANSLATED_BASE_LANG;
   const out: DefinitionEditorDraftItem[] = [];
   for (const raw of items) {
     if (!raw || typeof raw !== 'object' || Array.isArray(raw)) continue;
     const item = raw as Record<string, unknown>;
     const name = String(item.name || '').trim();
     if (!name) continue;
-    const type = String(item.type || 'char');
+    const type = String(item.type || 'char') || 'char';
+    const stringMap = asLabelMap(item.string);
+    const selectionLabelMaps: Record<string, Record<string, string>> = {};
     let selectionText = '';
     if (Array.isArray(item.selection)) {
+      const display: Array<[string, string]> = [];
+      for (const opt of item.selection) {
+        const value = selectionRawValue(opt);
+        if (value == null) continue;
+        const map = asLabelMap(selectionRawLabel(opt));
+        selectionLabelMaps[value] = map;
+        display.push([value, unwrapPropertyLabel(map, code) || value]);
+      }
       try {
-        selectionText = JSON.stringify(item.selection);
+        selectionText = display.length ? JSON.stringify(display) : '';
       } catch {
         selectionText = '';
       }
@@ -47,10 +154,12 @@ export function definitionItemsToDrafts(items: unknown): DefinitionEditorDraftIt
     out.push({
       name,
       type,
-      string: item.string == null ? '' : String(item.string),
+      string: unwrapPropertyLabel(stringMap, code),
+      stringMap,
       default: item.default == null ? '' : String(item.default),
       readonly: item.readonly === true,
       selectionText,
+      selectionLabelMaps,
     });
   }
   return out;
@@ -59,10 +168,18 @@ export function definitionItemsToDrafts(items: unknown): DefinitionEditorDraftIt
 /** Build Definition payload for Create/Update. Invalid selection JSON → throws. */
 export function draftsToDefinitionItems(
   drafts: DefinitionEditorDraftItem[] | null | undefined,
+  lang: string = TRANSLATED_BASE_LANG,
+  previousItems?: PropertyItemDefinition[] | null,
 ): PropertyItemDefinition[] {
+  const code = String(lang || '').trim() || TRANSLATED_BASE_LANG;
+  const prevByName = new Map<string, PropertyItemDefinition>();
+  for (const prev of previousItems || []) {
+    if (prev?.name) prevByName.set(prev.name, prev);
+  }
   const out: PropertyItemDefinition[] = [];
   const seenNames = new Set<string>();
   for (const draft of drafts || []) {
+    applyDraftCurrentLangToMaps(draft, code);
     const name = String(draft.name || '').trim();
     if (!name) continue;
     if (seenNames.has(name)) {
@@ -73,9 +190,13 @@ export function draftsToDefinitionItems(
     if (!PROPERTIES_V1_TYPES.has(type)) {
       throw new Error(`unsupported property type '${type}' (${name})`);
     }
+    const previous = prevByName.get(name);
     const item: PropertyItemDefinition = { name, type };
     const label = String(draft.string || '').trim();
-    if (label) item.string = label;
+    draft.string = label;
+    if (label || Object.keys(draft.stringMap).length) {
+      item.string = mergePropertyLabelWrite(previous?.string ?? draft.stringMap, label, code);
+    }
     if (draft.readonly) item.readonly = true;
     const defRaw = String(draft.default ?? '');
     if (defRaw.trim() !== '') {
@@ -102,8 +223,7 @@ export function draftsToDefinitionItems(
       if (item.default != null && !options.some(o => o.value === String(item.default))) {
         throw new Error(`selection property '${name}' default is not one of the options`);
       }
-      // Persist only usable options so malformed entries are not stored.
-      item.selection = options.map(o => [o.value, o.label]) as PropertyItemDefinition['selection'];
+      item.selection = mergeSelectionLabelsWrite(previous?.selection, options, code);
     }
     out.push(item);
   }
@@ -140,13 +260,17 @@ export function buildDefinitionScopeCondition(opts: {
   const targetModel = String(opts.targetModel || '').trim();
   const propertiesField = String(opts.propertiesField || '').trim();
   const containerModel =
-    opts.containerModel == null || opts.containerModel === '' ? null : String(opts.containerModel);
+    opts.containerModel == null || String(opts.containerModel).trim() === ''
+      ? null
+      : String(opts.containerModel).trim();
   const containerId =
-    opts.containerId == null || opts.containerId === '' ? null : String(opts.containerId);
+    opts.containerId == null || String(opts.containerId).trim() === ''
+      ? null
+      : String(opts.containerId).trim();
   return [
     ['TargetModel', '=', targetModel],
     ['PropertiesField', '=', propertiesField],
-    containerModel == null ? ['ContainerModel', '=', null] : ['ContainerModel', '=', containerModel],
-    containerId == null ? ['ContainerId', '=', null] : ['ContainerId', '=', containerId],
+    ['ContainerModel', '=', containerModel],
+    ['ContainerId', '=', containerId],
   ];
 }

From 2fdfc5ca0bf92defe6e9ce926532e095aed1d58f Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Wed, 28 Oct 2026 11:03:28 +0800
Subject: [PATCH 03/23] feat(sandbox): expose Record Properties configuration
 entry

Seed bilingual Definition labels and add a Configuration menu route to
the app-level PropertyDefinition editor for kitchen-sink verification.
---
 modules/sandbox/data/bootstrap.json           | 33 +++++++----------
 modules/sandbox/i18n/sandbox.pot              | 32 +++++++++++++----
 modules/sandbox/i18n/zh_CN.po                 | 32 +++++++++++++----
 .../sandbox/web/__tests__/lt_titles.test.ts   | 19 +++++++++-
 .../web/__tests__/resourceWiring.test.ts      |  6 ++++
 modules/sandbox/web/menu/menus.ts             | 19 +++++++++-
 modules/sandbox/web/menu/titles.ts            |  2 ++
 .../web/pages/SandboxRecordProperties.vue     | 17 +++++++++
 .../web/pages/page_mount_coverage.test.ts     |  7 ++++
 modules/sandbox/web/route/routes.ts           | 10 ++++++
 .../SandboxRecordPropertiesDefinitionView.vue | 35 +++++++++++++++++++
 11 files changed, 177 insertions(+), 35 deletions(-)
 create mode 100644 modules/sandbox/web/pages/SandboxRecordProperties.vue
 create mode 100644 modules/sandbox/web/views/SandboxRecordPropertiesDefinitionView.vue

diff --git a/modules/sandbox/data/bootstrap.json b/modules/sandbox/data/bootstrap.json
index c3093dc87..fa8a969ff 100644
--- a/modules/sandbox/data/bootstrap.json
+++ b/modules/sandbox/data/bootstrap.json
@@ -72,63 +72,54 @@
           {
             "name": "priority",
             "type": "selection",
-            "string": "Priority",
+            "string": { "en_US": "Priority", "zh_CN": "优先级" },
             "selection": [
-              [
-                "low",
-                "Low"
-              ],
-              [
-                "normal",
-                "Normal"
-              ],
-              [
-                "high",
-                "High"
-              ]
+              ["low", { "en_US": "Low", "zh_CN": "低" }],
+              ["normal", { "en_US": "Normal", "zh_CN": "普通" }],
+              ["high", { "en_US": "High", "zh_CN": "高" }]
             ],
             "default": "normal"
           },
           {
             "name": "external_code",
             "type": "char",
-            "string": "External Code"
+            "string": { "en_US": "External Code", "zh_CN": "外部编码" }
           },
           {
             "name": "is_vip",
             "type": "boolean",
-            "string": "VIP",
+            "string": { "en_US": "VIP", "zh_CN": "VIP" },
             "default": false
           },
           {
             "name": "qty_hint",
             "type": "integer",
-            "string": "Qty Hint"
+            "string": { "en_US": "Qty Hint", "zh_CN": "数量提示" }
           },
           {
             "name": "score",
             "type": "float",
-            "string": "Score"
+            "string": { "en_US": "Score", "zh_CN": "分数" }
           },
           {
             "name": "note",
             "type": "text",
-            "string": "Note"
+            "string": { "en_US": "Note", "zh_CN": "备注" }
           },
           {
             "name": "due_date",
             "type": "date",
-            "string": "Due Date"
+            "string": { "en_US": "Due Date", "zh_CN": "截止日期" }
           },
           {
             "name": "reviewed_at",
             "type": "datetime",
-            "string": "Reviewed At"
+            "string": { "en_US": "Reviewed At", "zh_CN": "审核时间" }
           },
           {
             "name": "locked_code",
             "type": "char",
-            "string": "Locked Code",
+            "string": { "en_US": "Locked Code", "zh_CN": "锁定编码" },
             "readonly": true,
             "default": "RO"
           }
diff --git a/modules/sandbox/i18n/sandbox.pot b/modules/sandbox/i18n/sandbox.pot
index 81cd084b5..9c5891011 100644
--- a/modules/sandbox/i18n/sandbox.pot
+++ b/modules/sandbox/i18n/sandbox.pot
@@ -332,32 +332,32 @@ msgctxt "sandbox.model.SandboxRecord.fields"
 msgid "Translatable varchar; use the translation action on the field."
 msgstr ""
 
-#: service/models/sandbox_record_category.ts:28
+#: service/models/sandbox_record_category.ts:31
 msgctxt "sandbox.model.SandboxRecordCategory.fields"
 msgid "Category"
 msgstr ""
 
-#: service/models/sandbox_record_category.ts:18
+#: service/models/sandbox_record_category.ts:21
 msgctxt "sandbox.model.SandboxRecordCategory.fields"
 msgid "Record"
 msgstr ""
 
-#: service/models/sandbox_record_tag.ts:18
+#: service/models/sandbox_record_tag.ts:21
 msgctxt "sandbox.model.SandboxRecordTag.fields"
 msgid "Record"
 msgstr ""
 
-#: service/models/sandbox_record_tag.ts:29
+#: service/models/sandbox_record_tag.ts:32
 msgctxt "sandbox.model.SandboxRecordTag.fields"
 msgid "Tag"
 msgstr ""
 
-#: service/models/sandbox_record_tag_chip.ts:18
+#: service/models/sandbox_record_tag_chip.ts:21
 msgctxt "sandbox.model.SandboxRecordTagChip.fields"
 msgid "Record"
 msgstr ""
 
-#: service/models/sandbox_record_tag_chip.ts:29
+#: service/models/sandbox_record_tag_chip.ts:32
 msgctxt "sandbox.model.SandboxRecordTagChip.fields"
 msgid "Tag"
 msgstr ""
@@ -377,11 +377,21 @@ msgctxt "sandbox.model.SandboxTag.fields"
 msgid "Name"
 msgstr ""
 
+#: web/menu/titles.ts:10
+msgctxt "web/menu/titles"
+msgid "Configuration"
+msgstr ""
+
 #: web/menu/titles.ts:9
 msgctxt "web/menu/titles"
 msgid "Field Kitchen Sink"
 msgstr ""
 
+#: web/menu/titles.ts:11
+msgctxt "web/menu/titles"
+msgid "Record Properties"
+msgstr ""
+
 #: web/menu/titles.ts:8
 msgctxt "web/menu/titles"
 msgid "Sandbox"
@@ -412,6 +422,11 @@ msgctxt "web/route/routes"
 msgid "New Sandbox Tag"
 msgstr ""
 
+#: web/route/routes.ts:142
+msgctxt "web/route/routes"
+msgid "Record Properties"
+msgstr ""
+
 #: web/route/routes.ts:61
 msgctxt "web/route/routes"
 msgid "Sandbox Record Chart"
@@ -800,6 +815,11 @@ msgctxt "web/views/SandboxRecordListView"
 msgid "View switcher"
 msgstr ""
 
+#: web/views/SandboxRecordPropertiesDefinitionView.vue:5
+msgctxt "web/views/SandboxRecordPropertiesDefinitionView"
+msgid "Edit the app-level schema for SandboxRecord.Properties. Labels support multiple languages; use Translate next to each label (and selection options) before Save."
+msgstr ""
+
 #: web/views/sandbox_tag_actions.ts:10
 msgctxt "web/views/SandboxTagFormView"
 msgid "Copy Sandbox Tag"
diff --git a/modules/sandbox/i18n/zh_CN.po b/modules/sandbox/i18n/zh_CN.po
index e37f32ad7..ba019801a 100644
--- a/modules/sandbox/i18n/zh_CN.po
+++ b/modules/sandbox/i18n/zh_CN.po
@@ -326,32 +326,32 @@ msgctxt "sandbox.model.SandboxRecord.fields"
 msgid "Translatable varchar; use the translation action on the field."
 msgstr "可翻译 varchar；请使用字段上的翻译操作。"
 
-#: service/models/sandbox_record_category.ts:28
+#: service/models/sandbox_record_category.ts:31
 msgctxt "sandbox.model.SandboxRecordCategory.fields"
 msgid "Category"
 msgstr "分类"
 
-#: service/models/sandbox_record_category.ts:18
+#: service/models/sandbox_record_category.ts:21
 msgctxt "sandbox.model.SandboxRecordCategory.fields"
 msgid "Record"
 msgstr "记录"
 
-#: service/models/sandbox_record_tag.ts:18
+#: service/models/sandbox_record_tag.ts:21
 msgctxt "sandbox.model.SandboxRecordTag.fields"
 msgid "Record"
 msgstr "记录"
 
-#: service/models/sandbox_record_tag.ts:29
+#: service/models/sandbox_record_tag.ts:32
 msgctxt "sandbox.model.SandboxRecordTag.fields"
 msgid "Tag"
 msgstr "标签"
 
-#: service/models/sandbox_record_tag_chip.ts:18
+#: service/models/sandbox_record_tag_chip.ts:21
 msgctxt "sandbox.model.SandboxRecordTagChip.fields"
 msgid "Record"
 msgstr "记录"
 
-#: service/models/sandbox_record_tag_chip.ts:29
+#: service/models/sandbox_record_tag_chip.ts:32
 msgctxt "sandbox.model.SandboxRecordTagChip.fields"
 msgid "Tag"
 msgstr "标签"
@@ -371,11 +371,21 @@ msgctxt "sandbox.model.SandboxTag.fields"
 msgid "Name"
 msgstr "名称"
 
+#: web/menu/titles.ts:10
+msgctxt "web/menu/titles"
+msgid "Configuration"
+msgstr "配置"
+
 #: web/menu/titles.ts:9
 msgctxt "web/menu/titles"
 msgid "Field Kitchen Sink"
 msgstr "字段试验场"
 
+#: web/menu/titles.ts:11
+msgctxt "web/menu/titles"
+msgid "Record Properties"
+msgstr "记录属性"
+
 #: web/menu/titles.ts:8
 msgctxt "web/menu/titles"
 msgid "Sandbox"
@@ -406,6 +416,11 @@ msgctxt "web/route/routes"
 msgid "New Sandbox Tag"
 msgstr "新建沙箱标签"
 
+#: web/route/routes.ts:142
+msgctxt "web/route/routes"
+msgid "Record Properties"
+msgstr "记录属性"
+
 #: web/route/routes.ts:61
 msgctxt "web/route/routes"
 msgid "Sandbox Record Chart"
@@ -791,6 +806,11 @@ msgctxt "web/views/SandboxRecordListView"
 msgid "View switcher"
 msgstr "视图切换"
 
+#: web/views/SandboxRecordPropertiesDefinitionView.vue:5
+msgctxt "web/views/SandboxRecordPropertiesDefinitionView"
+msgid "Edit the app-level schema for SandboxRecord.Properties. Labels support multiple languages; use Translate next to each label (and selection options) before Save."
+msgstr "编辑 SandboxRecord.Properties 的应用级 schema。标签支持多语言；请在保存前使用每项标签（及选项）旁的「翻译」。"
+
 #: web/views/sandbox_tag_actions.ts:10
 msgctxt "web/views/SandboxTagFormView"
 msgid "Copy Sandbox Tag"
diff --git a/modules/sandbox/web/__tests__/lt_titles.test.ts b/modules/sandbox/web/__tests__/lt_titles.test.ts
index 5d8e46017..b9205b50c 100644
--- a/modules/sandbox/web/__tests__/lt_titles.test.ts
+++ b/modules/sandbox/web/__tests__/lt_titles.test.ts
@@ -2,15 +2,25 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { createTranslate } from '@/core/service/i18n';
-import { sandboxRecordsMenuTitle, sandboxRootMenuTitle } from '../menu/titles';
+import {
+  sandboxConfigurationMenuTitle,
+  sandboxRecordPropertiesMenuTitle,
+  sandboxRecordsMenuTitle,
+  sandboxRootMenuTitle,
+} from '../menu/titles';
 import { sandboxRoutes } from '../route/routes';
 
 const listRouteTitle = createTranslate('sandbox', { scope: 'web/route/routes' })._lt('Sandbox Record List');
+const recordPropertiesRouteTitle = createTranslate('sandbox', { scope: 'web/route/routes' })._lt(
+  'Record Properties',
+);
 
 test('sandbox menu titles: titles.ts registers shared TermReferences', () => {
   expect(sandboxRootMenuTitle.src).toBe('Sandbox');
   expect(sandboxRootMenuTitle.module).toBe('sandbox');
   expect(sandboxRecordsMenuTitle.src).toBe('Field Kitchen Sink');
+  expect(sandboxConfigurationMenuTitle.src).toBe('Configuration');
+  expect(sandboxRecordPropertiesMenuTitle.src).toBe('Record Properties');
 });
 
 test('sandbox route titles: list route pins pageTitleText', () => {
@@ -19,3 +29,10 @@ test('sandbox route titles: list route pins pageTitleText', () => {
   expect(list.meta?.pageTitle).toBe('Sandbox Record List');
   expect(list.meta?.pageTitleText).toEqual(listRouteTitle);
 });
+
+test('sandbox route titles: record properties configuration pins pageTitleText', () => {
+  const route = sandboxRoutes.find(r => r.name === 'SandboxRecordProperties') as any;
+  expect(route).toBeTruthy();
+  expect(route.meta?.pageTitle).toBe('Record Properties');
+  expect(route.meta?.pageTitleText).toEqual(recordPropertiesRouteTitle);
+});
diff --git a/modules/sandbox/web/__tests__/resourceWiring.test.ts b/modules/sandbox/web/__tests__/resourceWiring.test.ts
index d21b30eff..26afaae0d 100644
--- a/modules/sandbox/web/__tests__/resourceWiring.test.ts
+++ b/modules/sandbox/web/__tests__/resourceWiring.test.ts
@@ -85,3 +85,9 @@ test('sandbox resource wiring: list/kanban/chart routes expose view switcher met
     viewPaths,
   });
 });
+
+test('sandbox resource wiring: record properties configuration route', () => {
+  const byName = Object.fromEntries(sandboxRoutes.map(route => [String(route.name), route]));
+  expect(byName.SandboxRecordProperties?.path).toBe('sandbox/configuration/record-properties');
+  expect(byName.SandboxRecordProperties?.meta).toMatchObject({ requiresAuth: true });
+});
diff --git a/modules/sandbox/web/menu/menus.ts b/modules/sandbox/web/menu/menus.ts
index 0427fe48c..2376bad61 100644
--- a/modules/sandbox/web/menu/menus.ts
+++ b/modules/sandbox/web/menu/menus.ts
@@ -4,7 +4,12 @@
 import type { MenuItem } from '@/core/web/menu';
 import { defineMenu } from '@/core/web/resource';
 import { FlaskConical } from 'lucide-vue-next';
-import { sandboxRecordsMenuTitle, sandboxRootMenuTitle } from './titles';
+import {
+  sandboxConfigurationMenuTitle,
+  sandboxRecordPropertiesMenuTitle,
+  sandboxRecordsMenuTitle,
+  sandboxRootMenuTitle,
+} from './titles';
 
 export const sandboxMenus: MenuItem[] = [
   defineMenu('sandbox.menu.root', {
@@ -18,6 +23,18 @@ export const sandboxMenus: MenuItem[] = [
         path: '/sandbox/records',
         sequence: 10,
       }),
+      // Pathless folder: app configuration (properties schema, future settings).
+      defineMenu('sandbox.menu.configuration', {
+        title: sandboxConfigurationMenuTitle,
+        sequence: 90,
+        children: [
+          defineMenu('sandbox.menu.record_properties', {
+            title: sandboxRecordPropertiesMenuTitle,
+            path: '/sandbox/configuration/record-properties',
+            sequence: 10,
+          }),
+        ],
+      }),
     ],
   }),
 ];
diff --git a/modules/sandbox/web/menu/titles.ts b/modules/sandbox/web/menu/titles.ts
index 6e4f895fa..af3f4edba 100644
--- a/modules/sandbox/web/menu/titles.ts
+++ b/modules/sandbox/web/menu/titles.ts
@@ -7,3 +7,5 @@ const { _lt } = createTranslate('sandbox', { scope: 'web/menu/titles' });
 
 export const sandboxRootMenuTitle = _lt('Sandbox');
 export const sandboxRecordsMenuTitle = _lt('Field Kitchen Sink');
+export const sandboxConfigurationMenuTitle = _lt('Configuration');
+export const sandboxRecordPropertiesMenuTitle = _lt('Record Properties');
diff --git a/modules/sandbox/web/pages/SandboxRecordProperties.vue b/modules/sandbox/web/pages/SandboxRecordProperties.vue
new file mode 100644
index 000000000..efb3649a8
--- /dev/null
+++ b/modules/sandbox/web/pages/SandboxRecordProperties.vue
@@ -0,0 +1,17 @@
+<!--
+SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
+SPDX-License-Identifier: Apache-2.0
+-->
+
+<template>
+  <ChoyPage>
+    <SandboxRecordPropertiesDefinitionView />
+  </ChoyPage>
+</template>
+
+<script setup lang="ts">
+import { ChoyPage } from '@/web';
+import SandboxRecordPropertiesDefinitionView from '../views/SandboxRecordPropertiesDefinitionView.vue';
+
+defineOptions({ name: 'SandboxRecordPropertiesPage' });
+</script>
diff --git a/modules/sandbox/web/pages/page_mount_coverage.test.ts b/modules/sandbox/web/pages/page_mount_coverage.test.ts
index c615ada48..72c2810bd 100644
--- a/modules/sandbox/web/pages/page_mount_coverage.test.ts
+++ b/modules/sandbox/web/pages/page_mount_coverage.test.ts
@@ -8,6 +8,7 @@ import SandboxRecordList from './SandboxRecordList.vue';
 import SandboxRecordKanban from './SandboxRecordKanban.vue';
 import SandboxRecordChart from './SandboxRecordChart.vue';
 import SandboxTag from './SandboxTag.vue';
+import SandboxRecordProperties from './SandboxRecordProperties.vue';
 import { sandboxMenus } from '../menu/menus';
 
 const pages: Array<[string, any, string]> = [
@@ -16,6 +17,7 @@ const pages: Array<[string, any, string]> = [
   ['SandboxRecordChart', SandboxRecordChart, '/sandbox/records/chart'],
   ['SandboxRecord', SandboxRecord, '/sandbox/records/1'],
   ['SandboxTag', SandboxTag, '/sandbox/tags/new'],
+  ['SandboxRecordProperties', SandboxRecordProperties, '/sandbox/configuration/record-properties'],
 ];
 
 test('sandbox page mount: every ChoyPage host mounts under choysumMount', async () => {
@@ -45,4 +47,9 @@ test('sandbox menus: root declares an icon and leaves stay text-only', () => {
   expect(sandboxMenus.length).toBeGreaterThan(0);
   expect(sandboxMenus[0]!.icon).toBeTruthy();
   expect(sandboxMenus[0]!.children?.every(child => child.icon == null)).toBe(true);
+  const configuration = sandboxMenus[0]!.children?.find(child => child.id === 'sandbox.menu.configuration');
+  expect(configuration?.path).toBeFalsy();
+  expect(configuration?.children?.some(child => child.path === '/sandbox/configuration/record-properties')).toBe(
+    true,
+  );
 });
diff --git a/modules/sandbox/web/route/routes.ts b/modules/sandbox/web/route/routes.ts
index 6459bcd66..db60a9eae 100644
--- a/modules/sandbox/web/route/routes.ts
+++ b/modules/sandbox/web/route/routes.ts
@@ -135,4 +135,14 @@ export const sandboxRoutes: RouteRecordRaw[] = [
     ],
     meta: { requiresAuth: true },
   }),
+  // App-level PropertyDefinition editor for SandboxRecord.Properties (label i18n UX).
+  // Write ACL comes from platform PropertyDefinition logical packs (auth RMA/RFR).
+  defineRoute('sandbox.route.record_properties', {
+    sequence: 80,
+    title: _lt('Record Properties'),
+    path: 'sandbox/configuration/record-properties',
+    name: 'SandboxRecordProperties',
+    component: () => import('../pages/SandboxRecordProperties.vue'),
+    meta: { requiresAuth: true },
+  }),
 ];
diff --git a/modules/sandbox/web/views/SandboxRecordPropertiesDefinitionView.vue b/modules/sandbox/web/views/SandboxRecordPropertiesDefinitionView.vue
new file mode 100644
index 000000000..49a7ff45e
--- /dev/null
+++ b/modules/sandbox/web/views/SandboxRecordPropertiesDefinitionView.vue
@@ -0,0 +1,35 @@
+<!--
+SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
+SPDX-License-Identifier: Apache-2.0
+-->
+
+<template>
+  <div
+    class="sandbox-record-properties-definition flex w-full flex-col gap-3"
+    data-testid="sandbox-record-properties-definition"
+  >
+    <p class="m-0 max-w-3xl text-sm text-muted-foreground">
+      {{
+        _t(
+          'Edit the app-level schema for SandboxRecord.Properties. Labels support multiple languages; use Translate next to each label (and selection options) before Save.',
+        )
+      }}
+    </p>
+    <ChoyPropertiesDefinitionEditor
+      application="sandbox"
+      target-model="SandboxRecord"
+      properties-field="Properties"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ChoyPropertiesDefinitionEditor } from '@/web';
+import { createTranslate } from '@/web/web/i18n';
+
+defineOptions({ name: 'SandboxRecordPropertiesDefinitionView' });
+
+const { _t } = createTranslate('sandbox', {
+  scope: 'web/views/SandboxRecordPropertiesDefinitionView',
+});
+</script>

From 3a7d75117611c583346be18379b44f4bdb05afa4 Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Wed, 28 Oct 2026 11:03:28 +0800
Subject: [PATCH 04/23] fix(schema): skip FKs for non-stored compute ManyToOne
 fields

Also enrich create-FK errors with table/column context and log failed
module commit holds at Error with the error value for stack traces.
---
 .../module/evolution/schema/foreignkey.go     | 62 +++++++++++++-
 .../evolution/schema/foreignkey_test.go       | 83 ++++++++++++++++++-
 internal/module/evolution/schema/migrator.go  |  5 +-
 .../module/lifecycle/install_tx_timing.go     | 11 +--
 .../lifecycle/install_tx_timing_test.go       | 29 ++++++-
 5 files changed, 177 insertions(+), 13 deletions(-)

diff --git a/internal/module/evolution/schema/foreignkey.go b/internal/module/evolution/schema/foreignkey.go
index 9226b28fc..30ea4b1ed 100644
--- a/internal/module/evolution/schema/foreignkey.go
+++ b/internal/module/evolution/schema/foreignkey.go
@@ -11,6 +11,7 @@ import (
 	"github.com/choysum-dev/choysum/pkg/meta"
 	"github.com/choysum-dev/choysum/pkg/scope"
 	"github.com/ettle/strcase"
+	xfmt "golang.org/x/exp/errors/fmt"
 )
 
 // ForeignKeyInfo describes a foreign key relationship.
@@ -98,8 +99,11 @@ func (m *foreignKeyMigrator) getManyToOneKeys() ([]ForeignKeyInfo, error) {
 					continue
 				}
 
-				// Treat fields with a select clause as virtual and skip FK creation.
-				if _, hasSelect := opts["select"]; hasSelect {
+				skip, skipErr := shouldSkipManyToOneForeignKey(field, opts)
+				if skipErr != nil {
+					return nil, skipErr
+				}
+				if skip {
 					continue
 				}
 
@@ -139,6 +143,51 @@ func (m *foreignKeyMigrator) getManyToOneKeys() ([]ForeignKeyInfo, error) {
 	return foreignKeys, nil
 }
 
+// shouldSkipManyToOneForeignKey skips virtual / non-column ManyToOne fields.
+// Prefer ResolvedSpec.Migration.ShouldCreateColumn (COMPUTE_STORE_FALSE, related,
+// sqlCompute, …); also skip @Field({ select }) and bare @Compute({ store: false })
+// when ResolvedSpec is absent.
+func shouldSkipManyToOneForeignKey(field *meta.Field, opts map[string]interface{}) (bool, error) {
+	if _, hasSelect := opts["select"]; hasSelect {
+		return true, nil
+	}
+	if field == nil {
+		return false, nil
+	}
+	resolved, err := field.GetResolvedSpec()
+	if err != nil {
+		return false, fmt.Errorf("error unmarshal field resolved spec for %s: %w", field.Name, err)
+	}
+	if resolved != nil {
+		return !resolved.Migration.ShouldCreateColumn, nil
+	}
+	return fieldHasNonStoredComputeDecorator(field), nil
+}
+
+func fieldHasNonStoredComputeDecorator(field *meta.Field) bool {
+	if field == nil {
+		return false
+	}
+	for _, decorator := range field.Decorators {
+		if decorator == nil || decorator.Name != "Compute" {
+			continue
+		}
+		for _, arg := range decorator.Arguments {
+			if arg == nil || arg.Type != "ObjectLiteral" || arg.Value == "" {
+				continue
+			}
+			var computeOpts map[string]interface{}
+			if err := json.Unmarshal([]byte(arg.Value), &computeOpts); err != nil {
+				continue
+			}
+			if store, ok := computeOpts["store"].(bool); ok && !store {
+				return true
+			}
+		}
+	}
+	return false
+}
+
 func (m *foreignKeyMigrator) resolveTargetModelByPath(targetModelPath string) (*meta.Model, error) {
 	for _, model := range m.models {
 		if model != nil && model.Path == targetModelPath {
@@ -235,7 +284,14 @@ func (m *foreignKeyMigrator) createForeignKeys(foreignKeys []ForeignKeyInfo) err
 		// Create the new foreign key.
 		createSQL := builder.BuildForeignKeySQL(fk)
 		if err := db.Exec(createSQL).Error; err != nil {
-			return fmt.Errorf("create foreign key failed: %v", err)
+			return xfmt.Errorf(
+				"create foreign key failed: table=%s column=%s refer=%s.%s: %w",
+				fk.TableName,
+				fk.ColumnName,
+				fk.ReferTableName,
+				fk.ReferColumnName,
+				err,
+			)
 		}
 	}
 
diff --git a/internal/module/evolution/schema/foreignkey_test.go b/internal/module/evolution/schema/foreignkey_test.go
index bc245ec7f..69e0536f6 100644
--- a/internal/module/evolution/schema/foreignkey_test.go
+++ b/internal/module/evolution/schema/foreignkey_test.go
@@ -250,11 +250,92 @@ func TestForeignKeyMigratorRuntimePaths(t *testing.T) {
 		fkMigrator := newForeignKeyMigrator(runtimeScope, nil, nil).(*foreignKeyMigrator)
 		fks := []ForeignKeyInfo{{TableName: "sales_order", ColumnName: "owner_id", ReferTableName: "sales_user", ReferColumnName: "id", OnDelete: "CASCADE"}}
 
-		if err := fkMigrator.createForeignKeys(fks); err == nil || !strings.Contains(err.Error(), "create foreign key failed") {
+		err := fkMigrator.createForeignKeys(fks)
+		if err == nil || !strings.Contains(err.Error(), "create foreign key failed") {
 			t.Fatalf("expected create foreign key error, got %v", err)
 		}
+		for _, want := range []string{
+			"table=sales_order",
+			"column=owner_id",
+			"refer=sales_user.id",
+		} {
+			if !strings.Contains(err.Error(), want) {
+				t.Fatalf("expected %q in error, got %v", want, err)
+			}
+		}
 		if err := fkMigrator.MigrateForeignKeys(); err != nil {
 			t.Fatalf("MigrateForeignKeys() with no keys error = %v", err)
 		}
 	})
+
+	t.Run("skips non-stored compute many-to-one via ResolvedSpec", func(t *testing.T) {
+		runtimeScope := newSchemaTestScope(t)
+		target := &meta.Model{Name: "Line", Path: "sandbox/line.ts", ModelTable: "sandbox_line"}
+		stored := newRelationField("OwnerId", "sandbox/line", `{"type":"ManyToOne"}`)
+		virtual := newRelationField("PrimaryLineId", "sandbox/line", `{"type":"ManyToOne","index":true,"readonly":true}`)
+		if err := virtual.SetResolvedSpec(&meta.FieldResolvedSpec{
+			FieldName: "PrimaryLineId",
+			Structural: meta.FieldStructuralSpec{
+				Name:      "PrimaryLineId",
+				FieldType: "ManyToOne",
+			},
+			Migration: meta.FieldMigrationDecision{
+				StorageKind:        "virtualRuntime",
+				ShouldCreateColumn: false,
+				ReasonCode:         "COMPUTE_STORE_FALSE",
+			},
+		}); err != nil {
+			t.Fatalf("SetResolvedSpec: %v", err)
+		}
+		source := &meta.Model{
+			Name:       "Record",
+			Path:       "sandbox/record.ts",
+			ModelTable: "sandbox_record",
+			Fields:     []*meta.Field{stored, virtual},
+		}
+
+		keys, err := newForeignKeyMigrator(runtimeScope, nil, []*meta.Model{source, target}).(*foreignKeyMigrator).getManyToOneKeys()
+		if err != nil {
+			t.Fatalf("getManyToOneKeys() error = %v", err)
+		}
+		if len(keys) != 1 || keys[0].ColumnName != "owner_id" {
+			t.Fatalf("expected only stored owner_id FK, got %#v", keys)
+		}
+	})
+
+	t.Run("skips non-stored compute many-to-one via Compute decorator fallback", func(t *testing.T) {
+		runtimeScope := newSchemaTestScope(t)
+		target := &meta.Model{Name: "Line", Path: "sandbox/line.ts", ModelTable: "sandbox_line"}
+		virtual := &meta.Field{
+			Name:           "PrimaryLineId",
+			ModuleSpecPath: "sandbox/line",
+			Decorators: []*meta.Decorator{
+				{
+					Name:      "Field",
+					Arguments: []*meta.Argument{{Type: "ObjectLiteral", Value: `{"type":"ManyToOne"}`}},
+				},
+				{
+					Name: "Compute",
+					Arguments: []*meta.Argument{
+						{Type: "StringLiteral", Value: "PrimaryLineId"},
+						{Type: "ObjectLiteral", Value: `{"deps":["Lines.Id"],"store":false}`},
+					},
+				},
+			},
+		}
+		source := &meta.Model{
+			Name:       "Record",
+			Path:       "sandbox/record.ts",
+			ModelTable: "sandbox_record",
+			Fields:     []*meta.Field{virtual},
+		}
+
+		keys, err := newForeignKeyMigrator(runtimeScope, nil, []*meta.Model{source, target}).(*foreignKeyMigrator).getManyToOneKeys()
+		if err != nil {
+			t.Fatalf("getManyToOneKeys() error = %v", err)
+		}
+		if len(keys) != 0 {
+			t.Fatalf("expected no FK for store:false Compute, got %#v", keys)
+		}
+	})
 }
diff --git a/internal/module/evolution/schema/migrator.go b/internal/module/evolution/schema/migrator.go
index 508709656..24c9ff073 100644
--- a/internal/module/evolution/schema/migrator.go
+++ b/internal/module/evolution/schema/migrator.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/choysum-dev/choysum/pkg/meta"
 	"github.com/choysum-dev/choysum/pkg/scope"
+	xfmt "golang.org/x/exp/errors/fmt"
 )
 
 type Migrator interface {
@@ -82,10 +83,10 @@ type migrator struct {
 
 func (m *migrator) Migrate() error {
 	if err := m.modelMigrator.MigrateSchema(); err != nil {
-		return fmt.Errorf("migrate schema: %w", err)
+		return xfmt.Errorf("migrate schema: %w", err)
 	}
 	if err := m.foreignKeyMigrator.MigrateForeignKeys(); err != nil {
-		return fmt.Errorf("migrate foreign keys: %w", err)
+		return xfmt.Errorf("migrate foreign keys: %w", err)
 	}
 	return nil
 }
diff --git a/internal/module/lifecycle/install_tx_timing.go b/internal/module/lifecycle/install_tx_timing.go
index 112db4456..c7a8608fb 100644
--- a/internal/module/lifecycle/install_tx_timing.go
+++ b/internal/module/lifecycle/install_tx_timing.go
@@ -11,7 +11,7 @@ import (
 
 // LogModuleCommitTxHold records how long a per-module Commit Required
 // transaction was held (install / upgrade / uninstall). Successful holds stay
-// Debug (ops metric); failures stay Info.
+// Debug (ops metric); failures log at Error.
 func LogModuleCommitTxHold(logger *slog.Logger, op string, caller string, started time.Time, err error) {
 	if logger == nil || started.IsZero() {
 		return
@@ -36,13 +36,14 @@ func logModuleCommitTxHold(logger *slog.Logger, op string, caller string, durati
 		"caller", caller,
 		"duration_ms", duration.Milliseconds(),
 	}
-	msg := op + " commit transaction hold completed"
 	if err != nil {
-		attrs = append(attrs, "error", err.Error())
-		logger.Info(msg, attrs...)
+		// Pass the error value (not err.Error()) so console/devslog/json
+		// ReplaceAttr can expand xfmt / QuickJS frames into a stack trace.
+		attrs = append(attrs, "error", err)
+		logger.Error(op+" commit transaction hold failed", attrs...)
 		return
 	}
-	logger.Debug(msg, attrs...)
+	logger.Debug(op+" commit transaction hold completed", attrs...)
 }
 
 // LogInstallOuterTxHold records install Commit / legacy outer Required hold time.
diff --git a/internal/module/lifecycle/install_tx_timing_test.go b/internal/module/lifecycle/install_tx_timing_test.go
index 88c8159c6..9a78a0e85 100644
--- a/internal/module/lifecycle/install_tx_timing_test.go
+++ b/internal/module/lifecycle/install_tx_timing_test.go
@@ -69,8 +69,8 @@ func TestLogModuleCommitTxHoldIncludesError(t *testing.T) {
 
 	logs := logBuf.String()
 	for _, want := range []string{
-		`"level":"INFO"`,
-		`"msg":"uninstall commit transaction hold completed"`,
+		`"level":"ERROR"`,
+		`"msg":"uninstall commit transaction hold failed"`,
 		`"error":"commit failed"`,
 	} {
 		if !strings.Contains(logs, want) {
@@ -79,6 +79,28 @@ func TestLogModuleCommitTxHoldIncludesError(t *testing.T) {
 	}
 }
 
+func TestLogModuleCommitTxHoldPassesErrorValueForStack(t *testing.T) {
+	t.Parallel()
+	var logBuf bytes.Buffer
+	// Capture attrs via a thin handler so we can assert the error is not stringified.
+	logger := slog.New(slog.NewJSONHandler(&logBuf, &slog.HandlerOptions{
+		Level: slog.LevelError,
+		ReplaceAttr: func(_ []string, a slog.Attr) slog.Attr {
+			if a.Key == "error" && a.Value.Kind() == slog.KindAny {
+				if _, ok := a.Value.Any().(error); !ok {
+					t.Fatalf("error attr must remain an error value, got %#v", a.Value.Any())
+				}
+			}
+			return a
+		},
+	}))
+	errSample := errors.New("commit failed")
+	logModuleCommitTxHold(logger, "install", "module_commit", 10*time.Millisecond, errSample)
+	if !strings.Contains(logBuf.String(), "commit failed") {
+		t.Fatalf("expected error text in logs, got %q", logBuf.String())
+	}
+}
+
 func TestLogInstallOuterTxHoldEmitsDuration(t *testing.T) {
 	t.Parallel()
 	var logBuf bytes.Buffer
@@ -127,6 +149,9 @@ func TestLogInstallOuterTxHoldIncludesError(t *testing.T) {
 	LogInstallOuterTxHold(logger, "cli", time.Now().Add(-10*time.Millisecond), errSample)
 
 	logs := logBuf.String()
+	if !strings.Contains(logs, `"level":"ERROR"`) {
+		t.Fatalf("expected ERROR level, got %q", logs)
+	}
 	if !strings.Contains(logs, `"error":"outer failed"`) {
 		t.Fatalf("expected error attr, got %q", logs)
 	}

From ce8a8cc075dd9d7e54652d02bb54dcac5415c7eb Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Wed, 28 Oct 2026 14:39:59 +0800
Subject: [PATCH 05/23] =?UTF-8?q?feat(web):=20PropertyDefinition=20List?=
 =?UTF-8?q?=E2=86=92Form=20editor=20with=20selection=20list=20and=20handle?=
 =?UTF-8?q?=20drag=20UX?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace the standalone definition editor with a form Field, item dialog, and
O2M-style selection options (reorder, translate icon). Keep jsonobject
Definition arrays intact in buildUpdatePayload, and share HTML5 drag-image
plus overIndex feedback across list handles, O2M Kanban, and definition tables.
---
 modules/core/i18n/core.pot                    |  69 ++-
 modules/core/i18n/zh_CN.po                    |  68 ++-
 .../model/property_definition_base_model.ts   |  36 +-
 .../orm/utils/relation_patch_diff.test.ts     |  21 +
 modules/core/utils/diff.ts                    |   5 +
 modules/sandbox/i18n/sandbox.pot              | 115 +++-
 modules/sandbox/i18n/zh_CN.po                 | 120 +++-
 .../sandbox/web/__tests__/lt_titles.test.ts   |   4 +-
 .../web/__tests__/resourceWiring.test.ts      |  10 +-
 .../web/pages/SandboxPropertyDefinition.vue   |  37 ++
 .../pages/SandboxPropertyDefinitionList.vue   |  28 +
 .../web/pages/SandboxRecordProperties.vue     |  17 -
 .../web/pages/page_mount_coverage.test.ts     |   6 +-
 modules/sandbox/web/route/routes.ts           |  42 +-
 .../SandboxPropertyDefinitionFormView.vue     | 102 ++++
 .../SandboxPropertyDefinitionListView.vue     |  92 +++
 .../SandboxRecordPropertiesDefinitionView.vue |  35 --
 .../sandbox_property_definition_actions.ts    |  12 +
 modules/web/i18n/web.pot                      | 174 ++++--
 modules/web/i18n/zh_CN.po                     | 247 ++++++--
 .../field/ChoyOneToManyKanbanField.vue        |  25 +-
 .../ChoyPropertiesDefinitionEditor.test.ts    | 236 --------
 .../field/ChoyPropertiesDefinitionEditor.vue  | 435 --------------
 .../ChoyPropertiesDefinitionField.test.ts     | 369 ++++++++++++
 .../field/ChoyPropertiesDefinitionField.vue   | 568 ++++++++++++++++++
 .../ChoyPropertiesDefinitionItemDialog.vue    | 299 +++++++++
 ...ropertiesDefinitionSelectionEditor.test.ts | 148 +++++
 ...hoyPropertiesDefinitionSelectionEditor.vue | 224 +++++++
 .../field/propertiesDefinitionHelpers.test.ts |  36 ++
 .../field/propertiesDefinitionHelpers.ts      |  69 ++-
 .../web/web/components/internal/DataTable.vue |  45 +-
 .../table/ChoyTableColumn.handle.test.ts      |  28 +-
 .../web/components/table/ChoyTableColumn.vue  |   7 +-
 .../view/ChoyKanbanVirtualLaneBody.vue        |  12 +-
 .../composables/useListHandleReorder.test.ts  |  74 ++-
 .../web/composables/useListHandleReorder.ts   |  68 ++-
 modules/web/web/kit.ts                        |   4 +-
 modules/web/web/utils/diff_payload.test.ts    |  13 +
 38 files changed, 2997 insertions(+), 903 deletions(-)
 create mode 100644 modules/sandbox/web/pages/SandboxPropertyDefinition.vue
 create mode 100644 modules/sandbox/web/pages/SandboxPropertyDefinitionList.vue
 delete mode 100644 modules/sandbox/web/pages/SandboxRecordProperties.vue
 create mode 100644 modules/sandbox/web/views/SandboxPropertyDefinitionFormView.vue
 create mode 100644 modules/sandbox/web/views/SandboxPropertyDefinitionListView.vue
 delete mode 100644 modules/sandbox/web/views/SandboxRecordPropertiesDefinitionView.vue
 create mode 100644 modules/sandbox/web/views/sandbox_property_definition_actions.ts
 delete mode 100644 modules/web/web/components/field/ChoyPropertiesDefinitionEditor.test.ts
 delete mode 100644 modules/web/web/components/field/ChoyPropertiesDefinitionEditor.vue
 create mode 100644 modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
 create mode 100644 modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
 create mode 100644 modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
 create mode 100644 modules/web/web/components/field/ChoyPropertiesDefinitionSelectionEditor.test.ts
 create mode 100644 modules/web/web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue

diff --git a/modules/core/i18n/core.pot b/modules/core/i18n/core.pot
index 4f7f7c6c8..91d630075 100644
--- a/modules/core/i18n/core.pot
+++ b/modules/core/i18n/core.pot
@@ -7,27 +7,27 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: service/orm/model/model.ts:430
+#: service/orm/model/model.ts:455
 msgctxt "core.model.BaseModel.fields"
 msgid "Created At"
 msgstr ""
 
-#: service/orm/model/model.ts:466
+#: service/orm/model/model.ts:491
 msgctxt "core.model.BaseModel.fields"
 msgid "Created By"
 msgstr ""
 
-#: service/orm/model/model.ts:452
+#: service/orm/model/model.ts:477
 msgctxt "core.model.BaseModel.fields"
 msgid "Deleted At"
 msgstr ""
 
-#: service/orm/model/model.ts:494
+#: service/orm/model/model.ts:519
 msgctxt "core.model.BaseModel.fields"
 msgid "Deleted By"
 msgstr ""
 
-#: service/orm/model/model.ts:408
+#: service/orm/model/model.ts:433
 msgctxt "core.model.BaseModel.fields"
 msgid "Display Name"
 msgstr ""
@@ -37,48 +37,73 @@ msgctxt "core.model.BaseModel.fields"
 msgid "Parent Path"
 msgstr ""
 
-#: service/orm/model/model.ts:441
+#: service/orm/model/model.ts:466
 msgctxt "core.model.BaseModel.fields"
 msgid "Updated At"
 msgstr ""
 
-#: service/orm/model/model.ts:480
+#: service/orm/model/model.ts:505
 msgctxt "core.model.BaseModel.fields"
 msgid "Updated By"
 msgstr ""
 
-#: service/orm/model/model.ts:287
+#: service/orm/model/property_definition_base_model.ts:216
+msgctxt "core.model.PropertyDefinition.fields"
+msgid "Container Id"
+msgstr ""
+
+#: service/orm/model/property_definition_base_model.ts:207
+msgctxt "core.model.PropertyDefinition.fields"
+msgid "Container Model"
+msgstr ""
+
+#: service/orm/model/property_definition_base_model.ts:224
+msgctxt "core.model.PropertyDefinition.fields"
+msgid "Definition"
+msgstr ""
+
+#: service/orm/model/property_definition_base_model.ts:199
+msgctxt "core.model.PropertyDefinition.fields"
+msgid "Properties Field"
+msgstr ""
+
+#: service/orm/model/property_definition_base_model.ts:190
+msgctxt "core.model.PropertyDefinition.fields"
+msgid "Target Model"
+msgstr ""
+
+#: service/orm/model/model.ts:308
 msgctxt "service/orm/model/model"
 msgid "current company is required"
 msgstr ""
 
-#: service/orm/model/model.ts:276
+#: service/orm/model/model.ts:297
 msgctxt "service/orm/model/model"
 msgid "current user is required"
 msgstr ""
 
-#: service/orm/model/model_instance.ts:189
+#: service/orm/model/model_instance.ts:197
 msgctxt "service/orm/model/model_instance"
 msgid "Delete failed: Record with Id %s not found or could not be deleted"
 msgstr ""
 
-#: service/orm/model/model_instance.ts:226
-#: service/orm/model/model_instance.ts:89
+#: service/orm/model/model_instance.ts:238
+#: service/orm/model/model_instance.ts:92
 msgctxt "service/orm/model/model_instance"
 msgid "Record with Id %s no longer exists"
 msgstr ""
 
-#: service/orm/model/model_read.ts:318
+#: service/orm/model/model_read.ts:324
 msgctxt "service/orm/model/model_read"
 msgid "%s not found"
 msgstr ""
 
-#: service/orm/model/model_soft_delete_scope.ts:29
+#: service/orm/model/model_soft_delete_scope.ts:23
 msgctxt "service/orm/model/model_soft_delete_scope"
 msgid "withDeleted and onlyDeleted cannot both be true"
 msgstr ""
 
-#: service/orm/model/model_update.ts:664
+#: service/orm/model/model_update.ts:667
 msgctxt "service/orm/model/model_update"
 msgid "Update failed: Record %s not found."
 msgstr ""
@@ -155,32 +180,32 @@ msgctxt "service/orm/repository/authz/record_rule_helpers"
 msgid "failed to fetch record rule condition"
 msgstr ""
 
-#: service/orm/repository/authz/record_rule_helpers.ts:203
+#: service/orm/repository/authz/record_rule_helpers.ts:214
 msgctxt "service/orm/repository/authz/record_rule_helpers"
 msgid "invalid JSON in record rule condition"
 msgstr ""
 
-#: service/orm/repository/authz/record_rule_helpers.ts:228
+#: service/orm/repository/authz/record_rule_helpers.ts:239
 msgctxt "service/orm/repository/authz/record_rule_helpers"
 msgid "invalid record rule condition shape (type=%s, isArray=%s, preview=%s)"
 msgstr ""
 
-#: service/orm/repository/authz/record_rule_helpers.ts:154
+#: service/orm/repository/authz/record_rule_helpers.ts:165
 msgctxt "service/orm/repository/authz/record_rule_helpers"
 msgid "missing ctx.activeCompanyId for $companyId token"
 msgstr ""
 
-#: service/orm/repository/authz/record_rule_helpers.ts:166
+#: service/orm/repository/authz/record_rule_helpers.ts:177
 msgctxt "service/orm/repository/authz/record_rule_helpers"
 msgid "missing ctx.enabledCompanyIds for $companyIds token"
 msgstr ""
 
-#: service/orm/repository/authz/record_rule_helpers.ts:252
+#: service/orm/repository/authz/record_rule_helpers.ts:263
 msgctxt "service/orm/repository/authz/record_rule_helpers"
 msgid "missing identity.userId for $userId token"
 msgstr ""
 
-#: service/orm/repository/authz/record_rule_helpers.ts:266
+#: service/orm/repository/authz/record_rule_helpers.ts:277
 msgctxt "service/orm/repository/authz/record_rule_helpers"
 msgid "unknown token in record rule condition"
 msgstr ""
@@ -211,7 +236,7 @@ msgctxt "service/orm/repository/validation/kernel"
 msgid "Field \"%s\" is required"
 msgstr ""
 
-#: service/orm/repository/validation/kernel.ts:224
+#: service/orm/repository/validation/kernel.ts:231
 msgctxt "service/orm/repository/validation/kernel"
 msgid "Field \"%s\" must be a valid decimal that satisfies the precision and scale limits"
 msgstr ""
diff --git a/modules/core/i18n/zh_CN.po b/modules/core/i18n/zh_CN.po
index 9e44aa5a6..a4e5313ef 100644
--- a/modules/core/i18n/zh_CN.po
+++ b/modules/core/i18n/zh_CN.po
@@ -1,27 +1,27 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nLanguage: zh_CN\n"
 
-#: service/orm/model/model.ts:430
+#: service/orm/model/model.ts:455
 msgctxt "core.model.BaseModel.fields"
 msgid "Created At"
 msgstr "创建时间"
 
-#: service/orm/model/model.ts:466
+#: service/orm/model/model.ts:491
 msgctxt "core.model.BaseModel.fields"
 msgid "Created By"
 msgstr "创建人"
 
-#: service/orm/model/model.ts:452
+#: service/orm/model/model.ts:477
 msgctxt "core.model.BaseModel.fields"
 msgid "Deleted At"
 msgstr "删除时间"
 
-#: service/orm/model/model.ts:494
+#: service/orm/model/model.ts:519
 msgctxt "core.model.BaseModel.fields"
 msgid "Deleted By"
 msgstr "删除人"
 
-#: service/orm/model/model.ts:408
+#: service/orm/model/model.ts:433
 msgctxt "core.model.BaseModel.fields"
 msgid "Display Name"
 msgstr "显示名称"
@@ -31,47 +31,72 @@ msgctxt "core.model.BaseModel.fields"
 msgid "Parent Path"
 msgstr "父级路径"
 
-#: service/orm/model/model.ts:441
+#: service/orm/model/model.ts:466
 msgctxt "core.model.BaseModel.fields"
 msgid "Updated At"
 msgstr "更新时间"
 
-#: service/orm/model/model.ts:480
+#: service/orm/model/model.ts:505
 msgctxt "core.model.BaseModel.fields"
 msgid "Updated By"
 msgstr "更新人"
 
-#: service/orm/model/model.ts:287
+#: service/orm/model/property_definition_base_model.ts:216
+msgctxt "core.model.PropertyDefinition.fields"
+msgid "Container Id"
+msgstr "容器 ID"
+
+#: service/orm/model/property_definition_base_model.ts:207
+msgctxt "core.model.PropertyDefinition.fields"
+msgid "Container Model"
+msgstr "容器模型"
+
+#: service/orm/model/property_definition_base_model.ts:224
+msgctxt "core.model.PropertyDefinition.fields"
+msgid "Definition"
+msgstr "定义"
+
+#: service/orm/model/property_definition_base_model.ts:199
+msgctxt "core.model.PropertyDefinition.fields"
+msgid "Properties Field"
+msgstr "属性字段"
+
+#: service/orm/model/property_definition_base_model.ts:190
+msgctxt "core.model.PropertyDefinition.fields"
+msgid "Target Model"
+msgstr "目标模型"
+
+#: service/orm/model/model.ts:308
 msgctxt "service/orm/model/model"
 msgid "current company is required"
 msgstr "需要当前公司"
 
-#: service/orm/model/model.ts:276
+#: service/orm/model/model.ts:297
 msgctxt "service/orm/model/model"
 msgid "current user is required"
 msgstr "需要当前用户"
 
-#: service/orm/model/model_instance.ts:189
+#: service/orm/model/model_instance.ts:197
 msgctxt "service/orm/model/model_instance"
 msgid "Delete failed: Record with Id %s not found or could not be deleted"
 msgstr "删除失败：未找到 Id 为 %s 的记录，或无法删除"
 
-#: service/orm/model/model_instance.ts:226 service/orm/model/model_instance.ts:89
+#: service/orm/model/model_instance.ts:238 service/orm/model/model_instance.ts:92
 msgctxt "service/orm/model/model_instance"
 msgid "Record with Id %s no longer exists"
 msgstr "Id 为 %s 的记录已不存在"
 
-#: service/orm/model/model_read.ts:318
+#: service/orm/model/model_read.ts:324
 msgctxt "service/orm/model/model_read"
 msgid "%s not found"
 msgstr "未找到 %s"
 
-#: service/orm/model/model_soft_delete_scope.ts:29
+#: service/orm/model/model_soft_delete_scope.ts:23
 msgctxt "service/orm/model/model_soft_delete_scope"
 msgid "withDeleted and onlyDeleted cannot both be true"
 msgstr "withDeleted 与 onlyDeleted 不能同时为 true"
 
-#: service/orm/model/model_update.ts:664
+#: service/orm/model/model_update.ts:667
 msgctxt "service/orm/model/model_update"
 msgid "Update failed: Record %s not found."
 msgstr "更新失败：未找到记录 %s。"
@@ -146,32 +171,32 @@ msgctxt "service/orm/repository/authz/record_rule_helpers"
 msgid "failed to fetch record rule condition"
 msgstr "获取记录规则条件失败"
 
-#: service/orm/repository/authz/record_rule_helpers.ts:203
+#: service/orm/repository/authz/record_rule_helpers.ts:214
 msgctxt "service/orm/repository/authz/record_rule_helpers"
 msgid "invalid JSON in record rule condition"
 msgstr "记录规则条件中的 JSON 无效"
 
-#: service/orm/repository/authz/record_rule_helpers.ts:228
+#: service/orm/repository/authz/record_rule_helpers.ts:239
 msgctxt "service/orm/repository/authz/record_rule_helpers"
 msgid "invalid record rule condition shape (type=%s, isArray=%s, preview=%s)"
 msgstr "记录规则条件形状无效（type=%s, isArray=%s, preview=%s）"
 
-#: service/orm/repository/authz/record_rule_helpers.ts:154
+#: service/orm/repository/authz/record_rule_helpers.ts:165
 msgctxt "service/orm/repository/authz/record_rule_helpers"
 msgid "missing ctx.activeCompanyId for $companyId token"
 msgstr "$companyId 令牌缺少 ctx.activeCompanyId"
 
-#: service/orm/repository/authz/record_rule_helpers.ts:166
+#: service/orm/repository/authz/record_rule_helpers.ts:177
 msgctxt "service/orm/repository/authz/record_rule_helpers"
 msgid "missing ctx.enabledCompanyIds for $companyIds token"
 msgstr "$companyIds 令牌缺少 ctx.enabledCompanyIds"
 
-#: service/orm/repository/authz/record_rule_helpers.ts:252
+#: service/orm/repository/authz/record_rule_helpers.ts:263
 msgctxt "service/orm/repository/authz/record_rule_helpers"
 msgid "missing identity.userId for $userId token"
 msgstr "$userId 令牌缺少 identity.userId"
 
-#: service/orm/repository/authz/record_rule_helpers.ts:266
+#: service/orm/repository/authz/record_rule_helpers.ts:277
 msgctxt "service/orm/repository/authz/record_rule_helpers"
 msgid "unknown token in record rule condition"
 msgstr "记录规则条件中存在未知令牌"
@@ -201,7 +226,7 @@ msgctxt "service/orm/repository/validation/kernel"
 msgid "Field \"%s\" is required"
 msgstr "字段 \"%s\" 为必填"
 
-#: service/orm/repository/validation/kernel.ts:224
+#: service/orm/repository/validation/kernel.ts:231
 msgctxt "service/orm/repository/validation/kernel"
 msgid "Field \"%s\" must be a valid decimal that satisfies the precision and scale limits"
 msgstr "字段 \"%s\" 必须是满足精度与小数位限制的有效小数"
@@ -290,3 +315,4 @@ msgstr "意外错误"
 msgctxt "web/rpc/errors"
 msgid "Unknown API error"
 msgstr "未知 API 错误"
+
diff --git a/modules/core/service/orm/model/property_definition_base_model.ts b/modules/core/service/orm/model/property_definition_base_model.ts
index 84b7cb1f4..8f49dd29d 100644
--- a/modules/core/service/orm/model/property_definition_base_model.ts
+++ b/modules/core/service/orm/model/property_definition_base_model.ts
@@ -3,6 +3,7 @@
 
 import { Field } from '../decorator/field';
 import { raiseDomainError } from '@/core/service/error';
+import { _lt } from '@/core/service/i18n_binder';
 import { MetadataStorage } from '../metadata/storage';
 import BaseModel from './model';
 import { registerLogicalModelName } from './logical_model_registry';
@@ -181,22 +182,47 @@ async function ensureDefinitionUniqueIndex(ctor: ModelCtor<PropertyDefinitionBas
  * `@Model('PropertyDefinition') export default class PropertyDefinition extends PropertyDefinitionBaseModel {}`
  */
 export default class PropertyDefinitionBaseModel extends BaseModel {
-  @Field({ type: 'varchar', size: 255, notNull: true, index: true })
+  @Field({
+    type: 'varchar',
+    size: 255,
+    notNull: true,
+    index: true,
+    string: _lt('Target Model', { scope: 'core.model.PropertyDefinition.fields' }),
+  })
   TargetModel!: string;
 
-  @Field({ type: 'varchar', size: 255, notNull: true, index: true })
+  @Field({
+    type: 'varchar',
+    size: 255,
+    notNull: true,
+    index: true,
+    string: _lt('Properties Field', { scope: 'core.model.PropertyDefinition.fields' }),
+  })
   PropertiesField!: string;
 
   /** Parent model short name; empty for App-level container. */
-  @Field({ type: 'varchar', size: 255 })
+  @Field({
+    type: 'varchar',
+    size: 255,
+    string: _lt('Container Model', { scope: 'core.model.PropertyDefinition.fields' }),
+  })
   ContainerModel?: string | null;
 
   /** Parent record id; null for App-level container. */
-  @Field({ type: 'varchar', size: 64, index: true })
+  @Field({
+    type: 'varchar',
+    size: 64,
+    index: true,
+    string: _lt('Container Id', { scope: 'core.model.PropertyDefinition.fields' }),
+  })
   ContainerId?: string | null;
 
   /** Property item schema array (stored as JSON; physical jsonobject). */
-  @Field({ type: 'jsonobject', notNull: true })
+  @Field({
+    type: 'jsonobject',
+    notNull: true,
+    string: _lt('Definition', { scope: 'core.model.PropertyDefinition.fields' }),
+  })
   Definition!: unknown[];
 
   static override async Create<C extends ModelCtor, F extends FieldSelection<RowOf<C>> | undefined = undefined>(
diff --git a/modules/core/service/orm/utils/relation_patch_diff.test.ts b/modules/core/service/orm/utils/relation_patch_diff.test.ts
index 9afbe4673..89dcaa086 100644
--- a/modules/core/service/orm/utils/relation_patch_diff.test.ts
+++ b/modules/core/service/orm/utils/relation_patch_diff.test.ts
@@ -378,6 +378,27 @@ test('buildUpdatePayload treats jsonobject via resolvedColumnType as whole-map r
   expect(payload.Meta).toEqual({ a: 9, b: 2 });
 });
 
+test('buildUpdatePayload keeps jsonobject array columns as arrays (not o2m / numeric-key maps)', () => {
+  const original = {
+    Definition: [
+      { name: 'external_code', type: 'char', string: { en_US: 'External Code', zh_CN: '外部编码' } },
+      { name: 'is_vip', type: 'boolean', string: { en_US: 'VIP', zh_CN: 'VIP' } },
+    ],
+  };
+  const current = {
+    Definition: [
+      { name: 'external_code', type: 'char', string: { en_US: 'External Code', zh_CN: '外部' } },
+      { name: 'is_vip', type: 'boolean', string: { en_US: 'VIP', zh_CN: 'VIP' } },
+    ],
+  };
+  const payload = buildUpdatePayload(original, current, {
+    Definition: { type: 'jsonobject' },
+  });
+  expect(Array.isArray(payload.Definition)).toBe(true);
+  expect(payload.Definition).toEqual(current.Definition);
+  expect((payload.Definition as object | undefined)?.constructor).toBe(Array);
+});
+
 test('buildUpdatePayload clears whole-map column when current is null', () => {
   const payload = buildUpdatePayload(
     { Properties: { a: 1 } },
diff --git a/modules/core/utils/diff.ts b/modules/core/utils/diff.ts
index 20901e36e..a1facf8db 100644
--- a/modules/core/utils/diff.ts
+++ b/modules/core/utils/diff.ts
@@ -32,6 +32,9 @@ function isWholeMapReplaceFieldMeta(fm: { type?: string; resolvedColumnType?: st
 
 function mergePlainMaps(original: unknown, current: unknown): Plain | unknown {
   if (current === null || current === undefined) return current;
+  // jsonobject may store a JSON array (e.g. PropertyDefinition.Definition).
+  // Spreading arrays into a plain object yields {0:…,1:…} and breaks BE Array.isArray checks.
+  if (Array.isArray(current) || Array.isArray(original)) return current;
   const oMap = asObjectRecord(original);
   const cMap = asObjectRecord(current);
   if (oMap && cMap) return { ...oMap, ...cMap };
@@ -409,6 +412,8 @@ export function buildUpdatePayload(original: Plain, current: Plain, fieldsMeta?:
   for (const key of allKeys) {
     if (processed.has(key) || readonlyKeys.has(key)) continue;
     if (fieldsMeta?.[key]?.relation) continue;
+    // jsonobject / properties may hold JSON arrays; never treat them as o2m.
+    if (isWholeMapReplaceFieldMeta(fieldsMeta?.[key])) continue;
 
     const oVal = original?.[key];
     const cVal = current?.[key];
diff --git a/modules/sandbox/i18n/sandbox.pot b/modules/sandbox/i18n/sandbox.pot
index 9c5891011..17f052526 100644
--- a/modules/sandbox/i18n/sandbox.pot
+++ b/modules/sandbox/i18n/sandbox.pot
@@ -397,6 +397,11 @@ msgctxt "web/menu/titles"
 msgid "Sandbox"
 msgstr ""
 
+#: web/pages/SandboxPropertyDefinitionList.vue:11
+msgctxt "web/pages/SandboxPropertyDefinitionList"
+msgid "Record Properties"
+msgstr ""
+
 #: web/pages/SandboxRecordChart.vue:12
 msgctxt "web/pages/SandboxRecordChart"
 msgid "Sandbox Record Chart"
@@ -412,6 +417,11 @@ msgctxt "web/pages/SandboxRecordList"
 msgid "Field Kitchen Sink"
 msgstr ""
 
+#: web/route/routes.ts:156
+msgctxt "web/route/routes"
+msgid "New Property Definition"
+msgstr ""
+
 #: web/route/routes.ts:82
 msgctxt "web/route/routes"
 msgid "New Sandbox Record"
@@ -422,6 +432,11 @@ msgctxt "web/route/routes"
 msgid "New Sandbox Tag"
 msgstr ""
 
+#: web/route/routes.ts:170
+msgctxt "web/route/routes"
+msgid "Property Definition"
+msgstr ""
+
 #: web/route/routes.ts:142
 msgctxt "web/route/routes"
 msgid "Record Properties"
@@ -502,6 +517,101 @@ msgctxt "web/views/SandboxLinesVirtTools"
 msgid "Short Lines stay content-sized. Open VIRT-LINES or fill rows to exercise capped table / kanban virtualize (not saved until you Save)."
 msgstr ""
 
+#: web/views/SandboxPropertyDefinitionFormView.vue:90
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Container Id"
+msgstr ""
+
+#: web/views/SandboxPropertyDefinitionFormView.vue:83
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Container Model"
+msgstr ""
+
+#: web/views/SandboxPropertyDefinitionFormView.vue:70
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Container scope"
+msgstr ""
+
+#: web/views/sandbox_property_definition_actions.ts:10
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Copy Property Definition"
+msgstr ""
+
+#: web/views/sandbox_property_definition_actions.ts:10
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Create Property Definition"
+msgstr ""
+
+#: web/views/SandboxPropertyDefinitionFormView.vue:23
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Definition"
+msgstr ""
+
+#: web/views/sandbox_property_definition_actions.ts:10
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Delete Property Definition"
+msgstr ""
+
+#: web/views/sandbox_property_definition_actions.ts:10
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Edit Property Definition"
+msgstr ""
+
+#: web/views/SandboxPropertyDefinitionFormView.vue:73
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Optional parent container for record-scoped definitions. Leave empty for app-level properties (e.g. SandboxRecord.Properties)."
+msgstr ""
+
+#: web/views/SandboxPropertyDefinitionFormView.vue:15
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Properties Field"
+msgstr ""
+
+#: web/views/sandbox_property_definition_actions.ts:11
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Property Definition"
+msgstr ""
+
+#: web/views/SandboxPropertyDefinitionFormView.vue:21
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Required"
+msgstr ""
+
+#: web/views/SandboxPropertyDefinitionFormView.vue:9
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Scope"
+msgstr ""
+
+#: web/views/SandboxPropertyDefinitionFormView.vue:12
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Target Model"
+msgstr ""
+
+#: web/views/SandboxPropertyDefinitionListView.vue:11
+msgctxt "web/views/SandboxPropertyDefinitionListView"
+msgid "Container Id"
+msgstr ""
+
+#: web/views/SandboxPropertyDefinitionListView.vue:10
+msgctxt "web/views/SandboxPropertyDefinitionListView"
+msgid "Container Model"
+msgstr ""
+
+#: web/views/SandboxPropertyDefinitionListView.vue:12
+msgctxt "web/views/SandboxPropertyDefinitionListView"
+msgid "Definition"
+msgstr ""
+
+#: web/views/SandboxPropertyDefinitionListView.vue:9
+msgctxt "web/views/SandboxPropertyDefinitionListView"
+msgid "Properties Field"
+msgstr ""
+
+#: web/views/SandboxPropertyDefinitionListView.vue:8
+msgctxt "web/views/SandboxPropertyDefinitionListView"
+msgid "Target Model"
+msgstr ""
+
 #: web/views/SandboxRecordChartView.vue:43
 msgctxt "web/views/SandboxRecordChartView"
 msgid "Chart View"
@@ -815,11 +925,6 @@ msgctxt "web/views/SandboxRecordListView"
 msgid "View switcher"
 msgstr ""
 
-#: web/views/SandboxRecordPropertiesDefinitionView.vue:5
-msgctxt "web/views/SandboxRecordPropertiesDefinitionView"
-msgid "Edit the app-level schema for SandboxRecord.Properties. Labels support multiple languages; use Translate next to each label (and selection options) before Save."
-msgstr ""
-
 #: web/views/sandbox_tag_actions.ts:10
 msgctxt "web/views/SandboxTagFormView"
 msgid "Copy Sandbox Tag"
diff --git a/modules/sandbox/i18n/zh_CN.po b/modules/sandbox/i18n/zh_CN.po
index ba019801a..1b7debe08 100644
--- a/modules/sandbox/i18n/zh_CN.po
+++ b/modules/sandbox/i18n/zh_CN.po
@@ -391,6 +391,11 @@ msgctxt "web/menu/titles"
 msgid "Sandbox"
 msgstr "沙箱"
 
+#: web/pages/SandboxPropertyDefinitionList.vue:11
+msgctxt "web/pages/SandboxPropertyDefinitionList"
+msgid "Record Properties"
+msgstr "记录属性"
+
 #: web/pages/SandboxRecordChart.vue:12
 msgctxt "web/pages/SandboxRecordChart"
 msgid "Sandbox Record Chart"
@@ -406,6 +411,11 @@ msgctxt "web/pages/SandboxRecordList"
 msgid "Field Kitchen Sink"
 msgstr "字段试验场"
 
+#: web/route/routes.ts:156
+msgctxt "web/route/routes"
+msgid "New Property Definition"
+msgstr "新建属性定义"
+
 #: web/route/routes.ts:82
 msgctxt "web/route/routes"
 msgid "New Sandbox Record"
@@ -416,6 +426,11 @@ msgctxt "web/route/routes"
 msgid "New Sandbox Tag"
 msgstr "新建沙箱标签"
 
+#: web/route/routes.ts:170
+msgctxt "web/route/routes"
+msgid "Property Definition"
+msgstr "属性定义"
+
 #: web/route/routes.ts:142
 msgctxt "web/route/routes"
 msgid "Record Properties"
@@ -496,6 +511,101 @@ msgctxt "web/views/SandboxLinesVirtTools"
 msgid "Short Lines stay content-sized. Open VIRT-LINES or fill rows to exercise capped table / kanban virtualize (not saved until you Save)."
 msgstr "短 Lines 保持内容高度。打开 VIRT-LINES 或填充行以练习封顶表格 / kanban 虚拟化（保存前不落库）。"
 
+#: web/views/SandboxPropertyDefinitionFormView.vue:90
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Container Id"
+msgstr "容器 ID"
+
+#: web/views/SandboxPropertyDefinitionFormView.vue:83
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Container Model"
+msgstr "容器模型"
+
+#: web/views/SandboxPropertyDefinitionFormView.vue:70
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Container scope"
+msgstr "容器作用域"
+
+#: web/views/sandbox_property_definition_actions.ts:10
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Copy Property Definition"
+msgstr "复制属性定义"
+
+#: web/views/sandbox_property_definition_actions.ts:10
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Create Property Definition"
+msgstr "创建属性定义"
+
+#: web/views/SandboxPropertyDefinitionFormView.vue:23
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Definition"
+msgstr "定义"
+
+#: web/views/sandbox_property_definition_actions.ts:10
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Delete Property Definition"
+msgstr "删除属性定义"
+
+#: web/views/sandbox_property_definition_actions.ts:10
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Edit Property Definition"
+msgstr "编辑属性定义"
+
+#: web/views/SandboxPropertyDefinitionFormView.vue:73
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Optional parent container for record-scoped definitions. Leave empty for app-level properties (e.g. SandboxRecord.Properties)."
+msgstr "可选的父级容器，用于记录级定义。应用级属性（如 SandboxRecord.Properties）请留空。"
+
+#: web/views/SandboxPropertyDefinitionFormView.vue:15
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Properties Field"
+msgstr "属性字段"
+
+#: web/views/sandbox_property_definition_actions.ts:11
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Property Definition"
+msgstr "属性定义"
+
+#: web/views/SandboxPropertyDefinitionFormView.vue:21
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Required"
+msgstr "必填"
+
+#: web/views/SandboxPropertyDefinitionFormView.vue:9
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Scope"
+msgstr "作用域"
+
+#: web/views/SandboxPropertyDefinitionFormView.vue:12
+msgctxt "web/views/SandboxPropertyDefinitionFormView"
+msgid "Target Model"
+msgstr "目标模型"
+
+#: web/views/SandboxPropertyDefinitionListView.vue:11
+msgctxt "web/views/SandboxPropertyDefinitionListView"
+msgid "Container Id"
+msgstr "容器 ID"
+
+#: web/views/SandboxPropertyDefinitionListView.vue:10
+msgctxt "web/views/SandboxPropertyDefinitionListView"
+msgid "Container Model"
+msgstr "容器模型"
+
+#: web/views/SandboxPropertyDefinitionListView.vue:12
+msgctxt "web/views/SandboxPropertyDefinitionListView"
+msgid "Definition"
+msgstr "定义"
+
+#: web/views/SandboxPropertyDefinitionListView.vue:9
+msgctxt "web/views/SandboxPropertyDefinitionListView"
+msgid "Properties Field"
+msgstr "属性字段"
+
+#: web/views/SandboxPropertyDefinitionListView.vue:8
+msgctxt "web/views/SandboxPropertyDefinitionListView"
+msgid "Target Model"
+msgstr "目标模型"
+
 #: web/views/SandboxRecordChartView.vue:43
 msgctxt "web/views/SandboxRecordChartView"
 msgid "Chart View"
@@ -806,11 +916,6 @@ msgctxt "web/views/SandboxRecordListView"
 msgid "View switcher"
 msgstr "视图切换"
 
-#: web/views/SandboxRecordPropertiesDefinitionView.vue:5
-msgctxt "web/views/SandboxRecordPropertiesDefinitionView"
-msgid "Edit the app-level schema for SandboxRecord.Properties. Labels support multiple languages; use Translate next to each label (and selection options) before Save."
-msgstr "编辑 SandboxRecord.Properties 的应用级 schema。标签支持多语言；请在保存前使用每项标签（及选项）旁的「翻译」。"
-
 #: web/views/sandbox_tag_actions.ts:10
 msgctxt "web/views/SandboxTagFormView"
 msgid "Copy Sandbox Tag"
@@ -858,6 +963,10 @@ msgstr "标签"
 #~ msgid "Add Line"
 #~ msgstr "添加明细"
 
+#~ msgctxt "web/views/SandboxRecordPropertiesDefinitionView"
+#~ msgid "Edit the app-level schema for SandboxRecord.Properties. Labels support multiple languages; use Translate next to each label (and selection options) before Save."
+#~ msgstr "编辑 SandboxRecord.Properties 的应用级 schema。标签支持多语言；请在保存前使用每项标签（及选项）旁的「翻译」。"
+
 #~ msgctxt "web/views/SandboxTagListView"
 #~ msgid "Copy Sandbox Tag"
 #~ msgstr "复制沙箱标签"
@@ -877,3 +986,4 @@ msgstr "标签"
 #~ msgctxt "web/views/SandboxTagListView"
 #~ msgid "Sandbox Tag"
 #~ msgstr "沙箱标签"
+
diff --git a/modules/sandbox/web/__tests__/lt_titles.test.ts b/modules/sandbox/web/__tests__/lt_titles.test.ts
index b9205b50c..9a6a0bbc2 100644
--- a/modules/sandbox/web/__tests__/lt_titles.test.ts
+++ b/modules/sandbox/web/__tests__/lt_titles.test.ts
@@ -30,8 +30,8 @@ test('sandbox route titles: list route pins pageTitleText', () => {
   expect(list.meta?.pageTitleText).toEqual(listRouteTitle);
 });
 
-test('sandbox route titles: record properties configuration pins pageTitleText', () => {
-  const route = sandboxRoutes.find(r => r.name === 'SandboxRecordProperties') as any;
+test('sandbox route titles: PropertyDefinition list pins pageTitleText', () => {
+  const route = sandboxRoutes.find(r => r.name === 'SandboxPropertyDefinitionList') as any;
   expect(route).toBeTruthy();
   expect(route.meta?.pageTitle).toBe('Record Properties');
   expect(route.meta?.pageTitleText).toEqual(recordPropertiesRouteTitle);
diff --git a/modules/sandbox/web/__tests__/resourceWiring.test.ts b/modules/sandbox/web/__tests__/resourceWiring.test.ts
index 26afaae0d..ed6778dbd 100644
--- a/modules/sandbox/web/__tests__/resourceWiring.test.ts
+++ b/modules/sandbox/web/__tests__/resourceWiring.test.ts
@@ -86,8 +86,12 @@ test('sandbox resource wiring: list/kanban/chart routes expose view switcher met
   });
 });
 
-test('sandbox resource wiring: record properties configuration route', () => {
+test('sandbox resource wiring: PropertyDefinition List→Form routes', () => {
   const byName = Object.fromEntries(sandboxRoutes.map(route => [String(route.name), route]));
-  expect(byName.SandboxRecordProperties?.path).toBe('sandbox/configuration/record-properties');
-  expect(byName.SandboxRecordProperties?.meta).toMatchObject({ requiresAuth: true });
+  expect(byName.SandboxPropertyDefinitionList?.path).toBe('sandbox/configuration/record-properties');
+  expect(byName.SandboxPropertyDefinitionCreate?.path).toBe('sandbox/configuration/record-properties/new');
+  expect(byName.SandboxPropertyDefinitionDetail?.path).toBe('sandbox/configuration/record-properties/:id');
+  expect(byName.SandboxPropertyDefinitionList?.meta).toMatchObject({ requiresAuth: true });
+  expect(byName.SandboxPropertyDefinitionCreate?.meta).toMatchObject({ requiresAuth: true });
+  expect(byName.SandboxPropertyDefinitionDetail?.meta).toMatchObject({ requiresAuth: true });
 });
diff --git a/modules/sandbox/web/pages/SandboxPropertyDefinition.vue b/modules/sandbox/web/pages/SandboxPropertyDefinition.vue
new file mode 100644
index 000000000..61aacabc7
--- /dev/null
+++ b/modules/sandbox/web/pages/SandboxPropertyDefinition.vue
@@ -0,0 +1,37 @@
+<!--
+SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
+SPDX-License-Identifier: Apache-2.0
+-->
+
+<template>
+  <ChoyPage :store="definitionStore">
+    <SandboxPropertyDefinitionFormView
+      :initial-values="initialValues"
+      :create-action="'/sandbox/configuration/record-properties/new'"
+    />
+  </ChoyPage>
+</template>
+
+<script setup lang="ts">
+import { useRoute } from 'vue-router';
+import { createStoreByModel } from '@/web/web/stores/registry';
+import { useScopeManager } from '@/web/web/stores/storeScopeManager';
+import { ChoyPage } from '@/web';
+import SandboxPropertyDefinitionFormView from '../views/SandboxPropertyDefinitionFormView.vue';
+
+defineOptions({ name: 'SandboxPropertyDefinitionPage' });
+
+const route = useRoute();
+const definitionStore = createStoreByModel('sandbox.PropertyDefinition', {
+  storeId: `SandboxPropertyDefinition_${route.fullPath}`,
+  scopeManager: useScopeManager().menuScopeManager,
+});
+
+const initialValues: Record<string, unknown> = {
+  TargetModel: 'SandboxRecord',
+  PropertiesField: 'Properties',
+  ContainerModel: null,
+  ContainerId: null,
+  Definition: [],
+};
+</script>
diff --git a/modules/sandbox/web/pages/SandboxPropertyDefinitionList.vue b/modules/sandbox/web/pages/SandboxPropertyDefinitionList.vue
new file mode 100644
index 000000000..75d742945
--- /dev/null
+++ b/modules/sandbox/web/pages/SandboxPropertyDefinitionList.vue
@@ -0,0 +1,28 @@
+<!--
+SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
+SPDX-License-Identifier: Apache-2.0
+-->
+
+<template>
+  <ChoyPage :title="pageTitle" :store="definitionStore">
+    <SandboxPropertyDefinitionListView />
+  </ChoyPage>
+</template>
+
+<script setup lang="ts">
+import { createStoreByModel } from '@/web/web/stores/registry';
+import { useScopeManager } from '@/web/web/stores/storeScopeManager';
+import { createTranslate } from '@/web/web/i18n';
+import { ChoyPage } from '@/web';
+import SandboxPropertyDefinitionListView from '../views/SandboxPropertyDefinitionListView.vue';
+
+defineOptions({ name: 'SandboxPropertyDefinitionListPage' });
+
+const { _t } = createTranslate('sandbox', { scope: 'web/pages/SandboxPropertyDefinitionList' });
+const pageTitle = _t('Record Properties');
+
+const definitionStore = createStoreByModel('sandbox.PropertyDefinition', {
+  storeId: 'SandboxPropertyDefinition_List',
+  scopeManager: useScopeManager().menuScopeManager,
+});
+</script>
diff --git a/modules/sandbox/web/pages/SandboxRecordProperties.vue b/modules/sandbox/web/pages/SandboxRecordProperties.vue
deleted file mode 100644
index efb3649a8..000000000
--- a/modules/sandbox/web/pages/SandboxRecordProperties.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
-SPDX-License-Identifier: Apache-2.0
--->
-
-<template>
-  <ChoyPage>
-    <SandboxRecordPropertiesDefinitionView />
-  </ChoyPage>
-</template>
-
-<script setup lang="ts">
-import { ChoyPage } from '@/web';
-import SandboxRecordPropertiesDefinitionView from '../views/SandboxRecordPropertiesDefinitionView.vue';
-
-defineOptions({ name: 'SandboxRecordPropertiesPage' });
-</script>
diff --git a/modules/sandbox/web/pages/page_mount_coverage.test.ts b/modules/sandbox/web/pages/page_mount_coverage.test.ts
index 72c2810bd..0feb350bb 100644
--- a/modules/sandbox/web/pages/page_mount_coverage.test.ts
+++ b/modules/sandbox/web/pages/page_mount_coverage.test.ts
@@ -8,7 +8,8 @@ import SandboxRecordList from './SandboxRecordList.vue';
 import SandboxRecordKanban from './SandboxRecordKanban.vue';
 import SandboxRecordChart from './SandboxRecordChart.vue';
 import SandboxTag from './SandboxTag.vue';
-import SandboxRecordProperties from './SandboxRecordProperties.vue';
+import SandboxPropertyDefinitionList from './SandboxPropertyDefinitionList.vue';
+import SandboxPropertyDefinition from './SandboxPropertyDefinition.vue';
 import { sandboxMenus } from '../menu/menus';
 
 const pages: Array<[string, any, string]> = [
@@ -17,7 +18,8 @@ const pages: Array<[string, any, string]> = [
   ['SandboxRecordChart', SandboxRecordChart, '/sandbox/records/chart'],
   ['SandboxRecord', SandboxRecord, '/sandbox/records/1'],
   ['SandboxTag', SandboxTag, '/sandbox/tags/new'],
-  ['SandboxRecordProperties', SandboxRecordProperties, '/sandbox/configuration/record-properties'],
+  ['SandboxPropertyDefinitionList', SandboxPropertyDefinitionList, '/sandbox/configuration/record-properties'],
+  ['SandboxPropertyDefinition', SandboxPropertyDefinition, '/sandbox/configuration/record-properties/new'],
 ];
 
 test('sandbox page mount: every ChoyPage host mounts under choysumMount', async () => {
diff --git a/modules/sandbox/web/route/routes.ts b/modules/sandbox/web/route/routes.ts
index db60a9eae..0682b0edc 100644
--- a/modules/sandbox/web/route/routes.ts
+++ b/modules/sandbox/web/route/routes.ts
@@ -135,14 +135,48 @@ export const sandboxRoutes: RouteRecordRaw[] = [
     ],
     meta: { requiresAuth: true },
   }),
-  // App-level PropertyDefinition editor for SandboxRecord.Properties (label i18n UX).
+  // PropertyDefinition List → Form (Definition edited via ChoyPropertiesDefinitionField).
   // Write ACL comes from platform PropertyDefinition logical packs (auth RMA/RFR).
-  defineRoute('sandbox.route.record_properties', {
+  defineRoute('sandbox.route.property_definition_list', {
     sequence: 80,
     title: _lt('Record Properties'),
     path: 'sandbox/configuration/record-properties',
-    name: 'SandboxRecordProperties',
-    component: () => import('../pages/SandboxRecordProperties.vue'),
+    name: 'SandboxPropertyDefinitionList',
+    component: () => import('../pages/SandboxPropertyDefinitionList.vue'),
+    actions: [
+      'sandbox.action.property_definition_create',
+      'sandbox.action.property_definition_edit',
+      'sandbox.action.property_definition_delete',
+      'sandbox.action.property_definition_copy',
+    ],
+    meta: { requiresAuth: true },
+  }),
+  defineRoute('sandbox.route.property_definition_create', {
+    sequence: 81,
+    title: _lt('New Property Definition'),
+    path: 'sandbox/configuration/record-properties/new',
+    name: 'SandboxPropertyDefinitionCreate',
+    component: () => import('../pages/SandboxPropertyDefinition.vue'),
+    actions: [
+      'sandbox.action.property_definition_create',
+      'sandbox.action.property_definition_edit',
+      'sandbox.action.property_definition_delete',
+      'sandbox.action.property_definition_copy',
+    ],
+    meta: { requiresAuth: true },
+  }),
+  defineRoute('sandbox.route.property_definition_detail', {
+    sequence: 82,
+    title: _lt('Property Definition'),
+    path: 'sandbox/configuration/record-properties/:id',
+    name: 'SandboxPropertyDefinitionDetail',
+    component: () => import('../pages/SandboxPropertyDefinition.vue'),
+    actions: [
+      'sandbox.action.property_definition_create',
+      'sandbox.action.property_definition_edit',
+      'sandbox.action.property_definition_delete',
+      'sandbox.action.property_definition_copy',
+    ],
     meta: { requiresAuth: true },
   }),
 ];
diff --git a/modules/sandbox/web/views/SandboxPropertyDefinitionFormView.vue b/modules/sandbox/web/views/SandboxPropertyDefinitionFormView.vue
new file mode 100644
index 000000000..ba969cdc4
--- /dev/null
+++ b/modules/sandbox/web/views/SandboxPropertyDefinitionFormView.vue
@@ -0,0 +1,102 @@
+<!--
+SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
+SPDX-License-Identifier: Apache-2.0
+-->
+
+<template>
+  <ChoyFormView
+    v-bind="{ store, recordId, initialValues, viewMode, showHeader, createAction }"
+    :action-ids="{
+      create: propertyDefinitionActions.create,
+      edit: propertyDefinitionActions.edit,
+      copy: propertyDefinitionActions.copy,
+      delete: propertyDefinitionActions.delete,
+    }"
+    :has-action="hasAction"
+    v-on="$attrs"
+  >
+    <div data-anchor="choy.form.sheet" class="min-h-full">
+      <ChoySection :title="_t('Scope')">
+        <ChoyGrid :cols="12">
+          <ChoyCol :span="6">
+            <ChoyVarcharField
+              :store="store"
+              prop="TargetModel"
+              :label="_t('Target Model')"
+              :rules="requiredRules"
+            />
+          </ChoyCol>
+          <ChoyCol :span="6">
+            <ChoyVarcharField
+              :store="store"
+              prop="PropertiesField"
+              :label="_t('Properties Field')"
+              :rules="requiredRules"
+            />
+          </ChoyCol>
+          <ChoyCol :span="6">
+            <ChoyVarcharField
+              :store="store"
+              prop="ContainerModel"
+              :label="_t('Container Model')"
+            />
+          </ChoyCol>
+          <ChoyCol :span="6">
+            <ChoyVarcharField
+              :store="store"
+              prop="ContainerId"
+              :label="_t('Container Id')"
+            />
+          </ChoyCol>
+        </ChoyGrid>
+      </ChoySection>
+
+      <ChoySection :title="_t('Definition')" class="mt-6">
+        <ChoyPropertiesDefinitionField :store="store" prop="Definition" hide-label />
+      </ChoySection>
+    </div>
+  </ChoyFormView>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+import type { RouteLocationRaw } from 'vue-router';
+import type { WebModelStore } from '@/web/web/stores/modelStore';
+import { usePermission } from '@/auth/web/composables/usePermission';
+import { resolvePageStore } from '@/web/web/composables/usePageContext';
+import { createTranslate } from '@/web/web/i18n';
+import {
+  ChoyCol,
+  ChoyFormView,
+  ChoyGrid,
+  ChoyPropertiesDefinitionField,
+  ChoySection,
+  ChoyVarcharField,
+  type ChoyViewMode as ViewMode,
+} from '@/web';
+import { sandboxPropertyDefinitionActions } from './sandbox_property_definition_actions';
+
+defineOptions({ name: 'SandboxPropertyDefinitionFormView', inheritAttrs: true });
+const { _t } = createTranslate('sandbox', { scope: 'web/views/SandboxPropertyDefinitionFormView' });
+const requiredRules = computed(() => [{ required: true, message: _t('Required') }]);
+
+const props = withDefaults(
+  defineProps<{
+    store?: WebModelStore<any>;
+    recordId?: string;
+    initialValues?: Record<string, unknown>;
+    viewMode?: ViewMode;
+    showHeader?: boolean;
+    createAction?: string | RouteLocationRaw;
+  }>(),
+  {
+    showHeader: true,
+    createAction: undefined,
+  },
+);
+
+const propertyDefinitionActions = sandboxPropertyDefinitionActions;
+const { hasAction } = usePermission();
+const store = resolvePageStore(props.store, 'SandboxPropertyDefinitionFormView');
+const { recordId, initialValues, viewMode, showHeader, createAction } = props;
+</script>
diff --git a/modules/sandbox/web/views/SandboxPropertyDefinitionListView.vue b/modules/sandbox/web/views/SandboxPropertyDefinitionListView.vue
new file mode 100644
index 000000000..0980e4f2a
--- /dev/null
+++ b/modules/sandbox/web/views/SandboxPropertyDefinitionListView.vue
@@ -0,0 +1,92 @@
+<!--
+SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
+SPDX-License-Identifier: Apache-2.0
+-->
+
+<template>
+  <ChoyListView
+    ref="listRef"
+    v-bind="$attrs"
+    :store="store"
+    :searchView="ChoySearchView"
+    create-action="/sandbox/configuration/record-properties/new"
+    :action-ids="{
+      create: propertyDefinitionActions.create,
+      delete: propertyDefinitionActions.delete,
+    }"
+    :has-action="hasAction"
+    @row-click="onRowClick"
+  >
+    <ChoyTableColumn type="selection" :vColumnProps="{ align: 'center' }" />
+    <ChoyTableColumn type="index" :vColumnProps="{ align: 'end' }" />
+    <ChoyVarcharField
+      :store="store"
+      prop="TargetModel"
+      :label="_t('Target Model')"
+      :vColumnProps="{ minWidth: 140 }"
+    />
+    <ChoyVarcharField
+      :store="store"
+      prop="PropertiesField"
+      :label="_t('Properties Field')"
+      :vColumnProps="{ minWidth: 140 }"
+    />
+    <ChoyVarcharField
+      :store="store"
+      prop="ContainerModel"
+      :label="_t('Container Model')"
+      :vColumnProps="{ minWidth: 140 }"
+    />
+    <ChoyVarcharField
+      :store="store"
+      prop="ContainerId"
+      :label="_t('Container Id')"
+      :vColumnProps="{ minWidth: 120 }"
+    />
+    <ChoyPropertiesDefinitionField
+      :store="store"
+      prop="Definition"
+      :label="_t('Definition')"
+      :vColumnProps="{ minWidth: 180 }"
+    />
+  </ChoyListView>
+</template>
+
+<script setup lang="ts">
+import { useRouter } from 'vue-router';
+import type { WebModelStore } from '@/web/web/stores/modelStore';
+import { useListViewExpose } from '@/web/web/composables/useListView';
+import { resolvePageStore } from '@/web/web/composables/usePageContext';
+import { usePermission } from '@/auth/web/composables/usePermission';
+import { createTranslate } from '@/web/web/i18n';
+import {
+  ChoyListView,
+  ChoyPropertiesDefinitionField,
+  ChoySearchView,
+  ChoyTableColumn,
+  ChoyVarcharField,
+  type RowEventPayload,
+} from '@/web';
+import { sandboxPropertyDefinitionActions } from './sandbox_property_definition_actions';
+
+defineOptions({ name: 'SandboxPropertyDefinitionListView', inheritAttrs: true });
+const { _t } = createTranslate('sandbox', { scope: 'web/views/SandboxPropertyDefinitionListView' });
+
+const router = useRouter();
+
+const props = defineProps<{
+  store?: WebModelStore<any>;
+}>();
+const store = resolvePageStore(props.store, 'SandboxPropertyDefinitionListView');
+
+const propertyDefinitionActions = sandboxPropertyDefinitionActions;
+const { hasAction } = usePermission();
+
+function onRowClick(payload: RowEventPayload) {
+  const id = String(payload.row?.Id ?? '').trim();
+  if (id) router.push(`/sandbox/configuration/record-properties/${id}`);
+}
+
+const { listRef, expose } = useListViewExpose<any>();
+defineExpose(expose);
+</script>
diff --git a/modules/sandbox/web/views/SandboxRecordPropertiesDefinitionView.vue b/modules/sandbox/web/views/SandboxRecordPropertiesDefinitionView.vue
deleted file mode 100644
index 49a7ff45e..000000000
--- a/modules/sandbox/web/views/SandboxRecordPropertiesDefinitionView.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
-SPDX-License-Identifier: Apache-2.0
--->
-
-<template>
-  <div
-    class="sandbox-record-properties-definition flex w-full flex-col gap-3"
-    data-testid="sandbox-record-properties-definition"
-  >
-    <p class="m-0 max-w-3xl text-sm text-muted-foreground">
-      {{
-        _t(
-          'Edit the app-level schema for SandboxRecord.Properties. Labels support multiple languages; use Translate next to each label (and selection options) before Save.',
-        )
-      }}
-    </p>
-    <ChoyPropertiesDefinitionEditor
-      application="sandbox"
-      target-model="SandboxRecord"
-      properties-field="Properties"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ChoyPropertiesDefinitionEditor } from '@/web';
-import { createTranslate } from '@/web/web/i18n';
-
-defineOptions({ name: 'SandboxRecordPropertiesDefinitionView' });
-
-const { _t } = createTranslate('sandbox', {
-  scope: 'web/views/SandboxRecordPropertiesDefinitionView',
-});
-</script>
diff --git a/modules/sandbox/web/views/sandbox_property_definition_actions.ts b/modules/sandbox/web/views/sandbox_property_definition_actions.ts
new file mode 100644
index 000000000..bfa39bbe8
--- /dev/null
+++ b/modules/sandbox/web/views/sandbox_property_definition_actions.ts
@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
+// SPDX-License-Identifier: Apache-2.0
+
+import { defineModelActions } from '@/core/web/resource';
+import { createTranslate } from '@/web/web/i18n';
+
+const { _lt } = createTranslate('sandbox', { scope: 'web/views/SandboxPropertyDefinitionFormView' });
+
+/** Standard CRUD action ids for sandbox.PropertyDefinition (C2-injected logical model). */
+export const sandboxPropertyDefinitionActions = defineModelActions('sandbox.PropertyDefinition', {
+  entityTitle: _lt('Property Definition'),
+});
diff --git a/modules/web/i18n/web.pot b/modules/web/i18n/web.pot
index 250636bd5..5548299f4 100644
--- a/modules/web/i18n/web.pot
+++ b/modules/web/i18n/web.pot
@@ -848,74 +848,172 @@ msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "View record"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:8
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
-msgid "Add property"
+#: web/components/field/ChoyPropertiesDefinitionField.vue:279
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
+msgid "%s properties"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:38
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
-msgid "Default"
+#: web/components/field/ChoyPropertiesDefinitionField.vue:281
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
+msgid "%s properties (%s, …)"
+msgstr ""
+
+#: web/components/field/ChoyPropertiesDefinitionField.vue:9
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
+msgid "Add a line…"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:183
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:193
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:33
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#: web/components/field/ChoyPropertiesDefinitionField.vue:16
+#: web/components/field/ChoyPropertiesDefinitionField.vue:9
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
+msgid "Edit"
+msgstr ""
+
+#: web/components/field/ChoyPropertiesDefinitionField.vue:16
+#: web/components/field/ChoyPropertiesDefinitionField.vue:9
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "Label"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:23
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#: web/components/field/ChoyPropertiesDefinitionField.vue:16
+#: web/components/field/ChoyPropertiesDefinitionField.vue:9
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "Name"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:19
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#: web/components/field/ChoyPropertiesDefinitionField.vue:275
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
+msgid "No properties"
+msgstr ""
+
+#: web/components/field/ChoyPropertiesDefinitionField.vue:16
+#: web/components/field/ChoyPropertiesDefinitionField.vue:9
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "No properties defined"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:126
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:221
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
-msgid "PropertyDefinition store is unavailable"
+#: web/components/field/ChoyPropertiesDefinitionField.vue:16
+#: web/components/field/ChoyPropertiesDefinitionField.vue:9
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
+msgid "Remove"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:41
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
-msgid "Readonly"
+#: web/components/field/ChoyPropertiesDefinitionField.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
+msgid "Reorder"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:51
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
-msgid "Remove"
+#: web/components/field/ChoyPropertiesDefinitionField.vue:16
+#: web/components/field/ChoyPropertiesDefinitionField.vue:9
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
+msgid "Type"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:5
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
-msgid "Save"
+#: web/components/field/ChoyPropertiesDefinitionField.vue:16
+#: web/components/field/ChoyPropertiesDefinitionField.vue:9
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
+msgid "View"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:43
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
-msgid "Selection JSON"
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Cancel"
+msgstr ""
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Default"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:35
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
-msgid "Translate"
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Edit property: %s"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:46
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
-msgid "Translate %s"
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Label"
+msgstr ""
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Name"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:25
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Name is required"
+msgstr ""
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "New property"
+msgstr ""
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Property"
+msgstr ""
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Property: %s"
+msgstr ""
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Readonly"
+msgstr ""
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Save"
+msgstr ""
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Translate label"
+msgstr ""
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Type"
 msgstr ""
 
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
+msgid "Add a line…"
+msgstr ""
+
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
+msgid "Delete"
+msgstr ""
+
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
+msgid "Label"
+msgstr ""
+
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
+msgid "No options"
+msgstr ""
+
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
+msgid "Reorder"
+msgstr ""
+
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
+msgid "Translate option"
+msgstr ""
+
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
+msgid "Value"
+msgstr ""
 #: web/components/field/ChoyPropertiesField.vue:243
 msgctxt "web/components/field/ChoyPropertiesField"
 msgid "+%s more"
diff --git a/modules/web/i18n/zh_CN.po b/modules/web/i18n/zh_CN.po
index df862f93a..14e0999a8 100644
--- a/modules/web/i18n/zh_CN.po
+++ b/modules/web/i18n/zh_CN.po
@@ -826,71 +826,165 @@ msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "View record"
 msgstr "查看记录"
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:8
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
-msgid "Add property"
-msgstr "添加属性"
+#: web/components/field/ChoyPropertiesDefinitionField.vue:279
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
+msgid "%s properties"
+msgstr "%s 个属性"
+
+#: web/components/field/ChoyPropertiesDefinitionField.vue:281
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
+msgid "%s properties (%s, …)"
+msgstr "%s 个属性（%s，…）"
+
+#: web/components/field/ChoyPropertiesDefinitionField.vue:9
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
+msgid "Add a line…"
+msgstr "添加一行…"
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:38
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
-msgid "Default"
-msgstr "默认"
+#: web/components/field/ChoyPropertiesDefinitionField.vue:16 web/components/field/ChoyPropertiesDefinitionField.vue:9
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
+msgid "Edit"
+msgstr "编辑"
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:183 web/components/field/ChoyPropertiesDefinitionEditor.vue:193 web/components/field/ChoyPropertiesDefinitionEditor.vue:33
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#: web/components/field/ChoyPropertiesDefinitionField.vue:16 web/components/field/ChoyPropertiesDefinitionField.vue:9
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "Label"
 msgstr "标签"
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:23
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#: web/components/field/ChoyPropertiesDefinitionField.vue:16 web/components/field/ChoyPropertiesDefinitionField.vue:9
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "Name"
 msgstr "名称"
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:19
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#: web/components/field/ChoyPropertiesDefinitionField.vue:275
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
+msgid "No properties"
+msgstr "无属性"
+
+#: web/components/field/ChoyPropertiesDefinitionField.vue:16 web/components/field/ChoyPropertiesDefinitionField.vue:9
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "No properties defined"
-msgstr "未定义属性"
+msgstr "尚未定义属性"
+
+#: web/components/field/ChoyPropertiesDefinitionField.vue:16 web/components/field/ChoyPropertiesDefinitionField.vue:9
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
+msgid "Remove"
+msgstr "移除"
+
+#: web/components/field/ChoyPropertiesDefinitionField.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
+msgid "Reorder"
+msgstr "调整顺序"
+
+#: web/components/field/ChoyPropertiesDefinitionField.vue:16 web/components/field/ChoyPropertiesDefinitionField.vue:9
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
+msgid "Type"
+msgstr "类型"
+
+#: web/components/field/ChoyPropertiesDefinitionField.vue:16 web/components/field/ChoyPropertiesDefinitionField.vue:9
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
+msgid "View"
+msgstr "查看"
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Cancel"
+msgstr "取消"
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Default"
+msgstr "默认值"
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Edit property: %s"
+msgstr "编辑属性：%s"
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Label"
+msgstr "标签"
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Name"
+msgstr "名称"
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:126 web/components/field/ChoyPropertiesDefinitionEditor.vue:221
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
-msgid "PropertyDefinition store is unavailable"
-msgstr "PropertyDefinition 存储不可用"
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Name is required"
+msgstr "名称为必填项"
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:41
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "New property"
+msgstr "新建属性"
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Property"
+msgstr "属性"
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Property: %s"
+msgstr "属性：%s"
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Readonly"
 msgstr "只读"
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:51
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
-msgid "Remove"
-msgstr "移除"
-
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:5
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Save"
 msgstr "保存"
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:43
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
-msgid "Selection JSON"
-msgstr "选择项 JSON"
-
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:35
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
-msgid "Translate"
-msgstr "翻译"
-
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:46
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
-msgid "Translate %s"
-msgstr "翻译 %s"
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Translate label"
+msgstr "翻译标签"
 
-#: web/components/field/ChoyPropertiesDefinitionEditor.vue:25
-msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Type"
 msgstr "类型"
 
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
+msgid "Add a line…"
+msgstr "添加一行…"
+
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
+msgid "Delete"
+msgstr "删除"
+
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
+msgid "Label"
+msgstr "标签"
+
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
+msgid "No options"
+msgstr "暂无选项"
+
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
+msgid "Reorder"
+msgstr "调整顺序"
+
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
+msgid "Translate option"
+msgstr "翻译选项"
+
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
+msgid "Value"
+msgstr "值"
 #: web/components/field/ChoyPropertiesField.vue:243
 msgctxt "web/components/field/ChoyPropertiesField"
 msgid "+%s more"
@@ -2666,6 +2760,70 @@ msgstr "页面"
 #~ msgid "New"
 #~ msgstr "新建"
 
+#~ msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#~ msgid "Add property"
+#~ msgstr "添加属性"
+
+#~ msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#~ msgid "Default"
+#~ msgstr "默认"
+
+#~ msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#~ msgid "Label"
+#~ msgstr "标签"
+
+#~ msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#~ msgid "Name"
+#~ msgstr "名称"
+
+#~ msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#~ msgid "No properties defined"
+#~ msgstr "未定义属性"
+
+#~ msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#~ msgid "PropertyDefinition store is unavailable"
+#~ msgstr "PropertyDefinition 存储不可用"
+
+#~ msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#~ msgid "Readonly"
+#~ msgstr "只读"
+
+#~ msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#~ msgid "Remove"
+#~ msgstr "移除"
+
+#~ msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#~ msgid "Save"
+#~ msgstr "保存"
+
+#~ msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#~ msgid "Selection JSON"
+#~ msgstr "选择项 JSON"
+
+#~ msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#~ msgid "Translate"
+#~ msgstr "翻译"
+
+#~ msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#~ msgid "Translate %s"
+#~ msgstr "翻译 %s"
+
+#~ msgctxt "web/components/field/ChoyPropertiesDefinitionEditor"
+#~ msgid "Type"
+#~ msgstr "类型"
+
+#~ msgctxt "web/components/field/ChoyPropertiesDefinitionField"
+#~ msgid "Add property"
+#~ msgstr "添加属性"
+
+#~ msgctxt "web/components/field/ChoyPropertiesDefinitionField"
+#~ msgid "Translate label"
+#~ msgstr "翻译标签"
+
+#~ msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+#~ msgid "Translate"
+#~ msgstr "翻译"
+
 #~ msgctxt "web/components/field/ChoyTextField"
 #~ msgid "No content"
 #~ msgstr "无内容"
@@ -2889,3 +3047,4 @@ msgstr "页面"
 #~ msgctxt "web/composables/useMenu"
 #~ msgid "No menus available"
 #~ msgstr "暂无可用菜单"
+
diff --git a/modules/web/web/components/field/ChoyOneToManyKanbanField.vue b/modules/web/web/components/field/ChoyOneToManyKanbanField.vue
index c2af6e6e2..44cd5e3f8 100644
--- a/modules/web/web/components/field/ChoyOneToManyKanbanField.vue
+++ b/modules/web/web/components/field/ChoyOneToManyKanbanField.vue
@@ -64,7 +64,7 @@ SPDX-License-Identifier: Apache-2.0
             <template #card="{ item, index }">
               <div
                 class="choy-o2m-kanban-card group/card relative cursor-pointer rounded-md border border-border bg-card p-3 shadow-xs outline-none transition-colors hover:bg-accent/40"
-                :class="{ 'opacity-60': sortableEnabled && kanbanReorder.draggingIndex.value === index }"
+                :class="kanbanCardDragClass(index)"
                 data-testid="choy-o2m-kanban-card"
                 role="button"
                 tabindex="0"
@@ -290,7 +290,10 @@ import { useField } from '@/web/web/composables/useField';
 import type { UseField } from '@/web/web/composables/useField';
 import { createTranslate } from '@/web/web/i18n';
 import { hasHandleField } from '@/web/web/composables/listRowEdit';
-import { useListHandleReorder } from '@/web/web/composables/useListHandleReorder';
+import {
+  setHtml5DragImage,
+  useListHandleReorder,
+} from '@/web/web/composables/useListHandleReorder';
 import { formatRelationCountSummary } from './relationCountSummary';
 
 const { _t } = createTranslate('web', { scope: 'web/components/field/ChoyOneToManyKanbanField' });
@@ -517,18 +520,24 @@ function kanbanItemKey(item: unknown, index: number): string {
   return String(readRowKeySeed(item) ?? index);
 }
 
+function kanbanCardDragClass(index: number): Record<string, boolean> {
+  if (!sortableEnabled.value) return {};
+  const dragging = kanbanReorder.draggingIndex.value;
+  const over = kanbanReorder.overIndex.value;
+  return {
+    'opacity-60': dragging === index,
+    'bg-accent/40 ring-1 ring-inset ring-primary/30':
+      dragging != null && over === index && over !== dragging,
+  };
+}
+
 /** Snapshot drag image from the card node so virtual recycle does not blank it. */
 function onKanbanDragStart(index: number, event: DragEvent) {
   kanbanReorder.onDragStart(index, event);
   const handle = event.currentTarget;
   const card =
     handle instanceof HTMLElement ? handle.closest('[data-testid=choy-o2m-kanban-card]') : null;
-  if (card instanceof HTMLElement && event.dataTransfer) {
-    const rect = card.getBoundingClientRect();
-    const offsetX = Math.max(0, Math.min(rect.width, event.clientX - rect.left));
-    const offsetY = Math.max(0, Math.min(rect.height, event.clientY - rect.top));
-    event.dataTransfer.setDragImage(card, offsetX, offsetY);
-  }
+  if (card instanceof HTMLElement) setHtml5DragImage(card, event);
 }
 
 const dialogVisible = ref(false);
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionEditor.test.ts b/modules/web/web/components/field/ChoyPropertiesDefinitionEditor.test.ts
deleted file mode 100644
index 124ecdc02..000000000
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionEditor.test.ts
+++ /dev/null
@@ -1,236 +0,0 @@
-// SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
-// SPDX-License-Identifier: Apache-2.0
-
-import { h, nextTick } from 'vue';
-
-import { flushPromises, fnRecorder, mountApp, restoreSfc, stubSfc } from '@/web/web/__tests__/mountApp';
-import ChoyButton from '@/web/web/components/layout/ChoyButton.vue';
-import ChoyPropertiesDefinitionEditor from './ChoyPropertiesDefinitionEditor.vue';
-
-function installChoyButtonStub() {
-  stubSfc(ChoyButton as any, {
-    name: 'ChoyButton',
-    props: {
-      disabled: Boolean,
-      loading: Boolean,
-      type: String,
-      size: String,
-      variant: String,
-    },
-    emits: ['click'],
-    inheritAttrs: false,
-    setup(props: any, { emit, slots, attrs }: any) {
-      return () =>
-        h(
-          'button',
-          {
-            ...attrs,
-            type: 'button',
-            disabled: props.disabled || undefined,
-            'data-disabled': props.disabled ? '1' : '0',
-            onClick: (e: Event) => emit('click', e),
-          },
-          slots.default?.()
-        );
-    },
-  } as any);
-}
-
-function setInputValue(root: Element, selector: string, value: string) {
-  const el = root.querySelector(selector) as HTMLInputElement | HTMLTextAreaElement | null;
-  expect(el).toBeTruthy();
-  el!.value = value;
-  el!.dispatchEvent(new Event('input', { bubbles: true }));
-}
-
-describe('ChoyPropertiesDefinitionEditor', () => {
-  beforeEach(() => {
-    installChoyButtonStub();
-  });
-
-  afterEach(() => {
-    restoreSfc(ChoyButton as any);
-  });
-
-  test('Search loads drafts and Save updates by id', async () => {
-    const Search = fnRecorder(async () => [
-      {
-        Id: 'def-1',
-        Definition: [{ name: 'tax_id', type: 'char', string: 'Tax' }],
-      },
-    ]);
-    const UpdateById = fnRecorder(async () => ({ Id: 'def-1' }));
-    const Create = fnRecorder(async () => ({ Id: 'new' }));
-    const store = { Search, UpdateById, Create } as any;
-
-    const mounted = mountApp(ChoyPropertiesDefinitionEditor as any, {
-      props: {
-        application: 'partner',
-        targetModel: 'Partner',
-        propertiesField: 'PartnerProperties',
-        store,
-      },
-    });
-    try {
-      await flushPromises();
-      expect(Search.calls.length).toBeGreaterThan(0);
-      const andCond = (Search.calls[0]![0] as any).And;
-      expect(andCond).toEqual([
-        ['TargetModel', '=', 'Partner'],
-        ['PropertiesField', '=', 'PartnerProperties'],
-        ['ContainerModel', '=', null],
-        ['ContainerId', '=', null],
-      ]);
-      expect(mounted.q('[data-testid="choy-properties-definition-name"]')).toBeTruthy();
-
-      mounted.click('[data-testid="choy-properties-definition-save"]');
-      await flushPromises();
-      expect(UpdateById.calls.length).toBe(1);
-      expect(UpdateById.calls[0]![0]).toBe('def-1');
-      expect((UpdateById.calls[0]![1] as any).Definition[0].name).toBe('tax_id');
-      expect(Create.calls.length).toBe(0);
-    } finally {
-      mounted.unmount();
-    }
-  });
-
-  test('empty Search then Add+Save creates a parent-scoped definition', async () => {
-    const Search = fnRecorder(async () => []);
-    const Create = fnRecorder(async (vals: any) => ({ Id: 'new-1', ...vals }));
-    const UpdateById = fnRecorder(async () => ({}));
-    const store = { Search, Create, UpdateById } as any;
-
-    const mounted = mountApp(ChoyPropertiesDefinitionEditor as any, {
-      props: {
-        application: 'project',
-        targetModel: 'Task',
-        propertiesField: 'TaskProperties',
-        containerModel: 'Project',
-        containerId: 'proj-9',
-        store,
-      },
-    });
-    try {
-      await flushPromises();
-      expect(mounted.q('[data-testid="choy-properties-definition-empty"]')).toBeTruthy();
-
-      mounted.click('[data-testid="choy-properties-definition-add"]');
-      await nextTick();
-      setInputValue(mounted.el, '[data-testid="choy-properties-definition-name"]', 'prio');
-      mounted.click('[data-testid="choy-properties-definition-save"]');
-      await flushPromises();
-
-      expect(Create.calls.length).toBe(1);
-      const payload = Create.calls[0]![0] as any;
-      expect(payload.TargetModel).toBe('Task');
-      expect(payload.PropertiesField).toBe('TaskProperties');
-      expect(payload.ContainerModel).toBe('Project');
-      expect(payload.ContainerId).toBe('proj-9');
-      expect(payload.Definition[0].name).toBe('prio');
-      expect(UpdateById.calls.length).toBe(0);
-    } finally {
-      mounted.unmount();
-    }
-  });
-
-  test('readonly disables Save and Add via DOM', async () => {
-    const Search = fnRecorder(async () => [
-      { Id: 'r1', Definition: [{ name: 'a', type: 'char' }] },
-    ]);
-    const Create = fnRecorder(async () => ({}));
-    const UpdateById = fnRecorder(async () => ({}));
-    const store = { Search, Create, UpdateById } as any;
-
-    const mounted = mountApp(ChoyPropertiesDefinitionEditor as any, {
-      props: {
-        application: 'partner',
-        targetModel: 'Partner',
-        propertiesField: 'PartnerProperties',
-        readonly: true,
-        store,
-      },
-    });
-    try {
-      await flushPromises();
-      const save = mounted.q('[data-testid="choy-properties-definition-save"]') as HTMLButtonElement | null;
-      const add = mounted.q('[data-testid="choy-properties-definition-add"]') as HTMLButtonElement | null;
-      expect(save).toBeTruthy();
-      expect(add).toBeTruthy();
-      expect(save!.getAttribute('data-disabled')).toBe('1');
-      expect(add!.getAttribute('data-disabled')).toBe('1');
-      expect(Create.calls.length).toBe(0);
-      expect(UpdateById.calls.length).toBe(0);
-    } finally {
-      mounted.unmount();
-    }
-  });
-
-  test('selection type uses a textarea for Selection JSON', async () => {
-    const Search = fnRecorder(async () => [
-      {
-        Id: 'sel-1',
-        Definition: [{ name: 'prio', type: 'selection', selection: [['low', 'Low'], ['high', 'High']] }],
-      },
-    ]);
-    const store = {
-      Search,
-      UpdateById: fnRecorder(async () => ({})),
-      Create: fnRecorder(async () => ({})),
-    } as any;
-
-    const mounted = mountApp(ChoyPropertiesDefinitionEditor as any, {
-      props: {
-        application: 'partner',
-        targetModel: 'Partner',
-        propertiesField: 'PartnerProperties',
-        store,
-      },
-    });
-    try {
-      await flushPromises();
-      const el = mounted.q('[data-testid="choy-properties-definition-selection"]') as HTMLTextAreaElement | null;
-      expect(el).toBeTruthy();
-      expect(el!.tagName).toBe('TEXTAREA');
-      expect(el!.getAttribute('data-slot')).toBe('textarea');
-      expect(el!.value).toMatch(/low/);
-    } finally {
-      mounted.unmount();
-    }
-  });
-
-  test('Save surfaces invalid selection JSON without calling Update', async () => {
-    const Search = fnRecorder(async () => [
-      {
-        Id: 'sel-bad',
-        Definition: [{ name: 'prio', type: 'selection', selection: [['low', 'Low']] }],
-      },
-    ]);
-    const UpdateById = fnRecorder(async () => ({}));
-    const store = {
-      Search,
-      UpdateById,
-      Create: fnRecorder(async () => ({})),
-    } as any;
-
-    const mounted = mountApp(ChoyPropertiesDefinitionEditor as any, {
-      props: {
-        application: 'partner',
-        targetModel: 'Partner',
-        propertiesField: 'PartnerProperties',
-        store,
-      },
-    });
-    try {
-      await flushPromises();
-      setInputValue(mounted.el, '[data-testid="choy-properties-definition-selection"]', 'not-json');
-      mounted.click('[data-testid="choy-properties-definition-save"]');
-      await flushPromises();
-      const err = mounted.q('[data-testid="choy-properties-definition-save-error"]');
-      expect(err).toBeTruthy();
-      expect(err!.textContent || '').toMatch(/invalid JSON/);
-      expect(UpdateById.calls.length).toBe(0);
-    } finally {
-      mounted.unmount();
-    }
-  });
-});
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionEditor.vue b/modules/web/web/components/field/ChoyPropertiesDefinitionEditor.vue
deleted file mode 100644
index 3ce10ddc8..000000000
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionEditor.vue
+++ /dev/null
@@ -1,435 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
-SPDX-License-Identifier: Apache-2.0
--->
-
-<template>
-  <div
-    data-anchor="choy.properties-definition-editor"
-    class="choy-properties-definition-editor flex w-full flex-col gap-3"
-    data-testid="choy-properties-definition-editor"
-  >
-    <div class="flex flex-wrap items-center gap-2">
-      <ChoyButton
-        size="sm"
-        :disabled="readonly || saving || loading || !canSave"
-        data-testid="choy-properties-definition-save"
-        @click="onSave"
-      >
-        {{ _t('Save') }}
-      </ChoyButton>
-      <ChoyButton
-        size="sm"
-        variant="outline"
-        :disabled="readonly || saving || loading"
-        data-testid="choy-properties-definition-add"
-        @click="onAdd"
-      >
-        {{ _t('Add property') }}
-      </ChoyButton>
-      <span
-        v-if="loadError"
-        class="text-sm text-destructive"
-        data-testid="choy-properties-definition-error"
-      >
-        {{ loadError }}
-      </span>
-      <span
-        v-else-if="saveError"
-        class="text-sm text-destructive"
-        data-testid="choy-properties-definition-save-error"
-      >
-        {{ saveError }}
-      </span>
-    </div>
-
-    <div
-      v-if="!drafts.length"
-      class="text-sm text-muted-foreground"
-      data-testid="choy-properties-definition-empty"
-    >
-      {{ _t('No properties defined') }}
-    </div>
-
-    <div
-      v-for="(item, index) in drafts"
-      :key="index"
-      class="grid gap-2 rounded-md border border-border p-3 sm:grid-cols-2"
-      :data-index="index"
-    >
-      <Input
-        v-model="item.name"
-        class="w-full"
-        :disabled="readonly"
-        :placeholder="_t('Name')"
-        data-testid="choy-properties-definition-name"
-      />
-      <Select v-model="item.type" :disabled="readonly">
-        <SelectTrigger
-          class="w-full"
-          :placeholder="_t('Type')"
-          data-testid="choy-properties-definition-type"
-        />
-        <SelectContent>
-          <SelectItem v-for="t in typeOptions" :key="t" :value="t">
-            {{ t }}
-          </SelectItem>
-        </SelectContent>
-      </Select>
-      <div class="flex min-w-0 items-center gap-2">
-        <Input
-          v-model="item.string"
-          class="min-w-0 flex-1"
-          :disabled="readonly"
-          :placeholder="_t('Label')"
-          data-testid="choy-properties-definition-string"
-        />
-        <ChoyButton
-          size="sm"
-          variant="outline"
-          :disabled="readonly"
-          data-testid="choy-properties-definition-translate-string"
-          @click="openStringTranslate(index)"
-        >
-          {{ _t('Translate') }}
-        </ChoyButton>
-      </div>
-      <Input
-        v-model="item.default"
-        class="w-full"
-        :disabled="readonly"
-        :placeholder="_t('Default')"
-        data-testid="choy-properties-definition-default"
-      />
-      <label class="flex items-center gap-2 text-sm sm:col-span-2">
-        <Checkbox
-          :model-value="item.readonly"
-          :disabled="readonly"
-          data-testid="choy-properties-definition-readonly"
-          @update:model-value="item.readonly = $event === true"
-        />
-        {{ _t('Readonly') }}
-      </label>
-      <Textarea
-        v-if="item.type === 'selection'"
-        v-model="item.selectionText"
-        class="font-mono text-xs sm:col-span-2"
-        :rows="3"
-        :disabled="readonly"
-        :placeholder="_t('Selection JSON')"
-        data-testid="choy-properties-definition-selection"
-      />
-      <div v-if="item.type === 'selection'" class="flex flex-wrap gap-2 sm:col-span-2">
-        <ChoyButton
-          v-for="opt in selectionOptionValues(item)"
-          :key="opt"
-          size="sm"
-          variant="outline"
-          :disabled="readonly"
-          :data-testid="`choy-properties-definition-translate-option-${opt}`"
-          @click="openSelectionTranslate(index, opt)"
-        >
-          {{ _t('Translate %s', opt) }}
-        </ChoyButton>
-      </div>
-      <div class="sm:col-span-2">
-        <ChoyButton
-          size="sm"
-          variant="destructive"
-          :disabled="readonly"
-          data-testid="choy-properties-definition-remove"
-          @click="onRemove(index)"
-        >
-          {{ _t('Remove') }}
-        </ChoyButton>
-      </div>
-    </div>
-
-    <ChoyPropertyLabelTranslationsDialog
-      v-model="translateOpen"
-      :label-title="translateTitle"
-      :translations="translateMap"
-      @saved="onTranslateSaved"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed, ref, watch } from 'vue';
-import { getActivePinia } from 'pinia';
-import type { PropertyItemDefinition } from '@/core/service/orm/model/properties_types';
-import { TRANSLATED_BASE_LANG } from '@/core/service/orm/repository/projection/translated_field_codec';
-import { createTranslate } from '@/web/web/i18n';
-import { createStoreByModel } from '@/web/web/stores/registry';
-import { useI18nStore } from '@/web/web/stores/i18nStore';
-import type { WebModelStore } from '@/web/web/stores/modelStore';
-import ChoyButton from '@/web/web/components/layout/ChoyButton.vue';
-import Checkbox from '../vendor/ui/checkbox/Checkbox.vue';
-import Input from '../vendor/ui/input/Input.vue';
-import Textarea from '../vendor/ui/textarea/Textarea.vue';
-import Select from '../vendor/ui/select/Select.vue';
-import SelectContent from '../vendor/ui/select/SelectContent.vue';
-import SelectItem from '../vendor/ui/select/SelectItem.vue';
-import SelectTrigger from '../vendor/ui/select/SelectTrigger.vue';
-import ChoyPropertyLabelTranslationsDialog from './ChoyPropertyLabelTranslationsDialog.vue';
-import { normalizeSelectionOptions } from './propertiesHelpers';
-import {
-  PROPERTY_DEFINITION_V1_TYPE_OPTIONS,
-  applyDraftCurrentLangToMaps,
-  buildDefinitionScopeCondition,
-  definitionItemsToDrafts,
-  draftsToDefinitionItems,
-  emptyDraftItem,
-  syncDraftLabelsForLang,
-  type DefinitionEditorDraftItem,
-} from './propertiesDefinitionHelpers';
-
-defineOptions({ name: 'ChoyPropertiesDefinitionEditor' });
-
-const { _t } = createTranslate('web', { scope: 'web/components/field/ChoyPropertiesDefinitionEditor' });
-
-const props = withDefaults(
-  defineProps<{
-    application: string;
-    targetModel: string;
-    propertiesField: string;
-    containerModel?: string | null;
-    containerId?: string | null;
-    readonly?: boolean;
-    /** Optional pre-built store (tests). */
-    store?: WebModelStore<any> | null;
-  }>(),
-  {
-    containerModel: null,
-    containerId: null,
-    readonly: false,
-    store: null,
-  },
-);
-
-const emit = defineEmits<{
-  saved: [payload: { id: string; definition: unknown[] }];
-}>();
-
-const typeOptions = PROPERTY_DEFINITION_V1_TYPE_OPTIONS;
-const drafts = ref<DefinitionEditorDraftItem[]>([]);
-const previousItems = ref<PropertyItemDefinition[]>([]);
-const definitionId = ref<string | null>(null);
-const loading = ref(false);
-const saving = ref(false);
-const loadError = ref('');
-const saveError = ref('');
-let reloadSeq = 0;
-
-const translateOpen = ref(false);
-const translateTitle = ref('');
-const translateMap = ref<Record<string, string>>({});
-type TranslateTarget =
-  | { kind: 'string'; index: number }
-  | { kind: 'selection'; index: number; value: string };
-const translateTarget = ref<TranslateTarget | null>(null);
-
-const canSave = computed(
-  () =>
-    Boolean(String(props.application || '').trim()) &&
-    Boolean(String(props.targetModel || '').trim()) &&
-    Boolean(String(props.propertiesField || '').trim()),
-);
-
-function editorLang(): string {
-  if (!getActivePinia()) return TRANSLATED_BASE_LANG;
-  try {
-    const lang = String(useI18nStore().terminologyLang || '').trim();
-    return lang || TRANSLATED_BASE_LANG;
-  } catch {
-    return TRANSLATED_BASE_LANG;
-  }
-}
-
-function selectionOptionValues(item: DefinitionEditorDraftItem): string[] {
-  try {
-    const parsed = item.selectionText ? JSON.parse(item.selectionText) : [];
-    return normalizeSelectionOptions(parsed).map(o => o.value);
-  } catch {
-    return Object.keys(item.selectionLabelMaps || {});
-  }
-}
-
-function resolveStore(): WebModelStore<any> | null {
-  if (props.store) return props.store;
-  const app = String(props.application || '').trim();
-  if (!app) return null;
-  try {
-    return createStoreByModel(`${app}.PropertyDefinition`);
-  } catch (e) {
-    loadError.value = e instanceof Error ? e.message : String(e);
-    return null;
-  }
-}
-
-async function reload() {
-  const seq = ++reloadSeq;
-  loadError.value = '';
-  saveError.value = '';
-  definitionId.value = null;
-  drafts.value = [];
-  previousItems.value = [];
-  if (!canSave.value) return;
-
-  const store = resolveStore();
-  if (!store || typeof (store as any).Search !== 'function') {
-    if (seq === reloadSeq && !loadError.value) {
-      loadError.value = _t('PropertyDefinition store is unavailable');
-    }
-    return;
-  }
-
-  loading.value = true;
-  try {
-    const And = buildDefinitionScopeCondition({
-      targetModel: props.targetModel,
-      propertiesField: props.propertiesField,
-      containerModel: props.containerModel,
-      containerId: props.containerId,
-    });
-    const rows = await (store as any).Search(
-      { And },
-      {
-        fields: ['Id', 'Definition', 'TargetModel', 'PropertiesField', 'ContainerModel', 'ContainerId'],
-        limit: 1,
-      },
-    );
-    if (seq !== reloadSeq) return;
-    const row = Array.isArray(rows) && rows[0] ? rows[0] : null;
-    if (row) {
-      definitionId.value = String(row.Id || '').trim() || null;
-      const raw = Array.isArray(row.Definition) ? (row.Definition as PropertyItemDefinition[]) : [];
-      previousItems.value = raw;
-      drafts.value = definitionItemsToDrafts(raw, editorLang());
-    } else {
-      definitionId.value = null;
-      previousItems.value = [];
-      drafts.value = [];
-    }
-  } catch (e) {
-    if (seq !== reloadSeq) return;
-    loadError.value = e instanceof Error ? e.message : String(e);
-    console.warn('[ChoyPropertiesDefinitionEditor] load failed', e);
-  } finally {
-    if (seq === reloadSeq) {
-      loading.value = false;
-    }
-  }
-}
-
-function onAdd() {
-  if (loading.value || saving.value || props.readonly) return;
-  drafts.value = [...drafts.value, emptyDraftItem()];
-}
-
-function onRemove(index: number) {
-  drafts.value = drafts.value.filter((_, i) => i !== index);
-}
-
-function openStringTranslate(index: number) {
-  const item = drafts.value[index];
-  if (!item || props.readonly) return;
-  applyDraftCurrentLangToMaps(item, editorLang());
-  translateTarget.value = { kind: 'string', index };
-  translateTitle.value = item.name || _t('Label');
-  translateMap.value = { ...item.stringMap };
-  translateOpen.value = true;
-}
-
-function openSelectionTranslate(index: number, value: string) {
-  const item = drafts.value[index];
-  if (!item || props.readonly) return;
-  applyDraftCurrentLangToMaps(item, editorLang());
-  translateTarget.value = { kind: 'selection', index, value };
-  translateTitle.value = `${item.name || _t('Label')}.${value}`;
-  translateMap.value = { ...(item.selectionLabelMaps[value] || {}) };
-  translateOpen.value = true;
-}
-
-function onTranslateSaved(next: Record<string, string>) {
-  const target = translateTarget.value;
-  if (!target) return;
-  const item = drafts.value[target.index];
-  if (!item) return;
-  if (target.kind === 'string') {
-    item.stringMap = { ...next };
-    syncDraftLabelsForLang(item, editorLang());
-  } else {
-    item.selectionLabelMaps = {
-      ...item.selectionLabelMaps,
-      [target.value]: { ...next },
-    };
-    syncDraftLabelsForLang(item, editorLang());
-  }
-  translateTarget.value = null;
-}
-
-async function onSave() {
-  saveError.value = '';
-  if (props.readonly || loading.value || saving.value || !canSave.value) return;
-  const store = resolveStore();
-  if (!store) {
-    saveError.value = _t('PropertyDefinition store is unavailable');
-    return;
-  }
-
-  let definition: unknown[];
-  try {
-    definition = draftsToDefinitionItems(drafts.value, editorLang(), previousItems.value);
-  } catch (e) {
-    saveError.value = e instanceof Error ? e.message : String(e);
-    return;
-  }
-
-  const payload: Record<string, unknown> = {
-    TargetModel: String(props.targetModel).trim(),
-    PropertiesField: String(props.propertiesField).trim(),
-    ContainerModel:
-      props.containerModel == null || props.containerModel === '' ? null : String(props.containerModel),
-    ContainerId: props.containerId == null || props.containerId === '' ? null : String(props.containerId),
-    Definition: definition,
-  };
-
-  saving.value = true;
-  try {
-    if (definitionId.value) {
-      await (store as any).UpdateById(definitionId.value, { Definition: definition });
-      emit('saved', { id: definitionId.value, definition });
-    } else {
-      const created = await (store as any).Create(payload);
-      const id = String(created?.Id || '').trim();
-      definitionId.value = id || null;
-      emit('saved', { id, definition });
-    }
-    await reload();
-  } catch (e) {
-    saveError.value = e instanceof Error ? e.message : String(e);
-    console.warn('[ChoyPropertiesDefinitionEditor] save failed', e);
-  } finally {
-    saving.value = false;
-  }
-}
-
-watch(
-  () => [
-    props.application,
-    props.targetModel,
-    props.propertiesField,
-    props.containerModel,
-    props.containerId,
-    props.store,
-    editorLang(),
-  ],
-  () => {
-    void reload();
-  },
-  { immediate: true },
-);
-
-defineExpose({ reload, drafts, definitionId, previousItems });
-</script>
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts b/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
new file mode 100644
index 000000000..c8cc4895f
--- /dev/null
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
@@ -0,0 +1,369 @@
+// SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
+// SPDX-License-Identifier: Apache-2.0
+
+import { computed, h, nextTick, reactive, ref } from 'vue';
+
+import type { UseField } from '@/web/web/composables/useField';
+import { flushPromises, mountApp, restoreSfc, stubSfc } from '@/web/web/__tests__/mountApp';
+import ChoyButton from '@/web/web/components/layout/ChoyButton.vue';
+import ChoyFieldBase from './ChoyFieldBase.vue';
+import ChoyPropertiesDefinitionField from './ChoyPropertiesDefinitionField.vue';
+import ChoyPropertiesDefinitionItemDialog from './ChoyPropertiesDefinitionItemDialog.vue';
+import ChoyPropertyLabelTranslationsDialog from './ChoyPropertyLabelTranslationsDialog.vue';
+
+function makeBinding(opts: {
+  definition?: unknown[] | null;
+  isEditMode?: boolean;
+  isForm?: boolean;
+}): UseField & { __value: any } {
+  const value = ref(opts.definition === undefined ? [] : opts.definition);
+  return {
+    env: {
+      isForm: opts.isForm !== false,
+      isEditMode: opts.isEditMode !== false,
+      viewMode: opts.isEditMode === false ? 'display' : 'edit',
+      fieldPrefix: null,
+    },
+    prop: 'Definition',
+    meta: reactive({ type: 'jsonobject' }) as any,
+    fieldRef: () => value as any,
+    fieldRefOf: () => value as any,
+    recordRef: () => computed(() => ({ Id: '1', Definition: value.value })) as any,
+    registerFields: () => undefined,
+    store: {} as any,
+    asView: () => ({ fieldValue: () => value }) as any,
+    __value: value,
+  } as any;
+}
+
+function installFieldBaseStub() {
+  stubSfc(ChoyFieldBase as any, {
+    name: 'ChoyFieldBase',
+    inheritAttrs: false,
+    props: {
+      binding: { type: Object, required: true },
+      toView: { type: Function, default: undefined },
+      fromView: { type: Function, default: undefined },
+      rules: { type: Array, default: undefined },
+      label: { type: String, default: undefined },
+      formItemProps: { type: Object, default: undefined },
+      vColumnProps: { type: Object, default: undefined },
+      required: { type: [Boolean, Function, Object], default: undefined },
+      readonly: { type: [Boolean, Function, Object], default: undefined },
+      visible: { type: [Boolean, Function, Object], default: undefined },
+      cellVisible: { type: [Boolean, Function, Object], default: undefined },
+      renderMode: { type: String, default: 'auto' },
+      showInlineError: { type: Boolean, default: false },
+      orientation: { type: String, default: undefined },
+      labelForControl: { type: Boolean, default: undefined },
+    },
+    setup(props: any, { slots }: any) {
+      const fieldValue = () => {
+        const raw = (props.binding as UseField).fieldRef();
+        const toView = props.toView as ((v: any) => any) | undefined;
+        const fromView = props.fromView as ((v: any) => any) | undefined;
+        return computed({
+          get: () => (toView ? toView(raw.value) : raw.value),
+          set: v => {
+            raw.value = fromView ? fromView(v) : v;
+          },
+        });
+      };
+      const slotProps = {
+        fieldValue,
+        inputId: 'def-input',
+        labelId: 'def-label',
+        describedBy: undefined,
+        invalid: false,
+      };
+      return () => {
+        const mode = props.binding?.env?.isEditMode ? 'edit' : 'display';
+        const slot = mode === 'edit' ? slots.edit : slots.display;
+        return h('div', { 'data-testid': 'choy-field-base-stub' }, slot?.(slotProps) ?? []);
+      };
+    },
+  } as any);
+}
+
+function installChoyButtonStub() {
+  stubSfc(ChoyButton as any, {
+    name: 'ChoyButton',
+    props: {
+      disabled: Boolean,
+      loading: Boolean,
+      type: String,
+      size: String,
+      variant: String,
+    },
+    emits: ['click'],
+    inheritAttrs: false,
+    setup(props: any, { emit, slots, attrs }: any) {
+      return () =>
+        h(
+          'button',
+          {
+            ...attrs,
+            type: 'button',
+            disabled: props.disabled || undefined,
+            onClick: (e: Event) => emit('click', e),
+          },
+          slots.default?.()
+        );
+    },
+  } as any);
+}
+
+function installItemDialogStub() {
+  stubSfc(ChoyPropertiesDefinitionItemDialog as any, {
+    name: 'ChoyPropertiesDefinitionItemDialog',
+    props: {
+      modelValue: Boolean,
+      item: Object,
+      readonly: Boolean,
+      title: String,
+    },
+    emits: ['update:modelValue', 'saved', 'closed'],
+    setup(props: any, { emit }: any) {
+      return () =>
+        props.modelValue
+          ? h('div', { 'data-testid': 'choy-properties-definition-item-dialog-stub' }, [
+              h(
+                'button',
+                {
+                  'data-testid': 'stub-item-save',
+                  onClick: () =>
+                    emit('saved', {
+                      name: 'from_dialog',
+                      type: 'char',
+                      string: 'From Dialog',
+                      stringMap: { en_US: 'From Dialog' },
+                      default: '',
+                      readonly: false,
+                      selectionText: '',
+                      selectionLabelMaps: {},
+                    }),
+                },
+                'save',
+              ),
+              h(
+                'button',
+                {
+                  'data-testid': 'stub-item-close',
+                  onClick: () => emit('update:modelValue', false),
+                },
+                'close',
+              ),
+            ])
+          : null;
+    },
+  } as any);
+}
+
+function installTranslateDialogStub() {
+  stubSfc(ChoyPropertyLabelTranslationsDialog as any, {
+    name: 'ChoyPropertyLabelTranslationsDialog',
+    props: { modelValue: Boolean, labelTitle: String, translations: Object },
+    emits: ['update:modelValue', 'saved', 'closed'],
+    setup() {
+      return () => null;
+    },
+  } as any);
+}
+
+describe('ChoyPropertiesDefinitionField', () => {
+  beforeEach(() => {
+    installFieldBaseStub();
+    installChoyButtonStub();
+    installItemDialogStub();
+    installTranslateDialogStub();
+  });
+
+  afterEach(() => {
+    restoreSfc(ChoyFieldBase as any);
+    restoreSfc(ChoyButton as any);
+    restoreSfc(ChoyPropertiesDefinitionItemDialog as any);
+    restoreSfc(ChoyPropertyLabelTranslationsDialog as any);
+  });
+
+  test('edit mode shows rows and Add; display mode hides Add', async () => {
+    const binding = makeBinding({
+      definition: [
+        { name: 'tax_id', type: 'char', string: { en_US: 'Tax' } },
+        { name: 'prio', type: 'selection', string: { en_US: 'Priority' }, selection: [['low', 'Low']] },
+      ],
+      isEditMode: true,
+    });
+    const mounted = mountApp(ChoyPropertiesDefinitionField as any, {
+      props: { binding },
+    });
+    try {
+      await flushPromises();
+      expect(mounted.q('[data-testid="choy-properties-definition-form"]')).toBeTruthy();
+      expect(mounted.q('[data-testid="choy-properties-definition-add"]')).toBeTruthy();
+      expect(mounted.el.querySelectorAll('[data-testid="choy-properties-definition-row"]').length).toBe(2);
+      expect(mounted.el.textContent || '').toMatch(/tax_id/);
+      expect(mounted.el.textContent || '').toMatch(/Tax/);
+    } finally {
+      mounted.unmount();
+    }
+
+    const displayBinding = makeBinding({
+      definition: [{ name: 'tax_id', type: 'char', string: { en_US: 'Tax' } }],
+      isEditMode: false,
+    });
+    const displayMounted = mountApp(ChoyPropertiesDefinitionField as any, {
+      props: { binding: displayBinding },
+    });
+    try {
+      await flushPromises();
+      expect(displayMounted.q('[data-testid="choy-properties-definition-add"]')).toBeFalsy();
+      expect(displayMounted.q('[data-testid="choy-properties-definition-display"]')).toBeTruthy();
+    } finally {
+      displayMounted.unmount();
+    }
+  });
+
+  test('Remove updates draft Definition array on the field', async () => {
+    const binding = makeBinding({
+      definition: [
+        { name: 'a', type: 'char', string: { en_US: 'A' } },
+        { name: 'b', type: 'char', string: { en_US: 'B' } },
+      ],
+      isEditMode: true,
+    });
+    const mounted = mountApp(ChoyPropertiesDefinitionField as any, {
+      props: { binding },
+    });
+    try {
+      await flushPromises();
+      const removeBtns = mounted.el.querySelectorAll('[data-testid="choy-properties-definition-remove"]');
+      expect(removeBtns.length).toBe(2);
+      (removeBtns[0] as HTMLButtonElement).click();
+      await nextTick();
+      await flushPromises();
+      const next = binding.__value.value as any[];
+      expect(next.length).toBe(1);
+      expect(next[0].name).toBe('b');
+    } finally {
+      mounted.unmount();
+    }
+  });
+
+  test('shows 1-based index column for definition rows', async () => {
+    const binding = makeBinding({
+      definition: [
+        { name: 'a', type: 'char', string: { en_US: 'A' } },
+        { name: 'b', type: 'char', string: { en_US: 'B' } },
+      ],
+      isEditMode: true,
+    });
+    const mounted = mountApp(ChoyPropertiesDefinitionField as any, {
+      props: { binding },
+    });
+    try {
+      await flushPromises();
+      expect(mounted.q('[data-testid="choy-properties-definition-index-header"]')?.textContent).toBe('#');
+      const indexes = mounted.qa('[data-testid="choy-properties-definition-index"]');
+      expect(indexes.map(el => (el.textContent || '').trim())).toEqual(['1', '2']);
+    } finally {
+      mounted.unmount();
+    }
+  });
+
+  test('handle drag reorders Definition rows', async () => {
+    const binding = makeBinding({
+      definition: [
+        { name: 'a', type: 'char', string: { en_US: 'A' } },
+        { name: 'b', type: 'char', string: { en_US: 'B' } },
+        { name: 'c', type: 'char', string: { en_US: 'C' } },
+      ],
+      isEditMode: true,
+    });
+    const mounted = mountApp(ChoyPropertiesDefinitionField as any, {
+      props: { binding },
+    });
+    try {
+      await flushPromises();
+      expect(mounted.qa('[data-testid="choy-properties-definition-handle"]').length).toBe(3);
+      const exposed = mounted.root as any;
+      const draftsRaw = exposed.drafts;
+      const drafts = (Array.isArray(draftsRaw) ? draftsRaw : draftsRaw?.value) as any[];
+      expect(drafts?.length).toBe(3);
+      exposed.commitDrafts([drafts[2], drafts[0], drafts[1]]);
+      await nextTick();
+      await flushPromises();
+      expect((binding.__value.value as any[]).map((r: any) => r.name)).toEqual(['c', 'a', 'b']);
+    } finally {
+      mounted.unmount();
+    }
+  });
+
+  test('Add opens dialog; Confirm writes new item into Definition', async () => {
+    const binding = makeBinding({ definition: [], isEditMode: true });
+    const mounted = mountApp(ChoyPropertiesDefinitionField as any, {
+      props: { binding },
+    });
+    try {
+      await flushPromises();
+      expect(mounted.q('[data-testid="choy-properties-definition-empty"]')).toBeTruthy();
+      mounted.click('[data-testid="choy-properties-definition-add"]');
+      await nextTick();
+      expect(mounted.q('[data-testid="choy-properties-definition-item-dialog-stub"]')).toBeTruthy();
+      mounted.click('[data-testid="stub-item-save"]');
+      await nextTick();
+      await flushPromises();
+      const next = binding.__value.value as any[];
+      expect(next.length).toBe(1);
+      expect(next[0].name).toBe('from_dialog');
+      // Single-lang storage may collapse to a plain string.
+      const label = next[0].string;
+      if (typeof label === 'string') {
+        expect(label).toBe('From Dialog');
+      } else {
+        expect(label).toEqual({ en_US: 'From Dialog' });
+      }
+    } finally {
+      mounted.unmount();
+    }
+  });
+
+  test('edit mode does not put translate control on the summary table', async () => {
+    const binding = makeBinding({
+      definition: [{ name: 'tax_id', type: 'char', string: { en_US: 'Tax', zh_CN: '税号' } }],
+      isEditMode: true,
+    });
+    const mounted = mountApp(ChoyPropertiesDefinitionField as any, {
+      props: { binding },
+    });
+    try {
+      await flushPromises();
+      expect(mounted.q('[data-testid="choy-properties-definition-translate"]')).toBeFalsy();
+      expect(mounted.q('[data-testid="choy-properties-definition-translate-string"]')).toBeFalsy();
+    } finally {
+      mounted.unmount();
+    }
+  });
+
+  test('table-like mode renders summary text', async () => {
+    const binding = makeBinding({
+      definition: [
+        { name: 'a', type: 'char' },
+        { name: 'b', type: 'char' },
+      ],
+      isEditMode: true,
+      isForm: false,
+    });
+    const mounted = mountApp(ChoyPropertiesDefinitionField as any, {
+      props: { binding },
+    });
+    try {
+      await flushPromises();
+      const summary = mounted.q('[data-testid="choy-properties-definition-summary"]');
+      expect(summary).toBeTruthy();
+      expect(summary!.textContent || '').toMatch(/a/);
+      expect(summary!.textContent || '').toMatch(/b/);
+    } finally {
+      mounted.unmount();
+    }
+  });
+});
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue b/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
new file mode 100644
index 000000000..3c8f1708b
--- /dev/null
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
@@ -0,0 +1,568 @@
+<!--
+SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
+SPDX-License-Identifier: Apache-2.0
+-->
+
+<template>
+  <ChoyFieldBase
+    :binding="binding"
+    :label="label"
+    :rules="rules"
+    :formItemProps="formItemProps"
+    :orientation="orientation"
+    :vColumnProps="vColumnProps"
+    :toView="toView"
+    :fromView="fromView"
+    :required="required"
+    :readonly="readonly"
+    :visible="visible"
+    :cellVisible="cellVisible"
+    :renderMode="renderMode"
+    :showInlineError="showInlineError"
+    :hide-label="hideLabel"
+    :label-for-control="false"
+    v-bind="$attrs"
+  >
+    <template #edit="{ fieldValue, inputId, labelId, describedBy, invalid }">
+      <span
+        v-if="isTableLike"
+        class="truncate text-sm text-foreground"
+        data-testid="choy-properties-definition-summary"
+      >{{ summaryText(fieldValue().value) }}</span>
+      <div
+        v-else
+        class="flex w-full min-w-0 flex-col gap-2"
+        data-testid="choy-properties-definition-form"
+        :id="inputId || undefined"
+        :aria-labelledby="labelId || undefined"
+        :aria-describedby="describedBy || undefined"
+        :aria-invalid="invalid ? 'true' : undefined"
+      >
+        <p
+          v-if="writeError"
+          class="m-0 text-sm text-destructive"
+          data-testid="choy-properties-definition-write-error"
+        >
+          {{ writeError }}
+        </p>
+        <DefinitionLinesTable
+          :drafts="drafts"
+          :can-mutate="canMutate"
+          :empty-text="_t('No properties defined')"
+          :name-header="_t('Name')"
+          :type-header="_t('Type')"
+          :label-header="_t('Label')"
+          :edit-text="_t('Edit')"
+          :view-text="_t('View')"
+          :remove-text="_t('Remove')"
+          :reorder-text="_t('Reorder')"
+          :index-header="'#'"
+          :add-text="_t('Add a line…')"
+          @open="openRow"
+          @remove="onRemove"
+          @reorder="onReorder"
+          @add="onAdd"
+        />
+      </div>
+    </template>
+
+    <template #display="{ fieldValue }">
+      <span
+        v-if="isTableLike"
+        class="truncate text-sm text-foreground"
+        data-testid="choy-properties-definition-summary"
+      >{{ summaryText(fieldValue().value) }}</span>
+      <div v-else class="flex w-full min-w-0 flex-col gap-2" data-testid="choy-properties-definition-display">
+        <DefinitionLinesTable
+          :drafts="drafts"
+          :can-mutate="false"
+          :empty-text="_t('No properties defined')"
+          :name-header="_t('Name')"
+          :type-header="_t('Type')"
+          :label-header="_t('Label')"
+          :edit-text="_t('Edit')"
+          :view-text="_t('View')"
+          :remove-text="_t('Remove')"
+          :reorder-text="_t('Reorder')"
+          :index-header="'#'"
+          @open="openRow"
+          @remove="onRemove"
+          @reorder="onReorder"
+        />
+      </div>
+    </template>
+  </ChoyFieldBase>
+
+  <ChoyPropertiesDefinitionItemDialog
+    v-model="dialogOpen"
+    :item="dialogItem"
+    :readonly="dialogReadonly"
+    @saved="onDialogSaved"
+  />
+</template>
+
+<script setup lang="ts" generic="T extends BaseModel, P extends FieldPath<T, unknown[] | null | undefined>, V = FieldPathType<T, P>">
+import type { BaseModel, FieldPath, FieldPathType } from '@/core/rpc';
+import type { PropertyItemDefinition } from '@/core/service/orm/model/properties_types';
+import { TRANSLATED_BASE_LANG } from '@/core/service/orm/repository/projection/translated_field_codec';
+import type { WebModelStore } from '@/web/web/stores/modelStore';
+import type { RuleItem } from 'async-validator';
+import { computed, defineComponent, h, ref, watch, type WritableComputedRef } from 'vue';
+import { getActivePinia } from 'pinia';
+import { GripVertical } from 'lucide-vue-next';
+import { useField } from '@/web/web/composables/useField';
+import type { UseField } from '@/web/web/composables/useField';
+import {
+  setListHandleDragImage,
+  useListHandleReorder,
+} from '@/web/web/composables/useListHandleReorder';
+import ChoyFieldBase, { type FieldStateExpr, type FormItemProps } from './ChoyFieldBase.vue';
+import ChoyButton from '@/web/web/components/layout/ChoyButton.vue';
+import { createTranslate } from '@/web/web/i18n';
+import { useI18nStore } from '@/web/web/stores/i18nStore';
+import ChoyPropertiesDefinitionItemDialog from './ChoyPropertiesDefinitionItemDialog.vue';
+import {
+  definitionItemsToDrafts,
+  draftsToDefinitionItems,
+  emptyDraftItem,
+  type DefinitionEditorDraftItem,
+} from './propertiesDefinitionHelpers';
+
+const { _t } = createTranslate('web', { scope: 'web/components/field/ChoyPropertiesDefinitionField' });
+
+defineOptions({ name: 'ChoyPropertiesDefinitionField' });
+
+/** Definition lines table: O2M-like frame with handle drag + footer “Add a line…”. */
+const DefinitionLinesTable = defineComponent({
+  name: 'ChoyPropertiesDefinitionLinesTable',
+  props: {
+    drafts: { type: Array as () => DefinitionEditorDraftItem[], required: true },
+    canMutate: { type: Boolean, required: true },
+    emptyText: { type: String, required: true },
+    nameHeader: { type: String, required: true },
+    typeHeader: { type: String, required: true },
+    labelHeader: { type: String, required: true },
+    editText: { type: String, required: true },
+    viewText: { type: String, required: true },
+    removeText: { type: String, required: true },
+    reorderText: { type: String, default: 'Reorder' },
+    /** Index column header (O2M-style "#"). */
+    indexHeader: { type: String, default: '#' },
+    addText: { type: String, default: '' },
+  },
+  emits: {
+    open: (_index: number, _asReadonly: boolean) => true,
+    remove: (_index: number) => true,
+    reorder: (_rows: DefinitionEditorDraftItem[]) => true,
+    add: () => true,
+  },
+  setup(props, { emit }) {
+    const handleEnabled = computed(() => props.canMutate);
+    const handleReorder = useListHandleReorder({
+      rows: () => props.drafts as DefinitionEditorDraftItem[],
+      enabled: handleEnabled,
+      // Drafts are not Sequence-backed; discard renumber mutations on throwaways.
+      getRecord: () => ({}),
+      onReorder: rows => emit('reorder', rows as DefinitionEditorDraftItem[]),
+    });
+
+    return () => {
+      const header = h('thead', [
+        h('tr', { class: 'border-b border-border bg-muted/40 text-left text-muted-foreground' }, [
+          props.canMutate ? h('th', { class: 'w-9 px-1 py-1.5 font-medium' }) : null,
+          h(
+            'th',
+            {
+              class: 'w-11 whitespace-nowrap px-2 py-1.5 text-right font-medium',
+              'data-testid': 'choy-properties-definition-index-header',
+            },
+            props.indexHeader,
+          ),
+          h('th', { class: 'whitespace-nowrap px-3 py-1.5 font-medium' }, props.nameHeader),
+          h('th', { class: 'whitespace-nowrap px-3 py-1.5 font-medium' }, props.typeHeader),
+          h('th', { class: 'min-w-[10rem] px-3 py-1.5 font-medium' }, props.labelHeader),
+          h('th', { class: 'whitespace-nowrap px-3 py-1.5 font-medium' }),
+        ]),
+      ]);
+
+      const colCount = props.canMutate ? 6 : 5;
+      const dragging = handleReorder.draggingIndex.value;
+      const over = handleReorder.overIndex.value;
+
+      const bodyRows =
+        props.drafts.length === 0
+          ? [
+              h('tr', { 'data-testid': 'choy-properties-definition-empty' }, [
+                h(
+                  'td',
+                  {
+                    class: 'px-3 py-3 text-sm text-muted-foreground',
+                    colspan: colCount,
+                  },
+                  props.emptyText,
+                ),
+              ]),
+            ]
+          : props.drafts.map((item, index) =>
+              h(
+                'tr',
+                {
+                  key: `${item.name || 'row'}-${index}`,
+                  class: [
+                    'cursor-pointer border-b border-border last:border-b-0 hover:bg-accent/40',
+                    dragging === index ? 'opacity-60' : '',
+                    dragging != null && over === index && over !== dragging
+                      ? 'bg-accent/40 ring-1 ring-inset ring-primary/30'
+                      : '',
+                  ],
+                  'data-index': index,
+                  'data-testid': 'choy-properties-definition-row',
+                  role: 'button',
+                  tabindex: 0,
+                  onClick: () => emit('open', index, !props.canMutate),
+                  onKeydown: (e: KeyboardEvent) => {
+                    if (e.key === 'Enter' || e.key === ' ') {
+                      e.preventDefault();
+                      emit('open', index, !props.canMutate);
+                    }
+                  },
+                  onDragover: props.canMutate
+                    ? (e: DragEvent) => {
+                        e.preventDefault();
+                        handleReorder.onDragOver(index, e);
+                      }
+                    : undefined,
+                  onDrop: props.canMutate
+                    ? (e: DragEvent) => {
+                        e.preventDefault();
+                        void handleReorder.onDrop(index, e);
+                      }
+                    : undefined,
+                },
+                [
+                  props.canMutate
+                    ? h(
+                        'td',
+                        {
+                          class: 'w-9 px-1 py-1.5 align-middle',
+                          onClick: (e: Event) => e.stopPropagation(),
+                        },
+                        [
+                          h(
+                            'span',
+                            {
+                              class:
+                                'inline-flex size-7 cursor-grab items-center justify-center text-muted-foreground select-none active:cursor-grabbing',
+                              draggable: 'true',
+                              title: props.reorderText,
+                              'aria-label': props.reorderText,
+                              'data-testid': 'choy-properties-definition-handle',
+                              onDragstart: (e: DragEvent) => {
+                                e.stopPropagation();
+                                handleReorder.onDragStart(index, e);
+                                setListHandleDragImage(e);
+                              },
+                              onDragend: (e: DragEvent) => {
+                                e.stopPropagation();
+                                handleReorder.onDragEnd();
+                              },
+                              onClick: (e: Event) => e.stopPropagation(),
+                            },
+                            [h(GripVertical, { class: 'size-3.5', 'aria-hidden': 'true' })],
+                          ),
+                        ],
+                      )
+                    : null,
+                  h(
+                    'td',
+                    {
+                      class: 'w-11 whitespace-nowrap px-2 py-1.5 text-right tabular-nums text-muted-foreground',
+                      'data-testid': 'choy-properties-definition-index',
+                    },
+                    String(index + 1),
+                  ),
+                  h(
+                    'td',
+                    {
+                      class: 'max-w-[14rem] truncate px-3 py-1.5 font-mono text-xs',
+                      title: item.name || undefined,
+                    },
+                    item.name || '—',
+                  ),
+                  h('td', { class: 'whitespace-nowrap px-3 py-1.5' }, item.type || '—'),
+                  h(
+                    'td',
+                    {
+                      class: 'max-w-[16rem] truncate px-3 py-1.5',
+                      title: item.string || undefined,
+                    },
+                    item.string || '—',
+                  ),
+                  h(
+                    'td',
+                    {
+                      class: 'whitespace-nowrap px-3 py-1.5',
+                      onClick: (e: Event) => e.stopPropagation(),
+                    },
+                    [
+                      h('div', { class: 'flex items-center gap-0.5' }, [
+                        h(
+                          ChoyButton,
+                          {
+                            size: 'sm',
+                            variant: 'ghost',
+                            class: 'h-7 px-2',
+                            'data-testid': 'choy-properties-definition-open',
+                            onClick: () => emit('open', index, !props.canMutate),
+                          },
+                          () => (props.canMutate ? props.editText : props.viewText),
+                        ),
+                        props.canMutate
+                          ? h(
+                              ChoyButton,
+                              {
+                                size: 'sm',
+                                variant: 'ghost',
+                                class:
+                                  'h-7 px-2 text-destructive hover:bg-destructive/10 hover:text-destructive',
+                                'data-testid': 'choy-properties-definition-remove',
+                                onClick: () => emit('remove', index),
+                              },
+                              () => props.removeText,
+                            )
+                          : null,
+                      ]),
+                    ],
+                  ),
+                ],
+              ),
+            );
+
+      const footer =
+        props.canMutate && props.addText
+          ? h(
+              'div',
+              {
+                class: 'flex items-center border-t border-border px-3 py-2',
+                'data-testid': 'choy-properties-definition-add-footer',
+              },
+              [
+                h(
+                  ChoyButton,
+                  {
+                    type: 'button',
+                    size: 'sm',
+                    variant: 'link',
+                    class: 'h-auto px-0',
+                    'data-testid': 'choy-properties-definition-add',
+                    onClick: () => emit('add'),
+                  },
+                  () => props.addText,
+                ),
+              ],
+            )
+          : null;
+
+      return h(
+        'div',
+        {
+          class: 'w-full min-w-0 overflow-hidden rounded-md border border-border',
+          'data-testid': 'choy-properties-definition-table',
+        },
+        [
+          h('div', { class: 'w-full overflow-x-auto' }, [
+            h('table', { class: 'w-full border-collapse text-sm' }, [
+              header,
+              h('tbody', bodyRows),
+            ]),
+          ]),
+          footer,
+        ],
+      );
+    };
+  },
+});
+
+type IsAny<T> = 0 extends 1 & T ? true : false;
+
+const props = withDefaults(
+  defineProps<{
+    store?: WebModelStore<T>;
+    prop?: P | (IsAny<T> extends true ? string : never);
+    binding?: UseField<T, V>;
+
+    label?: string;
+    rules?: RuleItem[];
+
+    required?: FieldStateExpr<T, V>;
+    readonly?: FieldStateExpr<T, V>;
+    visible?: FieldStateExpr<T, V>;
+    cellVisible?: FieldStateExpr<T, V>;
+
+    formItemProps?: Partial<FormItemProps>;
+    orientation?: 'horizontal' | 'vertical';
+    /** Hide label row when Section/Tab already titles the block. Prefer over `label=""`. */
+    hideLabel?: boolean;
+    vColumnProps?: {
+      width?: number | string;
+      minWidth?: number;
+      align?: 'left' | 'center' | 'right';
+      fixed?: 'left' | 'right';
+      sortable?: boolean;
+    };
+    renderMode?: 'auto' | 'form' | 'table' | 'inline';
+    showInlineError?: boolean;
+  }>(),
+  {
+    rules: () => [],
+    required: false,
+    readonly: false,
+    visible: true,
+    cellVisible: true,
+    formItemProps: () => ({}),
+    hideLabel: false,
+    vColumnProps: () => ({}),
+    renderMode: 'auto',
+    showInlineError: false,
+  },
+);
+
+const binding = (props.binding ??
+  useField<T, P, V>({ store: props.store as WebModelStore<T>, prop: props.prop as P })) as UseField<T, V>;
+
+const isTableLike = computed(() => {
+  const mode = props.renderMode;
+  if (mode === 'table' || mode === 'inline') return true;
+  if (mode === 'form') return false;
+  return binding.env?.isForm === false;
+});
+
+const canMutate = computed(() => Boolean(binding.env?.isEditMode));
+
+function editorLang(): string {
+  if (!getActivePinia()) return TRANSLATED_BASE_LANG;
+  try {
+    const lang = String(useI18nStore().terminologyLang || '').trim();
+    return lang || TRANSLATED_BASE_LANG;
+  } catch {
+    return TRANSLATED_BASE_LANG;
+  }
+}
+
+const toView = (raw: any): PropertyItemDefinition[] => (Array.isArray(raw) ? (raw as PropertyItemDefinition[]) : []);
+const fromView = (view: PropertyItemDefinition[]) => view as unknown as V;
+
+const drafts = ref<DefinitionEditorDraftItem[]>([]);
+const previousItems = ref<PropertyItemDefinition[]>([]);
+const writeError = ref('');
+const dialogOpen = ref(false);
+const dialogReadonly = ref(false);
+const dialogIndex = ref<number | null>(null);
+const dialogItem = ref<DefinitionEditorDraftItem | null>(null);
+
+/** Suppress draft re-sync while we write back from local drafts. */
+let syncingFromWrite = false;
+
+function summaryText(raw: unknown): string {
+  const items = toView(raw);
+  if (!items.length) return _t('No properties');
+  const names = items
+    .map(it => String((it as any)?.name || '').trim())
+    .filter(Boolean);
+  if (!names.length) return _t('%s properties', String(items.length));
+  if (names.length <= 3) return names.join(', ');
+  return _t('%s properties (%s, …)', String(names.length), names.slice(0, 2).join(', '));
+}
+
+function syncDraftsFromRaw(raw: unknown) {
+  const items = toView(raw);
+  previousItems.value = items;
+  drafts.value = definitionItemsToDrafts(items, editorLang());
+  writeError.value = '';
+}
+
+function commitDrafts(next: DefinitionEditorDraftItem[]) {
+  writeError.value = '';
+  let definition: PropertyItemDefinition[];
+  try {
+    definition = draftsToDefinitionItems(next, editorLang(), previousItems.value);
+  } catch (e) {
+    writeError.value = e instanceof Error ? e.message : String(e);
+    throw e;
+  }
+  drafts.value = next;
+  previousItems.value = definition;
+  const fieldRef = binding.fieldRef() as WritableComputedRef<any> | { value: any };
+  syncingFromWrite = true;
+  try {
+    fieldRef.value = definition;
+  } finally {
+    syncingFromWrite = false;
+  }
+}
+
+function onAdd() {
+  if (!canMutate.value) return;
+  dialogReadonly.value = false;
+  dialogIndex.value = drafts.value.length;
+  dialogItem.value = emptyDraftItem();
+  dialogOpen.value = true;
+}
+
+function onRemove(index: number) {
+  if (!canMutate.value) return;
+  try {
+    commitDrafts(drafts.value.filter((_, i) => i !== index));
+  } catch {
+    // writeError already set
+  }
+}
+
+function onReorder(rows: DefinitionEditorDraftItem[]) {
+  if (!canMutate.value) return;
+  try {
+    commitDrafts(rows);
+  } catch {
+    // writeError already set
+  }
+}
+
+function openRow(index: number, asReadonly: boolean) {
+  const item = drafts.value[index];
+  if (!item) return;
+  dialogReadonly.value = asReadonly || !canMutate.value;
+  dialogIndex.value = index;
+  dialogItem.value = item;
+  dialogOpen.value = true;
+}
+
+function onDialogSaved(item: DefinitionEditorDraftItem) {
+  if (dialogReadonly.value) return;
+  const index = dialogIndex.value;
+  if (index == null || index < 0) return;
+  const next = [...drafts.value];
+  if (index >= next.length) {
+    next.push(item);
+  } else {
+    next[index] = item;
+  }
+  try {
+    commitDrafts(next);
+  } catch {
+    // keep dialog closed; error shown on field
+  }
+  dialogIndex.value = null;
+  dialogItem.value = null;
+}
+
+watch(
+  () => [binding.fieldRef().value, editorLang(), binding.env?.isEditMode] as const,
+  () => {
+    if (syncingFromWrite) return;
+    syncDraftsFromRaw(binding.fieldRef().value);
+  },
+  { immediate: true, deep: true },
+);
+
+defineExpose({ drafts, previousItems, commitDrafts });
+</script>
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
new file mode 100644
index 000000000..343415f41
--- /dev/null
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
@@ -0,0 +1,299 @@
+<!--
+SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
+SPDX-License-Identifier: Apache-2.0
+-->
+
+<template>
+  <ChoyDialog v-model:open="visible">
+    <ChoyDialogContent
+      class="choy-properties-definition-item-dialog flex max-h-[min(85vh,40rem)] w-[min(90vw,40rem)] max-w-[min(90vw,40rem)] flex-col gap-3 overflow-hidden"
+      data-testid="choy-properties-definition-item-dialog"
+      @open-auto-focus.prevent
+    >
+      <ChoyDialogTitle class="shrink-0">{{ dialogTitle }}</ChoyDialogTitle>
+      <div v-if="local" class="min-h-0 flex-1 overflow-auto">
+        <div class="grid gap-3 sm:grid-cols-2">
+          <Input
+            v-model="local.name"
+            class="w-full"
+            :disabled="readonly"
+            :placeholder="_t('Name')"
+            data-testid="choy-properties-definition-name"
+          />
+          <Select v-model="local.type" :disabled="readonly">
+            <SelectTrigger
+              class="w-full"
+              :placeholder="_t('Type')"
+              data-testid="choy-properties-definition-type"
+            />
+            <SelectContent>
+              <SelectItem v-for="t in typeOptions" :key="t" :value="t">
+                {{ t }}
+              </SelectItem>
+            </SelectContent>
+          </Select>
+          <div class="flex min-w-0 items-center gap-1 sm:col-span-2">
+            <Input
+              v-model="local.string"
+              class="min-w-0 flex-1"
+              :disabled="readonly"
+              :placeholder="_t('Label')"
+              data-testid="choy-properties-definition-string"
+            />
+            <ChoyButton
+              v-if="!readonly"
+              type="button"
+              size="icon"
+              variant="ghost"
+              class="size-8 shrink-0 text-muted-foreground hover:text-foreground"
+              :aria-label="_t('Translate label')"
+              :title="_t('Translate label')"
+              data-testid="choy-properties-definition-translate-string"
+              @click="openStringTranslate"
+            >
+              <Languages class="size-4" aria-hidden="true" />
+            </ChoyButton>
+          </div>
+          <Input
+            v-model="local.default"
+            class="w-full sm:col-span-2"
+            :disabled="readonly"
+            :placeholder="_t('Default')"
+            data-testid="choy-properties-definition-default"
+          />
+          <label class="flex items-center gap-2 text-sm sm:col-span-2">
+            <Checkbox
+              :model-value="local.readonly"
+              :disabled="readonly"
+              data-testid="choy-properties-definition-readonly"
+              @update:model-value="local.readonly = $event === true"
+            />
+            {{ _t('Readonly') }}
+          </label>
+          <div v-if="local.type === 'selection'" class="sm:col-span-2">
+            <ChoyPropertiesDefinitionSelectionEditor
+              :model-value="selectionRows"
+              :readonly="readonly"
+              @update:model-value="onSelectionRowsUpdate"
+              @translate="openSelectionTranslate"
+            />
+          </div>
+        </div>
+        <p
+          v-if="formError"
+          class="mt-3 text-sm text-destructive"
+          data-testid="choy-properties-definition-item-error"
+        >
+          {{ formError }}
+        </p>
+      </div>
+      <div class="flex shrink-0 justify-end gap-2">
+        <ChoyButton type="button" variant="outline" data-testid="choy-properties-definition-item-cancel" @click="onCancel">
+          {{ _t('Cancel') }}
+        </ChoyButton>
+        <ChoyButton
+          v-if="!readonly"
+          type="button"
+          data-testid="choy-properties-definition-item-save"
+          @click="onConfirm"
+        >
+          {{ _t('Save') }}
+        </ChoyButton>
+      </div>
+    </ChoyDialogContent>
+  </ChoyDialog>
+
+  <ChoyPropertyLabelTranslationsDialog
+    v-model="translateOpen"
+    :label-title="translateTitle"
+    :translations="translateMap"
+    @saved="onTranslateSaved"
+  />
+</template>
+
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue';
+import { getActivePinia } from 'pinia';
+import { Languages } from 'lucide-vue-next';
+import { TRANSLATED_BASE_LANG } from '@/core/service/orm/repository/projection/translated_field_codec';
+import { createTranslate } from '@/web/web/i18n';
+import { useI18nStore } from '@/web/web/stores/i18nStore';
+import { ChoyDialog, ChoyDialogContent, ChoyDialogTitle } from '@/web/web/components/layout/choyDialog';
+import ChoyButton from '@/web/web/components/layout/ChoyButton.vue';
+import Checkbox from '../vendor/ui/checkbox/Checkbox.vue';
+import Input from '../vendor/ui/input/Input.vue';
+import Select from '../vendor/ui/select/Select.vue';
+import SelectContent from '../vendor/ui/select/SelectContent.vue';
+import SelectItem from '../vendor/ui/select/SelectItem.vue';
+import SelectTrigger from '../vendor/ui/select/SelectTrigger.vue';
+import ChoyPropertyLabelTranslationsDialog from './ChoyPropertyLabelTranslationsDialog.vue';
+import ChoyPropertiesDefinitionSelectionEditor from './ChoyPropertiesDefinitionSelectionEditor.vue';
+import {
+  PROPERTY_DEFINITION_V1_TYPE_OPTIONS,
+  applyDraftCurrentLangToMaps,
+  emptyDraftItem,
+  selectionRowsFromDraft,
+  syncDraftLabelsForLang,
+  writeSelectionRowsToDraft,
+  type DefinitionEditorDraftItem,
+  type SelectionDraftRow,
+} from './propertiesDefinitionHelpers';
+
+defineOptions({ name: 'ChoyPropertiesDefinitionItemDialog' });
+
+const { _t } = createTranslate('web', { scope: 'web/components/field/ChoyPropertiesDefinitionItemDialog' });
+
+const props = withDefaults(
+  defineProps<{
+    modelValue: boolean;
+    /** Draft row to edit; cloned into local state while open. */
+    item?: DefinitionEditorDraftItem | null;
+    readonly?: boolean;
+    /** Dialog title override (defaults from item name). */
+    title?: string;
+  }>(),
+  {
+    item: null,
+    readonly: false,
+    title: '',
+  },
+);
+
+const emit = defineEmits<{
+  'update:modelValue': [boolean];
+  saved: [item: DefinitionEditorDraftItem];
+  closed: [];
+}>();
+
+const typeOptions = PROPERTY_DEFINITION_V1_TYPE_OPTIONS;
+const local = ref<DefinitionEditorDraftItem | null>(null);
+const formError = ref('');
+
+const translateOpen = ref(false);
+const translateTitle = ref('');
+const translateMap = ref<Record<string, string>>({});
+type TranslateTarget = { kind: 'string' } | { kind: 'selection'; value: string };
+const translateTarget = ref<TranslateTarget | null>(null);
+
+const visible = computed({
+  get: () => props.modelValue,
+  set: v => emit('update:modelValue', v),
+});
+
+const dialogTitle = computed(() => {
+  const override = String(props.title || '').trim();
+  if (override) return override;
+  const name = String(local.value?.name || props.item?.name || '').trim();
+  if (props.readonly) {
+    return name ? _t('Property: %s', name) : _t('Property');
+  }
+  return name ? _t('Edit property: %s', name) : _t('New property');
+});
+
+const selectionRows = computed((): SelectionDraftRow[] => {
+  const item = local.value;
+  if (!item || item.type !== 'selection') return [];
+  return selectionRowsFromDraft(item);
+});
+
+function editorLang(): string {
+  if (!getActivePinia()) return TRANSLATED_BASE_LANG;
+  try {
+    const lang = String(useI18nStore().terminologyLang || '').trim();
+    return lang || TRANSLATED_BASE_LANG;
+  } catch {
+    return TRANSLATED_BASE_LANG;
+  }
+}
+
+function cloneDraft(src: DefinitionEditorDraftItem | null | undefined): DefinitionEditorDraftItem {
+  const base = src ? { ...src } : emptyDraftItem();
+  return {
+    ...base,
+    stringMap: { ...(base.stringMap || {}) },
+    selectionLabelMaps: Object.fromEntries(
+      Object.entries(base.selectionLabelMaps || {}).map(([k, v]) => [k, { ...(v || {}) }]),
+    ),
+  };
+}
+
+function onSelectionRowsUpdate(rows: SelectionDraftRow[]) {
+  const item = local.value;
+  if (!item || props.readonly) return;
+  writeSelectionRowsToDraft(item, rows, editorLang());
+}
+
+function openStringTranslate() {
+  const item = local.value;
+  if (!item || props.readonly) return;
+  applyDraftCurrentLangToMaps(item, editorLang());
+  translateTarget.value = { kind: 'string' };
+  translateTitle.value = item.name || _t('Label');
+  translateMap.value = { ...item.stringMap };
+  translateOpen.value = true;
+}
+
+function openSelectionTranslate(value: string) {
+  const item = local.value;
+  const opt = String(value || '').trim();
+  if (!item || props.readonly || !opt) return;
+  applyDraftCurrentLangToMaps(item, editorLang());
+  translateTarget.value = { kind: 'selection', value: opt };
+  translateTitle.value = `${item.name || _t('Label')}.${opt}`;
+  translateMap.value = { ...(item.selectionLabelMaps[opt] || {}) };
+  translateOpen.value = true;
+}
+
+function onTranslateSaved(next: Record<string, string>) {
+  const target = translateTarget.value;
+  const item = local.value;
+  if (!target || !item) return;
+  if (target.kind === 'string') {
+    item.stringMap = { ...next };
+    syncDraftLabelsForLang(item, editorLang());
+  } else {
+    item.selectionLabelMaps = {
+      ...item.selectionLabelMaps,
+      [target.value]: { ...next },
+    };
+    syncDraftLabelsForLang(item, editorLang());
+  }
+  translateTarget.value = null;
+}
+
+function onCancel() {
+  visible.value = false;
+}
+
+function onConfirm() {
+  formError.value = '';
+  const item = local.value;
+  if (!item || props.readonly) return;
+  const name = String(item.name || '').trim();
+  if (!name) {
+    formError.value = _t('Name is required');
+    return;
+  }
+  applyDraftCurrentLangToMaps(item, editorLang());
+  emit('saved', cloneDraft(item));
+  visible.value = false;
+}
+
+watch(
+  () => props.modelValue,
+  (open, wasOpen) => {
+    if (open && !wasOpen) {
+      formError.value = '';
+      local.value = cloneDraft(props.item);
+      syncDraftLabelsForLang(local.value, editorLang());
+    }
+    if (!open && wasOpen) {
+      local.value = null;
+      translateOpen.value = false;
+      translateTarget.value = null;
+      emit('closed');
+    }
+  },
+  { immediate: true },
+);
+</script>
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionSelectionEditor.test.ts b/modules/web/web/components/field/ChoyPropertiesDefinitionSelectionEditor.test.ts
new file mode 100644
index 000000000..556f1d3e5
--- /dev/null
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionSelectionEditor.test.ts
@@ -0,0 +1,148 @@
+// SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
+// SPDX-License-Identifier: Apache-2.0
+
+import { h, nextTick } from 'vue';
+
+import { mountApp, restoreSfc, stubSfc } from '@/web/web/__tests__/mountApp';
+import ChoyButton from '@/web/web/components/layout/ChoyButton.vue';
+import ChoyPropertiesDefinitionSelectionEditor from './ChoyPropertiesDefinitionSelectionEditor.vue';
+import type { SelectionDraftRow } from './propertiesDefinitionHelpers';
+
+function installChoyButtonStub() {
+  stubSfc(ChoyButton as any, {
+    name: 'ChoyButton',
+    props: {
+      type: String,
+      size: String,
+      variant: String,
+      disabled: Boolean,
+      class: [String, Array, Object],
+    },
+    emits: ['click'],
+    setup(props: any, { emit, slots, attrs }: any) {
+      return () =>
+        h(
+          'button',
+          {
+            ...attrs,
+            type: 'button',
+            disabled: props.disabled || undefined,
+            onClick: (e: Event) => emit('click', e),
+          },
+          slots.default?.(),
+        );
+    },
+  } as any);
+}
+
+function mountEditor(initial: SelectionDraftRow[], extra: Record<string, unknown> = {}) {
+  let mounted: ReturnType<typeof mountApp>;
+  mounted = mountApp(ChoyPropertiesDefinitionSelectionEditor as any, {
+    reactiveProps: true,
+    props: {
+      modelValue: initial,
+      ...extra,
+      'onUpdate:modelValue': (v: SelectionDraftRow[]) => {
+        (mounted.props as any).modelValue = v;
+      },
+    },
+  });
+  return mounted;
+}
+
+describe('ChoyPropertiesDefinitionSelectionEditor', () => {
+  beforeEach(() => {
+    installChoyButtonStub();
+  });
+
+  afterEach(() => {
+    restoreSfc(ChoyButton as any);
+  });
+
+  test('renders O2M-like rows and Add a line footer', async () => {
+    const mounted = mountEditor([
+      { value: 'low', label: '低' },
+      { value: 'normal', label: '普通' },
+    ]);
+    await nextTick();
+    expect(mounted.q('[data-testid="choy-properties-definition-selection"]')).toBeTruthy();
+    expect(mounted.el.querySelectorAll('[data-testid="choy-properties-definition-selection-row"]').length).toBe(2);
+    expect(mounted.q('[data-testid="choy-properties-definition-selection-add"]')).toBeTruthy();
+    expect(mounted.q('[data-testid="choy-properties-definition-selection-translate"]')).toBeTruthy();
+    mounted.unmount();
+  });
+
+  test('Add / Remove emit updated rows', async () => {
+    const mounted = mountEditor([{ value: 'a', label: 'A' }]);
+    await nextTick();
+    mounted.click('[data-testid="choy-properties-definition-selection-add"]');
+    await nextTick();
+    expect((mounted.props as any).modelValue).toEqual([
+      { value: 'a', label: 'A' },
+      { value: '', label: '' },
+    ]);
+    expect(mounted.el.querySelectorAll('[data-testid="choy-properties-definition-selection-row"]').length).toBe(2);
+
+    mounted.click('[data-testid="choy-properties-definition-selection-remove"]');
+    await nextTick();
+    expect((mounted.props as any).modelValue).toEqual([{ value: '', label: '' }]);
+    mounted.unmount();
+  });
+
+  test('translate is disabled for blank value and emits value when set', async () => {
+    const translated: string[] = [];
+    const mounted = mountEditor(
+      [
+        { value: '', label: '' },
+        { value: 'high', label: '高' },
+      ],
+      { onTranslate: (v: string) => translated.push(v) },
+    );
+    await nextTick();
+    const buttons = mounted.el.querySelectorAll(
+      '[data-testid="choy-properties-definition-selection-translate"]',
+    ) as NodeListOf<HTMLButtonElement>;
+    expect(buttons.length).toBe(2);
+    expect(buttons[0]?.disabled).toBe(true);
+    expect(buttons[1]?.disabled).toBe(false);
+    buttons[1]?.click();
+    await nextTick();
+    expect(translated).toEqual(['high']);
+    mounted.unmount();
+  });
+
+  test('readonly hides add/remove/translate controls', async () => {
+    const mounted = mountEditor([{ value: 'x', label: 'X' }], { readonly: true });
+    await nextTick();
+    expect(mounted.q('[data-testid="choy-properties-definition-selection-add"]')).toBeFalsy();
+    expect(mounted.q('[data-testid="choy-properties-definition-selection-remove"]')).toBeFalsy();
+    expect(mounted.q('[data-testid="choy-properties-definition-selection-translate"]')).toBeFalsy();
+    expect(mounted.q('[data-testid="choy-properties-definition-selection-handle"]')).toBeFalsy();
+    mounted.unmount();
+  });
+
+  test('handle drag reorders option rows', async () => {
+    const mounted = mountEditor([
+      { value: 'low', label: '低' },
+      { value: 'normal', label: '普通' },
+      { value: 'high', label: '高' },
+    ]);
+    await nextTick();
+    const api = (mounted.root as any)?.handleReorder;
+    expect(api).toBeTruthy();
+    const dt = {
+      effectAllowed: '',
+      dropEffect: '',
+      setData: () => undefined,
+    };
+    api.onDragStart(0, { preventDefault() {}, dataTransfer: dt } as DragEvent);
+    await api.onDrop(2, { preventDefault() {}, dataTransfer: dt } as DragEvent);
+    await nextTick();
+    expect((mounted.props as any).modelValue.map((r: SelectionDraftRow) => r.value)).toEqual([
+      'normal',
+      'high',
+      'low',
+    ]);
+    mounted.unmount();
+  });
+});
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue b/modules/web/web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
new file mode 100644
index 000000000..8e372b61b
--- /dev/null
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
@@ -0,0 +1,224 @@
+<!--
+SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
+SPDX-License-Identifier: Apache-2.0
+-->
+
+<template>
+  <div
+    class="choy-properties-definition-selection w-full min-w-0 overflow-hidden rounded-md border border-border"
+    data-testid="choy-properties-definition-selection"
+  >
+    <div class="w-full overflow-x-auto">
+      <table class="w-full border-collapse text-sm">
+        <thead>
+          <tr class="border-b border-border bg-muted/40 text-left text-muted-foreground">
+            <th v-if="!readonly" class="w-9 px-1 py-1.5 font-medium" />
+            <th class="whitespace-nowrap px-3 py-1.5 font-medium">{{ _t('Value') }}</th>
+            <th class="min-w-[10rem] px-3 py-1.5 font-medium">{{ _t('Label') }}</th>
+            <th class="w-10 px-2 py-1.5 font-medium" />
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-if="rows.length === 0" data-testid="choy-properties-definition-selection-empty">
+            <td class="px-3 py-3 text-sm text-muted-foreground" :colspan="readonly ? 3 : 4">
+              {{ _t('No options') }}
+            </td>
+          </tr>
+          <tr
+            v-for="(row, index) in rows"
+            :key="rowKey(row, index)"
+            class="border-b border-border last:border-b-0"
+            :class="selectionRowDragClass(index)"
+            data-testid="choy-properties-definition-selection-row"
+            :data-index="index"
+            @dragover="!readonly && onRowDragOver(index, $event)"
+            @drop="!readonly && onRowDrop(index, $event)"
+          >
+            <td v-if="!readonly" class="w-9 px-1 py-1 align-middle">
+              <span
+                class="inline-flex size-7 cursor-grab items-center justify-center text-muted-foreground select-none active:cursor-grabbing"
+                draggable="true"
+                :title="_t('Reorder')"
+                :aria-label="_t('Reorder')"
+                data-testid="choy-properties-definition-selection-handle"
+                @dragstart="onHandleDragStart(index, $event)"
+                @dragend="handleReorder.onDragEnd()"
+                @click.stop
+              >
+                <GripVertical class="size-3.5" aria-hidden="true" />
+              </span>
+            </td>
+            <td class="px-2 py-1 align-middle">
+              <Input
+                :model-value="row.value"
+                class="h-8 w-full min-w-[6rem] font-mono text-xs"
+                :disabled="readonly"
+                data-testid="choy-properties-definition-selection-value"
+                @update:model-value="onValue(index, $event)"
+              />
+            </td>
+            <td class="px-2 py-1 align-middle">
+              <div class="flex min-w-0 items-center gap-1">
+                <Input
+                  :model-value="row.label"
+                  class="h-8 min-w-0 flex-1"
+                  :disabled="readonly"
+                  data-testid="choy-properties-definition-selection-label"
+                  @update:model-value="onLabel(index, $event)"
+                />
+                <ChoyButton
+                  v-if="!readonly"
+                  type="button"
+                  size="icon"
+                  variant="ghost"
+                  class="size-8 shrink-0 text-muted-foreground hover:text-foreground"
+                  :disabled="!String(row.value || '').trim()"
+                  :aria-label="_t('Translate option')"
+                  :title="_t('Translate option')"
+                  data-testid="choy-properties-definition-selection-translate"
+                  @click="emit('translate', String(row.value || '').trim())"
+                >
+                  <Languages class="size-4" aria-hidden="true" />
+                </ChoyButton>
+              </div>
+            </td>
+            <td class="px-1 py-1 align-middle">
+              <ChoyButton
+                v-if="!readonly"
+                type="button"
+                size="icon"
+                variant="ghost"
+                class="size-7 text-muted-foreground hover:text-destructive"
+                :aria-label="_t('Delete')"
+                data-testid="choy-properties-definition-selection-remove"
+                @click="onRemove(index)"
+              >
+                <Trash2 class="size-3.5" aria-hidden="true" />
+              </ChoyButton>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <div
+      v-if="!readonly"
+      class="flex items-center border-t border-border px-3 py-2"
+      data-testid="choy-properties-definition-selection-add-footer"
+    >
+      <ChoyButton
+        type="button"
+        size="sm"
+        variant="link"
+        class="h-auto px-0"
+        data-testid="choy-properties-definition-selection-add"
+        @click="onAdd"
+      >
+        {{ _t('Add a line…') }}
+      </ChoyButton>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+import { GripVertical, Languages, Trash2 } from 'lucide-vue-next';
+import { createTranslate } from '@/web/web/i18n';
+import {
+  setListHandleDragImage,
+  useListHandleReorder,
+} from '@/web/web/composables/useListHandleReorder';
+import ChoyButton from '@/web/web/components/layout/ChoyButton.vue';
+import Input from '../vendor/ui/input/Input.vue';
+import type { SelectionDraftRow } from './propertiesDefinitionHelpers';
+
+defineOptions({ name: 'ChoyPropertiesDefinitionSelectionEditor' });
+
+const { _t } = createTranslate('web', {
+  scope: 'web/components/field/ChoyPropertiesDefinitionSelectionEditor',
+});
+
+const props = withDefaults(
+  defineProps<{
+    modelValue?: SelectionDraftRow[] | null;
+    readonly?: boolean;
+  }>(),
+  {
+    modelValue: () => [],
+    readonly: false,
+  },
+);
+
+const emit = defineEmits<{
+  'update:modelValue': [rows: SelectionDraftRow[]];
+  translate: [value: string];
+}>();
+
+const rows = computed(() => (Array.isArray(props.modelValue) ? props.modelValue : []));
+const handleEnabled = computed(() => !props.readonly);
+
+const handleReorder = useListHandleReorder({
+  rows: () => rows.value as SelectionDraftRow[],
+  enabled: handleEnabled,
+  getRecord: () => ({}),
+  onReorder: next => emitRows(next as SelectionDraftRow[]),
+});
+
+function rowKey(row: SelectionDraftRow, index: number): string {
+  const value = String(row.value || '').trim();
+  return value ? `${value}-${index}` : `new-${index}`;
+}
+
+function emitRows(next: SelectionDraftRow[]) {
+  emit(
+    'update:modelValue',
+    next.map(r => ({ value: String(r.value ?? ''), label: String(r.label ?? '') })),
+  );
+}
+
+function onValue(index: number, raw: string | number) {
+  const next = rows.value.map((r, i) => (i === index ? { ...r, value: String(raw ?? '') } : r));
+  emitRows(next);
+}
+
+function onLabel(index: number, raw: string | number) {
+  const next = rows.value.map((r, i) => (i === index ? { ...r, label: String(raw ?? '') } : r));
+  emitRows(next);
+}
+
+function onRemove(index: number) {
+  emitRows(rows.value.filter((_, i) => i !== index));
+}
+
+function onAdd() {
+  emitRows([...rows.value, { value: '', label: '' }]);
+}
+
+function selectionRowDragClass(index: number): Record<string, boolean> {
+  if (props.readonly) return {};
+  const dragging = handleReorder.draggingIndex.value;
+  const over = handleReorder.overIndex.value;
+  return {
+    'opacity-60': dragging === index,
+    'bg-accent/40 ring-1 ring-inset ring-primary/30':
+      dragging != null && over === index && over !== dragging,
+  };
+}
+
+function onHandleDragStart(index: number, event: DragEvent) {
+  event.stopPropagation();
+  handleReorder.onDragStart(index, event);
+  setListHandleDragImage(event);
+}
+
+function onRowDragOver(index: number, event: DragEvent) {
+  event.preventDefault();
+  handleReorder.onDragOver(index, event);
+}
+
+function onRowDrop(index: number, event: DragEvent) {
+  event.preventDefault();
+  void handleReorder.onDrop(index, event);
+}
+
+defineExpose({ handleReorder });
+</script>
diff --git a/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts b/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
index c753161b8..f03447b27 100644
--- a/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
+++ b/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
@@ -8,7 +8,9 @@ import {
   definitionItemsToDrafts,
   draftsToDefinitionItems,
   emptyDraftItem,
+  selectionRowsFromDraft,
   syncDraftLabelsForLang,
+  writeSelectionRowsToDraft,
 } from './propertiesDefinitionHelpers';
 
 describe('propertiesDefinitionHelpers', () => {
@@ -263,6 +265,40 @@ describe('propertiesDefinitionHelpers', () => {
     expect(draft.stringMap).toEqual({ en_US: 'Priority', zh_CN: '优先' });
   });
 
+  test('selectionRowsFromDraft / writeSelectionRowsToDraft keep maps across value rename', () => {
+    const draft = emptyDraftItem();
+    draft.type = 'selection';
+    draft.selectionText = JSON.stringify([
+      ['low', '低'],
+      ['normal', '普通'],
+    ]);
+    draft.selectionLabelMaps = {
+      low: { en_US: 'Low', zh_CN: '低' },
+      normal: { en_US: 'Normal', zh_CN: '普通' },
+    };
+    expect(selectionRowsFromDraft(draft)).toEqual([
+      { value: 'low', label: '低' },
+      { value: 'normal', label: '普通' },
+    ]);
+    writeSelectionRowsToDraft(
+      draft,
+      [
+        { value: 'lo', label: '低' },
+        { value: 'normal', label: '普通' },
+        { value: '', label: '' },
+      ],
+      'zh_CN',
+    );
+    expect(draft.selectionLabelMaps.lo).toEqual({ en_US: 'Low', zh_CN: '低' });
+    expect(draft.selectionLabelMaps.low).toBeUndefined();
+    expect(draft.selectionLabelMaps.normal).toEqual({ en_US: 'Normal', zh_CN: '普通' });
+    expect(JSON.parse(draft.selectionText)).toEqual([
+      ['lo', '低'],
+      ['normal', '普通'],
+      ['', ''],
+    ]);
+  });
+
   test('buildDefinitionScopeCondition', () => {
     expect(
       buildDefinitionScopeCondition({
diff --git a/modules/web/web/components/field/propertiesDefinitionHelpers.ts b/modules/web/web/components/field/propertiesDefinitionHelpers.ts
index c96fefc18..7fa965c70 100644
--- a/modules/web/web/components/field/propertiesDefinitionHelpers.ts
+++ b/modules/web/web/components/field/propertiesDefinitionHelpers.ts
@@ -23,12 +23,75 @@ export type DefinitionEditorDraftItem = {
   stringMap: Record<string, string>;
   default: string;
   readonly: boolean;
-  /** Selection JSON with current-language labels for the textarea. */
+  /** Selection options bridge: JSON tuples of [value, current-lang label] for the list editor. */
   selectionText: string;
-  /** Option value → label lang map (survives current-lang textarea edits via merge). */
+  /** Option value → label lang map (survives current-lang list edits via merge). */
   selectionLabelMaps: Record<string, Record<string, string>>;
 };
 
+/** One selection option row in the definition list editor (O2M-like). */
+export type SelectionDraftRow = {
+  value: string;
+  label: string;
+};
+
+/** Parse draft.selectionText into editable list rows (may include blank values while typing). */
+export function selectionRowsFromDraft(draft: DefinitionEditorDraftItem): SelectionDraftRow[] {
+  try {
+    const parsed = draft.selectionText ? JSON.parse(draft.selectionText) : [];
+    return normalizeSelectionOptions(parsed).map(o => ({
+      value: o.value,
+      label: String(o.label ?? ''),
+    }));
+  } catch {
+    return Object.keys(draft.selectionLabelMaps || {}).map(value => ({
+      value,
+      label: unwrapPropertyLabel(draft.selectionLabelMaps[value] || {}, TRANSLATED_BASE_LANG) || value,
+    }));
+  }
+}
+
+/**
+ * Write list-editor rows back onto the draft.
+ * Preserves lang maps across value renames by index when possible.
+ */
+export function writeSelectionRowsToDraft(
+  draft: DefinitionEditorDraftItem,
+  rows: SelectionDraftRow[],
+  lang: string = TRANSLATED_BASE_LANG,
+): void {
+  const code = String(lang || '').trim() || TRANSLATED_BASE_LANG;
+  const prevRows = selectionRowsFromDraft(draft);
+  const prevMaps: Record<string, Record<string, string>> = {};
+  for (const [k, v] of Object.entries(draft.selectionLabelMaps || {})) {
+    prevMaps[k] = { ...(v || {}) };
+  }
+  const cleaned = (rows || []).map(r => ({
+    value: String(r?.value ?? '').trim(),
+    label: String(r?.label ?? ''),
+  }));
+  const nextMaps: Record<string, Record<string, string>> = {};
+  const usedPrev = new Set<string>();
+  for (let i = 0; i < cleaned.length; i++) {
+    const row = cleaned[i]!;
+    if (!row.value) continue;
+    const oldValue = String(prevRows[i]?.value || '').trim();
+    let base = prevMaps[row.value];
+    if (!base && oldValue && oldValue !== row.value && !usedPrev.has(oldValue)) {
+      base = prevMaps[oldValue];
+      usedPrev.add(oldValue);
+    }
+    nextMaps[row.value] = asLabelMap(mergePropertyLabelWrite(base || {}, row.label, code));
+  }
+  draft.selectionLabelMaps = nextMaps;
+  const display = cleaned.map(r => [r.value, r.label || r.value] as [string, string]);
+  try {
+    draft.selectionText = display.length ? JSON.stringify(display) : '';
+  } catch {
+    draft.selectionText = '';
+  }
+}
+
 export function emptyDraftItem(): DefinitionEditorDraftItem {
   return {
     name: '',
@@ -216,7 +279,7 @@ export function draftsToDefinitionItems(
       if (!Array.isArray(parsed) || !parsed.length) {
         throw new Error(`selection property '${name}' requires a non-empty selection array`);
       }
-      const options = normalizeSelectionOptions(parsed);
+      const options = normalizeSelectionOptions(parsed).filter(o => String(o.value || '').trim() !== '');
       if (!options.length) {
         throw new Error(`selection property '${name}' has no usable options`);
       }
diff --git a/modules/web/web/components/internal/DataTable.vue b/modules/web/web/components/internal/DataTable.vue
index 8a6266613..b6a7e1e3a 100644
--- a/modules/web/web/components/internal/DataTable.vue
+++ b/modules/web/web/components/internal/DataTable.vue
@@ -134,6 +134,7 @@ SPDX-License-Identifier: Apache-2.0
             item.start != null ? 'absolute left-0' : undefined,
             rowIsSelected(item.row) ? 'bg-muted hover:bg-muted' : undefined,
             dataTableIsGroupLikeRow(item.row) ? 'bg-muted/30' : undefined,
+            handleRowClass(item),
           ]"
           :style="{
             gridTemplateColumns: gridTemplate,
@@ -143,6 +144,8 @@ SPDX-License-Identifier: Apache-2.0
           }"
           @click="onRowClick($event, item.row)"
           @keydown="onRowKeydown($event, item.row)"
+          @dragover="onHandleRowDragOver(item, $event)"
+          @drop="onHandleRowDrop(item, $event)"
         >
           <!-- Group / more rows: one full-width cell (main OVTable RowMerge). -->
           <div
@@ -209,7 +212,7 @@ SPDX-License-Identifier: Apache-2.0
 </template>
 
 <script setup lang="ts" generic="T extends Record<string, unknown>">
-import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue';
+import { computed, inject, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 import {
   FlexRender,
   getCoreRowModel,
@@ -222,6 +225,10 @@ import {
 import { useVirtualizer } from '@tanstack/vue-virtual';
 import { ChevronDown, ChevronUp } from 'lucide-vue-next';
 import { CHOY_LIST_ROW_HEIGHT } from '../../composables/listDensity';
+import {
+  LIST_HANDLE_API_KEY,
+  type ListHandleReorderApi,
+} from '../../composables/useListHandleReorder';
 import { cn, type ClassValue } from '../../lib/utils';
 import Checkbox from '../vendor/ui/checkbox/Checkbox.vue';
 import {
@@ -251,6 +258,9 @@ import {
   type DataTableRowId
 } from './dataTableHelpers';
 
+/** Optional list/O2M handle reorder API (absent when the host has no handle column). */
+const handleApi = inject<ListHandleReorderApi | null>(LIST_HANDLE_API_KEY, null);
+
 /**
  * L3 virtual data table (TanStack Table + virtualizer).
  * Not a public Choy* export — consumed by List and related kit hosts.
@@ -787,6 +797,39 @@ function onRowClick(event: MouseEvent, row: (typeof rows.value)[number] | undefi
   emit('row-click', row.original);
 }
 
+function handleReorderActive(): boolean {
+  return Boolean(handleApi?.enabled?.value);
+}
+
+/** Source / drop-target chrome while a list handle drag is in progress. */
+function handleRowClass(item: { index: number; row?: (typeof rows.value)[number] }): string | undefined {
+  if (!handleReorderActive() || dataTableIsGroupLikeRow(item.row)) return undefined;
+  const dragging = handleApi?.draggingIndex?.value;
+  const over = handleApi?.overIndex?.value;
+  if (dragging == null) return undefined;
+  if (dragging === item.index) return 'opacity-60';
+  if (over === item.index && over !== dragging) {
+    return 'bg-accent/40 ring-1 ring-inset ring-primary/30';
+  }
+  return undefined;
+}
+
+function onHandleRowDragOver(
+  item: { index: number; row?: (typeof rows.value)[number] },
+  event: DragEvent,
+): void {
+  if (!handleReorderActive() || dataTableIsGroupLikeRow(item.row)) return;
+  handleApi?.onDragOver(item.index, event);
+}
+
+function onHandleRowDrop(
+  item: { index: number; row?: (typeof rows.value)[number] },
+  event: DragEvent,
+): void {
+  if (!handleReorderActive() || dataTableIsGroupLikeRow(item.row)) return;
+  void handleApi?.onDrop(item.index, event);
+}
+
 type TableColumnLike = {
   id: string;
   columnDef?: { meta?: { selectColumn?: boolean; align?: unknown } };
diff --git a/modules/web/web/components/table/ChoyTableColumn.handle.test.ts b/modules/web/web/components/table/ChoyTableColumn.handle.test.ts
index f1d615760..fb121f65e 100644
--- a/modules/web/web/components/table/ChoyTableColumn.handle.test.ts
+++ b/modules/web/web/components/table/ChoyTableColumn.handle.test.ts
@@ -62,15 +62,39 @@ describe('ChoyTableColumn handle type', () => {
     const preventDefault = fnRecorder();
     const stopPropagation = fnRecorder();
     const setData = fnRecorder();
+    const setDragImage = fnRecorder();
     const cell = col.cellRenderer({ rowData: { Id: '1' }, rowIndex: 0 });
     expect(cell.props.class).toContain('choy-list-handle');
     expect(cell.props.draggable).toBe('true');
 
-    cell.props.onDragstart({ preventDefault, stopPropagation, dataTransfer: { effectAllowed: '', setData } });
-    expect(handleApi.draggingIndex.value).toBe(0);
+    const handleEl = document.createElement('span');
+    const rowEl = document.createElement('div');
+    rowEl.setAttribute('role', 'row');
+    rowEl.appendChild(handleEl);
+    document.body.appendChild(rowEl);
+    Object.defineProperty(rowEl, 'getBoundingClientRect', {
+      value: () => ({ left: 0, top: 0, width: 80, height: 24 }),
+    });
+    try {
+      cell.props.onDragstart({
+        preventDefault,
+        stopPropagation,
+        clientX: 4,
+        clientY: 6,
+        currentTarget: handleEl,
+        dataTransfer: { effectAllowed: '', setData, setDragImage },
+      });
+      expect(handleApi.draggingIndex.value).toBe(0);
+      expect(handleApi.overIndex.value).toBe(0);
+      expect(setDragImage.calls.length).toBe(1);
+      expect(setDragImage.calls[0]?.[0]).toBe(rowEl);
+    } finally {
+      rowEl.remove();
+    }
 
     cell.props.onDragover({ preventDefault, stopPropagation, dataTransfer: { dropEffect: '' } });
     expect(preventDefault.calls.length).toBeGreaterThan(0);
+    expect(handleApi.overIndex.value).toBe(0);
 
     cell.props.onDrop({ preventDefault, stopPropagation });
     await nextTick();
diff --git a/modules/web/web/components/table/ChoyTableColumn.vue b/modules/web/web/components/table/ChoyTableColumn.vue
index a5b2cc743..cbd82b986 100644
--- a/modules/web/web/components/table/ChoyTableColumn.vue
+++ b/modules/web/web/components/table/ChoyTableColumn.vue
@@ -17,7 +17,11 @@ import {
   type Column,
 } from '@/web/web/composables/useTable';
 import type { TableColumnMeta } from '@/web/web/composables/useTable';
-import { LIST_HANDLE_API_KEY, type ListHandleReorderApi } from '@/web/web/composables/useListHandleReorder';
+import {
+  LIST_HANDLE_API_KEY,
+  setListHandleDragImage,
+  type ListHandleReorderApi,
+} from '@/web/web/composables/useListHandleReorder';
 import {
   onTableColumnSignatureChange,
   skipTableColumnReregister,
@@ -310,6 +314,7 @@ function buildColumn(): Column {
             onDragstart: (e: DragEvent) => {
               e.stopPropagation();
               api?.onDragStart(rowIndex, e);
+              setListHandleDragImage(e);
             },
             onDragover: (e: DragEvent) => {
               e.stopPropagation();
diff --git a/modules/web/web/components/view/ChoyKanbanVirtualLaneBody.vue b/modules/web/web/components/view/ChoyKanbanVirtualLaneBody.vue
index 50856b29c..1845cf57e 100644
--- a/modules/web/web/components/view/ChoyKanbanVirtualLaneBody.vue
+++ b/modules/web/web/components/view/ChoyKanbanVirtualLaneBody.vue
@@ -139,6 +139,7 @@ SPDX-License-Identifier: Apache-2.0
 import { computed, ref } from 'vue';
 import { useVirtualizer } from '@tanstack/vue-virtual';
 import { MoreHorizontal } from 'lucide-vue-next';
+import { setHtml5DragImage } from '@/web/web/composables/useListHandleReorder';
 import ChoyButton from '../layout/ChoyButton.vue';
 import DropdownMenu from '../vendor/ui/dropdown-menu/DropdownMenu.vue';
 import DropdownMenuContent from '../vendor/ui/dropdown-menu/DropdownMenuContent.vue';
@@ -233,16 +234,9 @@ function onCardDragStart(event: DragEvent, card: ChoyKanbanCard | undefined): vo
   event.dataTransfer.setData(CHOY_KANBAN_LANE_DRAG_MIME, encoded);
   event.dataTransfer.setData('text/plain', card.id);
   event.dataTransfer.effectAllowed = 'move';
-  // Use the card node itself: off-screen / removed ghosts often fail in Chromium
-  // and fall back to a tiny default icon. The browser snapshots at dragstart, so
-  // later virtual recycle of the source node does not blank the drag image.
+  // Card node itself: off-screen ghosts often fail in Chromium; browser snapshots at dragstart.
   const el = event.currentTarget;
-  if (el instanceof HTMLElement) {
-    const rect = el.getBoundingClientRect();
-    const offsetX = Math.max(0, Math.min(rect.width, event.clientX - rect.left));
-    const offsetY = Math.max(0, Math.min(rect.height, event.clientY - rect.top));
-    event.dataTransfer.setDragImage(el, offsetX, offsetY);
-  }
+  if (el instanceof HTMLElement) setHtml5DragImage(el, event);
 }
 
 function moveToLabel(label: string): string {
diff --git a/modules/web/web/composables/useListHandleReorder.test.ts b/modules/web/web/composables/useListHandleReorder.test.ts
index 84eb4439a..b2eb1193a 100644
--- a/modules/web/web/composables/useListHandleReorder.test.ts
+++ b/modules/web/web/composables/useListHandleReorder.test.ts
@@ -2,7 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ref } from 'vue';
-import { useListHandleReorder } from '@/web/web/composables/useListHandleReorder';
+import {
+  setHtml5DragImage,
+  setListHandleDragImage,
+  useListHandleReorder,
+} from '@/web/web/composables/useListHandleReorder';
 import { asyncFnRecorder, fnRecorder } from '@/web/web/__tests__/mountApp';
 
 function dragEvent(partial?: Partial<DragEvent> & { throwTransfer?: boolean }): DragEvent {
@@ -10,6 +14,7 @@ function dragEvent(partial?: Partial<DragEvent> & { throwTransfer?: boolean }):
     effectAllowed: '',
     dropEffect: '',
     setData: fnRecorder(),
+    setDragImage: fnRecorder(),
   };
   if (partial?.throwTransfer) {
     Object.defineProperty(transfer, 'effectAllowed', {
@@ -64,14 +69,17 @@ describe('useListHandleReorder', () => {
     const start = dragEvent();
     api.onDragStart(0, start);
     expect(api.draggingIndex.value).toBe(0);
+    expect(api.overIndex.value).toBe(0);
     expect((start.dataTransfer!.setData as any).calls.length).toBe(1);
 
     const over = dragEvent();
     api.onDragOver(2, over);
     expect((over.preventDefault as any).calls.length).toBe(1);
+    expect(api.overIndex.value).toBe(2);
 
     const drop = dragEvent();
     await api.onDrop(2, drop);
+    expect(api.overIndex.value).toBeNull();
     expect(onReorder.calls.length).toBe(1);
     const [nextRows, changed] = onReorder.calls[0] as [any[], any[]];
     expect(nextRows.map((r: any) => r.payload.Id)).toEqual(['b', 'c', 'a']);
@@ -84,6 +92,70 @@ describe('useListHandleReorder', () => {
 
     api.onDragEnd();
     expect(api.draggingIndex.value).toBeNull();
+    expect(api.overIndex.value).toBeNull();
+  });
+
+  test('overIndex clears on dragEnd without drop', () => {
+    const enabled = ref(true);
+    const api = useListHandleReorder({
+      rows: () => [
+        { Id: '1', Sequence: 1 },
+        { Id: '2', Sequence: 2 },
+      ],
+      enabled,
+      onReorder: fnRecorder(),
+    });
+    api.onDragStart(0, dragEvent());
+    api.onDragOver(1, dragEvent());
+    expect(api.overIndex.value).toBe(1);
+    api.onDragEnd();
+    expect(api.draggingIndex.value).toBeNull();
+    expect(api.overIndex.value).toBeNull();
+  });
+
+  test('setHtml5DragImage / setListHandleDragImage tolerate missing transfer', () => {
+    const el = document.createElement('div');
+    el.setAttribute('role', 'row');
+    const handle = document.createElement('span');
+    el.appendChild(handle);
+    document.body.appendChild(el);
+    try {
+      expect(() => setHtml5DragImage(el, { clientX: 0, clientY: 0 } as DragEvent)).not.toThrow();
+      const setDragImage = fnRecorder();
+      const e = {
+        clientX: 10,
+        clientY: 12,
+        currentTarget: handle,
+        dataTransfer: { setDragImage },
+      } as unknown as DragEvent;
+      Object.defineProperty(el, 'getBoundingClientRect', {
+        value: () => ({ left: 0, top: 0, width: 100, height: 40 }),
+      });
+      setHtml5DragImage(el, e);
+      expect(setDragImage.calls.length).toBe(1);
+      expect(setDragImage.calls[0]).toEqual([el, 10, 12]);
+
+      const setDragImage2 = fnRecorder();
+      setListHandleDragImage({
+        clientX: 5,
+        clientY: 6,
+        currentTarget: handle,
+        dataTransfer: { setDragImage: setDragImage2 },
+      } as unknown as DragEvent);
+      expect(setDragImage2.calls.length).toBe(1);
+      expect(setDragImage2.calls[0]?.[0]).toBe(el);
+
+      // No matching ancestor → no-op.
+      const orphan = document.createElement('span');
+      expect(() =>
+        setListHandleDragImage({
+          currentTarget: orphan,
+          dataTransfer: { setDragImage: fnRecorder() },
+        } as unknown as DragEvent),
+      ).not.toThrow();
+    } finally {
+      el.remove();
+    }
   });
 
   test('no-ops when drop index equals drag index or out of range', async () => {
diff --git a/modules/web/web/composables/useListHandleReorder.ts b/modules/web/web/composables/useListHandleReorder.ts
index 5ca968ef1..2cfd0d68d 100644
--- a/modules/web/web/composables/useListHandleReorder.ts
+++ b/modules/web/web/composables/useListHandleReorder.ts
@@ -10,9 +10,59 @@ import { renumberSequence } from '@/web/web/composables/listRowEdit';
 
 export const LIST_HANDLE_API_KEY = Symbol('list-handle-api');
 
+/** data-testid values that identify a drag-image source row/card. */
+const LIST_HANDLE_DRAG_IMAGE_TEST_IDS = new Set([
+  'choy-o2m-kanban-card',
+  'choy-properties-definition-row',
+  'choy-properties-definition-selection-row',
+]);
+
+/**
+ * Snapshot `target` as the HTML5 drag ghost (Kanban / list handle shared offset math).
+ * No-ops when dataTransfer is missing; never throws.
+ */
+export function setHtml5DragImage(target: Element, event: DragEvent): void {
+  const dt = event.dataTransfer;
+  if (!dt || !(target instanceof HTMLElement)) return;
+  try {
+    const rect = target.getBoundingClientRect();
+    const offsetX = Math.max(0, Math.min(rect.width, event.clientX - rect.left));
+    const offsetY = Math.max(0, Math.min(rect.height, event.clientY - rect.top));
+    dt.setDragImage(target, offsetX, offsetY);
+  } catch {
+    /* ignore */
+  }
+}
+
+/** True for list/kanban/definition row containers used as drag ghosts. */
+export function isListHandleDragImageSource(el: Element): boolean {
+  if (el.getAttribute('role') === 'row') return true;
+  const testId = el.getAttribute('data-testid');
+  return !!testId && LIST_HANDLE_DRAG_IMAGE_TEST_IDS.has(testId);
+}
+
+/**
+ * Walk ancestors from the drag handle to the nearest row/card and set the drag image.
+ * Avoids compound CSS selectors so minimal/test DOMs without full `closest` still work.
+ */
+export function setListHandleDragImage(event: DragEvent): void {
+  const start = event.currentTarget;
+  if (!(start instanceof Element)) return;
+  let node: Element | null = start;
+  while (node) {
+    if (isListHandleDragImageSource(node)) {
+      setHtml5DragImage(node, event);
+      return;
+    }
+    node = node.parentElement;
+  }
+}
+
 export type ListHandleReorderApi = {
   enabled: Ref<boolean>;
   draggingIndex: Ref<number | null>;
+  /** Row currently hovered as the drop target while dragging (null when idle). */
+  overIndex: Ref<number | null>;
   onDragStart: (index: number, event: DragEvent) => void;
   onDragOver: (index: number, event: DragEvent) => void;
   onDrop: (index: number, event: DragEvent) => void | Promise<void>;
@@ -30,14 +80,21 @@ export function useListHandleReorder<T extends Record<string, any>>(opts: {
   onReorder: (rows: T[], changed: ReturnType<typeof renumberSequence<Record<string, any>>>) => void | Promise<void>;
 }): ListHandleReorderApi {
   const draggingIndex = ref<number | null>(null);
+  const overIndex = ref<number | null>(null);
   const recordOf = (row: T) => opts.getRecord?.(row) ?? (row as Record<string, any>);
 
+  function clearDragState() {
+    draggingIndex.value = null;
+    overIndex.value = null;
+  }
+
   function onDragStart(index: number, event: DragEvent) {
     if (!opts.enabled.value) {
       event.preventDefault();
       return;
     }
     draggingIndex.value = index;
+    overIndex.value = index;
     try {
       event.dataTransfer!.effectAllowed = 'move';
       event.dataTransfer!.setData('text/plain', String(index));
@@ -49,6 +106,7 @@ export function useListHandleReorder<T extends Record<string, any>>(opts: {
   function onDragOver(index: number, event: DragEvent) {
     if (!opts.enabled.value || draggingIndex.value == null) return;
     event.preventDefault();
+    overIndex.value = index;
     try {
       event.dataTransfer!.dropEffect = 'move';
     } catch {
@@ -58,9 +116,12 @@ export function useListHandleReorder<T extends Record<string, any>>(opts: {
 
   async function onDrop(index: number, event: DragEvent) {
     event.preventDefault();
-    if (!opts.enabled.value) return;
+    if (!opts.enabled.value) {
+      clearDragState();
+      return;
+    }
     const from = draggingIndex.value;
-    draggingIndex.value = null;
+    clearDragState();
     if (from == null || from === index) return;
 
     const rows = opts.rows().slice();
@@ -85,12 +146,13 @@ export function useListHandleReorder<T extends Record<string, any>>(opts: {
   }
 
   function onDragEnd() {
-    draggingIndex.value = null;
+    clearDragState();
   }
 
   return {
     enabled: opts.enabled,
     draggingIndex,
+    overIndex,
     onDragStart,
     onDragOver,
     onDrop,
diff --git a/modules/web/web/kit.ts b/modules/web/web/kit.ts
index 1de08b416..de016816f 100644
--- a/modules/web/web/kit.ts
+++ b/modules/web/web/kit.ts
@@ -241,7 +241,9 @@ export { default as ChoyImageField } from './components/field/ChoyImageField.vue
 export { default as ChoyHtmlField } from './components/field/ChoyHtmlField.vue';
 export { default as ChoyJsonField } from './components/field/ChoyJsonField.vue';
 export { default as ChoyPropertiesField } from './components/field/ChoyPropertiesField.vue';
-export { default as ChoyPropertiesDefinitionEditor } from './components/field/ChoyPropertiesDefinitionEditor.vue';
+export { default as ChoyPropertiesDefinitionField } from './components/field/ChoyPropertiesDefinitionField.vue';
+export { default as ChoyPropertiesDefinitionItemDialog } from './components/field/ChoyPropertiesDefinitionItemDialog.vue';
+export { default as ChoyPropertiesDefinitionSelectionEditor } from './components/field/ChoyPropertiesDefinitionSelectionEditor.vue';
 export { default as ChoyVirtualField } from './components/field/ChoyVirtualField.vue';
 export { default as ChoyFieldTranslationsDialog } from './components/field/ChoyFieldTranslationsDialog.vue';
 export { default as ChoyFieldCompanyValuesDialog } from './components/field/ChoyFieldCompanyValuesDialog.vue';
diff --git a/modules/web/web/utils/diff_payload.test.ts b/modules/web/web/utils/diff_payload.test.ts
index 9d16bbf10..6a9b0d723 100644
--- a/modules/web/web/utils/diff_payload.test.ts
+++ b/modules/web/web/utils/diff_payload.test.ts
@@ -125,6 +125,19 @@ test('FE buildUpdatePayload properties / jsonobject whole-map replace', () => {
     { Properties: { type: 'properties' } },
   );
   expect(scalar.Properties).toBe('not-a-map');
+
+  // jsonobject array (PropertyDefinition.Definition): whole-array replace, never {0:…,1:…}.
+  const defOriginal = {
+    Definition: [{ name: 'external_code', type: 'char', string: { zh_CN: '外部编码' } }],
+  };
+  const defCurrent = {
+    Definition: [{ name: 'external_code', type: 'char', string: { zh_CN: '外部' } }],
+  };
+  const defPayload = buildUpdatePayload(defOriginal, defCurrent, {
+    Definition: { type: 'jsonobject' },
+  });
+  expect(Array.isArray(defPayload.Definition)).toBe(true);
+  expect(defPayload.Definition).toEqual(defCurrent.Definition);
 });
 
 test('FE buildUpdatePayload collapses nested map microdiff without fieldsMeta', () => {

From cfd9403f443b5a23b0bb1c6585daffdc6f5cadd2 Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Wed, 28 Oct 2026 15:17:26 +0800
Subject: [PATCH 06/23] fix(web): show PropertyDefinition form-help and
 coalesce FieldsGet RPCs

- add Field help (+ zh) on PropertyDefinition scope fields from the model
- ensure presentation FieldsGet on display mount and when entering edit
- coalesce concurrent ensureFieldsGet for the same lang/attrs into one RPC
- optional ChoyFieldBase/Varchar help prop with unit coverage
---
 modules/core/i18n/core.pot                    |  30 +++-
 modules/core/i18n/zh_CN.po                    |  30 +++-
 .../model/property_definition_base_model.ts   |  14 ++
 ...roperty_definition_fields_get_help.test.ts |  20 +++
 modules/sandbox/i18n/sandbox.pot              |  16 +-
 modules/sandbox/i18n/zh_CN.po                 |  41 +++--
 .../components/field/ChoyFieldBase.test.ts    |  13 ++
 .../web/components/field/ChoyFieldBase.vue    |  25 ++-
 .../web/components/field/ChoyVarcharField.vue |   3 +
 modules/web/web/stores/fieldsGet.test.ts      |  47 +++++
 modules/web/web/stores/fieldsGet.ts           | 163 ++++++++++++++++--
 11 files changed, 350 insertions(+), 52 deletions(-)
 create mode 100644 modules/core/service/orm/model/property_definition_fields_get_help.test.ts

diff --git a/modules/core/i18n/core.pot b/modules/core/i18n/core.pot
index 91d630075..b548a2dbc 100644
--- a/modules/core/i18n/core.pot
+++ b/modules/core/i18n/core.pot
@@ -47,27 +47,47 @@ msgctxt "core.model.BaseModel.fields"
 msgid "Updated By"
 msgstr ""
 
-#: service/orm/model/property_definition_base_model.ts:216
+#: service/orm/model/property_definition_base_model.ts
 msgctxt "core.model.PropertyDefinition.fields"
 msgid "Container Id"
 msgstr ""
 
-#: service/orm/model/property_definition_base_model.ts:207
+#: service/orm/model/property_definition_base_model.ts
 msgctxt "core.model.PropertyDefinition.fields"
 msgid "Container Model"
 msgstr ""
 
-#: service/orm/model/property_definition_base_model.ts:224
+#: service/orm/model/property_definition_base_model.ts
 msgctxt "core.model.PropertyDefinition.fields"
 msgid "Definition"
 msgstr ""
 
-#: service/orm/model/property_definition_base_model.ts:199
+#: service/orm/model/property_definition_base_model.ts
+msgctxt "core.model.PropertyDefinition.fields"
+msgid "Leave empty for app-level scope; set to the parent model short name for record-scoped definitions."
+msgstr ""
+
+#: service/orm/model/property_definition_base_model.ts
+msgctxt "core.model.PropertyDefinition.fields"
+msgid "Leave empty for app-level scope; set with Container Model to bind this definition to one parent record."
+msgstr ""
+
+#: service/orm/model/property_definition_base_model.ts
+msgctxt "core.model.PropertyDefinition.fields"
+msgid "Model that owns the properties column (e.g. SandboxRecord)."
+msgstr ""
+
+#: service/orm/model/property_definition_base_model.ts
+msgctxt "core.model.PropertyDefinition.fields"
+msgid "Name of the properties field on the target model (e.g. Properties)."
+msgstr ""
+
+#: service/orm/model/property_definition_base_model.ts
 msgctxt "core.model.PropertyDefinition.fields"
 msgid "Properties Field"
 msgstr ""
 
-#: service/orm/model/property_definition_base_model.ts:190
+#: service/orm/model/property_definition_base_model.ts
 msgctxt "core.model.PropertyDefinition.fields"
 msgid "Target Model"
 msgstr ""
diff --git a/modules/core/i18n/zh_CN.po b/modules/core/i18n/zh_CN.po
index a4e5313ef..4a09b367c 100644
--- a/modules/core/i18n/zh_CN.po
+++ b/modules/core/i18n/zh_CN.po
@@ -41,27 +41,47 @@ msgctxt "core.model.BaseModel.fields"
 msgid "Updated By"
 msgstr "更新人"
 
-#: service/orm/model/property_definition_base_model.ts:216
+#: service/orm/model/property_definition_base_model.ts
 msgctxt "core.model.PropertyDefinition.fields"
 msgid "Container Id"
 msgstr "容器 ID"
 
-#: service/orm/model/property_definition_base_model.ts:207
+#: service/orm/model/property_definition_base_model.ts
 msgctxt "core.model.PropertyDefinition.fields"
 msgid "Container Model"
 msgstr "容器模型"
 
-#: service/orm/model/property_definition_base_model.ts:224
+#: service/orm/model/property_definition_base_model.ts
 msgctxt "core.model.PropertyDefinition.fields"
 msgid "Definition"
 msgstr "定义"
 
-#: service/orm/model/property_definition_base_model.ts:199
+#: service/orm/model/property_definition_base_model.ts
+msgctxt "core.model.PropertyDefinition.fields"
+msgid "Leave empty for app-level scope; set to the parent model short name for record-scoped definitions."
+msgstr "应用级作用域请留空；记录级定义则填写父模型短名。"
+
+#: service/orm/model/property_definition_base_model.ts
+msgctxt "core.model.PropertyDefinition.fields"
+msgid "Leave empty for app-level scope; set with Container Model to bind this definition to one parent record."
+msgstr "应用级作用域请留空；与「容器模型」一起填写以绑定到一条父记录。"
+
+#: service/orm/model/property_definition_base_model.ts
+msgctxt "core.model.PropertyDefinition.fields"
+msgid "Model that owns the properties column (e.g. SandboxRecord)."
+msgstr "拥有属性列的业务模型（例如 SandboxRecord）。"
+
+#: service/orm/model/property_definition_base_model.ts
+msgctxt "core.model.PropertyDefinition.fields"
+msgid "Name of the properties field on the target model (e.g. Properties)."
+msgstr "目标模型上的属性字段名（例如 Properties）。"
+
+#: service/orm/model/property_definition_base_model.ts
 msgctxt "core.model.PropertyDefinition.fields"
 msgid "Properties Field"
 msgstr "属性字段"
 
-#: service/orm/model/property_definition_base_model.ts:190
+#: service/orm/model/property_definition_base_model.ts
 msgctxt "core.model.PropertyDefinition.fields"
 msgid "Target Model"
 msgstr "目标模型"
diff --git a/modules/core/service/orm/model/property_definition_base_model.ts b/modules/core/service/orm/model/property_definition_base_model.ts
index 8f49dd29d..a142c2f97 100644
--- a/modules/core/service/orm/model/property_definition_base_model.ts
+++ b/modules/core/service/orm/model/property_definition_base_model.ts
@@ -188,6 +188,9 @@ export default class PropertyDefinitionBaseModel extends BaseModel {
     notNull: true,
     index: true,
     string: _lt('Target Model', { scope: 'core.model.PropertyDefinition.fields' }),
+    help: _lt('Model that owns the properties column (e.g. SandboxRecord).', {
+      scope: 'core.model.PropertyDefinition.fields',
+    }),
   })
   TargetModel!: string;
 
@@ -197,6 +200,9 @@ export default class PropertyDefinitionBaseModel extends BaseModel {
     notNull: true,
     index: true,
     string: _lt('Properties Field', { scope: 'core.model.PropertyDefinition.fields' }),
+    help: _lt('Name of the properties field on the target model (e.g. Properties).', {
+      scope: 'core.model.PropertyDefinition.fields',
+    }),
   })
   PropertiesField!: string;
 
@@ -205,6 +211,10 @@ export default class PropertyDefinitionBaseModel extends BaseModel {
     type: 'varchar',
     size: 255,
     string: _lt('Container Model', { scope: 'core.model.PropertyDefinition.fields' }),
+    help: _lt(
+      'Leave empty for app-level scope; set to the parent model short name for record-scoped definitions.',
+      { scope: 'core.model.PropertyDefinition.fields' },
+    ),
   })
   ContainerModel?: string | null;
 
@@ -214,6 +224,10 @@ export default class PropertyDefinitionBaseModel extends BaseModel {
     size: 64,
     index: true,
     string: _lt('Container Id', { scope: 'core.model.PropertyDefinition.fields' }),
+    help: _lt(
+      'Leave empty for app-level scope; set with Container Model to bind this definition to one parent record.',
+      { scope: 'core.model.PropertyDefinition.fields' },
+    ),
   })
   ContainerId?: string | null;
 
diff --git a/modules/core/service/orm/model/property_definition_fields_get_help.test.ts b/modules/core/service/orm/model/property_definition_fields_get_help.test.ts
new file mode 100644
index 000000000..72f04c547
--- /dev/null
+++ b/modules/core/service/orm/model/property_definition_fields_get_help.test.ts
@@ -0,0 +1,20 @@
+// SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
+// SPDX-License-Identifier: Apache-2.0
+
+import { Model } from '../decorator/model';
+import PropertyDefinitionBaseModel from './property_definition_base_model';
+
+@Model('PropertyDefinition', { application: 'pdhelp' })
+class PdHelpPropertyDefinition extends PropertyDefinitionBaseModel {}
+
+test('PropertyDefinition FieldsGet returns help for scope fields', async () => {
+  const meta = await (PdHelpPropertyDefinition as any).FieldsGet(
+    ['TargetModel', 'PropertiesField', 'ContainerModel', 'ContainerId'],
+    ['help', 'helpText', 'string'],
+  );
+  expect(String(meta.TargetModel?.help || '')).toMatch(/properties column/i);
+  expect(String(meta.PropertiesField?.help || '')).toMatch(/properties field/i);
+  expect(String(meta.ContainerModel?.help || '')).toMatch(/app-level scope/i);
+  expect(String(meta.ContainerId?.help || '')).toMatch(/Container Model/i);
+  expect(meta.ContainerModel?.helpText?.src).toBeTruthy();
+});
diff --git a/modules/sandbox/i18n/sandbox.pot b/modules/sandbox/i18n/sandbox.pot
index 17f052526..5871007d3 100644
--- a/modules/sandbox/i18n/sandbox.pot
+++ b/modules/sandbox/i18n/sandbox.pot
@@ -517,21 +517,16 @@ msgctxt "web/views/SandboxLinesVirtTools"
 msgid "Short Lines stay content-sized. Open VIRT-LINES or fill rows to exercise capped table / kanban virtualize (not saved until you Save)."
 msgstr ""
 
-#: web/views/SandboxPropertyDefinitionFormView.vue:90
+#: web/views/SandboxPropertyDefinitionFormView.vue:21
 msgctxt "web/views/SandboxPropertyDefinitionFormView"
 msgid "Container Id"
 msgstr ""
 
-#: web/views/SandboxPropertyDefinitionFormView.vue:83
+#: web/views/SandboxPropertyDefinitionFormView.vue:18
 msgctxt "web/views/SandboxPropertyDefinitionFormView"
 msgid "Container Model"
 msgstr ""
 
-#: web/views/SandboxPropertyDefinitionFormView.vue:70
-msgctxt "web/views/SandboxPropertyDefinitionFormView"
-msgid "Container scope"
-msgstr ""
-
 #: web/views/sandbox_property_definition_actions.ts:10
 msgctxt "web/views/SandboxPropertyDefinitionFormView"
 msgid "Copy Property Definition"
@@ -542,7 +537,7 @@ msgctxt "web/views/SandboxPropertyDefinitionFormView"
 msgid "Create Property Definition"
 msgstr ""
 
-#: web/views/SandboxPropertyDefinitionFormView.vue:23
+#: web/views/SandboxPropertyDefinitionFormView.vue:26
 msgctxt "web/views/SandboxPropertyDefinitionFormView"
 msgid "Definition"
 msgstr ""
@@ -557,11 +552,6 @@ msgctxt "web/views/SandboxPropertyDefinitionFormView"
 msgid "Edit Property Definition"
 msgstr ""
 
-#: web/views/SandboxPropertyDefinitionFormView.vue:73
-msgctxt "web/views/SandboxPropertyDefinitionFormView"
-msgid "Optional parent container for record-scoped definitions. Leave empty for app-level properties (e.g. SandboxRecord.Properties)."
-msgstr ""
-
 #: web/views/SandboxPropertyDefinitionFormView.vue:15
 msgctxt "web/views/SandboxPropertyDefinitionFormView"
 msgid "Properties Field"
diff --git a/modules/sandbox/i18n/zh_CN.po b/modules/sandbox/i18n/zh_CN.po
index 1b7debe08..82ec61e36 100644
--- a/modules/sandbox/i18n/zh_CN.po
+++ b/modules/sandbox/i18n/zh_CN.po
@@ -511,21 +511,16 @@ msgctxt "web/views/SandboxLinesVirtTools"
 msgid "Short Lines stay content-sized. Open VIRT-LINES or fill rows to exercise capped table / kanban virtualize (not saved until you Save)."
 msgstr "短 Lines 保持内容高度。打开 VIRT-LINES 或填充行以练习封顶表格 / kanban 虚拟化（保存前不落库）。"
 
-#: web/views/SandboxPropertyDefinitionFormView.vue:90
+#: web/views/SandboxPropertyDefinitionFormView.vue:21
 msgctxt "web/views/SandboxPropertyDefinitionFormView"
 msgid "Container Id"
 msgstr "容器 ID"
 
-#: web/views/SandboxPropertyDefinitionFormView.vue:83
+#: web/views/SandboxPropertyDefinitionFormView.vue:18
 msgctxt "web/views/SandboxPropertyDefinitionFormView"
 msgid "Container Model"
 msgstr "容器模型"
 
-#: web/views/SandboxPropertyDefinitionFormView.vue:70
-msgctxt "web/views/SandboxPropertyDefinitionFormView"
-msgid "Container scope"
-msgstr "容器作用域"
-
 #: web/views/sandbox_property_definition_actions.ts:10
 msgctxt "web/views/SandboxPropertyDefinitionFormView"
 msgid "Copy Property Definition"
@@ -536,7 +531,7 @@ msgctxt "web/views/SandboxPropertyDefinitionFormView"
 msgid "Create Property Definition"
 msgstr "创建属性定义"
 
-#: web/views/SandboxPropertyDefinitionFormView.vue:23
+#: web/views/SandboxPropertyDefinitionFormView.vue:26
 msgctxt "web/views/SandboxPropertyDefinitionFormView"
 msgid "Definition"
 msgstr "定义"
@@ -551,11 +546,6 @@ msgctxt "web/views/SandboxPropertyDefinitionFormView"
 msgid "Edit Property Definition"
 msgstr "编辑属性定义"
 
-#: web/views/SandboxPropertyDefinitionFormView.vue:73
-msgctxt "web/views/SandboxPropertyDefinitionFormView"
-msgid "Optional parent container for record-scoped definitions. Leave empty for app-level properties (e.g. SandboxRecord.Properties)."
-msgstr "可选的父级容器，用于记录级定义。应用级属性（如 SandboxRecord.Properties）请留空。"
-
 #: web/views/SandboxPropertyDefinitionFormView.vue:15
 msgctxt "web/views/SandboxPropertyDefinitionFormView"
 msgid "Properties Field"
@@ -959,6 +949,30 @@ msgstr "标签"
 #~ msgid "Per-company varchar; open Company Values from the field chrome."
 #~ msgstr "按公司存储的 varchar；可从字段控件打开公司值。"
 
+#~ msgctxt "web/views/SandboxPropertyDefinitionFormView"
+#~ msgid "Container scope"
+#~ msgstr "容器作用域"
+
+#~ msgctxt "web/views/SandboxPropertyDefinitionFormView"
+#~ msgid "Leave empty for app-level scope; set to the parent model short name for record-scoped definitions."
+#~ msgstr "应用级作用域请留空；记录级定义则填写父模型短名。"
+
+#~ msgctxt "web/views/SandboxPropertyDefinitionFormView"
+#~ msgid "Leave empty for app-level scope; set with Container Model to bind this definition to one parent record."
+#~ msgstr "应用级作用域请留空；与「容器模型」一起填写以绑定到一条父记录。"
+
+#~ msgctxt "web/views/SandboxPropertyDefinitionFormView"
+#~ msgid "Model that owns the properties column (e.g. SandboxRecord)."
+#~ msgstr "拥有属性列的业务模型（例如 SandboxRecord）。"
+
+#~ msgctxt "web/views/SandboxPropertyDefinitionFormView"
+#~ msgid "Name of the properties field on the target model (e.g. Properties)."
+#~ msgstr "目标模型上的属性字段名（例如 Properties）。"
+
+#~ msgctxt "web/views/SandboxPropertyDefinitionFormView"
+#~ msgid "Optional parent container for record-scoped definitions. Leave empty for app-level properties (e.g. SandboxRecord.Properties)."
+#~ msgstr "可选的父级容器，用于记录级定义。应用级属性（如 SandboxRecord.Properties）请留空。"
+
 #~ msgctxt "web/views/SandboxRecordFormView"
 #~ msgid "Add Line"
 #~ msgstr "添加明细"
@@ -986,4 +1000,3 @@ msgstr "标签"
 #~ msgctxt "web/views/SandboxTagListView"
 #~ msgid "Sandbox Tag"
 #~ msgstr "沙箱标签"
-
diff --git a/modules/web/web/components/field/ChoyFieldBase.test.ts b/modules/web/web/components/field/ChoyFieldBase.test.ts
index 601ea5602..cebbc21dc 100644
--- a/modules/web/web/components/field/ChoyFieldBase.test.ts
+++ b/modules/web/web/components/field/ChoyFieldBase.test.ts
@@ -289,6 +289,19 @@ describe('ChoyFieldBase label and help', () => {
     m.unmount();
   });
 
+  test('prefers explicit help prop over meta.help', () => {
+    const m = mountBase({
+      binding: makeBinding({ string: 'Code', help: 'From meta' }),
+      help: 'From prop',
+      renderMode: 'form',
+    });
+    const help = m.q('[data-slot="form-help"]') as HTMLElement | null;
+    expect(help).toBeTruthy();
+    expect(help!.getAttribute('aria-label') || '').toContain('From prop');
+    expect(help!.getAttribute('aria-label') || '').not.toContain('From meta');
+    m.unmount();
+  });
+
   test('omits help tip when help is blank', () => {
     const m = mountBase({
       binding: makeBinding({ string: 'Code', help: '   ' }),
diff --git a/modules/web/web/components/field/ChoyFieldBase.vue b/modules/web/web/components/field/ChoyFieldBase.vue
index ef64d3bc8..727bd270b 100644
--- a/modules/web/web/components/field/ChoyFieldBase.vue
+++ b/modules/web/web/components/field/ChoyFieldBase.vue
@@ -442,6 +442,11 @@ const props = withDefaults(
   defineProps<{
     binding: UseField<T, V>;
     label?: string;
+    /**
+     * Explicit help tip (translated). When set, wins over FieldsGet / meta.help so
+     * form views can guarantee form-help without waiting on FieldsGet overlay.
+     */
+    help?: string;
     rules?: RuleItem[];
     /** Explicit control id; otherwise `fld-${prop}`. Label `for` and slot `inputId` share this. */
     id?: string;
@@ -541,6 +546,8 @@ const resolvedLabel = computed(() => {
 });
 
 const effectiveHelp = computed(() => {
+  const propHelp = String(props.help || '').trim();
+  if (propHelp) return propHelp;
   const leaf = leafFieldName.value;
   return resolveFieldHelp({
     meta: effectiveFieldMeta.value as { help?: string; helpText?: TermReference } | undefined,
@@ -556,15 +563,27 @@ const helpAccessibleLabel = computed(() => {
   return label ? `${label}: ${help}` : help;
 });
 
-onMounted(() => {
-  // Edit mode: ensure ACL/presentation overlay so deny-write → isReadonly is visible (T5.3).
-  if (!binding.env.isEditMode) return;
+function ensurePresentationFieldsGet() {
+  // Presentation overlay (string/help + ACL isReadonly). Run in display and edit:
+  // ClientModel static meta may omit help; FieldsGet is the source for form-help tips.
+  // Also re-run when switching display → edit so deny-write → isReadonly is visible.
   const store = modelStore.value;
   const leaf = leafFieldName.value;
   if (!store?.ensureFieldsGet || !leaf) return;
   void store.ensureFieldsGet([leaf], [...FIELD_PRESENTATION_FIELDS_GET_ATTRS]);
+}
+
+onMounted(() => {
+  ensurePresentationFieldsGet();
 });
 
+watch(
+  () => binding.env.isEditMode,
+  (editing) => {
+    if (editing) ensurePresentationFieldsGet();
+  }
+);
+
 const translationsOpen = ref(false);
 const companyValuesOpen = ref(false);
 
diff --git a/modules/web/web/components/field/ChoyVarcharField.vue b/modules/web/web/components/field/ChoyVarcharField.vue
index ebe773f34..0b91aec4c 100644
--- a/modules/web/web/components/field/ChoyVarcharField.vue
+++ b/modules/web/web/components/field/ChoyVarcharField.vue
@@ -7,6 +7,7 @@ SPDX-License-Identifier: Apache-2.0
   <ChoyFieldBase
     :binding="binding"
     :label="label"
+    :help="help"
     :rules="mergedRules"
     :formItemProps="formItemProps"
     :orientation="orientation"
@@ -108,6 +109,8 @@ const props = withDefaults(
     binding?: UseField<T, V>;
 
     label?: string;
+    /** Explicit help tip; preferred over FieldsGet / meta.help when set. */
+    help?: string;
     rules?: RuleItem[];
 
     maxLength?: number;
diff --git a/modules/web/web/stores/fieldsGet.test.ts b/modules/web/web/stores/fieldsGet.test.ts
index 43af8f102..071253183 100644
--- a/modules/web/web/stores/fieldsGet.test.ts
+++ b/modules/web/web/stores/fieldsGet.test.ts
@@ -43,6 +43,53 @@ describe('createFieldsGetHelpers', () => {
     expect(FieldsGet.calls.length).toBe(1);
   });
 
+  test('coalesces concurrent ensures with different fields into one FieldsGet RPC', async () => {
+    const FieldsGet = asyncFnRecorder(async (fields?: string[]) => {
+      const names = fields && fields.length ? fields : ['TargetModel', 'PropertiesField', 'ContainerModel'];
+      const out: Record<string, WebFieldMetadata> = {};
+      for (const name of names) {
+        out[name] = {
+          id: name,
+          type: 'varchar',
+          typeAnnotation: 'string',
+          help: `help:${name}`,
+        };
+      }
+      return out;
+    });
+    const helpers = createFieldsGetHelpers(
+      makeHost(
+        {
+          TargetModel: { id: '1', type: 'varchar', typeAnnotation: 'string' },
+          PropertiesField: { id: '2', type: 'varchar', typeAnnotation: 'string' },
+          ContainerModel: { id: '3', type: 'varchar', typeAnnotation: 'string' },
+        },
+        FieldsGet
+      ),
+      { getLang: () => 'zh_CN' }
+    );
+
+    const attrs = [...FIELD_PRESENTATION_FIELDS_GET_ATTRS];
+    const [a, b, c] = await Promise.all([
+      helpers.ensureFieldsGet(['TargetModel'], attrs),
+      helpers.ensureFieldsGet(['PropertiesField'], attrs),
+      helpers.ensureFieldsGet(['ContainerModel'], attrs),
+    ]);
+
+    expect(FieldsGet.calls.length).toBe(1);
+    const requested = (FieldsGet.calls[0]?.[0] as string[] | undefined) || [];
+    expect([...requested].sort()).toEqual(['ContainerModel', 'PropertiesField', 'TargetModel']);
+    expect(a.TargetModel?.help).toBe('help:TargetModel');
+    expect(b.PropertiesField?.help).toBe('help:PropertiesField');
+    expect(c.ContainerModel?.help).toBe('help:ContainerModel');
+    expect(helpers.getFieldsGetTranslatedHelp('TargetModel')).toBe('help:TargetModel');
+
+    // Later ensure for an already-overlaid field must not re-RPC.
+    FieldsGet.calls.length = 0;
+    await helpers.ensureFieldsGet(['PropertiesField'], attrs);
+    expect(FieldsGet.calls.length).toBe(0);
+  });
+
   test('re-RPCs after lang change or clearFieldsGetCache (T1.6)', async () => {
     let fieldsGetImpl: FieldsGetHost['FieldsGet'] = async (_fields?: string[], _attrs?: string[]) => ({
       Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: '名称' },
diff --git a/modules/web/web/stores/fieldsGet.ts b/modules/web/web/stores/fieldsGet.ts
index 90e0af256..6db805372 100644
--- a/modules/web/web/stores/fieldsGet.ts
+++ b/modules/web/web/stores/fieldsGet.ts
@@ -5,6 +5,10 @@
  * Store-level FieldsGet cache helpers (design D7).
  *
  * Cache key: lang + sorted(fields) + sorted(attributes). No draft (D9).
+ *
+ * Concurrent ensureFieldsGet calls that share the same lang+attributes are
+ * coalesced into one RPC (union of field names) so a form with N ChoyFieldBase
+ * mounts does not fire N FieldsGet round-trips.
  */
 
 import { shallowRef } from 'vue';
@@ -82,6 +86,47 @@ function resolveLang(getLang?: () => string): string {
   }
 }
 
+function normalizeFieldNames(fields?: string[]): string[] {
+  if (!fields || fields.length === 0) return [];
+  return [...new Set(fields.map(v => String(v || '').trim()).filter(Boolean))];
+}
+
+/** True when caller asked for the whole model (empty / omitted fields list). */
+function wantsAllFields(fields?: string[]): boolean {
+  return !fields || fields.length === 0 || normalizeFieldNames(fields).length === 0;
+}
+
+function pickFieldSlice(
+  slice: Record<string, WebFieldMetadata>,
+  names: string[]
+): Record<string, WebFieldMetadata> {
+  const out: Record<string, WebFieldMetadata> = {};
+  for (const name of names) {
+    if (Object.prototype.hasOwnProperty.call(slice, name)) {
+      out[name] = slice[name]!;
+    }
+  }
+  return out;
+}
+
+type CoalesceWaiter = {
+  resolve: (value: Record<string, WebFieldMetadata>) => void;
+  reject: (reason?: unknown) => void;
+  /** Normalized field names; empty means whole-model request. */
+  names: string[];
+  wantAll: boolean;
+  cacheKey: string;
+};
+
+type CoalesceBucket = {
+  attributes: string[] | undefined;
+  fieldSet: Set<string>;
+  wantAll: boolean;
+  waiters: CoalesceWaiter[];
+  /** Shared promise for callers that join after flush started. */
+  inflight?: Promise<Record<string, WebFieldMetadata>>;
+};
+
 /**
  * Attach ensureFieldsGet / getFieldMeta helpers to a model store host.
  */
@@ -95,6 +140,8 @@ export function createFieldsGetHelpers(
   const overlayByLang = new Map<string, Record<string, WebFieldMetadata>>();
   /** Bumped so Vue computeds that call getFieldMeta / getFieldsGetTranslatedString re-run. */
   const overlayVersion = shallowRef(0);
+  /** lang|attrs → pending microtask-coalesced ensures. */
+  const coalesceByLangAttrs = new Map<string, CoalesceBucket>();
 
   const bumpOverlay = () => {
     overlayVersion.value += 1;
@@ -104,6 +151,7 @@ export function createFieldsGetHelpers(
     responseCache.clear();
     inflight.clear();
     overlayByLang.clear();
+    coalesceByLangAttrs.clear();
     bumpOverlay();
   };
 
@@ -113,6 +161,64 @@ export function createFieldsGetHelpers(
     bumpOverlay();
   };
 
+  const overlayHasFields = (lang: string, names: string[]): boolean => {
+    const overlay = overlayByLang.get(lang) || {};
+    return names.every(name => Object.prototype.hasOwnProperty.call(overlay, name));
+  };
+
+  const sliceFromOverlay = (lang: string, names: string[]): Record<string, WebFieldMetadata> => {
+    return pickFieldSlice(overlayByLang.get(lang) || {}, names);
+  };
+
+  const flushCoalesceBucket = (bucketKey: string, lang: string, bucket: CoalesceBucket) => {
+    coalesceByLangAttrs.delete(bucketKey);
+
+    const rpcFields = bucket.wantAll ? undefined : [...bucket.fieldSet].sort();
+    const rpcKey = buildCacheKey(lang, rpcFields, bucket.attributes);
+
+    const resolveWaiters = (slice: Record<string, WebFieldMetadata>) => {
+      for (const waiter of bucket.waiters) {
+        let value = responseCache.get(waiter.cacheKey);
+        if (!value) {
+          value = waiter.wantAll ? slice : pickFieldSlice(slice, waiter.names);
+          responseCache.set(waiter.cacheKey, value);
+        }
+        waiter.resolve(value);
+      }
+    };
+
+    const cached = responseCache.get(rpcKey);
+    if (cached) {
+      resolveWaiters(cached);
+      return;
+    }
+
+    const pendingExact = inflight.get(rpcKey);
+    const request =
+      pendingExact ||
+      (async () => {
+        const slice = (await host.FieldsGet(rpcFields, bucket.attributes)) || {};
+        responseCache.set(rpcKey, slice);
+        mergeOverlay(lang, slice);
+        inflight.delete(rpcKey);
+        return slice;
+      })().catch(err => {
+        inflight.delete(rpcKey);
+        throw err;
+      });
+
+    if (!pendingExact) {
+      inflight.set(rpcKey, request);
+    }
+    bucket.inflight = request;
+
+    void request.then(resolveWaiters).catch(err => {
+      for (const waiter of bucket.waiters) {
+        waiter.reject(err);
+      }
+    });
+  };
+
   const ensureFieldsGet = async (
     fields?: string[],
     attributes?: string[]
@@ -123,24 +229,57 @@ export function createFieldsGetHelpers(
     if (cached) {
       return cached;
     }
+
+    const wantAll = wantsAllFields(fields);
+    const names = wantAll ? [] : normalizeFieldNames(fields);
+
+    // Specific-field ensure: reuse overlay from a prior coalesced / broader fetch.
+    if (!wantAll && names.length > 0 && overlayHasFields(lang, names)) {
+      const fromOverlay = sliceFromOverlay(lang, names);
+      responseCache.set(key, fromOverlay);
+      return fromOverlay;
+    }
+
     const pending = inflight.get(key);
     if (pending) {
       return pending;
     }
 
-    const request = (async () => {
-      const slice = (await host.FieldsGet(fields, attributes)) || {};
-      responseCache.set(key, slice);
-      mergeOverlay(lang, slice);
-      inflight.delete(key);
-      return slice;
-    })().catch(err => {
-      inflight.delete(key);
-      throw err;
-    });
+    // Coalesce concurrent ensures that share lang + attributes into one RPC.
+    const attrsPart = sortedKeyPart(attributes);
+    const bucketKey = `${lang}|${attrsPart}`;
+    let bucket = coalesceByLangAttrs.get(bucketKey);
+    if (!bucket) {
+      bucket = {
+        attributes: attributes ? [...attributes] : undefined,
+        fieldSet: new Set<string>(),
+        wantAll: false,
+        waiters: [],
+      };
+      coalesceByLangAttrs.set(bucketKey, bucket);
+      queueMicrotask(() => {
+        const current = coalesceByLangAttrs.get(bucketKey);
+        if (!current) return;
+        flushCoalesceBucket(bucketKey, lang, current);
+      });
+    }
+
+    if (wantAll) {
+      bucket.wantAll = true;
+      bucket.fieldSet.clear();
+    } else if (!bucket.wantAll) {
+      for (const name of names) bucket.fieldSet.add(name);
+    }
 
-    inflight.set(key, request);
-    return request;
+    return new Promise<Record<string, WebFieldMetadata>>((resolve, reject) => {
+      bucket!.waiters.push({
+        resolve,
+        reject,
+        names,
+        wantAll,
+        cacheKey: key,
+      });
+    });
   };
 
   const getFieldMeta = (name: string): WebFieldMetadata | undefined => {

From b6e885e8e5068c23a4590a6e841bb4f204b7f176 Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Wed, 28 Oct 2026 15:38:26 +0800
Subject: [PATCH 07/23] feat(web): add per-property help with labeled
 definition editor

- store PropertyItemDefinition.help as lang maps; unwrap on Resolve
- ItemDialog Help input + FieldLabels (no placeholders); tip on Properties rows
- seed sandbox bootstrap help for priority/external_code/is_vip/locked_code
---
 .../orm/model/properties_label_i18n.test.ts   |  16 +-
 .../orm/model/properties_label_i18n.ts        |   5 +-
 .../orm/model/properties_resolve.test.ts      |   2 +
 .../service/orm/model/properties_types.ts     |  15 ++
 modules/sandbox/data/bootstrap.json           |  18 ++-
 modules/web/i18n/web.pot                      | 116 ++++++++------
 modules/web/i18n/zh_CN.po                     | 112 +++++++------
 .../ChoyPropertiesDefinitionField.test.ts     |   2 +
 .../ChoyPropertiesDefinitionItemDialog.vue    | 147 ++++++++++++------
 ...ropertiesDefinitionSelectionEditor.test.ts |   4 +-
 .../field/ChoyPropertiesField.test.ts         |  24 +++
 .../components/field/ChoyPropertiesField.vue  |  68 +++++++-
 .../field/propertiesDefinitionHelpers.test.ts |  32 ++++
 .../field/propertiesDefinitionHelpers.ts      |  21 ++-
 14 files changed, 431 insertions(+), 151 deletions(-)

diff --git a/modules/core/service/orm/model/properties_label_i18n.test.ts b/modules/core/service/orm/model/properties_label_i18n.test.ts
index 71da5aba6..4578390e4 100644
--- a/modules/core/service/orm/model/properties_label_i18n.test.ts
+++ b/modules/core/service/orm/model/properties_label_i18n.test.ts
@@ -73,13 +73,14 @@ test('mergeSelectionLabelsWrite merges by option value', () => {
   ]);
 });
 
-test('translatePropertyDefinitionItems unwraps string and selection labels only', () => {
+test('translatePropertyDefinitionItems unwraps string, help, and selection labels', () => {
   const items = translatePropertyDefinitionItems(
     [
       {
         name: 'priority',
         type: 'selection',
         string: { en_US: 'Priority', zh_CN: '优先级' },
+        help: { en_US: 'Record urgency', zh_CN: '记录紧急程度' },
         selection: [
           ['high', { en_US: 'High', zh_CN: '高' }],
           { value: 'low', label: { en_US: 'Low', zh_CN: '低' } },
@@ -90,6 +91,7 @@ test('translatePropertyDefinitionItems unwraps string and selection labels only'
     'zh_CN'
   );
   expect(items[0].string).toBe('优先级');
+  expect(items[0].help).toBe('记录紧急程度');
   expect(items[0].default).toBe('high');
   expect(items[0].selection).toEqual([
     ['high', '高'],
@@ -97,12 +99,13 @@ test('translatePropertyDefinitionItems unwraps string and selection labels only'
   ]);
 });
 
-test('assertValidPropertyDefinitionItems accepts lang-map labels', () => {
+test('assertValidPropertyDefinitionItems accepts lang-map labels and help', () => {
   const out = assertValidPropertyDefinitionItems([
     {
       name: 'priority',
       type: 'selection',
       string: { en_US: 'Priority', zh_CN: '优先级' },
+      help: { en_US: 'Record urgency', zh_CN: '记录紧急程度' },
       selection: [['high', { en_US: 'High', zh_CN: '高' }]],
       default: 'high',
     },
@@ -110,11 +113,14 @@ test('assertValidPropertyDefinitionItems accepts lang-map labels', () => {
       name: 'code',
       type: 'char',
       string: 'External Code',
+      help: 'Short unique code used in references',
     },
   ]);
   expect(out[0].string).toEqual({ en_US: 'Priority', zh_CN: '优先级' });
+  expect(out[0].help).toEqual({ en_US: 'Record urgency', zh_CN: '记录紧急程度' });
   expect(out[0].selection).toEqual([['high', { en_US: 'High', zh_CN: '高' }]]);
   expect(out[1].string).toBe('External Code');
+  expect(out[1].help).toBe('Short unique code used in references');
 });
 
 test('assertValidPropertyDefinitionItems rejects invalid label maps', () => {
@@ -122,3 +128,9 @@ test('assertValidPropertyDefinitionItems rejects invalid label maps', () => {
     assertValidPropertyDefinitionItems([{ name: 'x', type: 'char', string: { en_US: { bad: 1 } as any } }])
   ).toThrow(/must be a string/);
 });
+
+test('assertValidPropertyDefinitionItems rejects invalid help maps', () => {
+  expect(() =>
+    assertValidPropertyDefinitionItems([{ name: 'x', type: 'char', help: { en_US: { bad: 1 } as any } }])
+  ).toThrow(/must be a string/);
+});
diff --git a/modules/core/service/orm/model/properties_label_i18n.ts b/modules/core/service/orm/model/properties_label_i18n.ts
index 60601d763..d2b6271f7 100644
--- a/modules/core/service/orm/model/properties_label_i18n.ts
+++ b/modules/core/service/orm/model/properties_label_i18n.ts
@@ -164,7 +164,7 @@ export function mergeSelectionLabelsWrite(
 }
 
 /**
- * Expand item `string` / selection labels to the request language.
+ * Expand item `string` / `help` / selection labels to the request language.
  * Returns a new array; does not mutate input. Selection values are unchanged.
  */
 export function translatePropertyDefinitionItems(
@@ -177,6 +177,9 @@ export function translatePropertyDefinitionItems(
     if (Object.prototype.hasOwnProperty.call(item, 'string')) {
       next.string = unwrapPropertyLabel(item.string, code);
     }
+    if (Object.prototype.hasOwnProperty.call(item, 'help')) {
+      next.help = unwrapPropertyLabel(item.help, code);
+    }
     if (Array.isArray(item.selection)) {
       next.selection = item.selection.map(opt => {
         if (Array.isArray(opt) && typeof opt[0] === 'string') {
diff --git a/modules/core/service/orm/model/properties_resolve.test.ts b/modules/core/service/orm/model/properties_resolve.test.ts
index 4d560ff46..4f81fd01a 100644
--- a/modules/core/service/orm/model/properties_resolve.test.ts
+++ b/modules/core/service/orm/model/properties_resolve.test.ts
@@ -147,6 +147,7 @@ test('properties resolve: unwraps Definition label lang maps by request lang', a
           name: 'priority',
           type: 'selection',
           string: { en_US: 'Priority', zh_CN: '优先级' },
+          help: { en_US: 'Record urgency', zh_CN: '记录紧急程度' },
           selection: [
             ['high', { en_US: 'High', zh_CN: '高' }],
             ['low', 'Low'],
@@ -161,6 +162,7 @@ test('properties resolve: unwraps Definition label lang maps by request lang', a
   try {
     const items = await resolveProperties(Pp1Partner as any, { PartnerProperties: { priority: 'high' } }, 'PartnerProperties');
     expect(items[0]?.string).toBe('优先级');
+    expect(items[0]?.help).toBe('记录紧急程度');
     expect(items[0]?.selection).toEqual([
       ['high', '高'],
       ['low', 'Low'],
diff --git a/modules/core/service/orm/model/properties_types.ts b/modules/core/service/orm/model/properties_types.ts
index 2b4a56e50..3f53164c1 100644
--- a/modules/core/service/orm/model/properties_types.ts
+++ b/modules/core/service/orm/model/properties_types.ts
@@ -22,6 +22,8 @@ export type PropertyItemDefinition = {
   name: string;
   type: string;
   string?: PropertyLabel;
+  /** Field tip (plain string ≡ `{ en_US: s }` or lang map); shown next to the item label. */
+  help?: PropertyLabel;
   default?: unknown;
   readonly?: boolean;
   selection?: Array<{ value: string; label?: PropertyLabel } | [string, PropertyLabel]>;
@@ -150,6 +152,19 @@ export function assertValidPropertyDefinitionItems(raw: unknown): PropertyItemDe
         );
       }
     }
+    if (Object.prototype.hasOwnProperty.call(rec, 'help')) {
+      try {
+        const help = normalizePropertyLabelForStorage(rec.help, `${name}.help`);
+        if (help === undefined) delete normalized.help;
+        else normalized.help = help;
+      } catch (err) {
+        throw new Error(
+          err instanceof Error
+            ? err.message
+            : `PropertyDefinition.Definition item "${name}" help is invalid`
+        );
+      }
+    }
     if (type === 'selection') {
       const values = selectionOptionValues(rec.selection);
       if (values.length === 0) {
diff --git a/modules/sandbox/data/bootstrap.json b/modules/sandbox/data/bootstrap.json
index fa8a969ff..21ab9b947 100644
--- a/modules/sandbox/data/bootstrap.json
+++ b/modules/sandbox/data/bootstrap.json
@@ -73,6 +73,10 @@
             "name": "priority",
             "type": "selection",
             "string": { "en_US": "Priority", "zh_CN": "优先级" },
+            "help": {
+              "en_US": "How urgently this record should be handled.",
+              "zh_CN": "该记录需要处理的紧急程度。"
+            },
             "selection": [
               ["low", { "en_US": "Low", "zh_CN": "低" }],
               ["normal", { "en_US": "Normal", "zh_CN": "普通" }],
@@ -83,12 +87,20 @@
           {
             "name": "external_code",
             "type": "char",
-            "string": { "en_US": "External Code", "zh_CN": "外部编码" }
+            "string": { "en_US": "External Code", "zh_CN": "外部编码" },
+            "help": {
+              "en_US": "Short code used to reference this record in external systems.",
+              "zh_CN": "用于在外部系统中引用本记录的短编码。"
+            }
           },
           {
             "name": "is_vip",
             "type": "boolean",
             "string": { "en_US": "VIP", "zh_CN": "VIP" },
+            "help": {
+              "en_US": "Mark the record as VIP for preferential handling.",
+              "zh_CN": "标记为 VIP，以便优先处理。"
+            },
             "default": false
           },
           {
@@ -120,6 +132,10 @@
             "name": "locked_code",
             "type": "char",
             "string": { "en_US": "Locked Code", "zh_CN": "锁定编码" },
+            "help": {
+              "en_US": "Read-only lock token assigned when the record is sealed.",
+              "zh_CN": "记录锁定后分配的只读锁定码。"
+            },
             "readonly": true,
             "default": "RO"
           }
diff --git a/modules/web/i18n/web.pot b/modules/web/i18n/web.pot
index 5548299f4..add5473bd 100644
--- a/modules/web/i18n/web.pot
+++ b/modules/web/i18n/web.pot
@@ -274,22 +274,22 @@ msgctxt "web/components/field/ChoyDecimalField"
 msgid "Total digits must not exceed %s"
 msgstr ""
 
-#: web/components/field/ChoyFieldBase.vue:228
+#: web/components/field/ChoyFieldBase.vue:247
 msgctxt "web/components/field/ChoyFieldBase"
 msgid "Company values"
 msgstr ""
 
-#: web/components/field/ChoyFieldBase.vue:228
+#: web/components/field/ChoyFieldBase.vue:247
 msgctxt "web/components/field/ChoyFieldBase"
 msgid "Company values: %s"
 msgstr ""
 
-#: web/components/field/ChoyFieldBase.vue:221
+#: web/components/field/ChoyFieldBase.vue:240
 msgctxt "web/components/field/ChoyFieldBase"
 msgid "Translate field"
 msgstr ""
 
-#: web/components/field/ChoyFieldBase.vue:221
+#: web/components/field/ChoyFieldBase.vue:240
 msgctxt "web/components/field/ChoyFieldBase"
 msgid "Translate: %s"
 msgstr ""
@@ -780,45 +780,45 @@ msgctxt "web/components/field/ChoyOneToManyField"
 msgid "Delete"
 msgstr ""
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:186
+#: web/components/field/ChoyOneToManyKanbanField.vue:189
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Add a line…"
 msgstr ""
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:429
+#: web/components/field/ChoyOneToManyKanbanField.vue:438
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Are you sure you want to delete this record? This action cannot be undone."
 msgstr ""
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:434
+#: web/components/field/ChoyOneToManyKanbanField.vue:443
 #: web/components/field/ChoyOneToManyKanbanField.vue:93
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Cancel"
 msgstr ""
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:430
+#: web/components/field/ChoyOneToManyKanbanField.vue:439
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Confirm delete"
 msgstr ""
 
 #: web/components/field/ChoyOneToManyKanbanField.vue:20
-#: web/components/field/ChoyOneToManyKanbanField.vue:433
+#: web/components/field/ChoyOneToManyKanbanField.vue:442
 #: web/components/field/ChoyOneToManyKanbanField.vue:90
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Delete"
 msgstr ""
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:189
+#: web/components/field/ChoyOneToManyKanbanField.vue:192
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Edit record"
 msgstr ""
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:188
+#: web/components/field/ChoyOneToManyKanbanField.vue:191
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "New record"
 msgstr ""
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:187
+#: web/components/field/ChoyOneToManyKanbanField.vue:190
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "No data"
 msgstr ""
@@ -838,22 +838,22 @@ msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Save"
 msgstr ""
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:368
+#: web/components/field/ChoyOneToManyKanbanField.vue:377
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Untitled"
 msgstr ""
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:190
+#: web/components/field/ChoyOneToManyKanbanField.vue:193
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "View record"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionField.vue:279
+#: web/components/field/ChoyPropertiesDefinitionField.vue:369
 msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "%s properties"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionField.vue:281
+#: web/components/field/ChoyPropertiesDefinitionField.vue:371
 msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "%s properties (%s, …)"
 msgstr ""
@@ -881,7 +881,7 @@ msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "Name"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionField.vue:275
+#: web/components/field/ChoyPropertiesDefinitionField.vue:365
 msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "No properties"
 msgstr ""
@@ -898,7 +898,8 @@ msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "Remove"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionField.vue
+#: web/components/field/ChoyPropertiesDefinitionField.vue:16
+#: web/components/field/ChoyPropertiesDefinitionField.vue:9
 msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "Reorder"
 msgstr ""
@@ -915,122 +916,141 @@ msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "View"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:59
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Cancel"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:41
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Default"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:84
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Edit property: %s"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:136
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:32
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Help"
+msgstr ""
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:126
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:147
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:23
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Label"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:8
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Name"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:182
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Name is required"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:84
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "New property"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:82
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Property"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:82
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Property: %s"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:46
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Readonly"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:62
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Save"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:49
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Selection"
+msgstr ""
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:35
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Translate help"
+msgstr ""
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:26
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Translate label"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:12
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Type"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue:47
 msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
 msgid "Add a line…"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue:37
 msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
 msgid "Delete"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue:9
 msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
 msgid "Label"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue:16
 msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
 msgid "No options"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue:21
 msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
 msgid "Reorder"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue:31
 msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
 msgid "Translate option"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue:8
 msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
 msgid "Value"
 msgstr ""
-#: web/components/field/ChoyPropertiesField.vue:243
+
+#: web/components/field/ChoyPropertiesField.vue:292
 msgctxt "web/components/field/ChoyPropertiesField"
 msgid "+%s more"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesField.vue:227
+#: web/components/field/ChoyPropertiesField.vue:276
 msgctxt "web/components/field/ChoyPropertiesField"
 msgid "No"
 msgstr ""
 
 #: web/components/field/ChoyPropertiesField.vue:10
-#: web/components/field/ChoyPropertiesField.vue:46
+#: web/components/field/ChoyPropertiesField.vue:54
 msgctxt "web/components/field/ChoyPropertiesField"
 msgid "No properties defined"
 msgstr ""
 
-#: web/components/field/ChoyPropertiesField.vue:227
+#: web/components/field/ChoyPropertiesField.vue:276
 msgctxt "web/components/field/ChoyPropertiesField"
 msgid "Yes"
 msgstr ""
@@ -1105,32 +1125,32 @@ msgctxt "web/components/field/ChoyTimeField"
 msgid "Select time"
 msgstr ""
 
-#: web/components/field/ChoyVarcharField.vue:168
+#: web/components/field/ChoyVarcharField.vue:170
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Copied"
 msgstr ""
 
-#: web/components/field/ChoyVarcharField.vue:138
+#: web/components/field/ChoyVarcharField.vue:140
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Copy"
 msgstr ""
 
-#: web/components/field/ChoyVarcharField.vue:170
+#: web/components/field/ChoyVarcharField.vue:172
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Copy failed"
 msgstr ""
 
-#: web/components/field/ChoyVarcharField.vue:294
+#: web/components/field/ChoyVarcharField.vue:296
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Length must not exceed %s"
 msgstr ""
 
-#: web/components/field/ChoyVarcharField.vue:288
+#: web/components/field/ChoyVarcharField.vue:290
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Value is required"
 msgstr ""
 
-#: web/components/field/ChoyVarcharField.vue:290
+#: web/components/field/ChoyVarcharField.vue:292
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Value must be a string"
 msgstr ""
diff --git a/modules/web/i18n/zh_CN.po b/modules/web/i18n/zh_CN.po
index 14e0999a8..f491a7e8e 100644
--- a/modules/web/i18n/zh_CN.po
+++ b/modules/web/i18n/zh_CN.po
@@ -266,22 +266,22 @@ msgctxt "web/components/field/ChoyDecimalField"
 msgid "Total digits must not exceed %s"
 msgstr "总位数不得超过 %s"
 
-#: web/components/field/ChoyFieldBase.vue:228
+#: web/components/field/ChoyFieldBase.vue:247
 msgctxt "web/components/field/ChoyFieldBase"
 msgid "Company values"
 msgstr "公司值"
 
-#: web/components/field/ChoyFieldBase.vue:228
+#: web/components/field/ChoyFieldBase.vue:247
 msgctxt "web/components/field/ChoyFieldBase"
 msgid "Company values: %s"
 msgstr "公司值：%s"
 
-#: web/components/field/ChoyFieldBase.vue:221
+#: web/components/field/ChoyFieldBase.vue:240
 msgctxt "web/components/field/ChoyFieldBase"
 msgid "Translate field"
 msgstr "翻译字段"
 
-#: web/components/field/ChoyFieldBase.vue:221
+#: web/components/field/ChoyFieldBase.vue:240
 msgctxt "web/components/field/ChoyFieldBase"
 msgid "Translate: %s"
 msgstr "翻译：%s"
@@ -761,42 +761,42 @@ msgctxt "web/components/field/ChoyOneToManyField"
 msgid "Delete"
 msgstr "删除"
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:186
+#: web/components/field/ChoyOneToManyKanbanField.vue:189
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Add a line…"
 msgstr "添加一行…"
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:429
+#: web/components/field/ChoyOneToManyKanbanField.vue:438
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Are you sure you want to delete this record? This action cannot be undone."
 msgstr "确定要删除此记录吗？此操作无法撤销。"
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:434 web/components/field/ChoyOneToManyKanbanField.vue:93
+#: web/components/field/ChoyOneToManyKanbanField.vue:443 web/components/field/ChoyOneToManyKanbanField.vue:93
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Cancel"
 msgstr "取消"
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:430
+#: web/components/field/ChoyOneToManyKanbanField.vue:439
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Confirm delete"
 msgstr "确认删除"
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:20 web/components/field/ChoyOneToManyKanbanField.vue:433 web/components/field/ChoyOneToManyKanbanField.vue:90
+#: web/components/field/ChoyOneToManyKanbanField.vue:20 web/components/field/ChoyOneToManyKanbanField.vue:442 web/components/field/ChoyOneToManyKanbanField.vue:90
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Delete"
 msgstr "删除"
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:189
+#: web/components/field/ChoyOneToManyKanbanField.vue:192
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Edit record"
 msgstr "编辑记录"
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:188
+#: web/components/field/ChoyOneToManyKanbanField.vue:191
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "New record"
 msgstr "新建记录"
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:187
+#: web/components/field/ChoyOneToManyKanbanField.vue:190
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "No data"
 msgstr "暂无数据"
@@ -816,22 +816,22 @@ msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Save"
 msgstr "保存"
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:368
+#: web/components/field/ChoyOneToManyKanbanField.vue:377
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "Untitled"
 msgstr "未命名"
 
-#: web/components/field/ChoyOneToManyKanbanField.vue:190
+#: web/components/field/ChoyOneToManyKanbanField.vue:193
 msgctxt "web/components/field/ChoyOneToManyKanbanField"
 msgid "View record"
 msgstr "查看记录"
 
-#: web/components/field/ChoyPropertiesDefinitionField.vue:279
+#: web/components/field/ChoyPropertiesDefinitionField.vue:369
 msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "%s properties"
 msgstr "%s 个属性"
 
-#: web/components/field/ChoyPropertiesDefinitionField.vue:281
+#: web/components/field/ChoyPropertiesDefinitionField.vue:371
 msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "%s properties (%s, …)"
 msgstr "%s 个属性（%s，…）"
@@ -856,7 +856,7 @@ msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "Name"
 msgstr "名称"
 
-#: web/components/field/ChoyPropertiesDefinitionField.vue:275
+#: web/components/field/ChoyPropertiesDefinitionField.vue:365
 msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "No properties"
 msgstr "无属性"
@@ -871,7 +871,7 @@ msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "Remove"
 msgstr "移除"
 
-#: web/components/field/ChoyPropertiesDefinitionField.vue
+#: web/components/field/ChoyPropertiesDefinitionField.vue:16 web/components/field/ChoyPropertiesDefinitionField.vue:9
 msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "Reorder"
 msgstr "调整顺序"
@@ -886,121 +886,137 @@ msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "View"
 msgstr "查看"
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:59
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Cancel"
 msgstr "取消"
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:41
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Default"
 msgstr "默认值"
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:84
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Edit property: %s"
 msgstr "编辑属性：%s"
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:136 web/components/field/ChoyPropertiesDefinitionItemDialog.vue:32
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Help"
+msgstr "帮助"
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:126 web/components/field/ChoyPropertiesDefinitionItemDialog.vue:147 web/components/field/ChoyPropertiesDefinitionItemDialog.vue:23
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Label"
 msgstr "标签"
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:8
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Name"
 msgstr "名称"
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:182
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Name is required"
 msgstr "名称为必填项"
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:84
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "New property"
 msgstr "新建属性"
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:82
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Property"
 msgstr "属性"
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:82
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Property: %s"
 msgstr "属性：%s"
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:46
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Readonly"
 msgstr "只读"
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:62
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Save"
 msgstr "保存"
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:49
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Selection"
+msgstr "选项"
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:35
+msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
+msgid "Translate help"
+msgstr "翻译帮助"
+
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:26
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Translate label"
 msgstr "翻译标签"
 
-#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+#: web/components/field/ChoyPropertiesDefinitionItemDialog.vue:12
 msgctxt "web/components/field/ChoyPropertiesDefinitionItemDialog"
 msgid "Type"
 msgstr "类型"
 
-#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue:47
 msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
 msgid "Add a line…"
 msgstr "添加一行…"
 
-#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue:37
 msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
 msgid "Delete"
 msgstr "删除"
 
-#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue:9
 msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
 msgid "Label"
 msgstr "标签"
 
-#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue:16
 msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
 msgid "No options"
 msgstr "暂无选项"
 
-#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue:21
 msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
 msgid "Reorder"
 msgstr "调整顺序"
 
-#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue:31
 msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
 msgid "Translate option"
 msgstr "翻译选项"
 
-#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+#: web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue:8
 msgctxt "web/components/field/ChoyPropertiesDefinitionSelectionEditor"
 msgid "Value"
 msgstr "值"
-#: web/components/field/ChoyPropertiesField.vue:243
+
+#: web/components/field/ChoyPropertiesField.vue:292
 msgctxt "web/components/field/ChoyPropertiesField"
 msgid "+%s more"
 msgstr "+%s 项"
 
-#: web/components/field/ChoyPropertiesField.vue:227
+#: web/components/field/ChoyPropertiesField.vue:276
 msgctxt "web/components/field/ChoyPropertiesField"
 msgid "No"
 msgstr "否"
 
-#: web/components/field/ChoyPropertiesField.vue:10 web/components/field/ChoyPropertiesField.vue:46
+#: web/components/field/ChoyPropertiesField.vue:10 web/components/field/ChoyPropertiesField.vue:54
 msgctxt "web/components/field/ChoyPropertiesField"
 msgid "No properties defined"
 msgstr "暂无属性定义"
 
-#: web/components/field/ChoyPropertiesField.vue:227
+#: web/components/field/ChoyPropertiesField.vue:276
 msgctxt "web/components/field/ChoyPropertiesField"
 msgid "Yes"
 msgstr "是"
@@ -1075,32 +1091,32 @@ msgctxt "web/components/field/ChoyTimeField"
 msgid "Select time"
 msgstr "选择时间"
 
-#: web/components/field/ChoyVarcharField.vue:168
+#: web/components/field/ChoyVarcharField.vue:170
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Copied"
 msgstr "已复制"
 
-#: web/components/field/ChoyVarcharField.vue:138
+#: web/components/field/ChoyVarcharField.vue:140
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Copy"
 msgstr "复制"
 
-#: web/components/field/ChoyVarcharField.vue:170
+#: web/components/field/ChoyVarcharField.vue:172
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Copy failed"
 msgstr "复制失败"
 
-#: web/components/field/ChoyVarcharField.vue:294
+#: web/components/field/ChoyVarcharField.vue:296
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Length must not exceed %s"
 msgstr "长度不得超过 %s"
 
-#: web/components/field/ChoyVarcharField.vue:288
+#: web/components/field/ChoyVarcharField.vue:290
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Value is required"
 msgstr "值为必填项"
 
-#: web/components/field/ChoyVarcharField.vue:290
+#: web/components/field/ChoyVarcharField.vue:292
 msgctxt "web/components/field/ChoyVarcharField"
 msgid "Value must be a string"
 msgstr "值必须为字符串"
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts b/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
index c8cc4895f..47e6cc5f4 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
@@ -137,6 +137,8 @@ function installItemDialogStub() {
                       type: 'char',
                       string: 'From Dialog',
                       stringMap: { en_US: 'From Dialog' },
+                      help: '',
+                      helpMap: {},
                       default: '',
                       readonly: false,
                       selectionText: '',
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
index 343415f41..93ae087a2 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
@@ -13,54 +13,91 @@ SPDX-License-Identifier: Apache-2.0
       <ChoyDialogTitle class="shrink-0">{{ dialogTitle }}</ChoyDialogTitle>
       <div v-if="local" class="min-h-0 flex-1 overflow-auto">
         <div class="grid gap-3 sm:grid-cols-2">
-          <Input
-            v-model="local.name"
-            class="w-full"
-            :disabled="readonly"
-            :placeholder="_t('Name')"
-            data-testid="choy-properties-definition-name"
-          />
-          <Select v-model="local.type" :disabled="readonly">
-            <SelectTrigger
+          <div class="grid gap-1.5">
+            <FieldLabel :for="nameInputId">{{ _t('Name') }}</FieldLabel>
+            <Input
+              :id="nameInputId"
+              v-model="local.name"
               class="w-full"
-              :placeholder="_t('Type')"
-              data-testid="choy-properties-definition-type"
+              :disabled="readonly"
+              data-testid="choy-properties-definition-name"
             />
-            <SelectContent>
-              <SelectItem v-for="t in typeOptions" :key="t" :value="t">
-                {{ t }}
-              </SelectItem>
-            </SelectContent>
-          </Select>
-          <div class="flex min-w-0 items-center gap-1 sm:col-span-2">
+          </div>
+          <div class="grid gap-1.5">
+            <FieldLabel :for="typeInputId">{{ _t('Type') }}</FieldLabel>
+            <Select v-model="local.type" :disabled="readonly">
+              <SelectTrigger
+                :id="typeInputId"
+                class="w-full"
+                data-testid="choy-properties-definition-type"
+              />
+              <SelectContent>
+                <SelectItem v-for="t in typeOptions" :key="t" :value="t">
+                  {{ t }}
+                </SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
+          <div class="grid gap-1.5 sm:col-span-2">
+            <FieldLabel :for="labelInputId">{{ _t('Label') }}</FieldLabel>
+            <div class="flex min-w-0 items-center gap-1">
+              <Input
+                :id="labelInputId"
+                v-model="local.string"
+                class="min-w-0 flex-1"
+                :disabled="readonly"
+                data-testid="choy-properties-definition-string"
+              />
+              <ChoyButton
+                v-if="!readonly"
+                type="button"
+                size="icon"
+                variant="ghost"
+                class="size-8 shrink-0 text-muted-foreground hover:text-foreground"
+                :aria-label="_t('Translate label')"
+                :title="_t('Translate label')"
+                data-testid="choy-properties-definition-translate-string"
+                @click="openStringTranslate"
+              >
+                <Languages class="size-4" aria-hidden="true" />
+              </ChoyButton>
+            </div>
+          </div>
+          <div class="grid gap-1.5 sm:col-span-2">
+            <FieldLabel :for="helpInputId">{{ _t('Help') }}</FieldLabel>
+            <div class="flex min-w-0 items-start gap-1">
+              <Textarea
+                :id="helpInputId"
+                v-model="local.help"
+                class="min-h-[4.5em] min-w-0 flex-1"
+                :disabled="readonly"
+                data-testid="choy-properties-definition-help"
+              />
+              <ChoyButton
+                v-if="!readonly"
+                type="button"
+                size="icon"
+                variant="ghost"
+                class="mt-0.5 size-8 shrink-0 text-muted-foreground hover:text-foreground"
+                :aria-label="_t('Translate help')"
+                :title="_t('Translate help')"
+                data-testid="choy-properties-definition-translate-help"
+                @click="openHelpTranslate"
+              >
+                <Languages class="size-4" aria-hidden="true" />
+              </ChoyButton>
+            </div>
+          </div>
+          <div class="grid gap-1.5 sm:col-span-2">
+            <FieldLabel :for="defaultInputId">{{ _t('Default') }}</FieldLabel>
             <Input
-              v-model="local.string"
-              class="min-w-0 flex-1"
+              :id="defaultInputId"
+              v-model="local.default"
+              class="w-full"
               :disabled="readonly"
-              :placeholder="_t('Label')"
-              data-testid="choy-properties-definition-string"
+              data-testid="choy-properties-definition-default"
             />
-            <ChoyButton
-              v-if="!readonly"
-              type="button"
-              size="icon"
-              variant="ghost"
-              class="size-8 shrink-0 text-muted-foreground hover:text-foreground"
-              :aria-label="_t('Translate label')"
-              :title="_t('Translate label')"
-              data-testid="choy-properties-definition-translate-string"
-              @click="openStringTranslate"
-            >
-              <Languages class="size-4" aria-hidden="true" />
-            </ChoyButton>
           </div>
-          <Input
-            v-model="local.default"
-            class="w-full sm:col-span-2"
-            :disabled="readonly"
-            :placeholder="_t('Default')"
-            data-testid="choy-properties-definition-default"
-          />
           <label class="flex items-center gap-2 text-sm sm:col-span-2">
             <Checkbox
               :model-value="local.readonly"
@@ -70,7 +107,8 @@ SPDX-License-Identifier: Apache-2.0
             />
             {{ _t('Readonly') }}
           </label>
-          <div v-if="local.type === 'selection'" class="sm:col-span-2">
+          <div v-if="local.type === 'selection'" class="grid gap-1.5 sm:col-span-2">
+            <FieldLabel>{{ _t('Selection') }}</FieldLabel>
             <ChoyPropertiesDefinitionSelectionEditor
               :model-value="selectionRows"
               :readonly="readonly"
@@ -121,7 +159,9 @@ import { useI18nStore } from '@/web/web/stores/i18nStore';
 import { ChoyDialog, ChoyDialogContent, ChoyDialogTitle } from '@/web/web/components/layout/choyDialog';
 import ChoyButton from '@/web/web/components/layout/ChoyButton.vue';
 import Checkbox from '../vendor/ui/checkbox/Checkbox.vue';
+import FieldLabel from '../vendor/ui/field/FieldLabel.vue';
 import Input from '../vendor/ui/input/Input.vue';
+import Textarea from '../vendor/ui/textarea/Textarea.vue';
 import Select from '../vendor/ui/select/Select.vue';
 import SelectContent from '../vendor/ui/select/SelectContent.vue';
 import SelectItem from '../vendor/ui/select/SelectItem.vue';
@@ -168,11 +208,16 @@ const emit = defineEmits<{
 const typeOptions = PROPERTY_DEFINITION_V1_TYPE_OPTIONS;
 const local = ref<DefinitionEditorDraftItem | null>(null);
 const formError = ref('');
+const nameInputId = 'choy-properties-definition-name';
+const typeInputId = 'choy-properties-definition-type';
+const labelInputId = 'choy-properties-definition-label';
+const helpInputId = 'choy-properties-definition-help';
+const defaultInputId = 'choy-properties-definition-default';
 
 const translateOpen = ref(false);
 const translateTitle = ref('');
 const translateMap = ref<Record<string, string>>({});
-type TranslateTarget = { kind: 'string' } | { kind: 'selection'; value: string };
+type TranslateTarget = { kind: 'string' } | { kind: 'help' } | { kind: 'selection'; value: string };
 const translateTarget = ref<TranslateTarget | null>(null);
 
 const visible = computed({
@@ -211,6 +256,7 @@ function cloneDraft(src: DefinitionEditorDraftItem | null | undefined): Definiti
   return {
     ...base,
     stringMap: { ...(base.stringMap || {}) },
+    helpMap: { ...(base.helpMap || {}) },
     selectionLabelMaps: Object.fromEntries(
       Object.entries(base.selectionLabelMaps || {}).map(([k, v]) => [k, { ...(v || {}) }]),
     ),
@@ -233,6 +279,16 @@ function openStringTranslate() {
   translateOpen.value = true;
 }
 
+function openHelpTranslate() {
+  const item = local.value;
+  if (!item || props.readonly) return;
+  applyDraftCurrentLangToMaps(item, editorLang());
+  translateTarget.value = { kind: 'help' };
+  translateTitle.value = item.name ? `${item.name} · ${_t('Help')}` : _t('Help');
+  translateMap.value = { ...item.helpMap };
+  translateOpen.value = true;
+}
+
 function openSelectionTranslate(value: string) {
   const item = local.value;
   const opt = String(value || '').trim();
@@ -251,6 +307,9 @@ function onTranslateSaved(next: Record<string, string>) {
   if (target.kind === 'string') {
     item.stringMap = { ...next };
     syncDraftLabelsForLang(item, editorLang());
+  } else if (target.kind === 'help') {
+    item.helpMap = { ...next };
+    syncDraftLabelsForLang(item, editorLang());
   } else {
     item.selectionLabelMaps = {
       ...item.selectionLabelMaps,
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionSelectionEditor.test.ts b/modules/web/web/components/field/ChoyPropertiesDefinitionSelectionEditor.test.ts
index 556f1d3e5..10a92da65 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionSelectionEditor.test.ts
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionSelectionEditor.test.ts
@@ -135,8 +135,8 @@ describe('ChoyPropertiesDefinitionSelectionEditor', () => {
       dropEffect: '',
       setData: () => undefined,
     };
-    api.onDragStart(0, { preventDefault() {}, dataTransfer: dt } as DragEvent);
-    await api.onDrop(2, { preventDefault() {}, dataTransfer: dt } as DragEvent);
+    api.onDragStart(0, { preventDefault() {}, dataTransfer: dt } as unknown as DragEvent);
+    await api.onDrop(2, { preventDefault() {}, dataTransfer: dt } as unknown as DragEvent);
     await nextTick();
     expect((mounted.props as any).modelValue.map((r: SelectionDraftRow) => r.value)).toEqual([
       'normal',
diff --git a/modules/web/web/components/field/ChoyPropertiesField.test.ts b/modules/web/web/components/field/ChoyPropertiesField.test.ts
index 8cbca4b89..c9691b1b1 100644
--- a/modules/web/web/components/field/ChoyPropertiesField.test.ts
+++ b/modules/web/web/components/field/ChoyPropertiesField.test.ts
@@ -295,6 +295,30 @@ describe('PropertiesField', () => {
     }
   });
 
+  test('shows form-help tip only for items with help', async () => {
+    const ResolveProperties = fnRecorder(async () => [
+      { name: 'prio', type: 'selection', string: 'Priority', help: 'Record urgency', value: 'high', selection: [['high', 'High']] },
+      { name: 'code', type: 'char', string: 'Code', value: 'A1' },
+    ] as ResolvedPropertyItem[]);
+    const binding = makeBinding({
+      map: { prio: 'high', code: 'A1' },
+      ResolveProperties,
+    });
+    const mounted = await mountField({ binding, renderMode: 'form' });
+    try {
+      const prioRow = mounted.el.querySelector('[data-name="prio"]') as HTMLElement | null;
+      const codeRow = mounted.el.querySelector('[data-name="code"]') as HTMLElement | null;
+      expect(prioRow).toBeTruthy();
+      expect(codeRow).toBeTruthy();
+      const prioHelp = prioRow!.querySelector('[data-slot="form-help"]') as HTMLElement | null;
+      expect(prioHelp).toBeTruthy();
+      expect(prioHelp!.getAttribute('aria-label') || '').toContain('Record urgency');
+      expect(codeRow!.querySelector('[data-slot="form-help"]')).toBeFalsy();
+    } finally {
+      mounted.unmount();
+    }
+  });
+
   test('integer write rejects decimal keystrokes; float keeps intermediate dot', async () => {
     const ResolveProperties = fnRecorder(async () => [
       { name: 'qty', type: 'integer', value: 2 },
diff --git a/modules/web/web/components/field/ChoyPropertiesField.vue b/modules/web/web/components/field/ChoyPropertiesField.vue
index 1a561bab9..1f84e04ba 100644
--- a/modules/web/web/components/field/ChoyPropertiesField.vue
+++ b/modules/web/web/components/field/ChoyPropertiesField.vue
@@ -48,7 +48,10 @@ SPDX-License-Identifier: Apache-2.0
             :data-type="item.type"
             data-readonly="1"
           >
-            <dt class="text-[13px] font-normal text-muted-foreground">{{ itemLabel(item) }}</dt>
+            <dt class="inline-flex min-w-0 items-center gap-0.5 text-[13px] font-normal text-muted-foreground">
+              <span class="min-w-0 truncate">{{ itemLabel(item) }}</span>
+              <PropertyItemHelpTip :item="item" />
+            </dt>
             <dd
               class="m-0 truncate text-sm text-muted-foreground"
               data-testid="choy-properties-readonly-value"
@@ -61,7 +64,12 @@ SPDX-License-Identifier: Apache-2.0
             :data-type="item.type"
             data-readonly="0"
           >
-            <label class="text-[13px] text-foreground" :for="controlId(item)">{{ itemLabel(item) }}</label>
+            <div class="inline-flex min-w-0 items-center gap-0.5">
+              <label class="min-w-0 truncate text-[13px] text-foreground" :for="controlId(item)">{{
+                itemLabel(item)
+              }}</label>
+              <PropertyItemHelpTip :item="item" />
+            </div>
             <Switch
               v-if="item.type === 'boolean'"
               class="justify-self-start"
@@ -150,7 +158,10 @@ SPDX-License-Identifier: Apache-2.0
           class="choy-properties-item choy-properties-item--display grid grid-cols-[minmax(4.5rem,7.5rem)_minmax(0,1fr)] items-center gap-x-2 gap-y-1"
           :data-name="item.name"
         >
-          <span class="text-[13px] text-muted-foreground">{{ itemLabel(item) }}</span>
+          <div class="inline-flex min-w-0 items-center gap-0.5 text-[13px] text-muted-foreground">
+            <span class="min-w-0 truncate">{{ itemLabel(item) }}</span>
+            <PropertyItemHelpTip :item="item" />
+          </div>
           <span class="choy-properties-item__value truncate text-sm text-foreground">{{
             displayItemValue(fieldValue().value, item)
           }}</span>
@@ -165,13 +176,15 @@ import type { BaseModel, FieldPath, FieldPathType } from '@/core/rpc';
 import type { ResolvedPropertyItem } from '@/core/service/orm/model/properties_types';
 import type { WebModelStore } from '@/web/web/stores/modelStore';
 import type { RuleItem } from 'async-validator';
-import { computed, ref, watch, type WritableComputedRef } from 'vue';
+import { computed, defineComponent, h, ref, watch, type WritableComputedRef } from 'vue';
+import { CircleHelp } from 'lucide-vue-next';
 import { useField } from '@/web/web/composables/useField';
 import type { UseField } from '@/web/web/composables/useField';
 import ChoyFieldBase, { type FieldStateExpr, type FormItemProps } from './ChoyFieldBase.vue';
 import { getActivePinia } from 'pinia';
 import { createTranslate } from '@/web/web/i18n';
 import { useI18nStore } from '@/web/web/stores/i18nStore';
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/web/web/components/vendor/ui/tooltip';
 import Input from '../vendor/ui/input/Input.vue';
 import Textarea from '../vendor/ui/textarea/Textarea.vue';
 import Switch from '../vendor/ui/switch/Switch.vue';
@@ -208,6 +221,53 @@ const { _t } = createTranslate('web', { scope: 'web/components/field/ChoyPropert
 
 defineOptions({ name: 'ChoyPropertiesField' });
 
+function propertyItemHelpText(item: ResolvedPropertyItem | null | undefined): string {
+  return String(item?.help ?? '').trim();
+}
+
+/** CircleHelp tip beside a property item label (same chrome as ChoyFieldBase form-help). */
+const PropertyItemHelpTip = defineComponent({
+  name: 'PropertyItemHelpTip',
+  props: {
+    item: { type: Object as () => ResolvedPropertyItem, required: true },
+  },
+  setup(props) {
+    const help = computed(() => propertyItemHelpText(props.item));
+    const ariaLabel = computed(() => {
+      const label = String(props.item?.string ?? props.item?.name ?? '').trim();
+      return label ? `${label}: ${help.value}` : help.value;
+    });
+    return () => {
+      if (!help.value) return null;
+      return h(TooltipProvider, null, {
+        default: () =>
+          h(Tooltip, null, {
+            default: () => [
+              h(
+                TooltipTrigger,
+                { asChild: true },
+                {
+                  default: () =>
+                    h(
+                      'button',
+                      {
+                        type: 'button',
+                        class: 'inline-flex shrink-0 cursor-help text-muted-foreground hover:text-foreground',
+                        'data-slot': 'form-help',
+                        'aria-label': ariaLabel.value,
+                      },
+                      [h(CircleHelp, { class: 'size-3.5', 'aria-hidden': 'true' })],
+                    ),
+                },
+              ),
+              h(TooltipContent, null, { default: () => help.value }),
+            ],
+          }),
+      });
+    };
+  },
+});
+
 /** Request-lang fingerprint for Resolve; empty when Pinia is unavailable (unit stubs). */
 function currentTerminologyLang(): string {
   if (!getActivePinia()) return '';
diff --git a/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts b/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
index f03447b27..e02457251 100644
--- a/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
+++ b/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
@@ -18,6 +18,8 @@ describe('propertiesDefinitionHelpers', () => {
     expect(PROPERTY_DEFINITION_V1_TYPE_OPTIONS).toContain('char');
     expect(emptyDraftItem().type).toBe('char');
     expect(emptyDraftItem().stringMap).toEqual({});
+    expect(emptyDraftItem().help).toBe('');
+    expect(emptyDraftItem().helpMap).toEqual({});
   });
 
   test('definitionItemsToDrafts unwraps lang maps for the requested lang', () => {
@@ -33,6 +35,7 @@ describe('propertiesDefinitionHelpers', () => {
           name: 'sel',
           type: 'selection',
           string: { en_US: 'Priority', zh_CN: '优先级' },
+          help: { en_US: 'Record urgency', zh_CN: '记录紧急程度' },
           selection: [
             ['a', { en_US: 'A', zh_CN: '甲' }],
             { value: 'b', label: 'B' },
@@ -47,6 +50,8 @@ describe('propertiesDefinitionHelpers', () => {
         type: 'char',
         string: '',
         stringMap: {},
+        help: '',
+        helpMap: {},
         default: '',
         readonly: false,
         selectionText: '',
@@ -57,6 +62,8 @@ describe('propertiesDefinitionHelpers', () => {
         type: 'selection',
         string: '优先级',
         stringMap: { en_US: 'Priority', zh_CN: '优先级' },
+        help: '记录紧急程度',
+        helpMap: { en_US: 'Record urgency', zh_CN: '记录紧急程度' },
         default: '',
         readonly: false,
         selectionText: JSON.stringify([
@@ -256,13 +263,38 @@ describe('propertiesDefinitionHelpers', () => {
     draft.name = 'prio';
     draft.type = 'selection';
     draft.stringMap = { en_US: 'Priority', zh_CN: '优先级' };
+    draft.helpMap = { en_US: 'Record urgency', zh_CN: '记录紧急程度' };
     draft.selectionLabelMaps = { high: { en_US: 'High', zh_CN: '高' } };
     syncDraftLabelsForLang(draft, 'zh_CN');
     expect(draft.string).toBe('优先级');
+    expect(draft.help).toBe('记录紧急程度');
     expect(draft.selectionText).toBe(JSON.stringify([['high', '高']]));
     draft.string = '优先';
+    draft.help = '紧急程度';
     applyDraftCurrentLangToMaps(draft, 'zh_CN');
     expect(draft.stringMap).toEqual({ en_US: 'Priority', zh_CN: '优先' });
+    expect(draft.helpMap).toEqual({ en_US: 'Record urgency', zh_CN: '紧急程度' });
+  });
+
+  test('draftsToDefinitionItems writes help lang maps and omits blank help', () => {
+    const withHelp = draftsToDefinitionItems(
+      [
+        {
+          ...emptyDraftItem(),
+          name: 'code',
+          type: 'char',
+          help: '外部编码',
+          helpMap: { en_US: 'External reference code', zh_CN: '旧' },
+        },
+      ],
+      'zh_CN',
+    );
+    expect(withHelp[0]!.help).toEqual({
+      en_US: 'External reference code',
+      zh_CN: '外部编码',
+    });
+    const blank = draftsToDefinitionItems([{ ...emptyDraftItem(), name: 'x', type: 'char' }], 'en_US');
+    expect(blank[0]!.help).toBeUndefined();
   });
 
   test('selectionRowsFromDraft / writeSelectionRowsToDraft keep maps across value rename', () => {
diff --git a/modules/web/web/components/field/propertiesDefinitionHelpers.ts b/modules/web/web/components/field/propertiesDefinitionHelpers.ts
index 7fa965c70..d411299b0 100644
--- a/modules/web/web/components/field/propertiesDefinitionHelpers.ts
+++ b/modules/web/web/components/field/propertiesDefinitionHelpers.ts
@@ -21,6 +21,10 @@ export type DefinitionEditorDraftItem = {
   string: string;
   /** Full label lang map (source of truth for Save / translate dialog). */
   stringMap: Record<string, string>;
+  /** Current-language help tip shown in the Help input. */
+  help: string;
+  /** Full help lang map (source of truth for Save / translate dialog). */
+  helpMap: Record<string, string>;
   default: string;
   readonly: boolean;
   /** Selection options bridge: JSON tuples of [value, current-lang label] for the list editor. */
@@ -98,6 +102,8 @@ export function emptyDraftItem(): DefinitionEditorDraftItem {
     type: 'char',
     string: '',
     stringMap: {},
+    help: '',
+    helpMap: {},
     default: '',
     readonly: false,
     selectionText: '',
@@ -125,10 +131,11 @@ function selectionRawValue(opt: unknown): string | null {
   return null;
 }
 
-/** Sync the current-lang `string` / selectionText views from stored maps. */
+/** Sync the current-lang `string` / `help` / selectionText views from stored maps. */
 export function syncDraftLabelsForLang(draft: DefinitionEditorDraftItem, lang: string): void {
   const code = String(lang || '').trim() || TRANSLATED_BASE_LANG;
   draft.string = unwrapPropertyLabel(draft.stringMap, code);
+  draft.help = unwrapPropertyLabel(draft.helpMap, code);
   if (draft.type !== 'selection') return;
   const options = normalizeSelectionOptions(
     (() => {
@@ -158,6 +165,8 @@ export function applyDraftCurrentLangToMaps(draft: DefinitionEditorDraftItem, la
   const code = String(lang || '').trim() || TRANSLATED_BASE_LANG;
   draft.string = String(draft.string || '').trim();
   draft.stringMap = asLabelMap(mergePropertyLabelWrite(draft.stringMap, draft.string, code));
+  draft.help = String(draft.help || '').trim();
+  draft.helpMap = asLabelMap(mergePropertyLabelWrite(draft.helpMap, draft.help, code));
   if (draft.type !== 'selection') return;
   const text = String(draft.selectionText || '').trim();
   if (!text) return;
@@ -197,6 +206,7 @@ export function definitionItemsToDrafts(
     if (!name) continue;
     const type = String(item.type || 'char') || 'char';
     const stringMap = asLabelMap(item.string);
+    const helpMap = asLabelMap(item.help);
     const selectionLabelMaps: Record<string, Record<string, string>> = {};
     let selectionText = '';
     if (Array.isArray(item.selection)) {
@@ -219,6 +229,8 @@ export function definitionItemsToDrafts(
       type,
       string: unwrapPropertyLabel(stringMap, code),
       stringMap,
+      help: unwrapPropertyLabel(helpMap, code),
+      helpMap,
       default: item.default == null ? '' : String(item.default),
       readonly: item.readonly === true,
       selectionText,
@@ -260,6 +272,13 @@ export function draftsToDefinitionItems(
     if (label || Object.keys(draft.stringMap).length) {
       item.string = mergePropertyLabelWrite(previous?.string ?? draft.stringMap, label, code);
     }
+    const help = String(draft.help || '').trim();
+    draft.help = help;
+    const helpHasContent =
+      !!help || Object.values(draft.helpMap || {}).some(v => String(v || '').trim() !== '');
+    if (helpHasContent) {
+      item.help = mergePropertyLabelWrite(previous?.help ?? draft.helpMap, help, code);
+    }
     if (draft.readonly) item.readonly = true;
     const defRaw = String(draft.default ?? '');
     if (defRaw.trim() !== '') {

From 100f95c057dbb03e2cf70b53a7439989109b7801 Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Wed, 28 Oct 2026 15:57:05 +0800
Subject: [PATCH 08/23] fix(web): keep property dialog open on commit failure
 and raise patch coverage

Re-export TRANSLATED_BASE_LANG from properties_label_i18n so web UI avoids
forbidden projection imports. Close the item dialog only after commitDrafts
succeeds so validation errors do not discard edits. Add FE/BE unit tests for
the new dialogs, FieldsGet coalesce edges, DataTable handle reorder, Kanban
drag chrome, and non-stored ManyToOne FK skip paths.
---
 .../evolution/schema/foreignkey_test.go       | 170 ++++++
 modules/core/service/orm/model/index.ts       |   1 +
 .../orm/model/properties_label_i18n.test.ts   |  74 +++
 .../orm/model/properties_label_i18n.ts        |   3 +
 .../ChoyOneToManyKanbanField.mount.test.ts    |  89 +++
 .../ChoyPropertiesDefinitionField.test.ts     | 147 +++++
 .../field/ChoyPropertiesDefinitionField.vue   |   6 +-
 ...ChoyPropertiesDefinitionItemDialog.test.ts | 551 ++++++++++++++++++
 .../ChoyPropertiesDefinitionItemDialog.vue    |   4 +-
 ...hoyPropertyLabelTranslationsDialog.test.ts | 273 +++++++++
 .../ChoyPropertyLabelTranslationsDialog.vue   |   2 +-
 .../field/propertiesDefinitionHelpers.test.ts |  99 ++++
 .../field/propertiesDefinitionHelpers.ts      |   2 +-
 .../internal/DataTable.mount.test.ts          | 150 +++++
 modules/web/web/stores/fieldsGet.test.ts      | 178 ++++++
 15 files changed, 1743 insertions(+), 6 deletions(-)
 create mode 100644 modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts
 create mode 100644 modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts

diff --git a/internal/module/evolution/schema/foreignkey_test.go b/internal/module/evolution/schema/foreignkey_test.go
index 69e0536f6..d30d51447 100644
--- a/internal/module/evolution/schema/foreignkey_test.go
+++ b/internal/module/evolution/schema/foreignkey_test.go
@@ -339,3 +339,173 @@ func TestForeignKeyMigratorRuntimePaths(t *testing.T) {
 		}
 	})
 }
+
+func TestShouldSkipManyToOneForeignKey(t *testing.T) {
+	t.Parallel()
+
+	t.Run("select option skips without consulting field", func(t *testing.T) {
+		skip, err := shouldSkipManyToOneForeignKey(nil, map[string]interface{}{"select": "expr"})
+		if err != nil || !skip {
+			t.Fatalf("expected skip for select, got skip=%v err=%v", skip, err)
+		}
+	})
+
+	t.Run("nil field without select does not skip", func(t *testing.T) {
+		skip, err := shouldSkipManyToOneForeignKey(nil, map[string]interface{}{})
+		if err != nil || skip {
+			t.Fatalf("expected no skip for nil field, got skip=%v err=%v", skip, err)
+		}
+	})
+
+	t.Run("GetResolvedSpec error wraps field name", func(t *testing.T) {
+		field := &meta.Field{Name: "OwnerId", ResolvedSpec: `{not-json`}
+		_, err := shouldSkipManyToOneForeignKey(field, map[string]interface{}{})
+		if err == nil || !strings.Contains(err.Error(), "error unmarshal field resolved spec for OwnerId") {
+			t.Fatalf("expected resolved-spec unwrap error, got %v", err)
+		}
+	})
+
+	t.Run("ResolvedSpec ShouldCreateColumn true/false", func(t *testing.T) {
+		stored := &meta.Field{Name: "OwnerId"}
+		if err := stored.SetResolvedSpec(&meta.FieldResolvedSpec{
+			FieldName: "OwnerId",
+			Migration: meta.FieldMigrationDecision{ShouldCreateColumn: true},
+		}); err != nil {
+			t.Fatalf("SetResolvedSpec: %v", err)
+		}
+		skip, err := shouldSkipManyToOneForeignKey(stored, nil)
+		if err != nil || skip {
+			t.Fatalf("expected keep stored column FK, got skip=%v err=%v", skip, err)
+		}
+
+		virtual := &meta.Field{Name: "PrimaryLineId"}
+		if err := virtual.SetResolvedSpec(&meta.FieldResolvedSpec{
+			FieldName: "PrimaryLineId",
+			Migration: meta.FieldMigrationDecision{ShouldCreateColumn: false, ReasonCode: "COMPUTE_STORE_FALSE"},
+		}); err != nil {
+			t.Fatalf("SetResolvedSpec: %v", err)
+		}
+		skip, err = shouldSkipManyToOneForeignKey(virtual, nil)
+		if err != nil || !skip {
+			t.Fatalf("expected skip virtual column, got skip=%v err=%v", skip, err)
+		}
+	})
+
+	t.Run("falls back to Compute decorator when ResolvedSpec absent", func(t *testing.T) {
+		virtual := &meta.Field{
+			Name: "PrimaryLineId",
+			Decorators: []*meta.Decorator{{
+				Name: "Compute",
+				Arguments: []*meta.Argument{
+					{Type: "ObjectLiteral", Value: `{"store":false}`},
+				},
+			}},
+		}
+		skip, err := shouldSkipManyToOneForeignKey(virtual, map[string]interface{}{})
+		if err != nil || !skip {
+			t.Fatalf("expected skip via Compute store:false, got skip=%v err=%v", skip, err)
+		}
+	})
+}
+
+func TestFieldHasNonStoredComputeDecorator(t *testing.T) {
+	t.Parallel()
+
+	if fieldHasNonStoredComputeDecorator(nil) {
+		t.Fatal("nil field must be false")
+	}
+
+	cases := []struct {
+		name  string
+		field *meta.Field
+		want  bool
+	}{
+		{
+			name:  "empty decorators",
+			field: &meta.Field{Name: "X"},
+			want:  false,
+		},
+		{
+			name: "nil decorator skipped",
+			field: &meta.Field{
+				Name:       "X",
+				Decorators: []*meta.Decorator{nil},
+			},
+			want: false,
+		},
+		{
+			name: "non-Compute decorator ignored",
+			field: &meta.Field{
+				Name: "X",
+				Decorators: []*meta.Decorator{{
+					Name:      "Field",
+					Arguments: []*meta.Argument{{Type: "ObjectLiteral", Value: `{"store":false}`}},
+				}},
+			},
+			want: false,
+		},
+		{
+			name: "Compute store true does not skip",
+			field: &meta.Field{
+				Name: "X",
+				Decorators: []*meta.Decorator{{
+					Name: "Compute",
+					Arguments: []*meta.Argument{
+						{Type: "ObjectLiteral", Value: `{"store":true}`},
+					},
+				}},
+			},
+			want: false,
+		},
+		{
+			name: "Compute store false skips",
+			field: &meta.Field{
+				Name: "X",
+				Decorators: []*meta.Decorator{{
+					Name: "Compute",
+					Arguments: []*meta.Argument{
+						{Type: "StringLiteral", Value: "fn"},
+						{Type: "ObjectLiteral", Value: `{"deps":["A"],"store":false}`},
+					},
+				}},
+			},
+			want: true,
+		},
+		{
+			name: "invalid Compute JSON ignored",
+			field: &meta.Field{
+				Name: "X",
+				Decorators: []*meta.Decorator{{
+					Name: "Compute",
+					Arguments: []*meta.Argument{
+						{Type: "ObjectLiteral", Value: `{bad`},
+					},
+				}},
+			},
+			want: false,
+		},
+		{
+			name: "empty ObjectLiteral value ignored",
+			field: &meta.Field{
+				Name: "X",
+				Decorators: []*meta.Decorator{{
+					Name: "Compute",
+					Arguments: []*meta.Argument{
+						nil,
+						{Type: "ObjectLiteral", Value: ""},
+						{Type: "StringLiteral", Value: `{"store":false}`},
+					},
+				}},
+			},
+			want: false,
+		},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := fieldHasNonStoredComputeDecorator(tc.field); got != tc.want {
+				t.Fatalf("got %v, want %v", got, tc.want)
+			}
+		})
+	}
+}
diff --git a/modules/core/service/orm/model/index.ts b/modules/core/service/orm/model/index.ts
index 0a121bb95..9c93ff020 100644
--- a/modules/core/service/orm/model/index.ts
+++ b/modules/core/service/orm/model/index.ts
@@ -28,6 +28,7 @@ export {
   type ResolvedPropertyItem,
 } from './properties_types';
 export {
+  TRANSLATED_BASE_LANG,
   mergePropertyLabelWrite,
   mergeSelectionLabelsWrite,
   translatePropertyDefinitionItems,
diff --git a/modules/core/service/orm/model/properties_label_i18n.test.ts b/modules/core/service/orm/model/properties_label_i18n.test.ts
index 4578390e4..8e61588d8 100644
--- a/modules/core/service/orm/model/properties_label_i18n.test.ts
+++ b/modules/core/service/orm/model/properties_label_i18n.test.ts
@@ -5,6 +5,7 @@ import {
   mergePropertyLabelWrite,
   mergeSelectionLabelsWrite,
   normalizePropertyLabelForStorage,
+  normalizeSelectionLabelsForStorage,
   parsePropertyLabelMap,
   translatePropertyDefinitionItems,
   unwrapPropertyLabel,
@@ -21,6 +22,28 @@ test('parsePropertyLabelMap treats plain string as en_US', () => {
   expect(parsePropertyLabelMap(['x'])).toBeNull();
 });
 
+test('parsePropertyLabelMap skips hyphen keys and coerces number/boolean/null values', () => {
+  expect(
+    parsePropertyLabelMap({
+      en_US: 'Base',
+      'zh-CN': 'skipped',
+      '': 'empty-key',
+      zh_CN: 12,
+      fr_FR: true,
+      de_DE: false,
+      ja_JP: null,
+      bad: { nested: 1 },
+    })
+  ).toEqual({
+    en_US: 'Base',
+    zh_CN: '12',
+    fr_FR: 'true',
+    de_DE: 'false',
+    ja_JP: '',
+  });
+  expect(parsePropertyLabelMap({ 'zh-CN': 'only-hyphen' })).toBeNull();
+});
+
 test('unwrapPropertyLabel falls back to en_US and keeps explicit empty', () => {
   expect(unwrapPropertyLabel({ en_US: 'Priority', zh_CN: '优先级' }, 'zh_CN')).toBe('优先级');
   expect(unwrapPropertyLabel({ en_US: 'Priority' }, 'zh_CN')).toBe('Priority');
@@ -36,6 +59,13 @@ test('normalizePropertyLabelForStorage keeps string and cleans maps', () => {
     en_US: 'Priority',
     zh_CN: '优先级',
   });
+  expect(normalizePropertyLabelForStorage(null)).toBeUndefined();
+  expect(normalizePropertyLabelForStorage({})).toBeUndefined();
+  expect(normalizePropertyLabelForStorage({ zh_CN: 7, fr_FR: false, en_US: null })).toEqual({
+    zh_CN: '7',
+    fr_FR: 'false',
+    en_US: '',
+  });
   expect(() => normalizePropertyLabelForStorage({ 'zh-CN': 'x' })).toThrow(/terminology code/);
   expect(() => normalizePropertyLabelForStorage({ en_US: { nested: 1 } as any })).toThrow(/must be a string/);
 });
@@ -73,6 +103,50 @@ test('mergeSelectionLabelsWrite merges by option value', () => {
   ]);
 });
 
+test('mergeSelectionLabelsWrite skips invalid previous options and accepts object form', () => {
+  expect(mergeSelectionLabelsWrite(undefined, [{ value: 'a', label: 'A' }], 'en_US')).toEqual([
+    ['a', 'A'],
+  ]);
+  const merged = mergeSelectionLabelsWrite(
+    [
+      { value: 'a', label: { en_US: 'Alpha', zh_CN: '甲' } },
+      { value: 1 as any, label: 'skip-non-string-value' },
+      null as any,
+      [1 as any, 'non-string-tuple-value'],
+    ],
+    [
+      { value: 'a', label: '新甲' },
+      { value: 'b', label: '乙' },
+    ],
+    'zh_CN'
+  );
+  expect(merged).toEqual([
+    ['a', { en_US: 'Alpha', zh_CN: '新甲' }],
+    ['b', { en_US: '乙', zh_CN: '乙' }],
+  ]);
+});
+
+test('normalizeSelectionLabelsForStorage keeps tuple vs object shape and null labels', () => {
+  expect(
+    normalizeSelectionLabelsForStorage(
+      [
+        ['high', { en_US: 'High', zh_CN: '高' }],
+        { value: 'low', label: null },
+        { value: 'mid' },
+      ],
+      'priority'
+    )
+  ).toEqual([
+    ['high', { en_US: 'High', zh_CN: '高' }],
+    { value: 'low', label: 'low' },
+    { value: 'mid', label: 'mid' },
+  ]);
+  expect(() => normalizeSelectionLabelsForStorage(null, 'priority')).toThrow(/selection options are invalid/);
+  expect(() => normalizeSelectionLabelsForStorage([{ label: 'x' }], 'priority')).toThrow(
+    /selection options are invalid/
+  );
+});
+
 test('translatePropertyDefinitionItems unwraps string, help, and selection labels', () => {
   const items = translatePropertyDefinitionItems(
     [
diff --git a/modules/core/service/orm/model/properties_label_i18n.ts b/modules/core/service/orm/model/properties_label_i18n.ts
index d2b6271f7..2f5f0135f 100644
--- a/modules/core/service/orm/model/properties_label_i18n.ts
+++ b/modules/core/service/orm/model/properties_label_i18n.ts
@@ -9,6 +9,9 @@ import {
 } from '../repository/projection/translated_field_codec';
 import type { PropertyItemDefinition, PropertyLabel } from './properties_types';
 
+/** Re-export for web/UI callers (avoid deep `@/core/service/orm/repository/projection/*` imports). */
+export { TRANSLATED_BASE_LANG };
+
 function hasOwn(map: object, key: string): boolean {
   return Object.prototype.hasOwnProperty.call(map, key);
 }
diff --git a/modules/web/web/components/field/ChoyOneToManyKanbanField.mount.test.ts b/modules/web/web/components/field/ChoyOneToManyKanbanField.mount.test.ts
index 52785f410..6b455b33e 100644
--- a/modules/web/web/components/field/ChoyOneToManyKanbanField.mount.test.ts
+++ b/modules/web/web/components/field/ChoyOneToManyKanbanField.mount.test.ts
@@ -256,4 +256,93 @@ describe('ChoyOneToManyKanbanField mount coverage', () => {
     expect(removeItemAt.calls.length).toBe(1);
     m.unmount();
   });
+
+  test('kanbanCardDragClass paints overIndex ring; dragstart sets HTML5 drag image', async () => {
+    installStubs('edit');
+    const { binding } = makeBinding({
+      items: [
+        { Id: '1', Name: 'Alpha', Sequence: 1 },
+        { Id: '2', Name: 'Beta', Sequence: 2 },
+      ],
+    });
+    binding.relationStore = {
+      fieldsMetadata: { Sequence: { type: 'int' } },
+    } as any;
+    const m = mountApp(ChoyOneToManyKanbanField as any, {
+      props: { binding, cardTitleField: 'Name', cardSubtitleField: '' },
+    });
+    await nextTick();
+    await flushPromises();
+
+    const state = m.setupState() as {
+      kanbanCardDragClass?: (index: number) => Record<string, boolean>;
+      kanbanReorder?: {
+        draggingIndex: { value: number | null };
+        overIndex: { value: number | null };
+      };
+      sortableEnabled?: boolean;
+    };
+    expect(state.sortableEnabled).toBe(true);
+    expect(state.kanbanCardDragClass?.(0)).toEqual({
+      'opacity-60': false,
+      'bg-accent/40 ring-1 ring-inset ring-primary/30': false,
+    });
+
+    state.kanbanReorder!.draggingIndex.value = 0;
+    state.kanbanReorder!.overIndex.value = 1;
+    expect(state.kanbanCardDragClass?.(0)).toEqual({
+      'opacity-60': true,
+      'bg-accent/40 ring-1 ring-inset ring-primary/30': false,
+    });
+    expect(state.kanbanCardDragClass?.(1)).toEqual({
+      'opacity-60': false,
+      'bg-accent/40 ring-1 ring-inset ring-primary/30': true,
+    });
+
+    const handle = m.q('[data-testid="choy-o2m-kanban-handle"]') as HTMLElement | null;
+    const card = m.q('[data-testid="choy-o2m-kanban-card"]') as HTMLElement | null;
+    expect(handle).toBeTruthy();
+    expect(card).toBeTruthy();
+    Object.defineProperty(card, 'getBoundingClientRect', {
+      value: () => ({ left: 10, top: 20, width: 120, height: 80, right: 130, bottom: 100, x: 10, y: 20, toJSON: () => ({}) }),
+    });
+    const setData = fnRecorder();
+    const setDragImage = fnRecorder();
+    const onKanbanDragStart = (m.setupState() as { onKanbanDragStart?: (index: number, event: DragEvent) => void })
+      .onKanbanDragStart;
+    expect(typeof onKanbanDragStart).toBe('function');
+    onKanbanDragStart!(0, {
+      preventDefault: fnRecorder(),
+      stopPropagation: fnRecorder(),
+      clientX: 40,
+      clientY: 50,
+      currentTarget: handle,
+      dataTransfer: { effectAllowed: '', setData, setDragImage },
+    } as unknown as DragEvent);
+    await nextTick();
+    expect(setDragImage.calls.length).toBe(1);
+    expect(setDragImage.calls[0]?.[0]).toBe(card);
+    expect(state.kanbanReorder!.draggingIndex.value).toBe(0);
+
+    // Non-sortable (showHandle=false) returns empty class map.
+    m.unmount();
+    const hidden = makeBinding({
+      items: [
+        { Id: '1', Name: 'Alpha', Sequence: 1 },
+        { Id: '2', Name: 'Beta', Sequence: 2 },
+      ],
+    });
+    hidden.binding.relationStore = {
+      fieldsMetadata: { Sequence: { type: 'int' } },
+    } as any;
+    const hm = mountApp(ChoyOneToManyKanbanField as any, {
+      props: { binding: hidden.binding, showHandle: false },
+    });
+    await nextTick();
+    const hiddenState = hm.setupState() as {
+      kanbanCardDragClass?: (index: number) => Record<string, boolean>;
+    };
+    expect(hiddenState.kanbanCardDragClass?.(0)).toEqual({});
+    hm.unmount();
+  });
 });
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts b/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
index 47e6cc5f4..6eb2e40ad 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
@@ -368,4 +368,151 @@ describe('ChoyPropertiesDefinitionField', () => {
       mounted.unmount();
     }
   });
+
+  test('commitDrafts failure keeps dialog open (onDialogSaved catch return)', async () => {
+    // Invalid selection JSON → draftsToDefinitionItems throws inside commitDrafts.
+    stubSfc(ChoyPropertiesDefinitionItemDialog as any, {
+      name: 'ChoyPropertiesDefinitionItemDialog',
+      props: {
+        modelValue: Boolean,
+        item: Object,
+        readonly: Boolean,
+        title: String,
+      },
+      emits: ['update:modelValue', 'saved', 'closed'],
+      setup(props: any, { emit }: any) {
+        return () =>
+          props.modelValue
+            ? h('div', { 'data-testid': 'choy-properties-definition-item-dialog-stub' }, [
+                h(
+                  'button',
+                  {
+                    'data-testid': 'stub-item-save-bad',
+                    onClick: () =>
+                      emit('saved', {
+                        name: 'bad_sel',
+                        type: 'selection',
+                        string: 'Bad',
+                        stringMap: { en_US: 'Bad' },
+                        help: '',
+                        helpMap: {},
+                        default: '',
+                        readonly: false,
+                        selectionText: '',
+                        selectionLabelMaps: {},
+                      }),
+                  },
+                  'save-bad',
+                ),
+              ])
+            : null;
+      },
+    } as any);
+
+    const binding = makeBinding({ definition: [], isEditMode: true });
+    const mounted = mountApp(ChoyPropertiesDefinitionField as any, {
+      props: { binding },
+    });
+    try {
+      await flushPromises();
+      mounted.click('[data-testid="choy-properties-definition-add"]');
+      await nextTick();
+      expect(mounted.q('[data-testid="choy-properties-definition-item-dialog-stub"]')).toBeTruthy();
+      mounted.click('[data-testid="stub-item-save-bad"]');
+      await nextTick();
+      await flushPromises();
+      // Dialog stays open; writeError surfaces the validation message.
+      expect(mounted.q('[data-testid="choy-properties-definition-item-dialog-stub"]')).toBeTruthy();
+      expect(mounted.q('[data-testid="choy-properties-definition-write-error"]')?.textContent || '').toMatch(
+        /selection/,
+      );
+      expect((binding.__value.value as any[]).length).toBe(0);
+    } finally {
+      mounted.unmount();
+      installItemDialogStub();
+    }
+  });
+
+  test('openRow readonly in display mode opens dialog with View', async () => {
+    const binding = makeBinding({
+      definition: [{ name: 'tax_id', type: 'char', string: { en_US: 'Tax' } }],
+      isEditMode: false,
+    });
+    stubSfc(ChoyPropertiesDefinitionItemDialog as any, {
+      name: 'ChoyPropertiesDefinitionItemDialog',
+      props: {
+        modelValue: Boolean,
+        item: Object,
+        readonly: Boolean,
+        title: String,
+      },
+      emits: ['update:modelValue', 'saved', 'closed'],
+      setup(props: any) {
+        return () =>
+          props.modelValue
+            ? h('div', {
+                'data-testid': 'choy-properties-definition-item-dialog-stub',
+                'data-readonly': props.readonly ? '1' : '0',
+              })
+            : null;
+      },
+    } as any);
+
+    const mounted = mountApp(ChoyPropertiesDefinitionField as any, {
+      props: { binding },
+    });
+    try {
+      await flushPromises();
+      // Row click opens as readonly when canMutate is false (display mode).
+      mounted.click('[data-testid="choy-properties-definition-row"]');
+      await nextTick();
+      const stub = mounted.q('[data-testid="choy-properties-definition-item-dialog-stub"]');
+      expect(stub).toBeTruthy();
+      expect(stub?.getAttribute('data-readonly')).toBe('1');
+    } finally {
+      mounted.unmount();
+      installItemDialogStub();
+    }
+  });
+
+  test('openRow edit path and remove keep selection drafts intact', async () => {
+    const binding = makeBinding({
+      definition: [
+        {
+          name: 'prio',
+          type: 'selection',
+          string: { en_US: 'Priority' },
+          selection: [
+            ['low', 'Low'],
+            ['high', 'High'],
+          ],
+        },
+        { name: 'code', type: 'char', string: { en_US: 'Code' } },
+      ],
+      isEditMode: true,
+    });
+    const mounted = mountApp(ChoyPropertiesDefinitionField as any, {
+      props: { binding },
+    });
+    try {
+      await flushPromises();
+      expect(mounted.el.textContent || '').toMatch(/prio/);
+      expect(mounted.el.textContent || '').toMatch(/selection/);
+      mounted.click('[data-testid="choy-properties-definition-open"]');
+      await nextTick();
+      expect(mounted.q('[data-testid="choy-properties-definition-item-dialog-stub"]')).toBeTruthy();
+
+      const removeBtns = mounted.el.querySelectorAll(
+        '[data-testid="choy-properties-definition-remove"]',
+      );
+      (removeBtns[0] as HTMLButtonElement).click();
+      await nextTick();
+      await flushPromises();
+      const next = binding.__value.value as any[];
+      expect(next.length).toBe(1);
+      expect(next[0].name).toBe('code');
+    } finally {
+      mounted.unmount();
+    }
+  });
 });
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue b/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
index 3c8f1708b..00298e313 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
@@ -104,7 +104,7 @@ SPDX-License-Identifier: Apache-2.0
 <script setup lang="ts" generic="T extends BaseModel, P extends FieldPath<T, unknown[] | null | undefined>, V = FieldPathType<T, P>">
 import type { BaseModel, FieldPath, FieldPathType } from '@/core/rpc';
 import type { PropertyItemDefinition } from '@/core/service/orm/model/properties_types';
-import { TRANSLATED_BASE_LANG } from '@/core/service/orm/repository/projection/translated_field_codec';
+import { TRANSLATED_BASE_LANG } from '@/core/service/orm/model/properties_label_i18n';
 import type { WebModelStore } from '@/web/web/stores/modelStore';
 import type { RuleItem } from 'async-validator';
 import { computed, defineComponent, h, ref, watch, type WritableComputedRef } from 'vue';
@@ -549,8 +549,10 @@ function onDialogSaved(item: DefinitionEditorDraftItem) {
   try {
     commitDrafts(next);
   } catch {
-    // keep dialog closed; error shown on field
+    // Keep dialog open so the user can fix invalid input without retyping.
+    return;
   }
+  dialogOpen.value = false;
   dialogIndex.value = null;
   dialogItem.value = null;
 }
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts
new file mode 100644
index 000000000..d51387f2d
--- /dev/null
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts
@@ -0,0 +1,551 @@
+// SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
+// SPDX-License-Identifier: Apache-2.0
+
+import { h } from 'vue';
+import { createPinia, setActivePinia } from 'pinia';
+
+import { useI18nStore } from '@/web/web/stores/i18nStore';
+import { flushPromises, fnRecorder, mountApp, restoreSfc, stubSfc } from '@/web/web/__tests__/mountApp';
+import { ChoyDialog, ChoyDialogContent, ChoyDialogTitle } from '@/web/web/components/layout/choyDialog';
+import ChoyButton from '@/web/web/components/layout/ChoyButton.vue';
+import Checkbox from '../vendor/ui/checkbox/Checkbox.vue';
+import FieldLabel from '../vendor/ui/field/FieldLabel.vue';
+import Input from '../vendor/ui/input/Input.vue';
+import Textarea from '../vendor/ui/textarea/Textarea.vue';
+import Select from '../vendor/ui/select/Select.vue';
+import SelectContent from '../vendor/ui/select/SelectContent.vue';
+import SelectItem from '../vendor/ui/select/SelectItem.vue';
+import SelectTrigger from '../vendor/ui/select/SelectTrigger.vue';
+import ChoyPropertyLabelTranslationsDialog from './ChoyPropertyLabelTranslationsDialog.vue';
+import ChoyPropertiesDefinitionSelectionEditor from './ChoyPropertiesDefinitionSelectionEditor.vue';
+import ItemDialog from './ChoyPropertiesDefinitionItemDialog.vue';
+import type { DefinitionEditorDraftItem } from './propertiesDefinitionHelpers';
+
+function draft(partial: Partial<DefinitionEditorDraftItem> = {}): DefinitionEditorDraftItem {
+  return {
+    name: '',
+    type: 'char',
+    string: '',
+    stringMap: {},
+    help: '',
+    helpMap: {},
+    default: '',
+    readonly: false,
+    selectionText: '',
+    selectionLabelMaps: {},
+    ...partial,
+  };
+}
+
+describe('ChoyPropertiesDefinitionItemDialog', () => {
+  let pinia: ReturnType<typeof createPinia>;
+  let lastTranslateProps: Record<string, unknown> | null = null;
+  let translateSavedEmit: ((next: Record<string, string>) => void) | null = null;
+  let lastSelectionProps: Record<string, unknown> | null = null;
+  let selectionTranslateEmit: ((value: string) => void) | null = null;
+  let selectionUpdateEmit: ((rows: unknown[]) => void) | null = null;
+
+  function installStubs() {
+    stubSfc(ChoyDialog as any, {
+      name: 'Dialog',
+      props: { open: { type: Boolean, default: false } },
+      emits: ['update:open'],
+      setup(props: any, { slots }: any) {
+        return () =>
+          h('div', { class: 'dialog', 'data-open': props.open ? '1' : '0' }, [
+            props.open ? slots.default?.() : null,
+          ]);
+      },
+    });
+    stubSfc(ChoyDialogContent as any, {
+      name: 'DialogContent',
+      setup(_: any, { slots, attrs }: any) {
+        return () => h('div', { class: ['dialog-content', attrs.class], ...attrs }, slots.default?.());
+      },
+    });
+    stubSfc(ChoyDialogTitle as any, {
+      name: 'DialogTitle',
+      setup(_: any, { slots }: any) {
+        return () => h('div', { class: 'dialog-title', 'data-testid': 'item-dialog-title' }, slots.default?.());
+      },
+    });
+    stubSfc(ChoyButton as any, {
+      name: 'ChoyButton',
+      props: {
+        type: { type: String, default: 'button' },
+        variant: { type: String, default: 'default' },
+        size: { type: String, default: undefined },
+        disabled: { type: Boolean, default: false },
+      },
+      emits: ['click'],
+      setup(props: any, { emit, slots, attrs }: any) {
+        return () =>
+          h(
+            'button',
+            {
+              ...attrs,
+              type: props.type || 'button',
+              disabled: props.disabled || undefined,
+              onClick: (e: Event) => emit('click', e),
+            },
+            slots.default?.(),
+          );
+      },
+    });
+    stubSfc(Input as any, {
+      name: 'Input',
+      props: { modelValue: { type: [String, Number], default: '' }, disabled: Boolean, id: String },
+      emits: ['update:modelValue'],
+      setup(props: any, { emit, attrs }: any) {
+        return () =>
+          h('input', {
+            ...attrs,
+            id: props.id,
+            disabled: props.disabled || undefined,
+            value: props.modelValue ?? '',
+            onInput: (e: Event) => emit('update:modelValue', (e.target as HTMLInputElement).value),
+          });
+      },
+    });
+    stubSfc(Textarea as any, {
+      name: 'Textarea',
+      props: { modelValue: { type: String, default: '' }, disabled: Boolean, id: String },
+      emits: ['update:modelValue'],
+      setup(props: any, { emit, attrs }: any) {
+        return () =>
+          h('textarea', {
+            ...attrs,
+            id: props.id,
+            disabled: props.disabled || undefined,
+            value: props.modelValue ?? '',
+            onInput: (e: Event) => emit('update:modelValue', (e.target as HTMLTextAreaElement).value),
+          });
+      },
+    });
+    stubSfc(FieldLabel as any, {
+      name: 'FieldLabel',
+      setup(_: any, { slots }: any) {
+        return () => h('label', slots.default?.());
+      },
+    });
+    stubSfc(Checkbox as any, {
+      name: 'Checkbox',
+      props: { modelValue: { type: [Boolean, String, Number], default: false }, disabled: Boolean },
+      emits: ['update:modelValue'],
+      setup(props: any, { emit, attrs }: any) {
+        return () =>
+          h('input', {
+            ...attrs,
+            type: 'checkbox',
+            disabled: props.disabled || undefined,
+            checked: props.modelValue === true,
+            onChange: (e: Event) => emit('update:modelValue', (e.target as HTMLInputElement).checked),
+          });
+      },
+    });
+    stubSfc(Select as any, {
+      name: 'Select',
+      props: { modelValue: { type: String, default: '' }, disabled: Boolean },
+      emits: ['update:modelValue'],
+      setup(props: any, { slots, emit }: any) {
+        return () =>
+          h('div', { class: 'select-stub', 'data-value': props.modelValue }, [
+            slots.default?.(),
+            h(
+              'button',
+              {
+                type: 'button',
+                'data-testid': 'stub-set-selection-type',
+                disabled: props.disabled || undefined,
+                onClick: () => emit('update:modelValue', 'selection'),
+              },
+              'selection',
+            ),
+          ]);
+      },
+    });
+    stubSfc(SelectTrigger as any, {
+      name: 'SelectTrigger',
+      setup(_: any, { attrs }: any) {
+        return () => h('button', { ...attrs, type: 'button' }, 'type');
+      },
+    });
+    stubSfc(SelectContent as any, {
+      name: 'SelectContent',
+      setup(_: any, { slots }: any) {
+        return () => h('div', slots.default?.());
+      },
+    });
+    stubSfc(SelectItem as any, {
+      name: 'SelectItem',
+      props: { value: String },
+      setup(props: any, { slots }: any) {
+        return () => h('div', { 'data-value': props.value }, slots.default?.());
+      },
+    });
+    stubSfc(ChoyPropertyLabelTranslationsDialog as any, {
+      name: 'ChoyPropertyLabelTranslationsDialog',
+      props: { modelValue: Boolean, labelTitle: String, translations: Object },
+      emits: ['update:modelValue', 'saved', 'closed'],
+      setup(props: any, { emit }: any) {
+        lastTranslateProps = props;
+        translateSavedEmit = (next: Record<string, string>) => emit('saved', next);
+        return () =>
+          props.modelValue
+            ? h('div', { 'data-testid': 'translate-dialog-stub' }, [
+                h(
+                  'button',
+                  {
+                    type: 'button',
+                    'data-testid': 'stub-translate-save-string',
+                    onClick: () => emit('saved', { en_US: 'L-en', zh_CN: 'L-zh' }),
+                  },
+                  'save-string',
+                ),
+                h(
+                  'button',
+                  {
+                    type: 'button',
+                    'data-testid': 'stub-translate-save-help',
+                    onClick: () => emit('saved', { en_US: 'H-en', zh_CN: 'H-zh' }),
+                  },
+                  'save-help',
+                ),
+                h(
+                  'button',
+                  {
+                    type: 'button',
+                    'data-testid': 'stub-translate-save-selection',
+                    onClick: () => emit('saved', { en_US: 'S-en', zh_CN: 'S-zh' }),
+                  },
+                  'save-selection',
+                ),
+              ])
+            : null;
+      },
+    });
+    stubSfc(ChoyPropertiesDefinitionSelectionEditor as any, {
+      name: 'ChoyPropertiesDefinitionSelectionEditor',
+      props: { modelValue: { type: Array, default: () => [] }, readonly: Boolean },
+      emits: ['update:modelValue', 'translate'],
+      setup(props: any, { emit }: any) {
+        lastSelectionProps = props;
+        selectionTranslateEmit = (value: string) => emit('translate', value);
+        selectionUpdateEmit = (rows: unknown[]) => emit('update:modelValue', rows);
+        return () =>
+          h('div', { 'data-testid': 'selection-editor-stub' }, [
+            h(
+              'button',
+              {
+                type: 'button',
+                'data-testid': 'stub-selection-update',
+                onClick: () =>
+                  emit('update:modelValue', [
+                    { value: 'low', label: 'Low', labelMap: { en_US: 'Low' } },
+                    { value: 'high', label: 'High', labelMap: { en_US: 'High' } },
+                  ]),
+              },
+              'update',
+            ),
+            h(
+              'button',
+              {
+                type: 'button',
+                'data-testid': 'stub-selection-translate',
+                onClick: () => emit('translate', 'low'),
+              },
+              'translate',
+            ),
+          ]);
+      },
+    });
+  }
+
+  beforeEach(() => {
+    pinia = createPinia();
+    setActivePinia(pinia);
+    void useI18nStore();
+    lastTranslateProps = null;
+    translateSavedEmit = null;
+    lastSelectionProps = null;
+    selectionTranslateEmit = null;
+    selectionUpdateEmit = null;
+    installStubs();
+  });
+
+  afterEach(() => {
+    restoreSfc(ChoyDialog as any);
+    restoreSfc(ChoyDialogContent as any);
+    restoreSfc(ChoyDialogTitle as any);
+    restoreSfc(ChoyButton as any);
+    restoreSfc(Input as any);
+    restoreSfc(Textarea as any);
+    restoreSfc(FieldLabel as any);
+    restoreSfc(Checkbox as any);
+    restoreSfc(Select as any);
+    restoreSfc(SelectTrigger as any);
+    restoreSfc(SelectContent as any);
+    restoreSfc(SelectItem as any);
+    restoreSfc(ChoyPropertyLabelTranslationsDialog as any);
+    restoreSfc(ChoyPropertiesDefinitionSelectionEditor as any);
+  });
+
+  function mountDialog(props: Record<string, unknown> = {}, on?: Record<string, (...args: any[]) => void>) {
+    return mountApp(ItemDialog as any, {
+      props: {
+        modelValue: true,
+        item: draft({ name: 'tax_id', string: 'Tax', stringMap: { en_US: 'Tax' } }),
+        ...props,
+      },
+      on,
+      plugins: [pinia],
+    });
+  }
+
+  test('title override and edit/new/readonly titles', async () => {
+    const override = mountDialog({ title: 'Custom Title' });
+    await flushPromises();
+    expect(override.el.querySelector('[data-testid="item-dialog-title"]')?.textContent).toBe('Custom Title');
+    override.unmount();
+
+    const edit = mountDialog({ title: '' });
+    await flushPromises();
+    expect(edit.el.querySelector('[data-testid="item-dialog-title"]')?.textContent || '').toMatch(/tax_id/);
+    edit.unmount();
+
+    const neu = mountDialog({ title: '', item: draft() });
+    await flushPromises();
+    expect(neu.el.querySelector('[data-testid="item-dialog-title"]')?.textContent || '').toMatch(/New/i);
+    neu.unmount();
+
+    const ro = mountDialog({ title: '', readonly: true });
+    await flushPromises();
+    expect(ro.el.querySelector('[data-testid="item-dialog-title"]')?.textContent || '').toMatch(/Property/);
+    expect(ro.q('[data-testid="choy-properties-definition-item-save"]')).toBeFalsy();
+    ro.unmount();
+
+    const roEmpty = mountDialog({ title: '', readonly: true, item: draft() });
+    await flushPromises();
+    expect(roEmpty.el.querySelector('[data-testid="item-dialog-title"]')?.textContent || '').toMatch(/Property/);
+    roEmpty.unmount();
+  });
+
+  test('Name required validation shows formError', async () => {
+    const onSaved = fnRecorder();
+    const m = mountDialog({ item: draft({ name: '  ' }) }, { onSaved });
+    await flushPromises();
+    m.click('[data-testid="choy-properties-definition-item-save"]');
+    await flushPromises();
+    expect(m.q('[data-testid="choy-properties-definition-item-error"]')).toBeTruthy();
+    expect(onSaved.calls.length).toBe(0);
+    m.unmount();
+  });
+
+  test('Save emits saved and does not close itself', async () => {
+    const onSaved = fnRecorder();
+    const onUpdate = fnRecorder();
+    const m = mountDialog({}, { onSaved, 'onUpdate:modelValue': onUpdate });
+    await flushPromises();
+    m.click('[data-testid="choy-properties-definition-item-save"]');
+    await flushPromises();
+    expect(onSaved.calls.length).toBe(1);
+    expect(onSaved.calls[0][0].name).toBe('tax_id');
+    expect(onUpdate.calls.some((c: any[]) => c[0] === false)).toBe(false);
+    expect(m.q('[data-testid="choy-properties-definition-item-dialog"]')).toBeTruthy();
+    m.unmount();
+  });
+
+  test('Cancel closes dialog', async () => {
+    const onUpdate = fnRecorder();
+    const onClosed = fnRecorder();
+    const m = mountApp(ItemDialog as any, {
+      reactiveProps: true,
+      props: {
+        modelValue: true,
+        item: draft({ name: 'tax_id', string: 'Tax', stringMap: { en_US: 'Tax' } }),
+        'onUpdate:modelValue': (v: boolean) => {
+          (m.props as any).modelValue = v;
+        },
+        onClosed,
+      },
+      plugins: [pinia],
+    });
+    await flushPromises();
+    m.click('[data-testid="choy-properties-definition-item-cancel"]');
+    await flushPromises();
+    expect((m.props as any).modelValue).toBe(false);
+    expect(onClosed.calls.length).toBeGreaterThanOrEqual(1);
+    // onUpdate may be wired via props callback rather than `on` map
+    void onUpdate;
+    m.unmount();
+  });
+
+  test('translate label and help apply maps via onTranslateSaved', async () => {
+    const m = mountDialog({
+      item: draft({
+        name: 'tax_id',
+        string: 'Tax',
+        stringMap: { en_US: 'Tax' },
+        help: 'Help EN',
+        helpMap: { en_US: 'Help EN' },
+      }),
+    });
+    await flushPromises();
+
+    m.click('[data-testid="choy-properties-definition-translate-string"]');
+    await flushPromises();
+    expect(m.q('[data-testid="translate-dialog-stub"]')).toBeTruthy();
+    expect(String(lastTranslateProps?.labelTitle || '')).toMatch(/tax_id/);
+    m.click('[data-testid="stub-translate-save-string"]');
+    await flushPromises();
+
+    m.click('[data-testid="choy-properties-definition-translate-help"]');
+    await flushPromises();
+    expect(String(lastTranslateProps?.labelTitle || '')).toMatch(/Help/i);
+    m.click('[data-testid="stub-translate-save-help"]');
+    await flushPromises();
+
+    // Re-open and save again so maps stick into local before confirm
+    m.click('[data-testid="choy-properties-definition-item-save"]');
+    await flushPromises();
+    m.unmount();
+  });
+
+  test('selection type shows editor; update and translate option', async () => {
+    const onSaved = fnRecorder();
+    const m = mountDialog(
+      {
+        item: draft({
+          name: 'prio',
+          type: 'selection',
+          string: 'Priority',
+          stringMap: { en_US: 'Priority' },
+          selectionText: '[["low","Low"]]',
+          selectionLabelMaps: { low: { en_US: 'Low' } },
+        }),
+      },
+      { onSaved },
+    );
+    await flushPromises();
+    expect(m.q('[data-testid="selection-editor-stub"]')).toBeTruthy();
+    expect(lastSelectionProps).toBeTruthy();
+
+    m.click('[data-testid="stub-selection-update"]');
+    await flushPromises();
+    expect(selectionUpdateEmit).toBeTruthy();
+
+    m.click('[data-testid="stub-selection-translate"]');
+    await flushPromises();
+    expect(m.q('[data-testid="translate-dialog-stub"]')).toBeTruthy();
+    expect(selectionTranslateEmit).toBeTruthy();
+    m.click('[data-testid="stub-translate-save-selection"]');
+    await flushPromises();
+
+    m.click('[data-testid="choy-properties-definition-item-save"]');
+    await flushPromises();
+    expect(onSaved.calls.length).toBe(1);
+    const saved = onSaved.calls[0][0] as DefinitionEditorDraftItem;
+    expect(saved.type).toBe('selection');
+    expect(saved.selectionLabelMaps.low).toBeTruthy();
+    m.unmount();
+  });
+
+  test('readonly skips translate controls and selection mutate', async () => {
+    const m = mountDialog({
+      readonly: true,
+      item: draft({
+        name: 'prio',
+        type: 'selection',
+        selectionText: '[["low","Low"]]',
+        selectionLabelMaps: { low: { en_US: 'Low' } },
+      }),
+    });
+    await flushPromises();
+    expect(m.q('[data-testid="choy-properties-definition-translate-string"]')).toBeFalsy();
+    expect(m.q('[data-testid="choy-properties-definition-translate-help"]')).toBeFalsy();
+    expect(m.q('[data-testid="selection-editor-stub"]')).toBeTruthy();
+    // Selection update should be ignored when readonly
+    m.click('[data-testid="stub-selection-update"]');
+    await flushPromises();
+    m.unmount();
+  });
+
+  test('switching to selection type via select stub shows editor', async () => {
+    const m = mountDialog({ item: draft({ name: 'x', type: 'char' }) });
+    await flushPromises();
+    expect(m.q('[data-testid="selection-editor-stub"]')).toBeFalsy();
+    m.click('[data-testid="stub-set-selection-type"]');
+    await flushPromises();
+    expect(m.q('[data-testid="selection-editor-stub"]')).toBeTruthy();
+    m.unmount();
+  });
+
+  test('editorLang falls back without pinia', async () => {
+    // Unset pinia after mount setup path uses TRANSLATED_BASE_LANG when no pinia
+    setActivePinia(undefined as any);
+    const onSaved = fnRecorder();
+    const m = mountApp(ItemDialog as any, {
+      props: {
+        modelValue: true,
+        item: draft({ name: 'no_pinia', string: 'X', stringMap: { en_US: 'X' } }),
+      },
+      on: { onSaved },
+    });
+    await flushPromises();
+    m.click('[data-testid="choy-properties-definition-item-save"]');
+    await flushPromises();
+    expect(onSaved.calls.length).toBe(1);
+    m.unmount();
+    setActivePinia(pinia);
+  });
+
+  test('checkbox toggles readonly on draft', async () => {
+    const onSaved = fnRecorder();
+    const m = mountDialog({}, { onSaved });
+    await flushPromises();
+    const cb = m.q('[data-testid="choy-properties-definition-readonly"]') as HTMLInputElement;
+    expect(cb).toBeTruthy();
+    cb.checked = true;
+    cb.dispatchEvent(new Event('change', { bubbles: true }));
+    await flushPromises();
+    m.click('[data-testid="choy-properties-definition-item-save"]');
+    await flushPromises();
+    expect(onSaved.calls[0][0].readonly).toBe(true);
+    m.unmount();
+  });
+
+  test('openSelectionTranslate ignores empty value', async () => {
+    stubSfc(ChoyPropertiesDefinitionSelectionEditor as any, {
+      name: 'ChoyPropertiesDefinitionSelectionEditor',
+      props: { modelValue: { type: Array, default: () => [] }, readonly: Boolean },
+      emits: ['update:modelValue', 'translate'],
+      setup(_: any, { emit }: any) {
+        return () =>
+          h('div', { 'data-testid': 'selection-editor-stub' }, [
+            h(
+              'button',
+              {
+                type: 'button',
+                'data-testid': 'stub-selection-translate-empty',
+                onClick: () => emit('translate', '  '),
+              },
+              'empty',
+            ),
+          ]);
+      },
+    });
+    const m = mountDialog({
+      item: draft({
+        name: 'prio',
+        type: 'selection',
+        selectionText: '[["low","Low"]]',
+        selectionLabelMaps: { low: { en_US: 'Low' } },
+      }),
+    });
+    await flushPromises();
+    m.click('[data-testid="stub-selection-translate-empty"]');
+    await flushPromises();
+    expect(m.q('[data-testid="translate-dialog-stub"]')).toBeFalsy();
+    m.unmount();
+  });
+});
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
index 93ae087a2..5af62e0b4 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
@@ -153,7 +153,7 @@ SPDX-License-Identifier: Apache-2.0
 import { computed, ref, watch } from 'vue';
 import { getActivePinia } from 'pinia';
 import { Languages } from 'lucide-vue-next';
-import { TRANSLATED_BASE_LANG } from '@/core/service/orm/repository/projection/translated_field_codec';
+import { TRANSLATED_BASE_LANG } from '@/core/service/orm/model/properties_label_i18n';
 import { createTranslate } from '@/web/web/i18n';
 import { useI18nStore } from '@/web/web/stores/i18nStore';
 import { ChoyDialog, ChoyDialogContent, ChoyDialogTitle } from '@/web/web/components/layout/choyDialog';
@@ -334,8 +334,8 @@ function onConfirm() {
     return;
   }
   applyDraftCurrentLangToMaps(item, editorLang());
+  // Parent closes on successful commit; keep open when commitDrafts fails so edits are not lost.
   emit('saved', cloneDraft(item));
-  visible.value = false;
 }
 
 watch(
diff --git a/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts b/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts
new file mode 100644
index 000000000..bcbff6cad
--- /dev/null
+++ b/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts
@@ -0,0 +1,273 @@
+// SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
+// SPDX-License-Identifier: Apache-2.0
+
+import { h, nextTick } from 'vue';
+import { createPinia, setActivePinia } from 'pinia';
+
+import { ChoyMessage } from '../../composables/useChoyMessage';
+import { replaceStoreFactory } from '@/web/web/stores/registry';
+import { flushPromises, fnRecorder, mountApp, restoreSfc, stubSfc } from '@/web/web/__tests__/mountApp';
+import { ChoyDialog, ChoyDialogContent, ChoyDialogTitle } from '@/web/web/components/layout/choyDialog';
+import ChoyButton from '@/web/web/components/layout/ChoyButton.vue';
+import PropertyLabelTranslationsDialog from './ChoyPropertyLabelTranslationsDialog.vue';
+
+const DEFAULT_LANGS = [
+  { Code: 'en_US', Name: 'English (US)' },
+  { Code: 'zh_CN', Name: 'Chinese (Simplified)' },
+];
+
+const INPUT_SEL = '[data-testid="choy-property-label-translation-input"]';
+
+const origSuccess = ChoyMessage.success;
+const origError = ChoyMessage.error;
+
+function setInput(el: HTMLInputElement, value: string) {
+  el.value = value;
+  el.dispatchEvent(new Event('input', { bubbles: true }));
+}
+
+function labelsOf(el: HTMLElement): string[] {
+  return Array.from(el.querySelectorAll('label')).map(n => (n.textContent || '').trim());
+}
+
+describe('ChoyPropertyLabelTranslationsDialog', () => {
+  let pinia: ReturnType<typeof createPinia>;
+  let restoreLanguageFactory: (() => void) | undefined;
+  const getActiveLanguages = fnRecorder(async () => DEFAULT_LANGS.map(r => ({ ...r })));
+  const messageSuccess = fnRecorder();
+  const messageError = fnRecorder();
+
+  function installStubs() {
+    stubSfc(ChoyDialog as any, {
+      name: 'Dialog',
+      props: { open: { type: Boolean, default: false } },
+      emits: ['update:open'],
+      setup(props: any, { slots }: any) {
+        return () =>
+          h('div', { class: 'dialog', 'data-open': props.open ? '1' : '0' }, [
+            props.open ? slots.default?.() : null,
+          ]);
+      },
+    });
+    stubSfc(ChoyDialogContent as any, {
+      name: 'DialogContent',
+      setup(_: any, { slots, attrs }: any) {
+        return () => h('div', { class: ['dialog-content', attrs.class] }, slots.default?.());
+      },
+    });
+    stubSfc(ChoyDialogTitle as any, {
+      name: 'DialogTitle',
+      setup(_: any, { slots }: any) {
+        return () => h('div', { class: 'dialog-title' }, slots.default?.());
+      },
+    });
+    stubSfc(ChoyButton as any, {
+      name: 'ChoyButton',
+      props: {
+        type: { type: String, default: 'button' },
+        variant: { type: String, default: 'default' },
+        disabled: { type: Boolean, default: false },
+      },
+      emits: ['click'],
+      setup(props: any, { emit, slots, attrs }: any) {
+        return () =>
+          h(
+            'button',
+            {
+              ...attrs,
+              type: props.type || 'button',
+              class: 'btn',
+              disabled: props.disabled || undefined,
+              'data-test': props.variant === 'outline' ? 'cancel' : 'save',
+              onClick: (e: Event) => emit('click', e),
+            },
+            slots.default?.(),
+          );
+      },
+    });
+  }
+
+  beforeEach(() => {
+    pinia = createPinia();
+    setActivePinia(pinia);
+    getActiveLanguages.mockReset();
+    getActiveLanguages.mockImplementation(async () => DEFAULT_LANGS.map(r => ({ ...r })));
+    messageSuccess.mockClear();
+    messageError.mockClear();
+    ChoyMessage.success = messageSuccess as typeof ChoyMessage.success;
+    ChoyMessage.error = messageError as typeof ChoyMessage.error;
+    restoreLanguageFactory = replaceStoreFactory('base.Language', () => ({
+      GetActiveLanguages: getActiveLanguages,
+    }));
+    installStubs();
+  });
+
+  afterEach(() => {
+    restoreLanguageFactory?.();
+    restoreLanguageFactory = undefined;
+    ChoyMessage.success = origSuccess;
+    ChoyMessage.error = origError;
+    restoreSfc(ChoyDialog as any);
+    restoreSfc(ChoyDialogContent as any);
+    restoreSfc(ChoyDialogTitle as any);
+    restoreSfc(ChoyButton as any);
+  });
+
+  function mountDialog(props: Record<string, unknown> = {}, on?: Record<string, (...args: any[]) => void>) {
+    return mountApp(PropertyLabelTranslationsDialog as any, {
+      props: {
+        modelValue: true,
+        translations: { en_US: 'Hello', zh_CN: '你好' },
+        ...props,
+      },
+      on,
+      plugins: [pinia],
+    });
+  }
+
+  test('loadRows with GetActiveLanguages success ensures en_US present', async () => {
+    const m = mountDialog();
+    await flushPromises();
+    const labels = labelsOf(m.el);
+    expect(labels[0]).toBe('English (US)');
+    expect(labels).toContain('Chinese (Simplified)');
+    const inputs = m.qa(INPUT_SEL) as HTMLInputElement[];
+    expect(inputs.length).toBe(2);
+    expect(inputs[0]?.value).toBe('Hello');
+    expect(inputs[1]?.value).toBe('你好');
+    m.unmount();
+  });
+
+  test('GetActiveLanguages throws → still shows en_US base', async () => {
+    getActiveLanguages.mockImplementation(async () => {
+      throw new Error('langs boom');
+    });
+    const m = mountDialog({ translations: { en_US: 'Base' } });
+    await flushPromises();
+    const labels = labelsOf(m.el);
+    expect(labels).toEqual(['English (US)']);
+    expect((m.q(INPUT_SEL) as HTMLInputElement)?.value).toBe('Base');
+    expect(messageError.calls.length).toBe(0);
+    m.unmount();
+  });
+
+  test('injects en_US when active languages omit it and includes extra map keys', async () => {
+    getActiveLanguages.mockImplementation(async () => [
+      { Code: 'zh_CN', Name: '' },
+      { Code: '', Name: 'skip' },
+    ]);
+    const m = mountDialog({
+      translations: { en_US: 'Hello', zh_CN: '你好', fr_FR: 'Bonjour' },
+    });
+    await flushPromises();
+    const labels = labelsOf(m.el);
+    expect(labels[0]).toBe('English (US)');
+    expect(labels).toContain('zh_CN');
+    expect(labels).toContain('fr_FR');
+    m.unmount();
+  });
+
+  test('save keeps en_US even empty; drops empty non-base langs; emit saved; close', async () => {
+    const onSaved = fnRecorder();
+    const onUpdate = fnRecorder();
+    const m = mountDialog(
+      { translations: { en_US: 'Hello', zh_CN: '你好' } },
+      { onSaved, 'onUpdate:modelValue': onUpdate },
+    );
+    await flushPromises();
+    const inputs = m.qa(INPUT_SEL) as HTMLInputElement[];
+    setInput(inputs[0]!, '');
+    setInput(inputs[1]!, '');
+    m.click('[data-testid="choy-property-label-translations-save"]');
+    await nextTick();
+    expect(onSaved.calls[0]?.[0]).toEqual({ en_US: '' });
+    expect(onUpdate.calls.some(args => args[0] === false)).toBeTruthy();
+    m.unmount();
+  });
+
+  test('save keeps non-empty non-base langs', async () => {
+    const onSaved = fnRecorder();
+    const m = mountDialog(
+      { translations: { en_US: 'Hello', zh_CN: '你好' } },
+      { onSaved },
+    );
+    await flushPromises();
+    const inputs = m.qa(INPUT_SEL) as HTMLInputElement[];
+    setInput(inputs[1]!, '您好');
+    m.click('[data-testid="choy-property-label-translations-save"]');
+    await nextTick();
+    expect(onSaved.calls[0]?.[0]).toEqual({ en_US: 'Hello', zh_CN: '您好' });
+    m.unmount();
+  });
+
+  test('Cancel closes; closed emit', async () => {
+    const onUpdate = fnRecorder();
+    const onClosed = fnRecorder();
+    const m = mountApp(PropertyLabelTranslationsDialog as any, {
+      reactiveProps: true,
+      props: {
+        modelValue: true,
+        translations: { en_US: 'x' },
+        'onUpdate:modelValue': (v: boolean) => {
+          (m.props as any).modelValue = v;
+        },
+        onClosed,
+      },
+      plugins: [pinia],
+    });
+    await flushPromises();
+    m.click('[data-test="cancel"]');
+    await nextTick();
+    await flushPromises();
+    expect(onUpdate.calls.some(args => args[0] === false) || (m.props as any).modelValue === false).toBeTruthy();
+    expect(onClosed.calls.length).toBe(1);
+    m.unmount();
+  });
+
+  test('title with and without labelTitle', async () => {
+    const withTitle = mountDialog({ labelTitle: 'tax_id' });
+    await flushPromises();
+    expect((withTitle.q('.dialog-title')?.textContent || '').trim()).toMatch(/Translate:/);
+    expect((withTitle.q('.dialog-title')?.textContent || '').trim()).toMatch(/tax_id/);
+    withTitle.unmount();
+
+    const bare = mountDialog({ labelTitle: '', translations: null });
+    await flushPromises();
+    expect((bare.q('.dialog-title')?.textContent || '').trim()).toMatch(/Translate label/);
+    bare.unmount();
+  });
+
+  test('loadRows outer catch path clears rows and shows error', async () => {
+    // Spreading a Proxy that throws hits the outer try/catch in loadRows.
+    const badTranslations = new Proxy(
+      {},
+      {
+        ownKeys() {
+          throw new Error('spread boom');
+        },
+        getOwnPropertyDescriptor() {
+          throw new Error('spread boom');
+        },
+      },
+    );
+    const m = mountDialog({ translations: badTranslations as any });
+    await flushPromises();
+    expect(messageError.calls.length).toBe(1);
+    expect(m.qa(INPUT_SEL).length).toBe(0);
+    m.unmount();
+  });
+
+  test('sorts non-base languages by label', async () => {
+    getActiveLanguages.mockImplementation(async () => [
+      { Code: 'de_DE', Name: 'German' },
+      { Code: 'fr_FR', Name: 'French' },
+      { Code: 'en_US', Name: 'English (US)' },
+    ]);
+    const m = mountDialog({ translations: {} });
+    await flushPromises();
+    const labels = labelsOf(m.el);
+    expect(labels[0]).toBe('English (US)');
+    expect(labels.indexOf('French')).toBeLessThan(labels.indexOf('German'));
+    m.unmount();
+  });
+});
diff --git a/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.vue b/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.vue
index ca69e74b6..992ef0bcb 100644
--- a/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.vue
+++ b/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.vue
@@ -49,7 +49,7 @@ import ChoyInput from '@/web/web/components/vendor/ui/input/Input.vue';
 import { ChoyMessage } from '../../composables/useChoyMessage';
 import { createTranslate } from '@/web/web/i18n';
 import { createStoreByModel } from '@/web/web/stores/registry';
-import { TRANSLATED_BASE_LANG } from '@/core/service/orm/repository/projection/translated_field_codec';
+import { TRANSLATED_BASE_LANG } from '@/core/service/orm/model/properties_label_i18n';
 
 defineOptions({ name: 'ChoyPropertyLabelTranslationsDialog' });
 
diff --git a/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts b/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
index e02457251..c4c480d3c 100644
--- a/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
+++ b/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
@@ -372,4 +372,103 @@ describe('propertiesDefinitionHelpers', () => {
       ['ContainerId', '=', null],
     ]);
   });
+
+  test('selectionRowsFromDraft falls back to selectionLabelMaps on JSON parse failure', () => {
+    const draft = emptyDraftItem();
+    draft.type = 'selection';
+    draft.selectionText = '{not-json';
+    draft.selectionLabelMaps = {
+      low: { en_US: 'Low', zh_CN: '低' },
+      high: { en_US: 'High' },
+    };
+    const rows = selectionRowsFromDraft(draft);
+    expect(rows.map(r => r.value).sort()).toEqual(['high', 'low']);
+    expect(rows.find(r => r.value === 'low')?.label).toBe('Low');
+  });
+
+  test('selectionRowsFromDraft empty selectionText yields empty rows', () => {
+    const draft = emptyDraftItem();
+    draft.type = 'selection';
+    draft.selectionText = '';
+    expect(selectionRowsFromDraft(draft)).toEqual([]);
+  });
+
+  test('syncDraftLabelsForLang tolerates invalid selectionText JSON', () => {
+    const draft = emptyDraftItem();
+    draft.type = 'selection';
+    draft.selectionText = 'not-json';
+    draft.selectionLabelMaps = { a: { en_US: 'A', zh_CN: '甲' } };
+    syncDraftLabelsForLang(draft, 'zh_CN');
+    expect(draft.selectionText).toBe(JSON.stringify([['a', '甲']]));
+  });
+
+  test('applyDraftCurrentLangToMaps returns early on invalid / empty selection JSON', () => {
+    const draft = emptyDraftItem();
+    draft.type = 'selection';
+    draft.selectionLabelMaps = { a: { en_US: 'A' } };
+
+    draft.selectionText = '';
+    applyDraftCurrentLangToMaps(draft, 'en_US');
+    expect(draft.selectionLabelMaps).toEqual({ a: { en_US: 'A' } });
+
+    draft.selectionText = '{broken';
+    applyDraftCurrentLangToMaps(draft, 'en_US');
+    expect(draft.selectionLabelMaps).toEqual({ a: { en_US: 'A' } });
+
+    draft.selectionText = '[]';
+    applyDraftCurrentLangToMaps(draft, 'en_US');
+    expect(draft.selectionLabelMaps).toEqual({ a: { en_US: 'A' } });
+  });
+
+  test('writeSelectionRowsToDraft / syncDraftLabelsForLang tolerate stringify failures', () => {
+    const draft = emptyDraftItem();
+    draft.type = 'selection';
+    draft.selectionText = JSON.stringify([['a', 'A']]);
+    draft.selectionLabelMaps = { a: { en_US: 'A' } };
+
+    const origStringify = JSON.stringify;
+    try {
+      (JSON as any).stringify = () => {
+        throw new Error('stringify boom');
+      };
+      writeSelectionRowsToDraft(draft, [{ value: 'b', label: 'B' }], 'en_US');
+      expect(draft.selectionText).toBe('');
+      expect(draft.selectionLabelMaps.b).toEqual({ en_US: 'B' });
+
+      draft.selectionLabelMaps = { c: { en_US: 'C' } };
+      draft.selectionText = 'not-json';
+      syncDraftLabelsForLang(draft, 'en_US');
+      expect(draft.selectionText).toBe('');
+    } finally {
+      JSON.stringify = origStringify;
+    }
+  });
+
+  test('draftsToDefinitionItems omits help when map values are blank whitespace', () => {
+    const items = draftsToDefinitionItems(
+      [
+        {
+          ...emptyDraftItem(),
+          name: 'x',
+          type: 'char',
+          help: '   ',
+          helpMap: { en_US: '  ', zh_CN: '' },
+        },
+      ],
+      'en_US',
+    );
+    expect(items[0]!.help).toBeUndefined();
+  });
+
+  test('syncDraftLabelsForLang no-ops selection for non-selection types', () => {
+    const draft = emptyDraftItem();
+    draft.type = 'char';
+    draft.stringMap = { en_US: 'Label' };
+    draft.helpMap = { en_US: 'Help' };
+    draft.selectionText = 'should-stay';
+    syncDraftLabelsForLang(draft, '');
+    expect(draft.string).toBe('Label');
+    expect(draft.help).toBe('Help');
+    expect(draft.selectionText).toBe('should-stay');
+  });
 });
diff --git a/modules/web/web/components/field/propertiesDefinitionHelpers.ts b/modules/web/web/components/field/propertiesDefinitionHelpers.ts
index d411299b0..88ccc541e 100644
--- a/modules/web/web/components/field/propertiesDefinitionHelpers.ts
+++ b/modules/web/web/components/field/propertiesDefinitionHelpers.ts
@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import {
+  TRANSLATED_BASE_LANG,
   mergePropertyLabelWrite,
   mergeSelectionLabelsWrite,
   parsePropertyLabelMap,
   unwrapPropertyLabel,
 } from '@/core/service/orm/model/properties_label_i18n';
-import { TRANSLATED_BASE_LANG } from '@/core/service/orm/repository/projection/translated_field_codec';
 import { PROPERTIES_V1_TYPES, type PropertyItemDefinition, type PropertyLabel } from '@/core/service/orm/model/properties_types';
 
 import { normalizeSelectionOptions } from './propertiesHelpers';
diff --git a/modules/web/web/components/internal/DataTable.mount.test.ts b/modules/web/web/components/internal/DataTable.mount.test.ts
index 2a0c5d482..df05f97cd 100644
--- a/modules/web/web/components/internal/DataTable.mount.test.ts
+++ b/modules/web/web/components/internal/DataTable.mount.test.ts
@@ -2,11 +2,26 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { ColumnDef } from '@tanstack/vue-table';
+import { ref } from 'vue';
+
 import { flushPromises, fnRecorder, mountApp } from '@/web/web/__tests__/mountApp';
+import { LIST_HANDLE_API_KEY } from '@/web/web/composables/useListHandleReorder';
 import DataTable from './DataTable.vue';
 
 type Row = { Id: string; Name: string };
 
+function mockHandleApi(opts?: { enabled?: boolean; dragging?: number | null; over?: number | null }) {
+  return {
+    enabled: ref(opts?.enabled ?? true),
+    draggingIndex: ref<number | null>(opts?.dragging ?? null),
+    overIndex: ref<number | null>(opts?.over ?? null),
+    onDragStart: fnRecorder(),
+    onDragOver: fnRecorder(),
+    onDrop: fnRecorder(async () => undefined),
+    onDragEnd: fnRecorder(),
+  };
+}
+
 const columns: ColumnDef<Row, unknown>[] = [
   { accessorKey: 'Name', header: 'Name', cell: (ctx) => String(ctx.getValue() ?? '') },
 ];
@@ -263,6 +278,141 @@ describe('DataTable chrome', () => {
     expect(mounted.text()).not.toContain('↓');
     mounted.unmount();
   });
+
+  test('handle reorder helpers skip without api / when disabled / for group rows', async () => {
+    const noApi = mountApp(DataTable as any, {
+      props: {
+        columns,
+        data: rows,
+        height: 120,
+        virtualize: false,
+        enableRowSelection: false,
+      },
+    });
+    await flushPromises();
+    const noApiState = noApi.setupState() as {
+      handleReorderActive?: () => boolean;
+      handleRowClass?: (item: { index: number; row?: unknown }) => string | undefined;
+      onHandleRowDragOver?: (item: { index: number; row?: unknown }, event: DragEvent) => void;
+      onHandleRowDrop?: (item: { index: number; row?: unknown }, event: DragEvent) => void;
+    };
+    expect(noApiState.handleReorderActive?.()).toBe(false);
+    expect(noApiState.handleRowClass?.({ index: 0 })).toBeUndefined();
+    const idleEvent = { preventDefault: fnRecorder() } as unknown as DragEvent;
+    noApiState.onHandleRowDragOver?.({ index: 0 }, idleEvent);
+    noApiState.onHandleRowDrop?.({ index: 0 }, idleEvent);
+    noApi.unmount();
+
+    const handleApi = mockHandleApi({ enabled: false, dragging: 0, over: 1 });
+    const disabled = mountApp(DataTable as any, {
+      props: {
+        columns,
+        data: rows,
+        height: 120,
+        virtualize: false,
+        enableRowSelection: false,
+      },
+      provide: { [LIST_HANDLE_API_KEY]: handleApi },
+    });
+    await flushPromises();
+    const disabledState = disabled.setupState() as {
+      handleReorderActive?: () => boolean;
+      handleRowClass?: (item: { index: number; row?: unknown }) => string | undefined;
+      onHandleRowDragOver?: (item: { index: number; row?: unknown }, event: DragEvent) => void;
+      onHandleRowDrop?: (item: { index: number; row?: unknown }, event: DragEvent) => void;
+    };
+    expect(disabledState.handleReorderActive?.()).toBe(false);
+    expect(disabledState.handleRowClass?.({ index: 1 })).toBeUndefined();
+    disabledState.onHandleRowDragOver?.({ index: 1 }, idleEvent);
+    disabledState.onHandleRowDrop?.({ index: 1 }, idleEvent);
+    expect(handleApi.onDragOver.calls.length).toBe(0);
+    expect(handleApi.onDrop.calls.length).toBe(0);
+    disabled.unmount();
+
+    const activeApi = mockHandleApi({ enabled: true, dragging: 0, over: 1 });
+    const withGroups = mountApp(DataTable as any, {
+      props: {
+        columns,
+        data: [
+          { kind: 'group', key: 'g1', label: 'G', count: 1 },
+          { Id: '1', Name: 'alpha' },
+        ],
+        height: 120,
+        virtualize: false,
+        enableRowSelection: false,
+        rowId: (row: { key?: string; Id?: string }) => row.key || row.Id || '',
+      },
+      provide: { [LIST_HANDLE_API_KEY]: activeApi },
+    });
+    await flushPromises();
+    const groupState = withGroups.setupState() as {
+      handleRowClass?: (item: { index: number; row?: unknown }) => string | undefined;
+      onHandleRowDragOver?: (item: { index: number; row?: unknown }, event: DragEvent) => void;
+      onHandleRowDrop?: (item: { index: number; row?: unknown }, event: DragEvent) => void;
+      rows?: Array<{ original?: unknown }>;
+    };
+    const groupRow = groupState.rows?.[0];
+    expect(groupState.handleRowClass?.({ index: 0, row: groupRow })).toBeUndefined();
+    groupState.onHandleRowDragOver?.({ index: 0, row: groupRow }, idleEvent);
+    groupState.onHandleRowDrop?.({ index: 0, row: groupRow }, idleEvent);
+    expect(activeApi.onDragOver.calls.length).toBe(0);
+    expect(activeApi.onDrop.calls.length).toBe(0);
+    withGroups.unmount();
+  });
+
+  test('handle reorder helpers paint drag chrome and forward dragover/drop', async () => {
+    const handleApi = mockHandleApi({ enabled: true, dragging: 0, over: 1 });
+    const mounted = mountApp(DataTable as any, {
+      props: {
+        columns,
+        data: rows,
+        height: 120,
+        virtualize: false,
+        enableRowSelection: false,
+      },
+      provide: { [LIST_HANDLE_API_KEY]: handleApi },
+    });
+    await flushPromises();
+    const state = mounted.setupState() as {
+      handleReorderActive?: () => boolean;
+      handleRowClass?: (item: { index: number; row?: unknown }) => string | undefined;
+      onHandleRowDragOver?: (item: { index: number; row?: unknown }, event: DragEvent) => void;
+      onHandleRowDrop?: (item: { index: number; row?: unknown }, event: DragEvent) => void;
+      rows?: unknown[];
+    };
+    expect(state.handleReorderActive?.()).toBe(true);
+    expect(state.handleRowClass?.({ index: 0, row: state.rows?.[0] })).toBe('opacity-60');
+    expect(state.handleRowClass?.({ index: 1, row: state.rows?.[1] })).toBe(
+      'bg-accent/40 ring-1 ring-inset ring-primary/30'
+    );
+    expect(state.handleRowClass?.({ index: 2, row: state.rows?.[0] })).toBeUndefined();
+
+    handleApi.draggingIndex.value = null;
+    expect(state.handleRowClass?.({ index: 1, row: state.rows?.[1] })).toBeUndefined();
+    handleApi.draggingIndex.value = 0;
+    handleApi.overIndex.value = 0;
+    expect(state.handleRowClass?.({ index: 0, row: state.rows?.[0] })).toBe('opacity-60');
+
+    const event = { preventDefault: fnRecorder() } as unknown as DragEvent;
+    state.onHandleRowDragOver?.({ index: 1, row: state.rows?.[1] }, event);
+    expect(handleApi.onDragOver.calls.length).toBe(1);
+    expect(handleApi.onDragOver.calls[0]?.[0]).toBe(1);
+    expect(handleApi.onDragOver.calls[0]?.[1]).toBe(event);
+
+    state.onHandleRowDrop?.({ index: 1, row: state.rows?.[1] }, event);
+    expect(handleApi.onDrop.calls.length).toBe(1);
+    expect(handleApi.onDrop.calls[0]?.[0]).toBe(1);
+    expect(handleApi.onDrop.calls[0]?.[1]).toBe(event);
+
+    // DOM path: row dragover/drop also forward into handleApi.
+    const bodyRows = mounted.qa('[data-index]');
+    expect(bodyRows.length).toBe(2);
+    bodyRows[1]!.dispatchEvent(new Event('dragover', { bubbles: true }));
+    bodyRows[1]!.dispatchEvent(new Event('drop', { bubbles: true }));
+    expect(handleApi.onDragOver.calls.length).toBeGreaterThan(1);
+    expect(handleApi.onDrop.calls.length).toBeGreaterThan(1);
+    mounted.unmount();
+  });
 });
 
 describe('DataTable virtualize', () => {
diff --git a/modules/web/web/stores/fieldsGet.test.ts b/modules/web/web/stores/fieldsGet.test.ts
index 071253183..f3decd2b9 100644
--- a/modules/web/web/stores/fieldsGet.test.ts
+++ b/modules/web/web/stores/fieldsGet.test.ts
@@ -214,4 +214,182 @@ describe('createFieldsGetHelpers', () => {
     expect(helpers.getFieldsGetTranslatedHelp('Code')).toBeUndefined();
     expect(helpers.getFieldsGetTranslatedHelp('   ')).toBeUndefined();
   });
+
+  test('wantAll fields coalesces empty/omit names into one whole-model FieldsGet', async () => {
+    const FieldsGet = asyncFnRecorder(async (fields?: string[]) => {
+      expect(fields).toBeUndefined();
+      return {
+        Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: '名称' },
+        Code: { id: '2', type: 'varchar', typeAnnotation: 'string', string: '编码' },
+      };
+    });
+    const helpers = createFieldsGetHelpers(
+      makeHost(
+        {
+          Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: 'Name' },
+          Code: { id: '2', type: 'varchar', typeAnnotation: 'string', string: 'Code' },
+        },
+        FieldsGet
+      ),
+      { getLang: () => 'zh_CN' }
+    );
+
+    const [a, b] = await Promise.all([
+      helpers.ensureFieldsGet(undefined, ['string']),
+      helpers.ensureFieldsGet([], ['string']),
+      helpers.ensureFieldsGet(['  ', ''], ['string']),
+    ]);
+    expect(FieldsGet.calls.length).toBe(1);
+    expect(a.Name?.string).toBe('名称');
+    expect(b.Code?.string).toBe('编码');
+  });
+
+  test('overlay satisfaction skips RPC for already-fetched fields', async () => {
+    const FieldsGet = asyncFnRecorder(async (fields?: string[]) => {
+      const names = fields && fields.length ? fields : ['Name', 'Code'];
+      const out: Record<string, WebFieldMetadata> = {};
+      for (const name of names) {
+        out[name] = {
+          id: name,
+          type: 'varchar',
+          typeAnnotation: 'string',
+          string: `label:${name}`,
+        };
+      }
+      return out;
+    });
+    const helpers = createFieldsGetHelpers(
+      makeHost(
+        {
+          Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: 'Name' },
+          Code: { id: '2', type: 'varchar', typeAnnotation: 'string', string: 'Code' },
+        },
+        FieldsGet
+      ),
+      { getLang: () => 'zh_CN' }
+    );
+
+    await helpers.ensureFieldsGet(['Name', 'Code'], ['string']);
+    expect(FieldsGet.calls.length).toBe(1);
+
+    FieldsGet.calls.length = 0;
+    // Different attribute set → different cache key, but overlay already has Name.
+    const slice = await helpers.ensureFieldsGet(['Name'], ['string', 'help']);
+    expect(FieldsGet.calls.length).toBe(0);
+    expect(slice.Name?.string).toBe('label:Name');
+  });
+
+  test('clearFieldsGetCache mid-flight drops waiters; subsequent ensure re-RPCs', async () => {
+    let release!: (v: Record<string, WebFieldMetadata>) => void;
+    const gate = new Promise<Record<string, WebFieldMetadata>>(resolve => {
+      release = resolve;
+    });
+    const FieldsGet = asyncFnRecorder(async () => gate);
+    const helpers = createFieldsGetHelpers(
+      makeHost({ Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: 'Name' } }, FieldsGet),
+      { getLang: () => 'zh_CN' }
+    );
+
+    const first = helpers.ensureFieldsGet(['Name'], ['string']);
+    // Let the coalesce microtask schedule the RPC.
+    await Promise.resolve();
+    await Promise.resolve();
+    expect(FieldsGet.calls.length).toBe(1);
+
+    helpers.clearFieldsGetCache();
+
+    // Start a fresh ensure while the abandoned RPC is still pending so it cannot
+    // refill the cache before the second request is scheduled.
+    FieldsGet.calls.length = 0;
+    let release2!: (v: Record<string, WebFieldMetadata>) => void;
+    const gate2 = new Promise<Record<string, WebFieldMetadata>>(resolve => {
+      release2 = resolve;
+    });
+    FieldsGet.mockImplementation(async () => gate2);
+    const second = helpers.ensureFieldsGet(['Name'], ['string']);
+    await Promise.resolve();
+    await Promise.resolve();
+    expect(FieldsGet.calls.length).toBe(1);
+
+    release({ Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: '旧' } });
+    await Promise.race([first.then(() => 'ok', () => 'err'), Promise.resolve('cleared')]);
+
+    release2({ Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: '新' } });
+    const slice = await second;
+    expect(slice.Name?.string).toBe('新');
+    expect(helpers.getFieldsGetTranslatedString('Name')).toBe('新');
+  });
+
+  test('attributes cache hit returns same slice without re-RPC', async () => {
+    const FieldsGet = asyncFnRecorder(async () => ({
+      Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: '名称', help: '帮助' },
+    }));
+    const helpers = createFieldsGetHelpers(
+      makeHost({ Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: 'Name' } }, FieldsGet),
+      { getLang: () => 'zh_CN' }
+    );
+    const attrs = ['string', 'help'];
+    const first = await helpers.ensureFieldsGet(['Name'], attrs);
+    const second = await helpers.ensureFieldsGet(['Name'], attrs);
+    expect(first).toBe(second);
+    expect(FieldsGet.calls.length).toBe(1);
+    expect(helpers.getFieldsGetTranslatedHelp('Name')).toBe('帮助');
+  });
+
+  test('reject path propagates FieldsGet failure to all coalesced waiters', async () => {
+    const FieldsGet = asyncFnRecorder(async () => {
+      throw new Error('fieldsget boom');
+    });
+    const helpers = createFieldsGetHelpers(
+      makeHost(
+        {
+          Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: 'Name' },
+          Code: { id: '2', type: 'varchar', typeAnnotation: 'string', string: 'Code' },
+        },
+        FieldsGet
+      ),
+      { getLang: () => 'zh_CN' }
+    );
+
+    const results = await Promise.allSettled([
+      helpers.ensureFieldsGet(['Name'], ['string']),
+      helpers.ensureFieldsGet(['Code'], ['string']),
+    ]);
+    expect(FieldsGet.calls.length).toBe(1);
+    expect(results.every(r => r.status === 'rejected')).toBe(true);
+    expect((results[0] as PromiseRejectedResult).reason?.message).toMatch(/fieldsget boom/);
+
+    // After reject, a later ensure must re-RPC (inflight cleared).
+    FieldsGet.mockImplementation(async () => ({
+      Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: 'ok' },
+    }));
+    FieldsGet.calls.length = 0;
+    const ok = await helpers.ensureFieldsGet(['Name'], ['string']);
+    expect(FieldsGet.calls.length).toBe(1);
+    expect(ok.Name?.string).toBe('ok');
+  });
+
+  test('resolveLang falls back when getLang throws or returns blank', async () => {
+    const FieldsGet = asyncFnRecorder(async () => ({
+      Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: 'Name' },
+    }));
+    const helpersThrow = createFieldsGetHelpers(
+      makeHost({ Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: 'N' } }, FieldsGet),
+      {
+        getLang: () => {
+          throw new Error('lang boom');
+        },
+      }
+    );
+    await helpersThrow.ensureFieldsGet(['Name']);
+    expect(helpersThrow.getFieldsGetTranslatedString('Name')).toBe('Name');
+
+    FieldsGet.calls.length = 0;
+    const helpersBlank = createFieldsGetHelpers(
+      makeHost({ Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: 'N' } }, FieldsGet),
+      { getLang: () => '   ' }
+    );
+    await helpersBlank.ensureFieldsGet(['Name']);
+    expect(FieldsGet.calls.length).toBe(1);
+  });
 });

From d31ce768a2e796712131b9b1021a35b4f9ceca1d Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Wed, 28 Oct 2026 16:51:47 +0800
Subject: [PATCH 09/23] fix(web): preserve property translation maps and harden
 FieldsGet overlay

Keep SelectionEditor row keys index-stable so Value inputs do not remount on
each keystroke. Persist draft label/help/selection maps on save instead of
re-merging from previous items. Swallow FieldsGet presentation errors, track
overlay attribute coverage, and ignore stale cache writes after clear. Surface
commitDrafts failures inside the item dialog, leave sandbox New scope empty,
and extend unit coverage for the remaining patch gaps.
---
 .../evolution/schema/foreignkey_test.go       |  23 ++
 .../lifecycle/install_tx_timing_test.go       |  10 +-
 .../orm/model/properties_label_i18n.test.ts   |  18 ++
 .../web/pages/SandboxPropertyDefinition.vue   |   6 +-
 .../web/components/field/ChoyFieldBase.vue    |   6 +-
 .../ChoyPropertiesDefinitionField.test.ts     | 197 +++++++++++++++++-
 .../field/ChoyPropertiesDefinitionField.vue   |   1 +
 ...ChoyPropertiesDefinitionItemDialog.test.ts |   4 +-
 .../ChoyPropertiesDefinitionItemDialog.vue    |   7 +-
 ...ropertiesDefinitionSelectionEditor.test.ts | 107 ++++++++++
 ...hoyPropertiesDefinitionSelectionEditor.vue |   8 +-
 ...hoyPropertyLabelTranslationsDialog.test.ts |  22 ++
 .../field/propertiesDefinitionHelpers.test.ts |  54 +++++
 .../field/propertiesDefinitionHelpers.ts      |  20 +-
 modules/web/web/stores/fieldsGet.test.ts      |  41 +++-
 modules/web/web/stores/fieldsGet.ts           |  71 ++++++-
 16 files changed, 557 insertions(+), 38 deletions(-)

diff --git a/internal/module/evolution/schema/foreignkey_test.go b/internal/module/evolution/schema/foreignkey_test.go
index d30d51447..76fb50cc1 100644
--- a/internal/module/evolution/schema/foreignkey_test.go
+++ b/internal/module/evolution/schema/foreignkey_test.go
@@ -365,6 +365,29 @@ func TestShouldSkipManyToOneForeignKey(t *testing.T) {
 		}
 	})
 
+	t.Run("getManyToOneKeys propagates shouldSkip ResolvedSpec errors", func(t *testing.T) {
+		runtimeScope := newSchemaTestScope(t)
+		target := &meta.Model{Name: "Line", Path: "sandbox/line.ts", ModelTable: "sandbox_line"}
+		bad := &meta.Field{
+			Name:           "OwnerId",
+			ModuleSpecPath: "sandbox/line",
+			ResolvedSpec:   `{not-json`,
+			Decorators: []*meta.Decorator{
+				{Name: "Field", Arguments: []*meta.Argument{{Type: "ObjectLiteral", Value: `{"type":"ManyToOne"}`}}},
+			},
+		}
+		source := &meta.Model{
+			Name:       "Record",
+			Path:       "sandbox/record.ts",
+			ModelTable: "sandbox_record",
+			Fields:     []*meta.Field{bad},
+		}
+		_, err := newForeignKeyMigrator(runtimeScope, nil, []*meta.Model{source, target}).(*foreignKeyMigrator).getManyToOneKeys()
+		if err == nil || !strings.Contains(err.Error(), "error unmarshal field resolved spec for OwnerId") {
+			t.Fatalf("expected getManyToOneKeys to propagate skipErr, got %v", err)
+		}
+	})
+
 	t.Run("ResolvedSpec ShouldCreateColumn true/false", func(t *testing.T) {
 		stored := &meta.Field{Name: "OwnerId"}
 		if err := stored.SetResolvedSpec(&meta.FieldResolvedSpec{
diff --git a/internal/module/lifecycle/install_tx_timing_test.go b/internal/module/lifecycle/install_tx_timing_test.go
index 9a78a0e85..bf2b51ff1 100644
--- a/internal/module/lifecycle/install_tx_timing_test.go
+++ b/internal/module/lifecycle/install_tx_timing_test.go
@@ -86,9 +86,13 @@ func TestLogModuleCommitTxHoldPassesErrorValueForStack(t *testing.T) {
 	logger := slog.New(slog.NewJSONHandler(&logBuf, &slog.HandlerOptions{
 		Level: slog.LevelError,
 		ReplaceAttr: func(_ []string, a slog.Attr) slog.Attr {
-			if a.Key == "error" && a.Value.Kind() == slog.KindAny {
-				if _, ok := a.Value.Any().(error); !ok {
-					t.Fatalf("error attr must remain an error value, got %#v", a.Value.Any())
+			if a.Key == "error" {
+				if a.Value.Kind() != slog.KindAny {
+					t.Fatalf("error attr must remain KindAny for stack expansion, got kind=%v", a.Value.Kind())
+				}
+				errVal, ok := a.Value.Any().(error)
+				if !ok || errVal == nil || !strings.Contains(errVal.Error(), "commit failed") {
+					t.Fatalf("error attr must remain the original error value, got %#v", a.Value.Any())
 				}
 			}
 			return a
diff --git a/modules/core/service/orm/model/properties_label_i18n.test.ts b/modules/core/service/orm/model/properties_label_i18n.test.ts
index 8e61588d8..08d9e3ce9 100644
--- a/modules/core/service/orm/model/properties_label_i18n.test.ts
+++ b/modules/core/service/orm/model/properties_label_i18n.test.ts
@@ -68,6 +68,8 @@ test('normalizePropertyLabelForStorage keeps string and cleans maps', () => {
   });
   expect(() => normalizePropertyLabelForStorage({ 'zh-CN': 'x' })).toThrow(/terminology code/);
   expect(() => normalizePropertyLabelForStorage({ en_US: { nested: 1 } as any })).toThrow(/must be a string/);
+  expect(() => normalizePropertyLabelForStorage(['not-a-map'] as any)).toThrow(/string or lang map/);
+  expect(() => normalizePropertyLabelForStorage(12 as any)).toThrow(/string or lang map/);
 });
 
 test('mergePropertyLabelWrite preserves other langs and seeds en_US', () => {
@@ -133,6 +135,7 @@ test('normalizeSelectionLabelsForStorage keeps tuple vs object shape and null la
         ['high', { en_US: 'High', zh_CN: '高' }],
         { value: 'low', label: null },
         { value: 'mid' },
+        ['solo'],
       ],
       'priority'
     )
@@ -140,11 +143,13 @@ test('normalizeSelectionLabelsForStorage keeps tuple vs object shape and null la
     ['high', { en_US: 'High', zh_CN: '高' }],
     { value: 'low', label: 'low' },
     { value: 'mid', label: 'mid' },
+    ['solo', 'solo'],
   ]);
   expect(() => normalizeSelectionLabelsForStorage(null, 'priority')).toThrow(/selection options are invalid/);
   expect(() => normalizeSelectionLabelsForStorage([{ label: 'x' }], 'priority')).toThrow(
     /selection options are invalid/
   );
+  expect(() => normalizeSelectionLabelsForStorage([42], 'priority')).toThrow(/selection options are invalid/);
 });
 
 test('translatePropertyDefinitionItems unwraps string, help, and selection labels', () => {
@@ -158,9 +163,15 @@ test('translatePropertyDefinitionItems unwraps string, help, and selection label
         selection: [
           ['high', { en_US: 'High', zh_CN: '高' }],
           { value: 'low', label: { en_US: 'Low', zh_CN: '低' } },
+          'passthrough-invalid' as any,
+          [1 as any, 'non-string-value'],
         ],
         default: 'high',
       },
+      {
+        name: 'code',
+        type: 'char',
+      },
     ],
     'zh_CN'
   );
@@ -170,7 +181,14 @@ test('translatePropertyDefinitionItems unwraps string, help, and selection label
   expect(items[0].selection).toEqual([
     ['high', '高'],
     { value: 'low', label: '低' },
+    'passthrough-invalid',
+    [1, 'non-string-value'],
   ]);
+  expect(items[1].name).toBe('code');
+  expect(Object.prototype.hasOwnProperty.call(items[1], 'string')).toBe(false);
+
+  expect(translatePropertyDefinitionItems([], '')).toEqual([]);
+  expect(translatePropertyDefinitionItems(null as any, '  ')).toEqual([]);
 });
 
 test('assertValidPropertyDefinitionItems accepts lang-map labels and help', () => {
diff --git a/modules/sandbox/web/pages/SandboxPropertyDefinition.vue b/modules/sandbox/web/pages/SandboxPropertyDefinition.vue
index 61aacabc7..e11727f48 100644
--- a/modules/sandbox/web/pages/SandboxPropertyDefinition.vue
+++ b/modules/sandbox/web/pages/SandboxPropertyDefinition.vue
@@ -27,9 +27,11 @@ const definitionStore = createStoreByModel('sandbox.PropertyDefinition', {
   scopeManager: useScopeManager().menuScopeManager,
 });
 
+// Leave scope empty on New: bootstrap already seeds SandboxRecord.Properties;
+// prefilling that scope causes a duplicate-scope error on save.
 const initialValues: Record<string, unknown> = {
-  TargetModel: 'SandboxRecord',
-  PropertiesField: 'Properties',
+  TargetModel: null,
+  PropertiesField: null,
   ContainerModel: null,
   ContainerId: null,
   Definition: [],
diff --git a/modules/web/web/components/field/ChoyFieldBase.vue b/modules/web/web/components/field/ChoyFieldBase.vue
index 727bd270b..408cd8f26 100644
--- a/modules/web/web/components/field/ChoyFieldBase.vue
+++ b/modules/web/web/components/field/ChoyFieldBase.vue
@@ -570,7 +570,11 @@ function ensurePresentationFieldsGet() {
   const store = modelStore.value;
   const leaf = leafFieldName.value;
   if (!store?.ensureFieldsGet || !leaf) return;
-  void store.ensureFieldsGet([leaf], [...FIELD_PRESENTATION_FIELDS_GET_ATTRS]);
+  void store
+    .ensureFieldsGet([leaf], [...FIELD_PRESENTATION_FIELDS_GET_ATTRS])
+    .catch(() => {
+      // Presentation overlay is best-effort; static meta remains in effect.
+    });
 }
 
 onMounted(() => {
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts b/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
index 6eb2e40ad..8840f9f18 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
@@ -378,12 +378,20 @@ describe('ChoyPropertiesDefinitionField', () => {
         item: Object,
         readonly: Boolean,
         title: String,
+        commitError: String,
       },
       emits: ['update:modelValue', 'saved', 'closed'],
       setup(props: any, { emit }: any) {
         return () =>
           props.modelValue
             ? h('div', { 'data-testid': 'choy-properties-definition-item-dialog-stub' }, [
+                props.commitError
+                  ? h(
+                      'p',
+                      { 'data-testid': 'choy-properties-definition-item-error' },
+                      String(props.commitError),
+                    )
+                  : null,
                 h(
                   'button',
                   {
@@ -421,9 +429,9 @@ describe('ChoyPropertiesDefinitionField', () => {
       mounted.click('[data-testid="stub-item-save-bad"]');
       await nextTick();
       await flushPromises();
-      // Dialog stays open; writeError surfaces the validation message.
+      // Dialog stays open; commit error is shown inside the dialog (not only behind it).
       expect(mounted.q('[data-testid="choy-properties-definition-item-dialog-stub"]')).toBeTruthy();
-      expect(mounted.q('[data-testid="choy-properties-definition-write-error"]')?.textContent || '').toMatch(
+      expect(mounted.q('[data-testid="choy-properties-definition-item-error"]')?.textContent || '').toMatch(
         /selection/,
       );
       expect((binding.__value.value as any[]).length).toBe(0);
@@ -515,4 +523,189 @@ describe('ChoyPropertiesDefinitionField', () => {
       mounted.unmount();
     }
   });
+
+  test('summaryText covers empty, few, and many named properties', async () => {
+    const empty = makeBinding({ definition: [], isEditMode: true, isForm: false });
+    const emptyMounted = mountApp(ChoyPropertiesDefinitionField as any, { props: { binding: empty } });
+    try {
+      await flushPromises();
+      expect(emptyMounted.q('[data-testid="choy-properties-definition-summary"]')?.textContent || '').toMatch(
+        /No properties|properties/i,
+      );
+    } finally {
+      emptyMounted.unmount();
+    }
+
+    const few = makeBinding({
+      definition: [
+        { name: 'a', type: 'char' },
+        { name: 'b', type: 'char' },
+        { name: 'c', type: 'char' },
+      ],
+      isEditMode: true,
+      isForm: false,
+    });
+    const fewMounted = mountApp(ChoyPropertiesDefinitionField as any, { props: { binding: few } });
+    try {
+      await flushPromises();
+      const text = fewMounted.q('[data-testid="choy-properties-definition-summary"]')?.textContent || '';
+      expect(text).toMatch(/a/);
+      expect(text).toMatch(/c/);
+    } finally {
+      fewMounted.unmount();
+    }
+
+    const many = makeBinding({
+      definition: [
+        { name: 'a', type: 'char' },
+        { name: 'b', type: 'char' },
+        { name: 'c', type: 'char' },
+        { name: 'd', type: 'char' },
+      ],
+      isEditMode: true,
+      isForm: false,
+    });
+    const manyMounted = mountApp(ChoyPropertiesDefinitionField as any, { props: { binding: many } });
+    try {
+      await flushPromises();
+      expect(manyMounted.q('[data-testid="choy-properties-definition-summary"]')?.textContent || '').toMatch(
+        /4|properties|\.\.\./i,
+      );
+    } finally {
+      manyMounted.unmount();
+    }
+  });
+
+  test('row keyboard handlers open dialog; readonly saved is ignored', async () => {
+    const binding = makeBinding({
+      definition: [{ name: 'a', type: 'char', string: { en_US: 'A' } }],
+      isEditMode: false,
+    });
+    const mounted = mountApp(ChoyPropertiesDefinitionField as any, { props: { binding } });
+    try {
+      await flushPromises();
+      const row = mounted.q('[data-testid="choy-properties-definition-row"]') as HTMLElement;
+      // QuickJS may lack KeyboardEvent; synthesize a keydown-like object via listeners.
+      const listeners = (row as any).__vnode?.props || {};
+      const onKeydown = (row as any).onkeydown || listeners.onKeydown;
+      if (typeof onKeydown === 'function') {
+        onKeydown({ key: 'Enter', preventDefault() {} });
+      } else {
+        // Fallback: invoke openRow through the field setup.
+        (mounted.setupState() as { openRow?: (i: number, ro: boolean) => void }).openRow?.(0, true);
+      }
+      await nextTick();
+      expect(mounted.q('[data-testid="choy-properties-definition-item-dialog-stub"]')).toBeTruthy();
+      if (mounted.q('[data-testid="stub-item-save"]')) {
+        mounted.click('[data-testid="stub-item-save"]');
+        await nextTick();
+        await flushPromises();
+      }
+      expect((binding.__value.value as any[])[0].name).toBe('a');
+    } finally {
+      mounted.unmount();
+    }
+  });
+
+  test('onReorder failure keeps prior definition when commitDrafts throws', async () => {
+    const binding = makeBinding({
+      definition: [
+        { name: 'a', type: 'char', string: { en_US: 'A' } },
+        { name: 'b', type: 'char', string: { en_US: 'B' } },
+      ],
+      isEditMode: true,
+    });
+    const mounted = mountApp(ChoyPropertiesDefinitionField as any, { props: { binding } });
+    try {
+      await flushPromises();
+      const exposed = mounted.root as any;
+      const drafts = (Array.isArray(exposed.drafts) ? exposed.drafts : exposed.drafts?.value) as any[];
+      const bad = drafts.map((d: any, i: number) =>
+        i === 0
+          ? {
+              ...d,
+              type: 'selection',
+              selectionText: '',
+              selectionLabelMaps: {},
+            }
+          : d,
+      );
+      exposed.commitDrafts = () => {
+        throw new Error('forced');
+      };
+      const state = mounted.setupState() as { onReorder?: (rows: any[]) => void };
+      state.onReorder?.(bad);
+      await nextTick();
+      expect((binding.__value.value as any[]).map((r: any) => r.name)).toEqual(['a', 'b']);
+    } finally {
+      mounted.unmount();
+    }
+  });
+
+  test('summaryText nameless items; handle drag and row dragover/drop', async () => {
+    const nameless = makeBinding({
+      definition: [{ type: 'char' }, { type: 'char' }],
+      isEditMode: true,
+      isForm: false,
+    });
+    const namelessMounted = mountApp(ChoyPropertiesDefinitionField as any, {
+      props: { binding: nameless },
+    });
+    try {
+      await flushPromises();
+      expect(
+        namelessMounted.q('[data-testid="choy-properties-definition-summary"]')?.textContent || '',
+      ).toMatch(/2|properties/i);
+    } finally {
+      namelessMounted.unmount();
+    }
+
+    const binding = makeBinding({
+      definition: [
+        { name: 'a', type: 'char', string: { en_US: 'A' } },
+        { name: 'b', type: 'char', string: { en_US: 'B' } },
+      ],
+      isEditMode: true,
+    });
+    const mounted = mountApp(ChoyPropertiesDefinitionField as any, { props: { binding } });
+    try {
+      await flushPromises();
+      const handle = mounted.q('[data-testid="choy-properties-definition-handle"]') as HTMLElement;
+      const row = mounted.qa('[data-testid="choy-properties-definition-row"]')[1] as HTMLElement;
+      const dt = {
+        effectAllowed: '',
+        dropEffect: '',
+        setData: () => undefined,
+        setDragImage: () => undefined,
+      };
+      handle.dispatchEvent(
+        Object.assign(new Event('dragstart', { bubbles: true }), {
+          dataTransfer: dt,
+          stopPropagation() {},
+        }),
+      );
+      row.dispatchEvent(
+        Object.assign(new Event('dragover', { bubbles: true }), {
+          dataTransfer: dt,
+          preventDefault() {},
+        }),
+      );
+      row.dispatchEvent(
+        Object.assign(new Event('drop', { bubbles: true }), {
+          dataTransfer: dt,
+          preventDefault() {},
+        }),
+      );
+      handle.dispatchEvent(
+        Object.assign(new Event('dragend', { bubbles: true }), {
+          stopPropagation() {},
+        }),
+      );
+      await nextTick();
+      await flushPromises();
+    } finally {
+      mounted.unmount();
+    }
+  });
+
 });
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue b/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
index 00298e313..a1b84aba7 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
@@ -97,6 +97,7 @@ SPDX-License-Identifier: Apache-2.0
     v-model="dialogOpen"
     :item="dialogItem"
     :readonly="dialogReadonly"
+    :commit-error="writeError"
     @saved="onDialogSaved"
   />
 </template>
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts
index d51387f2d..46be145cc 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts
@@ -349,7 +349,7 @@ describe('ChoyPropertiesDefinitionItemDialog', () => {
     m.click('[data-testid="choy-properties-definition-item-save"]');
     await flushPromises();
     expect(onSaved.calls.length).toBe(1);
-    expect(onSaved.calls[0][0].name).toBe('tax_id');
+    expect((onSaved.calls[0][0] as DefinitionEditorDraftItem).name).toBe('tax_id');
     expect(onUpdate.calls.some((c: any[]) => c[0] === false)).toBe(false);
     expect(m.q('[data-testid="choy-properties-definition-item-dialog"]')).toBeTruthy();
     m.unmount();
@@ -510,7 +510,7 @@ describe('ChoyPropertiesDefinitionItemDialog', () => {
     await flushPromises();
     m.click('[data-testid="choy-properties-definition-item-save"]');
     await flushPromises();
-    expect(onSaved.calls[0][0].readonly).toBe(true);
+    expect((onSaved.calls[0][0] as DefinitionEditorDraftItem).readonly).toBe(true);
     m.unmount();
   });
 
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
index 5af62e0b4..aa599a6d1 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
@@ -118,11 +118,11 @@ SPDX-License-Identifier: Apache-2.0
           </div>
         </div>
         <p
-          v-if="formError"
+          v-if="formError || commitError"
           class="mt-3 text-sm text-destructive"
           data-testid="choy-properties-definition-item-error"
         >
-          {{ formError }}
+          {{ formError || commitError }}
         </p>
       </div>
       <div class="flex shrink-0 justify-end gap-2">
@@ -191,11 +191,14 @@ const props = withDefaults(
     readonly?: boolean;
     /** Dialog title override (defaults from item name). */
     title?: string;
+    /** Parent commitDrafts error shown while dialog stays open after a failed save. */
+    commitError?: string;
   }>(),
   {
     item: null,
     readonly: false,
     title: '',
+    commitError: '',
   },
 );
 
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionSelectionEditor.test.ts b/modules/web/web/components/field/ChoyPropertiesDefinitionSelectionEditor.test.ts
index 10a92da65..12522be93 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionSelectionEditor.test.ts
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionSelectionEditor.test.ts
@@ -145,4 +145,111 @@ describe('ChoyPropertiesDefinitionSelectionEditor', () => {
     ]);
     mounted.unmount();
   });
+
+  test('selectionRowDragClass and row drag helpers', async () => {
+    const mounted = mountEditor([
+      { value: 'a', label: 'A' },
+      { value: 'b', label: 'B' },
+    ]);
+    await nextTick();
+    const state = mounted.setupState() as {
+      selectionRowDragClass?: (index: number) => Record<string, boolean>;
+      onHandleDragStart?: (index: number, event: DragEvent) => void;
+      onRowDragOver?: (index: number, event: DragEvent) => void;
+      onRowDrop?: (index: number, event: DragEvent) => void;
+      handleReorder?: {
+        draggingIndex: { value: number | null };
+        overIndex: { value: number | null };
+      };
+    };
+    expect(state.selectionRowDragClass?.(0)).toEqual({
+      'opacity-60': false,
+      'bg-accent/40 ring-1 ring-inset ring-primary/30': false,
+    });
+    state.handleReorder!.draggingIndex.value = 0;
+    state.handleReorder!.overIndex.value = 1;
+    expect(state.selectionRowDragClass?.(0)?.['opacity-60']).toBe(true);
+    expect(state.selectionRowDragClass?.(1)?.['bg-accent/40 ring-1 ring-inset ring-primary/30']).toBe(true);
+
+    const preventDefault = () => undefined;
+    const stopPropagation = () => undefined;
+    const setData = () => undefined;
+    const setDragImage = () => undefined;
+    state.onHandleDragStart?.(0, {
+      preventDefault,
+      stopPropagation,
+      dataTransfer: { effectAllowed: '', setData, setDragImage },
+    } as unknown as DragEvent);
+    state.onRowDragOver?.(1, { preventDefault } as unknown as DragEvent);
+    state.onRowDrop?.(1, { preventDefault } as unknown as DragEvent);
+    await nextTick();
+    mounted.unmount();
+
+    const readonly = mountEditor([{ value: 'x', label: 'X' }], { readonly: true });
+    await nextTick();
+    const ro = readonly.setupState() as {
+      selectionRowDragClass?: (index: number) => Record<string, boolean>;
+    };
+    expect(ro.selectionRowDragClass?.(0)).toEqual({});
+    readonly.unmount();
+  });
+
+  test('null modelValue renders empty state', async () => {
+    const mounted = mountEditor(null as any);
+    await nextTick();
+    expect(mounted.q('[data-testid="choy-properties-definition-selection-empty"]')).toBeTruthy();
+    mounted.unmount();
+  });
+
+  test('typing value/label inputs emits updated rows', async () => {
+    const mounted = mountEditor([{ value: 'a', label: 'A' }]);
+    await nextTick();
+    const valueInput = mounted.q(
+      '[data-testid="choy-properties-definition-selection-value"]',
+    ) as HTMLInputElement;
+    const labelInput = mounted.q(
+      '[data-testid="choy-properties-definition-selection-label"]',
+    ) as HTMLInputElement;
+    expect(valueInput).toBeTruthy();
+    expect(labelInput).toBeTruthy();
+    valueInput.value = 'ab';
+    valueInput.dispatchEvent(new Event('input', { bubbles: true }));
+    await nextTick();
+    labelInput.value = 'AB';
+    labelInput.dispatchEvent(new Event('input', { bubbles: true }));
+    await nextTick();
+    expect((mounted.props as any).modelValue[0].value).toBe('ab');
+    expect((mounted.props as any).modelValue[0].label).toBe('AB');
+
+    // DOM dragover/drop on the row
+    const row = mounted.q('[data-testid="choy-properties-definition-selection-row"]') as HTMLElement;
+    const handle = mounted.q(
+      '[data-testid="choy-properties-definition-selection-handle"]',
+    ) as HTMLElement;
+    const dt = {
+      effectAllowed: '',
+      setData: () => undefined,
+      setDragImage: () => undefined,
+    };
+    handle.dispatchEvent(
+      Object.assign(new Event('dragstart', { bubbles: true }), {
+        dataTransfer: dt,
+        stopPropagation() {},
+      }),
+    );
+    row.dispatchEvent(
+      Object.assign(new Event('dragover', { bubbles: true }), {
+        preventDefault() {},
+        dataTransfer: dt,
+      }),
+    );
+    row.dispatchEvent(
+      Object.assign(new Event('drop', { bubbles: true }), {
+        preventDefault() {},
+        dataTransfer: dt,
+      }),
+    );
+    await nextTick();
+    mounted.unmount();
+  });
 });
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue b/modules/web/web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
index 8e372b61b..112cf9757 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionSelectionEditor.vue
@@ -163,9 +163,9 @@ const handleReorder = useListHandleReorder({
   onReorder: next => emitRows(next as SelectionDraftRow[]),
 });
 
-function rowKey(row: SelectionDraftRow, index: number): string {
-  const value = String(row.value || '').trim();
-  return value ? `${value}-${index}` : `new-${index}`;
+function rowKey(_row: SelectionDraftRow, index: number): string {
+  // Index-only: value is editable; including it remounts inputs on every keystroke.
+  return `row-${index}`;
 }
 
 function emitRows(next: SelectionDraftRow[]) {
@@ -220,5 +220,5 @@ function onRowDrop(index: number, event: DragEvent) {
   void handleReorder.onDrop(index, event);
 }
 
-defineExpose({ handleReorder });
+defineExpose({ handleReorder, selectionRowDragClass, onHandleDragStart, onRowDragOver, onRowDrop });
 </script>
diff --git a/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts b/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts
index bcbff6cad..ef807c1f2 100644
--- a/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts
+++ b/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts
@@ -270,4 +270,26 @@ describe('ChoyPropertyLabelTranslationsDialog', () => {
     expect(labels.indexOf('French')).toBeLessThan(labels.indexOf('German'));
     m.unmount();
   });
+
+  test('save after load failure still emits empty en_US base key', async () => {
+    const badTranslations = new Proxy(
+      {},
+      {
+        ownKeys() {
+          throw new Error('spread boom');
+        },
+        getOwnPropertyDescriptor() {
+          throw new Error('spread boom');
+        },
+      },
+    );
+    const onSaved = fnRecorder();
+    const m = mountDialog({ translations: badTranslations as any }, { onSaved });
+    await flushPromises();
+    expect(m.qa(INPUT_SEL).length).toBe(0);
+    m.click('[data-testid="choy-property-label-translations-save"]');
+    await nextTick();
+    expect(onSaved.calls[0]?.[0]).toEqual({ en_US: '' });
+    m.unmount();
+  });
 });
diff --git a/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts b/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
index c4c480d3c..757f73c76 100644
--- a/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
+++ b/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
@@ -8,6 +8,7 @@ import {
   definitionItemsToDrafts,
   draftsToDefinitionItems,
   emptyDraftItem,
+  selectionRawLabel,
   selectionRowsFromDraft,
   syncDraftLabelsForLang,
   writeSelectionRowsToDraft,
@@ -22,6 +23,15 @@ describe('propertiesDefinitionHelpers', () => {
     expect(emptyDraftItem().helpMap).toEqual({});
   });
 
+  test('selectionRawLabel covers tuple, object, and scalar fallback', () => {
+    expect(selectionRawLabel(['a', 'A'])).toBe('A');
+    expect(selectionRawLabel(['a'])).toBe('a');
+    expect(selectionRawLabel({ value: 'a', label: 'A' })).toBe('A');
+    expect(selectionRawLabel({ value: 'a' })).toBe('a');
+    expect(selectionRawLabel('scalar')).toBeUndefined();
+    expect(selectionRawLabel(null)).toBeUndefined();
+  });
+
   test('definitionItemsToDrafts unwraps lang maps for the requested lang', () => {
     expect(definitionItemsToDrafts(null)).toEqual([]);
     expect(definitionItemsToDrafts('x' as unknown as unknown[])).toEqual([]);
@@ -125,6 +135,50 @@ describe('propertiesDefinitionHelpers', () => {
     ]);
   });
 
+  test('draftsToDefinitionItems keeps translate-dialog maps even when previous exists', () => {
+    const previous = [
+      {
+        name: 'tax_id',
+        type: 'char',
+        string: { en_US: 'Tax', zh_CN: '税号' },
+        help: { en_US: 'Help', zh_CN: '帮助' },
+      },
+    ];
+    const drafts = definitionItemsToDrafts(previous, 'en_US');
+    drafts[0]!.stringMap = { en_US: 'Tax', zh_CN: '税号', ja_JP: '税' };
+    drafts[0]!.helpMap = { en_US: 'Help', zh_CN: '帮助', ja_JP: 'ヘルプ' };
+    // Drop zh_CN from string map (user cleared it in translate dialog).
+    delete drafts[0]!.stringMap.zh_CN;
+    const items = draftsToDefinitionItems(drafts, 'en_US', previous as any);
+    expect(items[0]!.string).toEqual({ en_US: 'Tax', ja_JP: '税' });
+    expect(items[0]!.help).toEqual({ en_US: 'Help', zh_CN: '帮助', ja_JP: 'ヘルプ' });
+  });
+
+  test('draftsToDefinitionItems selection labels follow draft maps after value rename', () => {
+    const drafts = [
+      {
+        ...emptyDraftItem(),
+        name: 'prio',
+        type: 'selection',
+        string: 'Priority',
+        stringMap: { en_US: 'Priority' },
+        selectionText: JSON.stringify([['hi', 'High']]),
+        selectionLabelMaps: {
+          hi: { en_US: 'High', zh_CN: '高' },
+        },
+      },
+    ];
+    const items = draftsToDefinitionItems(drafts, 'en_US', [
+      {
+        name: 'prio',
+        type: 'selection',
+        string: { en_US: 'Priority' },
+        selection: [['high', { en_US: 'High', zh_CN: '高' }]],
+      },
+    ] as any);
+    expect(items[0]!.selection).toEqual([['hi', { en_US: 'High', zh_CN: '高' }]]);
+  });
+
   test('definitionItemsToDrafts / draftsToDefinitionItems round-trip', () => {
     const drafts = definitionItemsToDrafts(
       [
diff --git a/modules/web/web/components/field/propertiesDefinitionHelpers.ts b/modules/web/web/components/field/propertiesDefinitionHelpers.ts
index 88ccc541e..a61968f4e 100644
--- a/modules/web/web/components/field/propertiesDefinitionHelpers.ts
+++ b/modules/web/web/components/field/propertiesDefinitionHelpers.ts
@@ -115,7 +115,8 @@ function asLabelMap(value: unknown): Record<string, string> {
   return parsePropertyLabelMap(value) || {};
 }
 
-function selectionRawLabel(opt: unknown): unknown {
+/** Resolve a selection option's raw label (tuple / object / other → undefined). */
+export function selectionRawLabel(opt: unknown): unknown {
   if (Array.isArray(opt)) return opt[1] ?? opt[0];
   if (opt && typeof opt === 'object' && !Array.isArray(opt)) {
     return (opt as { label?: unknown }).label ?? (opt as { value?: unknown }).value;
@@ -247,10 +248,8 @@ export function draftsToDefinitionItems(
   previousItems?: PropertyItemDefinition[] | null,
 ): PropertyItemDefinition[] {
   const code = String(lang || '').trim() || TRANSLATED_BASE_LANG;
-  const prevByName = new Map<string, PropertyItemDefinition>();
-  for (const prev of previousItems || []) {
-    if (prev?.name) prevByName.set(prev.name, prev);
-  }
+  // previousItems kept for call-site compatibility; draft maps are the merge base.
+  void previousItems;
   const out: PropertyItemDefinition[] = [];
   const seenNames = new Set<string>();
   for (const draft of drafts || []) {
@@ -265,19 +264,19 @@ export function draftsToDefinitionItems(
     if (!PROPERTIES_V1_TYPES.has(type)) {
       throw new Error(`unsupported property type '${type}' (${name})`);
     }
-    const previous = prevByName.get(name);
     const item: PropertyItemDefinition = { name, type };
     const label = String(draft.string || '').trim();
     draft.string = label;
     if (label || Object.keys(draft.stringMap).length) {
-      item.string = mergePropertyLabelWrite(previous?.string ?? draft.stringMap, label, code);
+      // Draft maps are the source of truth (translate dialog writes here).
+      item.string = mergePropertyLabelWrite(draft.stringMap, label, code);
     }
     const help = String(draft.help || '').trim();
     draft.help = help;
     const helpHasContent =
       !!help || Object.values(draft.helpMap || {}).some(v => String(v || '').trim() !== '');
     if (helpHasContent) {
-      item.help = mergePropertyLabelWrite(previous?.help ?? draft.helpMap, help, code);
+      item.help = mergePropertyLabelWrite(draft.helpMap, help, code);
     }
     if (draft.readonly) item.readonly = true;
     const defRaw = String(draft.default ?? '');
@@ -305,7 +304,10 @@ export function draftsToDefinitionItems(
       if (item.default != null && !options.some(o => o.value === String(item.default))) {
         throw new Error(`selection property '${name}' default is not one of the options`);
       }
-      item.selection = mergeSelectionLabelsWrite(previous?.selection, options, code);
+      const previousSelection = Object.entries(draft.selectionLabelMaps || {}).map(
+        ([value, map]) => [value, map] as [string, PropertyLabel],
+      );
+      item.selection = mergeSelectionLabelsWrite(previousSelection, options, code);
     }
     out.push(item);
   }
diff --git a/modules/web/web/stores/fieldsGet.test.ts b/modules/web/web/stores/fieldsGet.test.ts
index f3decd2b9..56b4ea62f 100644
--- a/modules/web/web/stores/fieldsGet.test.ts
+++ b/modules/web/web/stores/fieldsGet.test.ts
@@ -273,10 +273,15 @@ describe('createFieldsGetHelpers', () => {
     expect(FieldsGet.calls.length).toBe(1);
 
     FieldsGet.calls.length = 0;
-    // Different attribute set → different cache key, but overlay already has Name.
-    const slice = await helpers.ensureFieldsGet(['Name'], ['string', 'help']);
+    // Same attrs covered by overlay → no re-RPC.
+    const sameAttrs = await helpers.ensureFieldsGet(['Name'], ['string']);
     expect(FieldsGet.calls.length).toBe(0);
-    expect(slice.Name?.string).toBe('label:Name');
+    expect(sameAttrs.Name?.string).toBe('label:Name');
+
+    // Broader attrs are not covered by the prior string-only fetch → re-RPC.
+    const broader = await helpers.ensureFieldsGet(['Name'], ['string', 'help']);
+    expect(FieldsGet.calls.length).toBe(1);
+    expect(broader.Name?.string).toBe('label:Name');
   });
 
   test('clearFieldsGetCache mid-flight drops waiters; subsequent ensure re-RPCs', async () => {
@@ -311,15 +316,39 @@ describe('createFieldsGetHelpers', () => {
     await Promise.resolve();
     expect(FieldsGet.calls.length).toBe(1);
 
-    release({ Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: '旧' } });
-    await Promise.race([first.then(() => 'ok', () => 'err'), Promise.resolve('cleared')]);
-
     release2({ Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: '新' } });
     const slice = await second;
+    // Stale completion must not overwrite the newer overlay/cache.
+    release({ Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: '旧' } });
+    await Promise.race([first.then(() => 'ok', () => 'err'), Promise.resolve('cleared')]);
     expect(slice.Name?.string).toBe('新');
     expect(helpers.getFieldsGetTranslatedString('Name')).toBe('新');
   });
 
+  test('flush resolves waiters from an exact rpcKey cache hit', async () => {
+    const FieldsGet = asyncFnRecorder(async () => ({
+      Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: '名称' },
+    }));
+    const helpers = createFieldsGetHelpers(
+      makeHost({ Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: 'Name' } }, FieldsGet),
+      { getLang: () => 'zh_CN' }
+    );
+    // Prime the exact lang|fields|attrs cache entry.
+    await helpers.ensureFieldsGet(['Name'], ['string']);
+    expect(FieldsGet.calls.length).toBe(1);
+
+    // Clear only the coalesce bookkeeping by starting concurrent ensures that share attrs
+    // after the responseCache still holds the rpcKey (do not clearFieldsGetCache).
+    FieldsGet.calls.length = 0;
+    const [a, b] = await Promise.all([
+      helpers.ensureFieldsGet(['Name'], ['string']),
+      helpers.ensureFieldsGet(['Name'], ['string']),
+    ]);
+    expect(FieldsGet.calls.length).toBe(0);
+    expect(a.Name?.string).toBe('名称');
+    expect(b.Name?.string).toBe('名称');
+  });
+
   test('attributes cache hit returns same slice without re-RPC', async () => {
     const FieldsGet = asyncFnRecorder(async () => ({
       Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: '名称', help: '帮助' },
diff --git a/modules/web/web/stores/fieldsGet.ts b/modules/web/web/stores/fieldsGet.ts
index 6db805372..328a75a29 100644
--- a/modules/web/web/stores/fieldsGet.ts
+++ b/modules/web/web/stores/fieldsGet.ts
@@ -138,8 +138,16 @@ export function createFieldsGetHelpers(
   const inflight = new Map<string, Promise<Record<string, WebFieldMetadata>>>();
   /** Per-lang overlay written after successful ensures (for getFieldMeta). */
   const overlayByLang = new Map<string, Record<string, WebFieldMetadata>>();
+  /**
+   * Attribute coverage per lang|field. Overlay reuse is only safe when every
+   * requested attribute was included in a prior successful fetch for that field.
+   * `"*"` means a whole-attribute (omitted attrs) fetch covered the field.
+   */
+  const overlayAttrsByField = new Map<string, Set<string>>();
   /** Bumped so Vue computeds that call getFieldMeta / getFieldsGetTranslatedString re-run. */
   const overlayVersion = shallowRef(0);
+  /** Invalidates in-flight RPC completions after clearFieldsGetCache. */
+  let cacheGeneration = 0;
   /** lang|attrs → pending microtask-coalesced ensures. */
   const coalesceByLangAttrs = new Map<string, CoalesceBucket>();
 
@@ -147,17 +155,54 @@ export function createFieldsGetHelpers(
     overlayVersion.value += 1;
   };
 
+  const fieldAttrKey = (lang: string, name: string) => `${lang}|${name}`;
+
+  const recordOverlayAttrs = (
+    lang: string,
+    fieldNames: string[],
+    attributes: string[] | undefined
+  ) => {
+    const attrs = !attributes || attributes.length === 0 ? ['*'] : attributes.map(a => String(a || '').trim()).filter(Boolean);
+    for (const name of fieldNames) {
+      const key = fieldAttrKey(lang, name);
+      const set = overlayAttrsByField.get(key) || new Set<string>();
+      for (const attr of attrs) set.add(attr);
+      overlayAttrsByField.set(key, set);
+    }
+  };
+
+  const overlayCoversAttrs = (lang: string, names: string[], attributes?: string[]): boolean => {
+    const want =
+      !attributes || attributes.length === 0
+        ? ['*']
+        : attributes.map(a => String(a || '').trim()).filter(Boolean);
+    return names.every(name => {
+      const have = overlayAttrsByField.get(fieldAttrKey(lang, name));
+      if (!have) return false;
+      if (have.has('*')) return true;
+      if (want.includes('*')) return false;
+      return want.every(attr => have.has(attr));
+    });
+  };
+
   const clearFieldsGetCache = () => {
+    cacheGeneration += 1;
     responseCache.clear();
     inflight.clear();
     overlayByLang.clear();
+    overlayAttrsByField.clear();
     coalesceByLangAttrs.clear();
     bumpOverlay();
   };
 
-  const mergeOverlay = (lang: string, slice: Record<string, WebFieldMetadata>) => {
+  const mergeOverlay = (
+    lang: string,
+    slice: Record<string, WebFieldMetadata>,
+    attributes: string[] | undefined
+  ) => {
     const prev = overlayByLang.get(lang) || {};
     overlayByLang.set(lang, { ...prev, ...slice });
+    recordOverlayAttrs(lang, Object.keys(slice), attributes);
     bumpOverlay();
   };
 
@@ -175,13 +220,16 @@ export function createFieldsGetHelpers(
 
     const rpcFields = bucket.wantAll ? undefined : [...bucket.fieldSet].sort();
     const rpcKey = buildCacheKey(lang, rpcFields, bucket.attributes);
+    const generationAtStart = cacheGeneration;
 
     const resolveWaiters = (slice: Record<string, WebFieldMetadata>) => {
       for (const waiter of bucket.waiters) {
         let value = responseCache.get(waiter.cacheKey);
         if (!value) {
           value = waiter.wantAll ? slice : pickFieldSlice(slice, waiter.names);
-          responseCache.set(waiter.cacheKey, value);
+          if (generationAtStart === cacheGeneration) {
+            responseCache.set(waiter.cacheKey, value);
+          }
         }
         waiter.resolve(value);
       }
@@ -198,9 +246,13 @@ export function createFieldsGetHelpers(
       pendingExact ||
       (async () => {
         const slice = (await host.FieldsGet(rpcFields, bucket.attributes)) || {};
-        responseCache.set(rpcKey, slice);
-        mergeOverlay(lang, slice);
-        inflight.delete(rpcKey);
+        if (generationAtStart === cacheGeneration) {
+          responseCache.set(rpcKey, slice);
+          mergeOverlay(lang, slice, bucket.attributes);
+          inflight.delete(rpcKey);
+        } else {
+          inflight.delete(rpcKey);
+        }
         return slice;
       })().catch(err => {
         inflight.delete(rpcKey);
@@ -233,8 +285,13 @@ export function createFieldsGetHelpers(
     const wantAll = wantsAllFields(fields);
     const names = wantAll ? [] : normalizeFieldNames(fields);
 
-    // Specific-field ensure: reuse overlay from a prior coalesced / broader fetch.
-    if (!wantAll && names.length > 0 && overlayHasFields(lang, names)) {
+    // Specific-field ensure: reuse overlay only when field names AND attrs are covered.
+    if (
+      !wantAll &&
+      names.length > 0 &&
+      overlayHasFields(lang, names) &&
+      overlayCoversAttrs(lang, names, attributes)
+    ) {
       const fromOverlay = sliceFromOverlay(lang, names);
       responseCache.set(key, fromOverlay);
       return fromOverlay;

From c6118ccff0cb45fa50f74eea5e8a4b562c183beb Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Wed, 28 Oct 2026 17:21:12 +0800
Subject: [PATCH 10/23] fix(web): harden FieldsGet inflight cleanup and reach
 patch coverage 100%

- identity-guard inflight.delete so stale generations cannot clear a newer request
- clear writeError when opening Add/edit dialogs; cover editorLang fallbacks
- revert schema migrator/FK Errorf to standard fmt (drop x/exp alias)
- add web-side properties_label_i18n coverage and FieldsGet inflight reuse tests
---
 .../module/evolution/schema/foreignkey.go     |   3 +-
 internal/module/evolution/schema/migrator.go  |   5 +-
 .../orm/model/properties_label_i18n.ts        |   4 +-
 .../ChoyPropertiesDefinitionField.test.ts     | 113 +++++++++++++++---
 .../field/ChoyPropertiesDefinitionField.vue   |   2 +
 .../propertiesLabelI18n.coverage.test.ts      | 106 ++++++++++++++++
 modules/web/web/stores/fieldsGet.test.ts      |  33 ++++-
 modules/web/web/stores/fieldsGet.ts           |  47 ++++----
 8 files changed, 265 insertions(+), 48 deletions(-)
 create mode 100644 modules/web/web/components/field/propertiesLabelI18n.coverage.test.ts

diff --git a/internal/module/evolution/schema/foreignkey.go b/internal/module/evolution/schema/foreignkey.go
index 30ea4b1ed..251f55fb8 100644
--- a/internal/module/evolution/schema/foreignkey.go
+++ b/internal/module/evolution/schema/foreignkey.go
@@ -11,7 +11,6 @@ import (
 	"github.com/choysum-dev/choysum/pkg/meta"
 	"github.com/choysum-dev/choysum/pkg/scope"
 	"github.com/ettle/strcase"
-	xfmt "golang.org/x/exp/errors/fmt"
 )
 
 // ForeignKeyInfo describes a foreign key relationship.
@@ -284,7 +283,7 @@ func (m *foreignKeyMigrator) createForeignKeys(foreignKeys []ForeignKeyInfo) err
 		// Create the new foreign key.
 		createSQL := builder.BuildForeignKeySQL(fk)
 		if err := db.Exec(createSQL).Error; err != nil {
-			return xfmt.Errorf(
+			return fmt.Errorf(
 				"create foreign key failed: table=%s column=%s refer=%s.%s: %w",
 				fk.TableName,
 				fk.ColumnName,
diff --git a/internal/module/evolution/schema/migrator.go b/internal/module/evolution/schema/migrator.go
index 24c9ff073..508709656 100644
--- a/internal/module/evolution/schema/migrator.go
+++ b/internal/module/evolution/schema/migrator.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/choysum-dev/choysum/pkg/meta"
 	"github.com/choysum-dev/choysum/pkg/scope"
-	xfmt "golang.org/x/exp/errors/fmt"
 )
 
 type Migrator interface {
@@ -83,10 +82,10 @@ type migrator struct {
 
 func (m *migrator) Migrate() error {
 	if err := m.modelMigrator.MigrateSchema(); err != nil {
-		return xfmt.Errorf("migrate schema: %w", err)
+		return fmt.Errorf("migrate schema: %w", err)
 	}
 	if err := m.foreignKeyMigrator.MigrateForeignKeys(); err != nil {
-		return xfmt.Errorf("migrate foreign keys: %w", err)
+		return fmt.Errorf("migrate foreign keys: %w", err)
 	}
 	return nil
 }
diff --git a/modules/core/service/orm/model/properties_label_i18n.ts b/modules/core/service/orm/model/properties_label_i18n.ts
index 2f5f0135f..5c72394ee 100644
--- a/modules/core/service/orm/model/properties_label_i18n.ts
+++ b/modules/core/service/orm/model/properties_label_i18n.ts
@@ -99,7 +99,7 @@ export function mergePropertyLabelWrite(
   return normalizePropertyLabelForStorage(next, 'string') ?? current;
 }
 
-function selectionOptionValue(opt: unknown): string | null {
+export function selectionOptionValue(opt: unknown): string | null {
   if (Array.isArray(opt) && typeof opt[0] === 'string') return opt[0];
   if (opt && typeof opt === 'object' && !Array.isArray(opt) && typeof (opt as { value?: unknown }).value === 'string') {
     return String((opt as { value: string }).value);
@@ -107,7 +107,7 @@ function selectionOptionValue(opt: unknown): string | null {
   return null;
 }
 
-function selectionOptionLabel(opt: unknown): unknown {
+export function selectionOptionLabel(opt: unknown): unknown {
   if (Array.isArray(opt)) return opt[1] ?? opt[0];
   if (opt && typeof opt === 'object' && !Array.isArray(opt)) {
     return (opt as { label?: unknown }).label ?? (opt as { value?: unknown }).value;
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts b/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
index 8840f9f18..631470db7 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
@@ -1,11 +1,14 @@
 // SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
 // SPDX-License-Identifier: Apache-2.0
 
+import { createPinia, setActivePinia } from 'pinia';
 import { computed, h, nextTick, reactive, ref } from 'vue';
 
+import { TRANSLATED_BASE_LANG } from '@/core/service/orm/model/properties_label_i18n';
 import type { UseField } from '@/web/web/composables/useField';
 import { flushPromises, mountApp, restoreSfc, stubSfc } from '@/web/web/__tests__/mountApp';
 import ChoyButton from '@/web/web/components/layout/ChoyButton.vue';
+import { useI18nStore } from '@/web/web/stores/i18nStore';
 import ChoyFieldBase from './ChoyFieldBase.vue';
 import ChoyPropertiesDefinitionField from './ChoyPropertiesDefinitionField.vue';
 import ChoyPropertiesDefinitionItemDialog from './ChoyPropertiesDefinitionItemDialog.vue';
@@ -585,28 +588,110 @@ describe('ChoyPropertiesDefinitionField', () => {
     try {
       await flushPromises();
       const row = mounted.q('[data-testid="choy-properties-definition-row"]') as HTMLElement;
-      // QuickJS may lack KeyboardEvent; synthesize a keydown-like object via listeners.
-      const listeners = (row as any).__vnode?.props || {};
-      const onKeydown = (row as any).onkeydown || listeners.onKeydown;
-      if (typeof onKeydown === 'function') {
-        onKeydown({ key: 'Enter', preventDefault() {} });
-      } else {
-        // Fallback: invoke openRow through the field setup.
-        (mounted.setupState() as { openRow?: (i: number, ro: boolean) => void }).openRow?.(0, true);
-      }
+      // QuickJS has no KeyboardEvent; attach key onto a cancelable Event (Kanban pattern).
+      const enter = new Event('keydown', { bubbles: true, cancelable: true });
+      Object.defineProperty(enter, 'key', { value: 'Enter' });
+      row.dispatchEvent(enter);
       await nextTick();
       expect(mounted.q('[data-testid="choy-properties-definition-item-dialog-stub"]')).toBeTruthy();
-      if (mounted.q('[data-testid="stub-item-save"]')) {
-        mounted.click('[data-testid="stub-item-save"]');
-        await nextTick();
-        await flushPromises();
-      }
+
+      mounted.click('[data-testid="stub-item-close"]');
+      await nextTick();
+      const space = new Event('keydown', { bubbles: true, cancelable: true });
+      Object.defineProperty(space, 'key', { value: ' ' });
+      row.dispatchEvent(space);
+      await nextTick();
+      expect(mounted.q('[data-testid="choy-properties-definition-item-dialog-stub"]')).toBeTruthy();
+
+      expect(mounted.q('[data-testid="stub-item-save"]')).toBeTruthy();
+      mounted.click('[data-testid="stub-item-save"]');
+      await nextTick();
+      await flushPromises();
       expect((binding.__value.value as any[])[0].name).toBe('a');
     } finally {
       mounted.unmount();
     }
   });
 
+  test('edit existing row save replaces item at index', async () => {
+    const binding = makeBinding({
+      definition: [{ name: 'a', type: 'char', string: { en_US: 'A' } }],
+      isEditMode: true,
+    });
+    const mounted = mountApp(ChoyPropertiesDefinitionField as any, { props: { binding } });
+    try {
+      await flushPromises();
+      mounted.click('[data-testid="choy-properties-definition-open"]');
+      await nextTick();
+      mounted.click('[data-testid="stub-item-save"]');
+      await nextTick();
+      await flushPromises();
+      expect((binding.__value.value as any[])[0].name).toBe('from_dialog');
+    } finally {
+      mounted.unmount();
+    }
+  });
+
+  test('opening a dialog clears a stale writeError', async () => {
+    const binding = makeBinding({
+      definition: [{ name: 'a', type: 'char', string: { en_US: 'A' } }],
+      isEditMode: true,
+    });
+    const mounted = mountApp(ChoyPropertiesDefinitionField as any, { props: { binding } });
+    try {
+      await flushPromises();
+      const state = mounted.setupState() as { writeError?: { value: string } | string };
+      if (state.writeError && typeof state.writeError === 'object' && 'value' in state.writeError) {
+        state.writeError.value = 'stale';
+      }
+      mounted.click('[data-testid="choy-properties-definition-open"]');
+      await nextTick();
+      const err =
+        state.writeError && typeof state.writeError === 'object' && 'value' in state.writeError
+          ? state.writeError.value
+          : state.writeError;
+      expect(err).toBe('');
+    } finally {
+      mounted.unmount();
+    }
+  });
+
+  test('editorLang reads i18n store and falls back on empty or throw', async () => {
+    const pinia = createPinia();
+    setActivePinia(pinia);
+    const i18n = useI18nStore();
+    i18n.localeCode = 'zh-CN';
+
+    const binding = makeBinding({
+      definition: [{ name: 'a', type: 'char', string: { en_US: 'A' } }],
+      isEditMode: true,
+    });
+    const mounted = mountApp(ChoyPropertiesDefinitionField as any, { props: { binding } });
+    try {
+      await flushPromises();
+      const state = mounted.setupState() as { editorLang?: () => string };
+      expect(typeof state.editorLang).toBe('function');
+      expect(state.editorLang?.()).toBe('zh_CN');
+
+      Object.defineProperty(i18n, 'terminologyLang', {
+        configurable: true,
+        get: () => '   ',
+      });
+      expect(state.editorLang?.()).toBe(TRANSLATED_BASE_LANG);
+
+      Object.defineProperty(i18n, 'terminologyLang', {
+        configurable: true,
+        get: () => {
+          throw new Error('forced');
+        },
+      });
+      expect(state.editorLang?.()).toBe(TRANSLATED_BASE_LANG);
+    } finally {
+      mounted.unmount();
+      setActivePinia(undefined as any);
+    }
+  });
+
   test('onReorder failure keeps prior definition when commitDrafts throws', async () => {
     const binding = makeBinding({
       definition: [
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue b/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
index a1b84aba7..46833a2e1 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
@@ -504,6 +504,7 @@ function commitDrafts(next: DefinitionEditorDraftItem[]) {
 
 function onAdd() {
   if (!canMutate.value) return;
+  writeError.value = '';
   dialogReadonly.value = false;
   dialogIndex.value = drafts.value.length;
   dialogItem.value = emptyDraftItem();
@@ -531,6 +532,7 @@ function onReorder(rows: DefinitionEditorDraftItem[]) {
 function openRow(index: number, asReadonly: boolean) {
   const item = drafts.value[index];
   if (!item) return;
+  writeError.value = '';
   dialogReadonly.value = asReadonly || !canMutate.value;
   dialogIndex.value = index;
   dialogItem.value = item;
diff --git a/modules/web/web/components/field/propertiesLabelI18n.coverage.test.ts b/modules/web/web/components/field/propertiesLabelI18n.coverage.test.ts
new file mode 100644
index 000000000..fc64f2ce6
--- /dev/null
+++ b/modules/web/web/components/field/propertiesLabelI18n.coverage.test.ts
@@ -0,0 +1,106 @@
+// SPDX-FileCopyrightText: 2026-present Brian Wang <wangbuke@gmail.com>
+// SPDX-License-Identifier: Apache-2.0
+
+/**
+ * Web-side imports of properties_label_i18n so FE coverage (and Codecov patch)
+ * records branch lines that core BE instrumentation under-counts.
+ */
+import {
+  mergePropertyLabelWrite,
+  mergeSelectionLabelsWrite,
+  normalizePropertyLabelForStorage,
+  normalizeSelectionLabelsForStorage,
+  parsePropertyLabelMap,
+  selectionOptionLabel,
+  selectionOptionValue,
+  translatePropertyDefinitionItems,
+  unwrapPropertyLabel,
+} from '@/core/service/orm/model/properties_label_i18n';
+
+describe('properties_label_i18n web coverage', () => {
+  test('parsePropertyLabelMap null-value and skip branches', () => {
+    expect(parsePropertyLabelMap({ en_US: 'A', zh_CN: null, 'zh-CN': 'skip', '': 'skip' })).toEqual({
+      en_US: 'A',
+      zh_CN: '',
+    });
+    expect(parsePropertyLabelMap('plain')).toEqual({ en_US: 'plain' });
+    expect(parsePropertyLabelMap(null)).toBeNull();
+  });
+
+  test('normalizePropertyLabelForStorage string, throws, and null map values', () => {
+    expect(normalizePropertyLabelForStorage('Hello')).toBe('Hello');
+    expect(normalizePropertyLabelForStorage({ en_US: null, zh_CN: '你好' })).toEqual({
+      en_US: '',
+      zh_CN: '你好',
+    });
+    expect(() => normalizePropertyLabelForStorage(12 as any)).toThrow(/string or lang map/);
+    expect(() => normalizePropertyLabelForStorage(['x'] as any)).toThrow(/string or lang map/);
+    expect(() => normalizePropertyLabelForStorage({ en_US: { bad: 1 } as any })).toThrow(/must be a string/);
+  });
+
+  test('selection option helpers via normalize, merge, and direct exports', () => {
+    expect(selectionOptionValue({ value: 'low' })).toBe('low');
+    expect(selectionOptionValue(['high', 'High'])).toBe('high');
+    expect(selectionOptionValue(42)).toBeNull();
+    expect(selectionOptionLabel(['a', 'A'])).toBe('A');
+    expect(selectionOptionLabel({ value: 'a', label: 'A' })).toBe('A');
+    expect(selectionOptionLabel('scalar')).toBeUndefined();
+    expect(selectionOptionLabel(null)).toBeUndefined();
+
+    expect(
+      normalizeSelectionLabelsForStorage(
+        [
+          { value: 'low', label: 'Low' },
+          ['high', 'High'],
+          ['solo'],
+        ],
+        'prio',
+      ),
+    ).toEqual([
+      { value: 'low', label: 'Low' },
+      ['high', 'High'],
+      ['solo', 'solo'],
+    ]);
+    expect(() => normalizeSelectionLabelsForStorage(undefined as any, 'prio')).toThrow(/invalid/);
+    expect(() => normalizeSelectionLabelsForStorage('nope' as any, 'prio')).toThrow(/invalid/);
+    expect(() => normalizeSelectionLabelsForStorage([null], 'prio')).toThrow(/invalid/);
+    expect(() => normalizeSelectionLabelsForStorage([42], 'prio')).toThrow(/invalid/);
+
+    expect(
+      mergeSelectionLabelsWrite(
+        [{ value: 'a', label: 'A' }, { value: 1 as any, label: 'skip' }, 'scalar' as any],
+        [{ value: 'a', label: '甲' }],
+        'zh_CN',
+      ),
+    ).toEqual([['a', { en_US: 'A', zh_CN: '甲' }]]);
+  });
+
+  test('unwrap / merge / translate smoke for import graph', () => {
+    expect(unwrapPropertyLabel({ en_US: 'X', zh_CN: null as any }, 'zh_CN')).toBe('');
+    expect(mergePropertyLabelWrite(undefined, 'Y', 'zh_CN')).toEqual({ en_US: 'Y', zh_CN: 'Y' });
+    const translated = translatePropertyDefinitionItems(
+      [
+        {
+          name: 'n',
+          type: 'selection',
+          string: 'N',
+          help: { en_US: 'Help', zh_CN: '帮助' },
+          selection: [
+            ['a', 'A'],
+            { value: 'b', label: 'B' },
+            'passthrough' as any,
+            [1 as any, 'skip'],
+          ],
+        },
+      ],
+      'zh_CN',
+    );
+    expect(translated[0].help).toBe('帮助');
+    expect(translated[0].selection).toEqual([
+      ['a', 'A'],
+      { value: 'b', label: 'B' },
+      'passthrough',
+      [1, 'skip'],
+    ]);
+  });
+});
diff --git a/modules/web/web/stores/fieldsGet.test.ts b/modules/web/web/stores/fieldsGet.test.ts
index 56b4ea62f..4165c686e 100644
--- a/modules/web/web/stores/fieldsGet.test.ts
+++ b/modules/web/web/stores/fieldsGet.test.ts
@@ -325,7 +325,7 @@ describe('createFieldsGetHelpers', () => {
     expect(helpers.getFieldsGetTranslatedString('Name')).toBe('新');
   });
 
-  test('flush resolves waiters from an exact rpcKey cache hit', async () => {
+  test('concurrent ensures with an exact cached key make no RPC', async () => {
     const FieldsGet = asyncFnRecorder(async () => ({
       Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: '名称' },
     }));
@@ -333,12 +333,10 @@ describe('createFieldsGetHelpers', () => {
       makeHost({ Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: 'Name' } }, FieldsGet),
       { getLang: () => 'zh_CN' }
     );
-    // Prime the exact lang|fields|attrs cache entry.
     await helpers.ensureFieldsGet(['Name'], ['string']);
     expect(FieldsGet.calls.length).toBe(1);
 
-    // Clear only the coalesce bookkeeping by starting concurrent ensures that share attrs
-    // after the responseCache still holds the rpcKey (do not clearFieldsGetCache).
+    // The exact responseCache key remains populated, so both ensures return before coalescing.
     FieldsGet.calls.length = 0;
     const [a, b] = await Promise.all([
       helpers.ensureFieldsGet(['Name'], ['string']),
@@ -349,6 +347,33 @@ describe('createFieldsGetHelpers', () => {
     expect(b.Name?.string).toBe('名称');
   });
 
+  test('in-flight exact-key ensure reuses the pending promise', async () => {
+    let release!: (v: Record<string, any>) => void;
+    const gate = new Promise<Record<string, any>>(resolve => {
+      release = resolve;
+    });
+    const FieldsGet = asyncFnRecorder(async () => gate);
+    const helpers = createFieldsGetHelpers(
+      makeHost({ Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: 'Name' } }, FieldsGet),
+      { getLang: () => 'zh_CN' }
+    );
+
+    const first = helpers.ensureFieldsGet(['Name'], ['string']);
+    await Promise.resolve();
+    await Promise.resolve();
+    expect(FieldsGet.calls.length).toBe(1);
+
+    // Same cache key while RPC is pending → share inflight promise (no second RPC).
+    const second = helpers.ensureFieldsGet(['Name'], ['string']);
+    await Promise.resolve();
+    expect(FieldsGet.calls.length).toBe(1);
+
+    release({ Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: '名称' } });
+    const [a, b] = await Promise.all([first, second]);
+    expect(a.Name?.string).toBe('名称');
+    expect(b.Name?.string).toBe('名称');
+  });
+
   test('attributes cache hit returns same slice without re-RPC', async () => {
     const FieldsGet = asyncFnRecorder(async () => ({
       Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: '名称', help: '帮助' },
diff --git a/modules/web/web/stores/fieldsGet.ts b/modules/web/web/stores/fieldsGet.ts
index 328a75a29..2b1d6f642 100644
--- a/modules/web/web/stores/fieldsGet.ts
+++ b/modules/web/web/stores/fieldsGet.ts
@@ -235,31 +235,32 @@ export function createFieldsGetHelpers(
       }
     };
 
-    const cached = responseCache.get(rpcKey);
-    if (cached) {
-      resolveWaiters(cached);
-      return;
-    }
-
+    // Exact-key hits are handled in ensureFieldsGet before coalesce. Broader
+    // rpcKey reuse goes through overlay / responseCache on the ensure path.
     const pendingExact = inflight.get(rpcKey);
-    const request =
-      pendingExact ||
-      (async () => {
-        const slice = (await host.FieldsGet(rpcFields, bucket.attributes)) || {};
-        if (generationAtStart === cacheGeneration) {
-          responseCache.set(rpcKey, slice);
-          mergeOverlay(lang, slice, bucket.attributes);
-          inflight.delete(rpcKey);
-        } else {
-          inflight.delete(rpcKey);
+    let request = pendingExact;
+    if (!request) {
+      // Assign after the IIFE starts so cleanup can identity-check this promise
+      // without reading a const during its own initializer (TS2454).
+      let ownedRequest: Promise<Record<string, unknown>> | null = null;
+      const created = (async () => {
+        try {
+          const slice = (await host.FieldsGet(rpcFields, bucket.attributes)) || {};
+          if (generationAtStart === cacheGeneration) {
+            responseCache.set(rpcKey, slice);
+            mergeOverlay(lang, slice, bucket.attributes);
+          }
+          return slice;
+        } finally {
+          // Only clear this request — a newer ensure may have reused the same rpcKey
+          // after clearFieldsGetCache bumped the generation.
+          if (ownedRequest && inflight.get(rpcKey) === ownedRequest) {
+            inflight.delete(rpcKey);
+          }
         }
-        return slice;
-      })().catch(err => {
-        inflight.delete(rpcKey);
-        throw err;
-      });
-
-    if (!pendingExact) {
+      })();
+      ownedRequest = created;
+      request = created;
       inflight.set(rpcKey, request);
     }
     bucket.inflight = request;

From cfc1bc503a7c8f1e05b71b969572b4c2df4900e0 Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Wed, 28 Oct 2026 17:39:03 +0800
Subject: [PATCH 11/23] fix(web): settle FieldsGet waiters across cache clear
 and sync RPC throws

- keep coalesce buckets on clearFieldsGetCache so same-tick clears do not hang waiters
- register inflight cleanup after set so sync FieldsGet throws cannot poison the key
- make writeError dialog-clear test actually assign a stale value via unwrapped setupState
---
 .../ChoyPropertiesDefinitionField.test.ts     | 14 +++---
 modules/web/web/stores/fieldsGet.test.ts      | 43 +++++++++++++++++++
 modules/web/web/stores/fieldsGet.ts           | 31 ++++++-------
 3 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts b/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
index 631470db7..b7acdffe3 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
@@ -640,17 +640,13 @@ describe('ChoyPropertiesDefinitionField', () => {
     const mounted = mountApp(ChoyPropertiesDefinitionField as any, { props: { binding } });
     try {
       await flushPromises();
-      const state = mounted.setupState() as { writeError?: { value: string } | string };
-      if (state.writeError && typeof state.writeError === 'object' && 'value' in state.writeError) {
-        state.writeError.value = 'stale';
-      }
+      // setupState unwraps refs; assign through the proxy so the underlying ref updates.
+      const state = mounted.setupState() as { writeError: string };
+      state.writeError = 'stale';
+      expect(state.writeError).toBe('stale');
       mounted.click('[data-testid="choy-properties-definition-open"]');
       await nextTick();
-      const err =
-        state.writeError && typeof state.writeError === 'object' && 'value' in state.writeError
-          ? state.writeError.value
-          : state.writeError;
-      expect(err).toBe('');
+      expect(state.writeError).toBe('');
     } finally {
       mounted.unmount();
     }
diff --git a/modules/web/web/stores/fieldsGet.test.ts b/modules/web/web/stores/fieldsGet.test.ts
index 4165c686e..da64ced78 100644
--- a/modules/web/web/stores/fieldsGet.test.ts
+++ b/modules/web/web/stores/fieldsGet.test.ts
@@ -325,6 +325,23 @@ describe('createFieldsGetHelpers', () => {
     expect(helpers.getFieldsGetTranslatedString('Name')).toBe('新');
   });
 
+  test('clearFieldsGetCache before coalesce flush still settles waiters', async () => {
+    const FieldsGet = asyncFnRecorder(async () => ({
+      Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: '名称' },
+    }));
+    const helpers = createFieldsGetHelpers(
+      makeHost({ Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: 'Name' } }, FieldsGet),
+      { getLang: () => 'zh_CN' }
+    );
+
+    // Same-tick clear before the coalesce microtask — waiters must not hang.
+    const first = helpers.ensureFieldsGet(['Name'], ['string']);
+    helpers.clearFieldsGetCache();
+    const slice = await first;
+    expect(slice.Name?.string).toBe('名称');
+    expect(FieldsGet.calls.length).toBe(1);
+  });
+
   test('concurrent ensures with an exact cached key make no RPC', async () => {
     const FieldsGet = asyncFnRecorder(async () => ({
       Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: '名称' },
@@ -423,6 +440,32 @@ describe('createFieldsGetHelpers', () => {
     expect(ok.Name?.string).toBe('ok');
   });
 
+  test('sync FieldsGet throw does not permanently poison inflight', async () => {
+    let syncThrow = true;
+    const FieldsGet = asyncFnRecorder((() => {
+      if (syncThrow) {
+        throw new Error('sync boom');
+      }
+      return Promise.resolve({
+        Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: 'ok' },
+      });
+    }) as any);
+    const helpers = createFieldsGetHelpers(
+      makeHost({ Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: 'Name' } }, FieldsGet),
+      { getLang: () => 'zh_CN' }
+    );
+
+    const failed = await Promise.allSettled([helpers.ensureFieldsGet(['Name'], ['string'])]);
+    expect(failed[0]?.status).toBe('rejected');
+    expect(String((failed[0] as PromiseRejectedResult).reason?.message || '')).toMatch(/sync boom/);
+
+    syncThrow = false;
+    FieldsGet.calls.length = 0;
+    const ok = await helpers.ensureFieldsGet(['Name'], ['string']);
+    expect(FieldsGet.calls.length).toBe(1);
+    expect(ok.Name?.string).toBe('ok');
+  });
+
   test('resolveLang falls back when getLang throws or returns blank', async () => {
     const FieldsGet = asyncFnRecorder(async () => ({
       Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: 'Name' },
diff --git a/modules/web/web/stores/fieldsGet.ts b/modules/web/web/stores/fieldsGet.ts
index 2b1d6f642..91a1ae9c9 100644
--- a/modules/web/web/stores/fieldsGet.ts
+++ b/modules/web/web/stores/fieldsGet.ts
@@ -191,7 +191,8 @@ export function createFieldsGetHelpers(
     inflight.clear();
     overlayByLang.clear();
     overlayAttrsByField.clear();
-    coalesceByLangAttrs.clear();
+    // Keep queued coalesce buckets so their microtask flush can still settle
+    // waiters under the new cacheGeneration (clearing would leave them pending).
     bumpOverlay();
   };
 
@@ -240,28 +241,22 @@ export function createFieldsGetHelpers(
     const pendingExact = inflight.get(rpcKey);
     let request = pendingExact;
     if (!request) {
-      // Assign after the IIFE starts so cleanup can identity-check this promise
-      // without reading a const during its own initializer (TS2454).
-      let ownedRequest: Promise<Record<string, unknown>> | null = null;
       const created = (async () => {
-        try {
-          const slice = (await host.FieldsGet(rpcFields, bucket.attributes)) || {};
-          if (generationAtStart === cacheGeneration) {
-            responseCache.set(rpcKey, slice);
-            mergeOverlay(lang, slice, bucket.attributes);
-          }
-          return slice;
-        } finally {
-          // Only clear this request — a newer ensure may have reused the same rpcKey
-          // after clearFieldsGetCache bumped the generation.
-          if (ownedRequest && inflight.get(rpcKey) === ownedRequest) {
-            inflight.delete(rpcKey);
-          }
+        const slice = (await host.FieldsGet(rpcFields, bucket.attributes)) || {};
+        if (generationAtStart === cacheGeneration) {
+          responseCache.set(rpcKey, slice);
+          mergeOverlay(lang, slice, bucket.attributes);
         }
+        return slice;
       })();
-      ownedRequest = created;
       request = created;
       inflight.set(rpcKey, request);
+      // Attach after inflight.set so a sync throw from FieldsGet cannot leave a
+      // rejected promise stuck under this key (finally would run before set).
+      const cleanup = () => {
+        if (inflight.get(rpcKey) === created) inflight.delete(rpcKey);
+      };
+      void created.then(cleanup, cleanup);
     }
     bucket.inflight = request;
 

From b8d8e887e21ac361900b08de8a5fe17af3bea401 Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Wed, 28 Oct 2026 18:33:13 +0800
Subject: [PATCH 12/23] fix(web): preserve selection maps on clear-retype and
 deep-merge FieldsGet overlay

- keep per-row map keys across blank Value updates so translations survive rename
- merge overlay field metadata per name so narrower projections cannot drop attrs
- use syncFnRecorder in the sync FieldsGet throw test
---
 .../ChoyPropertiesDefinitionItemDialog.vue    |  1 +
 .../field/propertiesDefinitionHelpers.test.ts | 18 +++++
 .../field/propertiesDefinitionHelpers.ts      | 30 ++++++++-
 modules/web/web/stores/fieldsGet.test.ts      | 66 +++++++++++++++++--
 modules/web/web/stores/fieldsGet.ts           |  8 ++-
 5 files changed, 114 insertions(+), 9 deletions(-)

diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
index aa599a6d1..a3ada4ebf 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
@@ -263,6 +263,7 @@ function cloneDraft(src: DefinitionEditorDraftItem | null | undefined): Definiti
     selectionLabelMaps: Object.fromEntries(
       Object.entries(base.selectionLabelMaps || {}).map(([k, v]) => [k, { ...(v || {}) }]),
     ),
+    selectionRowMapKeys: [...(base.selectionRowMapKeys || [])],
   };
 }
 
diff --git a/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts b/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
index 757f73c76..888201e95 100644
--- a/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
+++ b/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
@@ -362,6 +362,7 @@ describe('propertiesDefinitionHelpers', () => {
       low: { en_US: 'Low', zh_CN: '低' },
       normal: { en_US: 'Normal', zh_CN: '普通' },
     };
+    draft.selectionRowMapKeys = ['low', 'normal'];
     expect(selectionRowsFromDraft(draft)).toEqual([
       { value: 'low', label: '低' },
       { value: 'normal', label: '普通' },
@@ -385,6 +386,23 @@ describe('propertiesDefinitionHelpers', () => {
     ]);
   });
 
+  test('writeSelectionRowsToDraft keeps maps across clear-and-retype of Value', () => {
+    const draft = emptyDraftItem();
+    draft.type = 'selection';
+    draft.selectionText = JSON.stringify([['low', '低']]);
+    draft.selectionLabelMaps = { low: { en_US: 'Low', zh_CN: '低' } };
+    draft.selectionRowMapKeys = ['low'];
+
+    writeSelectionRowsToDraft(draft, [{ value: '', label: '低' }], 'zh_CN');
+    expect(draft.selectionLabelMaps.low).toEqual({ en_US: 'Low', zh_CN: '低' });
+    expect(draft.selectionRowMapKeys).toEqual(['low']);
+
+    writeSelectionRowsToDraft(draft, [{ value: 'lo', label: '低' }], 'zh_CN');
+    expect(draft.selectionLabelMaps.lo).toEqual({ en_US: 'Low', zh_CN: '低' });
+    expect(draft.selectionLabelMaps.low).toBeUndefined();
+    expect(draft.selectionRowMapKeys).toEqual(['lo']);
+  });
+
   test('buildDefinitionScopeCondition', () => {
     expect(
       buildDefinitionScopeCondition({
diff --git a/modules/web/web/components/field/propertiesDefinitionHelpers.ts b/modules/web/web/components/field/propertiesDefinitionHelpers.ts
index a61968f4e..3c0da78bc 100644
--- a/modules/web/web/components/field/propertiesDefinitionHelpers.ts
+++ b/modules/web/web/components/field/propertiesDefinitionHelpers.ts
@@ -31,6 +31,11 @@ export type DefinitionEditorDraftItem = {
   selectionText: string;
   /** Option value → label lang map (survives current-lang list edits via merge). */
   selectionLabelMaps: Record<string, Record<string, string>>;
+  /**
+   * Parallel to selection rows: last non-blank option value per index.
+   * Keeps label-map identity across clear-and-retype in the Value input.
+   */
+  selectionRowMapKeys?: string[];
 };
 
 /** One selection option row in the definition list editor (O2M-like). */
@@ -57,7 +62,8 @@ export function selectionRowsFromDraft(draft: DefinitionEditorDraftItem): Select
 
 /**
  * Write list-editor rows back onto the draft.
- * Preserves lang maps across value renames by index when possible.
+ * Preserves lang maps across value renames by index when possible, including
+ * clear-and-retype (blank intermediate updates keep the prior map key).
  */
 export function writeSelectionRowsToDraft(
   draft: DefinitionEditorDraftItem,
@@ -70,17 +76,32 @@ export function writeSelectionRowsToDraft(
   for (const [k, v] of Object.entries(draft.selectionLabelMaps || {})) {
     prevMaps[k] = { ...(v || {}) };
   }
+  const prevKeys = Array.isArray(draft.selectionRowMapKeys) ? draft.selectionRowMapKeys : [];
   const cleaned = (rows || []).map(r => ({
     value: String(r?.value ?? '').trim(),
     label: String(r?.label ?? ''),
   }));
   const nextMaps: Record<string, Record<string, string>> = {};
+  const nextKeys: string[] = [];
   const usedPrev = new Set<string>();
   for (let i = 0; i < cleaned.length; i++) {
     const row = cleaned[i]!;
-    if (!row.value) continue;
     const oldValue = String(prevRows[i]?.value || '').trim();
+    // Prior non-blank map key for this index (survives blank intermediate updates).
+    const prevKey = String(prevKeys[i] || oldValue || '').trim();
+    nextKeys.push(row.value || prevKey);
+    if (!row.value) {
+      if (prevKey && prevMaps[prevKey] && !usedPrev.has(prevKey)) {
+        nextMaps[prevKey] = { ...prevMaps[prevKey] };
+        usedPrev.add(prevKey);
+      }
+      continue;
+    }
     let base = prevMaps[row.value];
+    if (!base && prevKey && prevKey !== row.value && !usedPrev.has(prevKey)) {
+      base = prevMaps[prevKey];
+      usedPrev.add(prevKey);
+    }
     if (!base && oldValue && oldValue !== row.value && !usedPrev.has(oldValue)) {
       base = prevMaps[oldValue];
       usedPrev.add(oldValue);
@@ -88,6 +109,7 @@ export function writeSelectionRowsToDraft(
     nextMaps[row.value] = asLabelMap(mergePropertyLabelWrite(base || {}, row.label, code));
   }
   draft.selectionLabelMaps = nextMaps;
+  draft.selectionRowMapKeys = nextKeys;
   const display = cleaned.map(r => [r.value, r.label || r.value] as [string, string]);
   try {
     draft.selectionText = display.length ? JSON.stringify(display) : '';
@@ -108,6 +130,7 @@ export function emptyDraftItem(): DefinitionEditorDraftItem {
     readonly: false,
     selectionText: '',
     selectionLabelMaps: {},
+    selectionRowMapKeys: [],
   };
 }
 
@@ -210,6 +233,7 @@ export function definitionItemsToDrafts(
     const helpMap = asLabelMap(item.help);
     const selectionLabelMaps: Record<string, Record<string, string>> = {};
     let selectionText = '';
+    let selectionRowMapKeys: string[] = [];
     if (Array.isArray(item.selection)) {
       const display: Array<[string, string]> = [];
       for (const opt of item.selection) {
@@ -219,6 +243,7 @@ export function definitionItemsToDrafts(
         selectionLabelMaps[value] = map;
         display.push([value, unwrapPropertyLabel(map, code) || value]);
       }
+      selectionRowMapKeys = display.map(([value]) => value);
       try {
         selectionText = display.length ? JSON.stringify(display) : '';
       } catch {
@@ -236,6 +261,7 @@ export function definitionItemsToDrafts(
       readonly: item.readonly === true,
       selectionText,
       selectionLabelMaps,
+      selectionRowMapKeys,
     });
   }
   return out;
diff --git a/modules/web/web/stores/fieldsGet.test.ts b/modules/web/web/stores/fieldsGet.test.ts
index da64ced78..dca695412 100644
--- a/modules/web/web/stores/fieldsGet.test.ts
+++ b/modules/web/web/stores/fieldsGet.test.ts
@@ -8,7 +8,7 @@ import {
   type FieldsGetRpcLike,
 } from './fieldsGet';
 import type { WebFieldMetadata } from './modelStore';
-import { asyncFnRecorder } from '@/web/web/__tests__/mountApp';
+import { asyncFnRecorder, syncFnRecorder } from '@/web/web/__tests__/mountApp';
 
 function makeHost(
   fieldsMetadata: Record<string, WebFieldMetadata>,
@@ -442,16 +442,17 @@ describe('createFieldsGetHelpers', () => {
 
   test('sync FieldsGet throw does not permanently poison inflight', async () => {
     let syncThrow = true;
-    const FieldsGet = asyncFnRecorder((() => {
+    // syncFnRecorder rethrows synchronously; asyncFnRecorder would wrap into reject.
+    const FieldsGet = syncFnRecorder(() => {
       if (syncThrow) {
         throw new Error('sync boom');
       }
-      return Promise.resolve({
+      return {
         Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: 'ok' },
-      });
-    }) as any);
+      };
+    });
     const helpers = createFieldsGetHelpers(
-      makeHost({ Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: 'Name' } }, FieldsGet),
+      makeHost({ Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: 'Name' } }, FieldsGet as any),
       { getLang: () => 'zh_CN' }
     );
 
@@ -466,6 +467,59 @@ describe('createFieldsGetHelpers', () => {
     expect(ok.Name?.string).toBe('ok');
   });
 
+  test('mergeOverlay preserves prior field attrs across narrower projections', async () => {
+    let releaseFull!: () => void;
+    let releaseNarrow!: () => void;
+    const gateFull = new Promise<void>(resolve => {
+      releaseFull = resolve;
+    });
+    const gateNarrow = new Promise<void>(resolve => {
+      releaseNarrow = resolve;
+    });
+    const FieldsGet = asyncFnRecorder(async (_fields?: string[], attributes?: string[]) => {
+      const attrs = attributes || [];
+      if (attrs.length === 0) {
+        await gateFull;
+        return {
+          Amount: {
+            id: '1',
+            type: 'float',
+            typeAnnotation: 'float',
+            string: 'Amount',
+            currencyField: 'CurrencyId',
+          },
+        };
+      }
+      await gateNarrow;
+      return {
+        Amount: { id: '1', type: 'float', typeAnnotation: 'float', string: '金额' },
+      };
+    });
+    const helpers = createFieldsGetHelpers(
+      makeHost(
+        { Amount: { id: '1', type: 'float', typeAnnotation: 'float', string: 'Amount' } },
+        FieldsGet
+      ),
+      { getLang: () => 'zh_CN' }
+    );
+
+    // Different attr buckets → two RPCs. Complete full slice first, then presentation.
+    const fullP = helpers.ensureFieldsGet(['Amount']);
+    const narrowP = helpers.ensureFieldsGet(['Amount'], ['string']);
+    await Promise.resolve();
+    await Promise.resolve();
+    expect(FieldsGet.calls.length).toBe(2);
+
+    releaseFull();
+    await fullP;
+    releaseNarrow();
+    await narrowP;
+
+    const meta = helpers.getFieldMeta('Amount');
+    expect(meta?.string).toBe('金额');
+    expect((meta as any)?.currencyField).toBe('CurrencyId');
+  });
+
   test('resolveLang falls back when getLang throws or returns blank', async () => {
     const FieldsGet = asyncFnRecorder(async () => ({
       Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: 'Name' },
diff --git a/modules/web/web/stores/fieldsGet.ts b/modules/web/web/stores/fieldsGet.ts
index 91a1ae9c9..c4d860053 100644
--- a/modules/web/web/stores/fieldsGet.ts
+++ b/modules/web/web/stores/fieldsGet.ts
@@ -202,7 +202,13 @@ export function createFieldsGetHelpers(
     attributes: string[] | undefined
   ) => {
     const prev = overlayByLang.get(lang) || {};
-    overlayByLang.set(lang, { ...prev, ...slice });
+    // Per-field shallow merge so a narrower attr projection cannot drop keys
+    // already present (e.g. currencyField) while wildcard coverage stays set.
+    const merged: Record<string, WebFieldMetadata> = { ...prev };
+    for (const [name, metadata] of Object.entries(slice)) {
+      merged[name] = { ...(prev[name] || {}), ...metadata };
+    }
+    overlayByLang.set(lang, merged);
     recordOverlayAttrs(lang, Object.keys(slice), attributes);
     bumpOverlay();
   };

From b258e4a94dd7ffc0a5c57480ab8685b821a892dc Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Wed, 28 Oct 2026 18:41:30 +0800
Subject: [PATCH 13/23] fix(web): update draft expectations and harden
 commit/error paths

- expect selectionRowMapKeys from definitionItemsToDrafts (CI failure)
- clone drafts before commit so failed conversion does not mutate UI state
- surface applyDraftCurrentLangToMaps errors via dialog formError
---
 .../field/ChoyPropertiesDefinitionField.vue   |  7 ++++--
 .../ChoyPropertiesDefinitionItemDialog.vue    | 25 +++++++------------
 .../field/propertiesDefinitionHelpers.test.ts |  2 ++
 .../field/propertiesDefinitionHelpers.ts      | 14 +++++++++++
 4 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue b/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
index 46833a2e1..c1d38a96f 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
@@ -123,6 +123,7 @@ import { createTranslate } from '@/web/web/i18n';
 import { useI18nStore } from '@/web/web/stores/i18nStore';
 import ChoyPropertiesDefinitionItemDialog from './ChoyPropertiesDefinitionItemDialog.vue';
 import {
+  cloneDraftItem,
   definitionItemsToDrafts,
   draftsToDefinitionItems,
   emptyDraftItem,
@@ -484,14 +485,16 @@ function syncDraftsFromRaw(raw: unknown) {
 
 function commitDrafts(next: DefinitionEditorDraftItem[]) {
   writeError.value = '';
+  // Clone so a failed draftsToDefinitionItems leave caller's drafts unmutated.
+  const working = next.map(d => cloneDraftItem(d));
   let definition: PropertyItemDefinition[];
   try {
-    definition = draftsToDefinitionItems(next, editorLang(), previousItems.value);
+    definition = draftsToDefinitionItems(working, editorLang(), previousItems.value);
   } catch (e) {
     writeError.value = e instanceof Error ? e.message : String(e);
     throw e;
   }
-  drafts.value = next;
+  drafts.value = working;
   previousItems.value = definition;
   const fieldRef = binding.fieldRef() as WritableComputedRef<any> | { value: any };
   syncingFromWrite = true;
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
index a3ada4ebf..8f4242ff6 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
@@ -171,6 +171,7 @@ import ChoyPropertiesDefinitionSelectionEditor from './ChoyPropertiesDefinitionS
 import {
   PROPERTY_DEFINITION_V1_TYPE_OPTIONS,
   applyDraftCurrentLangToMaps,
+  cloneDraftItem,
   emptyDraftItem,
   selectionRowsFromDraft,
   syncDraftLabelsForLang,
@@ -254,19 +255,6 @@ function editorLang(): string {
   }
 }
 
-function cloneDraft(src: DefinitionEditorDraftItem | null | undefined): DefinitionEditorDraftItem {
-  const base = src ? { ...src } : emptyDraftItem();
-  return {
-    ...base,
-    stringMap: { ...(base.stringMap || {}) },
-    helpMap: { ...(base.helpMap || {}) },
-    selectionLabelMaps: Object.fromEntries(
-      Object.entries(base.selectionLabelMaps || {}).map(([k, v]) => [k, { ...(v || {}) }]),
-    ),
-    selectionRowMapKeys: [...(base.selectionRowMapKeys || [])],
-  };
-}
-
 function onSelectionRowsUpdate(rows: SelectionDraftRow[]) {
   const item = local.value;
   if (!item || props.readonly) return;
@@ -337,9 +325,14 @@ function onConfirm() {
     formError.value = _t('Name is required');
     return;
   }
-  applyDraftCurrentLangToMaps(item, editorLang());
+  try {
+    applyDraftCurrentLangToMaps(item, editorLang());
+  } catch (e) {
+    formError.value = e instanceof Error ? e.message : String(e);
+    return;
+  }
   // Parent closes on successful commit; keep open when commitDrafts fails so edits are not lost.
-  emit('saved', cloneDraft(item));
+  emit('saved', cloneDraftItem(item));
 }
 
 watch(
@@ -347,7 +340,7 @@ watch(
   (open, wasOpen) => {
     if (open && !wasOpen) {
       formError.value = '';
-      local.value = cloneDraft(props.item);
+      local.value = cloneDraftItem(props.item);
       syncDraftLabelsForLang(local.value, editorLang());
     }
     if (!open && wasOpen) {
diff --git a/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts b/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
index 888201e95..5ea40e252 100644
--- a/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
+++ b/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
@@ -66,6 +66,7 @@ describe('propertiesDefinitionHelpers', () => {
         readonly: false,
         selectionText: '',
         selectionLabelMaps: {},
+        selectionRowMapKeys: [],
       },
       {
         name: 'sel',
@@ -84,6 +85,7 @@ describe('propertiesDefinitionHelpers', () => {
           a: { en_US: 'A', zh_CN: '甲' },
           b: { en_US: 'B' },
         },
+        selectionRowMapKeys: ['a', 'b'],
       },
     ]);
   });
diff --git a/modules/web/web/components/field/propertiesDefinitionHelpers.ts b/modules/web/web/components/field/propertiesDefinitionHelpers.ts
index 3c0da78bc..e785f836f 100644
--- a/modules/web/web/components/field/propertiesDefinitionHelpers.ts
+++ b/modules/web/web/components/field/propertiesDefinitionHelpers.ts
@@ -134,6 +134,20 @@ export function emptyDraftItem(): DefinitionEditorDraftItem {
   };
 }
 
+/** Deep-clone draft maps so failed commits do not partially mutate caller state. */
+export function cloneDraftItem(src: DefinitionEditorDraftItem | null | undefined): DefinitionEditorDraftItem {
+  const base = src ? { ...src } : emptyDraftItem();
+  return {
+    ...base,
+    stringMap: { ...(base.stringMap || {}) },
+    helpMap: { ...(base.helpMap || {}) },
+    selectionLabelMaps: Object.fromEntries(
+      Object.entries(base.selectionLabelMaps || {}).map(([k, v]) => [k, { ...(v || {}) }]),
+    ),
+    selectionRowMapKeys: [...(base.selectionRowMapKeys || [])],
+  };
+}
+
 function asLabelMap(value: unknown): Record<string, string> {
   return parsePropertyLabelMap(value) || {};
 }

From 1bc90b874f4f829c6c43138b329bc83c8b6afbf8 Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Wed, 28 Oct 2026 20:34:43 +0800
Subject: [PATCH 14/23] fix(web): avoid caching incomplete FieldsGet slices and
 cover dialog/helpers gaps

- skip responseCache for incomplete specific-field RPC/waiter slices
- cover applyDraftCurrentLangToMaps formError path and selection map-key fallback
- exercise cloneDraftItem nested copy
---
 ...ChoyPropertiesDefinitionItemDialog.test.ts | 21 ++++++++++++++
 .../field/propertiesDefinitionHelpers.test.ts | 29 +++++++++++++++++++
 modules/web/web/stores/fieldsGet.test.ts      | 21 ++++++++++++++
 modules/web/web/stores/fieldsGet.ts           | 14 +++++++--
 4 files changed, 83 insertions(+), 2 deletions(-)

diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts
index 46be145cc..6df17570e 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts
@@ -341,6 +341,27 @@ describe('ChoyPropertiesDefinitionItemDialog', () => {
     m.unmount();
   });
 
+  test('Save surfaces applyDraftCurrentLangToMaps failures as formError', async () => {
+    const onSaved = fnRecorder();
+    const i18n = useI18nStore();
+    Object.defineProperty(i18n, 'terminologyLang', {
+      configurable: true,
+      get: () => 'zh-CN',
+    });
+    const m = mountDialog({ item: draft({ name: 'tax_id', string: 'Tax', stringMap: { en_US: 'Tax' } }) }, { onSaved });
+    try {
+      await flushPromises();
+      m.click('[data-testid="choy-properties-definition-item-save"]');
+      await flushPromises();
+      expect(onSaved.calls.length).toBe(0);
+      const err = m.q('[data-testid="choy-properties-definition-item-error"]');
+      expect(err).toBeTruthy();
+      expect(String(err?.textContent || '')).toMatch(/terminology|locale|language/i);
+    } finally {
+      m.unmount();
+    }
+  });
+
   test('Save emits saved and does not close itself', async () => {
     const onSaved = fnRecorder();
     const onUpdate = fnRecorder();
diff --git a/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts b/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
index 5ea40e252..7d8ea26fd 100644
--- a/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
+++ b/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
@@ -5,6 +5,7 @@ import {
   PROPERTY_DEFINITION_V1_TYPE_OPTIONS,
   applyDraftCurrentLangToMaps,
   buildDefinitionScopeCondition,
+  cloneDraftItem,
   definitionItemsToDrafts,
   draftsToDefinitionItems,
   emptyDraftItem,
@@ -405,6 +406,34 @@ describe('propertiesDefinitionHelpers', () => {
     expect(draft.selectionRowMapKeys).toEqual(['lo']);
   });
 
+  test('writeSelectionRowsToDraft falls back to previous row value when map key misses', () => {
+    const draft = emptyDraftItem();
+    draft.type = 'selection';
+    draft.selectionText = JSON.stringify([['old', '旧']]);
+    draft.selectionLabelMaps = { old: { en_US: 'Old', zh_CN: '旧' } };
+    // Stale/wrong map key so rename must recover via prevRows[i].value.
+    draft.selectionRowMapKeys = ['missing'];
+
+    writeSelectionRowsToDraft(draft, [{ value: 'new', label: '旧' }], 'zh_CN');
+    expect(draft.selectionLabelMaps.new).toEqual({ en_US: 'Old', zh_CN: '旧' });
+    expect(draft.selectionLabelMaps.old).toBeUndefined();
+    expect(draft.selectionRowMapKeys).toEqual(['new']);
+  });
+
+  test('cloneDraftItem copies nested maps and map keys', () => {
+    const src = emptyDraftItem();
+    src.name = 'n';
+    src.stringMap = { en_US: 'N' };
+    src.helpMap = { en_US: 'H' };
+    src.selectionLabelMaps = { a: { en_US: 'A' } };
+    src.selectionRowMapKeys = ['a'];
+    const copy = cloneDraftItem(src);
+    expect(copy).toEqual(src);
+    expect(copy.stringMap).not.toBe(src.stringMap);
+    expect(copy.selectionLabelMaps.a).not.toBe(src.selectionLabelMaps.a);
+    expect(cloneDraftItem(null).type).toBe('char');
+  });
+
   test('buildDefinitionScopeCondition', () => {
     expect(
       buildDefinitionScopeCondition({
diff --git a/modules/web/web/stores/fieldsGet.test.ts b/modules/web/web/stores/fieldsGet.test.ts
index dca695412..c8228bc5a 100644
--- a/modules/web/web/stores/fieldsGet.test.ts
+++ b/modules/web/web/stores/fieldsGet.test.ts
@@ -407,6 +407,27 @@ describe('createFieldsGetHelpers', () => {
     expect(helpers.getFieldsGetTranslatedHelp('Name')).toBe('帮助');
   });
 
+  test('incomplete specific-field slice is not cached under the waiter key', async () => {
+    let round = 0;
+    const FieldsGet = asyncFnRecorder(async () => {
+      round += 1;
+      if (round === 1) return {};
+      return {
+        Ghost: { id: '9', type: 'varchar', typeAnnotation: 'string', string: '幽灵' },
+      };
+    });
+    const helpers = createFieldsGetHelpers(makeHost({}, FieldsGet), { getLang: () => 'zh_CN' });
+
+    const first = await helpers.ensureFieldsGet(['Ghost'], ['string']);
+    expect(first.Ghost).toBeUndefined();
+    expect(FieldsGet.calls.length).toBe(1);
+
+    // Must re-RPC: empty incomplete result must not poison responseCache.
+    const second = await helpers.ensureFieldsGet(['Ghost'], ['string']);
+    expect(FieldsGet.calls.length).toBe(2);
+    expect(second.Ghost?.string).toBe('幽灵');
+  });
+
   test('reject path propagates FieldsGet failure to all coalesced waiters', async () => {
     const FieldsGet = asyncFnRecorder(async () => {
       throw new Error('fieldsget boom');
diff --git a/modules/web/web/stores/fieldsGet.ts b/modules/web/web/stores/fieldsGet.ts
index c4d860053..423877b2d 100644
--- a/modules/web/web/stores/fieldsGet.ts
+++ b/modules/web/web/stores/fieldsGet.ts
@@ -234,7 +234,11 @@ export function createFieldsGetHelpers(
         let value = responseCache.get(waiter.cacheKey);
         if (!value) {
           value = waiter.wantAll ? slice : pickFieldSlice(slice, waiter.names);
-          if (generationAtStart === cacheGeneration) {
+          // Do not cache incomplete specific-field slices (unknown/missing names),
+          // or a later ensure for the same key would keep returning {}.
+          const complete =
+            waiter.wantAll || waiter.names.every(n => Object.prototype.hasOwnProperty.call(value!, n));
+          if (complete && generationAtStart === cacheGeneration) {
             responseCache.set(waiter.cacheKey, value);
           }
         }
@@ -250,7 +254,13 @@ export function createFieldsGetHelpers(
       const created = (async () => {
         const slice = (await host.FieldsGet(rpcFields, bucket.attributes)) || {};
         if (generationAtStart === cacheGeneration) {
-          responseCache.set(rpcKey, slice);
+          const rpcComplete =
+            bucket.wantAll ||
+            !rpcFields ||
+            rpcFields.every(n => Object.prototype.hasOwnProperty.call(slice, n));
+          if (rpcComplete) {
+            responseCache.set(rpcKey, slice);
+          }
           mergeOverlay(lang, slice, bucket.attributes);
         }
         return slice;

From 4686e484fa62b12a0b72f2c7f74825309ed2b92a Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Wed, 28 Oct 2026 20:35:15 +0800
Subject: [PATCH 15/23] test(web): cover definitionItemsToDrafts selectionText
 stringify failure

---
 .../field/propertiesDefinitionHelpers.test.ts | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts b/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
index 7d8ea26fd..039473552 100644
--- a/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
+++ b/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
@@ -434,6 +434,25 @@ describe('propertiesDefinitionHelpers', () => {
     expect(cloneDraftItem(null).type).toBe('char');
   });
 
+  test('definitionItemsToDrafts clears selectionText when JSON.stringify throws', () => {
+    const orig = JSON.stringify;
+    try {
+      (JSON as any).stringify = () => {
+        throw new Error('stringify boom');
+      };
+      const drafts = definitionItemsToDrafts(
+        [{ name: 'sel', type: 'selection', selection: [['a', { en_US: 'A' }]] }],
+        'en_US',
+      );
+      expect(drafts).toHaveLength(1);
+      expect(drafts[0]!.selectionText).toBe('');
+      expect(drafts[0]!.selectionLabelMaps.a).toEqual({ en_US: 'A' });
+      expect(drafts[0]!.selectionRowMapKeys).toEqual(['a']);
+    } finally {
+      (JSON as any).stringify = orig;
+    }
+  });
+
   test('buildDefinitionScopeCondition', () => {
     expect(
       buildDefinitionScopeCondition({

From be74db093c9c02a693a431f2eadf65222ab9b751 Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Wed, 28 Oct 2026 20:55:51 +0800
Subject: [PATCH 16/23] fix(web): trim property name onto draft before dialog
 save emit

---
 .../ChoyPropertiesDefinitionItemDialog.test.ts  | 17 +++++++++++++++++
 .../ChoyPropertiesDefinitionItemDialog.vue      |  1 +
 2 files changed, 18 insertions(+)

diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts
index 6df17570e..b8ff089ad 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts
@@ -376,6 +376,23 @@ describe('ChoyPropertiesDefinitionItemDialog', () => {
     m.unmount();
   });
 
+  test('Save trims name onto the draft before emit', async () => {
+    const onSaved = fnRecorder();
+    const m = mountDialog(
+      { item: draft({ name: '  padded_name  ', string: 'P', stringMap: { en_US: 'P' } }) },
+      { onSaved },
+    );
+    try {
+      await flushPromises();
+      m.click('[data-testid="choy-properties-definition-item-save"]');
+      await flushPromises();
+      expect(onSaved.calls.length).toBe(1);
+      expect((onSaved.calls[0][0] as DefinitionEditorDraftItem).name).toBe('padded_name');
+    } finally {
+      m.unmount();
+    }
+  });
+
   test('Cancel closes dialog', async () => {
     const onUpdate = fnRecorder();
     const onClosed = fnRecorder();
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
index 8f4242ff6..7d2ab9abc 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
@@ -325,6 +325,7 @@ function onConfirm() {
     formError.value = _t('Name is required');
     return;
   }
+  item.name = name;
   try {
     applyDraftCurrentLangToMaps(item, editorLang());
   } catch (e) {

From 2a3229c1c1cd41d2add4d14f4b3d6dc27b5d1670 Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Wed, 28 Oct 2026 21:02:29 +0800
Subject: [PATCH 17/23] fix(web): harden definition draft sync, translate rows,
 and helper clones

Defer clearing syncingFromWrite until nextTick so failed commits keep writeError; restore in-progress selection rows after translate; clone drafts inside draftsToDefinitionItems so validation throws do not mutate callers.
---
 .../field/ChoyPropertiesDefinitionField.vue   |  8 +++-
 ...ChoyPropertiesDefinitionItemDialog.test.ts | 39 +++++++++++++++++++
 .../ChoyPropertiesDefinitionItemDialog.vue    |  3 ++
 .../field/propertiesDefinitionHelpers.test.ts |  8 ++++
 .../field/propertiesDefinitionHelpers.ts      |  4 +-
 5 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue b/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
index c1d38a96f..d412876c3 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
@@ -108,7 +108,7 @@ import type { PropertyItemDefinition } from '@/core/service/orm/model/properties
 import { TRANSLATED_BASE_LANG } from '@/core/service/orm/model/properties_label_i18n';
 import type { WebModelStore } from '@/web/web/stores/modelStore';
 import type { RuleItem } from 'async-validator';
-import { computed, defineComponent, h, ref, watch, type WritableComputedRef } from 'vue';
+import { computed, defineComponent, h, nextTick, ref, watch, type WritableComputedRef } from 'vue';
 import { getActivePinia } from 'pinia';
 import { GripVertical } from 'lucide-vue-next';
 import { useField } from '@/web/web/composables/useField';
@@ -497,11 +497,15 @@ function commitDrafts(next: DefinitionEditorDraftItem[]) {
   drafts.value = working;
   previousItems.value = definition;
   const fieldRef = binding.fieldRef() as WritableComputedRef<any> | { value: any };
+  // Hold until the next tick so the deep fieldRef watcher does not re-sync
+  // (and clear writeError) before Vue flushes the write.
   syncingFromWrite = true;
   try {
     fieldRef.value = definition;
   } finally {
-    syncingFromWrite = false;
+    void nextTick(() => {
+      syncingFromWrite = false;
+    });
   }
 }
 
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts
index b8ff089ad..36ef1cfdb 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts
@@ -488,6 +488,45 @@ describe('ChoyPropertiesDefinitionItemDialog', () => {
     m.unmount();
   });
 
+  test('selection translate keeps in-progress blank option rows', async () => {
+    const onSaved = fnRecorder();
+    const m = mountDialog(
+      {
+        item: draft({
+          name: 'prio',
+          type: 'selection',
+          string: 'Priority',
+          stringMap: { en_US: 'Priority' },
+          selectionText: JSON.stringify([
+            ['low', 'Low'],
+            ['', ''],
+          ]),
+          selectionLabelMaps: { low: { en_US: 'Low' } },
+          selectionRowMapKeys: ['low', ''],
+        }),
+      },
+      { onSaved },
+    );
+    try {
+      await flushPromises();
+      m.click('[data-testid="stub-selection-translate"]');
+      await flushPromises();
+      m.click('[data-testid="stub-translate-save-selection"]');
+      await flushPromises();
+      const editorRows = (lastSelectionProps?.modelValue as Array<{ value: string }> | undefined) || [];
+      expect(editorRows.some(r => r && r.value === '')).toBe(true);
+      m.click('[data-testid="choy-properties-definition-item-save"]');
+      await flushPromises();
+      expect(onSaved.calls.length).toBe(1);
+      const saved = onSaved.calls[0][0] as DefinitionEditorDraftItem;
+      const rows = JSON.parse(String(saved.selectionText || '[]')) as unknown[];
+      expect(rows.some(r => Array.isArray(r) && r[0] === '')).toBe(true);
+      expect(saved.selectionLabelMaps.low).toBeTruthy();
+    } finally {
+      m.unmount();
+    }
+  });
+
   test('readonly skips translate controls and selection mutate', async () => {
     const m = mountDialog({
       readonly: true,
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
index 7d2ab9abc..7e87276b6 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
@@ -303,11 +303,14 @@ function onTranslateSaved(next: Record<string, string>) {
     item.helpMap = { ...next };
     syncDraftLabelsForLang(item, editorLang());
   } else {
+    // Keep in-progress rows (e.g. blank values) across the map→selectionText rebuild.
+    const pendingRows = selectionRowsFromDraft(item);
     item.selectionLabelMaps = {
       ...item.selectionLabelMaps,
       [target.value]: { ...next },
     };
     syncDraftLabelsForLang(item, editorLang());
+    writeSelectionRowsToDraft(item, pendingRows, editorLang());
   }
   translateTarget.value = null;
 }
diff --git a/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts b/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
index 039473552..e303f4df2 100644
--- a/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
+++ b/modules/web/web/components/field/propertiesDefinitionHelpers.test.ts
@@ -250,6 +250,14 @@ describe('propertiesDefinitionHelpers', () => {
     );
   });
 
+  test('draftsToDefinitionItems does not mutate caller drafts when validation throws', () => {
+    const first = { ...emptyDraftItem(), name: 'ok', type: 'char', string: '  Label  ', stringMap: {} };
+    const second = { ...emptyDraftItem(), name: 'ok', type: 'char', string: 'Dup', stringMap: {} };
+    expect(() => draftsToDefinitionItems([first, second], 'en_US')).toThrow(/duplicate/);
+    expect(first.stringMap).toEqual({});
+    expect(first.string).toBe('  Label  ');
+  });
+
   test('draftsToDefinitionItems rejects bad selection and unsupported types', () => {
     expect(() =>
       draftsToDefinitionItems([{ ...emptyDraftItem(), name: 's', type: 'selection', selectionText: '' }], 'en_US'),
diff --git a/modules/web/web/components/field/propertiesDefinitionHelpers.ts b/modules/web/web/components/field/propertiesDefinitionHelpers.ts
index e785f836f..69bbb1975 100644
--- a/modules/web/web/components/field/propertiesDefinitionHelpers.ts
+++ b/modules/web/web/components/field/propertiesDefinitionHelpers.ts
@@ -292,7 +292,9 @@ export function draftsToDefinitionItems(
   void previousItems;
   const out: PropertyItemDefinition[] = [];
   const seenNames = new Set<string>();
-  for (const draft of drafts || []) {
+  for (const source of drafts || []) {
+    // Clone so a mid-loop throw does not leave caller's drafts partially mutated.
+    const draft = cloneDraftItem(source);
     applyDraftCurrentLangToMaps(draft, code);
     const name = String(draft.name || '').trim();
     if (!name) continue;

From 75d41f8abe70c5aa044f775683f2a3193b81356c Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Wed, 28 Oct 2026 21:07:18 +0800
Subject: [PATCH 18/23] fix(web): avoid wipe on failed translate load; harden
 dialog/FieldsGet settle

Skip Save emit when translation rows failed to load; track new-item dialogs explicitly so shrink-while-open cannot overwrite; separate FieldsGet coalesce resolve/reject so resolve throws do not re-reject waiters.
---
 .../ChoyPropertiesDefinitionField.test.ts     | 31 +++++++++++++++++++
 .../field/ChoyPropertiesDefinitionField.vue   | 14 ++++++---
 ...hoyPropertyLabelTranslationsDialog.test.ts |  6 ++--
 .../ChoyPropertyLabelTranslationsDialog.vue   | 13 +++++++-
 modules/web/web/stores/fieldsGet.ts           | 23 +++++++++++---
 5 files changed, 75 insertions(+), 12 deletions(-)

diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts b/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
index b7acdffe3..807d03936 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
@@ -372,6 +372,37 @@ describe('ChoyPropertiesDefinitionField', () => {
     }
   });
 
+  test('new-item dialog appends even if rows shrink while open', async () => {
+    const binding = makeBinding({
+      definition: [{ name: 'tax_id', type: 'char', string: { en_US: 'Tax' } }],
+      isEditMode: true,
+    });
+    const mounted = mountApp(ChoyPropertiesDefinitionField as any, {
+      props: { binding },
+    });
+    try {
+      await flushPromises();
+      mounted.click('[data-testid="choy-properties-definition-add"]');
+      await nextTick();
+      expect(mounted.q('[data-testid="choy-properties-definition-item-dialog-stub"]')).toBeTruthy();
+      // Remove the existing row while the add dialog is still open.
+      const removeBtns = mounted.el.querySelectorAll('[data-testid="choy-properties-definition-remove"]');
+      expect(removeBtns.length).toBe(1);
+      (removeBtns[0] as HTMLElement).click();
+      await nextTick();
+      await flushPromises();
+      expect((binding.__value.value as any[]).length).toBe(0);
+      mounted.click('[data-testid="stub-item-save"]');
+      await nextTick();
+      await flushPromises();
+      const saved = binding.__value.value as any[];
+      expect(saved.length).toBe(1);
+      expect(saved[0]?.name).toBe('from_dialog');
+    } finally {
+      mounted.unmount();
+    }
+  });
+
   test('commitDrafts failure keeps dialog open (onDialogSaved catch return)', async () => {
     // Invalid selection JSON → draftsToDefinitionItems throws inside commitDrafts.
     stubSfc(ChoyPropertiesDefinitionItemDialog as any, {
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue b/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
index d412876c3..1d852ac91 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
@@ -460,6 +460,8 @@ const writeError = ref('');
 const dialogOpen = ref(false);
 const dialogReadonly = ref(false);
 const dialogIndex = ref<number | null>(null);
+/** True when the open dialog is creating a new row (not editing by index). */
+const dialogIsNew = ref(false);
 const dialogItem = ref<DefinitionEditorDraftItem | null>(null);
 
 /** Suppress draft re-sync while we write back from local drafts. */
@@ -513,7 +515,8 @@ function onAdd() {
   if (!canMutate.value) return;
   writeError.value = '';
   dialogReadonly.value = false;
-  dialogIndex.value = drafts.value.length;
+  dialogIsNew.value = true;
+  dialogIndex.value = null;
   dialogItem.value = emptyDraftItem();
   dialogOpen.value = true;
 }
@@ -541,6 +544,7 @@ function openRow(index: number, asReadonly: boolean) {
   if (!item) return;
   writeError.value = '';
   dialogReadonly.value = asReadonly || !canMutate.value;
+  dialogIsNew.value = false;
   dialogIndex.value = index;
   dialogItem.value = item;
   dialogOpen.value = true;
@@ -548,12 +552,13 @@ function openRow(index: number, asReadonly: boolean) {
 
 function onDialogSaved(item: DefinitionEditorDraftItem) {
   if (dialogReadonly.value) return;
-  const index = dialogIndex.value;
-  if (index == null || index < 0) return;
   const next = [...drafts.value];
-  if (index >= next.length) {
+  if (dialogIsNew.value) {
     next.push(item);
   } else {
+    const index = dialogIndex.value;
+    // Stale index (row removed/reordered while dialog open): keep dialog open.
+    if (index == null || index < 0 || index >= next.length) return;
     next[index] = item;
   }
   try {
@@ -563,6 +568,7 @@ function onDialogSaved(item: DefinitionEditorDraftItem) {
     return;
   }
   dialogOpen.value = false;
+  dialogIsNew.value = false;
   dialogIndex.value = null;
   dialogItem.value = null;
 }
diff --git a/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts b/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts
index ef807c1f2..3ea100c48 100644
--- a/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts
+++ b/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts
@@ -271,7 +271,7 @@ describe('ChoyPropertyLabelTranslationsDialog', () => {
     m.unmount();
   });
 
-  test('save after load failure still emits empty en_US base key', async () => {
+  test('save after load failure closes without wiping translations', async () => {
     const badTranslations = new Proxy(
       {},
       {
@@ -287,9 +287,11 @@ describe('ChoyPropertyLabelTranslationsDialog', () => {
     const m = mountDialog({ translations: badTranslations as any }, { onSaved });
     await flushPromises();
     expect(m.qa(INPUT_SEL).length).toBe(0);
+    const saveBtn = m.q('[data-testid="choy-property-label-translations-save"]') as HTMLButtonElement | null;
+    expect(saveBtn?.disabled).toBe(true);
     m.click('[data-testid="choy-property-label-translations-save"]');
     await nextTick();
-    expect(onSaved.calls[0]?.[0]).toEqual({ en_US: '' });
+    expect(onSaved.calls.length).toBe(0);
     m.unmount();
   });
 });
diff --git a/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.vue b/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.vue
index 992ef0bcb..427ae3927 100644
--- a/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.vue
+++ b/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.vue
@@ -33,7 +33,12 @@ SPDX-License-Identifier: Apache-2.0
       </div>
       <div class="mt-4 flex justify-end gap-2">
         <ChoyButton type="button" variant="outline" @click="visible = false">{{ _t('Cancel') }}</ChoyButton>
-        <ChoyButton type="button" data-testid="choy-property-label-translations-save" @click="handleSave">
+        <ChoyButton
+          type="button"
+          data-testid="choy-property-label-translations-save"
+          :disabled="loading || rows.length === 0"
+          @click="handleSave"
+        >
           {{ _t('Save translations') }}
         </ChoyButton>
       </div>
@@ -153,6 +158,12 @@ watch(
 );
 
 function handleSave() {
+  // Load failure / still loading leaves rows empty — closing without emit
+  // avoids wiping the caller's existing label map with { en_US: '' }.
+  if (loading.value || rows.value.length === 0) {
+    visible.value = false;
+    return;
+  }
   const next: Record<string, string> = {};
   for (const row of rows.value) {
     const value = String(row.value ?? '');
diff --git a/modules/web/web/stores/fieldsGet.ts b/modules/web/web/stores/fieldsGet.ts
index 423877b2d..2b0290c91 100644
--- a/modules/web/web/stores/fieldsGet.ts
+++ b/modules/web/web/stores/fieldsGet.ts
@@ -276,11 +276,24 @@ export function createFieldsGetHelpers(
     }
     bucket.inflight = request;
 
-    void request.then(resolveWaiters).catch(err => {
-      for (const waiter of bucket.waiters) {
-        waiter.reject(err);
-      }
-    });
+    // Separate settle paths so a throw inside resolveWaiters cannot be
+    // mistaken for an RPC failure and reject waiters that already resolved.
+    void request.then(
+      slice => {
+        try {
+          resolveWaiters(slice);
+        } catch (err) {
+          for (const waiter of bucket.waiters) {
+            waiter.reject(err);
+          }
+        }
+      },
+      err => {
+        for (const waiter of bucket.waiters) {
+          waiter.reject(err);
+        }
+      },
+    );
   };
 
   const ensureFieldsGet = async (

From aba4e994cd18dc70da3b2149bcfd97060e60cea5 Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Wed, 28 Oct 2026 21:11:04 +0800
Subject: [PATCH 19/23] fix(web): surface writeError when property edit index
 goes stale

Tell the user to reopen the row instead of silently no-oping Save after the list shrinks or reorders while the dialog is open.
---
 modules/web/i18n/web.pot                      |  5 +++
 modules/web/i18n/zh_CN.po                     |  5 +++
 .../ChoyPropertiesDefinitionField.test.ts     | 37 +++++++++++++++++++
 .../field/ChoyPropertiesDefinitionField.vue   |  5 ++-
 4 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/modules/web/i18n/web.pot b/modules/web/i18n/web.pot
index add5473bd..d4a21e8cf 100644
--- a/modules/web/i18n/web.pot
+++ b/modules/web/i18n/web.pot
@@ -892,6 +892,11 @@ msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "No properties defined"
 msgstr ""
 
+#: web/components/field/ChoyPropertiesDefinitionField.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
+msgid "This row was changed while editing; please reopen it."
+msgstr ""
+
 #: web/components/field/ChoyPropertiesDefinitionField.vue:16
 #: web/components/field/ChoyPropertiesDefinitionField.vue:9
 msgctxt "web/components/field/ChoyPropertiesDefinitionField"
diff --git a/modules/web/i18n/zh_CN.po b/modules/web/i18n/zh_CN.po
index f491a7e8e..c1230a168 100644
--- a/modules/web/i18n/zh_CN.po
+++ b/modules/web/i18n/zh_CN.po
@@ -861,6 +861,11 @@ msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "No properties"
 msgstr "无属性"
 
+#: web/components/field/ChoyPropertiesDefinitionField.vue
+msgctxt "web/components/field/ChoyPropertiesDefinitionField"
+msgid "This row was changed while editing; please reopen it."
+msgstr "该行在编辑期间已变更，请重新打开。"
+
 #: web/components/field/ChoyPropertiesDefinitionField.vue:16 web/components/field/ChoyPropertiesDefinitionField.vue:9
 msgctxt "web/components/field/ChoyPropertiesDefinitionField"
 msgid "No properties defined"
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts b/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
index 807d03936..e2d138d6f 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
@@ -403,6 +403,43 @@ describe('ChoyPropertiesDefinitionField', () => {
     }
   });
 
+  test('stale edit index surfaces writeError and keeps dialog open', async () => {
+    const binding = makeBinding({
+      definition: [
+        { name: 'a', type: 'char', string: { en_US: 'A' } },
+        { name: 'b', type: 'char', string: { en_US: 'B' } },
+      ],
+      isEditMode: true,
+    });
+    const mounted = mountApp(ChoyPropertiesDefinitionField as any, {
+      props: { binding },
+    });
+    try {
+      await flushPromises();
+      const openBtns = mounted.el.querySelectorAll('[data-testid="choy-properties-definition-open"]');
+      expect(openBtns.length).toBe(2);
+      (openBtns[1] as HTMLElement).click();
+      await nextTick();
+      expect(mounted.q('[data-testid="choy-properties-definition-item-dialog-stub"]')).toBeTruthy();
+      // Remove the first row so dialogIndex 1 is now out of range.
+      const removeBtns = mounted.el.querySelectorAll('[data-testid="choy-properties-definition-remove"]');
+      (removeBtns[0] as HTMLElement).click();
+      await nextTick();
+      await flushPromises();
+      expect((binding.__value.value as any[]).map((r: any) => r.name)).toEqual(['b']);
+      mounted.click('[data-testid="stub-item-save"]');
+      await nextTick();
+      await flushPromises();
+      expect(mounted.q('[data-testid="choy-properties-definition-item-dialog-stub"]')).toBeTruthy();
+      expect(mounted.q('[data-testid="choy-properties-definition-write-error"]')?.textContent || '').toMatch(
+        /changed while editing/i,
+      );
+      expect((binding.__value.value as any[]).map((r: any) => r.name)).toEqual(['b']);
+    } finally {
+      mounted.unmount();
+    }
+  });
+
   test('commitDrafts failure keeps dialog open (onDialogSaved catch return)', async () => {
     // Invalid selection JSON → draftsToDefinitionItems throws inside commitDrafts.
     stubSfc(ChoyPropertiesDefinitionItemDialog as any, {
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue b/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
index 1d852ac91..0077e74ff 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
@@ -558,7 +558,10 @@ function onDialogSaved(item: DefinitionEditorDraftItem) {
   } else {
     const index = dialogIndex.value;
     // Stale index (row removed/reordered while dialog open): keep dialog open.
-    if (index == null || index < 0 || index >= next.length) return;
+    if (index == null || index < 0 || index >= next.length) {
+      writeError.value = _t('This row was changed while editing; please reopen it.');
+      return;
+    }
     next[index] = item;
   }
   try {

From 94c0e5158e6f02df412a5e8ceb0e47c9400640a2 Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Wed, 28 Oct 2026 21:19:43 +0800
Subject: [PATCH 20/23] fix(web): keep translate labels, ignore stale loads,
 pin coalesce generation

Preserve the newly saved selection label when restoring pending rows; invalidate translation dialog loads across close/reopen; capture FieldsGet coalesce generation at bucket queue so a clear before flush cannot cache stale RPC results.
---
 ...ChoyPropertiesDefinitionItemDialog.test.ts | 41 ++++++++++++++++++
 .../ChoyPropertiesDefinitionItemDialog.vue    | 12 ++++--
 ...hoyPropertyLabelTranslationsDialog.test.ts | 42 +++++++++++++++++++
 .../ChoyPropertyLabelTranslationsDialog.vue   | 15 ++++++-
 modules/web/web/stores/fieldsGet.test.ts      | 10 +++++
 modules/web/web/stores/fieldsGet.ts           |  7 +++-
 6 files changed, 121 insertions(+), 6 deletions(-)

diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts
index 36ef1cfdb..f63862f94 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.test.ts
@@ -527,6 +527,47 @@ describe('ChoyPropertiesDefinitionItemDialog', () => {
     }
   });
 
+  test('selection translate keeps newly saved label (not stale pending row label)', async () => {
+    const onSaved = fnRecorder();
+    const m = mountDialog(
+      {
+        item: draft({
+          name: 'prio',
+          type: 'selection',
+          string: 'Priority',
+          stringMap: { en_US: 'Priority' },
+          selectionText: JSON.stringify([
+            ['low', 'Low'],
+            ['', ''],
+          ]),
+          selectionLabelMaps: { low: { en_US: 'Low' } },
+          selectionRowMapKeys: ['low', ''],
+        }),
+      },
+      { onSaved },
+    );
+    try {
+      await flushPromises();
+      m.click('[data-testid="stub-selection-translate"]');
+      await flushPromises();
+      m.click('[data-testid="stub-translate-save-selection"]');
+      await flushPromises();
+      const editorRows =
+        (lastSelectionProps?.modelValue as Array<{ value: string; label: string }> | undefined) || [];
+      const low = editorRows.find(r => r && r.value === 'low');
+      expect(low?.label).toBe('S-en');
+      m.click('[data-testid="choy-properties-definition-item-save"]');
+      await flushPromises();
+      expect(onSaved.calls.length).toBe(1);
+      const saved = onSaved.calls[0][0] as DefinitionEditorDraftItem;
+      expect(saved.selectionLabelMaps.low).toEqual({ en_US: 'S-en', zh_CN: 'S-zh' });
+      const rows = JSON.parse(String(saved.selectionText || '[]')) as Array<[string, string]>;
+      expect(rows.find(r => r[0] === 'low')?.[1]).toBe('S-en');
+    } finally {
+      m.unmount();
+    }
+  });
+
   test('readonly skips translate controls and selection mutate', async () => {
     const m = mountDialog({
       readonly: true,
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
index 7e87276b6..8e45b273d 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionItemDialog.vue
@@ -153,7 +153,7 @@ SPDX-License-Identifier: Apache-2.0
 import { computed, ref, watch } from 'vue';
 import { getActivePinia } from 'pinia';
 import { Languages } from 'lucide-vue-next';
-import { TRANSLATED_BASE_LANG } from '@/core/service/orm/model/properties_label_i18n';
+import { TRANSLATED_BASE_LANG, unwrapPropertyLabel } from '@/core/service/orm/model/properties_label_i18n';
 import { createTranslate } from '@/web/web/i18n';
 import { useI18nStore } from '@/web/web/stores/i18nStore';
 import { ChoyDialog, ChoyDialogContent, ChoyDialogTitle } from '@/web/web/components/layout/choyDialog';
@@ -304,13 +304,19 @@ function onTranslateSaved(next: Record<string, string>) {
     syncDraftLabelsForLang(item, editorLang());
   } else {
     // Keep in-progress rows (e.g. blank values) across the map→selectionText rebuild.
+    // Refresh the translated option's label so writeSelectionRowsToDraft does not
+    // merge the stale pending label over the just-saved map.
     const pendingRows = selectionRowsFromDraft(item);
     item.selectionLabelMaps = {
       ...item.selectionLabelMaps,
       [target.value]: { ...next },
     };
-    syncDraftLabelsForLang(item, editorLang());
-    writeSelectionRowsToDraft(item, pendingRows, editorLang());
+    const lang = editorLang();
+    const freshLabel = unwrapPropertyLabel(next, lang);
+    const restored = pendingRows.map(row =>
+      String(row.value || '').trim() === target.value ? { ...row, label: freshLabel } : row,
+    );
+    writeSelectionRowsToDraft(item, restored, lang);
   }
   translateTarget.value = null;
 }
diff --git a/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts b/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts
index 3ea100c48..da1469a9f 100644
--- a/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts
+++ b/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts
@@ -200,6 +200,48 @@ describe('ChoyPropertyLabelTranslationsDialog', () => {
     m.unmount();
   });
 
+  test('ignores stale loadRows from a previous opening', async () => {
+    let releaseFirst!: () => void;
+    const firstGate = new Promise<void>(resolve => {
+      releaseFirst = resolve;
+    });
+    let calls = 0;
+    getActiveLanguages.mockImplementation(async () => {
+      calls += 1;
+      if (calls === 1) await firstGate;
+      return DEFAULT_LANGS.map(r => ({ ...r }));
+    });
+
+    const m = mountApp(PropertyLabelTranslationsDialog as any, {
+      reactiveProps: true,
+      props: {
+        modelValue: true,
+        translations: { en_US: 'First' },
+        'onUpdate:modelValue': (v: boolean) => {
+          (m.props as any).modelValue = v;
+        },
+      },
+      plugins: [pinia],
+    });
+    await flushPromises();
+    expect(m.qa(INPUT_SEL).length).toBe(0);
+
+    (m.props as any).modelValue = false;
+    await nextTick();
+    await flushPromises();
+
+    (m.props as any).translations = { en_US: 'Second', zh_CN: '第二' };
+    (m.props as any).modelValue = true;
+    await flushPromises();
+    expect((m.qa(INPUT_SEL) as HTMLInputElement[])[0]?.value).toBe('Second');
+
+    releaseFirst();
+    await flushPromises();
+    expect((m.qa(INPUT_SEL) as HTMLInputElement[])[0]?.value).toBe('Second');
+    expect((m.qa(INPUT_SEL) as HTMLInputElement[])[1]?.value).toBe('第二');
+    m.unmount();
+  });
+
   test('Cancel closes; closed emit', async () => {
     const onUpdate = fnRecorder();
     const onClosed = fnRecorder();
diff --git a/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.vue b/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.vue
index 427ae3927..6993200f7 100644
--- a/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.vue
+++ b/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.vue
@@ -92,6 +92,8 @@ const dialogTitle = computed(() => {
 
 const loading = ref(false);
 const rows = ref<TranslationRow[]>([]);
+/** Bumped on each load / close so a late GetActiveLanguages cannot overwrite a newer open. */
+let loadGeneration = 0;
 
 function formatLanguageLabel(name: unknown, code: string): string {
   const display = String(name ?? '').trim();
@@ -99,6 +101,7 @@ function formatLanguageLabel(name: unknown, code: string): string {
 }
 
 async function loadRows() {
+  const gen = ++loadGeneration;
   loading.value = true;
   try {
     const current = props.translations && typeof props.translations === 'object' ? { ...props.translations } : {};
@@ -109,6 +112,7 @@ async function loadRows() {
     } catch {
       list = [];
     }
+    if (gen !== loadGeneration) return;
     const byCode = new Map<string, TranslationRow>();
     for (const lang of Array.isArray(list) ? list : []) {
       const code = String(lang?.Code || '').trim();
@@ -141,10 +145,11 @@ async function loadRows() {
     });
     rows.value = ordered;
   } catch (err: any) {
+    if (gen !== loadGeneration) return;
     ChoyMessage.error(String(err?.message || err || _t('Failed to load translations')));
     rows.value = [];
   } finally {
-    loading.value = false;
+    if (gen === loadGeneration) loading.value = false;
   }
 }
 
@@ -152,7 +157,13 @@ watch(
   () => props.modelValue,
   (open, wasOpen) => {
     if (open && !wasOpen) void loadRows();
-    if (!open && wasOpen) emit('closed');
+    if (!open && wasOpen) {
+      // Invalidate in-flight loads from this opening.
+      loadGeneration += 1;
+      rows.value = [];
+      loading.value = false;
+      emit('closed');
+    }
   },
   { immediate: true },
 );
diff --git a/modules/web/web/stores/fieldsGet.test.ts b/modules/web/web/stores/fieldsGet.test.ts
index c8228bc5a..1b10bc2ca 100644
--- a/modules/web/web/stores/fieldsGet.test.ts
+++ b/modules/web/web/stores/fieldsGet.test.ts
@@ -340,6 +340,16 @@ describe('createFieldsGetHelpers', () => {
     const slice = await first;
     expect(slice.Name?.string).toBe('名称');
     expect(FieldsGet.calls.length).toBe(1);
+    // Stale RPC must not land in the post-clear cache/overlay (bucket generation).
+    expect(helpers.getFieldsGetTranslatedString('Name')).toBeUndefined();
+
+    FieldsGet.mockImplementation(async () => ({
+      Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: '新' },
+    }));
+    const second = await helpers.ensureFieldsGet(['Name'], ['string']);
+    expect(FieldsGet.calls.length).toBe(2);
+    expect(second.Name?.string).toBe('新');
+    expect(helpers.getFieldsGetTranslatedString('Name')).toBe('新');
   });
 
   test('concurrent ensures with an exact cached key make no RPC', async () => {
diff --git a/modules/web/web/stores/fieldsGet.ts b/modules/web/web/stores/fieldsGet.ts
index 2b0290c91..709df40d4 100644
--- a/modules/web/web/stores/fieldsGet.ts
+++ b/modules/web/web/stores/fieldsGet.ts
@@ -123,6 +123,8 @@ type CoalesceBucket = {
   fieldSet: Set<string>;
   wantAll: boolean;
   waiters: CoalesceWaiter[];
+  /** cacheGeneration when the bucket was queued (invalidate writes after clear). */
+  generation: number;
   /** Shared promise for callers that join after flush started. */
   inflight?: Promise<Record<string, WebFieldMetadata>>;
 };
@@ -227,7 +229,9 @@ export function createFieldsGetHelpers(
 
     const rpcFields = bucket.wantAll ? undefined : [...bucket.fieldSet].sort();
     const rpcKey = buildCacheKey(lang, rpcFields, bucket.attributes);
-    const generationAtStart = cacheGeneration;
+    // Use the generation from queue time — a clear before this flush bumps
+    // cacheGeneration, and capturing here would treat the stale RPC as fresh.
+    const generationAtStart = bucket.generation;
 
     const resolveWaiters = (slice: Record<string, WebFieldMetadata>) => {
       for (const waiter of bucket.waiters) {
@@ -337,6 +341,7 @@ export function createFieldsGetHelpers(
         fieldSet: new Set<string>(),
         wantAll: false,
         waiters: [],
+        generation: cacheGeneration,
       };
       coalesceByLangAttrs.set(bucketKey, bucket);
       queueMicrotask(() => {

From 42cfa6f54a9dab079d63ef6bf4b653d83f1a7495 Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Thu, 29 Oct 2026 09:22:38 +0800
Subject: [PATCH 21/23] fix(web): invalidate stale definition edit dialogs and
 cover translate/FieldsGet edges

Close existing-row dialogs on external definition sync, block save when reorder moves the edited name, and add tests for empty-row save guards plus resolveWaiters throw settle.
---
 .../ChoyPropertiesDefinitionField.test.ts     | 71 +++++++++++++++++++
 .../field/ChoyPropertiesDefinitionField.vue   | 23 +++++-
 ...hoyPropertyLabelTranslationsDialog.test.ts | 27 ++++++-
 modules/web/web/stores/fieldsGet.test.ts      | 38 ++++++++++
 4 files changed, 156 insertions(+), 3 deletions(-)

diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts b/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
index e2d138d6f..43ae8ef4c 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionField.test.ts
@@ -440,6 +440,77 @@ describe('ChoyPropertiesDefinitionField', () => {
     }
   });
 
+  test('reorder while edit open blocks save when original name no longer matches', async () => {
+    const binding = makeBinding({
+      definition: [
+        { name: 'a', type: 'char', string: { en_US: 'A' } },
+        { name: 'b', type: 'char', string: { en_US: 'B' } },
+      ],
+      isEditMode: true,
+    });
+    const mounted = mountApp(ChoyPropertiesDefinitionField as any, {
+      props: { binding },
+    });
+    try {
+      await flushPromises();
+      const openBtns = mounted.el.querySelectorAll('[data-testid="choy-properties-definition-open"]');
+      (openBtns[0] as HTMLElement).click();
+      await nextTick();
+      expect(mounted.q('[data-testid="choy-properties-definition-item-dialog-stub"]')).toBeTruthy();
+      const state = mounted.setupState() as {
+        onReorder?: (rows: any[]) => void;
+        drafts?: any[];
+      };
+      const drafts = Array.isArray(state.drafts) ? state.drafts : [];
+      expect(drafts.length).toBe(2);
+      state.onReorder?.([drafts[1], drafts[0]]);
+      await nextTick();
+      await flushPromises();
+      mounted.click('[data-testid="stub-item-save"]');
+      await nextTick();
+      await flushPromises();
+      expect(mounted.q('[data-testid="choy-properties-definition-item-dialog-stub"]')).toBeTruthy();
+      expect(mounted.q('[data-testid="choy-properties-definition-write-error"]')?.textContent || '').toMatch(
+        /changed while editing/i,
+      );
+      expect((binding.__value.value as any[]).map((r: any) => r.name)).toEqual(['b', 'a']);
+    } finally {
+      mounted.unmount();
+    }
+  });
+
+  test('external definition change closes open edit dialog', async () => {
+    const binding = makeBinding({
+      definition: [
+        { name: 'a', type: 'char', string: { en_US: 'A' } },
+        { name: 'b', type: 'char', string: { en_US: 'B' } },
+      ],
+      isEditMode: true,
+    });
+    const mounted = mountApp(ChoyPropertiesDefinitionField as any, {
+      props: { binding },
+    });
+    try {
+      await flushPromises();
+      const openBtns = mounted.el.querySelectorAll('[data-testid="choy-properties-definition-open"]');
+      (openBtns[0] as HTMLElement).click();
+      await nextTick();
+      expect(mounted.q('[data-testid="choy-properties-definition-item-dialog-stub"]')).toBeTruthy();
+      binding.__value.value = [
+        { name: 'b', type: 'char', string: { en_US: 'B' } },
+        { name: 'a', type: 'char', string: { en_US: 'A' } },
+      ];
+      await nextTick();
+      await flushPromises();
+      expect(mounted.q('[data-testid="choy-properties-definition-item-dialog-stub"]')).toBeFalsy();
+      expect(mounted.q('[data-testid="choy-properties-definition-write-error"]')?.textContent || '').toMatch(
+        /changed while editing/i,
+      );
+    } finally {
+      mounted.unmount();
+    }
+  });
+
   test('commitDrafts failure keeps dialog open (onDialogSaved catch return)', async () => {
     // Invalid selection JSON → draftsToDefinitionItems throws inside commitDrafts.
     stubSfc(ChoyPropertiesDefinitionItemDialog as any, {
diff --git a/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue b/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
index 0077e74ff..e44937406 100644
--- a/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
+++ b/modules/web/web/components/field/ChoyPropertiesDefinitionField.vue
@@ -462,6 +462,8 @@ const dialogReadonly = ref(false);
 const dialogIndex = ref<number | null>(null);
 /** True when the open dialog is creating a new row (not editing by index). */
 const dialogIsNew = ref(false);
+/** Name of the row opened for edit; detects reorder while the dialog is open. */
+const dialogOriginalName = ref<string | null>(null);
 const dialogItem = ref<DefinitionEditorDraftItem | null>(null);
 
 /** Suppress draft re-sync while we write back from local drafts. */
@@ -480,9 +482,21 @@ function summaryText(raw: unknown): string {
 
 function syncDraftsFromRaw(raw: unknown) {
   const items = toView(raw);
+  // External field updates replace drafts; an open edit dialog's dialogIndex may
+  // then target a different row. Close it (new-item dialogs stay open).
+  const editWasInvalidated = dialogOpen.value && !dialogIsNew.value && !dialogReadonly.value;
+  if (editWasInvalidated) {
+    dialogOpen.value = false;
+    dialogIsNew.value = false;
+    dialogIndex.value = null;
+    dialogOriginalName.value = null;
+    dialogItem.value = null;
+  }
   previousItems.value = items;
   drafts.value = definitionItemsToDrafts(items, editorLang());
-  writeError.value = '';
+  writeError.value = editWasInvalidated
+    ? _t('This row was changed while editing; please reopen it.')
+    : '';
 }
 
 function commitDrafts(next: DefinitionEditorDraftItem[]) {
@@ -517,6 +531,7 @@ function onAdd() {
   dialogReadonly.value = false;
   dialogIsNew.value = true;
   dialogIndex.value = null;
+  dialogOriginalName.value = null;
   dialogItem.value = emptyDraftItem();
   dialogOpen.value = true;
 }
@@ -546,6 +561,7 @@ function openRow(index: number, asReadonly: boolean) {
   dialogReadonly.value = asReadonly || !canMutate.value;
   dialogIsNew.value = false;
   dialogIndex.value = index;
+  dialogOriginalName.value = String(item.name || '');
   dialogItem.value = item;
   dialogOpen.value = true;
 }
@@ -562,6 +578,10 @@ function onDialogSaved(item: DefinitionEditorDraftItem) {
       writeError.value = _t('This row was changed while editing; please reopen it.');
       return;
     }
+    if (dialogOriginalName.value != null && next[index]?.name !== dialogOriginalName.value) {
+      writeError.value = _t('This row was changed while editing; please reopen it.');
+      return;
+    }
     next[index] = item;
   }
   try {
@@ -573,6 +593,7 @@ function onDialogSaved(item: DefinitionEditorDraftItem) {
   dialogOpen.value = false;
   dialogIsNew.value = false;
   dialogIndex.value = null;
+  dialogOriginalName.value = null;
   dialogItem.value = null;
 }
 
diff --git a/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts b/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts
index da1469a9f..ea6630a64 100644
--- a/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts
+++ b/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts
@@ -326,14 +326,37 @@ describe('ChoyPropertyLabelTranslationsDialog', () => {
       },
     );
     const onSaved = fnRecorder();
-    const m = mountDialog({ translations: badTranslations as any }, { onSaved });
+    const onUpdate = fnRecorder();
+    const m = mountDialog(
+      { translations: badTranslations as any },
+      { onSaved, 'onUpdate:modelValue': onUpdate },
+    );
     await flushPromises();
     expect(m.qa(INPUT_SEL).length).toBe(0);
     const saveBtn = m.q('[data-testid="choy-property-label-translations-save"]') as HTMLButtonElement | null;
     expect(saveBtn?.disabled).toBe(true);
-    m.click('[data-testid="choy-property-label-translations-save"]');
+    // Disabled button may not fire DOM click; exercise the empty-rows guard directly.
+    const ss = m.setupState() as { handleSave?: () => void };
+    ss.handleSave?.();
     await nextTick();
     expect(onSaved.calls.length).toBe(0);
+    expect(onUpdate.calls.some(args => args[0] === false)).toBeTruthy();
+    m.unmount();
+  });
+
+  test('save seeds empty en_US when rows omit the base language', async () => {
+    const onSaved = fnRecorder();
+    const m = mountDialog({ translations: { zh_CN: '你好' } }, { onSaved });
+    await flushPromises();
+    const ss = m.setupState() as {
+      rows?: { value: Array<{ code: string; label: string; value: string }> };
+      handleSave?: () => void;
+    };
+    // Force a rows list that has no en_US so handleSave's base-key seed runs.
+    ss.rows!.value = [{ code: 'zh_CN', label: 'Chinese', value: '你好' }];
+    ss.handleSave?.();
+    await nextTick();
+    expect(onSaved.calls[0]?.[0]).toEqual({ zh_CN: '你好', en_US: '' });
     m.unmount();
   });
 });
diff --git a/modules/web/web/stores/fieldsGet.test.ts b/modules/web/web/stores/fieldsGet.test.ts
index 1b10bc2ca..80fff1a59 100644
--- a/modules/web/web/stores/fieldsGet.test.ts
+++ b/modules/web/web/stores/fieldsGet.test.ts
@@ -438,6 +438,44 @@ describe('createFieldsGetHelpers', () => {
     expect(second.Ghost?.string).toBe('幽灵');
   });
 
+  test('resolveWaiters throw rejects coalesced waiters without treating it as RPC failure alone', async () => {
+    const FieldsGet = asyncFnRecorder(async () => {
+      // Non-enumerable so mergeOverlay's Object.entries succeeds; pickFieldSlice
+      // still sees the own key via hasOwnProperty and throws on access.
+      // Coalesce two waiters so rpcKey ≠ waiter.cacheKey (otherwise the full
+      // RPC slice is served from responseCache and pickFieldSlice is skipped).
+      const slice: Record<string, any> = {
+        Code: { id: '2', type: 'varchar', typeAnnotation: 'string', string: 'Code' },
+      };
+      Object.defineProperty(slice, 'Name', {
+        enumerable: false,
+        configurable: true,
+        get() {
+          throw new Error('slice boom');
+        },
+      });
+      return slice;
+    });
+    const helpers = createFieldsGetHelpers(
+      makeHost(
+        {
+          Name: { id: '1', type: 'varchar', typeAnnotation: 'string', string: 'Name' },
+          Code: { id: '2', type: 'varchar', typeAnnotation: 'string', string: 'Code' },
+        },
+        FieldsGet,
+      ),
+      { getLang: () => 'zh_CN' },
+    );
+    const settled = await Promise.allSettled([
+      helpers.ensureFieldsGet(['Name'], ['string']),
+      helpers.ensureFieldsGet(['Code'], ['string']),
+    ]);
+    expect(FieldsGet.calls.length).toBe(1);
+    const rejected = settled.filter(r => r.status === 'rejected') as PromiseRejectedResult[];
+    expect(rejected.length).toBeGreaterThan(0);
+    expect(rejected.some(r => String(r.reason?.message || '').includes('slice boom'))).toBe(true);
+  });
+
   test('reject path propagates FieldsGet failure to all coalesced waiters', async () => {
     const FieldsGet = asyncFnRecorder(async () => {
       throw new Error('fieldsget boom');

From 8553e5a82696921bb7122f8050177e5c889441f2 Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Thu, 29 Oct 2026 09:37:40 +0800
Subject: [PATCH 22/23] fix(web): skip list-handle drag image when reorder API
 is unavailable

Cancel dragstart when the handle API is missing or disabled so setListHandleDragImage does not run for a drag that never started; clarify help prop docs to match non-empty precedence.
---
 .../web/components/field/ChoyFieldBase.vue    |  2 +-
 .../web/components/field/ChoyVarcharField.vue |  2 +-
 .../table/ChoyTableColumn.handle.test.ts      | 42 ++++++++++++++++++-
 .../web/components/table/ChoyTableColumn.vue  |  7 +++-
 4 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/modules/web/web/components/field/ChoyFieldBase.vue b/modules/web/web/components/field/ChoyFieldBase.vue
index 408cd8f26..adca76a54 100644
--- a/modules/web/web/components/field/ChoyFieldBase.vue
+++ b/modules/web/web/components/field/ChoyFieldBase.vue
@@ -443,7 +443,7 @@ const props = withDefaults(
     binding: UseField<T, V>;
     label?: string;
     /**
-     * Explicit help tip (translated). When set, wins over FieldsGet / meta.help so
+     * Explicit help tip (translated). When non-empty, wins over FieldsGet / meta.help so
      * form views can guarantee form-help without waiting on FieldsGet overlay.
      */
     help?: string;
diff --git a/modules/web/web/components/field/ChoyVarcharField.vue b/modules/web/web/components/field/ChoyVarcharField.vue
index 0b91aec4c..3abff478a 100644
--- a/modules/web/web/components/field/ChoyVarcharField.vue
+++ b/modules/web/web/components/field/ChoyVarcharField.vue
@@ -109,7 +109,7 @@ const props = withDefaults(
     binding?: UseField<T, V>;
 
     label?: string;
-    /** Explicit help tip; preferred over FieldsGet / meta.help when set. */
+    /** Explicit help tip; preferred over FieldsGet / meta.help when non-empty. */
     help?: string;
     rules?: RuleItem[];
 
diff --git a/modules/web/web/components/table/ChoyTableColumn.handle.test.ts b/modules/web/web/components/table/ChoyTableColumn.handle.test.ts
index fb121f65e..8793991ca 100644
--- a/modules/web/web/components/table/ChoyTableColumn.handle.test.ts
+++ b/modules/web/web/components/table/ChoyTableColumn.handle.test.ts
@@ -134,12 +134,52 @@ describe('ChoyTableColumn handle type', () => {
     expect(cell.props.title).toBe('');
 
     const preventDefault = fnRecorder();
-    cell.props.onDragstart({ preventDefault, stopPropagation: fnRecorder(), dataTransfer: { setData: fnRecorder() } });
+    const setDragImage = fnRecorder();
+    cell.props.onDragstart({
+      preventDefault,
+      stopPropagation: fnRecorder(),
+      dataTransfer: { setData: fnRecorder(), setDragImage },
+    });
     expect(preventDefault.calls.length).toBeGreaterThan(0);
     expect(handleApi.draggingIndex.value).toBeNull();
+    expect(setDragImage.calls.length).toBe(0);
     unmount();
   });
 
+  test('skips drag image when handle reorder api is missing', async () => {
+    let registry: ColumnRegistry | null = null;
+    const Host = defineComponent({
+      setup() {
+        registry = useTableProvideColumnRegistry();
+        useTableProvideBuildContext({ getRows: () => [{ Id: '1' }], baseIndex: ref(1) });
+        // Intentionally do not provide LIST_HANDLE_API_KEY.
+        return () =>
+          h(ChoyTableColumn, {
+            type: 'handle',
+            colKey: '__handle__',
+            vColumnProps: { width: 36, align: 'center' },
+          });
+      },
+    });
+    const mounted = mountApp(Host);
+    await nextTick();
+    await flushPromises();
+    const col = registry!.columns.value[0] as any;
+    const cell = col.cellRenderer({ rowData: { Id: '1' }, rowIndex: 0 });
+    expect(cell.props.draggable).toBe('false');
+    const preventDefault = fnRecorder();
+    const setDragImage = fnRecorder();
+    cell.props.onDragstart({
+      preventDefault,
+      stopPropagation: fnRecorder(),
+      currentTarget: document.createElement('span'),
+      dataTransfer: { setData: fnRecorder(), setDragImage },
+    });
+    expect(preventDefault.calls.length).toBeGreaterThan(0);
+    expect(setDragImage.calls.length).toBe(0);
+    mounted.unmount();
+  });
+
   test('skips re-registration when the column signature is unchanged', async () => {
     let registry: ColumnRegistry | null = null;
     let columnVm: any = null;
diff --git a/modules/web/web/components/table/ChoyTableColumn.vue b/modules/web/web/components/table/ChoyTableColumn.vue
index cbd82b986..4ea10362d 100644
--- a/modules/web/web/components/table/ChoyTableColumn.vue
+++ b/modules/web/web/components/table/ChoyTableColumn.vue
@@ -313,7 +313,12 @@ function buildColumn(): Column {
             title: disabled ? '' : 'Drag to reorder',
             onDragstart: (e: DragEvent) => {
               e.stopPropagation();
-              api?.onDragStart(rowIndex, e);
+              // No API / disabled: cancel the drag; do not set a drag image.
+              if (!api?.enabled?.value) {
+                e.preventDefault();
+                return;
+              }
+              api.onDragStart(rowIndex, e);
               setListHandleDragImage(e);
             },
             onDragover: (e: DragEvent) => {

From 6226b3ebb942df1712ff3fe17ed02d35a223138b Mon Sep 17 00:00:00 2001
From: Brian Wang <wangbuke@gmail.com>
Date: Thu, 29 Oct 2026 09:49:02 +0800
Subject: [PATCH 23/23] fix(web): clarify handle drag API guard and cover en_US
 save seed

Make the missing/disabled reorder-API check explicit before onDragStart, and mutate live translation rows so the empty base-lang seed path is actually exercised.
---
 .../ChoyPropertyLabelTranslationsDialog.test.ts      | 12 +++++++++---
 modules/web/web/components/table/ChoyTableColumn.vue |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts b/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts
index ea6630a64..2e3ec9b2a 100644
--- a/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts
+++ b/modules/web/web/components/field/ChoyPropertyLabelTranslationsDialog.test.ts
@@ -349,11 +349,17 @@ describe('ChoyPropertyLabelTranslationsDialog', () => {
     const m = mountDialog({ translations: { zh_CN: '你好' } }, { onSaved });
     await flushPromises();
     const ss = m.setupState() as {
-      rows?: { value: Array<{ code: string; label: string; value: string }> };
+      rows?: Array<{ code: string; label: string; value: string }> | { value: Array<{ code: string; label: string; value: string }> };
       handleSave?: () => void;
     };
-    // Force a rows list that has no en_US so handleSave's base-key seed runs.
-    ss.rows!.value = [{ code: 'zh_CN', label: 'Chinese', value: '你好' }];
+    // Mutate the live rows array (ref may be unwrapped on setupState).
+    const rows = Array.isArray((ss.rows as { value?: unknown } | undefined)?.value)
+      ? (ss.rows as { value: Array<{ code: string; label: string; value: string }> }).value
+      : (ss.rows as Array<{ code: string; label: string; value: string }>);
+    const baseIdx = rows.findIndex(r => r.code === 'en_US');
+    expect(baseIdx).toBeGreaterThanOrEqual(0);
+    rows.splice(baseIdx, 1);
+    expect(rows.some(r => r.code === 'en_US')).toBe(false);
     ss.handleSave?.();
     await nextTick();
     expect(onSaved.calls[0]?.[0]).toEqual({ zh_CN: '你好', en_US: '' });
diff --git a/modules/web/web/components/table/ChoyTableColumn.vue b/modules/web/web/components/table/ChoyTableColumn.vue
index 4ea10362d..7cb094414 100644
--- a/modules/web/web/components/table/ChoyTableColumn.vue
+++ b/modules/web/web/components/table/ChoyTableColumn.vue
@@ -314,7 +314,7 @@ function buildColumn(): Column {
             onDragstart: (e: DragEvent) => {
               e.stopPropagation();
               // No API / disabled: cancel the drag; do not set a drag image.
-              if (!api?.enabled?.value) {
+              if (!api || !api.enabled.value) {
                 e.preventDefault();
                 return;
               }