@fto-consult/expo-ui 6.70.4 → 6.71.0

package/package.json

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

package/src/components/Datagrid/Common/Common.js

@@ -3131,8 +3131,8 @@ export default class CommonDatagridComponent extends AppComponent {
         return this.doFilter(arg);
     }
     ///si les filtres devront être convertis au format SQL
-    willConvertFiltersToSQL(){
-        return !!defaultVal(this.props.convertFiltersToSQL);;
+    canConvertFiltersToSQL(){
+        return !!(this.props.convertFiltersToSQL);;
     }
     /*** retourne la liste des colonnes sur lesquelles on peut effectuer un filtre*/
     getFilterableColumnsNames(){ 
@@ -3243,7 +3243,7 @@ export default class CommonDatagridComponent extends AppComponent {
                     return resolve(sData);
                 }
                 if(this.beforeFetchData({fetchOptions,force,context:this,renderProgressBar}) === false) return resolve(sData);
-                if(this.willConvertFiltersToSQL()){
+                if(this.canConvertFiltersToSQL()){
                     fetchOptions.selector = convertToSQL(fetchOptions.selector);
                 }
                 if(typeof this.props.beforeFetchData =='function' && this.props.beforeFetchData({...rest,renderProgressBar,context:this,force,fetchOptions,options:fetchOptions}) === false){

package/src/layouts/Screen/TableData.js

@@ -241,6 +241,7 @@ export default class TableDataScreenComponent extends FormDataScreen{
             clone,
             isArchivable,clonable,isPrintable,print,data:customData,getRowKey,
             save2newAction,
+            save2cloneAction,
             saveAction,
             save2closeAction,
             cloneAction,
@@ -317,15 +318,17 @@ export default class TableDataScreenComponent extends FormDataScreen{
             isUpdated,
             fields,
         });
+        const cCloneAction = this.isClonable() && this.canCreateNew() && clonable !== false ? cloneAction : false;
         const rActionsArg = this.currentRenderingProps = {
             ...rest,
             ...formProps,
             context,
+            cloneAction : cCloneAction,
             save2newAction : this.canCreateNew() && save2newAction !== false ? true : false,
+            save2cloneAction : cloneAction && save2cloneAction !== false ? true : false,
             isMobile : isMobOrTab,
             saveAction,
             save2closeAction,
-            cloneAction : this.isClonable() && clonable !== false ? cloneAction : false,
             tableName,
             sessionName,
             table,
@@ -719,16 +722,17 @@ export default class TableDataScreenComponent extends FormDataScreen{
                     }
                     if(action == 'save2new'){
                         this.reset();
-                        closePreloader();
                     } else if(action === 'save'){
                         this.reset({data:savedData});
-                        closePreloader();
+                    } else if(action === 'save2clone'){
+                        this.clone(savedData);
+                        return;
                     } else if(willCloseAfterSave) {
                         close();
                     } else {
                         notify('Données modifiée avec succès!!','success');
-                        closePreloader();
                     }
+                    closePreloader();
                 }).catch((e)=>{
                     console.log('error on saving table data ',e);
                     closePreloader();

package/src/layouts/Screen/utils.js

@@ -70,7 +70,7 @@ export const renderTabsContent = ({tabs,context,data,sessionName,isMobile,props,
 }
 export const readablePerms = ["read","print"];
 export const defaultArchivedPermsFilter = ({perm})=>!readablePerms.includes(perm) && !readablePerms.includes(perm.toLowerCase());
-export  function renderActions({context,isUpdate,newElementLabel,readablePerms:cReadablePerms,makePhoneCallProps,hasManyData,onPressCopyToClipboard,archived,archivedPermsFilter,canMakePhoneCall,onPressToMakePhoneCall,saveAction,save2newAction,save2closeAction,cloneAction,readOnly,printable,archivable,data,table,perm,tableName,saveButton,datas,rows,currentData,currentDataIndex,onPressToSave,onPressToCreateNew,onPressToPrint,onPressToPrevious,onPressToNext,onPressToArchive,...rest}){
+export  function renderActions({context,isUpdate,newElementLabel,readablePerms:cReadablePerms,makePhoneCallProps,hasManyData,onPressCopyToClipboard,archived,archivedPermsFilter,canMakePhoneCall,onPressToMakePhoneCall,saveAction,save2newAction,save2cloneAction,save2closeAction,cloneAction,readOnly,printable,archivable,data,table,perm,tableName,saveButton,datas,rows,currentData,currentDataIndex,onPressToSave,onPressToCreateNew,onPressToPrint,onPressToPrevious,onPressToNext,onPressToArchive,...rest}){
     let textSave = defaultStr(saveButton)
     table = defaultStr(tableName,table);
     datas = defaultArray(datas,rows);
@@ -133,7 +133,17 @@ export  function renderActions({context,isUpdate,newElementLabel,readablePerms:c
         icon : 'content-save-edit',
         flat : true,
         onPress : createCallback({context:self,action:'save2new',callback:onPressToSave})
+    } : null
+    ,save2clone = (save2cloneAction !== false && cloneAction !== false && !readOnly && save && permsObj.canCreate)?{
+        text : textSave+'& Dupliquer',
+        title : textSave+'& Dupliquer',
+        isAction : true,
+        shortcut : "save2clone",
+        icon : 'content-save-move',
+        flat : true,
+        onPress : createCallback({context:self,action:'save2clone',callback:onPressToSave})
     } : null;
+    
     return {
         print : (isUpdate && permsObj.canPrint)?{
             text : 'Imprimer',
@@ -155,6 +165,7 @@ export  function renderActions({context,isUpdate,newElementLabel,readablePerms:c
         } : null,
         save2close,
         save2new,
+        save2clone,
         save,
         previous : (hasManyData && datas.length > 0 && currentDataIndex > 0)?{
             icon : 'chevron-left',