flexmonster 2.9.18 → 2.9.19

package/lib/flexmonster.highcharts.js

@@ -246,6 +246,7 @@
             for (var j = 0; j < data.meta.vAmount; j++) {
                 _yName = data.meta["v" + j + "Name"];
                 _seriesName = _seriesBasedOnC ? record["c0"] : _yName;
+                // Add "_" at the start to ensure order remains unchanged
                 if (series["_" + _yName] == undefined) {
                     series["_" + _yName] = {};
                 }
@@ -262,6 +263,8 @@
         var yn = 0;
         for (var yAxis in series) {
             var _series = series[yAxis];
+            // Remove the "_" helper symbol
+            yAxis = yAxis.replace("_", "");
             for (var seriesname in _series) {
                 var s = {
                     name: (data.meta["rAmount"] > 0 && data.meta["cAmount"] > 0 && data.meta["vAmount"] > 1) ?
@@ -303,6 +306,7 @@
             for (var j = 0; j < data.meta.vAmount; j++) {
                 _yName = data.meta["v" + j + "Name"];
                 _seriesName = _seriesBasedOnC ? record["c0"] : _yName;
+                // Add "_" at the start to ensure order remains unchanged
                 if (series["_" + _yName] == undefined) {
                     series["_" + _yName] = {};
                 }
@@ -319,6 +323,8 @@
         var yn = 0;
         for (var yAxis in series) {
             var _series = series[yAxis];
+            // Remove the "_" helper symbol
+            yAxis = yAxis.replace("_", "");
             for (var seriesname in _series) {
                 var s = {
                     name: (data.meta["rAmount"] > 0 && data.meta["cAmount"] > 0 && data.meta["vAmount"] > 1) ?

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flexmonster",
-  "version": "2.9.18",
+  "version": "2.9.19",
   "description": "Pivot table component for web reporting. The most powerful JavaScript tool to visualize your business data.",
   "main": "flexmonster.full.js",
   "typings": "./types/flexmonster.d.ts",

package/theme/accessible/flexmonster.css

@@ -1,5 +1,5 @@
 :root {
-  --fm-version: "2.9.18";
+  --fm-version: "2.9.19";
 }
 /* ===== RESET STYLES ===== */
 #fm-pivot-view,
@@ -4848,10 +4848,104 @@
 }
 #fm-pivot-view div.fm-calculated-view .fm-popup-content {
   position: relative;
+  /*Calculated view search */
 }
 #fm-pivot-view div.fm-calculated-view .fm-popup-content .fm-name-input {
   margin-bottom: 20px;
 }
+#fm-pivot-view div.fm-calculated-view .fm-popup-content .fm-list-header {
+  background: #E8E8E8;
+  position: relative;
+  border: 1px solid #111;
+  border-bottom: 0px;
+}
+#fm-pivot-view div.fm-calculated-view .fm-popup-content .fm-list-header .fm-list-header-label-wrap {
+  width: calc(100% - 40px);
+  width: -webkit-calc(60%);
+  padding: 10px;
+}
+#fm-pivot-view div.fm-calculated-view .fm-popup-content .fm-list-header span.fm-ui-label {
+  color: #111;
+}
+#fm-pivot-view div.fm-calculated-view .fm-popup-content .fm-list-header .fm-search-wrap {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 40px;
+  height: 100%;
+  border-left: 1px solid #111;
+  z-index: 9;
+}
+#fm-pivot-view div.fm-calculated-view .fm-popup-content .fm-list-header .fm-search-wrap .fm-search-btn {
+  position: absolute;
+  width: 100%;
+  height: 38px;
+  cursor: pointer;
+  z-index: 3;
+  border: none;
+  background: transparent;
+}
+#fm-pivot-view div.fm-calculated-view .fm-popup-content .fm-list-header .fm-search-wrap .fm-search-btn .fm-icon-act_search {
+  color: #111;
+  position: absolute;
+  top: 5px;
+  right: 7px;
+}
+#fm-pivot-view div.fm-calculated-view .fm-popup-content .fm-list-header .fm-search-wrap .fm-search-btn .fm-icon-act_search::before {
+  font-size: 25px;
+}
+#fm-pivot-view div.fm-calculated-view .fm-popup-content .fm-list-header .fm-search-wrap.fm-search-opened {
+  width: 100%;
+  height: 100%;
+  border-left: none;
+}
+#fm-pivot-view div.fm-calculated-view .fm-popup-content .fm-list-header .fm-search-wrap.fm-search-opened .fm-icon-act_close,
+#fm-pivot-view div.fm-calculated-view .fm-popup-content .fm-list-header .fm-search-wrap.fm-search-opened .fm-search-inp {
+  visibility: visible;
+  opacity: 1;
+}
+#fm-pivot-view div.fm-calculated-view .fm-popup-content .fm-list-header .fm-search-wrap.fm-search-opened .fm-select-counter {
+  display: none;
+}
+#fm-pivot-view div.fm-calculated-view .fm-popup-content .fm-list-header .fm-search-wrap.fm-search-opened .fm-search-btn {
+  font-size: 0;
+  width: 40px;
+  left: 0;
+  pointer-events: none;
+}
+#fm-pivot-view div.fm-calculated-view .fm-popup-content .fm-list-header .fm-search-wrap.fm-search-opened .fm-search-btn .fm-icon-act_search:before {
+  color: #111;
+}
+#fm-pivot-view div.fm-calculated-view .fm-popup-content .fm-list-header .fm-search-wrap .fm-icon-act_close {
+  visibility: hidden;
+  position: absolute;
+  right: 0;
+  top: 0;
+  height: 100%;
+  width: 39px;
+  cursor: pointer;
+  z-index: 3;
+  color: #111;
+}
+#fm-pivot-view div.fm-calculated-view .fm-popup-content .fm-list-header .fm-search-wrap .fm-icon-act_close::before {
+  font-size: 26px;
+  position: absolute;
+  top: 5px;
+  left: 6px;
+}
+#fm-pivot-view div.fm-calculated-view .fm-popup-content .fm-list-header .fm-search-wrap .fm-search-inp {
+  visibility: hidden;
+  position: absolute;
+  right: 0;
+  top: 0px;
+  width: 100%;
+  height: 37px;
+  padding-left: 40px;
+  padding-right: 40px;
+  border-top: 0px;
+  border-right: 0px;
+  border-left: 0px;
+}
 #fm-pivot-view div.fm-calculated-view .fm-popup-content .fm-list-content {
   border: 1px solid #111;
   margin-bottom: 20px;
@@ -4883,6 +4977,10 @@
   width: calc(100% - 50px);
   width: -webkit-calc(100% - 50px);
 }
+#fm-pivot-view div.fm-calculated-view .fm-popup-content .fm-lst-measures li .fm-text-display .fm-search-highlight {
+  background-color: #FFFF00;
+  font-weight: inherit;
+}
 #fm-pivot-view div.fm-calculated-view .fm-popup-content .fm-lst-measures li .fm-aggr-display {
   width: 32px;
   height: 100%;