@syncfusion/ej2-pivotview 20.1.47 → 20.1.48

package/dist/es6/ej2-pivotview.es2015.js

@@ -8912,7 +8912,7 @@ class Render {
             let field = this.parent.dataSourceSettings.values[vCnt];
             let format = 'N';
             if (this.parent.dataType === 'olap') {
-                if (this.parent.olapEngineModule.fieldList[field.name]) {
+                if (this.parent.olapEngineModule.fieldList[field.name] && !isNullOrUndefined(this.parent.olapEngineModule.fieldList[field.name].formatString)) {
                     let fString = this.parent.olapEngineModule.fieldList[field.name].formatString;
                     format = fString.indexOf('#') > -1 ? fString : (fString[0] + '2');
                 }
@@ -20078,7 +20078,7 @@ class OlapEngine {
                         let value = '0';
                         let measureName = this.getUniqueName(measure);
                         let showTotals = true;
-                        let attrDrill = (this.fieldList[columns[0].hierarchy] && this.fieldList[columns[0].hierarchy].isHierarchy && columns[0].isDrilled); /* eslint-disable-line */
+                        let attrDrill = (this.fieldList[columns[0].hierarchy] && this.fieldList[columns[0].hierarchy].isHierarchy) ? columns[0].isDrilled : true; /* eslint-disable-line */
                         if (this.tupRowInfo[rowOrdinal]) {
                             showTotals = this.tupRowInfo[rowOrdinal].showTotals;
                         }
@@ -22283,7 +22283,8 @@ let PivotView = class PivotView extends Component {
             multipleAxisMode: 'Multiple Axis Mode',
             grandTotalPosition: 'Grand totals position',
             top: 'Top',
-            bottom: 'Bottom'
+            bottom: 'Bottom',
+            None: 'None'
         };
         /* eslint-enable */
         this.localeObj = new L10n(this.getModuleName(), this.defaultLocale, this.locale);
@@ -26477,6 +26478,7 @@ class ExcelExport$1 {
                                             pivotCell.formattedText === undefined || isNullOrUndefined(pivotCell.value)) {
                                             lastCell.value = type === 'Excel' ? null : '';
                                         }
+                                        styles.numberFormat = typeof cellValue === 'string' ? undefined : styles.numberFormat;
                                         lastCell.style = !isNullOrUndefined(lastCell.value) ? styles : { bold: false, wrapText: true };
                                     }
                                     else {
@@ -29598,7 +29600,7 @@ class PivotButton {
             !(args.target.classList.contains(REMOVE_CLASS)) &&
             !(args.target.classList.contains(DRAG_CLASS)) &&
             (buttonElement && fieldInfo.fieldItem && (fieldInfo.fieldItem.showSortIcon ||
-                isNullOrUndefined(fieldInfo.fieldItem.showSortIcon)))) {
+                isNullOrUndefined(fieldInfo.fieldItem.showSortIcon)) && !fieldInfo.fieldItem.isCalculatedField)) {
             this.parent.actionObj.actionName = sortField;
             this.parent.actionObj.fieldInfo = fieldInfo;
             if (this.parent.actionBeginMethod()) {
@@ -30596,7 +30598,8 @@ let PivotFieldList = class PivotFieldList extends Component {
             group: 'Group',
             removeCalculatedField: 'Are you sure you want to delete this calculated field?',
             yes: 'Yes',
-            no: 'No'
+            no: 'No',
+            None: 'None'
         };
         /* eslint-enable */
         this.localeObj = new L10n(this.getModuleName(), this.defaultLocale, this.locale);
@@ -32379,7 +32382,7 @@ class CalculatedField {
             let formatDrop = getInstance(select('#' + this.parentID + 'Format_Div', dialogElement), DropDownList);
             let memberTypeDrop = getInstance(select('#' + this.parentID + 'Member_Type_Div', dialogElement), DropDownList);
             let hierarchyDrop = getInstance(select('#' + this.parentID + 'Hierarchy_List_Div', dialogElement), DropDownList);
-            field.formatString = (formatDrop.value === 'Custom' ? customFormat.value : formatDrop.value);
+            field.formatString = (formatDrop.value === 'Custom' ? customFormat.value : (formatDrop.value === 'None' ? null : formatDrop.value));
             if (memberTypeDrop.value === 'Dimension') {
                 field.hierarchyUniqueName = hierarchyDrop.value;
             }
@@ -33005,7 +33008,7 @@ class CalculatedField {
             hierarchyDrop.dataBind();
         }
         if (dialogElement.querySelector('.' + CALC_FORMAT_TYPE_DIV)) {
-            let formatStringData = ['Standard', 'Currency', 'Percent'];
+            let formatStringData = ['Standard', 'Currency', 'Percent', 'None'];
             let formatDrop = getInstance(select('#' + this.parentID + 'Format_Div', dialogElement), DropDownList);
             this.formatType = formatDrop.value = (formatStringData.indexOf(calcInfo.formatString) > -1 ? calcInfo.formatString : 'Custom');
         }
@@ -33033,7 +33036,7 @@ class CalculatedField {
         let fData = [];
         let fieldData = [];
         let memberTypeData = ['Measure', 'Dimension'];
-        let formatStringData = ['Standard', 'Currency', 'Percent', 'Custom'];
+        let formatStringData = ['Standard', 'Currency', 'Percent', 'Custom', 'None'];
         for (let type of memberTypeData) {
             mData.push({ value: type, text: this.parent.localeObj.getConstant(type) });
         }
@@ -33256,10 +33259,10 @@ class CalculatedField {
                 args.node.setAttribute('data-membertype', field.fieldType);
                 args.node.setAttribute('data-hierarchy', field.parentHierarchy ? field.parentHierarchy : '');
                 args.node.setAttribute('data-formula', field.formula);
-                let formatStringData = ['Standard', 'Currency', 'Percent'];
+                let formatStringData = ['Standard', 'Currency', 'Percent', 'None'];
                 let formatString;
                 formatString = (field.formatString ? formatStringData.indexOf(field.formatString) > -1 ?
-                    field.formatString : 'Custom' : '');
+                    field.formatString : 'Custom' : 'None');
                 args.node.setAttribute('data-formatString', formatString);
                 args.node.setAttribute('data-customString', (formatString === 'Custom' ? field.formatString : ''));
                 let removeElement = createElement('span', {