@ledvance/group-ui-biz-bundle 1.0.12 → 1.0.14

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/group-ui-biz-bundle",
   "pid": [],
   "uiid": "",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "scripts": {},
   "dependencies": {
     "@ledvance/base": "^1.x",

package/src/modules/flags/FlagInfo.tsx

@@ -300,7 +300,7 @@ export const defFlagList: FlagUiInfo[] = [
     version: 0,
     mode: SceneNodeTransitionMode.Jump,
     speed: 70,
-    name: I18n.getLang('flag_leverkusen'),
+    name: '',
     icon: res.leverkusen_icon,
     whiteColors: [
       { brightness: 100, colorTemp: 0},

package/src/modules/flags/FlagItem.tsx

@@ -28,8 +28,8 @@ export default function FlagItem(props: RecommendMoodItemProps) {
         <Spacer height={cx(16)} />
         <View style={styles.headline}>
           <View style={{ flexDirection: 'row', flex: 1, paddingRight: cx(5), justifyContent: 'flex-start' }}>
-            <Text style={styles.headText}>{props.title}</Text>
-            {props.icon && <Image source={icon} style={{ width: cx(60), aspectRatio: 2.14, marginRight: cx(10) }} />}
+            {props.title ? <Text style={styles.headText}>{props.title}</Text> : undefined}
+            {props.icon ? <Image source={icon} style={{ width: cx(60), aspectRatio: 2.14, marginRight: cx(10) }} /> : undefined}
           </View>
           <SwitchButton
             thumbStyle={{ elevation: 0 }}

package/src/modules/mood/StaticMoodEditorPage.tsx

@@ -63,9 +63,12 @@ const StaticMoodEditorPage = () => {
     if (state.currentNode.isColorNode) {
       return hsv2Hex(state.currentNode.h, s, 100)
     }
-    if (moduleParams.isSupportTemperature) {
-      return cctToColor(state.currentNode.colorTemp.toFixed())
+    if (moduleParams.isSupportColor) {
+      return hsv2Hex(state.currentNode.h, s, 100)
+    } else if (moduleParams.isSupportTemperature) {
+      return cctToColor(state.currentNode.colorTemp.toFixed());
     }
+    return '#fff'
   }, [state.currentNode.colorTemp])
 
   const getButtonStatus = () => {

package/src/modules/time_schedule/ScheduleCard.tsx

@@ -2,9 +2,10 @@ import React from "react";
 import { ViewStyle, View, Text, StyleSheet } from "react-native";
 import Card from "@ledvance/base/src/components/Card";
 import { SwitchButton, Utils } from 'tuya-panel-kit';
-import { convertTo12HourFormat, loopText } from '@ledvance/base/src/utils/common';
+import { convertTo12HourFormat, loopText, showDialog } from '@ledvance/base/src/utils/common';
 import { Timer } from "./Interface";
 import { useSystemTimeFormate } from "@ledvance/base/src/models/modules/NativePropsSlice";
+import I18n from "@ledvance/base/src/i18n";
 const { convertX: cx } = Utils.RatioUtils;
 
 interface ScheduleCardProps {
@@ -44,7 +45,21 @@ const ScheduleCard = (props: ScheduleCardProps) => {
           value={!!item.status}
           thumbStyle={{ elevation: 0 }}
           onValueChange={() => {
-            onEnableChange(!item.status);
+            if (!item.status) {
+              showDialog({
+                method: 'confirm',
+                title: I18n.getLang('conflict_dialog_active_item_timeschedule_titel'),
+                subTitle: I18n.getLang('group_conflict_feature'),
+                confirmText: I18n.getLang('registration_dialog_button_yes'),
+                cancelText: I18n.getLang('registration_dialog_button_no'),
+                onConfirm: (_, {close}) => {
+                  onEnableChange(!item.status);
+                  close()
+                }
+              });
+            } else {
+              onEnableChange(!item.status);
+            }
           }}
         />
       </View>
@@ -110,4 +125,4 @@ const styles = StyleSheet.create({
   }
 });
 
-export default ScheduleCard
+export default ScheduleCard

package/src/modules/time_schedule/TimeScheduleDetailPage.tsx

@@ -420,18 +420,28 @@ const TimeScheduleDetailPage = () => {
       rightButtonIcon={allowSubmit ? res.ic_check : res.ic_uncheck}
       rightButtonIconClick={async () => {
         if (!allowSubmit || state.loading) return
-        state.loading = true
-        const res = await props.modDeleteTimeSchedule(props.mode, {
-          ...state.timeSchedule,
-          status: 1,
-          dps: getActions()
-        }, '')
-        console.log(res, '< ---- resss')
-        state.loading = false
-        if (res.success) {
-          props.refreshFn()
-          navigation.goBack()
-        }
+        showDialog({
+          method: 'confirm',
+          title: I18n.getLang('conflict_dialog_active_item_timeschedule_titel'),
+          subTitle: I18n.getLang('group_conflict_feature'),
+          confirmText: I18n.getLang('registration_dialog_button_yes'),
+          cancelText: I18n.getLang('registration_dialog_button_no'),
+          onConfirm: async (_, { close }) => {
+            state.loading = true
+            const res = await props.modDeleteTimeSchedule(props.mode, {
+              ...state.timeSchedule,
+              status: 1,
+              dps: getActions()
+            }, '')
+            console.log(res, '< ---- resss')
+            state.loading = false
+            if (res.success) {
+              close()
+              props.refreshFn()
+              navigation.goBack()
+            }
+          }
+        })
       }}
       backDialogTitle={I18n.getLang('cancel_dialog_leave_unsaved_titel')}
       backDialogContent={I18n.getLang('cancel_dialog_leave_unsaved_timeschedule_note')}