Commit cdc92069d37cad895c0466d7f734ea8b0ad7c213
1 parent
b945b93b
fix: system menu default folding && device list column setting device name is null
Showing
2 changed files
with
3 additions
and
2 deletions
| @@ -19,6 +19,7 @@ export const columns: BasicColumn[] = [ | @@ -19,6 +19,7 @@ export const columns: BasicColumn[] = [ | ||
| 19 | }, | 19 | }, |
| 20 | { | 20 | { |
| 21 | dataIndex: 'name', | 21 | dataIndex: 'name', |
| 22 | + title: '设备名称/设备SN', | ||
| 22 | width: 200, | 23 | width: 200, |
| 23 | align: 'left', | 24 | align: 'left', |
| 24 | slots: { customRender: 'name', title: 'deviceTitle' }, | 25 | slots: { customRender: 'name', title: 'deviceTitle' }, |
| @@ -71,7 +71,7 @@ | @@ -71,7 +71,7 @@ | ||
| 71 | delMenu, | 71 | delMenu, |
| 72 | handleSuccess | 72 | handleSuccess |
| 73 | ); | 73 | ); |
| 74 | - const [registerTable, { reload, expandAll }] = useTable({ | 74 | + const [registerTable, { reload, collapseAll }] = useTable({ |
| 75 | title: t('routes.common.system.pageSystemTitleMenuList'), //'菜单列表' | 75 | title: t('routes.common.system.pageSystemTitleMenuList'), //'菜单列表' |
| 76 | api: getMenuList, //加载数据 | 76 | api: getMenuList, //加载数据 |
| 77 | columns, //加载列 | 77 | columns, //加载列 |
| @@ -148,7 +148,7 @@ | @@ -148,7 +148,7 @@ | ||
| 148 | 148 | ||
| 149 | function onFetchSuccess() { | 149 | function onFetchSuccess() { |
| 150 | // 演示默认展开所有表项 | 150 | // 演示默认展开所有表项 |
| 151 | - nextTick(expandAll); | 151 | + nextTick(collapseAll); |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | return { | 154 | return { |