feat: 扩展通过 name/prop 来设置 id 的写法

src/util/transform-content.js

@@ -10,6 +10,7 @@ export default function transformContent(content) {
       item.items = transformContent(item.items)
     } else {
       removeDollarInKey(item)
+      setItemId(item)
       extractRulesFromComponent(item)
       // 有些旧写法是 checkboxGroup & radioGroup
       item.type = _kebabcase(item.type)
@@ -19,13 +20,19 @@ export default function transformContent(content) {
   })
 }
 
+// 兼容旧写法：$id、$name
 function removeDollarInKey(item) {
   Object.keys(item)
-    .filter(k => k.startsWith('$'))
-    .filter(k => !(k.slice(1) in item))
+    .filter(k => k.startsWith('$') && !(k.slice(1) in item))
     .forEach(k => ((item[k.slice(1)] = item[k]), delete item[k]))
 }
 
+function setItemId(item) {
+  if (item.id) return
+  // name 是符合表单项直觉的命名； prop 是为了与 element 的 table 的 columns 匹配
+  item.id = item.name || item.prop
+}
+
 export function extractRulesFromComponent(item) {
   if (item.overrideRules) return
   const {component} = item

test/transform-content.test.js

@@ -232,6 +232,13 @@ const expectContent = [
   },
 ]
 
+const hasId = [{id: 'id'}]
+const hasName = [{name: 'id'}]
+const hasProp = [{prop: 'id'}]
+
 test('transform content', () => {
   expect(transformContent(oldContent)).toEqual(expectContent)
+
+  expect(transformContent(hasName)[0].id).toBe(hasId[0].id)
+  expect(transformContent(hasProp)[0].id).toBe(hasId[0].id)
 })