datatables.net-searchbuilder-bm 1.7.1 → 1.8.1
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.
|
@@ -3,6 +3,7 @@ div.dt-button-collection {
|
|
|
3
3
|
z-index: 2002 !important;
|
|
4
4
|
}
|
|
5
5
|
div.dt-button-collection div.dtsb-searchBuilder {
|
|
6
|
+
box-sizing: border-box;
|
|
6
7
|
padding-left: 1em !important;
|
|
7
8
|
padding-right: 1em !important;
|
|
8
9
|
}
|
|
@@ -24,6 +25,7 @@ div.dtsb-searchBuilder {
|
|
|
24
25
|
cursor: default;
|
|
25
26
|
margin-bottom: 1em;
|
|
26
27
|
text-align: left;
|
|
28
|
+
width: 100%;
|
|
27
29
|
}
|
|
28
30
|
div.dtsb-searchBuilder button.dtsb-button,
|
|
29
31
|
div.dtsb-searchBuilder select {
|
|
@@ -162,9 +164,10 @@ div.dtsb-searchBuilder div.dtsb-group button.dtsb-clearGroup {
|
|
|
162
164
|
}
|
|
163
165
|
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-dropDown {
|
|
164
166
|
height: 2.5em;
|
|
165
|
-
border-radius:
|
|
166
|
-
background-color:
|
|
167
|
+
border-radius: var(--bulma-control-radius);
|
|
168
|
+
background-color: hsl(var(--bulma-input-h), var(--bulma-input-s), calc(var(--bulma-input-background-l) + var(--bulma-input-background-l-delta)));
|
|
167
169
|
padding-right: 2.5em;
|
|
170
|
+
border-width: 1px;
|
|
168
171
|
}
|
|
169
172
|
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-condition {
|
|
170
173
|
border-color: #48c78e;
|
|
@@ -187,8 +190,8 @@ div.dtsb-searchBuilder div.dtsb-group div.dtsb-logicContainer {
|
|
|
187
190
|
overflow: hidden;
|
|
188
191
|
}
|
|
189
192
|
div.dtsb-searchBuilder div.dtsb-group div.dtsb-logicContainer button.dtsb-logic {
|
|
190
|
-
border:
|
|
191
|
-
border-radius: 0px;
|
|
193
|
+
border-top-right-radius: 0px;
|
|
194
|
+
border-bottom-right-radius: 0px;
|
|
192
195
|
flex-grow: 1;
|
|
193
196
|
flex-shrink: 0;
|
|
194
197
|
flex-basis: 3em;
|
|
@@ -196,8 +199,9 @@ div.dtsb-searchBuilder div.dtsb-group div.dtsb-logicContainer button.dtsb-logic
|
|
|
196
199
|
padding: 0.375rem 0rem;
|
|
197
200
|
}
|
|
198
201
|
div.dtsb-searchBuilder div.dtsb-group div.dtsb-logicContainer button.dtsb-clearGroup {
|
|
199
|
-
border: none;
|
|
200
|
-
border-radius: 0px;
|
|
202
|
+
border-left: none;
|
|
203
|
+
border-top-left-radius: 0px;
|
|
204
|
+
border-bottom-left-radius: 0px;
|
|
201
205
|
width: 2em;
|
|
202
206
|
margin: 0px;
|
|
203
207
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
div.dt-button-collection{overflow:visible !important;z-index:2002 !important}div.dt-button-collection div.dtsb-searchBuilder{padding-left:1em !important;padding-right:1em !important}div.dt-button-collection.dtb-collection-closeable div.dtsb-titleRow{padding-right:40px}.dtsb-greyscale{border:1px solid #cecece !important}div.dtsb-logicContainer .dtsb-greyscale{border:none !important}div.dtsb-searchBuilder{justify-content:space-evenly;cursor:default;margin-bottom:1em;text-align:left}div.dtsb-searchBuilder button.dtsb-button,div.dtsb-searchBuilder select{font-size:1em}div.dtsb-searchBuilder div.dtsb-titleRow{justify-content:space-evenly;margin-bottom:.5em}div.dtsb-searchBuilder div.dtsb-titleRow div.dtsb-title{display:inline-block;padding-top:14px}div.dtsb-searchBuilder div.dtsb-titleRow div.dtsb-title:empty{display:inline}div.dtsb-searchBuilder div.dtsb-titleRow button.dtsb-clearAll{float:right;margin-bottom:.8em}div.dtsb-searchBuilder div.dtsb-vertical .dtsb-value,div.dtsb-searchBuilder div.dtsb-vertical .dtsb-data,div.dtsb-searchBuilder div.dtsb-vertical .dtsb-condition{display:block}div.dtsb-searchBuilder div.dtsb-group{position:relative;clear:both;margin-bottom:.8em}div.dtsb-searchBuilder div.dtsb-group button.dtsb-search{float:right}div.dtsb-searchBuilder div.dtsb-group button.dtsb-clearGroup{margin:2px;text-align:center;padding:0}div.dtsb-searchBuilder div.dtsb-group div.dtsb-logicContainer{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-o-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg);position:absolute;margin-top:.8em;margin-right:.8em}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria{margin-bottom:.8em;display:flex;justify-content:start;flex-flow:row wrap}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-dropDown,div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria input.dtsb-input{padding:.4em;margin-right:.8em;min-width:5em;max-width:20em;color:inherit;font-size:1em}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-dropDown option.dtsb-notItalic,div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria input.dtsb-input option.dtsb-notItalic{font-style:normal}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-italic{font-style:italic}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-inputCont{flex:1;white-space:nowrap}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-inputCont span.dtsb-joiner{margin-right:.8em}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-inputCont input.dtsb-value{width:33%}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-inputCont select,div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-inputCont input{height:100%;box-sizing:border-box}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer{margin-left:auto;display:inline-block}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer button.dtsb-delete,div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer button.dtsb-right,div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer button.dtsb-left{margin-right:.8em}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer button.dtsb-delete:last-child,div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer button.dtsb-right:last-child,div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer button.dtsb-left:last-child{margin-right:0}@media screen and (max-width: 550px){div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria{display:flex;flex-flow:none;flex-direction:column;justify-content:start;padding-right:calc(35px + .8em);margin-bottom:0px}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria:not(:first-child),div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria:not(:nth-child(2)),div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria:not(:last-child){padding-top:.8em}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria:first-child,div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria:nth-child(2),div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria:last-child{padding-top:0em}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-dropDown,div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria input.dtsb-input{max-width:none;width:100%;margin-bottom:.8em;margin-right:.8em}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-inputCont{margin-right:.8em}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer{position:absolute;width:35px;display:flex;flex-wrap:wrap-reverse;right:0}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer button{margin-right:0px !important}}div.dtsb-searchBuilder div.dtsb-titleRow{margin-bottom:1.5em}div.dtsb-searchBuilder div.dtsb-group button.dtsb-clearGroup{margin-right:8px}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-dropDown{height:2.5em;border-radius
|
|
1
|
+
div.dt-button-collection{overflow:visible !important;z-index:2002 !important}div.dt-button-collection div.dtsb-searchBuilder{box-sizing:border-box;padding-left:1em !important;padding-right:1em !important}div.dt-button-collection.dtb-collection-closeable div.dtsb-titleRow{padding-right:40px}.dtsb-greyscale{border:1px solid #cecece !important}div.dtsb-logicContainer .dtsb-greyscale{border:none !important}div.dtsb-searchBuilder{justify-content:space-evenly;cursor:default;margin-bottom:1em;text-align:left;width:100%}div.dtsb-searchBuilder button.dtsb-button,div.dtsb-searchBuilder select{font-size:1em}div.dtsb-searchBuilder div.dtsb-titleRow{justify-content:space-evenly;margin-bottom:.5em}div.dtsb-searchBuilder div.dtsb-titleRow div.dtsb-title{display:inline-block;padding-top:14px}div.dtsb-searchBuilder div.dtsb-titleRow div.dtsb-title:empty{display:inline}div.dtsb-searchBuilder div.dtsb-titleRow button.dtsb-clearAll{float:right;margin-bottom:.8em}div.dtsb-searchBuilder div.dtsb-vertical .dtsb-value,div.dtsb-searchBuilder div.dtsb-vertical .dtsb-data,div.dtsb-searchBuilder div.dtsb-vertical .dtsb-condition{display:block}div.dtsb-searchBuilder div.dtsb-group{position:relative;clear:both;margin-bottom:.8em}div.dtsb-searchBuilder div.dtsb-group button.dtsb-search{float:right}div.dtsb-searchBuilder div.dtsb-group button.dtsb-clearGroup{margin:2px;text-align:center;padding:0}div.dtsb-searchBuilder div.dtsb-group div.dtsb-logicContainer{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-o-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg);position:absolute;margin-top:.8em;margin-right:.8em}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria{margin-bottom:.8em;display:flex;justify-content:start;flex-flow:row wrap}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-dropDown,div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria input.dtsb-input{padding:.4em;margin-right:.8em;min-width:5em;max-width:20em;color:inherit;font-size:1em}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-dropDown option.dtsb-notItalic,div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria input.dtsb-input option.dtsb-notItalic{font-style:normal}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-italic{font-style:italic}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-inputCont{flex:1;white-space:nowrap}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-inputCont span.dtsb-joiner{margin-right:.8em}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-inputCont input.dtsb-value{width:33%}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-inputCont select,div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-inputCont input{height:100%;box-sizing:border-box}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer{margin-left:auto;display:inline-block}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer button.dtsb-delete,div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer button.dtsb-right,div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer button.dtsb-left{margin-right:.8em}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer button.dtsb-delete:last-child,div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer button.dtsb-right:last-child,div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer button.dtsb-left:last-child{margin-right:0}@media screen and (max-width: 550px){div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria{display:flex;flex-flow:none;flex-direction:column;justify-content:start;padding-right:calc(35px + .8em);margin-bottom:0px}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria:not(:first-child),div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria:not(:nth-child(2)),div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria:not(:last-child){padding-top:.8em}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria:first-child,div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria:nth-child(2),div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria:last-child{padding-top:0em}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-dropDown,div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria input.dtsb-input{max-width:none;width:100%;margin-bottom:.8em;margin-right:.8em}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-inputCont{margin-right:.8em}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer{position:absolute;width:35px;display:flex;flex-wrap:wrap-reverse;right:0}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer button{margin-right:0px !important}}div.dtsb-searchBuilder div.dtsb-titleRow{margin-bottom:1.5em}div.dtsb-searchBuilder div.dtsb-group button.dtsb-clearGroup{margin-right:8px}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-dropDown{height:2.5em;border-radius:var(--bulma-control-radius);background-color:hsl(var(--bulma-input-h), var(--bulma-input-s), calc(var(--bulma-input-background-l) + var(--bulma-input-background-l-delta)));padding-right:2.5em;border-width:1px}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-condition{border-color:#48c78e}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-data{border-color:#ef2e55}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-value,div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria input.dtsb-value{border-color:#3e8ed0}div.dtsb-searchBuilder div.dtsb-group div.dtsb-logicContainer{border-radius:4px;display:flex;flex-direction:row;flex-wrap:wrap;justify-content:flex-start;align-content:flex-start;align-items:flex-start;margin-top:10px;overflow:hidden}div.dtsb-searchBuilder div.dtsb-group div.dtsb-logicContainer button.dtsb-logic{border-top-right-radius:0px;border-bottom-right-radius:0px;flex-grow:1;flex-shrink:0;flex-basis:3em;margin:0px;padding:.375rem 0rem}div.dtsb-searchBuilder div.dtsb-group div.dtsb-logicContainer button.dtsb-clearGroup{border-left:none;border-top-left-radius:0px;border-bottom-left-radius:0px;width:2em;margin:0px}div.dt-button-collection div.dtsb-searchBuilder{padding-left:10px;padding-right:10px}
|
|
@@ -57,15 +57,16 @@ $.extend(true, DataTable.SearchBuilder.classes, {
|
|
|
57
57
|
});
|
|
58
58
|
$.extend(true, DataTable.Group.classes, {
|
|
59
59
|
add: 'button dtsb-add',
|
|
60
|
-
clearGroup: 'button dtsb-clearGroup
|
|
61
|
-
logic: 'button dtsb-logic
|
|
60
|
+
clearGroup: 'button dtsb-clearGroup',
|
|
61
|
+
logic: 'button dtsb-logic',
|
|
62
62
|
search: 'button dtsb-search'
|
|
63
63
|
});
|
|
64
64
|
$.extend(true, DataTable.Criteria.classes, {
|
|
65
65
|
container: 'dtsb-criteria',
|
|
66
66
|
"delete": 'button dtsb-delete',
|
|
67
67
|
left: 'button dtsb-left',
|
|
68
|
-
right: 'button dtsb-right'
|
|
68
|
+
right: 'button dtsb-right',
|
|
69
|
+
input: 'input dtsb-input'
|
|
69
70
|
});
|
|
70
71
|
|
|
71
72
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
/*! Bulma ui integration for DataTables' SearchBuilder
|
|
2
2
|
* © SpryMedia Ltd - datatables.net/license
|
|
3
3
|
*/
|
|
4
|
-
!function(n){var d,r;"function"==typeof define&&define.amd?define(["jquery","datatables.net-bm","datatables.net-searchbuilder"],function(e){return n(e,window,document)}):"object"==typeof exports?(d=require("jquery"),r=function(e,t){t.fn.dataTable||require("datatables.net-bm")(e,t),t.fn.dataTable.SearchBuilder||require("datatables.net-searchbuilder")(e,t)},"undefined"==typeof window?module.exports=function(e,t){return e=e||window,t=t||d(e),r(e,t),n(t,0,e.document)}:(r(window,d),module.exports=n(d,window,window.document))):n(jQuery,window,document)}(function(e,t,n){"use strict";var d=e.fn.dataTable;return e.extend(!0,d.SearchBuilder.classes,{clearAll:"button dtsb-clearAll"}),e.extend(!0,d.Group.classes,{add:"button dtsb-add",clearGroup:"button dtsb-clearGroup
|
|
4
|
+
!function(n){var d,r;"function"==typeof define&&define.amd?define(["jquery","datatables.net-bm","datatables.net-searchbuilder"],function(e){return n(e,window,document)}):"object"==typeof exports?(d=require("jquery"),r=function(e,t){t.fn.dataTable||require("datatables.net-bm")(e,t),t.fn.dataTable.SearchBuilder||require("datatables.net-searchbuilder")(e,t)},"undefined"==typeof window?module.exports=function(e,t){return e=e||window,t=t||d(e),r(e,t),n(t,0,e.document)}:(r(window,d),module.exports=n(d,window,window.document))):n(jQuery,window,document)}(function(e,t,n){"use strict";var d=e.fn.dataTable;return e.extend(!0,d.SearchBuilder.classes,{clearAll:"button dtsb-clearAll"}),e.extend(!0,d.Group.classes,{add:"button dtsb-add",clearGroup:"button dtsb-clearGroup",logic:"button dtsb-logic",search:"button dtsb-search"}),e.extend(!0,d.Criteria.classes,{container:"dtsb-criteria",delete:"button dtsb-delete",left:"button dtsb-left",right:"button dtsb-right",input:"input dtsb-input"}),d});
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
/*! Bulma ui integration for DataTables' SearchBuilder
|
|
2
2
|
* © SpryMedia Ltd - datatables.net/license
|
|
3
3
|
*/
|
|
4
|
-
import jQuery from"jquery";import DataTable from"datatables.net-bm";import SearchBuilder from"datatables.net-searchbuilder";let $=jQuery;$.extend(!0,DataTable.SearchBuilder.classes,{clearAll:"button dtsb-clearAll"}),$.extend(!0,DataTable.Group.classes,{add:"button dtsb-add",clearGroup:"button dtsb-clearGroup
|
|
4
|
+
import jQuery from"jquery";import DataTable from"datatables.net-bm";import SearchBuilder from"datatables.net-searchbuilder";let $=jQuery;$.extend(!0,DataTable.SearchBuilder.classes,{clearAll:"button dtsb-clearAll"}),$.extend(!0,DataTable.Group.classes,{add:"button dtsb-add",clearGroup:"button dtsb-clearGroup",logic:"button dtsb-logic",search:"button dtsb-search"}),$.extend(!0,DataTable.Criteria.classes,{container:"dtsb-criteria",delete:"button dtsb-delete",left:"button dtsb-left",right:"button dtsb-right",input:"input dtsb-input"});export default DataTable;
|
|
@@ -14,15 +14,16 @@ $.extend(true, DataTable.SearchBuilder.classes, {
|
|
|
14
14
|
});
|
|
15
15
|
$.extend(true, DataTable.Group.classes, {
|
|
16
16
|
add: 'button dtsb-add',
|
|
17
|
-
clearGroup: 'button dtsb-clearGroup
|
|
18
|
-
logic: 'button dtsb-logic
|
|
17
|
+
clearGroup: 'button dtsb-clearGroup',
|
|
18
|
+
logic: 'button dtsb-logic',
|
|
19
19
|
search: 'button dtsb-search'
|
|
20
20
|
});
|
|
21
21
|
$.extend(true, DataTable.Criteria.classes, {
|
|
22
22
|
container: 'dtsb-criteria',
|
|
23
23
|
"delete": 'button dtsb-delete',
|
|
24
24
|
left: 'button dtsb-left',
|
|
25
|
-
right: 'button dtsb-right'
|
|
25
|
+
right: 'button dtsb-right',
|
|
26
|
+
input: 'input dtsb-input'
|
|
26
27
|
});
|
|
27
28
|
|
|
28
29
|
|
package/package.json
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
"module": "js/searchBuilder.bulma.mjs",
|
|
6
6
|
"style": "css/searchBuilder.bulma.css",
|
|
7
7
|
"types": "./types/searchBuilder.bulma.d.ts",
|
|
8
|
-
"version": "1.
|
|
8
|
+
"version": "1.8.1",
|
|
9
9
|
"files": [
|
|
10
10
|
"css/**/*.css",
|
|
11
11
|
"js/**/*.js",
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
"sort"
|
|
25
25
|
],
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"datatables.net-searchbuilder": "1.
|
|
28
|
-
"datatables.net-bm": "1
|
|
27
|
+
"datatables.net-searchbuilder": "1.8.1",
|
|
28
|
+
"datatables.net-bm": "^2.1",
|
|
29
29
|
"jquery": ">=1.7"
|
|
30
30
|
},
|
|
31
31
|
"moduleType": [
|