@ledvance/ui-biz-bundle 1.1.12 → 1.1.13

package/package.json

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

package/src/modules/flags/FlagActions.ts

@@ -1,7 +1,7 @@
 import { useDps } from "@ledvance/base/src/models/modules/NativePropsSlice";
 import { FlagPageProps } from "./FlagPage";
 import { SceneNodeTransitionMode } from "@ledvance/ui-biz-bundle/src/modules/scene/SceneInfo";
-import { WORK_MODE, nToHS, parseJSON, toFixed } from "@tuya/tuya-panel-lamp-sdk/lib/utils";
+import { ColorUtils, WORK_MODE, nToHS, parseJSON, toFixed } from "@tuya/tuya-panel-lamp-sdk/lib/utils";
 import { cloneDeep } from "lodash";
 import { FlagItemInfo, FlagUiInfo, defFlagList } from "./FlagInfo";
 import { hex2Int } from "@ledvance/base/src/utils/common";
@@ -9,7 +9,6 @@ import { spliceByStep } from "@ledvance/base/src/utils/common";
 import { useMemo, useState } from "react";
 import { useUpdateEffect } from "ahooks";
 import { NativeApi } from "@ledvance/base/src/api/native";
-import { hsv2Hex } from "@ledvance/base/src/utils";
 import { stripDp2Obj } from "@ledvance/ui-biz-bundle/src/modules/scene/SceneAction";
 
 export interface ExtraParams extends FlagPageProps, FlagOption {
@@ -52,8 +51,8 @@ export const useFlag: UseFlagType = (flagCode, extra) => {
 
   const setFlagFn = (flagItem: FlagItemInfo) => {
     if (extra.drawToolLight) {
-      const hex = extra.drawToolLight.drawToolObj2dp(flagItem.colors.map(item => hsv2Hex(item.h, item.s, item.v)))
-      return setDps({ [flagCode]: hex })
+      const hex = extra.drawToolLight.drawToolObj2dp(flagItem.colors.map(item => ColorUtils.hsv2hex(item.h, item.s, item.v)))
+      return setDps({ [flagCode]: hex , [extra.switchLedCode]: true})
     } else {
       const hex = obj2Dp(flagItem, extra)
       return setDps({ [flagCode]: hex, [extra.workModeCode]: WORK_MODE.SCENE, [extra.switchLedCode]: true })

package/src/modules/flags/FlagPage.tsx

@@ -17,7 +17,7 @@ import { hsv2Hex } from "@ledvance/base/src/utils";
 import { SceneNodeTransitionMode } from "@ledvance/ui-biz-bundle/src/modules/scene/SceneInfo";
 import { Result } from "@ledvance/base/src/models/modules/Result";
 import { useDps } from "@ledvance/base/src/models/modules/NativePropsSlice";
-import { WORK_MODE } from "@tuya/tuya-panel-lamp-sdk/lib/utils";
+import { ColorUtils, WORK_MODE } from "@tuya/tuya-panel-lamp-sdk/lib/utils";
 const cx = Utils.RatioUtils.convertX
 
 export interface FlagPageProps {
@@ -59,7 +59,7 @@ const FlagPage = () => {
   const flagId = useMemo(() =>{
     if(flagState.colors !== undefined){
       const flag = state.flags.find(item => {
-        const hexColors = item.colors.map(c => hsv2Hex(c.h, c.s, c.v).toLocaleUpperCase())
+        const hexColors = item.colors.map(c => ColorUtils.hsv2hex(c.h, c.s, c.v).toLocaleUpperCase())
         return isEqual(hexColors, flagState.colors)
       })
       return flag?.id
@@ -105,7 +105,7 @@ const FlagPage = () => {
         })
       }
       state.flags = cloneFlag
-      setFlags(cloneFlag)
+      setFlags(cloneDeep(cloneFlag))
     }
   }
 
@@ -185,7 +185,7 @@ const FlagPage = () => {
       <FlatList
         data={state.flags}
         renderItem={({ item }) => <FlagItem
-          enable={dps[params.workModeCode] === WORK_MODE.SCENE && flagId === item.id}
+          enable={dps[params.workModeCode] === (params.isStripLight ? WORK_MODE.Colour : WORK_MODE.Scene) && flagId === item.id}
           title={item.name}
           colors={item.colors.map(item => hsv2Hex(item.h, item.s, item.v))}
           onSwitch={async (enable) => {