Skip to content

Commit 9553035

Browse files
author
苏文雄
committed
feat: add title input
1 parent 9d4497f commit 9553035

File tree

9 files changed

+66
-17
lines changed

9 files changed

+66
-17
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ npm-debug.log*
77
pids
88
*.pid
99
*.seed
10+
prd_sourcemap
1011

1112
# Directory for instrumented libs generated by jscoverage/JSCover
1213
lib-cov

‎package.json

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"license": "MIC",
77
"scripts": {
88
"start": "ykit s -p 8082",
9+
"demo": "NODE_ENV=production ykit pack -m",
910
"build": "webpack"
1011
},
1112
"dependencies": {

‎package/App.js

+19-4
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class jsonSchema extends React.Component {
9999
if (!data) {
100100
data = `{
101101
"type": "object",
102-
"title": "empty object",
102+
"title": "title",
103103
"properties":{}
104104
}`;
105105
}
@@ -372,7 +372,7 @@ class jsonSchema extends React.Component {
372372
)}
373373
<Col span={this.props.showEditor ? 16 : 24} className="wrapper object-style">
374374
<Row type="flex" align="middle">
375-
<Col span={this.props.isMock ? 10 : 12} className="col-item name-item col-item-name">
375+
<Col span={8} className="col-item name-item col-item-name">
376376
<Row type="flex" justify="space-around" align="middle">
377377
<Col span={2} className="down-style-col">
378378
{schema.type === 'object' ? (
@@ -402,7 +402,7 @@ class jsonSchema extends React.Component {
402402
</Col>
403403
</Row>
404404
</Col>
405-
<Col span={4} className="col-item col-item-type">
405+
<Col span={3} className="col-item col-item-type">
406406
<Select
407407
className="type-select-style"
408408
onChange={e => this.changeType(`type`, e)}
@@ -426,6 +426,21 @@ class jsonSchema extends React.Component {
426426
/>
427427
</Col>
428428
)}
429+
<Col span={this.props.isMock ? 4 : 5} className="col-item col-item-mock">
430+
<Input
431+
addonAfter={
432+
<Icon
433+
type="edit"
434+
onClick={() =>
435+
this.showEdit([], 'title', this.props.schema.title)
436+
}
437+
/>
438+
}
439+
placeholder={'Title'}
440+
value={this.props.schema.title}
441+
onChange={e => this.changeValue(['title'], e.target.value)}
442+
/>
443+
</Col>
429444
<Col span={this.props.isMock ? 4 : 5} className="col-item col-item-desc">
430445
<Input
431446
addonAfter={
@@ -441,7 +456,7 @@ class jsonSchema extends React.Component {
441456
onChange={e => this.changeValue(['description'], e.target.value)}
442457
/>
443458
</Col>
444-
<Col span={3} className="col-item col-item-setting">
459+
<Col span={2} className="col-item col-item-setting">
445460
<span className="adv-set" onClick={() => this.showAdv([], this.props.schema)}>
446461
<Tooltip placement="top" title={LocalProvider('adv_setting')}>
447462
<Icon type="setting" />

‎package/components/LocalProvider/index.js

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import React from 'react';
33

44
const langs = {
55
en_US: {
6+
'title': 'Title',
67
'import_json': 'Import JSON',
78
'base_setting': 'Base Setting',
89
'all_setting': 'Sourec Code',
@@ -37,6 +38,7 @@ const langs = {
3738
'mockLink': 'Help'
3839
},
3940
zh_CN: {
41+
'title': '标题',
4042
'import_json': '导入 json',
4143
'base_setting': '基础设置',
4244
'all_setting': '编辑源码',

‎package/components/SchemaComponents/SchemaJson.js

+36-6
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,13 @@ class SchemaArray extends PureComponent {
8585
this.Model.changeValueAction({ key, value });
8686
};
8787

88+
handleChangeTitle = e =>{
89+
let prefix = this.getPrefix();
90+
let key = [].concat(prefix, `title`);
91+
let value = e.target.value;
92+
this.Model.changeValueAction({ key, value });
93+
}
94+
8895
// 增加子节点
8996
handleAddChildField = () => {
9097
let prefix = this.getPrefix();
@@ -121,7 +128,7 @@ class SchemaArray extends PureComponent {
121128
<div className="array-type">
122129
<Row className="array-item-type" type="flex" justify="space-around" align="middle">
123130
<Col
124-
span={this.context.isMock ? 10 : 12}
131+
span={8}
125132
className="col-item name-item col-item-name"
126133
style={this.__tagPaddingLeftStyle}
127134
>
@@ -142,7 +149,7 @@ class SchemaArray extends PureComponent {
142149
</Col>
143150
</Row>
144151
</Col>
145-
<Col span={4} className="col-item col-item-type">
152+
<Col span={3} className="col-item col-item-type">
146153
<Select
147154
name="itemtype"
148155
className="type-select-style"
@@ -168,6 +175,14 @@ class SchemaArray extends PureComponent {
168175
/>
169176
</Col>
170177
)}
178+
<Col span={this.context.isMock ? 4 : 5} className="col-item col-item-mock">
179+
<Input
180+
addonAfter={<Icon type="edit" onClick={() => this.handleShowEdit('title')} />}
181+
placeholder={LocaleProvider('title')}
182+
value={value.title}
183+
onChange={this.handleChangeTitle}
184+
/>
185+
</Col>
171186
<Col span={this.context.isMock ? 4 : 5} className="col-item col-item-desc">
172187
<Input
173188
addonAfter={<Icon type="edit" onClick={() => this.handleShowEdit('description')} />}
@@ -176,7 +191,7 @@ class SchemaArray extends PureComponent {
176191
onChange={this.handleChangeDesc}
177192
/>
178193
</Col>
179-
<Col span={3} className="col-item col-item-setting">
194+
<Col span={this.context.isMock ? 2: 3} className="col-item col-item-setting">
180195
<span className="adv-set" onClick={this.handleShowAdv}>
181196
<Tooltip placement="top" title={LocaleProvider('adv_setting')}>
182197
<Icon type="setting" />
@@ -253,6 +268,13 @@ class SchemaItem extends PureComponent {
253268
this.Model.changeValueAction({ key, value });
254269
};
255270

271+
handleChangeTitle = e => {
272+
let prefix = this.getPrefix();
273+
let key = [].concat(prefix, `title`);
274+
let value = e.target.value;
275+
this.Model.changeValueAction({ key, value });
276+
}
277+
256278
// 修改数据类型
257279
handleChangeType = e => {
258280
let prefix = this.getPrefix();
@@ -319,7 +341,7 @@ class SchemaItem extends PureComponent {
319341
<div>
320342
<Row type="flex" justify="space-around" align="middle">
321343
<Col
322-
span={this.context.isMock ? 10 : 12}
344+
span={8}
323345
className="col-item name-item col-item-name"
324346
style={this.__tagPaddingLeftStyle}
325347
>
@@ -355,7 +377,7 @@ class SchemaItem extends PureComponent {
355377
</Col>
356378

357379

358-
<Col span={4} className="col-item col-item-type">
380+
<Col span={3} className="col-item col-item-type">
359381
<Select
360382
className="type-select-style"
361383
onChange={this.handleChangeType}
@@ -391,6 +413,14 @@ class SchemaItem extends PureComponent {
391413
</Col>
392414
)}
393415

416+
<Col span={this.context.isMock ? 4 : 5} className="col-item col-item-mock">
417+
<Input
418+
addonAfter={<Icon type="edit" onClick={() => this.handleShowEdit('title')} />}
419+
placeholder={LocaleProvider('title')}
420+
value={value.title}
421+
onChange={this.handleChangeTitle}
422+
/>
423+
</Col>
394424

395425
<Col span={this.context.isMock ? 4 : 5} className="col-item col-item-desc">
396426
<Input
@@ -402,7 +432,7 @@ class SchemaItem extends PureComponent {
402432
</Col>
403433

404434

405-
<Col span={3} className="col-item col-item-setting">
435+
<Col span={this.context.isMock ? 2: 3} className="col-item col-item-setting">
406436
<span className="adv-set" onClick={this.handleShowAdv}>
407437
<Tooltip placement="top" title={LocaleProvider('adv_setting')}>
408438
<Icon type="setting" />

‎package/components/SchemaComponents/schemaJson.css

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636

3737
.json-schema-react-editor .col-item-mock{
3838
text-align: center;
39-
padding-right: 16px;
39+
padding-right: 6px;
4040
}
4141

4242
.json-schema-react-editor .col-item-setting{
43-
padding-left: 16px;
43+
padding-left: 6px;
4444
cursor: pointer;
4545
}
4646

@@ -96,7 +96,7 @@
9696
}
9797

9898
.json-schema-react-editor .type-select-style {
99-
width: 80%
99+
width: 90%
100100
}
101101

102102
.json-schema-react-editor-import-modal .ant-tabs-nav .ant-tabs-tab{

‎prd/src/index.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎prd/src/index.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ render(
5151

5252
<JEditor1
5353
showEditor={true}
54-
isMock={true}
54+
isMock={false}
5555
data={''}
5656
onChange={e => {
5757
console.log('changeValue', e);

0 commit comments

Comments
 (0)