flexmonster 2.9.18 → 2.9.19

package/theme/flexmonster-base.less

@@ -1,7 +1,7 @@
 @import (reference) "default/flexmonster.less";
 
 :root {
-    --fm-version: "2.9.18";
+    --fm-version: "2.9.19";
 }
 
 /* ===== RESET STYLES ===== */
@@ -4450,6 +4450,116 @@
             margin-bottom: 20px;
         }
 
+        /*Calculated view search */
+        .fm-list-header {
+            background: @ui-background-light;
+            position: relative;
+            border: @ui-element-border;
+            border-bottom: 0px;
+
+            .fm-list-header-label-wrap {
+                width: calc(100% - 40px);
+                width: -webkit-calc(100% - 40px);
+                padding: 10px;
+            }
+
+            span.fm-ui-label {
+                color: @ui-label-color-light;
+            }
+
+            .fm-search-wrap {
+                position: absolute;
+                top: 0;
+                right: 0;
+                width: 40px;
+                height: 100%;
+                border-left: @ui-element-border;
+                z-index: 9;
+
+                .fm-search-btn {
+                    position: absolute;
+                    width: 100%;
+                    height: 38px;
+                    cursor: pointer;
+                    z-index: 3;
+                    border: none;
+                    background: transparent;
+        
+                    .fm-icon-act_search {
+                        color: @ui-icon-color;
+                        position: absolute;
+                        top: 5px;
+                        right: 7px;
+
+                        &::before {
+                            font-size: 25px;
+                        }
+                    }
+                }
+
+                &.fm-search-opened {
+                    width: 100%;
+                    height: 100%;
+                    border-left: none;
+
+                    .fm-icon-act_close,
+                    .fm-search-inp {
+                        visibility: visible;
+                        opacity: 1;
+                    }
+
+                    .fm-select-counter {
+                        display: none;
+                    }
+
+                    .fm-search-btn {
+                        font-size: 0;
+                        width: 40px;
+                        left: 0;
+                        pointer-events: none;
+
+                        .fm-icon-act_search:before {
+                            color: @ui-prompt-icon-color;
+                        }
+                    }
+                }
+
+                .fm-icon-act_close {
+                    visibility: hidden;
+                    position: absolute;
+                    right: 0;
+                    top: 0;
+                    height: 100%;
+                    width: 39px;
+                    cursor: pointer;
+                    z-index: 3;
+                    color: @ui-icon-color;
+
+
+                    &::before {
+                        font-size: 26px;
+                        position: absolute;
+                        top: 5px;
+                        left: 6px;
+                    }
+                }
+
+                .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-list-content {
             border: @ui-element-border;
             margin-bottom: 20px;
@@ -4482,6 +4592,11 @@
                     overflow: hidden;
                     width: ~"calc(100% - 50px)";
                     width: ~"-webkit-calc(100% - 50px)";
+
+                    .fm-search-highlight {
+                        background-color: @grid-table-header-filter-column-search-highlight;
+                        font-weight: inherit;
+                    }
                 }
 
                 .fm-aggr-display {

package/theme/green/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: #ebfada;
+  position: relative;
+  border: 1px solid #b9d998;
+  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: #69b01e;
+}
+#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 #b9d998;
+  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: #69b01e;
+  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: #c1f49c;
+}
+#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: #69b01e;
+}
+#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 #b9d998;
   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%;