d2coreui 21.0.11 → 21.0.12

package/components/grid/dataGrid.js

@@ -30,6 +30,7 @@ import NoRecordsOverlay from "d2coreui/components/grid/panel/noRecordsOverlay";
 import at from "lodash/at";
 import ColumnTransfer from "d2coreui/components/grid/config/columnTransfer";
 import cloneDeep from "lodash/cloneDeep";
+import escape from "lodash/escape";
 import { RangeSelector } from "d2coreui/components/grid/cell/rangeSelector";
 import { WildcardQuickFilter } from "d2coreui/components/grid/cell/wildcardQuickFilter";
 import { ColDefUtil } from "ag-grid-community";
@@ -141,8 +142,8 @@ export default class DataGrid extends React.Component {
         this.wildcardQuickFilter = new WildcardQuickFilter();
         this.columnTypes = {
             "localizedArrayColumn": {
-                cellRenderer: (props) => {
-                    const value = DataGrid.getFieldValue(props);
+                cellRenderer: (params) => {
+                    const value = DataGrid.getCellValue(params);
                     if (value) {
                         return value.map((s) => i18n(s)).join(",");
                     }
@@ -154,27 +155,23 @@ export default class DataGrid extends React.Component {
                     textCustomComparator: this.textCustomComparator
                 },
                 filterValueGetter: function (params) {
-                    if (params.colDef.field) {
-                        const value = DataGrid.getFieldValue(params);
-                        if (value) {
-                            return value.map((s) => i18n(s)).join(",");
-                        }
+                    const value = DataGrid.getCellValue(params);
+                    if (value) {
+                        return value.map((s) => i18n(s)).join(",");
                     }
                     return null;
                 },
                 getQuickFilterText: function (params) {
-                    if (params.colDef.field) {
-                        const value = DataGrid.getFieldValue(params);
-                        if (value || value === 0) {
-                            return value.map((s) => i18n(s)).join(",");
-                        }
+                    const value = DataGrid.getCellValue(params);
+                    if (value) {
+                        return value.map((s) => i18n(s)).join(",");
                     }
                     return "";
                 }
             },
             "numberColumn": {
-                cellRenderer: (props) => {
-                    const value = DataGrid.getFieldValue(props);
+                cellRenderer: (params) => {
+                    const value = DataGrid.getCellValue(params);
                     if (value || value === 0) {
                         return LocaleHolder.formatNumber(value);
                     }
@@ -186,33 +183,27 @@ export default class DataGrid extends React.Component {
                     textCustomComparator: this.textCustomComparator
                 },
                 filterValueGetter: function (params) {
-                    if (params.colDef.field) {
-                        const value = DataGrid.getFieldValue(params);
-                        if (value || value === 0) {
-                            return LocaleHolder.formatNumber(value);
-                        }
-                        else {
-                            return "";
-                        }
+                    const value = DataGrid.getCellValue(params);
+                    if (value || value === 0) {
+                        return LocaleHolder.formatNumber(value);
+                    }
+                    else {
+                        return "";
                     }
-                    return null;
                 },
                 getQuickFilterText: function (params) {
-                    if (params.colDef.field) {
-                        const value = DataGrid.getFieldValue(params);
-                        if (value || value === 0) {
-                            return LocaleHolder.formatNumber(value);
-                        }
-                        else {
-                            return "";
-                        }
+                    const value = DataGrid.getCellValue(params);
+                    if (value || value === 0) {
+                        return LocaleHolder.formatNumber(value);
+                    }
+                    else {
+                        return "";
                     }
-                    return "";
                 }
             },
             "dateColumn": {
-                cellRenderer: (props) => {
-                    const value = DataGrid.getFieldValue(props);
+                cellRenderer: (params) => {
+                    const value = DataGrid.getCellValue(params);
                     if (value) {
                         if (value === D2000UnixTimeNullValue) {
                             return "---";
@@ -225,12 +216,10 @@ export default class DataGrid extends React.Component {
                         return "---";
                     }
                 },
-                valueFormatter: (props) => {
-                    if (props.colDef.field) {
-                        const value = DataGrid.getFieldValue(props);
-                        if (value) {
-                            return unixTimeToMoment(value).format(LocaleHolder.getDateFormat(!this.props.hideYear));
-                        }
+                valueFormatter: (params) => {
+                    const value = DataGrid.getCellValue(params);
+                    if (value) {
+                        return unixTimeToMoment(value).format(LocaleHolder.getDateFormat(!this.props.hideYear));
                     }
                     return "---";
                 },
@@ -238,46 +227,39 @@ export default class DataGrid extends React.Component {
                     textCustomComparator: this.textCustomComparator
                 },
                 filterValueGetter: (params) => {
-                    if (params.colDef.field) {
-                        const value = DataGrid.getFieldValue(params);
-                        if (value) {
-                            return unixTimeToMoment(value).format(LocaleHolder.getDateFormat(!this.props.hideYear));
-                        }
+                    const value = DataGrid.getCellValue(params);
+                    if (value) {
+                        return unixTimeToMoment(value).format(LocaleHolder.getDateFormat(!this.props.hideYear));
                     }
                     return null;
                 },
                 getQuickFilterText: (params) => {
-                    if (params.colDef.field) {
-                        const value = DataGrid.getFieldValue(params);
-                        if (value) {
-                            return unixTimeToMoment(value).format(LocaleHolder.getDateFormat(!this.props.hideYear));
-                        }
+                    const value = DataGrid.getCellValue(params);
+                    if (value) {
+                        return unixTimeToMoment(value).format(LocaleHolder.getDateFormat(!this.props.hideYear));
                     }
                     return "";
                 }
             },
             "dateTimeColumn": {
-                cellRenderer: (props) => {
-                    var _a;
-                    if ((_a = props.colDef) === null || _a === void 0 ? void 0 : _a.field) {
-                        const value = DataGrid.getFieldValue(props);
-                        if (value) {
-                            if (value === D2000UnixTimeNullValue) {
-                                return "---";
-                            }
-                            let tooltipValue;
-                            tooltipValue = unixTimeToMoment(value).format(LocaleHolder.getDateTimeFormat(true, true, true));
-                            return `<span title="${tooltipValue}">${unixTimeToMoment(value).format(LocaleHolder.getDateTimeFormat(!this.props.hideYear, true, this.props.showMilliseconds))}</span>`;
+                cellRenderer: (params) => {
+                    const value = DataGrid.getCellValue(params);
+                    if (value) {
+                        if (value === D2000UnixTimeNullValue) {
+                            return "---";
                         }
+                        let tooltipValue;
+                        tooltipValue = unixTimeToMoment(value).format(LocaleHolder.getDateTimeFormat(true, true, true));
+                        return `<span title="${tooltipValue}">${unixTimeToMoment(value).format(LocaleHolder.getDateTimeFormat(!this.props.hideYear, true, this.props.showMilliseconds))}</span>`;
+                    }
+                    else {
+                        return "---";
                     }
-                    return "---";
                 },
-                valueFormatter: (props) => {
-                    if (props.colDef.field) {
-                        const value = DataGrid.getFieldValue(props);
-                        if (value) {
-                            return unixTimeToMoment(value).format(LocaleHolder.getDateTimeFormat(!this.props.hideYear, true, this.props.showMilliseconds));
-                        }
+                valueFormatter: (params) => {
+                    const value = DataGrid.getCellValue(params);
+                    if (value) {
+                        return unixTimeToMoment(value).format(LocaleHolder.getDateTimeFormat(!this.props.hideYear, true, this.props.showMilliseconds));
                     }
                     return "---";
                 },
@@ -285,27 +267,23 @@ export default class DataGrid extends React.Component {
                     textCustomComparator: this.textCustomComparator
                 },
                 filterValueGetter: (params) => {
-                    if (params.colDef.field) {
-                        const value = DataGrid.getFieldValue(params);
-                        if (value) {
-                            return unixTimeToMoment(value).format(LocaleHolder.getDateTimeFormat(!this.props.hideYear, true, this.props.showMilliseconds));
-                        }
+                    const value = DataGrid.getCellValue(params);
+                    if (value) {
+                        return unixTimeToMoment(value).format(LocaleHolder.getDateTimeFormat(!this.props.hideYear, true, this.props.showMilliseconds));
                     }
                     return null;
                 },
                 getQuickFilterText: (params) => {
-                    if (params.colDef.field) {
-                        const value = DataGrid.getFieldValue(params);
-                        if (value) {
-                            return unixTimeToMoment(value).format(LocaleHolder.getDateTimeFormat(!this.props.hideYear, true, this.props.showMilliseconds));
-                        }
+                    const value = DataGrid.getCellValue(params);
+                    if (value) {
+                        return unixTimeToMoment(value).format(LocaleHolder.getDateTimeFormat(!this.props.hideYear, true, this.props.showMilliseconds));
                     }
                     return "";
                 }
             },
             "fromNowDateTimeColumn": {
-                cellRenderer: (props) => {
-                    const value = DataGrid.getFieldValue(props);
+                cellRenderer: (params) => {
+                    const value = DataGrid.getCellValue(params);
                     if (value) {
                         let tooltipValue;
                         tooltipValue = unixTimeToMoment(value).format(LocaleHolder.getDateTimeFormat(true, true, true));
@@ -315,12 +293,10 @@ export default class DataGrid extends React.Component {
                         return "---";
                     }
                 },
-                valueFormatter: (props) => {
-                    if (props.colDef.field) {
-                        const value = DataGrid.getFieldValue(props);
-                        if (value) {
-                            return unixTimeToMoment(value).format(LocaleHolder.getDateTimeFormat(!this.props.hideYear, true, this.props.showMilliseconds));
-                        }
+                valueFormatter: (params) => {
+                    const value = DataGrid.getCellValue(params);
+                    if (value) {
+                        return unixTimeToMoment(value).format(LocaleHolder.getDateTimeFormat(!this.props.hideYear, true, this.props.showMilliseconds));
                     }
                     return "---";
                 },
@@ -328,24 +304,41 @@ export default class DataGrid extends React.Component {
                     textCustomComparator: this.textCustomComparator
                 },
                 filterValueGetter: (params) => {
-                    if (params.colDef.field) {
-                        const value = DataGrid.getFieldValue(params);
-                        if (value) {
-                            return unixTimeToMoment(value).format(LocaleHolder.getDateTimeFormat(!this.props.hideYear, true, this.props.showMilliseconds));
-                        }
+                    const value = DataGrid.getCellValue(params);
+                    if (value) {
+                        return unixTimeToMoment(value).format(LocaleHolder.getDateTimeFormat(!this.props.hideYear, true, this.props.showMilliseconds));
                     }
                     return null;
                 },
                 getQuickFilterText: (params) => {
-                    if (params.colDef.field) {
-                        const value = DataGrid.getFieldValue(params);
-                        if (value) {
-                            return unixTimeToMoment(value).format(LocaleHolder.getDateTimeFormat(!this.props.hideYear, true, this.props.showMilliseconds));
-                        }
+                    const value = DataGrid.getCellValue(params);
+                    if (value) {
+                        return unixTimeToMoment(value).format(LocaleHolder.getDateTimeFormat(!this.props.hideYear, true, this.props.showMilliseconds));
                     }
                     return "";
                 }
             },
+            "escapedValueColumn": {
+                cellRenderer: (params) => {
+                    const value = DataGrid.getCellValue(params);
+                    if (value) {
+                        const text = typeof value === "string" ? escape(value.replace(/[\r\n]+/g, ' ')) : value;
+                        return `<span style="white-space: pre" title="${text}">${text}</span>`;
+                    }
+                    else {
+                        return "";
+                    }
+                },
+                valueFormatter: (params) => {
+                    const value = DataGrid.getCellValue(params);
+                    if (value) {
+                        return typeof value === "string" ? value.replace(/[\r\n]+/g, ' ') : value;
+                    }
+                    else {
+                        return "";
+                    }
+                }
+            },
             "textColumnFilter": {
                 filter: "agTextColumnFilter",
                 floatingFilter: true,
@@ -384,33 +377,19 @@ export default class DataGrid extends React.Component {
             "alignRight": {}
         };
     }
-    static getFieldValue(props) {
-        var _a, _b;
-        switch (typeof ((_a = props.colDef) === null || _a === void 0 ? void 0 : _a.valueGetter)) {
-            case "undefined":
-                if ((_b = props.colDef) === null || _b === void 0 ? void 0 : _b.field) {
-                    return at(props.data, props.colDef.field)[0];
-                }
-                else {
-                    return "---";
-                }
-            case "string":
-                return props.colDef.valueGetter;
-            case "function":
-                try {
-                    return props.colDef.valueGetter(props);
-                }
-                catch (e) {
-                    if (props.colDef.field) {
-                        return at(props.data, props.colDef.field)[0];
-                    }
-                    else {
-                        return "---";
-                    }
-                }
-            default:
-                return "---";
+    static getCellValue(props) {
+        if (props) {
+            if (props.colDef.field && typeof props.getValue === "function") {
+                return props.getValue(props.colDef.field);
+            }
+            if (props.data && props.colDef && props.colDef.field) {
+                return at(props.data, props.colDef.field)[0];
+            }
+            if (props.value !== undefined) {
+                return props.value;
+            }
         }
+        return undefined;
     }
     textCustomComparator(filter, value, filterText) {
         const filterTextLowerCase = filterText.toLowerCase();