mandarina-antd 2.5.6 → 2.5.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -123,7 +123,7 @@ var CustomAuto = /** @class */ (function (_super) {
|
|
|
123
123
|
}
|
|
124
124
|
//this.props properties applied directly on AutoField
|
|
125
125
|
//props has a field property with values in the schema
|
|
126
|
-
var mergeProps = __assign(__assign({},
|
|
126
|
+
var mergeProps = __assign(__assign({}, props.field.form.props), this.props);
|
|
127
127
|
if (mergeProps.col === false)
|
|
128
128
|
return (0, react_1.createElement)(props.component, mergeProps);
|
|
129
129
|
var col = typeof mergeProps.col !== 'object' ? { span: mergeProps.col || 24 } : mergeProps.col ? __assign({}, mergeProps.col) : { span: 24 };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AutoField.js","sourceRoot":"","sources":["../../src/uniforms/AutoField.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA2C;AAC3C,6BAAyB;AACzB,iEAA2C;AAC3C,oEAA8C;AAC9C,sEAAgD;AAChD,sEAAgD;AAChD,sEAAgD;AAChD,0EAAoD;AACpD,wEAAkD;AAClD,0DAAoC;AACpC,0DAAoC;AACpC,4DAAsC;AACtC,wDAAiC;AACjC,uCAAiC;AACjC,0EAAoD;AACpD,2EAAqD;AAErD,wBAAc,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"AutoField.js","sourceRoot":"","sources":["../../src/uniforms/AutoField.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -15,7 +15,7 @@ import {Integer} from 'mandarina'
|
|
|
15
15
|
import HiddenField from "uniforms-antd/HiddenField";
|
|
16
16
|
import filterDOMProps from "uniforms/filterDOMProps";
|
|
17
17
|
|
|
18
|
-
filterDOMProps.register('col', 'loading',
|
|
18
|
+
filterDOMProps.register('col', 'loading', 'minCount', 'maxCount', 'fields', 'submitting', 'validating', 'fieldDefinition')
|
|
19
19
|
|
|
20
20
|
|
|
21
21
|
class CustomAuto extends BaseField {
|
|
@@ -70,13 +70,13 @@ class CustomAuto extends BaseField {
|
|
|
70
70
|
}
|
|
71
71
|
//this.props properties applied directly on AutoField
|
|
72
72
|
//props has a field property with values in the schema
|
|
73
|
-
const mergeProps={...
|
|
73
|
+
const mergeProps = {...props.field.form.props, ...this.props}
|
|
74
74
|
if (mergeProps.col === false) return createElement(props.component, mergeProps)
|
|
75
|
-
let col=typeof mergeProps.col !== 'object'? {span: mergeProps.col || 24
|
|
75
|
+
let col = typeof mergeProps.col !== 'object' ? {span: mergeProps.col || 24} : mergeProps.col ? {...mergeProps.col} : {span: 24}
|
|
76
76
|
return (
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
77
|
+
<Col {...col} data-id={mergeProps.name}>
|
|
78
|
+
{createElement(props.component, mergeProps)}
|
|
79
|
+
</Col>
|
|
80
80
|
)
|
|
81
81
|
}
|
|
82
82
|
};
|