datatables.net-searchbuilder-se 1.2.0 → 1.3.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.
|
@@ -1,8 +1,15 @@
|
|
|
1
1
|
div.dt-button-collection {
|
|
2
2
|
overflow: visible !important;
|
|
3
|
+
z-index: 2002 !important;
|
|
3
4
|
}
|
|
4
5
|
div.dt-button-collection div.dtsb-searchBuilder {
|
|
5
|
-
width:
|
|
6
|
+
width: 99% !important;
|
|
7
|
+
padding-left: 10px !important;
|
|
8
|
+
padding-right: 10px !important;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
div.dt-button-collection.dtb-collection-closeable div.dtsb-titleRow {
|
|
12
|
+
padding-right: 40px;
|
|
6
13
|
}
|
|
7
14
|
|
|
8
15
|
.dtsb-greyscale {
|
|
@@ -31,6 +38,9 @@ div.dtsb-searchBuilder div.dtsb-titleRow div.dtsb-title {
|
|
|
31
38
|
display: inline-block;
|
|
32
39
|
padding-top: 6px;
|
|
33
40
|
}
|
|
41
|
+
div.dtsb-searchBuilder div.dtsb-titleRow div.dtsb-title:empty {
|
|
42
|
+
display: inline;
|
|
43
|
+
}
|
|
34
44
|
div.dtsb-searchBuilder div.dtsb-titleRow button.dtsb-clearAll {
|
|
35
45
|
float: right;
|
|
36
46
|
margin-bottom: 0.333em;
|
|
@@ -89,6 +99,33 @@ div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria span.dtsp-joiner {
|
|
|
89
99
|
margin-right: 0.8em;
|
|
90
100
|
}
|
|
91
101
|
|
|
102
|
+
div.dt-button-collection {
|
|
103
|
+
border: 1px solid rgba(34, 36, 38, 0.15);
|
|
104
|
+
border-radius: 4px;
|
|
105
|
+
}
|
|
106
|
+
div.dt-button-collection div.dtsb-searchBuilder {
|
|
107
|
+
margin: 10px;
|
|
108
|
+
}
|
|
109
|
+
div.dt-button-collection div.dtsb-searchBuilder div.dtsb-titleRow {
|
|
110
|
+
font-size: 13.33px;
|
|
111
|
+
}
|
|
112
|
+
div.dt-button-collection div.dtsb-searchBuilder div.dtsb-titleRow button.dtsb-clearAll {
|
|
113
|
+
border: none;
|
|
114
|
+
border-radius: 4px;
|
|
115
|
+
}
|
|
116
|
+
div.dt-button-collection div.dtsb-searchBuilder select.ui.dropdown {
|
|
117
|
+
font-size: 13.33px;
|
|
118
|
+
}
|
|
119
|
+
div.dt-button-collection div.dtsb-searchBuilder div.dtsb-logicContainer {
|
|
120
|
+
margin-top: 10px !important;
|
|
121
|
+
border: 1px solid rgba(34, 36, 38, 0.15);
|
|
122
|
+
border-radius: 4px;
|
|
123
|
+
}
|
|
124
|
+
div.dt-button-collection div.dtsb-searchBuilder div.dtsb-criteria,
|
|
125
|
+
div.dt-button-collection div.dtsb-searchBuilder div.dtsb-group {
|
|
126
|
+
margin-bottom: 10px !important;
|
|
127
|
+
}
|
|
128
|
+
|
|
92
129
|
div.dtsb-searchBuilder button.dtsb-button {
|
|
93
130
|
padding-top: 5px;
|
|
94
131
|
padding-left: 5px;
|
|
@@ -105,6 +142,7 @@ div.dtsb-searchBuilder div.dtsb-titleRow button.dtsb-clearAll {
|
|
|
105
142
|
}
|
|
106
143
|
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select {
|
|
107
144
|
width: auto !important;
|
|
145
|
+
background-color: transparent !important;
|
|
108
146
|
}
|
|
109
147
|
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-condition {
|
|
110
148
|
border-color: #21ba45;
|
|
@@ -115,6 +153,9 @@ div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-data {
|
|
|
115
153
|
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-value, div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria input.dtsb-value {
|
|
116
154
|
border-color: #2185d0;
|
|
117
155
|
}
|
|
156
|
+
div.dtsb-searchBuilder div.dtsb-group button.ui.button {
|
|
157
|
+
border-radius: 4px;
|
|
158
|
+
}
|
|
118
159
|
div.dtsb-searchBuilder div.dtsb-group div.dtsb-logicContainer {
|
|
119
160
|
border-radius: 4px;
|
|
120
161
|
display: flex;
|
|
@@ -128,14 +169,19 @@ div.dtsb-searchBuilder div.dtsb-group div.dtsb-logicContainer {
|
|
|
128
169
|
div.dtsb-searchBuilder div.dtsb-group div.dtsb-logicContainer button.dtsb-logic {
|
|
129
170
|
border: none;
|
|
130
171
|
border-radius: 0px;
|
|
172
|
+
border-top-left-radius: 4px;
|
|
173
|
+
border-bottom-left-radius: 4px;
|
|
131
174
|
flex-grow: 1;
|
|
132
175
|
flex-shrink: 0;
|
|
133
|
-
flex-basis:
|
|
176
|
+
flex-basis: 2.5em;
|
|
134
177
|
margin: 0px;
|
|
135
178
|
}
|
|
136
179
|
div.dtsb-searchBuilder div.dtsb-group div.dtsb-logicContainer button.dtsb-clearGroup {
|
|
137
180
|
border: none;
|
|
138
181
|
border-radius: 0px;
|
|
182
|
+
border-top-right-radius: 4px;
|
|
183
|
+
border-bottom-right-radius: 4px;
|
|
184
|
+
flex-grow: 0;
|
|
139
185
|
width: 2em;
|
|
140
186
|
margin: 0px;
|
|
141
187
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
div.dt-button-collection{overflow:visible !important}div.dt-button-collection div.dtsb-searchBuilder{width:
|
|
1
|
+
div.dt-button-collection{overflow:visible !important;z-index:2002 !important}div.dt-button-collection div.dtsb-searchBuilder{width:99% !important;padding-left:10px !important;padding-right:10px !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:6px}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:.333em}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-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}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;max-width:20em;background-color:rgba(200, 200, 200, 0.3)}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-buttonContainer{float:right;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}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria span.dtsp-joiner{margin-right:.8em}div.dt-button-collection{border:1px solid rgba(34, 36, 38, 0.15);border-radius:4px}div.dt-button-collection div.dtsb-searchBuilder{margin:10px}div.dt-button-collection div.dtsb-searchBuilder div.dtsb-titleRow{font-size:13.33px}div.dt-button-collection div.dtsb-searchBuilder div.dtsb-titleRow button.dtsb-clearAll{border:none;border-radius:4px}div.dt-button-collection div.dtsb-searchBuilder select.ui.dropdown{font-size:13.33px}div.dt-button-collection div.dtsb-searchBuilder div.dtsb-logicContainer{margin-top:10px !important;border:1px solid rgba(34, 36, 38, 0.15);border-radius:4px}div.dt-button-collection div.dtsb-searchBuilder div.dtsb-criteria,div.dt-button-collection div.dtsb-searchBuilder div.dtsb-group{margin-bottom:10px !important}div.dtsb-searchBuilder button.dtsb-button{padding-top:5px;padding-left:5px;padding-right:5px;padding-bottom:5px;min-width:30px;min-height:30px}div.dtsb-searchBuilder div.dtsb-titleRow{margin-bottom:1em}div.dtsb-searchBuilder div.dtsb-titleRow button.dtsb-clearAll{margin-bottom:0px}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select{width:auto !important;background-color:transparent !important}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-condition{border-color:#21ba45}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-data{border-color:#db2828}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:#2185d0}div.dtsb-searchBuilder div.dtsb-group button.ui.button{border-radius:4px}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:.8em}div.dtsb-searchBuilder div.dtsb-group div.dtsb-logicContainer button.dtsb-logic{border:none;border-radius:0px;border-top-left-radius:4px;border-bottom-left-radius:4px;flex-grow:1;flex-shrink:0;flex-basis:2.5em;margin:0px}div.dtsb-searchBuilder div.dtsb-group div.dtsb-logicContainer button.dtsb-clearGroup{border:none;border-radius:0px;border-top-right-radius:4px;border-bottom-right-radius:4px;flex-grow:0;width:2em;margin:0px}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
if (typeof define === 'function' && define.amd) {
|
|
6
6
|
// AMD
|
|
7
7
|
define(['jquery', 'datatables.net-se', 'datatables.net-searchbuilder'], function ($) {
|
|
8
|
-
return factory(
|
|
8
|
+
return factory($);
|
|
9
9
|
});
|
|
10
10
|
}
|
|
11
11
|
else if (typeof exports === 'object') {
|
|
@@ -22,31 +22,43 @@
|
|
|
22
22
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
23
23
|
require('datatables.net-searchbuilder')(root, $);
|
|
24
24
|
}
|
|
25
|
-
return factory(
|
|
25
|
+
return factory($);
|
|
26
26
|
};
|
|
27
27
|
}
|
|
28
28
|
else {
|
|
29
29
|
// Browser
|
|
30
|
-
factory(jQuery
|
|
30
|
+
factory(jQuery);
|
|
31
31
|
}
|
|
32
|
-
}(function (
|
|
32
|
+
}(function ($) {
|
|
33
33
|
'use strict';
|
|
34
34
|
var dataTable = $.fn.dataTable;
|
|
35
35
|
$.extend(true, dataTable.SearchBuilder.classes, {
|
|
36
|
-
clearAll: 'ui button dtsb-clearAll'
|
|
36
|
+
clearAll: 'basic ui button dtsb-clearAll'
|
|
37
37
|
});
|
|
38
38
|
$.extend(true, dataTable.Group.classes, {
|
|
39
|
-
add: 'ui button dtsb-add',
|
|
40
|
-
clearGroup: 'ui button dtsb-clearGroup',
|
|
41
|
-
logic: 'ui button dtsb-logic'
|
|
39
|
+
add: 'basic ui button dtsb-add',
|
|
40
|
+
clearGroup: 'basic ui button dtsb-clearGroup',
|
|
41
|
+
logic: 'basic ui button dtsb-logic'
|
|
42
42
|
});
|
|
43
43
|
$.extend(true, dataTable.Criteria.classes, {
|
|
44
44
|
condition: 'ui selection dropdown dtsb-condition',
|
|
45
45
|
data: 'ui selection dropdown dtsb-data',
|
|
46
|
-
"delete": 'ui button dtsb-delete',
|
|
47
|
-
left: 'ui button dtsb-left',
|
|
48
|
-
right: 'ui button dtsb-right',
|
|
49
|
-
value: 'ui selection dropdown dtsb-value'
|
|
46
|
+
"delete": 'basic ui button dtsb-delete',
|
|
47
|
+
left: 'basic ui button dtsb-left',
|
|
48
|
+
right: 'basic ui button dtsb-right',
|
|
49
|
+
value: 'basic ui selection dropdown dtsb-value'
|
|
50
50
|
});
|
|
51
|
+
dataTable.ext.buttons.searchBuilder.action = function (e, dt, node, config) {
|
|
52
|
+
e.stopPropagation();
|
|
53
|
+
this.popover(config._searchBuilder.getNode(), {
|
|
54
|
+
align: 'container',
|
|
55
|
+
span: 'container'
|
|
56
|
+
});
|
|
57
|
+
// Need to redraw the contents to calculate the correct positions for the elements
|
|
58
|
+
if (config._searchBuilder.s.topGroup !== undefined) {
|
|
59
|
+
config._searchBuilder.s.topGroup.dom.container.trigger('dtsb-redrawContents');
|
|
60
|
+
}
|
|
61
|
+
$('div.dtsb-searchBuilder').removeClass('ui basic vertical buttons');
|
|
62
|
+
};
|
|
51
63
|
return dataTable.searchPanes;
|
|
52
64
|
}));
|
|
@@ -2,5 +2,6 @@
|
|
|
2
2
|
semantic ui integration for DataTables' SearchBuilder
|
|
3
3
|
©2016 SpryMedia Ltd - datatables.net/license
|
|
4
4
|
*/
|
|
5
|
-
(function(b){"function"===typeof define&&define.amd?define(["jquery","datatables.net-se","datatables.net-searchbuilder"],function(a){return b(a
|
|
6
|
-
|
|
5
|
+
(function(b){"function"===typeof define&&define.amd?define(["jquery","datatables.net-se","datatables.net-searchbuilder"],function(a){return b(a)}):"object"===typeof exports?module.exports=function(a,c){a||(a=window);c&&c.fn.dataTable||(c=require("datatables.net-se")(a,c).$);c.fn.dataTable.searchBuilder||require("datatables.net-searchbuilder")(a,c);return b(c)}:b(jQuery)})(function(b){var a=b.fn.dataTable;b.extend(!0,a.SearchBuilder.classes,{clearAll:"basic ui button dtsb-clearAll"});b.extend(!0,a.Group.classes,
|
|
6
|
+
{add:"basic ui button dtsb-add",clearGroup:"basic ui button dtsb-clearGroup",logic:"basic ui button dtsb-logic"});b.extend(!0,a.Criteria.classes,{condition:"ui selection dropdown dtsb-condition",data:"ui selection dropdown dtsb-data","delete":"basic ui button dtsb-delete",left:"basic ui button dtsb-left",right:"basic ui button dtsb-right",value:"basic ui selection dropdown dtsb-value"});a.ext.buttons.searchBuilder.action=function(c,e,f,d){c.stopPropagation();this.popover(d._searchBuilder.getNode(),
|
|
7
|
+
{align:"container",span:"container"});void 0!==d._searchBuilder.s.topGroup&&d._searchBuilder.s.topGroup.dom.container.trigger("dtsb-redrawContents");b("div.dtsb-searchBuilder").removeClass("ui basic vertical buttons")};return a.searchPanes});
|
package/package.json
CHANGED
|
@@ -4,10 +4,11 @@
|
|
|
4
4
|
"main": "js/searchBuilder.semanticui.js",
|
|
5
5
|
"style": "css/searchBuilder.semanticui.css",
|
|
6
6
|
"types": "./types/searchBuilder.semanticui.d.ts",
|
|
7
|
-
"version": "1.
|
|
7
|
+
"version": "1.3.1",
|
|
8
8
|
"files": [
|
|
9
9
|
"css/**/*.css",
|
|
10
|
-
"js/**/*.js"
|
|
10
|
+
"js/**/*.js",
|
|
11
|
+
"types/**/*.d.ts"
|
|
11
12
|
],
|
|
12
13
|
"keywords": [
|
|
13
14
|
"SearchBuilder",
|
|
@@ -23,8 +24,8 @@
|
|
|
23
24
|
"sort"
|
|
24
25
|
],
|
|
25
26
|
"dependencies": {
|
|
26
|
-
"datatables.net-searchbuilder": ">=1.
|
|
27
|
-
"datatables.net-se": ">=1.
|
|
27
|
+
"datatables.net-searchbuilder": ">=1.2.2",
|
|
28
|
+
"datatables.net-se": ">=1.11.3",
|
|
28
29
|
"jquery": ">=1.7"
|
|
29
30
|
},
|
|
30
31
|
"moduleType": [
|
|
File without changes
|