From 0d80269e2dad1927c9c28c9ed40ae89af047e2ec Mon Sep 17 00:00:00 2001
From: jialin <jialinkuang@126.com>
Date: Thu, 27 Mar 2025 12:16:57 +0800
Subject: [PATCH] fix: windows path style

---
 src/components/page-tools/index.tsx           | 143 +++++++++++++++++-
 src/hooks/use-table-fetch.ts                  |   2 +-
 .../resources/components/model-files.tsx      | 118 ++++-----------
 3 files changed, 171 insertions(+), 92 deletions(-)

diff --git a/src/components/page-tools/index.tsx b/src/components/page-tools/index.tsx
index 553b9cba..77d059f1 100644
--- a/src/components/page-tools/index.tsx
+++ b/src/components/page-tools/index.tsx
@@ -1,4 +1,13 @@
-import { useMemo } from 'react';
+import DropDownActions from '@/components/drop-down-actions';
+import {
+  DeleteOutlined,
+  DownOutlined,
+  PlusOutlined,
+  SyncOutlined
+} from '@ant-design/icons';
+import { useIntl } from '@umijs/max';
+import { Button, Input, Select, Space } from 'antd';
+import React, { useMemo } from 'react';
 import './index.less';
 
 type PageToolsProps = {
@@ -36,4 +45,136 @@ const PageTools: React.FC<PageToolsProps> = (props) => {
   );
 };
 
+interface ActionItem {
+  label: string;
+  locale: boolean;
+  value: string;
+  key: string;
+  icon: React.ReactNode;
+}
+interface FilterBarProps {
+  handleInputChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+  handleSelectChange?: (value: any) => void;
+  handleSearch: () => void;
+  handleDeleteByBatch: () => void;
+  handleClickPrimary: (item: any) => void;
+  rowSelection: any;
+  actionItems: ActionItem[];
+  selectOptions?: Global.BaseListItem<string>[];
+  showSelect?: boolean;
+  buttonText: string;
+  buttonIcon?: React.ReactNode;
+  marginBottom?: number;
+  marginTop?: number;
+  inputHolder: string;
+  selectHolder: string;
+  actionType: 'dropdown' | 'button';
+  width?: {
+    input: number;
+    select: number;
+  };
+}
+
+export const FilterBar: React.FC<FilterBarProps> = (props) => {
+  const {
+    handleInputChange,
+    handleSelectChange,
+    handleSearch,
+    handleDeleteByBatch,
+    handleClickPrimary,
+    rowSelection,
+    actionItems,
+    selectOptions,
+    showSelect,
+    buttonText,
+    buttonIcon,
+    actionType,
+    marginBottom = 10,
+    marginTop = 10,
+    inputHolder,
+    selectHolder,
+    width
+  } = props;
+  const intl = useIntl();
+
+  return (
+    <PageTools
+      marginBottom={marginBottom}
+      marginTop={marginTop}
+      left={
+        <Space>
+          <Input
+            placeholder={intl.formatMessage({
+              id: inputHolder
+            })}
+            style={{ width: width?.input || 230 }}
+            allowClear
+            onChange={handleInputChange}
+          ></Input>
+          {showSelect && (
+            <Select
+              allowClear
+              showSearch={false}
+              placeholder={intl.formatMessage({
+                id: selectHolder
+              })}
+              style={{ width: width?.select || 230 }}
+              size="large"
+              onChange={handleSelectChange}
+              options={selectOptions}
+            ></Select>
+          )}
+          <Button
+            type="text"
+            style={{ color: 'var(--ant-color-text-tertiary)' }}
+            onClick={handleSearch}
+            icon={<SyncOutlined></SyncOutlined>}
+          ></Button>
+        </Space>
+      }
+      right={
+        <Space size={20}>
+          {actionType === 'dropdown' ? (
+            <DropDownActions
+              menu={{
+                items: actionItems,
+                onClick: handleClickPrimary
+              }}
+            >
+              <Button
+                icon={<DownOutlined></DownOutlined>}
+                type="primary"
+                iconPosition="end"
+              >
+                {buttonText}
+              </Button>
+            </DropDownActions>
+          ) : (
+            <Button
+              icon={buttonIcon ?? <PlusOutlined></PlusOutlined>}
+              type="primary"
+              onClick={handleClickPrimary}
+            >
+              {buttonText}
+            </Button>
+          )}
+          <Button
+            icon={<DeleteOutlined />}
+            danger
+            onClick={handleDeleteByBatch}
+            disabled={!rowSelection.selectedRowKeys.length}
+          >
+            <span>
+              {intl?.formatMessage?.({ id: 'common.button.delete' })}
+              {rowSelection.selectedRowKeys.length > 0 && (
+                <span>({rowSelection.selectedRowKeys?.length})</span>
+              )}
+            </span>
+          </Button>
+        </Space>
+      }
+    ></PageTools>
+  );
+};
+
 export default PageTools;
diff --git a/src/hooks/use-table-fetch.ts b/src/hooks/use-table-fetch.ts
index 40b2d155..f683fa0c 100644
--- a/src/hooks/use-table-fetch.ts
+++ b/src/hooks/use-table-fetch.ts
@@ -122,7 +122,7 @@ export default function useTableFetch<ListItem>(options: {
     setSortOrder(sorter.order);
   };
 
-  const handleSearch = (e: any) => {
+  const handleSearch = () => {
     fetchData();
   };
 
diff --git a/src/pages/resources/components/model-files.tsx b/src/pages/resources/components/model-files.tsx
index f316f208..f943eb56 100644
--- a/src/pages/resources/components/model-files.tsx
+++ b/src/pages/resources/components/model-files.tsx
@@ -2,9 +2,8 @@ import { modelsExpandKeysAtom } from '@/atoms/models';
 import AutoTooltip from '@/components/auto-tooltip';
 import CopyButton from '@/components/copy-button';
 import DeleteModal from '@/components/delete-modal';
-import DropDownActions from '@/components/drop-down-actions';
 import DropdownButtons from '@/components/drop-down-buttons';
-import PageTools from '@/components/page-tools';
+import { FilterBar } from '@/components/page-tools';
 import StatusTag from '@/components/status-tag';
 import { PageAction } from '@/config';
 import useAppUtils from '@/hooks/use-app-utils';
@@ -27,19 +26,8 @@ import {
 } from '@/pages/llmodels/config/button-actions';
 import DownloadModal from '@/pages/llmodels/download';
 import { convertFileSize } from '@/utils';
-import { DeleteOutlined, DownOutlined, SyncOutlined } from '@ant-design/icons';
 import { useIntl, useNavigate } from '@umijs/max';
-import {
-  Button,
-  ConfigProvider,
-  Empty,
-  Input,
-  Select,
-  Space,
-  Table,
-  Tag,
-  message
-} from 'antd';
+import { ConfigProvider, Empty, Table, Tag, message } from 'antd';
 import dayjs from 'dayjs';
 import { useAtom } from 'jotai';
 import _ from 'lodash';
@@ -244,7 +232,7 @@ const ModelFiles = () => {
           record.ollama_library_model_name ||
           record.model_scope_model_id ||
           record.local_path,
-        '/'
+        /[\\/]/
       ).pop()
     );
 
@@ -405,7 +393,6 @@ const ModelFiles = () => {
   const handleCreateModel = async (data: any) => {
     try {
       const result = getSourceRepoConfigValue(openDeployModal.source, data);
-
       const modelData = await createModel({
         data: {
           ...result.values
@@ -530,80 +517,31 @@ const ModelFiles = () => {
 
   return (
     <>
-      <PageTools
-        marginBottom={10}
-        marginTop={10}
-        left={
-          <Space>
-            <Input
-              placeholder={intl.formatMessage({
-                id: 'resources.filter.source'
-              })}
-              style={{ width: 230 }}
-              allowClear
-              onChange={handleNameChange}
-            ></Input>
-            <Select
-              allowClear
-              showSearch={false}
-              placeholder={intl.formatMessage({
-                id: 'resources.filter.worker'
-              })}
-              style={{ width: 230 }}
-              size="large"
-              onChange={handleWorkerChange}
-              options={workersList}
-            ></Select>
-            <Button
-              type="text"
-              style={{ color: 'var(--ant-color-text-tertiary)' }}
-              onClick={handleSearch}
-              icon={<SyncOutlined></SyncOutlined>}
-            ></Button>
-          </Space>
-        }
-        right={
-          <Space size={20}>
-            <DropDownActions
-              menu={{
-                items: onLineSourceOptions,
-                onClick: handleClickDropdown
-              }}
-            >
-              <Button
-                icon={<DownOutlined></DownOutlined>}
-                type="primary"
-                iconPosition="end"
-              >
-                {intl.formatMessage({ id: 'resources.modelfiles.download' })}
-              </Button>
-            </DropDownActions>
-            <Button
-              icon={<DeleteOutlined />}
-              danger
-              onClick={handleDeleteByBatch}
-              disabled={!rowSelection.selectedRowKeys.length}
-            >
-              <span>
-                {intl?.formatMessage?.({ id: 'common.button.delete' })}
-                {rowSelection.selectedRowKeys.length > 0 && (
-                  <span>({rowSelection.selectedRowKeys?.length})</span>
-                )}
-              </span>
-            </Button>
-          </Space>
-        }
-      ></PageTools>
+      <FilterBar
+        actionType="dropdown"
+        selectHolder="resources.filter.worker"
+        inputHolder="resources.filter.source"
+        buttonText={intl.formatMessage({ id: 'resources.modelfiles.download' })}
+        handleSelectChange={handleWorkerChange}
+        handleDeleteByBatch={handleDeleteByBatch}
+        handleClickPrimary={handleClickDropdown}
+        handleSearch={handleSearch}
+        selectOptions={onLineSourceOptions}
+        handleInputChange={handleNameChange}
+        rowSelection={rowSelection}
+        actionItems={onLineSourceOptions}
+        showSelect={true}
+      ></FilterBar>
       <ConfigProvider renderEmpty={renderEmpty}>
         <Table
-          columns={columns}
+          rowKey="id"
           tableLayout="fixed"
           style={{ width: '100%' }}
+          onChange={handleTableChange}
           dataSource={dataSource.dataList}
           loading={dataSource.loading}
-          rowKey="id"
-          onChange={handleTableChange}
           rowSelection={rowSelection}
+          columns={columns}
           pagination={{
             showSizeChanger: true,
             pageSize: queryParams.perPage,
@@ -616,29 +554,29 @@ const ModelFiles = () => {
       </ConfigProvider>
       <DeleteModal ref={modalRef}></DeleteModal>
       <DownloadModal
-        open={downloadModalStatus.show}
-        title={intl.formatMessage({ id: 'resources.modelfiles.download' })}
-        source={downloadModalStatus.source}
-        width={downloadModalStatus.width}
         onCancel={handleDownloadCancel}
         onOk={handleDownload}
+        title={intl.formatMessage({ id: 'resources.modelfiles.download' })}
+        open={downloadModalStatus.show}
+        source={downloadModalStatus.source}
+        width={downloadModalStatus.width}
         workersList={workersList.filter(
           (item: any) => item.state === WorkerStatusMap.ready
         )}
       ></DownloadModal>
       <DeployModal
         deploymentType="modelFiles"
+        title={intl.formatMessage({ id: 'models.button.deploy' })}
+        onCancel={handleDeployModalCancel}
+        onOk={handleCreateModel}
         open={openDeployModal.show}
         action={PageAction.CREATE}
-        title={intl.formatMessage({ id: 'models.button.deploy' })}
         source={openDeployModal.source}
         width={openDeployModal.width}
         gpuOptions={openDeployModal.gpuOptions}
         modelFileOptions={openDeployModal.modelFileOptions || []}
         initialValues={openDeployModal.initialValues}
         isGGUF={openDeployModal.isGGUF}
-        onCancel={handleDeployModalCancel}
-        onOk={handleCreateModel}
       ></DeployModal>
     </>
   );