@fto-consult/expo-ui 2.39.7 → 2.40.1
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/index.js +1 -2
- package/package.json +120 -120
- package/readChart.txt +3 -1
- package/src/components/Countries/resources/countries-normalized.json +1987 -1987
- package/src/components/Countries/resources/countries-with-not-extra.json +1211 -1211
- package/src/components/Countries/resources/countries.sql +243 -243
- package/src/components/Datagrid/Common/Common.js +9 -6
- package/src/components/Datagrid/SWRDatagrid.js +16 -13
- package/src/components/Form/Fields/SelectTableData/Component.js +6 -5
- package/src/components/Form/FormData/FormData.js +7 -1
- package/src/layouts/DatabaseStatistics/DatabaseStatistic.js +2 -2
|
@@ -194,13 +194,19 @@ export default class FormDataComponent extends AppComponent{
|
|
|
194
194
|
const type = defaultStr(field.jsType,field.type,"text").trim().toLowerCase().replaceAll("_","");
|
|
195
195
|
const isDate = (type.contains('date') || type.contains('time'));
|
|
196
196
|
const Component = componentsTypes[type] || componentsTypes.default;
|
|
197
|
-
let {defaultValue,useDefaultValueFromData,hidden,renderFormDataField,getMediaQueryStyle,printLabels,queryLimit,selected,value,visible,dataFilesInterest,perm,ignore,form,responsiveProps:customResponsiveProps,...rest} = field;
|
|
197
|
+
let {defaultValue,useDefaultValueFromData,primaryKey,hidden,renderFormDataField,getMediaQueryStyle,printLabels,queryLimit,selected,value,visible,dataFilesInterest,perm,ignore,form,responsiveProps:customResponsiveProps,...rest} = field;
|
|
198
198
|
rest = Object.assign({},rest);
|
|
199
199
|
delete rest.import;
|
|
200
200
|
delete rest.export;
|
|
201
201
|
if(form === false || ignore || (isNonNullString(perm) && !Auth.isAllowedFromStr(perm))){
|
|
202
202
|
return null;
|
|
203
203
|
}
|
|
204
|
+
if(rest.nullable === false){
|
|
205
|
+
rest.required = true;
|
|
206
|
+
}
|
|
207
|
+
if(primaryKey === true && typeof rest.required !=='boolean'){
|
|
208
|
+
rest.required = true;
|
|
209
|
+
}
|
|
204
210
|
hidden = visible === false ? true : hidden;
|
|
205
211
|
if(typeof rest.filter !=='function'){
|
|
206
212
|
delete rest.filter;
|
|
@@ -66,7 +66,7 @@ export default function DatabaseStatisticContainer ({dashboardProps,onRefreshAll
|
|
|
66
66
|
setIsLoading(false);
|
|
67
67
|
refreshingRef.current = false;
|
|
68
68
|
});
|
|
69
|
-
|
|
69
|
+
},100);
|
|
70
70
|
}
|
|
71
71
|
|
|
72
72
|
React.useEffect(()=>{
|
|
@@ -170,7 +170,7 @@ export default function DatabaseStatisticContainer ({dashboardProps,onRefreshAll
|
|
|
170
170
|
onPress = {onPress}
|
|
171
171
|
title = {title}
|
|
172
172
|
//style = {[theme.styles.pv1]}
|
|
173
|
-
description = {isLoading
|
|
173
|
+
description = {isLoading ?progressBar:<CountUp
|
|
174
174
|
from={0}
|
|
175
175
|
to={count}
|
|
176
176
|
style = {counUpStyle}
|