refactoring

altai-ui · Jan 19, 2021 · 185370b · 185370b
1 parent bc89502
commit 185370b
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/src/qComponents/QTable/src/QTable.vue b/src/qComponents/QTable/src/QTable.vue
@@ -96,14 +96,14 @@
                           v-if="$scopedSlots.header"
                           name="header"
                           :data="column"
-                          v-bind="updateItem(column, index, column.key)"
+                          v-bind="updateColumnItem(column, index, column.key)"
                         />
 
                         <slot
                           v-else-if="column.slots && column.slots.header"
                           :name="column.slots.header"
                           :data="column"
-                          v-bind="updateItem(column, index, column.key)"
+                          v-bind="updateColumnItem(column, index, column.key)"
                         />
 
                         <template v-else>
@@ -188,14 +188,14 @@
                       v-if="$scopedSlots.total"
                       name="total"
                       :data="total"
-                      v-bind="updateItem(total, index, column.key)"
+                      v-bind="updateTotalItem(total, index, column.key)"
                     />
 
                     <slot
                       v-else-if="column.slots && column.slots.total"
                       :name="column.slots.total"
                       :data="total"
-                      v-bind="updateItem(total, index, column.key)"
+                      v-bind="updateTotalItem(total, index, column.key)"
                     />
 
                     <template v-else-if="total[column.key]">
@@ -864,8 +864,18 @@ export default {
       };
     },
 
-    updateItem(item, index, key) {
-      const value = item.value ?? item[key] ?? null;
+    updateColumnItem(item, index, key) {
+      const value = item.value ?? null;
+
+      return {
+        columnKey: key || null,
+        index,
+        value
+      };
+    },
+
+    updateTotalItem(item, index, key) {
+      const value = item[key] ?? null;
 
       return {
         columnKey: key || null,