ods-component-lib 1.17.13 → 1.17.16

package/dist/index.js

@@ -1191,8 +1191,8 @@ var renderMenuItem = function renderMenuItem() {
     formats: exportFormats
   });
 };
-var customizeBooleanColumnRender = function customizeBooleanColumnRender(e) {
-  if (e.column.dataField === 'IsActive' || e.column.dataField === 'Status') {
+var customizeColumnRender = function customizeColumnRender(e) {
+  if (e.column.dataField === 'IsActive') {
     var tagColor = e.value ? 'green' : 'gold';
     return React__default.createElement(antd.Tag, {
       color: tagColor
@@ -1214,19 +1214,6 @@ var customizeBooleanColumnRender = function customizeBooleanColumnRender(e) {
 };
 function OdsDataGrid(props) {
   var dataGridRef = React.useRef(null);
-  var clearSelection = function clearSelection() {
-    if (dataGridRef.current) {
-      var selectedRowKeys = dataGridRef.current.instance.getSelectedRowKeys();
-      if (selectedRowKeys.length > 0) {
-        debugger;
-        dataGridRef.current.instance.clearSelection();
-        dataGridRef.current.instance.deselectAll();
-      }
-    }
-  };
-  React.useEffect(function () {
-    clearSelection();
-  }, []);
   return grid(props, dataGridRef);
 }
 function grid(props, dataGridRef) {
@@ -1272,6 +1259,7 @@ function grid(props, dataGridRef) {
   var clearAllFilters = function clearAllFilters() {
     if (dataGridRef.current) {
       dataGridRef.current.instance.clearFilter();
+      dataGridRef.current.instance.deselectAll();
     }
   };
   return React__default.createElement(React__default.Fragment, null, React__default.createElement("div", {
@@ -1359,12 +1347,14 @@ function grid(props, dataGridRef) {
     allowExportSelectedData: true,
     formats: exportFormats
   }), props.columns.map(function (col) {
-    return React__default.createElement(dataGrid.Column, Object.assign({
-      key: col.dataField
-    }, col, {
+    return React__default.createElement(dataGrid.Column, {
+      key: col.dataField,
+      dataField: col.dataField,
+      dataType: col.dataType,
+      caption: col.caption,
       headerCellRender: headerCellRender,
-      cellRender: customizeBooleanColumnRender
-    }), col.required && React__default.createElement(dataGrid.RequiredRule, {
+      cellRender: customizeColumnRender
+    }, col.required && React__default.createElement(dataGrid.RequiredRule, {
       message: col.requiredMessage
     }), col.dataField === 'IsActive' && React__default.createElement(dataGrid.HeaderFilter, {
       dataSource: [{
@@ -1574,7 +1564,7 @@ var renderMenuItem$1 = function renderMenuItem() {
     formats: exportFormats$2
   });
 };
-var customizeBooleanColumnRender$1 = function customizeBooleanColumnRender(e) {
+var customizeBooleanColumnRender = function customizeBooleanColumnRender(e) {
   var tagColor = e.value ? 'green' : 'gold';
   return React__default.createElement(antd.Tag, {
     color: tagColor
@@ -1737,7 +1727,7 @@ function OdsProfDataGrid(props) {
       key: col.dataField
     }, col, {
       headerCellRender: headerCellRender,
-      cellRender: col.dataField === 'IsActive' || col.dataField === 'Status' ? customizeBooleanColumnRender$1 : ""
+      cellRender: col.dataField === 'IsActive' || col.dataField === 'Status' ? customizeBooleanColumnRender : ""
     }), col.required && React__default.createElement(dataGrid.RequiredRule, {
       message: col.requiredMessage
     }), col.dataField === 'IsActive' && React__default.createElement(dataGrid.HeaderFilter, {
@@ -1835,7 +1825,7 @@ var renderMenuItem$2 = function renderMenuItem() {
     formats: exportFormats$3
   });
 };
-var customizeBooleanColumnRender$2 = function customizeBooleanColumnRender(e) {
+var customizeBooleanColumnRender$1 = function customizeBooleanColumnRender(e) {
   if (e.column.dataField === 'IsActive' || e.column.dataField === 'Status') {
     var tagColor = e.value ? 'green' : 'gold';
     return React__default.createElement(antd.Tag, {
@@ -1985,7 +1975,7 @@ function grid$2(props) {
       key: col.dataField
     }, col, {
       headerCellRender: headerCellRender,
-      cellRender: customizeBooleanColumnRender$2
+      cellRender: customizeBooleanColumnRender$1
     }), col.required && React__default.createElement(dataGrid.RequiredRule, {
       message: col.requiredMessage
     }), col.dataField === 'IsActive' && React__default.createElement(dataGrid.HeaderFilter, {