fix(anyof): 新值为object类型直接覆盖

fix #77
lljj-x · Sep 21, 2021 · d2f9791 · d2f9791
1 parent 85d9545
commit d2f9791
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/packages/lib/vue2/vue2-core/src/fields/combiningSchemas/SelectLinkageField/index.js b/packages/lib/vue2/vue2-core/src/fields/combiningSchemas/SelectLinkageField/index.js
@@ -143,7 +143,14 @@ export default {
             // 设置新值
             if (isObject(newOptionData)) {
                 Object.entries(newOptionData).forEach(([key, value]) => {
-                    if (value !== undefined && (curFormData[key] === undefined || this.selectList[newVal].properties[key].const !== undefined)) {
+                    if (
+                        value !== undefined
+                        && (
+                            curFormData[key] === undefined
+                            || this.selectList[newVal].properties[key].const !== undefined
+                            || isObject(value)
+                        )
+                    ) {
                         // 这里没找到一个比较合理的新旧值合并方式
                         //
                         // 1. 如果anyOf里面同名属性中的schema包含了 const 配置，产生了新的值这里做覆盖处理

diff --git a/packages/lib/vue3/vue3-core/src/fields/combiningSchemas/SelectLinkageField/index.js b/packages/lib/vue3/vue3-core/src/fields/combiningSchemas/SelectLinkageField/index.js
@@ -135,7 +135,14 @@ export default {
             // 设置新值
             if (isObject(newOptionData)) {
                 Object.entries(newOptionData).forEach(([key, value]) => {
-                    if (value !== undefined && (curFormData[key] === undefined || props.selectList[newVal].properties[key].const !== undefined)) {
+                    if (
+                        value !== undefined
+                        && (
+                            curFormData[key] === undefined
+                            || props.selectList[newVal].properties[key].const !== undefined
+                            || isObject(value)
+                        )
+                    ) {
                         // 这里没找到一个比较合理的新旧值合并方式
                         //
                         // 1. 如果anyOf里面同名属性中的schema包含了 const 配置，产生了新的值这里做覆盖处理