chore: rebase main
This commit is contained in:
@@ -2,7 +2,7 @@ import { createFromIconfontCN } from '@ant-design/icons';
|
|||||||
// import './iconfont/iconfont.js';
|
// import './iconfont/iconfont.js';
|
||||||
|
|
||||||
const IconFont = createFromIconfontCN({
|
const IconFont = createFromIconfontCN({
|
||||||
scriptUrl: '//at.alicdn.com/t/c/font_4613488_ifwyia863k.js'
|
scriptUrl: '//at.alicdn.com/t/c/font_4613488_lqs6kytf9t8.js'
|
||||||
});
|
});
|
||||||
|
|
||||||
export default IconFont;
|
export default IconFont;
|
||||||
|
|||||||
@@ -43,9 +43,6 @@ export default {
|
|||||||
'noresult.benchmark.title': 'No Benchmarks',
|
'noresult.benchmark.title': 'No Benchmarks',
|
||||||
'noresult.benchmark.subTitle': 'No benchmarks have been added yet.',
|
'noresult.benchmark.subTitle': 'No benchmarks have been added yet.',
|
||||||
'noresult.benchmark.nofound': 'No matching benchmarks found.',
|
'noresult.benchmark.nofound': 'No matching benchmarks found.',
|
||||||
'noresult.provider.title': 'No Providers',
|
|
||||||
'noresult.provider.subTitle': 'No providers have been added yet.',
|
|
||||||
'noresult.provider.nofound': 'No matching providers found.',
|
|
||||||
'noresult.providers.title': 'No Providers',
|
'noresult.providers.title': 'No Providers',
|
||||||
'noresult.providers.subTitle': 'No providers have been added yet.',
|
'noresult.providers.subTitle': 'No providers have been added yet.',
|
||||||
'noresult.providers.nofound': 'No matching providers found.',
|
'noresult.providers.nofound': 'No matching providers found.',
|
||||||
|
|||||||
@@ -43,9 +43,6 @@ export default {
|
|||||||
'noresult.benchmark.title': 'No Benchmarks',
|
'noresult.benchmark.title': 'No Benchmarks',
|
||||||
'noresult.benchmark.subTitle': 'No benchmarks have been added yet.',
|
'noresult.benchmark.subTitle': 'No benchmarks have been added yet.',
|
||||||
'noresult.benchmark.nofound': 'No matching benchmarks found.',
|
'noresult.benchmark.nofound': 'No matching benchmarks found.',
|
||||||
'noresult.provider.title': 'No Providers',
|
|
||||||
'noresult.provider.subTitle': 'No providers have been added yet.',
|
|
||||||
'noresult.provider.nofound': 'No matching providers found.',
|
|
||||||
'noresult.providers.title': 'No Providers',
|
'noresult.providers.title': 'No Providers',
|
||||||
'noresult.providers.subTitle': 'No providers have been added yet.',
|
'noresult.providers.subTitle': 'No providers have been added yet.',
|
||||||
'noresult.providers.nofound': 'No matching providers found.',
|
'noresult.providers.nofound': 'No matching providers found.',
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ export default {
|
|||||||
'menu.models.deployment': 'Запуск',
|
'menu.models.deployment': 'Запуск',
|
||||||
'menu.models.benchmark': 'Benchmarks',
|
'menu.models.benchmark': 'Benchmarks',
|
||||||
'menu.models.benchmarkDetail': 'Benchmark Details',
|
'menu.models.benchmarkDetail': 'Benchmark Details',
|
||||||
'menu.models.provider': 'Provider',
|
|
||||||
'menu.models.providers': 'Providers',
|
'menu.models.providers': 'Providers',
|
||||||
'menu.models.routes': 'Routes',
|
'menu.models.routes': 'Routes',
|
||||||
'menu.modelCatalog': 'Каталог',
|
'menu.modelCatalog': 'Каталог',
|
||||||
|
|||||||
@@ -44,9 +44,6 @@ export default {
|
|||||||
'noresult.benchmark.title': 'No Benchmarks',
|
'noresult.benchmark.title': 'No Benchmarks',
|
||||||
'noresult.benchmark.subTitle': 'No benchmarks have been added yet.',
|
'noresult.benchmark.subTitle': 'No benchmarks have been added yet.',
|
||||||
'noresult.benchmark.nofound': 'No matching benchmarks found.',
|
'noresult.benchmark.nofound': 'No matching benchmarks found.',
|
||||||
'noresult.provider.title': 'No Providers',
|
|
||||||
'noresult.provider.subTitle': 'No providers have been added yet.',
|
|
||||||
'noresult.provider.nofound': 'No matching providers found.',
|
|
||||||
'noresult.providers.title': 'No Providers',
|
'noresult.providers.title': 'No Providers',
|
||||||
'noresult.providers.subTitle': 'No providers have been added yet.',
|
'noresult.providers.subTitle': 'No providers have been added yet.',
|
||||||
'noresult.providers.nofound': 'No matching providers found.',
|
'noresult.providers.nofound': 'No matching providers found.',
|
||||||
@@ -63,9 +60,6 @@ export default {
|
|||||||
// 5. 'noresult.benchmark.title': 'No Benchmarks',
|
// 5. 'noresult.benchmark.title': 'No Benchmarks',
|
||||||
// 6. 'noresult.benchmark.subTitle': 'No benchmarks have been added yet.',
|
// 6. 'noresult.benchmark.subTitle': 'No benchmarks have been added yet.',
|
||||||
// 7. 'noresult.benchmark.nofound': 'No matching benchmarks found.'
|
// 7. 'noresult.benchmark.nofound': 'No matching benchmarks found.'
|
||||||
// 5. 'noresult.provider.title': 'No Providers',
|
|
||||||
// 6. 'noresult.provider.subTitle': 'No providers have been added yet.',
|
|
||||||
// 7. 'noresult.provider.nofound': 'No matching providers found.',
|
|
||||||
// 5. 'noresult.providers.title': 'No Providers',
|
// 5. 'noresult.providers.title': 'No Providers',
|
||||||
// 6. 'noresult.providers.subTitle': 'No providers have been added yet.',
|
// 6. 'noresult.providers.subTitle': 'No providers have been added yet.',
|
||||||
// 7. 'noresult.providers.nofound': 'No matching providers found.',
|
// 7. 'noresult.providers.nofound': 'No matching providers found.',
|
||||||
|
|||||||
@@ -205,22 +205,13 @@ const MaasProvider: React.FC = () => {
|
|||||||
<Table
|
<Table
|
||||||
rowKey="id"
|
rowKey="id"
|
||||||
tableLayout="auto"
|
tableLayout="auto"
|
||||||
loadChildren={loadChildrenData}
|
|
||||||
sortDirections={TABLE_SORT_DIRECTIONS}
|
sortDirections={TABLE_SORT_DIRECTIONS}
|
||||||
expandedRowKeys={expandedRowKeys}
|
|
||||||
onExpand={handleExpandChange}
|
|
||||||
onExpandAll={handleToggleExpandAll}
|
|
||||||
renderChildren={renderChildren}
|
|
||||||
onTableSort={handleOnSortChange}
|
|
||||||
showSorterTooltip={false}
|
showSorterTooltip={false}
|
||||||
dataSource={dataSource.dataList}
|
dataSource={dataSource.dataList}
|
||||||
loading={dataSource.loading}
|
loading={dataSource.loading}
|
||||||
loadend={dataSource.loadend}
|
|
||||||
rowSelection={rowSelection}
|
rowSelection={rowSelection}
|
||||||
columns={columns}
|
columns={columns}
|
||||||
childParentKey="provider_id"
|
|
||||||
scroll={{ x: true }}
|
scroll={{ x: true }}
|
||||||
expandable={true}
|
|
||||||
pagination={{
|
pagination={{
|
||||||
showSizeChanger: true,
|
showSizeChanger: true,
|
||||||
pageSize: queryParams.perPage,
|
pageSize: queryParams.perPage,
|
||||||
|
|||||||
Reference in New Issue
Block a user