@esfaenza/extensions 15.2.44 → 15.2.45

package/fesm2020/esfaenza-extensions.mjs

@@ -1521,7 +1521,7 @@ class UtilityService {
      *
      * @return {any} Clone dell'oggetto passato
      */
-    deepClone(source) {
+    deepClone(source, type = null) {
         // Valori semplici
         if (source == null || typeof source !== 'object')
             return source;
@@ -1538,7 +1538,7 @@ class UtilityService {
             default: break;
         }
         // Oggetti Complessi
-        return this.recursiveStep(source, Array.isArray(source) || source instanceof Array ? [] : Object.create(Object.getPrototypeOf(source)));
+        return this.recursiveStep(source, Array.isArray(source) || source instanceof Array ? [] : (type == null ? Object.create(Object.getPrototypeOf(source)) : new type()));
     }
     /**
      * @ignore
@@ -1664,10 +1664,13 @@ const Export = (order, header, format = null, tableid = null) => (target, proper
  * @param {any} type Tipo da esportare
  */
 const ExportAs = (order, type, prefix) => (target, propertyKey) => {
+    var addedHere = {};
     var t = new type();
     var props = t[exportList];
     for (let i = 0; i < props.length; i++) {
         let prop = props[i].replace(csvVisPrefix, '');
+        if (addedHere[prop])
+            continue;
         if (typeof t[prop + csvVisPrefix] !== "undefined") {
             var toEmit = t[prop + csvVisPrefix];
             var lbl = t[prop + csvHdrPrefix];
@@ -1675,16 +1678,18 @@ const ExportAs = (order, type, prefix) => (target, propertyKey) => {
             var orderProp = t[prop + csvOrdPrefix];
             if (format)
                 Object.defineProperty(target, propertyKey + prop + csvFormatPrefix, { value: format, writable: false });
-            Object.defineProperty(target, propertyKey + prop + csvOrdPrefix, { value: orderProp + order, writable: false });
-            Object.defineProperty(target, propertyKey + prop, { value: null, writable: true, enumerable: true });
-            Object.defineProperty(target, propertyKey + prop + csvValueNavigator, { value: propertyKey + "." + prop, writable: false });
-            Object.defineProperty(target, propertyKey + prop + csvVisPrefix, { value: toEmit, writable: false });
-            Object.defineProperty(target, propertyKey + prop + csvHdrPrefix, { value: (prefix ? prefix + ' ' : '') + lbl, writable: false });
-            Object.defineProperty(target, propertyKey + prop + csvValueType, { value: type, writable: false });
+            let ppp = propertyKey + "$_$" + prop;
+            Object.defineProperty(target, ppp + csvOrdPrefix, { value: orderProp + order, writable: false });
+            Object.defineProperty(target, ppp, { value: null, writable: true, enumerable: true });
+            Object.defineProperty(target, ppp + csvValueNavigator, { value: propertyKey + "." + prop.replace(/\$_\$/g, '.'), writable: false });
+            Object.defineProperty(target, ppp + csvVisPrefix, { value: toEmit, writable: false });
+            Object.defineProperty(target, ppp + csvHdrPrefix, { value: (prefix ? prefix + ' ' : '') + lbl, writable: false });
+            Object.defineProperty(target, ppp + csvValueType, { value: type, writable: false });
             if (target[exportList])
-                target[exportList].push(propertyKey + prop + csvVisPrefix);
+                target[exportList].push(ppp + csvVisPrefix);
             else
-                target[exportList] = [propertyKey + prop + csvVisPrefix];
+                target[exportList] = [ppp + csvVisPrefix];
+            addedHere[ppp] = true;
         }
     }
 };
@@ -2166,14 +2171,11 @@ class ExportService {
      * @param {any[]} items Oggetti da esportare
      */
     export(items, format, fileName, type, columnsFilter, genericHeaders) {
-        var createdItems = items.map(t => {
-            let tmp = new type();
-            for (let property in t)
-                tmp[property] = t[property];
-            return tmp;
-        });
+        // Deepclone con assegnatura del tipo
+        var createdItems = items.map(t => this.utiExts.deepClone(t, type));
         let headers = genericHeaders ? this.setupForGenericExport(createdItems, genericHeaders) : this.setupForExport(createdItems, columnsFilter);
         (format == "CSV" ? this.exportCSV : this.exportExcel).bind(this)(fileName, headers, createdItems);
+        return headers;
     }
 }
 ExportService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: ExportService, deps: [{ token: DateService }, { token: UtilityService }, { token: i1.LocalizationService }], target: i0.ɵɵFactoryTarget.Injectable });