ods-component-lib 1.18.67 → 1.18.69
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/components/devextreme/OdsRemoteDataGrid.d.ts +1 -1
- package/dist/index.js +13 -11
- package/dist/index.js.map +1 -1
- package/dist/index.modern.js +13 -11
- package/dist/index.modern.js.map +1 -1
- package/package.json +1 -1
- package/dist/components/antd/form/OdsBasicForm.d.ts +0 -18
- package/dist/components/antd/icon/OdsIcon.d.ts +0 -10
- package/dist/components/antd/message/OdsMessage.d.ts +0 -3
- package/dist/components/antd/select/OdsCustomMultiSelect.d.ts +0 -7
- package/dist/components/antd/select/OdsMultiSelect.d.ts +0 -9
- package/dist/components/custom/OdsLogin.d.ts +0 -8
- package/dist/components/devextreme/DxDataPopupForm.d.ts +0 -3
- package/dist/components/devextreme/DynamicIcon.d.ts +0 -5
- package/dist/components/devextreme/OdsDataGridNew.d.ts +0 -56
- package/dist/components/devextreme/OdsProfDataGrid.d.ts +0 -3
- package/dist/components/devextreme/treeview/DxTreeView.d.ts +0 -3
- package/dist/stories/OdsCustomMultiSelect/OdsCustomMultiSelect.stories.d.ts +0 -9
- package/dist/stories/OdsCustomMultiSelect/Samples/Basic.Sample.d.ts +0 -1
- package/dist/stories/OdsCustomMultiSelect/Samples/ModeMultiple.Sample.d.ts +0 -1
- package/dist/utils/DynamicIcon.d.ts +0 -5
package/dist/index.modern.js
CHANGED
|
@@ -16698,9 +16698,11 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
|
|
|
16698
16698
|
var onOptionChanged = props.onOptionChanged;
|
|
16699
16699
|
if (onOptionChanged) {
|
|
16700
16700
|
var dataGridInstance = gridRef.current.instance;
|
|
16701
|
-
var sortingState = dataGridInstance.getVisibleColumns().
|
|
16701
|
+
var sortingState = dataGridInstance.getVisibleColumns().filter(function (p) {
|
|
16702
|
+
return !p.command;
|
|
16703
|
+
}).map(function (column, index) {
|
|
16702
16704
|
return {
|
|
16703
|
-
index: index
|
|
16705
|
+
index: index,
|
|
16704
16706
|
dataField: column.dataField,
|
|
16705
16707
|
sortOrder: column.sortOrder
|
|
16706
16708
|
};
|
|
@@ -16854,16 +16856,16 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
|
|
|
16854
16856
|
var onExporting = useCallback(function (e) {
|
|
16855
16857
|
if (e.format === 'xlsx') {
|
|
16856
16858
|
var workbook = new Workbook();
|
|
16857
|
-
if (props.
|
|
16858
|
-
var
|
|
16859
|
+
if (props.filterData != null) {
|
|
16860
|
+
var newColumnFromFilterData = props.filterData.map(function (filterItem) {
|
|
16859
16861
|
return {
|
|
16860
|
-
dataField:
|
|
16861
|
-
caption:
|
|
16862
|
+
dataField: filterItem.key,
|
|
16863
|
+
caption: filterItem.key
|
|
16862
16864
|
};
|
|
16863
16865
|
});
|
|
16864
|
-
var
|
|
16866
|
+
var newColumns = [].concat(columns.current, newColumnFromFilterData);
|
|
16865
16867
|
e.component.beginUpdate();
|
|
16866
|
-
e.component.option("columns",
|
|
16868
|
+
e.component.option("columns", newColumns);
|
|
16867
16869
|
e.component.endUpdate();
|
|
16868
16870
|
}
|
|
16869
16871
|
exportDataGrid({
|
|
@@ -16886,8 +16888,8 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
|
|
|
16886
16888
|
excelCell.value = formattedDate;
|
|
16887
16889
|
}
|
|
16888
16890
|
}
|
|
16889
|
-
if (gridCell.rowType !== 'header' && props.
|
|
16890
|
-
var matchingItem = props.
|
|
16891
|
+
if (gridCell.rowType !== 'header' && props.filterData != null) {
|
|
16892
|
+
var matchingItem = props.filterData.find(function (item) {
|
|
16891
16893
|
return item.key === gridCell.column.dataField;
|
|
16892
16894
|
});
|
|
16893
16895
|
if (matchingItem) {
|
|
@@ -16912,7 +16914,7 @@ var OdsRemoteDataGrid = function OdsRemoteDataGrid(props) {
|
|
|
16912
16914
|
doc.save(fileName + '.pdf');
|
|
16913
16915
|
});
|
|
16914
16916
|
}
|
|
16915
|
-
}, [fileName]);
|
|
16917
|
+
}, [fileName, props.filterData]);
|
|
16916
16918
|
var customLoad = useCallback(function () {
|
|
16917
16919
|
var state = JSON.parse(localStorage.getItem(props.exportFileName + "Storage"));
|
|
16918
16920
|
if (localStorage.getItem(props.exportFileName + "Storage")) {
|