@@ -214,18 +213,16 @@ class SchemaArray extends PureComponent {
}
}
-SchemaArray.contextTypes = {
- getOpenValue: PropTypes.func,
- Model: PropTypes.object,
- isMock: PropTypes.bool
-};
+const SchemaArray = connect(({ open }) => { return { open }}, {
+ changeEditorSchema, changeType, addChildField, changeValue, requireAll,
+ setOpenValue, changeName, deleteItem, enableRequire, addField
+})(SchemaArrayComponent);
-class SchemaItem extends PureComponent {
+class SchemaItemComponent extends PureComponent {
constructor(props, context) {
super(props);
this._tagPaddingLeftStyle = {};
// this.num = 0
- this.Model = context.Model.schema;
}
componentWillMount() {
@@ -249,7 +246,7 @@ class SchemaItem extends PureComponent {
return message.error(`The field "${value}" already exists.`);
}
- this.Model.changeNameAction({ value, prefix, name });
+ this.props.changeName({ keys: prefix, name, value });
};
// 修改备注信息
@@ -257,7 +254,7 @@ class SchemaItem extends PureComponent {
let prefix = this.getPrefix();
let key = [].concat(prefix, 'description');
let value = e.target.value;
- this.Model.changeValueAction({ key, value });
+ this.props.changeValue({ key, value });
};
// 修改mock 信息
@@ -265,29 +262,28 @@ class SchemaItem extends PureComponent {
let prefix = this.getPrefix();
let key = [].concat(prefix, `mock`);
let value = e ? { mock: e } : '';
- this.Model.changeValueAction({ key, value });
+ this.props.changeValue({ key, value });
};
handleChangeTitle = e => {
let prefix = this.getPrefix();
let key = [].concat(prefix, `title`);
let value = e.target.value;
- this.Model.changeValueAction({ key, value });
+ this.props.changeValue({ key, value });
}
// 修改数据类型
handleChangeType = e => {
let prefix = this.getPrefix();
- let key = [].concat(prefix, 'type');
- this.Model.changeTypeAction({ key, value: e });
+ let keys = [].concat(prefix, 'type');
+ this.props.changeType({ keys, value: e });
};
- // 删除节点
handleDeleteItem = () => {
const { prefix, name } = this.props;
let nameArray = this.getPrefix();
- this.Model.deleteItemAction({ key: nameArray });
- this.Model.enableRequireAction({ prefix, name, required: false });
+ this.props.deleteItem({ keys: nameArray });
+ this.props.enableRequire({ keys: prefix, name, required: false });
};
/*
展示备注编辑弹窗
@@ -300,7 +296,6 @@ class SchemaItem extends PureComponent {
showEdit(this.getPrefix(), editorName, data.properties[name][editorName], type);
};
- // 展示高级设置弹窗
handleShowAdv = () => {
const { data, name, showAdv } = this.props;
showAdv(this.getPrefix(), data.properties[name]);
@@ -309,7 +304,7 @@ class SchemaItem extends PureComponent {
// 增加子节点
handleAddField = () => {
const { prefix, name } = this.props;
- this.Model.addFieldAction({ prefix, name });
+ this.props.addField({ keys: prefix, name });
};
// 控制三角形按钮
@@ -317,26 +312,22 @@ class SchemaItem extends PureComponent {
let prefix = this.getPrefix();
// 数据存储在 properties.xxx.properties 下
let keyArr = [].concat(prefix, 'properties');
- this.Model.setOpenValueAction({ key: keyArr });
+ this.props.setOpenValue({ key: keyArr });
};
// 修改是否必须
handleEnableRequire = e => {
const { prefix, name } = this.props;
let required = e.target.checked;
- // this.enableRequire(this.props.prefix, this.props.name, e.target.checked);
- this.Model.enableRequireAction({ prefix, name, required });
+ this.props.enableRequire({ keys: prefix, name, required });
};
render() {
- let { name, data, prefix, showEdit, showAdv } = this.props;
+ let { name, data, prefix, open, showEdit, showAdv } = this.props;
let value = data.properties[name];
let prefixArray = [].concat(prefix, name);
-
- let prefixStr = prefix.join(JSONPATH_JOIN_CHAR);
- let prefixArrayStr = [].concat(prefixArray, 'properties').join(JSONPATH_JOIN_CHAR);
- let show = this.context.getOpenValue([prefixStr]);
- let showIcon = this.context.getOpenValue([prefixArrayStr]);
+ let show = _.get(open, prefix);
+ let showIcon = _.get(open, [].concat(prefix, name, 'properties'));
return show ? (
@@ -396,15 +387,6 @@ class SchemaItem extends PureComponent {
{this.context.isMock && (
- {/* this.handleShowEdit('mock', value.type)} />
- }
- placeholder={LocaleProvider('mock')}
- value={value.mock ? value.mock.mock : ''}
- onChange={this.handleChangeMock}
- disabled={value.type === 'object' || value.type === 'array'}
- /> */}
this.handleShowEdit('mock', value.type)}
@@ -458,62 +440,55 @@ class SchemaItem extends PureComponent {
}
}
-SchemaItem.contextTypes = {
- getOpenValue: PropTypes.func,
- Model: PropTypes.object,
+SchemaItemComponent.contextTypes = {
isMock: PropTypes.bool
};
-class SchemaObjectComponent extends Component {
- shouldComponentUpdate(nextProps) {
- if (
- _.isEqual(nextProps.data, this.props.data) &&
- _.isEqual(nextProps.prefix, this.props.prefix) &&
- _.isEqual(nextProps.open, this.props.open)
- ) {
- return false;
- }
- return true;
- }
+const SchemaItem = connect(({ open }) => { return { open }}, {
+ changeEditorSchema, changeType, addChildField, changeValue, requireAll,
+ setOpenValue, changeName, deleteItem, enableRequire, addField
+})(SchemaItemComponent);
+class SchemaObjectComponent extends Component {
render() {
const { data, prefix, showEdit, showAdv } = this.props;
return (
- {Object.keys(data.properties).map((name, index) => (
-
- ))}
+ {Object.keys(data.properties).map((name, index) => {
+ return (
+
+ );
+ })}
);
}
}
-const SchemaObject = connect(state => ({
- open: state.schema.open
-}))(SchemaObjectComponent);
+const SchemaObject = connect(
+ ({ schema }) => {return { schema }}
+)(SchemaObjectComponent);
-const DropPlus = (props, context) => {
- const { prefix, name, add } = props;
- const Model = context.Model.schema;
+const DropPlusComponent = (props, context) => {
+ const { prefix, name, addField, setOpenValue, addChildField} = props;
const menu = (