From f0390682ce5c2f061deecc17aa629c143cccb421 Mon Sep 17 00:00:00 2001
From: jialin <jialinkuang@126.com>
Date: Tue, 3 Feb 2026 11:29:27 +0800
Subject: [PATCH] chore: rebase main

---
 src/components/icon-font/index.tsx | 2 +-
 src/locales/en-US/no-result.ts     | 3 ---
 src/locales/ja-JP/no-result.ts     | 3 ---
 src/locales/ru-RU/menu.ts          | 1 -
 src/locales/ru-RU/no-result.ts     | 6 ------
 src/pages/maas-provider/index.tsx  | 9 ---------
 6 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/src/components/icon-font/index.tsx b/src/components/icon-font/index.tsx
index 707caef1..fb4f8e9e 100644
--- a/src/components/icon-font/index.tsx
+++ b/src/components/icon-font/index.tsx
@@ -2,7 +2,7 @@ import { createFromIconfontCN } from '@ant-design/icons';
 // import './iconfont/iconfont.js';
 
 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;
diff --git a/src/locales/en-US/no-result.ts b/src/locales/en-US/no-result.ts
index 1278b933..a9b6db85 100644
--- a/src/locales/en-US/no-result.ts
+++ b/src/locales/en-US/no-result.ts
@@ -43,9 +43,6 @@ export default {
   'noresult.benchmark.title': 'No Benchmarks',
   'noresult.benchmark.subTitle': 'No benchmarks have been added yet.',
   '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.subTitle': 'No providers have been added yet.',
   'noresult.providers.nofound': 'No matching providers found.',
diff --git a/src/locales/ja-JP/no-result.ts b/src/locales/ja-JP/no-result.ts
index 1278b933..a9b6db85 100644
--- a/src/locales/ja-JP/no-result.ts
+++ b/src/locales/ja-JP/no-result.ts
@@ -43,9 +43,6 @@ export default {
   'noresult.benchmark.title': 'No Benchmarks',
   'noresult.benchmark.subTitle': 'No benchmarks have been added yet.',
   '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.subTitle': 'No providers have been added yet.',
   'noresult.providers.nofound': 'No matching providers found.',
diff --git a/src/locales/ru-RU/menu.ts b/src/locales/ru-RU/menu.ts
index 81daae33..ea624995 100644
--- a/src/locales/ru-RU/menu.ts
+++ b/src/locales/ru-RU/menu.ts
@@ -15,7 +15,6 @@ export default {
   'menu.models.deployment': 'Запуск',
   'menu.models.benchmark': 'Benchmarks',
   'menu.models.benchmarkDetail': 'Benchmark Details',
-  'menu.models.provider': 'Provider',
   'menu.models.providers': 'Providers',
   'menu.models.routes': 'Routes',
   'menu.modelCatalog': 'Каталог',
diff --git a/src/locales/ru-RU/no-result.ts b/src/locales/ru-RU/no-result.ts
index 2811d2be..b801f553 100644
--- a/src/locales/ru-RU/no-result.ts
+++ b/src/locales/ru-RU/no-result.ts
@@ -44,9 +44,6 @@ export default {
   'noresult.benchmark.title': 'No Benchmarks',
   'noresult.benchmark.subTitle': 'No benchmarks have been added yet.',
   '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.subTitle': 'No providers have been added yet.',
   'noresult.providers.nofound': 'No matching providers found.',
@@ -63,9 +60,6 @@ export default {
 // 5. 'noresult.benchmark.title': 'No Benchmarks',
 // 6. 'noresult.benchmark.subTitle': 'No benchmarks have been added yet.',
 // 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',
 // 6. 'noresult.providers.subTitle': 'No providers have been added yet.',
 // 7. 'noresult.providers.nofound': 'No matching providers found.',
diff --git a/src/pages/maas-provider/index.tsx b/src/pages/maas-provider/index.tsx
index 73916d5c..d786653a 100644
--- a/src/pages/maas-provider/index.tsx
+++ b/src/pages/maas-provider/index.tsx
@@ -205,22 +205,13 @@ const MaasProvider: React.FC = () => {
           <Table
             rowKey="id"
             tableLayout="auto"
-            loadChildren={loadChildrenData}
             sortDirections={TABLE_SORT_DIRECTIONS}
-            expandedRowKeys={expandedRowKeys}
-            onExpand={handleExpandChange}
-            onExpandAll={handleToggleExpandAll}
-            renderChildren={renderChildren}
-            onTableSort={handleOnSortChange}
             showSorterTooltip={false}
             dataSource={dataSource.dataList}
             loading={dataSource.loading}
-            loadend={dataSource.loadend}
             rowSelection={rowSelection}
             columns={columns}
-            childParentKey="provider_id"
             scroll={{ x: true }}
-            expandable={true}
             pagination={{
               showSizeChanger: true,
               pageSize: queryParams.perPage,