@ledvance/ui-biz-bundle 1.1.69 → 1.1.71

package/src/modules/history/SwitchHistoryPageActions.ts

@@ -1,77 +1,77 @@
-import { getDpReportSataData, PagingResult } from '@ledvance/base/src/models/TuyaApi'
-import { cloneDeep, groupBy, isEqual, uniqWith } from 'lodash'
-import dayjs from 'dayjs'
-import I18n from '@ledvance/base/src/i18n'
-import duration from 'dayjs/plugin/duration'
-dayjs.extend(duration)
-export interface SwitchHistoryUIItemData {
-    title: string
-    actions: SwitchHistoryUIItemActionData[]
-}
-
-const weekList = {
-    Sun: I18n.getLang('timeschedule_add_schedule_weekday7_text'),
-    Mon: I18n.getLang('timeschedule_add_schedule_weekday1_text'),
-    Tue: I18n.getLang('timeschedule_add_schedule_weekday2_text'),
-    Wed: I18n.getLang('timeschedule_add_schedule_weekday3_text'),
-    Thu: I18n.getLang('timeschedule_add_schedule_weekday4_text'),
-    Fri: I18n.getLang('timeschedule_add_schedule_weekday5_text'),
-    Sat: I18n.getLang('timeschedule_add_schedule_weekday6_text'),
-}
-
-export interface SwitchHistoryUIItemActionData {
-    date: string
-    time: string
-    action: string
-    dpId: string
-}
-
-const formateLimitTime = (time: number) =>{
-    const duration = dayjs.duration(time * 1000);
-    const hours = duration.hours();
-    const minutes = duration.minutes();
-    const seconds = duration.seconds();
-    const hoursString = ` ${hours}h ${minutes}min ${seconds}sec`
-    const minutesString = ` ${minutes}min ${seconds}sec`
-    const secondsString = ` ${seconds}sec`
-    const v = hours > 0 ? hoursString : (hours > 0 || minutes > 0) ? minutesString : secondsString
-    return v
-    // return ` ${hours > 0 ? hours + 'h' : ''} ${(minutes > 0 || hours > 0) ? minutes + 'min' : ''} ${seconds}sec`
-}
-
-type getSwitchHistoryDataFunType = (deviceId: string, dpIds: string[], offset: number, limit?: number, stringOn?:string, stringOff?:string, actionKey?:string, showLimit?:boolean) => Promise<PagingResult<SwitchHistoryUIItemData[]>>
-
-export const getSwitchHistoryData: getSwitchHistoryDataFunType = async (deviceId: string, dpIds: string[], offset: number, limit: number = 100, stringOn, stringOff, actionKey, showLimit) => {
-    const res = await getDpReportSataData(deviceId, dpIds, 0, offset + limit)
-    const uniqData = uniqWith(res.dps, isEqual)
-    const reverseData = cloneDeep(uniqData).reverse()
-    const limitTimeData = reverseData.map((item, idx) =>{
-        return {
-            ...item,
-            limitTime: reverseData[idx + 1] ? formateLimitTime(reverseData[idx + 1].timeStamp - item.timeStamp) : ''
-        }
-    })
-    const key = actionKey || 'true'
-    const dateActionsMap = groupBy(limitTimeData.reverse().map(dpData => {
-        const dayjsDate = dayjs(dpData.timeStr)
-        return {
-            date: `${dayjsDate.format('DD/MM/YYYY')} (${weekList[dayjsDate.format('ddd')]})`,
-            time: dayjsDate.format('HH:mm:ss'),
-            action: I18n.formatValue(dpData.value === key ? (stringOn || 'history_powerstrip_field1_text') : (stringOff || 'history_powerstrip_field1_text2'), '', showLimit ? dpData.limitTime : ''),
-            dpId: dpData.dpId,
-        }
-    }), 'date')
-    const data: SwitchHistoryUIItemData[] = Object.keys(dateActionsMap).map(key => {
-        return {
-            title: key,
-            actions: dateActionsMap[key],
-        }
-    })
-    const result: PagingResult<SwitchHistoryUIItemData[]> = {
-        data: data,
-        hasNext: res.hasNext,
-        currentOffset: res.dps.length,
-    }
-    console.log(result)
-    return result
+import { getDpReportSataData, PagingResult } from '@ledvance/base/src/models/TuyaApi'
+import { cloneDeep, groupBy, isEqual, uniqWith } from 'lodash'
+import dayjs from 'dayjs'
+import I18n from '@ledvance/base/src/i18n'
+import duration from 'dayjs/plugin/duration'
+dayjs.extend(duration)
+export interface SwitchHistoryUIItemData {
+    title: string
+    actions: SwitchHistoryUIItemActionData[]
+}
+
+const weekList = {
+    Sun: I18n.getLang('timeschedule_add_schedule_weekday7_text'),
+    Mon: I18n.getLang('timeschedule_add_schedule_weekday1_text'),
+    Tue: I18n.getLang('timeschedule_add_schedule_weekday2_text'),
+    Wed: I18n.getLang('timeschedule_add_schedule_weekday3_text'),
+    Thu: I18n.getLang('timeschedule_add_schedule_weekday4_text'),
+    Fri: I18n.getLang('timeschedule_add_schedule_weekday5_text'),
+    Sat: I18n.getLang('timeschedule_add_schedule_weekday6_text'),
+}
+
+export interface SwitchHistoryUIItemActionData {
+    date: string
+    time: string
+    action: string
+    dpId: string
+}
+
+const formateLimitTime = (time: number) =>{
+    const duration = dayjs.duration(time * 1000);
+    const hours = duration.hours();
+    const minutes = duration.minutes();
+    const seconds = duration.seconds();
+    const hoursString = ` ${hours}h ${minutes}min ${seconds}sec`
+    const minutesString = ` ${minutes}min ${seconds}sec`
+    const secondsString = ` ${seconds}sec`
+    const v = hours > 0 ? hoursString : (hours > 0 || minutes > 0) ? minutesString : secondsString
+    return v
+    // return ` ${hours > 0 ? hours + 'h' : ''} ${(minutes > 0 || hours > 0) ? minutes + 'min' : ''} ${seconds}sec`
+}
+
+type getSwitchHistoryDataFunType = (deviceId: string, dpIds: string[], offset: number, limit?: number, stringOn?:string, stringOff?:string, actionKey?:string, showLimit?:boolean) => Promise<PagingResult<SwitchHistoryUIItemData[]>>
+
+export const getSwitchHistoryData: getSwitchHistoryDataFunType = async (deviceId: string, dpIds: string[], offset: number, limit: number = 100, stringOn, stringOff, actionKey, showLimit) => {
+    const res = await getDpReportSataData(deviceId, dpIds, 0, offset + limit)
+    const uniqData = uniqWith(res.dps, isEqual)
+    const reverseData = cloneDeep(uniqData).reverse()
+    const limitTimeData = reverseData.map((item, idx) =>{
+        return {
+            ...item,
+            limitTime: reverseData[idx + 1] ? formateLimitTime(reverseData[idx + 1].timeStamp - item.timeStamp) : ''
+        }
+    })
+    const key = actionKey || 'true'
+    const dateActionsMap = groupBy(limitTimeData.reverse().map(dpData => {
+        const dayjsDate = dayjs(dpData.timeStr)
+        return {
+            date: `${dayjsDate.format('DD/MM/YYYY')} (${weekList[dayjsDate.format('ddd')]})`,
+            time: dayjsDate.format('HH:mm:ss'),
+            action: I18n.formatValue(dpData.value === key ? (stringOn || 'history_powerstrip_field1_text') : (stringOff || 'history_powerstrip_field1_text2'), '', showLimit ? dpData.limitTime : ''),
+            dpId: dpData.dpId,
+        }
+    }), 'date')
+    const data: SwitchHistoryUIItemData[] = Object.keys(dateActionsMap).map(key => {
+        return {
+            title: key,
+            actions: dateActionsMap[key],
+        }
+    })
+    const result: PagingResult<SwitchHistoryUIItemData[]> = {
+        data: data,
+        hasNext: res.hasNext,
+        currentOffset: res.dps.length,
+    }
+    console.log(result)
+    return result
 }

package/src/modules/mood/AddMoodPage.d.ts

@@ -1,10 +1,10 @@
-import { SceneUIState } from '../scene/SceneInfo';
-import { MoodPageProps } from './MoodPage';
-export interface AddMoodPageParams {
-    isStatic: boolean;
-    moods: SceneUIState[];
-    onSave: () => void;
-    moduleParams: MoodPageProps;
-}
-declare const AddMoodPage: () => any;
-export default AddMoodPage;
+import { SceneUIState } from '../scene/SceneInfo';
+import { MoodPageProps } from './MoodPage';
+export interface AddMoodPageParams {
+    isStatic: boolean;
+    moods: SceneUIState[];
+    onSave: () => void;
+    moduleParams: MoodPageProps;
+}
+declare const AddMoodPage: () => any;
+export default AddMoodPage;