Merge branch 'fix/table-heade-crash' into 'release/0.9.0'

fix: 导入的组件默认怎么变量绑定



See merge request !919824
This commit is contained in:
康为 2020-08-04 17:06:22 +08:00
commit 410eaf0403

View File

@ -16,8 +16,9 @@ class SettingFieldView extends Component<{ field: SettingField }> {
render() { render() {
const { field } = this.props; const { field } = this.props;
const { extraProps } = field; const { extraProps, componentMeta } = field;
const { condition, defaultValue, display } = extraProps; const { condition, defaultValue, display } = extraProps;
const { prototype } = componentMeta;
let visible; let visible;
try { try {
visible = field.isSingle && typeof condition === 'function' ? condition(field) !== false : true; visible = field.isSingle && typeof condition === 'function' ? condition(field) !== false : true;
@ -33,6 +34,8 @@ class SettingFieldView extends Component<{ field: SettingField }> {
let setterProps: any = {}; let setterProps: any = {};
let setterType: any; let setterType: any;
let initialValue: any = null; let initialValue: any = null;
const isReactComponent = prototype === null || prototype === undefined;
console.log(111, this.props);
if (Array.isArray(setter)) { if (Array.isArray(setter)) {
setterType = 'MixedSetter'; setterType = 'MixedSetter';
setterProps = { setterProps = {
@ -49,12 +52,13 @@ class SettingFieldView extends Component<{ field: SettingField }> {
if (setter.initialValue != null) { if (setter.initialValue != null) {
initialValue = setter.initialValue; initialValue = setter.initialValue;
} }
} else if (setter) { } else if (isReactComponent) {
// 默认配置上变量绑定功能
setterType = 'MixedSetter'; setterType = 'MixedSetter';
setterProps = { setterProps = {
setters: [setter, 'VariableSetter'], setters: [setter, 'VariableSetter'],
}; };
} else if (setter) {
setterType = setter;
} }
let value = null; let value = null;