@fto-consult/expo-ui 1.5.7 → 1.5.9
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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fto-consult/expo-ui",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.9",
|
|
4
4
|
"description": "Bibliothèque de composants UI Expo,react-native",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"@expo/html-elements": "^0.2.0",
|
|
62
62
|
"@expo/metro-config": "^0.4.0",
|
|
63
63
|
"@expo/webpack-config": "^0.17.2",
|
|
64
|
-
"@fto-consult/common": "^1.9.
|
|
64
|
+
"@fto-consult/common": "^1.9.3",
|
|
65
65
|
"@gorhom/portal": "^1.0.14",
|
|
66
66
|
"@react-native-async-storage/async-storage": "~1.17.3",
|
|
67
67
|
"@react-native-community/datetimepicker": "6.2.0",
|
|
@@ -278,6 +278,9 @@ const DatagridFactory = (Factory)=>{
|
|
|
278
278
|
callArgs.columnDef = columnDef;
|
|
279
279
|
callArgs.columnField = columnField;
|
|
280
280
|
let ret = this.renderRowCell(callArgs);
|
|
281
|
+
if(typeof ret =='number'){
|
|
282
|
+
ret = ret+"";
|
|
283
|
+
}
|
|
281
284
|
if(isNonNullString(ret)){
|
|
282
285
|
ret = ret.trim();
|
|
283
286
|
}
|
|
@@ -1586,7 +1586,7 @@ export default class CommonDatagridComponent extends AppComponent {
|
|
|
1586
1586
|
columnDef.src = rowData[columnField];
|
|
1587
1587
|
_render = <Image {...columnDef}/>
|
|
1588
1588
|
}
|
|
1589
|
-
if(
|
|
1589
|
+
if(_render === undefined){
|
|
1590
1590
|
_render = rowData[columnField];
|
|
1591
1591
|
}
|
|
1592
1592
|
if(columnDef.type =="password" && isNonNullString(_render)){
|
|
@@ -1636,6 +1636,9 @@ export default class CommonDatagridComponent extends AppComponent {
|
|
|
1636
1636
|
delete renderProps.Component;
|
|
1637
1637
|
_render = <Component {...renderProps}>{_render}</Component>
|
|
1638
1638
|
}
|
|
1639
|
+
if(typeof _render =='boolean'){
|
|
1640
|
+
_render = _render ? "Oui" : "Non";
|
|
1641
|
+
}
|
|
1639
1642
|
if(typeof _render ==='string' || typeof _render =='decimal'){
|
|
1640
1643
|
_render = <Label selectable>{_render}</Label>
|
|
1641
1644
|
}
|
|
@@ -4,13 +4,13 @@
|
|
|
4
4
|
/****Le composant TableLink est utilisé pour les liens cliquable vers les tables de données */
|
|
5
5
|
import {TouchableOpacity,StyleSheet} from "react-native";
|
|
6
6
|
import React from "$react";
|
|
7
|
-
import View from "$
|
|
7
|
+
import View from "$ecomponents/View";
|
|
8
8
|
import PropTypes from "prop-types";
|
|
9
|
-
import Label from "$
|
|
9
|
+
import Label from "$ecomponents/Label";
|
|
10
10
|
import {defaultStr,isPromise,defaultObj} from "$utils";
|
|
11
11
|
import {open as openPreloader,close as closePreloader} from "$preloader";
|
|
12
12
|
import {styles as _styles} from "$theme";
|
|
13
|
-
import Tooltip from "$
|
|
13
|
+
import Tooltip from "$ecomponents/Tooltip";
|
|
14
14
|
|
|
15
15
|
const TableLinKComponent = React.forwardRef((props,ref)=>{
|
|
16
16
|
let {disabled,labelProps,server,containerProps,testID,Component,routeName,routeParams,component,_id,primary,triggerProps,onPress,children, ...rest} = props;
|