Merge branch 'fix/DEFECT-1349' into 'main_dev'

fix: DEFECT-1349修复切换组件后未将设备属性置空

See merge request yunteng/thingskit-front!646

@@ -28,6 +28,7 @@
   import { useGetComponentConfig } from '../packages/hook/useGetComponetConfig';
   import { useGetComponentConfig } from '../packages/hook/useGetComponetConfig';
   import { MessageAlert } from './components/MessageAlert';
   import { MessageAlert } from './components/MessageAlert';
   import { createSelectWidgetKeysContext, createSelectWidgetModeContext } from './useContext';
   import { createSelectWidgetKeysContext, createSelectWidgetModeContext } from './useContext';
+  import { useGetCategoryByComponentKey } from '../packages/hook/useGetCategoryByComponentKey';
 
 
   const props = defineProps<{
   const props = defineProps<{
     layout: Layout[];
     layout: Layout[];
@@ -119,10 +120,16 @@
    */
    */
   watch(
   watch(
     () => selectWidgetKeys.value.componentKey,
     () => selectWidgetKeys.value.componentKey,
-    (value) => {
+    (value, oldValue) => {
       if (value) {
       if (value) {
+        const oldCategory = useGetCategoryByComponentKey(oldValue);
+        const category = useGetCategoryByComponentKey(value);
+        const needReset =
+          [oldCategory, category].some((item) => item === PackagesCategoryEnum.CONTROL) &&
+          oldCategory !== category;
         dataSource.value = unref(dataSource).map((item) => ({
         dataSource.value = unref(dataSource).map((item) => ({
           ...item,
           ...item,
+          ...(needReset ? { attribute: null } : {}),
           componentInfo: { ...unref(getComponentConfig).persetOption, ...item.componentInfo },
           componentInfo: { ...unref(getComponentConfig).persetOption, ...item.componentInfo },
         }));
         }));
         if ((window as any).requestIdleCallback as unknown as boolean) {
         if ((window as any).requestIdleCallback as unknown as boolean) {

@@ -48,13 +48,9 @@
   });
   });
 
 
   const getOptions = computed<VideoJsPlayerOptions>(() => {
   const getOptions = computed<VideoJsPlayerOptions>(() => {
-    const { option } = props.config;
-    const { itemHeightRatio, itemWidthRatio, widthPx, heightPx } = option;
-    const currentW = widthPx * (itemWidthRatio / 100);
-    const currentH = heightPx * (itemHeightRatio / 100);
     return {
     return {
-      width: currentW - 8,
-      height: currentH - 8,
+      width: '100%' as unknown as number,
+      height: '100%' as unknown as number,
       sources: unref(getVideoPlaySources).src
       sources: unref(getVideoPlaySources).src
         ? ([unref(getVideoPlaySources)] as VideoJsPlayerOptions['sources'])
         ? ([unref(getVideoPlaySources)] as VideoJsPlayerOptions['sources'])
         : [],
         : [],

+import { PackagesCategoryEnum } from '../index.type';
+import { packageList } from '../package';
+
+export const useGetCategoryByComponentKey = (componentKey: string) => {
+  for (const key of Object.keys(packageList) as PackagesCategoryEnum[]) {
+    for (const item of packageList[key]) {
+      if (item.key === componentKey) {
+        return key;
+      }
+    }
+  }
+};