@dataloop-ai/components 0.15.2 → 0.15.4-table-fix.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dataloop-ai/components",
-  "version": "0.15.2",
+  "version": "0.15.4-table-fix.0",
   "exports": {
     ".": "./index.ts",
     "./models": "./models.ts",

package/src/components/DlCounters.vue

@@ -88,7 +88,10 @@ export default defineComponent({
             return value[0].toUpperCase() + value.slice(1)
         },
         abbreviateNumber(nr: number) {
-            if (nr) return abbreviateToString(nr)
+            if (typeof nr === 'number') {
+                return abbreviateToString(nr)
+            }
+            return nr
         },
         computeClass(value: string): (string | boolean)[] {
             return [value, this.small && `${value}--small`]

package/src/components/DlTable/DlTable.vue

@@ -620,12 +620,7 @@ export default defineComponent({
         const virtScrollRef = ref(null)
         const hasVirtScroll = computed(() => props.virtualScroll === true)
 
-        const {
-            hasClickEvent,
-            hasDblClickEvent,
-            hasContextMenuEvent,
-            hasAnyAction
-        } = useTableActions(props)
+        const { hasAnyAction } = useTableActions(props) // todo: does not work
 
         const getRowKey = computed(() =>
             typeof props.rowKey === 'function'
@@ -1110,9 +1105,7 @@ export default defineComponent({
             row: TableRow,
             pageIndex: number
         ) => {
-            if (hasClickEvent.value) {
-                emit('row-click', evt, row, pageIndex)
-            }
+            emit('row-click', evt, row, pageIndex)
         }
 
         const onTrDblClick = (
@@ -1120,9 +1113,7 @@ export default defineComponent({
             row: TableRow,
             pageIndex: number
         ) => {
-            if (hasDblClickEvent.value) {
-                emit('row-dblclick', evt, row, pageIndex)
-            }
+            emit('row-dblclick', evt, row, pageIndex)
         }
 
         const onTrContextMenu = (
@@ -1130,9 +1121,7 @@ export default defineComponent({
             row: TableRow,
             pageIndex: number
         ) => {
-            if (hasContextMenuEvent.value) {
-                emit('row-contextmenu', evt, row, pageIndex)
-            }
+            emit('row-contextmenu', evt, row, pageIndex)
         }
 
         function injectBodyCommonScope(data: Record<string, any>) {

package/src/utils/abbreviate-to-string.ts

@@ -1,14 +1,23 @@
-export function abbreviateToString(value: number): string {
-    const suffixes = ['', 'k', 'm', 'b', 't']
-    const suffixNum = Math.floor(('' + value).length / 3)
-    const shortValue = parseFloat(
-        (suffixNum !== 0
-            ? value / Math.pow(1000, suffixNum)
-            : value
-        ).toPrecision(2)
-    )
-    if (shortValue % 1 !== 0) {
-        shortValue.toFixed(1)
+export function abbreviateToString(num: number, precision: number = 1): string {
+    const abbreviations = [
+        { value: 1e12, suffix: 'T' },
+        { value: 1e9, suffix: 'B' },
+        { value: 1e6, suffix: 'M' },
+        { value: 1e3, suffix: 'K' }
+    ]
+
+    const match = abbreviations.find((abb) => num >= abb.value)
+    if (!match) {
+        return num.toString()
+    }
+
+    const abbreviated = (num / match.value).toFixed(precision)
+    const formatted = Number(abbreviated).toString()
+    const suffix = match.suffix
+
+    if (formatted.includes('.')) {
+        return formatted.replace(/\.?0*$/, '') + suffix
+    } else {
+        return formatted + suffix
     }
-    return shortValue + suffixes[suffixNum]
 }