|
1 | | -import { get } from 'lodash'; |
| 1 | +import { get, merge } from 'lodash'; |
2 | 2 |
|
3 | 3 | const vfjsUiGetters = { |
4 | 4 | getVfjsFields(fields = []) { |
@@ -61,23 +61,24 @@ const vfjsUiGetters = { |
61 | 61 | .map((v, i) => this.vfjsHelperChildArrayReducerMapper(model, children, i)) |
62 | 62 | .map(this.getVfjsUiFieldsActive); |
63 | 63 | }, |
64 | | - getVfjsUiField({ children = [], model, ...field }) { |
65 | | - if (this.getVfjsUiFieldVisible({ ...field, model })) { |
66 | | - const isArray = this.vfjsHelperFieldIsArray(model); |
67 | | - const required = this.vfjsHelperFieldIsRequired(model); |
| 64 | + getVfjsUiField(field) { |
| 65 | + if (this.getVfjsUiFieldVisible(field)) { |
| 66 | + const isArray = this.vfjsHelperFieldIsArray(field.model); |
| 67 | + const required = this.vfjsHelperFieldIsRequired(field.model); |
| 68 | + |
| 69 | + const dynamicProperties = this.vfjsHelperFieldDynamicProperties(field); |
| 70 | + const { children = [], ...fieldProperties } = merge({}, field, dynamicProperties); |
68 | 71 |
|
69 | 72 | if (isArray) { |
70 | 73 | return { |
71 | | - ...field, |
72 | | - model, |
| 74 | + ...fieldProperties, |
73 | 75 | required, |
74 | | - children: this.getVfjsUiFieldArrayChildrenActive(model, children), |
| 76 | + children: this.getVfjsUiFieldArrayChildrenActive(field.model, children), |
75 | 77 | }; |
76 | 78 | } |
77 | 79 |
|
78 | 80 | return { |
79 | | - ...field, |
80 | | - model, |
| 81 | + ...fieldProperties, |
81 | 82 | required, |
82 | 83 | children: this.getVfjsUiFieldsActive(children), |
83 | 84 | }; |
|
0 commit comments