mediacube-ui 0.1.343 → 0.1.345

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.1.345](https://github.com/MediaCubeCo/mcui/compare/v0.1.344...v0.1.345) (2024-12-10)
+
+### [0.1.344](https://github.com/MediaCubeCo/mcui/compare/v0.1.343...v0.1.344) (2024-12-09)
+
 ### [0.1.343](https://github.com/MediaCubeCo/mcui/compare/v0.1.342...v0.1.343) (2024-12-06)
 
 ### [0.1.342](https://github.com/MediaCubeCo/mcui/compare/v0.1.341...v0.1.342) (2024-11-29)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mediacube-ui",
-  "version": "0.1.343",
+  "version": "0.1.345",
   "description": "Design system for Mediacube services",
   "author": "Mediacube",
   "private": false,

package/src/patterns/McTable/McTable/McTable.vue

@@ -56,6 +56,7 @@
 import noTableDataIcon from '../../../assets/img/no_table_data.png'
 import _throttle from 'lodash/throttle'
 import _isEmpty from 'lodash/isEmpty'
+import _isEqual from 'lodash/isEqual'
 
 import McTitle from '../../../elements/McTitle/McTitle'
 import McSvgIcon from '../../../elements/McSvgIcon/McSvgIcon'
@@ -317,17 +318,14 @@ export default {
             return !this.scrollable && this.hasMore
         },
         canShowFooter() {
-            if (this.scrollable) {
-                switch (this.footerInfo) {
-                    case 'total':
-                        return !this.cardIsOpen
-                    case 'loaded':
-                        return !this.hasMore && !this.$attrs.loading && !!this.items.length
-                    default:
-                        return false
-                }
+            switch (this.footerInfo) {
+                case 'total':
+                    return true
+                case 'loaded':
+                    return !this.hasMore && !this.$attrs.loading && !!this.items.length
+                default:
+                    return false
             }
-            return !!this.items.length
         },
         tag() {
             return `vxe-${this.componentTag}`
@@ -343,7 +341,7 @@ export default {
         },
         wrapperStyles() {
             return {
-                width: this.cardIsOpen ? `${this.firstColsWidth}px` : 'auto',
+                width: 'auto',
                 height: this.$attrs.height ? this.getFixedHeight(this.$attrs.height) : 'auto',
                 'max-height': this.$attrs['max-height'] ? this.getFixedHeight(this.$attrs['max-height']) : 'none',
             }
@@ -391,9 +389,14 @@ export default {
             deep: true,
         },
         items: {
-            handler: async function(newVal) {
-                newVal && (await this.loadData(true))
-                newVal && (await this.setFirstColsWidth())
+            handler: async function(newVal, oldVal) {
+                if (_isEqual(newVal, oldVal)) return
+                if (newVal.length !== oldVal.length) {
+                    newVal && (await this.loadData(true))
+                } else {
+                    newVal && (await this.setFirstColsWidth())
+                    await this.reloadData()
+                }
             },
             deep: true,
         },
@@ -427,8 +430,8 @@ export default {
         reloadData() {
             this.$refs.xTable.reloadData(this.items)
         },
-        updateData() {
-            this.$refs.xTable.updateData()
+        async updateData() {
+            await this.$refs.xTable.updateData()
         },
         checkOccupancy() {
             if (!this.$refs.xTable || !this.items?.length) return
@@ -516,29 +519,14 @@ export default {
         toggleColumns(val) {
             if (val) {
                 const columns = this.$refs.xTable.getColumns()
-                let fixedColNeigbhorIndex
-                const hideColumns = columns.filter((col, i) => {
-                    const isFixedCol = col.fixed === 'left'
-                    /**
-                     * Скрываем все столбцы кроме фиксированного и его соседа, чтобы не было рассинхрона при выходе из карточки
-                     * т.к. когда остается 1 столбец, то фикс - размаунтится, а потом при выходе из карточки перерендеривается
-                     * и скроллит в самый верх
-                     * */
-                    if (isFixedCol) fixedColNeigbhorIndex = i + 1
-                    switch (true) {
-                        case i === fixedColNeigbhorIndex:
-                            return
-                        default:
-                            return !isFixedCol
-                    }
-                })
+                const hideColumns = columns.filter(col => col.fixed !== 'left')
                 hideColumns.forEach(col => (col.visible = false))
                 this.$refs.xTable.refreshColumn()
             } else {
                 this.$refs.xTable.resetColumn()
             }
-            // this.$refs.xTable.recalculate()
-            // this.$refs.xTable.syncData()
+            this.$refs.xTable.recalculate()
+            this.$refs.xTable.syncData() // Синхронит данные таблиц (фикс колонка === отдельная таблица)
             this.checkHorizontalScroll()
         },
         getFixedHeight(val) {
@@ -696,6 +684,10 @@ export default {
         .vxe-table--body-wrapper,
         .vxe-table--footer-wrapper {
             overflow-x: hidden;
+            width: fit-content;
+        }
+        .vxe-table--footer {
+            display: none;
         }
     }
     &--clickable {