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

fix: DEFECT-1304 修复流量计组件可显示设备名称

See merge request yunteng/thingskit-front!628

@@ -13,6 +13,7 @@ export const option: PublicPresetOptions = {
   [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
   [ComponentConfigFieldEnum.UNIT]: 'm',
   [ComponentConfigFieldEnum.FONT_COLOR]: '#fff',
+  [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
   [ComponentConfigFieldEnum.FLOWMETER_CONFIG]: {
     [ComponentConfigFieldEnum.BACKGROUND_COLOR]: '#8badcb',
     [ComponentConfigFieldEnum.WAVE_FIRST]: '#4579e2',

@@ -49,6 +49,12 @@
         component: 'Input',
         defaultValue: option.unit,
       },
+      {
+        field: ComponentConfigFieldEnum.SHOW_DEVICE_NAME,
+        label: '显示设备名称',
+        component: 'Checkbox',
+        defaultValue: option.showDeviceName,
+      },
     ],
     showActionButtonGroup: false,
     labelWidth: 120,

@@ -5,6 +5,7 @@
   import { computed } from 'vue';
   import { ref } from 'vue';
   import { unref } from 'vue';
+  import { DeviceName } from '/@/views/visual/commonComponents/DeviceName';
 
   const props = defineProps<{
     config: ComponentPropsConfigType<typeof option>;
@@ -70,6 +71,7 @@
 
 <template>
   <main class="w-full h-full flex flex-col justify-center items-center relative">
+    <DeviceName :config="config" />
     <svg
       class="waves-rect"
       viewBox="0 0 100 100"

@@ -49,6 +49,12 @@
         component: 'Input',
         defaultValue: option.unit,
       },
+      {
+        field: ComponentConfigFieldEnum.SHOW_DEVICE_NAME,
+        label: '显示设备名称',
+        component: 'Checkbox',
+        defaultValue: option.showDeviceName,
+      },
     ],
     showActionButtonGroup: false,
     labelWidth: 120,

@@ -5,6 +5,7 @@
   import { computed } from 'vue';
   import { ref } from 'vue';
   import { unref } from 'vue';
+  import { DeviceName } from '/@/views/visual/commonComponents/DeviceName';
 
   const props = defineProps<{
     config: ComponentPropsConfigType<typeof option>;
@@ -60,6 +61,7 @@
 
 <template>
   <main class="w-full h-full flex flex-col justify-center items-center relative">
+    <DeviceName :config="config" />
     <svg
       class="waves-rect"
       viewBox="0 0 100 100"

@@ -5,6 +5,7 @@
   import { ref } from 'vue';
   import { computed } from 'vue';
   import { unref } from 'vue';
+  import { DeviceName } from '/@/views/visual/commonComponents/DeviceName';
 
   const props = defineProps<{
     config: ComponentPropsConfigType<typeof option>;
@@ -53,6 +54,7 @@
 
 <template>
   <main class="w-full h-full flex flex-col justify-center items-center relative">
+    <DeviceName :config="config" />
     <svg class="flowmeter-thermometer" viewBox="0 0 200 250" xmlns="http://www.w3.org/2000/svg">
       <defs>
         <radialGradient id="thermometerdiv_meter_2" cx="50%" cy="50%" r="50%" fx="50%" fy="50%">