@ledvance/ui-biz-bundle 1.0.66 → 1.0.68

package/package.json

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

package/src/modules/biorhythm/BiorhythmEditPage.tsx

@@ -16,6 +16,7 @@ import ColorTempAdjustView from '@ledvance/base/src/components/ColorTempAdjustVi
 import DeleteButton from '@ledvance/base/src/components/DeleteButton'
 import res from '@ledvance/base/src/res'
 import { ui_biz_routerKey } from '../../navigation/Routers'
+import { delay } from 'lodash'
 
 const cx = Utils.RatioUtils.convertX
 
@@ -133,7 +134,7 @@ const BiorhythmEditPage = () => {
       confirmText: I18n.getLang('cancel_dialog_delete_item_wakeupschedule_answer_yes_text'),
       onConfirm: async (_, { close }) => {
         close()
-        onDeleteBtnClick()
+        delay(onDeleteBtnClick, 200)
       },
       motionConfig:{
         hideDuration: 0,

package/src/modules/mood/DynamicMoodEditorPage.tsx

@@ -18,7 +18,7 @@ import LampAdjustView from '@ledvance/base/src/components/LampAdjustView'
 import {Utils} from 'tuya-panel-kit'
 import LdvSlider from '@ledvance/base/src/components/ldvSlider'
 import {saveScene, useScene} from '../scene/SceneAction'
-import {isUVCFanDevice, useDeviceId, useFanMaxSpeed} from '@ledvance/base/src/models/modules/NativePropsSlice'
+import {isUVCFanDevice, useDeviceId, useFanMaxSpeed, useRole} from '@ledvance/base/src/models/modules/NativePropsSlice'
 import TextButton from '@ledvance/base/src/components/TextButton'
 import {SceneNodeInfo, SceneNodeTransitionMode} from '../scene/SceneInfo'
 import TextFieldStyleButton from '@ledvance/base/src/components/TextFieldStyleButton'
@@ -40,12 +40,14 @@ const DynamicMoodEditorPage = () => {
   const [moodId, setScene] = useScene(moduleParams.sceneDpCode)
   const [, setWorkMode] = useWorkMode(moduleParams.workModeDpCode)
   const isUVCFan = isUVCFanDevice()
+  const role = useRole()
   const state = useReactive<DynamicMoodEditorPageState>({
     headline: '',
     mood: params.currentMood,
     currentNode: params.currentMood.nodes[params.currentMood.nodes.length - 1],
     paintBucketSelected: false,
   })
+  const canDelete = useMemo(() => (role === 0 || role === 2), [role])
   useEffect(() => {
     state.headline = Strings.getLang(params.mode ? 'add_new_dynamic_mood_headline_text' : 'edit_static_mood_headline_text')
   }, [params.mode])
@@ -416,7 +418,7 @@ const DynamicMoodEditorPage = () => {
                     state.mood.fanSpeed = fanSpeed
                   }}
                   style={styles.fanAdjustCard}/>}
-          {params.mode === 'edit' &&
+          {params.mode === 'edit' && canDelete &&
               <View style={{marginTop: cx(20), marginHorizontal: cx(24)}}>
                   <TextButton
                       style={styles.deleteBtn}

package/src/modules/mood/StaticMoodEditorPage.tsx

@@ -15,7 +15,7 @@ import res from '@ledvance/base/src/res'
 import {cloneDeep, find, isEqual} from 'lodash'
 import TextButton from '@ledvance/base/src/components/TextButton'
 import {saveScene, useScene} from '../scene/SceneAction'
-import {useDeviceId, useFanMaxSpeed} from '@ledvance/base/src/models/modules/NativePropsSlice'
+import {useDeviceId, useFanMaxSpeed, useRole} from '@ledvance/base/src/models/modules/NativePropsSlice'
 import {SceneNodeInfo, SceneUIState} from '../scene/SceneInfo'
 import LampAdjustView from '@ledvance/base/src/components/LampAdjustView'
 import FanAdjustView from '@ledvance/base/src/components/FanAdjustView'
@@ -45,6 +45,7 @@ const StaticMoodEditorPage = () => {
   const params = cloneDeep(routeParams)
   const moduleParams = params.moduleParams
   const deviceId = useDeviceId()
+  const role = useRole()
   const [moodId, setScene] = useScene(moduleParams.sceneDpCode)
   const [, setWorkMode] = useWorkMode(moduleParams.workModeDpCode)
 
@@ -53,7 +54,7 @@ const StaticMoodEditorPage = () => {
     mood: params.currentMood,
     currentNode: params.currentMood.nodes[0],
   })
-
+  const canDelete = useMemo(() => (role === 0 || role === 2), [role])
   useEffect(() => {
     state.headline = Strings.getLang(params.mode === 'add' ? 'add_new_static_mood_headline_text' : 'edit_static_mood_headline_text')
   }, [params.mode])
@@ -240,7 +241,7 @@ const StaticMoodEditorPage = () => {
                     state.mood.fanSpeed = fanSpeed
                   }}
                   style={styles.fanAdjustCard}/>}
-          {params.mode === 'edit' &&
+          {params.mode === 'edit' && canDelete &&
               <View style={{marginTop: cx(20), marginHorizontal: cx(24)}}>
                   <TextButton
                       style={styles.deleteBtn}