Merge branch 'local_dev_ft' into 'main'

pref:优化设备列表 事件管理筛选查询换行

See merge request yunteng/thingskit-front!496

@@ -68,6 +68,7 @@ export const formSchemas: FormSchema[] = [
     componentProps: {
       placeholder: '请输入标识符',
     },
+    colProps: { span: 6 },
   },
   {
     field: 'eventType',
@@ -82,16 +83,17 @@ export const formSchemas: FormSchema[] = [
       labelField: 'itemText',
       valueField: 'itemValue',
     },
+    colProps: { span: 6 },
   },
   {
     field: 'dateRange',
     label: '时间范围',
     component: 'RangePicker',
-    colProps: { span: 10 },
     componentProps: {
       showTime: {
         defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
       },
     },
+    colProps: { span: 6 },
   },
 ];

@@ -25,9 +25,7 @@
       listField: 'data',
     },
     formConfig: {
-      layout: 'inline',
-      baseColProps: { span: 6 },
-      labelWidth: 80,
+      labelWidth: 120,
       schemas: formSchemas,
       fieldMapToTime: [['dateRange', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']],
     },