@fto-consult/expo-ui 6.74.1 → 6.74.2

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.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/components/Datagrid/Common/utils.js +7 -5
  3. package/src/components/Filter/index.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fto-consult/expo-ui",
3
- "version": "6.74.1",
3
+ "version": "6.74.2",
4
4
  "description": "Bibliothèque de composants UI Expo,react-native",
5
5
  "main": "main",
6
6
  "scripts": {
package/src/components/Datagrid/Common/utils.js CHANGED
@@ -45,11 +45,13 @@ export const renderRowCell = (arg)=>{
45
45
  } else if(typeof columnDef.render === "function"){
46
46
  _render = columnDef.render.call(context,renderArgs);
47
47
  } else if(arrayValueExists( _type,["date","datetime","time"])){
48
- const sqlFormat =_type === 'time'? undefined : _type ==="datetime" ? DateLib.SQLDateTimeFormat : DateLib.SQLDateFormat;
49
- let _dd =DateLib.parse(rowData[columnField],sqlFormat);
50
- if(DateLib.isDateObj(_dd)){
51
- const eFormat = defaultStr(columnDef.format,(_type === 'time'?DateLib.defaultTimeFormat:DateLib.masks.defaultDate));
52
- _render = DateLib.format(_dd,eFormat);
48
+ if(rowData[columnField]){
49
+ const sqlFormat =_type === 'time'? undefined : _type ==="datetime" ? DateLib.SQLDateTimeFormat : DateLib.SQLDateFormat;
50
+ let _dd =DateLib.parse(rowData[columnField],sqlFormat);
51
+ if(DateLib.isDateObj(_dd)){
52
+ const eFormat = defaultStr(columnDef.format,(_type === 'time'?DateLib.defaultTimeFormat:DateLib.masks.defaultDate));
53
+ _render = DateLib.format(_dd,eFormat);
54
+ }
53
55
  }
54
56
  if(!_render) _render = rowData[columnField]
55
57
  } else if(arrayValueExists(_type,['switch','checkbox'])){
package/src/components/Filter/index.js CHANGED
@@ -137,7 +137,7 @@ export default class Filter extends AppComponent {
137
137
  type = defaultStr(type,this.type,this.props.type).toLowerCase();
138
138
  if(type.contains('select')){
139
139
  return "$in";
140
- } if(type !== 'date2time' && type !== 'time' && type !== 'number' && type !== 'decimal'){
140
+ } if(type !== 'date2time' && type !=="date" && type !== 'time' && type !== 'number' && type !== 'decimal'){
141
141
  return '$regexcontains';
142
142
  }
143
143
  return '$eq';