@deephaven/iris-grid 0.30.2-beta.7 → 0.31.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/dist/GotoRow.css +1 -1
- package/dist/GotoRow.css.map +1 -1
- package/dist/GotoRow.d.ts.map +1 -1
- package/dist/GotoRow.js +26 -3
- package/dist/GotoRow.js.map +1 -1
- package/dist/IrisGrid.d.ts.map +1 -1
- package/dist/IrisGrid.js +96 -51
- package/dist/IrisGrid.js.map +1 -1
- package/dist/IrisGridUtils.d.ts +6 -0
- package/dist/IrisGridUtils.d.ts.map +1 -1
- package/dist/IrisGridUtils.js +26 -0
- package/dist/IrisGridUtils.js.map +1 -1
- package/dist/sidebar/AdvancedSettingsMenu.js +2 -2
- package/dist/sidebar/AdvancedSettingsMenu.js.map +1 -1
- package/dist/sidebar/RollupRows.js +1 -1
- package/dist/sidebar/RollupRows.js.map +1 -1
- package/dist/sidebar/SelectDistinctBuilder.d.ts.map +1 -1
- package/dist/sidebar/SelectDistinctBuilder.js +1 -3
- package/dist/sidebar/SelectDistinctBuilder.js.map +1 -1
- package/dist/sidebar/conditional-formatting/ConditionalFormattingUtils.d.ts.map +1 -1
- package/dist/sidebar/conditional-formatting/ConditionalFormattingUtils.js +20 -3
- package/dist/sidebar/conditional-formatting/ConditionalFormattingUtils.js.map +1 -1
- package/package.json +15 -15
package/dist/IrisGrid.js
CHANGED
|
@@ -138,7 +138,7 @@ export class IrisGrid extends Component {
|
|
|
138
138
|
}
|
|
139
139
|
optionItems.push({
|
|
140
140
|
type: OptionType.VISIBILITY_ORDERING_BUILDER,
|
|
141
|
-
title: '
|
|
141
|
+
title: 'Organize Columns',
|
|
142
142
|
icon: dhEye
|
|
143
143
|
});
|
|
144
144
|
if (isFormatColumnsAvailable) {
|
|
@@ -1734,6 +1734,7 @@ export class IrisGrid extends Component {
|
|
|
1734
1734
|
});
|
|
1735
1735
|
}
|
|
1736
1736
|
toggleGotoRow() {
|
|
1737
|
+
var _this$grid15, _this$grid16;
|
|
1737
1738
|
var row = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
|
|
1738
1739
|
var value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
|
|
1739
1740
|
var columnName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
|
|
@@ -1753,10 +1754,34 @@ export class IrisGrid extends Component {
|
|
|
1753
1754
|
this.focusRowInGrid(row);
|
|
1754
1755
|
return;
|
|
1755
1756
|
}
|
|
1757
|
+
var cursorRow = (_this$grid15 = this.grid) === null || _this$grid15 === void 0 ? void 0 : _this$grid15.state.cursorRow;
|
|
1758
|
+
var cursorColumn = (_this$grid16 = this.grid) === null || _this$grid16 === void 0 ? void 0 : _this$grid16.state.cursorColumn;
|
|
1759
|
+
if (cursorRow == null || cursorColumn == null) {
|
|
1760
|
+
// if a cell is not selected / grid is not rendered
|
|
1761
|
+
this.setState({
|
|
1762
|
+
isGotoShown: !isGotoShown,
|
|
1763
|
+
gotoRow: '',
|
|
1764
|
+
gotoValue: '',
|
|
1765
|
+
gotoRowError: '',
|
|
1766
|
+
gotoValueError: ''
|
|
1767
|
+
});
|
|
1768
|
+
return;
|
|
1769
|
+
}
|
|
1770
|
+
// if a row is selected
|
|
1771
|
+
var {
|
|
1772
|
+
model
|
|
1773
|
+
} = this.props;
|
|
1774
|
+
var {
|
|
1775
|
+
name,
|
|
1776
|
+
type
|
|
1777
|
+
} = model.columns[cursorColumn];
|
|
1778
|
+
var cellValue = model.valueForCell(cursorColumn, cursorRow);
|
|
1779
|
+
var text = IrisGridUtils.convertValueToText(cellValue, type);
|
|
1756
1780
|
this.setState({
|
|
1757
1781
|
isGotoShown: !isGotoShown,
|
|
1758
|
-
gotoRow:
|
|
1759
|
-
gotoValue:
|
|
1782
|
+
gotoRow: "".concat(cursorRow),
|
|
1783
|
+
gotoValue: text,
|
|
1784
|
+
gotoValueSelectedColumnName: name,
|
|
1760
1785
|
gotoRowError: '',
|
|
1761
1786
|
gotoValueError: ''
|
|
1762
1787
|
});
|
|
@@ -1885,7 +1910,7 @@ export class IrisGrid extends Component {
|
|
|
1885
1910
|
this.setAdvancedFilter(index, filter, options);
|
|
1886
1911
|
}
|
|
1887
1912
|
handleAdvancedFilterSortChange(column, direction) {
|
|
1888
|
-
var _this$
|
|
1913
|
+
var _this$grid17;
|
|
1889
1914
|
var addToExisting = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
|
|
1890
1915
|
var {
|
|
1891
1916
|
model
|
|
@@ -1907,11 +1932,11 @@ export class IrisGrid extends Component {
|
|
|
1907
1932
|
this.setState({
|
|
1908
1933
|
sorts
|
|
1909
1934
|
});
|
|
1910
|
-
(_this$
|
|
1935
|
+
(_this$grid17 = this.grid) === null || _this$grid17 === void 0 ? void 0 : _this$grid17.forceUpdate();
|
|
1911
1936
|
}
|
|
1912
1937
|
handleAdvancedFilterDone() {
|
|
1913
|
-
var _this$
|
|
1914
|
-
(_this$
|
|
1938
|
+
var _this$grid18;
|
|
1939
|
+
(_this$grid18 = this.grid) === null || _this$grid18 === void 0 ? void 0 : _this$grid18.focus();
|
|
1915
1940
|
}
|
|
1916
1941
|
handleAdvancedMenuOpened(column) {
|
|
1917
1942
|
this.setState({
|
|
@@ -1992,8 +2017,8 @@ export class IrisGrid extends Component {
|
|
|
1992
2017
|
var setGridFocus = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
|
|
1993
2018
|
var defocusInput = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
|
|
1994
2019
|
if (setGridFocus) {
|
|
1995
|
-
var _this$
|
|
1996
|
-
(_this$
|
|
2020
|
+
var _this$grid19;
|
|
2021
|
+
(_this$grid19 = this.grid) === null || _this$grid19 === void 0 ? void 0 : _this$grid19.focus();
|
|
1997
2022
|
}
|
|
1998
2023
|
if (defocusInput) {
|
|
1999
2024
|
this.setState({
|
|
@@ -2083,7 +2108,7 @@ export class IrisGrid extends Component {
|
|
|
2083
2108
|
}
|
|
2084
2109
|
}
|
|
2085
2110
|
handleUpdate() {
|
|
2086
|
-
var _this$
|
|
2111
|
+
var _this$grid20;
|
|
2087
2112
|
this.stopLoading();
|
|
2088
2113
|
log.debug2('Received model update');
|
|
2089
2114
|
var {
|
|
@@ -2113,16 +2138,16 @@ export class IrisGrid extends Component {
|
|
|
2113
2138
|
} else {
|
|
2114
2139
|
this.lastLoadedConfig = null;
|
|
2115
2140
|
}
|
|
2116
|
-
(_this$
|
|
2141
|
+
(_this$grid20 = this.grid) === null || _this$grid20 === void 0 ? void 0 : _this$grid20.forceUpdate();
|
|
2117
2142
|
}
|
|
2118
2143
|
handleViewChanged(metrics) {
|
|
2119
|
-
var _this$grid$state, _this$
|
|
2144
|
+
var _this$grid$state, _this$grid21;
|
|
2120
2145
|
var {
|
|
2121
2146
|
model
|
|
2122
2147
|
} = this.props;
|
|
2123
2148
|
var {
|
|
2124
2149
|
selectionEndRow = 0
|
|
2125
|
-
} = (_this$grid$state = (_this$
|
|
2150
|
+
} = (_this$grid$state = (_this$grid21 = this.grid) === null || _this$grid21 === void 0 ? void 0 : _this$grid21.state) !== null && _this$grid$state !== void 0 ? _this$grid$state : {};
|
|
2126
2151
|
var pendingRowCount = 0;
|
|
2127
2152
|
if (isEditableGridModel(model) && model.isEditable) {
|
|
2128
2153
|
assertNotNull(metrics);
|
|
@@ -2179,8 +2204,8 @@ export class IrisGrid extends Component {
|
|
|
2179
2204
|
this.setState({
|
|
2180
2205
|
columnHeaderGroups: IrisGridUtils.parseColumnHeaderGroups(model, columnHeaderGroups).groups
|
|
2181
2206
|
}, () => {
|
|
2182
|
-
var _this$
|
|
2183
|
-
return (_this$
|
|
2207
|
+
var _this$grid22;
|
|
2208
|
+
return (_this$grid22 = this.grid) === null || _this$grid22 === void 0 ? void 0 : _this$grid22.forceUpdate();
|
|
2184
2209
|
});
|
|
2185
2210
|
}
|
|
2186
2211
|
handleTooltipRef(tooltip) {
|
|
@@ -2319,9 +2344,9 @@ export class IrisGrid extends Component {
|
|
|
2319
2344
|
isReady
|
|
2320
2345
|
} = this.state;
|
|
2321
2346
|
if (isReady) {
|
|
2322
|
-
var _this$
|
|
2347
|
+
var _this$grid23;
|
|
2323
2348
|
this.stopLoading();
|
|
2324
|
-
(_this$
|
|
2349
|
+
(_this$grid23 = this.grid) === null || _this$grid23 === void 0 ? void 0 : _this$grid23.forceUpdate();
|
|
2325
2350
|
} else {
|
|
2326
2351
|
this.initState();
|
|
2327
2352
|
}
|
|
@@ -2333,7 +2358,7 @@ export class IrisGrid extends Component {
|
|
|
2333
2358
|
return this.discardPending();
|
|
2334
2359
|
}
|
|
2335
2360
|
handlePendingDataUpdated() {
|
|
2336
|
-
var _this$
|
|
2361
|
+
var _this$grid24;
|
|
2337
2362
|
log.debug('pending data updated');
|
|
2338
2363
|
var {
|
|
2339
2364
|
model
|
|
@@ -2347,7 +2372,7 @@ export class IrisGrid extends Component {
|
|
|
2347
2372
|
pendingDataErrors,
|
|
2348
2373
|
pendingSaveError: null
|
|
2349
2374
|
});
|
|
2350
|
-
(_this$
|
|
2375
|
+
(_this$grid24 = this.grid) === null || _this$grid24 === void 0 ? void 0 : _this$grid24.forceUpdate();
|
|
2351
2376
|
}
|
|
2352
2377
|
|
|
2353
2378
|
/**
|
|
@@ -2468,6 +2493,7 @@ export class IrisGrid extends Component {
|
|
|
2468
2493
|
var _arguments = arguments,
|
|
2469
2494
|
_this5 = this;
|
|
2470
2495
|
return _asyncToGenerator(function* () {
|
|
2496
|
+
var _this5$grid;
|
|
2471
2497
|
var isBackwards = _arguments.length > 1 && _arguments[1] !== undefined ? _arguments[1] : false;
|
|
2472
2498
|
var {
|
|
2473
2499
|
gotoValueSelectedColumnName: selectedColumnName,
|
|
@@ -2482,27 +2508,25 @@ export class IrisGrid extends Component {
|
|
|
2482
2508
|
if (inputString === '') {
|
|
2483
2509
|
return;
|
|
2484
2510
|
}
|
|
2485
|
-
var
|
|
2486
|
-
if (
|
|
2511
|
+
var selectedColumn = IrisGridUtils.getColumnByName(model.columns, selectedColumnName);
|
|
2512
|
+
if (selectedColumn === undefined) {
|
|
2487
2513
|
return;
|
|
2488
2514
|
}
|
|
2489
|
-
var
|
|
2490
|
-
var searchFromRow;
|
|
2491
|
-
if (_this5.grid) {
|
|
2492
|
-
({
|
|
2493
|
-
selectionEndRow: searchFromRow
|
|
2494
|
-
} = _this5.grid.state);
|
|
2495
|
-
}
|
|
2515
|
+
var searchFromRow = (_this5$grid = _this5.grid) === null || _this5$grid === void 0 ? void 0 : _this5$grid.state.cursorRow;
|
|
2496
2516
|
if (searchFromRow == null) {
|
|
2497
2517
|
searchFromRow = 0;
|
|
2498
2518
|
}
|
|
2499
2519
|
var isContains = gotoValueSelectedFilter === FilterType.contains;
|
|
2500
2520
|
var isEquals = gotoValueSelectedFilter === FilterType.eq || gotoValueSelectedFilter === FilterType.eqIgnoreCase;
|
|
2501
2521
|
try {
|
|
2502
|
-
var _this5$
|
|
2522
|
+
var _this5$grid2;
|
|
2523
|
+
var {
|
|
2524
|
+
formatter
|
|
2525
|
+
} = model;
|
|
2503
2526
|
var columnDataType = TableUtils.getNormalizedType(selectedColumn.type);
|
|
2504
2527
|
var rowIndex;
|
|
2505
2528
|
switch (columnDataType) {
|
|
2529
|
+
case TableUtils.dataType.CHAR:
|
|
2506
2530
|
case TableUtils.dataType.STRING:
|
|
2507
2531
|
{
|
|
2508
2532
|
rowIndex = yield model.seekRow(isBackwards === true ? searchFromRow - 1 : searchFromRow + 1, selectedColumn, dh.ValueType.STRING, inputString, isEquals, isContains, isBackwards !== null && isBackwards !== void 0 ? isBackwards : false);
|
|
@@ -2510,9 +2534,6 @@ export class IrisGrid extends Component {
|
|
|
2510
2534
|
}
|
|
2511
2535
|
case TableUtils.dataType.DATETIME:
|
|
2512
2536
|
{
|
|
2513
|
-
var {
|
|
2514
|
-
formatter
|
|
2515
|
-
} = model;
|
|
2516
2537
|
var [startDate] = DateUtils.parseDateRange(inputString, formatter.timeZone);
|
|
2517
2538
|
rowIndex = yield model.seekRow(isBackwards === true ? searchFromRow - 1 : searchFromRow + 1, selectedColumn, dh.ValueType.DATETIME, startDate, undefined, undefined, isBackwards !== null && isBackwards !== void 0 ? isBackwards : false);
|
|
2518
2539
|
break;
|
|
@@ -2522,6 +2543,11 @@ export class IrisGrid extends Component {
|
|
|
2522
2543
|
{
|
|
2523
2544
|
if (!TableUtils.isBigDecimalType(selectedColumn.type) && !TableUtils.isBigIntegerType(selectedColumn.type)) {
|
|
2524
2545
|
var inputValue = parseInt(inputString, 10);
|
|
2546
|
+
if (inputString === '-Infinity') {
|
|
2547
|
+
inputValue = Number.NEGATIVE_INFINITY;
|
|
2548
|
+
} else if (inputString === 'Infinity') {
|
|
2549
|
+
inputValue = Number.POSITIVE_INFINITY;
|
|
2550
|
+
}
|
|
2525
2551
|
rowIndex = yield model.seekRow(searchFromRow, selectedColumn, dh.ValueType.NUMBER, inputValue, undefined, undefined, isBackwards !== null && isBackwards !== void 0 ? isBackwards : false);
|
|
2526
2552
|
} else {
|
|
2527
2553
|
rowIndex = yield model.seekRow(searchFromRow, selectedColumn, dh.ValueType.STRING, inputString, undefined, undefined, isBackwards !== null && isBackwards !== void 0 ? isBackwards : false);
|
|
@@ -2530,10 +2556,10 @@ export class IrisGrid extends Component {
|
|
|
2530
2556
|
}
|
|
2531
2557
|
default:
|
|
2532
2558
|
{
|
|
2533
|
-
rowIndex = yield model.seekRow(searchFromRow, selectedColumn, dh.ValueType.STRING, inputString, undefined, undefined, isBackwards !== null && isBackwards !== void 0 ? isBackwards : false);
|
|
2559
|
+
rowIndex = yield model.seekRow(searchFromRow, selectedColumn, dh.ValueType.STRING, TableUtils.makeValue(selectedColumn.type, inputString, formatter.timeZone), undefined, undefined, isBackwards !== null && isBackwards !== void 0 ? isBackwards : false);
|
|
2534
2560
|
}
|
|
2535
2561
|
}
|
|
2536
|
-
(_this5$
|
|
2562
|
+
(_this5$grid2 = _this5.grid) === null || _this5$grid2 === void 0 ? void 0 : _this5$grid2.setFocusRow(rowIndex);
|
|
2537
2563
|
_this5.setState({
|
|
2538
2564
|
gotoValueError: ''
|
|
2539
2565
|
});
|
|
@@ -2702,22 +2728,22 @@ export class IrisGrid extends Component {
|
|
|
2702
2728
|
gotoRowError: 'Invalid row index'
|
|
2703
2729
|
});
|
|
2704
2730
|
} else if (rowInt === 0) {
|
|
2705
|
-
var _this$
|
|
2731
|
+
var _this$grid25;
|
|
2706
2732
|
this.setState({
|
|
2707
2733
|
gotoRowError: '',
|
|
2708
2734
|
gotoValueError: ''
|
|
2709
2735
|
});
|
|
2710
|
-
(_this$
|
|
2736
|
+
(_this$grid25 = this.grid) === null || _this$grid25 === void 0 ? void 0 : _this$grid25.setFocusRow(0);
|
|
2711
2737
|
} else if (rowInt < 0) {
|
|
2712
|
-
var _this$
|
|
2738
|
+
var _this$grid26;
|
|
2713
2739
|
this.setState({
|
|
2714
2740
|
gotoRowError: '',
|
|
2715
2741
|
gotoValueError: ''
|
|
2716
2742
|
});
|
|
2717
|
-
(_this$
|
|
2743
|
+
(_this$grid26 = this.grid) === null || _this$grid26 === void 0 ? void 0 : _this$grid26.setFocusRow(rowInt + rowCount);
|
|
2718
2744
|
} else {
|
|
2719
|
-
var _this$
|
|
2720
|
-
(_this$
|
|
2745
|
+
var _this$grid27;
|
|
2746
|
+
(_this$grid27 = this.grid) === null || _this$grid27 === void 0 ? void 0 : _this$grid27.setFocusRow(rowInt - 1);
|
|
2721
2747
|
this.setState({
|
|
2722
2748
|
gotoRowError: '',
|
|
2723
2749
|
gotoValueError: ''
|
|
@@ -2816,6 +2842,25 @@ export class IrisGrid extends Component {
|
|
|
2816
2842
|
})));
|
|
2817
2843
|
}
|
|
2818
2844
|
handleGotoValueSelectedColumnNameChanged(columnName) {
|
|
2845
|
+
var _this$grid28;
|
|
2846
|
+
var {
|
|
2847
|
+
model
|
|
2848
|
+
} = this.props;
|
|
2849
|
+
var cursorRow = (_this$grid28 = this.grid) === null || _this$grid28 === void 0 ? void 0 : _this$grid28.state.cursorRow;
|
|
2850
|
+
if (cursorRow != null) {
|
|
2851
|
+
var _index = model.getColumnIndexByName(columnName);
|
|
2852
|
+
var _column3 = IrisGridUtils.getColumnByName(model.columns, columnName);
|
|
2853
|
+
if (_index == null || _column3 == null) {
|
|
2854
|
+
return;
|
|
2855
|
+
}
|
|
2856
|
+
var _value4 = model.valueForCell(_index, cursorRow);
|
|
2857
|
+
var text = IrisGridUtils.convertValueToText(_value4, _column3.type);
|
|
2858
|
+
this.setState({
|
|
2859
|
+
gotoValueSelectedColumnName: columnName,
|
|
2860
|
+
gotoValue: text,
|
|
2861
|
+
gotoValueError: ''
|
|
2862
|
+
});
|
|
2863
|
+
}
|
|
2819
2864
|
this.setState({
|
|
2820
2865
|
gotoValueSelectedColumnName: columnName,
|
|
2821
2866
|
gotoValueError: ''
|
|
@@ -2837,8 +2882,8 @@ export class IrisGrid extends Component {
|
|
|
2837
2882
|
var _rollupConfig$columns3,
|
|
2838
2883
|
_rollupConfig$columns4,
|
|
2839
2884
|
_this6 = this,
|
|
2840
|
-
_this$
|
|
2841
|
-
_this$
|
|
2885
|
+
_this$grid30,
|
|
2886
|
+
_this$grid30$state$dr,
|
|
2842
2887
|
_openOptions;
|
|
2843
2888
|
var {
|
|
2844
2889
|
children,
|
|
@@ -2953,7 +2998,7 @@ export class IrisGrid extends Component {
|
|
|
2953
2998
|
var columnX = allColumnXs.get(focusedFilterBarColumn);
|
|
2954
2999
|
var columnWidth = allColumnWidths.get(focusedFilterBarColumn);
|
|
2955
3000
|
if (columnX != null && columnWidth != null) {
|
|
2956
|
-
var _theme$filterBarHeigh, _theme$filterBarHeigh2, _this$
|
|
3001
|
+
var _theme$filterBarHeigh, _theme$filterBarHeigh2, _this$grid29;
|
|
2957
3002
|
var x = gridX + columnX;
|
|
2958
3003
|
var y = gridY - ((_theme$filterBarHeigh = theme.filterBarHeight) !== null && _theme$filterBarHeigh !== void 0 ? _theme$filterBarHeigh : 0);
|
|
2959
3004
|
var fieldWidth = columnWidth + 1; // cover right border
|
|
@@ -2965,14 +3010,14 @@ export class IrisGrid extends Component {
|
|
|
2965
3010
|
// Don't cause overflow
|
|
2966
3011
|
height: fieldHeight
|
|
2967
3012
|
};
|
|
2968
|
-
var
|
|
3013
|
+
var _value5 = '';
|
|
2969
3014
|
var isValid = true;
|
|
2970
3015
|
var modelColumn = this.getModelColumn(focusedFilterBarColumn);
|
|
2971
3016
|
assertNotNull(modelColumn);
|
|
2972
3017
|
var quickFilter = quickFilters.get(modelColumn);
|
|
2973
3018
|
var advancedFilter = advancedFilters.get(modelColumn);
|
|
2974
3019
|
if (quickFilter != null) {
|
|
2975
|
-
|
|
3020
|
+
_value5 = quickFilter.text;
|
|
2976
3021
|
isValid = quickFilter.filter != null;
|
|
2977
3022
|
}
|
|
2978
3023
|
var isBarFiltered = quickFilters.size !== 0 || advancedFilters.size !== 0;
|
|
@@ -2981,7 +3026,7 @@ export class IrisGrid extends Component {
|
|
|
2981
3026
|
style: style,
|
|
2982
3027
|
className: classNames({
|
|
2983
3028
|
error: !isValid,
|
|
2984
|
-
active:
|
|
3029
|
+
active: _value5 !== '' || advancedFilter != null,
|
|
2985
3030
|
'iris-grid-has-filter': isBarFiltered
|
|
2986
3031
|
}),
|
|
2987
3032
|
isAdvancedFilterSet: advancedFilter != null,
|
|
@@ -2994,9 +3039,9 @@ export class IrisGrid extends Component {
|
|
|
2994
3039
|
onChange: this.handleFilterBarChange,
|
|
2995
3040
|
onDone: this.handleFilterBarDone,
|
|
2996
3041
|
onTab: this.handleFilterBarTab,
|
|
2997
|
-
onContextMenu: (_this$
|
|
3042
|
+
onContextMenu: (_this$grid29 = this.grid) === null || _this$grid29 === void 0 ? void 0 : _this$grid29.handleContextMenu,
|
|
2998
3043
|
debounceMs: debounceMs,
|
|
2999
|
-
value:
|
|
3044
|
+
value: _value5
|
|
3000
3045
|
});
|
|
3001
3046
|
}
|
|
3002
3047
|
}
|
|
@@ -3141,7 +3186,7 @@ export class IrisGrid extends Component {
|
|
|
3141
3186
|
};
|
|
3142
3187
|
var _modelColumn = _this6.getModelColumn(columnIndex);
|
|
3143
3188
|
if (_modelColumn != null) {
|
|
3144
|
-
var
|
|
3189
|
+
var _column4 = model.columns[_modelColumn];
|
|
3145
3190
|
var _advancedFilter2 = advancedFilters.get(_modelColumn);
|
|
3146
3191
|
var {
|
|
3147
3192
|
options: advancedFilterOptions
|
|
@@ -3164,7 +3209,7 @@ export class IrisGrid extends Component {
|
|
|
3164
3209
|
options: {
|
|
3165
3210
|
positionFixed: true
|
|
3166
3211
|
}
|
|
3167
|
-
}, _this6.getCachedAdvancedFilterMenuActions(model,
|
|
3212
|
+
}, _this6.getCachedAdvancedFilterMenuActions(model, _column4, advancedFilterOptions, sortDirection, formatter)));
|
|
3168
3213
|
advancedFilterMenus.push(element);
|
|
3169
3214
|
}
|
|
3170
3215
|
}
|
|
@@ -3362,7 +3407,7 @@ export class IrisGrid extends Component {
|
|
|
3362
3407
|
movedColumns: movedColumns,
|
|
3363
3408
|
customColumns: customColumns,
|
|
3364
3409
|
hiddenColumns: hiddenColumns,
|
|
3365
|
-
alwaysFetchColumns: this.getAlwaysFetchColumns(alwaysFetchColumns, model.columns, movedColumns, model.floatingLeftColumnCount, model.floatingRightColumnCount, (_this$
|
|
3410
|
+
alwaysFetchColumns: this.getAlwaysFetchColumns(alwaysFetchColumns, model.columns, movedColumns, model.floatingLeftColumnCount, model.floatingRightColumnCount, (_this$grid30 = this.grid) === null || _this$grid30 === void 0 ? void 0 : (_this$grid30$state$dr = _this$grid30.state.draggingColumn) === null || _this$grid30$state$dr === void 0 ? void 0 : _this$grid30$state$dr.range),
|
|
3366
3411
|
formatColumns: this.getCachedPreviewFormatColumns(this.getCachedModelColumns(model, customColumns), conditionalFormats, conditionalFormatPreview,
|
|
3367
3412
|
// Disable the preview format when we press Back on the format edit page
|
|
3368
3413
|
((_openOptions = openOptions[openOptions.length - 1]) === null || _openOptions === void 0 ? void 0 : _openOptions.type) === OptionType.CONDITIONAL_FORMATTING_EDIT ? conditionalFormatEditIndex !== null && conditionalFormatEditIndex !== void 0 ? conditionalFormatEditIndex : undefined : undefined),
|