@fto-consult/expo-ui 2.37.4 → 2.37.6
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
|
@@ -432,7 +432,7 @@ const DatagridFactory = (Factory)=>{
|
|
|
432
432
|
} = this.preparedColumns;
|
|
433
433
|
const hasFootersFields = this.hasFootersFields();
|
|
434
434
|
const datagridHeader = <View testID={testID+"_HeaderContainer"} pointerEvents={pointerEvents} style={[styles.datagridHeader]}>
|
|
435
|
-
<ScrollView testID={testID+"_HeaderScrollView"} horizontal
|
|
435
|
+
<ScrollView testID={testID+"_HeaderScrollView"} horizontal showsHorizontalScrollIndicator = {!isTouchDevice()} contentContainerStyle={StyleSheet.flatten([styles.contentContainerStyle,styles.minW100])}>
|
|
436
436
|
<View testID={testID+"_HeaderContentCntainer"} style={[styles.table,styles.pullRight]}>
|
|
437
437
|
{dbSelector}
|
|
438
438
|
<View testID={testID+"_HeaderQueryLimit"} style={[styles.paginationItem]}>
|
|
@@ -551,7 +551,7 @@ const DatagridFactory = (Factory)=>{
|
|
|
551
551
|
{!canRenderChart && showFooters ? (
|
|
552
552
|
<View testID={testID+"_FooterContainer"} pointerEvents={pointerEvents} style={[theme.styles.justifyContentCenter,theme.styles.pv1]}>
|
|
553
553
|
<View testID={testID+"_FooterContentContainer"} style={[styles.footersContainer]}>
|
|
554
|
-
<ScrollView testID={testID+"_FooterScrollView"} horizontal contentContainerStyle={[styles.contentContainerStyle]}>
|
|
554
|
+
<ScrollView testID={testID+"_FooterScrollView"} horizontal showsHorizontalScrollIndicator = {!isTouchDevice()} contentContainerStyle={[styles.contentContainerStyle]}>
|
|
555
555
|
<View testID={testID+"_FooterContent"} style={[styles.table,theme.styles.p1]}>
|
|
556
556
|
{Object.mapToArray(this.getFooterValues(),(footer,field)=>{
|
|
557
557
|
return <Footer
|
|
@@ -1736,29 +1736,31 @@ export default class CommonDatagridComponent extends AppComponent {
|
|
|
1736
1736
|
d.push(null);
|
|
1737
1737
|
}
|
|
1738
1738
|
data.push(d);
|
|
1739
|
-
}
|
|
1740
|
-
|
|
1741
|
-
|
|
1742
|
-
|
|
1743
|
-
|
|
1744
|
-
|
|
1745
|
-
|
|
1746
|
-
|
|
1747
|
-
|
|
1748
|
-
|
|
1749
|
-
|
|
1750
|
-
|
|
1751
|
-
|
|
1752
|
-
|
|
1753
|
-
|
|
1739
|
+
} else {
|
|
1740
|
+
const hF = hFooters[key];
|
|
1741
|
+
if(isObj(hF) && isNonNullString(agFunc)){
|
|
1742
|
+
const dd = [];
|
|
1743
|
+
Object.map(cols,(col,i)=>{
|
|
1744
|
+
if(i in hF){
|
|
1745
|
+
const ff = hF[i];
|
|
1746
|
+
dd.push(defaultNumber(ff[agFunc]));
|
|
1747
|
+
} else {
|
|
1748
|
+
dd.push(null);
|
|
1749
|
+
}
|
|
1750
|
+
});
|
|
1751
|
+
if(canExportOnlyTotal){
|
|
1752
|
+
dd.unshift(val);
|
|
1753
|
+
data.push(dd);
|
|
1754
|
+
} else {
|
|
1755
|
+
data.push(d);
|
|
1756
|
+
data.push(dd);
|
|
1757
|
+
}
|
|
1754
1758
|
} else {
|
|
1755
1759
|
data.push(d);
|
|
1756
|
-
data.push(dd);
|
|
1757
1760
|
}
|
|
1758
|
-
} else {
|
|
1759
|
-
data.push(d);
|
|
1760
1761
|
}
|
|
1761
1762
|
|
|
1763
|
+
|
|
1762
1764
|
} else if(!canExportOnlyTotal) {
|
|
1763
1765
|
Object.map(cols,(col,i)=>{
|
|
1764
1766
|
const isDateField = defaultStr(col.type).toLowerCase().contains("date");
|