Commit abd9609044390f5fd26210e2e3e162dc49da36d3
Merge branch 'local_dev_ft' into 'main'
pref:优化设备列表 事件管理筛选查询换行 See merge request yunteng/thingskit-front!496
Showing
2 changed files
with
4 additions
and
4 deletions
| @@ -68,6 +68,7 @@ export const formSchemas: FormSchema[] = [ | @@ -68,6 +68,7 @@ export const formSchemas: FormSchema[] = [ | ||
| 68 | componentProps: { | 68 | componentProps: { |
| 69 | placeholder: '请输入标识符', | 69 | placeholder: '请输入标识符', |
| 70 | }, | 70 | }, |
| 71 | + colProps: { span: 6 }, | ||
| 71 | }, | 72 | }, |
| 72 | { | 73 | { |
| 73 | field: 'eventType', | 74 | field: 'eventType', |
| @@ -82,16 +83,17 @@ export const formSchemas: FormSchema[] = [ | @@ -82,16 +83,17 @@ export const formSchemas: FormSchema[] = [ | ||
| 82 | labelField: 'itemText', | 83 | labelField: 'itemText', |
| 83 | valueField: 'itemValue', | 84 | valueField: 'itemValue', |
| 84 | }, | 85 | }, |
| 86 | + colProps: { span: 6 }, | ||
| 85 | }, | 87 | }, |
| 86 | { | 88 | { |
| 87 | field: 'dateRange', | 89 | field: 'dateRange', |
| 88 | label: '时间范围', | 90 | label: '时间范围', |
| 89 | component: 'RangePicker', | 91 | component: 'RangePicker', |
| 90 | - colProps: { span: 10 }, | ||
| 91 | componentProps: { | 92 | componentProps: { |
| 92 | showTime: { | 93 | showTime: { |
| 93 | defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')], | 94 | defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')], |
| 94 | }, | 95 | }, |
| 95 | }, | 96 | }, |
| 97 | + colProps: { span: 6 }, | ||
| 96 | }, | 98 | }, |
| 97 | ]; | 99 | ]; |
| @@ -25,9 +25,7 @@ | @@ -25,9 +25,7 @@ | ||
| 25 | listField: 'data', | 25 | listField: 'data', |
| 26 | }, | 26 | }, |
| 27 | formConfig: { | 27 | formConfig: { |
| 28 | - layout: 'inline', | ||
| 29 | - baseColProps: { span: 6 }, | ||
| 30 | - labelWidth: 80, | 28 | + labelWidth: 120, |
| 31 | schemas: formSchemas, | 29 | schemas: formSchemas, |
| 32 | fieldMapToTime: [['dateRange', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']], | 30 | fieldMapToTime: [['dateRange', ['startTime', 'endTime'], 'YYYY-MM-DD HH:mm:ss']], |
| 33 | }, | 31 | }, |