@ledvance/base 1.1.48 → 1.1.49

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/base",
   "pid": [],
   "uiid": "",
-  "version": "1.1.48",
+  "version": "1.1.49",
   "scripts": {},
   "dependencies": {
     "@reduxjs/toolkit": "^1.8.6",

package/src/api/native.ts

@@ -319,8 +319,8 @@ export const queryDpIds = (dpIds: string, deviceId: string) => {
   })
 }
 
-export const formatNumber: (num: number, fixed: number, isCN?: boolean) => string = (num, fixed, isCN: boolean = false) => {
-  const res = devicePanel.formatNumber(num, fixed, isCN)
+export const formatNumber: (num: number, fixed: number, shoGroup?: boolean) => string = (num, fixed, shoGroup: boolean = true) => {
+  const res = devicePanel.formatNumber(num, fixed, shoGroup)
   log(`formatNumber: num=${num}, fixed=${fixed}, res=${res}`)
   return res
 }

package/src/models/modules/NativePropsSlice.tsx

@@ -186,7 +186,7 @@ const useDeviceInfo: () => DevInfo<DpState> = () => {
 const useTimeSchedule = (): [v: boolean | undefined, f: any] => {
   const dps = useSelector(store => store.ldvModules.timeSchedule)
   const dispatch = useDispatch()
-  const setTimeScheduleFn = (value: Symbol) => {
+  const setTimeScheduleFn = (value: boolean) => {
     dispatch(setTimeSchedule(value))
   }
   return [dps, setTimeScheduleFn]

package/src/utils/common.ts

@@ -86,19 +86,21 @@ if (Platform.OS === 'ios') {
 }
 
 // 德国数字格式化
-export const localeNumber = (v: number | string, fixed?: number) => {
+export const localeNumber = (v: number | string, fixed?: number, showGroup?: boolean) => {
   const mFixed = fixed || 2
   const n = isNaN(Number(v)) ? 0 : Number(v)
-  const num = Number(n.toFixed(mFixed))
   try {
-    if (Platform.OS === 'android') return formatNumber(n, mFixed)
+    if (Platform.OS === 'android') return formatNumber(n, mFixed, showGroup)
     let local = defaultLocale
     if (defaultLocale !== 'pt_BR' && defaultLocale !== 'pt-BR') {
       local = defaultLocale.split('_')[0]
     }
-    return new Intl.NumberFormat(local).format(num)
+    return new Intl.NumberFormat(local, {
+      useGrouping: showGroup !== undefined ? showGroup : true,
+      maximumFractionDigits: mFixed
+    }).format(n)
   } catch (_) {
-    return num
+    return n
   }
 }