datatables.net-searchbuilder-bs4 1.4.2 → 1.6.0
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.
- package/css/searchBuilder.bootstrap4.css +13 -6
- package/css/searchBuilder.bootstrap4.min.css +1 -1
- package/js/searchBuilder.bootstrap4.js +1 -1
- package/js/searchBuilder.bootstrap4.min.js +1 -1
- package/js/searchBuilder.bootstrap4.min.mjs +1 -1
- package/js/searchBuilder.bootstrap4.mjs +4 -1
- package/package.json +4 -4
- package/types/types.d.ts +0 -115
|
@@ -3,9 +3,8 @@ div.dt-button-collection {
|
|
|
3
3
|
z-index: 2002 !important;
|
|
4
4
|
}
|
|
5
5
|
div.dt-button-collection div.dtsb-searchBuilder {
|
|
6
|
-
|
|
7
|
-
padding-
|
|
8
|
-
padding-right: 10px !important;
|
|
6
|
+
padding-left: 1em !important;
|
|
7
|
+
padding-right: 1em !important;
|
|
9
8
|
}
|
|
10
9
|
|
|
11
10
|
div.dt-button-collection.dtb-collection-closeable div.dtsb-titleRow {
|
|
@@ -36,14 +35,14 @@ div.dtsb-searchBuilder div.dtsb-titleRow {
|
|
|
36
35
|
}
|
|
37
36
|
div.dtsb-searchBuilder div.dtsb-titleRow div.dtsb-title {
|
|
38
37
|
display: inline-block;
|
|
39
|
-
padding-top:
|
|
38
|
+
padding-top: 14px;
|
|
40
39
|
}
|
|
41
40
|
div.dtsb-searchBuilder div.dtsb-titleRow div.dtsb-title:empty {
|
|
42
41
|
display: inline;
|
|
43
42
|
}
|
|
44
43
|
div.dtsb-searchBuilder div.dtsb-titleRow button.dtsb-clearAll {
|
|
45
44
|
float: right;
|
|
46
|
-
margin-bottom: 0.
|
|
45
|
+
margin-bottom: 0.8em;
|
|
47
46
|
}
|
|
48
47
|
div.dtsb-searchBuilder div.dtsb-vertical .dtsb-value, div.dtsb-searchBuilder div.dtsb-vertical .dtsb-data, div.dtsb-searchBuilder div.dtsb-vertical .dtsb-condition {
|
|
49
48
|
display: block;
|
|
@@ -53,6 +52,9 @@ div.dtsb-searchBuilder div.dtsb-group {
|
|
|
53
52
|
clear: both;
|
|
54
53
|
margin-bottom: 0.8em;
|
|
55
54
|
}
|
|
55
|
+
div.dtsb-searchBuilder div.dtsb-group button.dtsb-search {
|
|
56
|
+
float: right;
|
|
57
|
+
}
|
|
56
58
|
div.dtsb-searchBuilder div.dtsb-group button.dtsb-clearGroup {
|
|
57
59
|
margin: 2px;
|
|
58
60
|
text-align: center;
|
|
@@ -80,7 +82,7 @@ div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria input.dtsb-input {
|
|
|
80
82
|
margin-right: 0.8em;
|
|
81
83
|
min-width: 5em;
|
|
82
84
|
max-width: 20em;
|
|
83
|
-
|
|
85
|
+
color: inherit;
|
|
84
86
|
}
|
|
85
87
|
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-dropDown option.dtsb-notItalic,
|
|
86
88
|
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria input.dtsb-input option.dtsb-notItalic {
|
|
@@ -99,6 +101,11 @@ div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-inputCont span.
|
|
|
99
101
|
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-inputCont input.dtsb-value {
|
|
100
102
|
width: 33%;
|
|
101
103
|
}
|
|
104
|
+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-inputCont select,
|
|
105
|
+
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-inputCont input {
|
|
106
|
+
height: 100%;
|
|
107
|
+
box-sizing: border-box;
|
|
108
|
+
}
|
|
102
109
|
div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria div.dtsb-buttonContainer {
|
|
103
110
|
margin-left: auto;
|
|
104
111
|
display: inline-block;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
div.dt-button-collection{overflow:visible !important;z-index:2002 !important}div.dt-button-collection div.dtsb-searchBuilder{
|
|
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}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.dtsp-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 + 0.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{height:40px}div.dtsb-searchBuilder div.dtsb-titleRow div.dtsb-title{padding-top:10px}div.dtsb-searchBuilder div.dtsb-group button.dtsb-clearGroup{margin-right:8px}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria .form-control{width:auto;display:inline-block}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-condition{border-color:#28a745}div.dtsb-searchBuilder div.dtsb-group div.dtsb-criteria select.dtsb-data{border-color:#dc3545}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:#007bff}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}div.dtsb-searchBuilder div.dtsb-group div.dtsb-logicContainer button.dtsb-logic{border:none;border-radius:0px;flex-grow:1;flex-shrink:0;flex-basis:3em;margin:0px}div.dtsb-searchBuilder div.dtsb-group div.dtsb-logicContainer button.dtsb-clearGroup{border:none;border-radius:0px;width:2em;margin:0px}div.dt-button-collection div.dtsb-searchBuilder{padding-left:10px;padding-right:10px}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
/*! Bootstrap 4 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-bs4","datatables.net-searchbuilder"],function(t){return n(t,window,document)}):"object"==typeof exports?(d=require("jquery"),r=function(t,e){e.fn.dataTable||require("datatables.net-bs4")(t,e),e.fn.dataTable.SearchBuilder||require("datatables.net-searchbuilder")(t,e)},"undefined"
|
|
4
|
+
!function(n){var d,r;"function"==typeof define&&define.amd?define(["jquery","datatables.net-bs4","datatables.net-searchbuilder"],function(t){return n(t,window,document)}):"object"==typeof exports?(d=require("jquery"),r=function(t,e){e.fn.dataTable||require("datatables.net-bs4")(t,e),e.fn.dataTable.SearchBuilder||require("datatables.net-searchbuilder")(t,e)},"undefined"==typeof window?module.exports=function(t,e){return t=t||window,e=e||d(t),r(t,e),n(e,0,t.document)}:(r(window,d),module.exports=n(d,window,window.document))):n(jQuery,window,document)}(function(t,e,n,d){"use strict";var r=t.fn.dataTable;return t.extend(!0,r.SearchBuilder.classes,{clearAll:"btn btn-light dtsb-clearAll"}),t.extend(!0,r.Group.classes,{add:"btn btn-light dtsb-add",clearGroup:"btn btn-light dtsb-clearGroup",logic:"btn btn-light dtsb-logic"}),t.extend(!0,r.Criteria.classes,{condition:"form-control dtsb-condition",data:"form-control dtsb-data",delete:"btn btn-light dtsb-delete",left:"btn btn-light dtsb-left",right:"btn btn-light dtsb-right",value:"form-control dtsb-value"}),r});
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
/*! Bootstrap 4 ui integration for DataTables' SearchBuilder
|
|
2
2
|
* © SpryMedia Ltd - datatables.net/license
|
|
3
3
|
*/
|
|
4
|
-
import
|
|
4
|
+
import jQuery from"jquery";import DataTable from"datatables.net-bs4";import SearchBuilder from"datatables.net-searchbuilder";let $=jQuery;$.extend(!0,DataTable.SearchBuilder.classes,{clearAll:"btn btn-light dtsb-clearAll"}),$.extend(!0,DataTable.Group.classes,{add:"btn btn-light dtsb-add",clearGroup:"btn btn-light dtsb-clearGroup",logic:"btn btn-light dtsb-logic"}),$.extend(!0,DataTable.Criteria.classes,{condition:"form-control dtsb-condition",data:"form-control dtsb-data",delete:"btn btn-light dtsb-delete",left:"btn btn-light dtsb-left",right:"btn btn-light dtsb-right",value:"form-control dtsb-value"});export default DataTable;
|
|
@@ -2,10 +2,13 @@
|
|
|
2
2
|
* © SpryMedia Ltd - datatables.net/license
|
|
3
3
|
*/
|
|
4
4
|
|
|
5
|
-
import
|
|
5
|
+
import jQuery from 'jquery';
|
|
6
6
|
import DataTable from 'datatables.net-bs4';
|
|
7
7
|
import SearchBuilder from 'datatables.net-searchbuilder';
|
|
8
8
|
|
|
9
|
+
// Allow reassignment of the $ variable
|
|
10
|
+
let $ = jQuery;
|
|
11
|
+
|
|
9
12
|
$.extend(true, DataTable.SearchBuilder.classes, {
|
|
10
13
|
clearAll: 'btn btn-light dtsb-clearAll'
|
|
11
14
|
});
|
package/package.json
CHANGED
|
@@ -4,8 +4,8 @@
|
|
|
4
4
|
"main": "js/searchBuilder.bootstrap4.js",
|
|
5
5
|
"module": "js/searchBuilder.bootstrap4.mjs",
|
|
6
6
|
"style": "css/searchBuilder.bootstrap4.css",
|
|
7
|
-
"types": "./types/
|
|
8
|
-
"version": "1.
|
|
7
|
+
"types": "./types/searchBuilder.bootstrap4.d.ts",
|
|
8
|
+
"version": "1.6.0",
|
|
9
9
|
"files": [
|
|
10
10
|
"css/**/*.css",
|
|
11
11
|
"js/**/*.js",
|
|
@@ -25,8 +25,8 @@
|
|
|
25
25
|
"sort"
|
|
26
26
|
],
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"datatables.net-searchbuilder": ">=1.
|
|
29
|
-
"datatables.net-bs4": ">=1.
|
|
28
|
+
"datatables.net-searchbuilder": ">=1.4.2",
|
|
29
|
+
"datatables.net-bs4": ">=1.13.4",
|
|
30
30
|
"jquery": ">=1.7"
|
|
31
31
|
},
|
|
32
32
|
"moduleType": [
|
package/types/types.d.ts
DELETED
|
@@ -1,115 +0,0 @@
|
|
|
1
|
-
// Type definitions for DataTables SearchBuilder
|
|
2
|
-
//
|
|
3
|
-
// Project: https://datatables.net/extensions/searchbuilder/, https://datatables.net
|
|
4
|
-
|
|
5
|
-
/// <reference types="jquery" />
|
|
6
|
-
|
|
7
|
-
import DataTables, {Api} from 'datatables.net';
|
|
8
|
-
import {IDefaults, IDetails, II18n} from './searchBuilder';
|
|
9
|
-
|
|
10
|
-
export default DataTables;
|
|
11
|
-
|
|
12
|
-
type DeepPartial<T> = T extends object ? {
|
|
13
|
-
[P in keyof T]?: DeepPartial<T[P]>;
|
|
14
|
-
} : T;
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
|
18
|
-
* DataTables' types integration
|
|
19
|
-
*/
|
|
20
|
-
declare module 'datatables.net' {
|
|
21
|
-
interface Config {
|
|
22
|
-
/**
|
|
23
|
-
* SearchBuilder extension options
|
|
24
|
-
*/
|
|
25
|
-
searchBuilder?: boolean | string[] | ConfigSearchBuilder | ConfigSearchBuilder[];
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
interface ConfigLanguage {
|
|
29
|
-
/**
|
|
30
|
-
* SearchBuilder language options
|
|
31
|
-
*/
|
|
32
|
-
searchBuilder?: ConfigSearchBuilderLanguage;
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
interface ConfigColumns {
|
|
36
|
-
searchBuilder?: {
|
|
37
|
-
/** Set a default condition for this column */
|
|
38
|
-
defaultCondition?: number | string;
|
|
39
|
-
|
|
40
|
-
/** Set values of orthogonal data for rendering functions */
|
|
41
|
-
orthogonal?: {[key: string]: string};
|
|
42
|
-
};
|
|
43
|
-
|
|
44
|
-
/** Set a custom title for a column in SearchBuilder */
|
|
45
|
-
searchBuilderTitle?: string;
|
|
46
|
-
|
|
47
|
-
/** Set the SearchBuilder type to use for a column */
|
|
48
|
-
searchBuilderType?: string;
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
interface Api<T> {
|
|
52
|
-
/**
|
|
53
|
-
* SearchBuilder methods container
|
|
54
|
-
*
|
|
55
|
-
* @returns Api for chaining with the additional SearchBuilder methods
|
|
56
|
-
*/
|
|
57
|
-
searchBuilder: ApiSearchBuilder<T>;
|
|
58
|
-
}
|
|
59
|
-
|
|
60
|
-
interface ApiStatic {
|
|
61
|
-
/**
|
|
62
|
-
* SearchBuilder class
|
|
63
|
-
*/
|
|
64
|
-
SearchBuilder: {
|
|
65
|
-
/**
|
|
66
|
-
* Create a new SearchBuilder instance for the target DataTable
|
|
67
|
-
*/
|
|
68
|
-
new (dt: Api<any>, settings: string[] | ConfigSearchBuilder | ConfigSearchBuilder[]);
|
|
69
|
-
|
|
70
|
-
/**
|
|
71
|
-
* SearchBuilder version
|
|
72
|
-
*/
|
|
73
|
-
version: string;
|
|
74
|
-
|
|
75
|
-
/**
|
|
76
|
-
* Default configuration values
|
|
77
|
-
*/
|
|
78
|
-
defaults: ConfigSearchBuilder;
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
|
85
|
-
* Options
|
|
86
|
-
*/
|
|
87
|
-
|
|
88
|
-
interface ConfigSearchBuilder extends Partial<IDefaults> {}
|
|
89
|
-
|
|
90
|
-
interface ConfigSearchBuilderLanguage extends DeepPartial<II18n> {}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
|
94
|
-
* API
|
|
95
|
-
*/
|
|
96
|
-
interface ApiSearchBuilder<T> extends Api<T> {
|
|
97
|
-
/**
|
|
98
|
-
* Returns the node of the SearchBuilder Container
|
|
99
|
-
*/
|
|
100
|
-
container(): JQuery<HTMLElement>;
|
|
101
|
-
|
|
102
|
-
/**
|
|
103
|
-
* Gets the details of the current SearchBuilder setup
|
|
104
|
-
*/
|
|
105
|
-
getDetails(): IDetails;
|
|
106
|
-
|
|
107
|
-
/**
|
|
108
|
-
* Rebuild the search to a given state.
|
|
109
|
-
*
|
|
110
|
-
* @param state Object of the same structure that is returned from searchBuilder.getDetails().
|
|
111
|
-
* This contains all of the details needed to rebuild the state.
|
|
112
|
-
* @returns self for chaining
|
|
113
|
-
*/
|
|
114
|
-
rebuild(state: IDetails): Api<T>;
|
|
115
|
-
}
|