@policystudio/policy-studio-ui-vue 1.1.86 → 1.1.88

package/dist/css/psui_styles.css

@@ -2443,12 +2443,9 @@ video {
 
 .psui-el-table-results.layout-flexible thead tr:first-of-type th:first-child {
               padding-left: 0;
+              width: 598px;
             }
 
-.psui-el-table-results.layout-flexible thead tr:first-of-type th:first-child > div {
-                min-width: 598px;
-              }
-
 .psui-el-table-results.layout-flexible thead tr:first-of-type th > div {
               display: flex;
               flex-direction: row;
@@ -2495,7 +2492,7 @@ video {
 
 .psui-el-table-results.layout-flexible thead tr:not(:first-of-type) th:first-child {
               text-align: left;
-              min-width: 330px;
+              width: 352px;
               padding-left: 0;
             }
 
@@ -2503,7 +2500,7 @@ video {
               position: sticky;
               z-index: 10;
               background-color: #ffffff ;
-              left:330px;
+              left: 352px;
               min-width: 140px;
             }
 
@@ -2511,7 +2508,7 @@ video {
               position: sticky;
               z-index: 10;
               background-color: #ffffff ;
-              left: 470px;
+              left: 492px;
             }
 
 .psui-el-table-results.layout-flexible tbody tr {
@@ -2592,15 +2589,15 @@ video {
             left: 0;
             padding-top: 8px;
             padding-bottom: 8px;
-            min-width: 330px;
+            width: 352px;
             padding-left: 0px;
           }
 
 .psui-el-table-results.layout-flexible tbody tr td:nth-child(2) {
             position: sticky;
             z-index: 10;
-            min-width: 140px;
-            left: 330px;
+            width: 140px;
+            left: 352px;
           }
 
 .psui-el-table-results.layout-flexible tbody tr td:nth-child(2) > div {
@@ -2611,7 +2608,7 @@ video {
             position: sticky;
             z-index: 10;
             min-width: 140px;
-            left: 470px;
+            left: 492px;
           }
 
 .psui-el-table-results.layout-flexible tbody tr td:nth-child(3) > div {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@policystudio/policy-studio-ui-vue",
-  "version": "1.1.86",
+  "version": "1.1.88",
   "description": "Policy Studio UI",
   "main": "src/index.js",
   "author": "Policy Studio Team",

package/src/assets/scss/components/PsTableResults.scss

@@ -404,10 +404,7 @@
 
               &:first-child {
                 padding-left: 0;
-
-                > div {
-                  min-width: 598px;
-                }
+                width: 598px;
               }
   
               > div {
@@ -442,19 +439,19 @@
 
               &:first-child {
                 @apply psui-text-left;
-                min-width: 330px;
+                width: 352px;
                 padding-left: 0;
               }
 
               &:nth-child(2) {
                 @apply psui-sticky psui-z-10 psui-bg-white;
-                left:330px;
+                left: 352px;
                 min-width: 140px;
               }
   
               &:nth-child(3) {
                 @apply psui-sticky psui-z-10 psui-bg-white;
-                left: 470px;
+                left: 492px;
               }
             }
           }
@@ -525,14 +522,14 @@
               @apply psui-pr-8 psui-text-left psui-block psui-sticky psui-z-10 psui-left-0;
               padding-top: 8px;
               padding-bottom: 8px;
-              min-width: 330px;
+              width: 352px;
               padding-left: 0px;
             }
 
             &:nth-child(2) {
               @apply psui-sticky psui-z-10;
-              min-width: 140px;
-              left: 330px;
+              width: 140px;
+              left: 352px;
               > div {
                 @apply psui-justify-center;
               }
@@ -541,7 +538,7 @@
             &:nth-child(3) {
               @apply psui-sticky psui-z-10;
               min-width: 140px;
-              left: 470px;
+              left: 492px;
               > div {
                 @apply psui-justify-center;
               }

package/src/components/table-results/PsTableResults.vue

@@ -520,8 +520,12 @@ export default {
       return  !item.is_disabled && item.deep != 0 ? '#ECF7FB' : item.is_disabled && item.deep != 0 ? '#E6ECF2' : ''
     },
     setCollapsedRows() {
-      const newRowsCollpased = [...(this.itemsHiddenIndexes || [])]
-      if ( this.showRowsCollapsed || this.layout === 'flexible' ) {
+      let newRowsCollpased = [...(this.itemsHiddenIndexes || [])]
+      
+      if ( this.itemsHiddenIndexes && this.layout != 'flexible' ) return
+
+      if ( this.showRowsCollapsed || this.layout == 'flexible' ) {
+
         this.getRows.forEach(element => {
           const matchForAll = Boolean( element?.items?.length && ( this.customLevelOpened == null || element.index.split('-').length > this.customLevelOpened))
           const matchForFlexibleLayout = Boolean(element.isCollapsed === true)
@@ -529,7 +533,23 @@ export default {
             newRowsCollpased.push(element.index)
           }
         })
-      }
+      } 
+      
+      // else {
+      //   if ( this.itemsHiddenIndexes ) {
+      //     this.collapsedRows = [...this.itemsHiddenIndexes] 
+      //     return
+      //   }
+
+      //   if ( this.showRowsCollapsed ) {
+      //     this.getRows.forEach(element => {
+      //       if ( element?.items?.length && ( this.customLevelOpened == null || element.index.split('-').length > this.customLevelOpened)) {
+      //         newRowsCollpased.push(element.index)
+      //       }
+      //     })
+      //   }
+      // }
+      
       this.collapsedRows = newRowsCollpased
     },
     getIconClasses(item) {
@@ -569,6 +589,7 @@ export default {
       }
 
       const index = this.collapsedRows.indexOf(item.index)
+      
       if(index > -1) {
         this.collapsedRows.splice(index, 1)
         delete item.isCollapsed
@@ -577,6 +598,7 @@ export default {
         item.isCollapsed = true
       }
       this.$forceUpdate()
+      
       this.$emit('collapse-row', this.collapsedRows, $event)
     }, 
     onRowHover(index, item, type) {