Merge branch 'main_dev' of http://git.yunteng.com/yunteng/thingskit-front into f…

…eat/device-new-protocol

@@ -183,7 +183,6 @@
       padding: 10px 4px 10px 10px;
 
       img {
-        width: @logo-width;
         height: @logo-width;
       }
     }

@@ -16,8 +16,8 @@
         <div class="hidden min-h-full pl-4 mr-4 xl:flex xl:flex-col xl:w-6/12">
           <!-- <AppLogo class="-enter-x" /> -->
           <div style="display: flex; margin-top: 10px">
-            <img v-if="defaultLogo" :src="defaultLogo" style="width: 48px; height: 48px" />
-            <img style="width: 48px; height: 48px" v-else src="/src/assets/images/logo.png" />
+            <img v-if="defaultLogo" :src="defaultLogo" class="h-12" />
+            <img class="h-12" v-else src="/src/assets/images/logo.png" />
             <div
               class="ml-2 truncate md:opacity-100"
               style="

@@ -34,6 +34,12 @@
         },
       },
       {
+        field: ComponentConfigFieldEnum.SHOW_DEVICE_NAME,
+        label: '显示设备名称',
+        component: 'Checkbox',
+        defaultValue: option.showDeviceName,
+      },
+      {
         field: ComponentConfigFieldEnum.SHOW_TIME,
         label: '显示时间',
         component: 'Checkbox',