@ledvance/group-ui-biz-bundle 1.0.44 → 1.0.46
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/modules/fixedTimeForPlug/FixedTimeForPlugDetailPage.tsx +4 -2
- package/src/modules/fixedTimeForPlug/FixedTimeForPlugPage.tsx +1 -0
- package/src/modules/fixedTimingForLight/FixedTimingForLightDetailPage.tsx +3 -2
- package/src/modules/fixedTimingForLight/FixedTimingForLightPage.tsx +2 -1
- package/src/modules/randomTimeForPlug/RandomTimeForPlugDetailPage.tsx +3 -2
- package/src/modules/randomTimeForPlug/RandomTimeForPlugPage.tsx +1 -0
- package/src/modules/randomTimingForLight/RandomTimingForLightDetailPage.tsx +3 -2
- package/src/modules/randomTimingForLight/RandomTimingForLightPage.tsx +2 -1
package/package.json
CHANGED
|
@@ -45,8 +45,9 @@ const newFixedTimeItem = (): FixedTimeItem => {
|
|
|
45
45
|
const FixedTimeForPlugDetailPage = () => {
|
|
46
46
|
const navigation = useNavigation()
|
|
47
47
|
const params = useRoute().params as FixedTimeDetailParam
|
|
48
|
+
const initItem = newFixedTimeItem();
|
|
48
49
|
const state = useReactive({
|
|
49
|
-
item: params.mode === 'add' ?
|
|
50
|
+
item: params.mode === 'add' ? cloneDeep(initItem) : cloneDeep(params.item),
|
|
50
51
|
onHour: '00',
|
|
51
52
|
onMinute: '01',
|
|
52
53
|
offHour: '00',
|
|
@@ -91,7 +92,7 @@ const FixedTimeForPlugDetailPage = () => {
|
|
|
91
92
|
}, [state.item.name, state.item.channel, isTimeEffective])
|
|
92
93
|
|
|
93
94
|
const showConfirm = useMemo(() => {
|
|
94
|
-
return params.mode === 'edit'
|
|
95
|
+
return !isEqual(state.item, params.mode === 'edit' ? params.item : initItem)
|
|
95
96
|
}, [JSON.stringify(state.item), JSON.stringify(params.item)])
|
|
96
97
|
|
|
97
98
|
const onSave = async () => {
|
|
@@ -101,6 +102,7 @@ const FixedTimeForPlugDetailPage = () => {
|
|
|
101
102
|
const item = cloneDeep(state.item)
|
|
102
103
|
item.onTime = parseTime(state.onHour, state.onMinute)
|
|
103
104
|
item.offTime = parseTime(state.offHour, state.offMinute)
|
|
105
|
+
item.settingTime = new Date().getTime()
|
|
104
106
|
showDialog({
|
|
105
107
|
method: 'confirm',
|
|
106
108
|
title: I18n.getLang('conflict_dialog_active_item_fixedtimecycle_titel'),
|
|
@@ -55,8 +55,9 @@ const newFixedTimingItem = (): FixedTimingItem => {
|
|
|
55
55
|
const FixedTimingForLightDetailPage = () => {
|
|
56
56
|
const navigation = useNavigation()
|
|
57
57
|
const params = useRoute().params as FixedTimeDetailParam
|
|
58
|
+
const initItem = newFixedTimingItem();
|
|
58
59
|
const state = useReactive({
|
|
59
|
-
item: params.mode === 'add' ?
|
|
60
|
+
item: params.mode === 'add' ? cloneDeep(initItem) : cloneDeep(params.item),
|
|
60
61
|
onHour: '00',
|
|
61
62
|
onMinute: '01',
|
|
62
63
|
offHour: '00',
|
|
@@ -107,7 +108,7 @@ const FixedTimingForLightDetailPage = () => {
|
|
|
107
108
|
}, [state.item.name, state.item.channel, isTimeEffective])
|
|
108
109
|
|
|
109
110
|
const showConfirm = useMemo(() => {
|
|
110
|
-
return params.mode === 'edit'
|
|
111
|
+
return !isEqual(state.item, params.mode === 'edit' ? params.item : initItem)
|
|
111
112
|
}, [JSON.stringify(state.item), JSON.stringify(params.item)])
|
|
112
113
|
|
|
113
114
|
const onSave = async () => {
|
|
@@ -14,7 +14,7 @@ import ItemCard from "./ItemCard";
|
|
|
14
14
|
import {cloneDeep} from "lodash";
|
|
15
15
|
|
|
16
16
|
const {convertX: cx, topBarHeight} = Utils.RatioUtils;
|
|
17
|
-
const MAX_NUM =
|
|
17
|
+
const MAX_NUM = 4
|
|
18
18
|
|
|
19
19
|
const FixedTimeForLightPage = () => {
|
|
20
20
|
const devInfo = useDeviceInfo()
|
|
@@ -80,6 +80,7 @@ const FixedTimeForLightPage = () => {
|
|
|
80
80
|
await onPost('edit', {
|
|
81
81
|
...item,
|
|
82
82
|
power: v,
|
|
83
|
+
settingTime: new Date().getTime()
|
|
83
84
|
})
|
|
84
85
|
}}
|
|
85
86
|
onPress={() => {
|
|
@@ -43,8 +43,9 @@ const newRandomTimeItem = (): RandomTimeItem => {
|
|
|
43
43
|
const RandomTimeForPlugDetailPage = () => {
|
|
44
44
|
const navigation = useNavigation()
|
|
45
45
|
const params = useRoute().params as RandomTimeDetailParam
|
|
46
|
+
const initItem = newRandomTimeItem();
|
|
46
47
|
const state = useReactive({
|
|
47
|
-
item: params.mode === 'add' ?
|
|
48
|
+
item: params.mode === 'add' ? cloneDeep(initItem) : cloneDeep(params.item),
|
|
48
49
|
loading: false
|
|
49
50
|
})
|
|
50
51
|
|
|
@@ -53,7 +54,7 @@ const RandomTimeForPlugDetailPage = () => {
|
|
|
53
54
|
}, [state.item.name, state.item.channel])
|
|
54
55
|
|
|
55
56
|
const showConfirm = useMemo(() => {
|
|
56
|
-
return params.mode === 'edit'
|
|
57
|
+
return !isEqual(state.item, params.mode === 'edit' ? params.item : initItem)
|
|
57
58
|
}, [JSON.stringify(state.item), JSON.stringify(params.item)])
|
|
58
59
|
|
|
59
60
|
const onSave = async () => {
|
|
@@ -52,8 +52,9 @@ const newRandomTimingItem = (): RandomTimingItem => {
|
|
|
52
52
|
const RandomTimingForLightDetailPage = () => {
|
|
53
53
|
const navigation = useNavigation()
|
|
54
54
|
const params = useRoute().params as RandomTimeDetailParam
|
|
55
|
+
const initItem = newRandomTimingItem();
|
|
55
56
|
const state = useReactive({
|
|
56
|
-
item: params.mode === 'add' ?
|
|
57
|
+
item: params.mode === 'add' ? cloneDeep(initItem) : cloneDeep(params.item),
|
|
57
58
|
loading: false,
|
|
58
59
|
isColorMode: false
|
|
59
60
|
})
|
|
@@ -68,7 +69,7 @@ const RandomTimingForLightDetailPage = () => {
|
|
|
68
69
|
}, [state.item.name, state.item.channel])
|
|
69
70
|
|
|
70
71
|
const showConfirm = useMemo(() => {
|
|
71
|
-
return params.mode === 'edit'
|
|
72
|
+
return !isEqual(state.item, params.mode === 'edit' ? params.item : initItem)
|
|
72
73
|
}, [JSON.stringify(state.item), JSON.stringify(params.item)])
|
|
73
74
|
|
|
74
75
|
const onSave = async () => {
|
|
@@ -14,7 +14,7 @@ import ItemCard from "./ItemCard";
|
|
|
14
14
|
import {cloneDeep} from "lodash";
|
|
15
15
|
|
|
16
16
|
const {convertX: cx, topBarHeight} = Utils.RatioUtils;
|
|
17
|
-
const MAX_NUM =
|
|
17
|
+
const MAX_NUM = 4
|
|
18
18
|
|
|
19
19
|
const RandomTimeForLightPage = () => {
|
|
20
20
|
const devInfo = useDeviceInfo()
|
|
@@ -80,6 +80,7 @@ const RandomTimeForLightPage = () => {
|
|
|
80
80
|
await onPost('edit', {
|
|
81
81
|
...item,
|
|
82
82
|
power: v,
|
|
83
|
+
settingTime: new Date().getTime()
|
|
83
84
|
})
|
|
84
85
|
}}
|
|
85
86
|
onPress={() => {
|