@datagrok-libraries/utils 4.6.5 → 4.6.6
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/query-builder.css +15 -3
- package/package.json +1 -1
- package/src/query-builder/query-builder.d.ts +14 -10
- package/src/query-builder/query-builder.d.ts.map +1 -1
- package/src/query-builder/query-builder.js +172 -118
- package/src/viewers/forms-viewer.d.ts +3 -1
- package/src/viewers/forms-viewer.d.ts.map +1 -1
- package/src/viewers/forms-viewer.js +70 -26
package/css/query-builder.css
CHANGED
|
@@ -3,12 +3,20 @@
|
|
|
3
3
|
color: #2083D5;
|
|
4
4
|
}
|
|
5
5
|
|
|
6
|
+
.query-builder-search-query-operator .fa-trash-alt:hover {
|
|
7
|
+
color: red;
|
|
8
|
+
}
|
|
9
|
+
|
|
6
10
|
.query-builder-nested-condition-operators .fa-trash-alt {
|
|
7
11
|
padding: 0px 7px 0px 5px;
|
|
8
|
-
font-size:
|
|
12
|
+
font-size: 12px !important;
|
|
9
13
|
margin-top: 2px;
|
|
10
14
|
}
|
|
11
15
|
|
|
16
|
+
.query-builder-nested-condition-operators .fa-trash-alt:hover {
|
|
17
|
+
color: red;
|
|
18
|
+
}
|
|
19
|
+
|
|
12
20
|
.query-builder-search-query-operator .fa-plus {
|
|
13
21
|
color: #2083D5;
|
|
14
22
|
}
|
|
@@ -87,7 +95,7 @@
|
|
|
87
95
|
|
|
88
96
|
.query-builder-filter-inputs .add-delete-icons {
|
|
89
97
|
visibility: hidden;
|
|
90
|
-
gap:
|
|
98
|
+
gap: 10px;
|
|
91
99
|
padding-top: 15px;
|
|
92
100
|
}
|
|
93
101
|
|
|
@@ -170,7 +178,7 @@
|
|
|
170
178
|
.add-delete-icons {
|
|
171
179
|
display: flex;
|
|
172
180
|
align-items: center;
|
|
173
|
-
gap:
|
|
181
|
+
gap: 10px;
|
|
174
182
|
flex-shrink: 0;
|
|
175
183
|
}
|
|
176
184
|
|
|
@@ -201,3 +209,7 @@
|
|
|
201
209
|
visibility: hidden;
|
|
202
210
|
}
|
|
203
211
|
|
|
212
|
+
.boolean-input .query-builder-filter-operator {
|
|
213
|
+
display: none;
|
|
214
|
+
}
|
|
215
|
+
|
package/package.json
CHANGED
|
@@ -42,37 +42,38 @@ export declare class BaseConditionEditor<T = any> {
|
|
|
42
42
|
root: HTMLDivElement;
|
|
43
43
|
condition: SimpleCondition<T>;
|
|
44
44
|
onChanged: Subject<SimpleCondition<T>>;
|
|
45
|
+
onValidationError: Subject<boolean>;
|
|
45
46
|
showSuggestions: boolean;
|
|
46
47
|
suggestionsMenuClicked: boolean;
|
|
47
48
|
constructor(prop: DG.Property, operator: string, initialCondition?: SimpleCondition<T>);
|
|
48
|
-
protected initializeEditor(prop: DG.Property):
|
|
49
|
+
protected initializeEditor(prop: DG.Property): Promise<DG.InputBase[]>;
|
|
49
50
|
initializeSuggestions(prop: DG.Property, input: DG.InputBase): void;
|
|
50
51
|
addSuggestions(prop: DG.Property, input: DG.InputBase): Promise<void>;
|
|
51
52
|
}
|
|
52
53
|
export declare class BetweenConditionEditor extends BaseConditionEditor {
|
|
53
|
-
initializeEditor(prop: DG.Property):
|
|
54
|
+
initializeEditor(prop: DG.Property): Promise<DG.InputBase[]>;
|
|
54
55
|
}
|
|
55
56
|
export declare class BooleanConditionEditor extends BaseConditionEditor {
|
|
56
|
-
initializeEditor(prop: DG.Property):
|
|
57
|
+
initializeEditor(prop: DG.Property): Promise<DG.InputBase[]>;
|
|
57
58
|
}
|
|
58
59
|
export declare class MoleculeConditionEditor extends BaseConditionEditor<string> {
|
|
59
|
-
initializeEditor(prop: DG.Property):
|
|
60
|
+
initializeEditor(prop: DG.Property): Promise<DG.InputBase[]>;
|
|
60
61
|
}
|
|
61
62
|
export type MoleculeSimilarity = {
|
|
62
63
|
molecule: string;
|
|
63
64
|
threshold: number;
|
|
64
65
|
};
|
|
65
66
|
export declare class MoleculeSimilarityConditionEditor extends BaseConditionEditor<MoleculeSimilarity> {
|
|
66
|
-
initializeEditor(prop: DG.Property):
|
|
67
|
+
initializeEditor(prop: DG.Property): Promise<DG.InputBase[]>;
|
|
67
68
|
}
|
|
68
69
|
export declare class MultiValueConditionEditorString extends BaseConditionEditor<string[]> {
|
|
69
|
-
initializeEditor(prop: DG.Property):
|
|
70
|
+
initializeEditor(prop: DG.Property): Promise<DG.InputBase[]>;
|
|
70
71
|
}
|
|
71
72
|
export declare class MultiValueConditionEditorInt extends BaseConditionEditor<number[]> {
|
|
72
|
-
initializeEditor(prop: DG.Property):
|
|
73
|
+
initializeEditor(prop: DG.Property): Promise<DG.InputBase[]>;
|
|
73
74
|
}
|
|
74
75
|
export declare class MultiValueConditionEditorFloat extends BaseConditionEditor<number[]> {
|
|
75
|
-
initializeEditor(prop: DG.Property):
|
|
76
|
+
initializeEditor(prop: DG.Property): Promise<DG.InputBase[]>;
|
|
76
77
|
}
|
|
77
78
|
export declare class ConditionRegistry {
|
|
78
79
|
private static instance;
|
|
@@ -104,15 +105,18 @@ export declare class QueryBuilder {
|
|
|
104
105
|
properties: DG.Property[];
|
|
105
106
|
structureChanged: Subject<ComplexCondition>;
|
|
106
107
|
filterValueChanged: Subject<SimpleCondition>;
|
|
108
|
+
validationError: Subject<boolean>;
|
|
109
|
+
invalid: boolean;
|
|
107
110
|
layout: QueryBuilderLayout;
|
|
108
111
|
private _historyCacheKey;
|
|
109
112
|
private historyIcon;
|
|
110
|
-
|
|
113
|
+
private historyIconOnTop;
|
|
114
|
+
constructor(properties: DG.Property[], initialCondition?: ComplexCondition, layout?: QueryBuilderLayout, historyCacheKey?: string, historyIconOnTop?: boolean);
|
|
111
115
|
set historyCache(key: string);
|
|
112
116
|
saveConditionToHistory(): void;
|
|
113
117
|
private setupHistoryIcon;
|
|
114
118
|
private showHistoryMenu;
|
|
115
|
-
|
|
119
|
+
loadCondition(condition: ComplexCondition): void;
|
|
116
120
|
conditionToString(condition: ComplexCondition): string;
|
|
117
121
|
private expressionToString;
|
|
118
122
|
private simpleConditionToString;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-builder.d.ts","sourceRoot":"","sources":["query-builder.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,6BAA6B,CAAC;AAGrC,eAAO,MAAM,oBAAoB,wBAAwB,CAAC;AAE1D,yBAAiB,SAAS,CAAC;IAChB,MAAM,QAAQ,aAAa,CAAC;IAC5B,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,WAAW,gBAAgB,CAAC;IAClC,MAAM,SAAS,cAAc,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,GAAG,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,GAAG,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,MAAM,OAAO,CAAC;IACpB,MAAM,MAAM,WAAW,CAAC;IACxB,MAAM,KAAK,UAAU,CAAC;IACtB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,OAAO,YAAY,CAAC;IAC1B,MAAM,UAAU,eAAe,CAAC;IAChC,MAAM,YAAY,iBAAiB,CAAC;IAE3C,KAAY,OAAO;QACf,GAAG,QAAQ;QACX,EAAE,OAAO;KACZ;CACJ;AAED,oBAAY,kBAAkB;IAC1B,QAAQ,aAAa;IACrB,MAAM,WAAW;CACpB;AAED,MAAM,WAAW,eAAe,CAAC,CAAC,GAAG,GAAG;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,CAAC,CAAC;CACZ;AAED,MAAM,WAAW,gBAAgB;IAC7B,eAAe,EAAE,SAAS,CAAC,OAAO,CAAC;IACnC,UAAU,EAAE,UAAU,EAAE,CAAC;CAC5B;AAED,MAAM,MAAM,UAAU,CAAC,CAAC,GAAG,GAAG,IAAI,eAAe,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC;AAGxE,qBAAa,mBAAmB,CAAC,CAAC,GAAG,GAAG;IACpC,IAAI,EAAE,cAAc,CAAY;IAChC,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;IAC9B,SAAS,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAqC;IAC3E,eAAe,UAAS;IACxB,sBAAsB,UAAS;gBAEnB,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"query-builder.d.ts","sourceRoot":"","sources":["query-builder.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,6BAA6B,CAAC;AAGrC,eAAO,MAAM,oBAAoB,wBAAwB,CAAC;AAE1D,yBAAiB,SAAS,CAAC;IAChB,MAAM,QAAQ,aAAa,CAAC;IAC5B,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,WAAW,gBAAgB,CAAC;IAClC,MAAM,SAAS,cAAc,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,GAAG,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,GAAG,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,MAAM,OAAO,CAAC;IACpB,MAAM,MAAM,WAAW,CAAC;IACxB,MAAM,KAAK,UAAU,CAAC;IACtB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,OAAO,YAAY,CAAC;IAC1B,MAAM,UAAU,eAAe,CAAC;IAChC,MAAM,YAAY,iBAAiB,CAAC;IAE3C,KAAY,OAAO;QACf,GAAG,QAAQ;QACX,EAAE,OAAO;KACZ;CACJ;AAED,oBAAY,kBAAkB;IAC1B,QAAQ,aAAa;IACrB,MAAM,WAAW;CACpB;AAED,MAAM,WAAW,eAAe,CAAC,CAAC,GAAG,GAAG;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,CAAC,CAAC;CACZ;AAED,MAAM,WAAW,gBAAgB;IAC7B,eAAe,EAAE,SAAS,CAAC,OAAO,CAAC;IACnC,UAAU,EAAE,UAAU,EAAE,CAAC;CAC5B;AAED,MAAM,MAAM,UAAU,CAAC,CAAC,GAAG,GAAG,IAAI,eAAe,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC;AAGxE,qBAAa,mBAAmB,CAAC,CAAC,GAAG,GAAG;IACpC,IAAI,EAAE,cAAc,CAAY;IAChC,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;IAC9B,SAAS,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAqC;IAC3E,iBAAiB,EAAE,OAAO,CAAC,OAAO,CAAC,CAA0B;IAC7D,eAAe,UAAS;IACxB,sBAAsB,UAAS;gBAEnB,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC;cAiBtE,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,GAAG,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;IAoB5E,qBAAqB,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,CAAC,SAAS;IAOtD,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,CAAC,SAAS;CAkB9D;AAED,qBAAa,sBAAuB,SAAQ,mBAAmB;IAC5C,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,GAAG,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;CAyB9E;AAED,qBAAa,sBAAuB,SAAQ,mBAAmB;IAC5C,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,GAAG,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;CAgB9E;AAED,qBAAa,uBAAwB,SAAQ,mBAAmB,CAAC,MAAM,CAAC;IACrD,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,GAAG,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;CAqB9E;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAA;CACpB,CAAA;AACD,qBAAa,iCAAkC,SAAQ,mBAAmB,CAAC,kBAAkB,CAAC;IAC3E,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,GAAG,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;CA0B9E;AAGD,qBAAa,+BAAgC,SAAQ,mBAAmB,CAAC,MAAM,EAAE,CAAC;IAC/D,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,GAAG,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;CAe9E;AAED,qBAAa,4BAA6B,SAAQ,mBAAmB,CAAC,MAAM,EAAE,CAAC;IAC5D,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,GAAG,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;CAe9E;AAED,qBAAa,8BAA+B,SAAQ,mBAAmB,CAAC,MAAM,EAAE,CAAC;IAC9D,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,GAAG,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;CAe9E;AAGD,qBAAa,iBAAiB;IAC1B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAoB;IAC3C,OAAO,CAAC,aAAa,CAAoC;IACzD,OAAO,CAAC,gBAAgB,CAAoC;IAC5D,OAAO,CAAC,cAAc,CAAoH;IAE1I,OAAO;IAKP,MAAM,CAAC,WAAW,IAAI,iBAAiB;IAOvC,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,wBAAwB;IAuBhC,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI;IAItE,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI;IAKpE,uBAAuB,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,GAAG,MAAM,EAAE;IAUxD,mBAAmB,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO;IAMrE,cAAc,CAAC,CAAC,EACZ,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,KAAK,IAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,KAAK,mBAAmB,CAAC,CAAC,CAAC,GACjF,IAAI;IAMP,YAAY,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC;IA0BvH,kBAAkB,CAAC,CAAC,GAAG,GAAG,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC;IAQ5H,OAAO,CAAC,eAAe;CAG1B;AAGD,MAAM,MAAM,WAAW,GAAG;IACtB,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;CACjB,CAAA;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QASrD;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,EAAE,CAErD;AAED,qBAAa,YAAY;IACrB,IAAI,EAAE,WAAW,CAAC;IAClB,SAAS,EAAE,gBAAgB,CAAC;IAC5B,UAAU,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC;IAC1B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAmC;IAC9E,kBAAkB,EAAE,OAAO,CAAC,eAAe,CAAC,CAAkC;IAC9E,eAAe,EAAE,OAAO,CAAC,OAAO,CAAC,CAA0B;IAC3D,OAAO,UAAS;IAChB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,WAAW,CAA4B;IAC/C,OAAO,CAAC,gBAAgB,CAAS;gBAErB,UAAU,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE,gBAAgB,CAAC,EAAE,gBAAgB,EAAE,MAAM,GAAE,kBAAgD,EAChI,eAAe,GAAE,MAAW,EAAE,gBAAgB,UAAQ;IAoB1D,IAAI,YAAY,CAAC,GAAG,EAAE,MAAM,EAG3B;IAED,sBAAsB,IAAI,IAAI;IAK9B,OAAO,CAAC,gBAAgB;IAoBxB,OAAO,CAAC,eAAe;IAYvB,aAAa,CAAC,SAAS,EAAE,gBAAgB,GAAG,IAAI;IAMhD,iBAAiB,CAAC,SAAS,EAAE,gBAAgB,GAAG,MAAM;IAiBtD,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,uBAAuB;IAU/B,4BAA4B,IAAI,eAAe;IAoB/C,SAAS,IAAI,IAAI;IASjB,SAAS,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI;IAsB3C,SAAS,IAAI,kBAAkB;IAI/B,OAAO,CACH,SAAS,EAAE,gBAAgB,EAC3B,eAAe,CAAC,EAAE,gBAAgB,EAClC,YAAY,GAAE,MAAU,GACzB,WAAW;IAuMd,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;CAY9C"}
|