ods-component-lib 1.17.16 → 1.17.19

package/dist/index.js

@@ -1191,8 +1191,8 @@ var renderMenuItem = function renderMenuItem() {
     formats: exportFormats
   });
 };
-var customizeColumnRender = function customizeColumnRender(e) {
-  if (e.column.dataField === 'IsActive') {
+var customizeBooleanColumnRender = function customizeBooleanColumnRender(e) {
+  if (e.column.dataField === 'IsActive' || e.column.dataField === 'Status') {
     var tagColor = e.value ? 'green' : 'gold';
     return React__default.createElement(antd.Tag, {
       color: tagColor
@@ -1210,7 +1210,7 @@ var customizeColumnRender = function customizeColumnRender(e) {
       return formatedDate;
     }
   }
-  return e.value;
+  return e.column.dataType;
 };
 function OdsDataGrid(props) {
   var dataGridRef = React.useRef(null);
@@ -1347,14 +1347,12 @@ function grid(props, dataGridRef) {
     allowExportSelectedData: true,
     formats: exportFormats
   }), props.columns.map(function (col) {
-    return React__default.createElement(dataGrid.Column, {
-      key: col.dataField,
-      dataField: col.dataField,
-      dataType: col.dataType,
-      caption: col.caption,
+    return React__default.createElement(dataGrid.Column, Object.assign({
+      key: col.dataField
+    }, col, {
       headerCellRender: headerCellRender,
-      cellRender: customizeColumnRender
-    }, col.required && React__default.createElement(dataGrid.RequiredRule, {
+      cellRender: customizeBooleanColumnRender
+    }), col.required && React__default.createElement(dataGrid.RequiredRule, {
       message: col.requiredMessage
     }), col.dataField === 'IsActive' && React__default.createElement(dataGrid.HeaderFilter, {
       dataSource: [{
@@ -1564,7 +1562,7 @@ var renderMenuItem$1 = function renderMenuItem() {
     formats: exportFormats$2
   });
 };
-var customizeBooleanColumnRender = function customizeBooleanColumnRender(e) {
+var customizeBooleanColumnRender$1 = function customizeBooleanColumnRender(e) {
   var tagColor = e.value ? 'green' : 'gold';
   return React__default.createElement(antd.Tag, {
     color: tagColor
@@ -1727,7 +1725,7 @@ function OdsProfDataGrid(props) {
       key: col.dataField
     }, col, {
       headerCellRender: headerCellRender,
-      cellRender: col.dataField === 'IsActive' || col.dataField === 'Status' ? customizeBooleanColumnRender : ""
+      cellRender: col.dataField === 'IsActive' || col.dataField === 'Status' ? customizeBooleanColumnRender$1 : ""
     }), col.required && React__default.createElement(dataGrid.RequiredRule, {
       message: col.requiredMessage
     }), col.dataField === 'IsActive' && React__default.createElement(dataGrid.HeaderFilter, {
@@ -1825,7 +1823,7 @@ var renderMenuItem$2 = function renderMenuItem() {
     formats: exportFormats$3
   });
 };
-var customizeBooleanColumnRender$1 = function customizeBooleanColumnRender(e) {
+var customizeBooleanColumnRender$2 = function customizeBooleanColumnRender(e) {
   if (e.column.dataField === 'IsActive' || e.column.dataField === 'Status') {
     var tagColor = e.value ? 'green' : 'gold';
     return React__default.createElement(antd.Tag, {
@@ -1975,7 +1973,7 @@ function grid$2(props) {
       key: col.dataField
     }, col, {
       headerCellRender: headerCellRender,
-      cellRender: customizeBooleanColumnRender$1
+      cellRender: customizeBooleanColumnRender$2
     }), col.required && React__default.createElement(dataGrid.RequiredRule, {
       message: col.requiredMessage
     }), col.dataField === 'IsActive' && React__default.createElement(dataGrid.HeaderFilter, {