Skip to content

Commit 5cf6f90

Browse files
authored
Merge pull request #249 from lljj-x/fix/issues-247
fix(lib): 修复 anyOf 下schema没有重新resolve
2 parents 46d18c9 + 4678bb0 commit 5cf6f90

File tree

2 files changed

+15
-2
lines changed
  • packages/lib
    • vue2/vue2-core/src/fields/combiningSchemas/SelectLinkageField
    • vue3/vue3-core/src/fields/combiningSchemas/SelectLinkageField

2 files changed

+15
-2
lines changed

packages/lib/vue2/vue2-core/src/fields/combiningSchemas/SelectLinkageField/index.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,14 @@ export default {
147147
value !== undefined
148148
&& (
149149
curFormData[key] === undefined
150-
|| this.selectList[newVal].properties[key].const !== undefined
151150
|| isObject(value)
151+
|| ((() => {
152+
const newSelectSchema = retrieveSchema(
153+
this.selectList[newVal],
154+
this.rootSchema
155+
);
156+
return newSelectSchema.properties[key]?.const !== undefined;
157+
})())
152158
)
153159
) {
154160
// 这里没找到一个比较合理的新旧值合并方式

packages/lib/vue3/vue3-core/src/fields/combiningSchemas/SelectLinkageField/index.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,15 @@ export default {
141141
value !== undefined
142142
&& (
143143
curFormData[key] === undefined
144-
|| props.selectList[newVal].properties[key].const !== undefined
145144
|| isObject(value)
145+
|| ((() => {
146+
const newSelectSchema = retrieveSchema(
147+
props.selectList[newVal],
148+
props.rootSchema
149+
);
150+
151+
return newSelectSchema.properties[key]?.const !== undefined;
152+
})())
146153
)
147154
) {
148155
// 这里没找到一个比较合理的新旧值合并方式

0 commit comments

Comments
 (0)