@fto-consult/expo-ui 6.73.4 → 6.73.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.73.4",
+  "version": "6.73.6",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "main",
   "scripts": {

package/src/components/Form/Form.js

@@ -30,6 +30,9 @@ export default class FormComponent extends React.AppComponent {
     getErrorText(){
         return defaultStr(this.___errorText);
     }
+    getErrorLabel(){
+        return defaultStr(this.___errorText);
+    }
     /*** vérifie si la form est valide */
     isValid () {
         let fields = this.getFields();

package/src/layouts/Fab/index.js

@@ -26,7 +26,7 @@ const FabLayoutComponent = React.forwardRef((p,ref)=>{
           const addText = defaultStr(table.newElementLabel,"Nouveau");
           const tableName = defaultStr(table.table,table.tableName);
           if(!table || !icon || !text || !Auth.isTableDataAllowed({table:tableName,action:'create'})) return;
-          let fabProps = typeof table.fabProps ==='function'? table.fabProps({tableName}) : defaultObj(table.fabProps);;
+          let fabProps = typeof table.fabProps ==='function'? table.fabProps({tableName,table:tableName}) : defaultObj(table.fabProps);;
           if(fabProps === false) return;
           fabProps = defaultObj(fabProps);
           const cSuffix = theme.Colors.getSuffix(index);

package/src/layouts/Screen/ScreenWithoutAuthContainer.js

@@ -175,5 +175,5 @@ MainScreenScreenWithoutAuthContainer.propTypes = {
   contentContainerStyle : StyleProp,
   withFab : PropTypes.bool,
   withDrawer : PropTypes.bool,//si l'on doit afficher un drawer dans le contenu
-  fabProps : PropTypes.object,
+  //fabProps : PropTypes.object,
 }

package/src/layouts/Screen/TableData.js

@@ -261,6 +261,7 @@ export default class TableDataScreenComponent extends FormDataScreen{
             ...rest
         } = this.prepareComponentProps({...props,tableName,context:this,fields:extendObj(true,{},this.fields,props.fields),isUpdated,isUpdate:isUpdated,data,datas,currentIndex});
         const sessionName = this.getSessionName();
+        const generatedColumnsProps = this.getGeneratedColumnsProperties();
         ///on effectue une mutator sur le champ en cours de modification
         Object.map(preparedFields,(field,i,counterIndex)=>{
             const currentField = isObj(field)?Object.clone(field):field;
@@ -270,7 +271,7 @@ export default class TableDataScreenComponent extends FormDataScreen{
                 if(currentField.visibleOnlyOnEditing === true && !isUpdated){
                     currentField.form = false;
                 }
-                generatedColumnsProperties.map((f)=>{
+                generatedColumnsProps.map((f)=>{
                     //on affiche les champs générés uniquement  en cas de mise à jour
                     if(currentField[f] === true){
                         currentField.visible = isUpdated ? true : false;
@@ -376,6 +377,10 @@ export default class TableDataScreenComponent extends FormDataScreen{
         }
         return rActionsArg;
     }
+    /*** retourne la liste des colones générées comme createdDate,updateDate et bien d'autres */
+    getGeneratedColumnsProperties(){
+        return generatedColumnsProperties;
+    }
     renderTabs(args){
         const tabs = this.props.tabs;
         if(typeof tabs =='function'){
@@ -573,7 +578,7 @@ export default class TableDataScreenComponent extends FormDataScreen{
         if(typeof this.props.clone ==='function' && this.props.clone(data,this) === false) return data;
         this.showPreloader();
         delete data.approved;
-        Object.map(['_rev',...generatedColumnsProperties,...Object.keys(this.primaryKeyFields),'_id','code','updateBy',"created_at","updated_at",'updatedDate','createBy','updatedHour','createdHour','createdDate'],(idx)=>{
+        Object.map(['_rev','_id',this.getGeneratedColumnsProperties(),...Object.keys(this.primaryKeyFields)],(idx)=>{
             data[idx] = undefined;
             delete data[idx];
         });

package/src/layouts/Screen/utils.js

@@ -6,7 +6,8 @@ import { COPY_ICON,PRINT_ICON} from "$ecomponents/Icon";
 import {getTableDataRouteName} from "$enavigation/utils";
 
 //@seee : https://github.com/typeorm/typeorm/blob/master/src/entity-schema/EntitySchemaColumnOptions.ts
-export const generatedColumnsProperties = ["createDate","updateDate","deleteDate","createBy","updateBy","deleteBy"]
+///'_rev','_id','code',
+export const generatedColumnsProperties = ["createDate","updateDate","createdBy","updateBy",'updatedDate','updatedHour','createdHour','createdDate']
 
 export const renderTabsContent = ({tabs,context,data,sessionName,isMobile,props,firstTab,tabKey,tabProps,tabsProps})=>{
     let tabsArr = [],hasFirstTab = false;