Skip to content

Commit 06d3c07

Browse files
committed
[dev] update suite
1 parent 05a1372 commit 06d3c07

20 files changed

+173
-98
lines changed

src/dataview/DataviewEvents.js

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,33 @@ class DataviewEvents extends Component {
2424
template: template,
2525
itemsInRow: 4,
2626
gap: 10,
27+
multiselection: true,
28+
dragMode: "both",
2729
});
2830
this.dataview && this.dataview.data.load(`${process.env.PUBLIC_URL}/static/dataview.json`);
2931

30-
this.dataview.events.on("click", id => this.setState({ event: "click", id: id }));
31-
this.dataview.events.on("focuschange", id => this.setState({ event: "focuschange", id: id }));
32-
this.dataview.events.on("doubleclick", id => this.setState({ event: "doubleclick", id: id }));
32+
this.dataview.events.on("click", id => this.setState({ event: "click", id }));
33+
this.dataview.events.on("doubleclick", id => this.setState({ event: "doubleclick", id }));
34+
this.dataview.events.on("focuschange", id => this.setState({ event: "focuschange", id }));
35+
this.dataview.events.on("beforeDrag", () => this.setState({ event: "beforeDrag" }));
36+
this.dataview.events.on("beforeDrop", () => this.setState({ event: "beforeDrop" }));
37+
this.dataview.events.on("dragStart", () => this.setState({ event: "dragStart" }));
38+
this.dataview.events.on("afterDrag", () => this.setState({ event: "afterDrag" }));
39+
this.dataview.events.on("canDrop", () => this.setState({ event: "canDrop" }));
40+
this.dataview.events.on("cancelDrop", () => this.setState({ event: "cancelDrop" }));
41+
this.dataview.events.on("afterDrop", () => this.setState({ event: "afterDrop" }));
42+
this.dataview.events.on("dragOut", () => this.setState({ event: "dragOut" }));
43+
this.dataview.events.on("dragIn", () => this.setState({ event: "dragIn" }));
44+
this.dataview.events.on("beforeSelect", () => this.setState({ event: "beforeSelect" }));
45+
this.dataview.events.on("afterSelect", () => this.setState({ event: "afterSelect" }));
46+
this.dataview.events.on("beforeUnSelect", () => this.setState({ event: "beforeUnSelect" }));
47+
this.dataview.events.on("afterUnSelect", () => this.setState({ event: "afterUnSelect" }));
48+
this.dataview.events.on("beforeEditStart", () => this.setState({ event: "beforeEditStart" }));
49+
this.dataview.events.on("afterEditStart", () => this.setState({ event: "afterEditStart" }));
50+
this.dataview.events.on("beforeEditEnd", () => this.setState({ event: "beforeEditEnd" }));
51+
this.dataview.events.on("afterEditEnd", () => this.setState({ event: "afterEditEnd" }));
52+
this.dataview.events.on("itemRightClick", () => this.setState({ event: "itemRightClick" }));
53+
this.dataview.events.on("itemMouseOver", () => this.setState({ event: "itemMouseOver" }));
3354
}
3455
componentWillUnmount() {
3556
this.dataview && this.dataview.destructor();

src/form/Form.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import React, { Component } from "react";
22
import PropTypes from "prop-types";
33
import { Form as FormDHX } from "dhx-suite";
4-
import "dhx-suite/codebase/suite.min.css";
4+
55
import "@mdi/font/css/materialdesignicons.min.css";
66

77
class Form extends Component {
88
componentDidMount() {
99
this.form = new FormDHX(this.el, {
1010
css: "dhx_widget--bordered",
11-
gravity: false,
1211
width: 400,
1312
rows: [
1413
{
@@ -30,14 +29,13 @@ class Form extends Component {
3029
},
3130
{
3231
type: "checkbox",
33-
label: "I agree",
32+
text: "I agree",
3433
name: "agree",
35-
labelPosition: "right",
3634
value: "checkboxvalue",
3735
},
3836
{
3937
type: "button",
40-
value: "Send",
38+
text: "Send",
4139
size: "medium",
4240
view: "flat",
4341
submit: true,
@@ -56,14 +54,13 @@ class Form extends Component {
5654

5755
Form.propTypes = {
5856
css: PropTypes.string,
59-
width: PropTypes.string,
60-
height: PropTypes.string,
57+
width: PropTypes.string || PropTypes.number,
58+
height: PropTypes.string || PropTypes.number,
6159
rows: PropTypes.array,
6260
cols: PropTypes.array,
6361
title: PropTypes.string,
6462
align: PropTypes.oneOf(["start", "center", "end", "between", "around", "evenly"]),
65-
padding: PropTypes.string,
66-
gravity: PropTypes.bool,
63+
padding: PropTypes.string || PropTypes.number,
6764
disabled: PropTypes.bool,
6865
};
6966

src/form/FormCdn.js

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ class FormCDN extends Component {
1616
/* global dhx */
1717
this.form = new dhx.Form(this.el, {
1818
css: "dhx_widget--bordered",
19-
gravity: false,
2019
width: 400,
2120
rows: [
2221
{
@@ -38,14 +37,13 @@ class FormCDN extends Component {
3837
},
3938
{
4039
type: "checkbox",
41-
label: "I agree",
40+
text: "I agree",
4241
name: "agree",
43-
labelPosition: "right",
4442
value: "checkboxvalue",
4543
},
4644
{
4745
type: "button",
48-
value: "Send",
46+
text: "Send",
4947
size: "medium",
5048
view: "flat",
5149
submit: true,
@@ -68,14 +66,13 @@ class FormCDN extends Component {
6866

6967
FormCDN.propTypes = {
7068
css: PropTypes.string,
71-
width: PropTypes.string,
72-
height: PropTypes.string,
69+
width: PropTypes.string || PropTypes.number,
70+
height: PropTypes.string || PropTypes.number,
7371
rows: PropTypes.array,
7472
cols: PropTypes.array,
7573
title: PropTypes.string,
7674
align: PropTypes.oneOf(["start", "center", "end", "between", "around", "evenly"]),
77-
padding: PropTypes.string,
78-
gravity: PropTypes.bool,
75+
padding: PropTypes.string || PropTypes.number,
7976
disabled: PropTypes.bool,
8077
};
8178

src/form/FormConfigured.js

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ class FormConfigured extends Component {
88
this.form = new FormDHX(this.el, {
99
css: "dhx_widget--bordered",
1010
title: "DHX Form",
11-
gravity: false,
1211
width: 400,
1312
rows: [
1413
{
@@ -37,15 +36,14 @@ class FormConfigured extends Component {
3736
},
3837
{
3938
type: "checkbox",
40-
label: "I agree",
39+
text: "I agree",
4140
name: "agree",
42-
labelInline: true,
4341
value: "checkboxvalue",
4442
required: true,
4543
},
4644
{
4745
type: "button",
48-
value: "Send",
46+
text: "Send",
4947
size: "medium",
5048
view: "flat",
5149
submit: true,
@@ -64,14 +62,13 @@ class FormConfigured extends Component {
6462

6563
FormConfigured.propTypes = {
6664
css: PropTypes.string,
67-
width: PropTypes.string,
68-
height: PropTypes.string,
65+
width: PropTypes.string || PropTypes.number,
66+
height: PropTypes.string || PropTypes.number,
6967
rows: PropTypes.array,
7068
cols: PropTypes.array,
7169
title: PropTypes.string,
7270
align: PropTypes.oneOf(["start", "center", "end", "between", "around", "evenly"]),
73-
padding: PropTypes.string,
74-
gravity: PropTypes.bool,
71+
padding: PropTypes.string || PropTypes.number,
7572
disabled: PropTypes.bool,
7673
};
7774

src/form/FormEvents.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@ class FormEvents extends Component {
88
super(props);
99
this.state = {
1010
event: "",
11-
id: "",
11+
name: "",
1212
};
1313
}
1414
componentDidMount() {
1515
this.form = new FormDHX(this.el, {
1616
css: "dhx_widget--bordered",
1717
title: "DHX Form",
18-
gravity: false,
1918
width: 400,
2019
rows: [
2120
{
@@ -24,51 +23,53 @@ class FormEvents extends Component {
2423
icon: "dxi-magnify",
2524
placeholder: "John Doe",
2625
required: true,
27-
id: "name",
2826
name: "name",
2927
},
3028
{
3129
type: "datepicker",
3230
label: "Date",
3331
required: true,
34-
id: "date",
3532
name: "date",
3633
},
3734
{
3835
type: "timepicker",
3936
controls: "true",
4037
label: "Time",
4138
required: true,
42-
id: "time",
4339
name: "time",
4440
},
4541
{
4642
type: "colorpicker",
4743
label: "Color",
4844
required: true,
49-
id: "color",
5045
name: "color",
5146
},
5247
{
5348
type: "simpleVault",
5449
required: true,
5550
label: "Files",
56-
id: "simplevault",
5751
name: "simplevault",
5852
},
5953
{
6054
type: "button",
61-
value: "Send",
55+
text: "Send",
6256
size: "medium",
6357
view: "flat",
6458
submit: true,
6559
color: "primary",
6660
},
6761
],
6862
});
69-
this.form.events.on("change", id => this.setState({ event: "change", id: id }));
70-
this.form.events.on("buttonclick", id => this.setState({ event: "buttonclick", id: id }));
71-
this.form.events.on("validationfail", id => this.setState({ event: "validationfail", id: id }));
63+
this.form.events.on("change", name => this.setState({ event: "change", name }));
64+
this.form.events.on("click", name => this.setState({ event: "click", name }));
65+
this.form.events.on("beforeHide", name => this.setState({ event: "beforeHide", name }));
66+
this.form.events.on("afterHide", name => this.setState({ event: "afterHide", name }));
67+
this.form.events.on("beforeShow", name => this.setState({ event: "beforeShow", name }));
68+
this.form.events.on("afterShow", name => this.setState({ event: "afterShow", name }));
69+
this.form.events.on("beforeValidate", name => this.setState({ event: "beforeValidate", name }));
70+
this.form.events.on("afterValidate", name => this.setState({ event: "afterValidate", name }));
71+
this.form.events.on("beforeChangeProperties", name => this.setState({ event: "beforeChangeProperties", name }));
72+
this.form.events.on("afterChangeProperties", name => this.setState({ event: "afterChangeProperties", name }));
7273
this.form.events.on("afterSend", () => this.setState({ event: "afterSend" }));
7374
this.form.events.on("beforeSend", () => this.setState({ event: "beforeSend" }));
7475
}
@@ -92,7 +93,7 @@ class FormEvents extends Component {
9293
{this.state.event ? `Event: ${this.state.event}` : "Click to widget"}
9394
</button>
9495
<button className="button button--bordered">
95-
Item: {this.state.id ? this.state.id : ""}
96+
Item: {this.state.name ? this.state.name : ""}
9697
</button>
9798
</div>
9899
</div>
@@ -102,14 +103,13 @@ class FormEvents extends Component {
102103

103104
FormEvents.propTypes = {
104105
css: PropTypes.string,
105-
width: PropTypes.string,
106-
height: PropTypes.string,
106+
width: PropTypes.string || PropTypes.number,
107+
height: PropTypes.string || PropTypes.number,
107108
rows: PropTypes.array,
108109
cols: PropTypes.array,
109110
title: PropTypes.string,
110111
align: PropTypes.oneOf(["start", "center", "end", "between", "around", "evenly"]),
111-
padding: PropTypes.string,
112-
gravity: PropTypes.bool,
112+
padding: PropTypes.string || PropTypes.number,
113113
disabled: PropTypes.bool,
114114
};
115115

src/form/FormProps.js

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ import "dhx-suite/codebase/suite.min.css";
55

66
class Form extends Component {
77
componentDidMount() {
8-
const { css, rows, gravity, padding, title, width } = this.props;
8+
const { css, rows, padding, title, width } = this.props;
99
this.form = new FormDHX(this.el, {
10-
css: css,
11-
gravity: gravity,
12-
padding: padding,
13-
rows: rows,
14-
title: title,
15-
width: width,
10+
css,
11+
padding,
12+
rows,
13+
title,
14+
width,
1615
});
1716
}
1817
componentWillUnmount() {
@@ -52,15 +51,14 @@ class FormProps extends Component {
5251
},
5352
{
5453
type: "checkbox",
55-
label: "I agree",
54+
text: "I agree",
5655
name: "agree",
57-
labelInline: true,
5856
value: "checkboxvalue",
5957
required: true,
6058
},
6159
{
6260
type: "button",
63-
value: "Send",
61+
text: "Send",
6462
size: "medium",
6563
view: "flat",
6664
submit: true,
@@ -72,7 +70,6 @@ class FormProps extends Component {
7270
css={"dhx_widget--bordered"}
7371
width={400}
7472
rows={rows}
75-
gravity={false}
7673
padding={20}
7774
title={"DHX Form"}
7875
/>
@@ -82,14 +79,13 @@ class FormProps extends Component {
8279

8380
FormProps.propTypes = {
8481
css: PropTypes.string,
85-
width: PropTypes.string,
86-
height: PropTypes.string,
82+
width: PropTypes.string || PropTypes.number,
83+
height: PropTypes.string || PropTypes.number,
8784
rows: PropTypes.array,
8885
cols: PropTypes.array,
8986
title: PropTypes.string,
9087
align: PropTypes.oneOf(["start", "center", "end", "between", "around", "evenly"]),
91-
padding: PropTypes.string,
92-
gravity: PropTypes.bool,
88+
padding: PropTypes.string || PropTypes.number,
9389
disabled: PropTypes.bool,
9490
};
9591

src/grid/GridData.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@ class Grid extends Component {
1414
multiselection,
1515
selection,
1616
} = this.props;
17+
1718
this.grid = new GridDHX(this.el, {
18-
rowHeight: rowHeight,
19-
adjust: adjust,
20-
autoWidth: autoWidth,
21-
columns: columns,
22-
data: data,
23-
editable: editable,
24-
multiselection: multiselection,
25-
selection: selection,
19+
rowHeight,
20+
adjust,
21+
autoWidth,
22+
columns,
23+
data,
24+
editable,
25+
multiselection,
26+
selection,
2627
});
2728
}
2829
componentWillUnmount() {

0 commit comments

Comments
 (0)