Merge branch 'main_dev' of http://git.yunteng.com/yunteng/thingskit-front into fix/DEFECT-1362

@@ -3,18 +3,20 @@
   import IconData from '/@/components/Icon/data/iconfont.data';
   import { SvgIcon } from '/@/components/Icon';
   import { computed } from '@vue/reactivity';
-  import { onMounted, unref } from 'vue';
+  import { onMounted } from 'vue';
 
-  const props = defineProps<{
-    value?: string;
-    color?: string;
-  }>();
+  const props = withDefaults(
+    defineProps<{
+      value?: string;
+      color?: string;
+    }>(),
+    {
+      value: 'shuiwen',
+    }
+  );
   const emit = defineEmits(['update:value']);
   const iconList = IconData.icons;
   const [register, { openDrawer, closeDrawer }] = useDrawer();
-  const getIcon = computed(() => {
-    return props.value || 'shuiwen';
-  });
 
   const getColor = computed(() => {
     return props.color || '#377DFF';
@@ -30,14 +32,13 @@
   };
 
   onMounted(() => {
-    emit('update:value', unref(getIcon));
+    emit('update:value', props.value);
   });
 </script>
 
 <template>
   <SvgIcon
-    :name="getIcon"
-    :icon="getIcon"
+    :name="value"
     prefix="iconfont"
     class="cursor-pointer !w-6 !h-6"
     :style="{ color: getColor }"

@@ -21,7 +21,7 @@ export const getVideoTypeByUrl = (url: string) => {
     const type = VideoPlayerType[ext];
     return type ? type : VideoPlayerType.webm;
   } catch (error) {
-    console.error(error);
+    console.error(`url: '${url}' is invalid!`);
     return VideoPlayerType.webm;
   }
 };

@@ -68,16 +68,17 @@ export const usePlatform = async () => {
       .vben-login::before{
         background-image:url("${background || lightThemeBgImage}");
         position:absolute;
+        background-size: ${background ? '100%' : 'auto'} 100% !important;
         margin-left: ${background ? 0 : '-48%'} !important;
       }
       html[data-theme='dark'] .vben-login::before{
         background-image:url("${background || darkThemeBgImage}");
         position:absolute;
+        background-size: ${background ? '100%' : 'auto'} 100% !important;
         margin-left: ${background ? 0 : '-48%'} !important;
       }
     `;
 
-    console.log(styleEl);
     document.head.appendChild(styleEl);
   };
 

@@ -105,7 +105,8 @@
     if (activeKey === TabKeyEnum.VISUAL) {
       dataSource.value = (dataSourceFormEl.value?.getFormValues() as DataSourceType[]) || [];
     }
-    currentRecord.value = basicInfoFromEl.value?.getFormValues() || {};
+    const value = basicInfoFromEl.value?.getFormValues() || {};
+    currentRecord.value = { ...unref(currentRecord), ...value };
   };
 
   const handleNewRecord = () => {