flexmonster 2.9.13 → 2.9.14

package/toolbar/flexmonster.toolbar.js

@@ -1,6 +1,6 @@
 /** 
  * Flexmonster Pivot Table & Charts [https://www.flexmonster.com/]
- * November 2021 (v. 2.9.13)
+ * December 2021 (v. 2.9.14)
  * Copyright (c) 2021 Flexmonster. All rights reserved.
  *
  * Flexmonster Pivot Table & Charts commercial licenses may be obtained at
@@ -1743,7 +1743,7 @@ FlexmonsterToolbar.prototype.showConditionalFormattingDialog = function (measure
         }
     }
     for (var i = 0; i < _measures.length; i++) {// adding all the measures from the slice.measures list to the dropdown the list
-        if (_uniqueNames.indexOf(_measures[i].uniqueName) == -1) {
+        if (_uniqueNames.indexOf(_measures[i].uniqueName) === -1 && _measures[i].type === "number") {
             _uniqueNames.push(_measures[i].uniqueName);
             measures.push(_measures[i]);
         }

package/types/flexmonster.d.ts

@@ -177,7 +177,7 @@ declare namespace Flexmonster {
         updateData(object: DataSource | object[], options?: { ignoreScroll?: boolean, ignoreSorting?: boolean, partial?: boolean }): void;
         version: string;
         amcharts?: {
-            getData(options: { slice?: Slice; prepareDataFunction?: (rawData: any) => any },
+            getData(options: { slice?: Slice; prepareDataFunction?: (rawData: any, options: any) => any },
                 callbackHandler: ((chartData: GetDataValueObject, rawData: GetDataValueObject) => void) | string,
                 updateHandler?: ((chartData: GetDataValueObject, rawData: GetDataValueObject) => void) | string): void;
             getNumberFormatPattern(format: object): string;
@@ -186,20 +186,20 @@ declare namespace Flexmonster {
             getNumberOfMeasures(rawData: any): number;
         };
         fusioncharts?: {
-            getData(options: { type: string; slice?: Slice; prepareDataFunction?: (rawData: any) => any },
+            getData(options: { type: string; slice?: Slice; prepareDataFunction?: (rawData: any, options: any) => any },
                 callbackHandler: ((chartData: GetDataValueObject, rawData: GetDataValueObject) => void) | string,
                 updateHandler?: ((chartData: GetDataValueObject, rawData: GetDataValueObject) => void) | string): void;
             getNumberFormat(format: object): object;
         };
         googlecharts?: {
-            getData(options: { type?: string; slice?: Slice; prepareDataFunction?: (rawData: any) => any },
+            getData(options: { type?: string; slice?: Slice; prepareDataFunction?: (rawData: any, options: any) => any },
                 callbackHandler: ((chartData: GetDataValueObject, rawData: GetDataValueObject) => void) | string,
                 updateHandler?: ((chartData: GetDataValueObject, rawData: GetDataValueObject) => void) | string): void;
             getNumberFormat(format: object): object;
             getNumberFormatPattern(format: object): string;
         };
         highcharts?: {
-            getData(options: { type?: string; slice?: Slice; xAxisType?: string; valuesOnly?: boolean, withDrilldown?: boolean, prepareDataFunction?: (rawData: any) => any },
+            getData(options: { type?: string; slice?: Slice; xAxisType?: string; valuesOnly?: boolean, withDrilldown?: boolean, prepareDataFunction?: (rawData: any, options: any) => any },
                 callbackHandler: ((chartData: GetDataValueObject, rawData: GetDataValueObject) => void) | string,
                 updateHandler?: ((chartData: GetDataValueObject, rawData: GetDataValueObject) => void) | string): void;
             getAxisFormat(format: object): string;