adminforth 1.2.34 → 1.2.35
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/dataConnectors/clickhouse.ts +3 -1
- package/dist/dataConnectors/clickhouse.js +1 -1
- package/dist/spa/spa/src/components/CustomDatePicker.vue +3 -3
- package/dist/spa/spa/src/components/CustomRangePicker.vue +1 -1
- package/package.json +1 -1
- package/spa/src/components/CustomDatePicker.vue +3 -3
- package/spa/src/components/CustomRangePicker.vue +1 -1
|
@@ -190,7 +190,9 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
|
|
|
190
190
|
let field = f.field;
|
|
191
191
|
let operator = this.OperatorsMap[f.operator];
|
|
192
192
|
if (f.operator == AdminForthFilterOperators.IN || f.operator == AdminForthFilterOperators.NIN) {
|
|
193
|
-
placeholder = `(${f.value.map((_, j) => `p${i}_${j}
|
|
193
|
+
placeholder = `(${f.value.map((_, j) => `{p${i}_${j}:${
|
|
194
|
+
column._underlineType
|
|
195
|
+
}}`).join(', ')})`;
|
|
194
196
|
}
|
|
195
197
|
|
|
196
198
|
return `${field} ${operator} ${placeholder}`
|
|
@@ -194,7 +194,7 @@ class ClickhouseConnector extends AdminForthBaseConnector {
|
|
|
194
194
|
let field = f.field;
|
|
195
195
|
let operator = this.OperatorsMap[f.operator];
|
|
196
196
|
if (f.operator == AdminForthFilterOperators.IN || f.operator == AdminForthFilterOperators.NIN) {
|
|
197
|
-
placeholder = `(${f.value.map((_, j) => `p${i}_${j}`).join(', ')})`;
|
|
197
|
+
placeholder = `(${f.value.map((_, j) => `{p${i}_${j}:${column._underlineType}}`).join(', ')})`;
|
|
198
198
|
}
|
|
199
199
|
return `${field} ${operator} ${placeholder}`;
|
|
200
200
|
}).join(' AND ')}` : '';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div>
|
|
3
|
-
<div class="
|
|
3
|
+
<div class="grid w-40 gap-4 mb-2">
|
|
4
4
|
<div>
|
|
5
5
|
<label for="start-time" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">{{ label }}</label>
|
|
6
6
|
|
|
@@ -11,13 +11,13 @@
|
|
|
11
11
|
|
|
12
12
|
<input ref="datepickerStartEl" type="text"
|
|
13
13
|
class="bg-gray-50 border leading-none border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
|
|
14
|
-
placeholder="
|
|
14
|
+
placeholder="Select date">
|
|
15
15
|
</div>
|
|
16
16
|
</div>
|
|
17
17
|
</div>
|
|
18
18
|
|
|
19
19
|
<div>
|
|
20
|
-
<div class="
|
|
20
|
+
<div class="grid w-40 gap-4 mb-2" :class="{hidden: !showTimeInputs}">
|
|
21
21
|
<div>
|
|
22
22
|
<div class="relative">
|
|
23
23
|
<div class="absolute inset-y-0 end-0 top-0 flex items-center pe-3.5 pointer-events-none">
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div>
|
|
3
|
-
<div class="
|
|
3
|
+
<div class="grid w-40 gap-4 mb-2">
|
|
4
4
|
<div>
|
|
5
5
|
<label for="start-time" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">{{ label }}</label>
|
|
6
6
|
|
|
@@ -11,13 +11,13 @@
|
|
|
11
11
|
|
|
12
12
|
<input ref="datepickerStartEl" type="text"
|
|
13
13
|
class="bg-gray-50 border leading-none border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
|
|
14
|
-
placeholder="
|
|
14
|
+
placeholder="Select date">
|
|
15
15
|
</div>
|
|
16
16
|
</div>
|
|
17
17
|
</div>
|
|
18
18
|
|
|
19
19
|
<div>
|
|
20
|
-
<div class="
|
|
20
|
+
<div class="grid w-40 gap-4 mb-2" :class="{hidden: !showTimeInputs}">
|
|
21
21
|
<div>
|
|
22
22
|
<div class="relative">
|
|
23
23
|
<div class="absolute inset-y-0 end-0 top-0 flex items-center pe-3.5 pointer-events-none">
|