bfg-common 1.4.404 → 1.4.405

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/form/lib/config/dateForm.ts

@@ -85,6 +85,7 @@ export const chartTypeFunc = (
 ]
 
 const getCorrectRuForm = (value: number, type: string): string => {
+  // TODO поправить используя correctRuUnit из плагина date
   const forms: UI_I_ArbitraryObject<string[]> = {
     hour: ['Час', 'Часа', 'Часов'],
     day: ['День', 'Дня', 'Дней'],

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.4.404",
+  "version": "1.4.405",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",

package/plugins/date.ts

@@ -215,12 +215,12 @@ export default defineNuxtPlugin(() => {
     const years = Math.floor(time / 60 / 60 / 24 / 30 / 12)
 
     let result = ''
-    if (seconds) result += `${seconds}${units[0]}`
-    if (minutes) result += `${minutes}${units[1]} `
-    if (hours) result += `${hours}${units[2]} `
-    if (days) result += `${days}${units[3]} `
-    if (months) result += `${months}${units[4]} `
-    if (years) result += `${years}${units[5]} `
+    if (years) result += `${years}${units[5]}`
+    if (months) result += ` ${months}${units[4]}`
+    if (days) result += ` ${days}${units[3]}`
+    if (hours) result += ` ${hours}${units[2]}`
+    if (minutes) result += ` ${minutes}${units[1]}`
+    if (seconds) result += ` ${seconds}${units[0]}`
 
     return result
   }