@onehat/ui 0.4.44 → 0.4.45
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/package.json +1 -1
- package/src/Components/Form/Field/Combo/Combo.js +4 -1
- package/src/Components/Form/Field/Slider.js +2 -1
- package/src/Components/Form/Field/Tag/Tag.js +6 -0
- package/src/Components/Hoc/withFilters.js +1 -1
- package/src/Components/Window/UploadsDownloadsWindow.js +1 -5
- /package/src/Data/{Hoc → hoc}/withRedux.js +0 -0
package/package.json
CHANGED
|
@@ -722,7 +722,7 @@ export const ComboComponent = forwardRef((props, ref) => {
|
|
|
722
722
|
// 'data',
|
|
723
723
|
'idIx',
|
|
724
724
|
'displayIx',
|
|
725
|
-
'value',
|
|
725
|
+
// 'value',
|
|
726
726
|
'disableView',
|
|
727
727
|
'disableCopy',
|
|
728
728
|
'disableDuplicate',
|
|
@@ -732,6 +732,9 @@ export const ComboComponent = forwardRef((props, ref) => {
|
|
|
732
732
|
'selectorSelectedField',
|
|
733
733
|
'usePermissions',
|
|
734
734
|
]);
|
|
735
|
+
if (!isInTag) {
|
|
736
|
+
gridProps.value = props.value;
|
|
737
|
+
}
|
|
735
738
|
if (!Repository) {
|
|
736
739
|
gridProps.data = filteredData;
|
|
737
740
|
}
|
|
@@ -148,6 +148,7 @@ function SliderElement(props) {
|
|
|
148
148
|
}
|
|
149
149
|
|
|
150
150
|
let className = `
|
|
151
|
+
Slider
|
|
151
152
|
w-full
|
|
152
153
|
items-center
|
|
153
154
|
`,
|
|
@@ -184,7 +185,7 @@ function SliderElement(props) {
|
|
|
184
185
|
tooltipPlacement={tooltipPlacement}
|
|
185
186
|
{...props._input}
|
|
186
187
|
/>
|
|
187
|
-
<HStack className="flex-1">
|
|
188
|
+
<HStack className="SliderContainer flex-1">
|
|
188
189
|
<Slider
|
|
189
190
|
{...testProps('slider')}
|
|
190
191
|
ref={props.outerRef}
|
|
@@ -38,6 +38,9 @@ function TagComponent(props) {
|
|
|
38
38
|
// withComponent
|
|
39
39
|
self,
|
|
40
40
|
|
|
41
|
+
// withFilters
|
|
42
|
+
isInFilter,
|
|
43
|
+
|
|
41
44
|
// withValue
|
|
42
45
|
value = [],
|
|
43
46
|
setValue,
|
|
@@ -246,6 +249,9 @@ function TagComponent(props) {
|
|
|
246
249
|
w-full
|
|
247
250
|
p-0
|
|
248
251
|
`;
|
|
252
|
+
if (isInFilter) {
|
|
253
|
+
className += ' max-w-[250px]';
|
|
254
|
+
}
|
|
249
255
|
if (props.className) {
|
|
250
256
|
className += ' ' + props.className;
|
|
251
257
|
}
|
|
@@ -307,7 +307,7 @@ export default function withFilters(WrappedComponent) {
|
|
|
307
307
|
placeholder={tooltip}
|
|
308
308
|
value={getFilterValue(field)}
|
|
309
309
|
onChangeValue={(value) => onFilterChangeValue(field, value)}
|
|
310
|
-
|
|
310
|
+
isInFilter={true}
|
|
311
311
|
minimizeForRow={true}
|
|
312
312
|
{...filterProps}
|
|
313
313
|
{...elementProps}
|
|
@@ -45,10 +45,6 @@ function UploadsDownloadsWindow(props) {
|
|
|
45
45
|
|
|
46
46
|
const
|
|
47
47
|
baseURL = Repository.api.baseURL,
|
|
48
|
-
filters = Repository.filters.reduce((result, current) => {
|
|
49
|
-
result[current.name] = current.value;
|
|
50
|
-
return result;
|
|
51
|
-
}, {}),
|
|
52
48
|
columns = columnsConfig.map((column) => {
|
|
53
49
|
return column.fieldName;
|
|
54
50
|
}),
|
|
@@ -62,11 +58,11 @@ function UploadsDownloadsWindow(props) {
|
|
|
62
58
|
body: JSON.stringify({
|
|
63
59
|
download_token,
|
|
64
60
|
report_id: 1,
|
|
65
|
-
filters,
|
|
66
61
|
columns,
|
|
67
62
|
order,
|
|
68
63
|
model,
|
|
69
64
|
isTemplate,
|
|
65
|
+
...Repository._params,
|
|
70
66
|
...downloadParams,
|
|
71
67
|
}),
|
|
72
68
|
headers: _.merge({ 'Content-Type': 'application/json' }, Repository.headers, downloadHeaders),
|
|
File without changes
|