From 572efdbc1da6ed932cf64db289d8977295fd2ce9 Mon Sep 17 00:00:00 2001
From: cp3hnu <cp3hnu@gmail.com>
Date: Wed, 19 Mar 2025 17:04:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E4=B9=8B=E5=90=8E=EF=BC=8C=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=88=A0=E9=99=A4=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 react-ui/.nvmrc                               |  2 +-
 react-ui/src/components/CodeSelect/index.tsx  |  7 ++
 .../src/components/ParameterInput/index.tsx   | 18 ++--
 .../src/components/ParameterSelect/config.tsx | 26 +-----
 .../src/components/ParameterSelect/index.tsx  | 12 ++-
 .../src/components/ResourceSelect/index.tsx   | 82 +++++++++----------
 .../components/CreateForm/DatasetConfig.tsx   |  1 -
 .../components/CreateForm/ExecuteConfig.tsx   |  7 +-
 .../Experiment/components/LogGroup/index.tsx  | 24 +++---
 .../ModelDeployment/CreateVersion/index.tsx   |  2 -
 react-ui/src/pages/Pipeline/Info/index.jsx    |  2 +-
 react-ui/src/stories/CodeSelect.stories.tsx   |  1 +
 .../src/stories/ParameterInput.stories.tsx    | 70 ++++++----------
 .../src/stories/ResourceSelect.stories.tsx    |  4 +-
 14 files changed, 119 insertions(+), 139 deletions(-)

diff --git a/react-ui/.nvmrc b/react-ui/.nvmrc
index 8ddbc0c6..216afccf 100644
--- a/react-ui/.nvmrc
+++ b/react-ui/.nvmrc
@@ -1 +1 @@
-v18.16.0
+v18.20.7
diff --git a/react-ui/src/components/CodeSelect/index.tsx b/react-ui/src/components/CodeSelect/index.tsx
index d2afbb94..c6486d1e 100644
--- a/react-ui/src/components/CodeSelect/index.tsx
+++ b/react-ui/src/components/CodeSelect/index.tsx
@@ -30,6 +30,7 @@ function CodeSelect({
   onChange,
   ...rest
 }: CodeSelectProps) {
+  // 选择代码配置
   const selectResource = () => {
     const { close } = openAntdModal(CodeSelectorModal, {
       onOk: (res) => {
@@ -59,6 +60,11 @@ function CodeSelect({
     });
   };
 
+  // 删除
+  const handleRemove = () => {
+    onChange?.(undefined);
+  };
+
   return (
     <div className={classNames('kf-code-select', className)} style={style}>
       <ParameterInput
@@ -68,6 +74,7 @@ function CodeSelect({
         value={value}
         onChange={onChange}
         onClick={selectResource}
+        onRemove={handleRemove}
       ></ParameterInput>
       <Button
         className="kf-code-select__button"
diff --git a/react-ui/src/components/ParameterInput/index.tsx b/react-ui/src/components/ParameterInput/index.tsx
index 47ef5d0e..32672b98 100644
--- a/react-ui/src/components/ParameterInput/index.tsx
+++ b/react-ui/src/components/ParameterInput/index.tsx
@@ -6,7 +6,7 @@
 
 import { CommonTabKeys } from '@/enums';
 import { CloseOutlined } from '@ant-design/icons';
-import { Form, Input } from 'antd';
+import { ConfigProvider, Form, Input } from 'antd';
 import { RuleObject } from 'antd/es/form';
 import classNames from 'classnames';
 import './index.less';
@@ -67,7 +67,7 @@ function ParameterInput({
   allowClear,
   className,
   style,
-  size = 'middle',
+  size,
   disabled = false,
   id,
   ...rest
@@ -81,10 +81,17 @@ function ParameterInput({
   const placeholder = valueObj?.placeholder || rest?.placeholder;
   const InputComponent = textArea ? Input.TextArea : Input;
   const { status } = Form.Item.useStatus();
+  const { componentSize } = ConfigProvider.useConfig();
+  const mySize = size || componentSize;
 
   // 删除
   const handleRemove = (e: React.MouseEvent<HTMLSpanElement, MouseEvent>) => {
     e.stopPropagation();
+    if (onRemove) {
+      onRemove();
+      return;
+    }
+
     onChange?.({
       ...valueObj,
       value: undefined,
@@ -94,7 +101,6 @@ function ParameterInput({
       expandedKeys: [],
       checkedKeys: [],
     });
-    onRemove?.();
   };
 
   return (
@@ -104,8 +110,8 @@ function ParameterInput({
           id={id}
           className={classNames(
             'parameter-input',
-            { 'parameter-input--large': size === 'large' },
-            { 'parameter-input--small': size === 'small' },
+            { 'parameter-input--large': mySize === 'large' },
+            { 'parameter-input--small': mySize === 'small' },
             { [`parameter-input--${status}`]: status },
             className,
           )}
@@ -128,7 +134,7 @@ function ParameterInput({
         <InputComponent
           {...rest}
           id={id}
-          size={size}
+          size={mySize}
           className={className}
           style={style}
           placeholder={placeholder}
diff --git a/react-ui/src/components/ParameterSelect/config.tsx b/react-ui/src/components/ParameterSelect/config.tsx
index 2548f44c..f9ac72d2 100644
--- a/react-ui/src/components/ParameterSelect/config.tsx
+++ b/react-ui/src/components/ParameterSelect/config.tsx
@@ -1,21 +1,10 @@
+import { filterResourceStandard, resourceFieldNames } from '@/hooks/resource';
 import { ServiceData } from '@/pages/ModelDeployment/types';
 import { getDatasetList, getModelList } from '@/services/dataset/index.js';
 import { getServiceListReq } from '@/services/modelDeployment';
-import { getComputingResourceReq } from '@/services/pipeline';
-import { ComputingResource } from '@/types';
 import { type SelectProps } from 'antd';
 import { pick } from 'lodash';
 
-// 过滤资源规格
-const filterResourceStandard: SelectProps<string, ComputingResource>['filterOption'] = (
-  input: string,
-  option?: ComputingResource,
-) => {
-  return (
-    option?.computing_resource?.toLocaleLowerCase()?.includes(input.toLocaleLowerCase()) ?? false
-  );
-};
-
 // id 从 number 转换为 string
 const convertId = (item: any) => ({
   ...item,
@@ -86,17 +75,10 @@ export const paramSelectConfig: Record<string, SelectPropsConfig> = {
   },
   resource: {
     getOptions: async () => {
-      const res = await getComputingResourceReq({
-        page: 0,
-        size: 1000,
-        resource_type: '',
-      });
-      return res?.data?.content ?? [];
-    },
-    fieldNames: {
-      label: 'description',
-      value: 'standard',
+      // 不需要这个函数
+      return [];
     },
+    fieldNames: resourceFieldNames,
     filterOption: filterResourceStandard as SelectProps['filterOption'],
   },
 };
diff --git a/react-ui/src/components/ParameterSelect/index.tsx b/react-ui/src/components/ParameterSelect/index.tsx
index f1902e5c..b765ea61 100644
--- a/react-ui/src/components/ParameterSelect/index.tsx
+++ b/react-ui/src/components/ParameterSelect/index.tsx
@@ -4,6 +4,7 @@
  * @Description: 参数下拉选择组件，支持资源规格、数据集、模型、服务
  */
 
+import { useComputingResource } from '@/hooks/resource';
 import { to } from '@/utils/promise';
 import { Select, type SelectProps } from 'antd';
 import { useEffect, useState } from 'react';
@@ -20,7 +21,7 @@ export interface ParameterSelectProps extends SelectProps {
   dataType: 'dataset' | 'model' | 'service' | 'resource';
   /** 是否只是展示信息 */
   display?: boolean;
-  /** 值 */
+  /** 值，支持对象，对象必须包含 value */
   value?: string | ParameterSelectObject;
   /** 修改后回调 */
   onChange?: (value: string | ParameterSelectObject) => void;
@@ -34,9 +35,10 @@ function ParameterSelect({
   onChange,
   ...rest
 }: ParameterSelectProps) {
-  const [options, setOptions] = useState([]);
+  const [options, setOptions] = useState<SelectProps['options']>([]);
   const propsConfig = paramSelectConfig[dataType];
   const valueText = typeof value === 'object' && value !== null ? value.value : value;
+  const [resourceStandardList] = useComputingResource();
 
   useEffect(() => {
     // 获取下拉数据
@@ -54,6 +56,8 @@ function ParameterSelect({
     getSelectOptions();
   }, [propsConfig]);
 
+  const selectOptions = dataType === 'resource' ? resourceStandardList : options;
+
   const handleChange = (text: string) => {
     if (typeof value === 'object' && value !== null) {
       onChange?.({
@@ -71,7 +75,7 @@ function ParameterSelect({
       <FormInfo
         select
         value={valueText}
-        options={options}
+        options={selectOptions}
         fieldNames={propsConfig?.fieldNames}
       ></FormInfo>
     );
@@ -81,7 +85,7 @@ function ParameterSelect({
     <Select
       {...rest}
       filterOption={propsConfig?.filterOption}
-      options={options}
+      options={selectOptions}
       fieldNames={propsConfig?.fieldNames}
       optionFilterProp={propsConfig?.optionFilterProp}
       value={valueText}
diff --git a/react-ui/src/components/ResourceSelect/index.tsx b/react-ui/src/components/ResourceSelect/index.tsx
index 29f01009..a7e02ce3 100644
--- a/react-ui/src/components/ResourceSelect/index.tsx
+++ b/react-ui/src/components/ResourceSelect/index.tsx
@@ -11,10 +11,9 @@ import ResourceSelectorModal, {
   selectorTypeConfig,
 } from '@/components/ResourceSelectorModal';
 import { openAntdModal } from '@/utils/modal';
-import { Button } from 'antd';
+import { Button, ConfigProvider } from 'antd';
 import classNames from 'classnames';
 import { pick } from 'lodash';
-import { useEffect, useState } from 'react';
 import ParameterInput, { type ParameterInputProps } from '../ParameterInput';
 import './index.less';
 
@@ -46,43 +45,40 @@ function ResourceSelect({
   onChange,
   ...rest
 }: ResourceSelectProps) {
-  const [selectedResource, setSelectedResource] = useState<ResourceSelectorResponse | undefined>(
-    undefined,
-  );
-
-  useEffect(() => {
-    if (
-      value &&
-      typeof value === 'object' &&
-      value.activeTab &&
-      value.id &&
-      value.name &&
-      value.version &&
-      value.path &&
-      (type === ResourceSelectorType.Mirror || (value.identifier && value.owner))
-    ) {
-      const originResource = pick(value, [
-        'activeTab',
-        'id',
-        'identifier',
-        'name',
-        'owner',
-        'version',
-        'path',
-      ]) as ResourceSelectorResponse;
-      setSelectedResource(originResource);
-    }
-  }, [value, type]);
+  const { componentSize } = ConfigProvider.useConfig();
+  const mySize = size || componentSize;
+  let selectedResource: ResourceSelectorResponse | undefined = undefined;
+  if (
+    value &&
+    typeof value === 'object' &&
+    value.activeTab &&
+    value.id &&
+    value.name &&
+    value.version &&
+    value.path &&
+    (type === ResourceSelectorType.Mirror || (value.identifier && value.owner))
+  ) {
+    selectedResource = pick(value, [
+      'activeTab',
+      'id',
+      'identifier',
+      'name',
+      'owner',
+      'version',
+      'path',
+    ]) as ResourceSelectorResponse;
+  }
 
+  // 选择数据集、模型、镜像
   const selectResource = () => {
-    const resource = selectedResource;
     const { close } = openAntdModal(ResourceSelectorModal, {
       type,
-      defaultExpandedKeys: resource ? [resource.id] : [],
-      defaultCheckedKeys: resource ? [`${resource.id}-${resource.version}`] : [],
-      defaultActiveTab: resource?.activeTab,
+      defaultExpandedKeys: selectedResource ? [selectedResource.id] : [],
+      defaultCheckedKeys: selectedResource
+        ? [`${selectedResource.id}-${selectedResource.version}`]
+        : [],
+      defaultActiveTab: selectedResource?.activeTab,
       onOk: (res) => {
-        setSelectedResource(res);
         if (res) {
           const { activeTab, id, name, version, path, identifier, owner } = res;
           if (type === ResourceSelectorType.Mirror) {
@@ -116,32 +112,32 @@ function ResourceSelect({
             });
           }
         } else {
-          onChange?.({
-            value: undefined,
-            showValue: undefined,
-            fromSelect: false,
-            activeTab: undefined,
-          });
+          onChange?.(undefined);
         }
         close();
       },
     });
   };
 
+  // 删除
+  const handleRemove = () => {
+    onChange?.(undefined);
+  };
+
   return (
     <div className={classNames('kf-resource-select', className)} style={style}>
       <ParameterInput
         {...rest}
         disabled={disabled}
         value={value}
-        size={size}
+        size={mySize}
         onChange={onChange}
-        onRemove={() => setSelectedResource(undefined)}
+        onRemove={handleRemove}
         onClick={selectResource}
       ></ParameterInput>
       <Button
         className="kf-resource-select__button"
-        size={size}
+        size={mySize}
         type="link"
         icon={getSelectBtnIcon(type)}
         disabled={disabled}
diff --git a/react-ui/src/pages/AutoML/components/CreateForm/DatasetConfig.tsx b/react-ui/src/pages/AutoML/components/CreateForm/DatasetConfig.tsx
index b3b3f2dd..ae70e806 100644
--- a/react-ui/src/pages/AutoML/components/CreateForm/DatasetConfig.tsx
+++ b/react-ui/src/pages/AutoML/components/CreateForm/DatasetConfig.tsx
@@ -30,7 +30,6 @@ function DatasetConfig() {
               type={ResourceSelectorType.Dataset}
               placeholder="请选择数据集"
               canInput={false}
-              size="large"
             />
           </Form.Item>
         </Col>
diff --git a/react-ui/src/pages/AutoML/components/CreateForm/ExecuteConfig.tsx b/react-ui/src/pages/AutoML/components/CreateForm/ExecuteConfig.tsx
index d03445f3..689deb1b 100644
--- a/react-ui/src/pages/AutoML/components/CreateForm/ExecuteConfig.tsx
+++ b/react-ui/src/pages/AutoML/components/CreateForm/ExecuteConfig.tsx
@@ -431,7 +431,12 @@ function ExecuteConfig() {
 
       <Row gutter={8}>
         <Col span={10}>
-          <Form.Item label="是否打乱" name="shuffle" tooltip="拆分数据前是否打乱顺序">
+          <Form.Item
+            label="是否打乱"
+            name="shuffle"
+            tooltip="拆分数据前是否打乱顺序"
+            valuePropName="checked"
+          >
             <Switch />
           </Form.Item>
         </Col>
diff --git a/react-ui/src/pages/Experiment/components/LogGroup/index.tsx b/react-ui/src/pages/Experiment/components/LogGroup/index.tsx
index e69b4773..3bc1b566 100644
--- a/react-ui/src/pages/Experiment/components/LogGroup/index.tsx
+++ b/react-ui/src/pages/Experiment/components/LogGroup/index.tsx
@@ -33,7 +33,7 @@ function LogGroup({
   status,
 }: LogGroupProps) {
   const [collapse, setCollapse] = useState(true);
-  const [logList, setLogList, logListRef] = useStateRef<Log[]>([]);
+  const [logList, setLogList] = useState<Log[]>([]);
   const [completed, setCompleted] = useState(false);
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const [_isMouseDown, setIsMouseDown, isMouseDownRef] = useStateRef(false);
@@ -126,6 +126,14 @@ function LogGroup({
       socketRef.current = socket;
     };
 
+    // 关闭 socket
+    const closeSocket = () => {
+      if (socketRef.current) {
+        socketRef.current.close(1000, 'completed');
+        socketRef.current = undefined;
+      }
+    };
+
     if (status === ExperimentStatus.Running) {
       setupSockect();
     }
@@ -133,7 +141,7 @@ function LogGroup({
     return () => {
       closeSocket();
     };
-  }, [status, start_time, pod_name, isMouseDownRef, setLogList]);
+  }, [status, start_time, pod_name, isMouseDownRef]);
 
   // 鼠标拖到中不滚动到底部
   useEffect(() => {
@@ -153,8 +161,8 @@ function LogGroup({
 
   // 请求日志
   const requestExperimentPodsLog = async () => {
-    const list = logListRef.current;
-    const startTime = list.length > 0 ? list[list.length - 1].start_time : start_time;
+    const last = logList[logList.length - 1];
+    const startTime = last ? last.start_time : start_time;
     const params = {
       pod_name,
       start_time: startTime,
@@ -201,14 +209,6 @@ function LogGroup({
     requestExperimentPodsLog();
   };
 
-  // 关闭 socket
-  const closeSocket = () => {
-    if (socketRef.current) {
-      socketRef.current.close(1000, 'completed');
-      socketRef.current = undefined;
-    }
-  };
-
   // 滚动到底部
   const scrollToBottom = (smooth: boolean = true) => {
     // const element = document.getElementById(listId);
diff --git a/react-ui/src/pages/ModelDeployment/CreateVersion/index.tsx b/react-ui/src/pages/ModelDeployment/CreateVersion/index.tsx
index 6b47ce30..e0a2c074 100644
--- a/react-ui/src/pages/ModelDeployment/CreateVersion/index.tsx
+++ b/react-ui/src/pages/ModelDeployment/CreateVersion/index.tsx
@@ -305,7 +305,6 @@ function CreateServiceVersion() {
                     placeholder="请选择模型"
                     disabled={disabled}
                     canInput={false}
-                    size="large"
                   />
                 </Form.Item>
               </Col>
@@ -327,7 +326,6 @@ function CreateServiceVersion() {
                     type={ResourceSelectorType.Mirror}
                     placeholder="请选择镜像"
                     canInput={false}
-                    size="large"
                     disabled={disabled}
                   />
                 </Form.Item>
diff --git a/react-ui/src/pages/Pipeline/Info/index.jsx b/react-ui/src/pages/Pipeline/Info/index.jsx
index 353ef7e0..3cc69a4c 100644
--- a/react-ui/src/pages/Pipeline/Info/index.jsx
+++ b/react-ui/src/pages/Pipeline/Info/index.jsx
@@ -24,7 +24,7 @@ const EditPipeline = () => {
   const propsRef = useRef();
   const [paramsDrawerOpen, openParamsDrawer, closeParamsDrawer] = useVisible(false);
   const [globalParam, setGlobalParam, globalParamRef] = useStateRef([]);
-  const [workflowInfo, setWorkflowInfo] = useStateRef(undefined);
+  const [workflowInfo, setWorkflowInfo] = useState(undefined);
   const { message } = App.useApp();
   let sourceAnchorIdx, targetAnchorIdx, dropAnchorIdx;
   let dragSourceNode;
diff --git a/react-ui/src/stories/CodeSelect.stories.tsx b/react-ui/src/stories/CodeSelect.stories.tsx
index 415d05da..b2246700 100644
--- a/react-ui/src/stories/CodeSelect.stories.tsx
+++ b/react-ui/src/stories/CodeSelect.stories.tsx
@@ -41,6 +41,7 @@ export const Primary: Story = {
     canInput: false,
     textArea: false,
     size: 'large',
+    placeholder: '请选择代码配置',
     style: { width: 400 },
   },
   render: function Render(args) {
diff --git a/react-ui/src/stories/ParameterInput.stories.tsx b/react-ui/src/stories/ParameterInput.stories.tsx
index 914b6196..3ca116c8 100644
--- a/react-ui/src/stories/ParameterInput.stories.tsx
+++ b/react-ui/src/stories/ParameterInput.stories.tsx
@@ -1,5 +1,7 @@
 import ParameterInput, { ParameterInputValue } from '@/components/ParameterInput';
+import { action } from '@storybook/addon-actions';
 import type { Meta, StoryObj } from '@storybook/react';
+import { fn } from '@storybook/test';
 import { Button } from 'antd';
 import { useState } from 'react';
 
@@ -18,7 +20,7 @@ const meta = {
     // backgroundColor: { control: 'color' },
   },
   // Use `fn` to spy on the onClick arg, which will appear in the actions panel once invoked: https://storybook.js.org/docs/essentials/actions#action-args
-  // args: { onClick: fn() },
+  args: { onChange: fn() },
 } satisfies Meta<typeof ParameterInput>;
 
 export default meta;
@@ -37,45 +39,6 @@ export const Input: Story = {
 };
 
 export const Select: Story = {
-  args: {
-    placeholder: '请输入工作目录',
-    style: { width: 300 },
-    value: 'storybook',
-    canInput: false,
-    size: 'large',
-  },
-};
-
-export const SelectWithObjctValue: Story = {
-  args: {
-    placeholder: '请输入工作目录',
-    style: { width: 300 },
-    value: {
-      value: 'storybook',
-      showValue: 'storybook',
-      fromSelect: true,
-    },
-    canInput: true,
-    size: 'large',
-  },
-};
-
-export const Disabled: Story = {
-  args: {
-    placeholder: '请输入工作目录',
-    style: { width: 300 },
-    value: {
-      value: 'storybook',
-      showValue: 'storybook',
-      fromSelect: true,
-    },
-    canInput: true,
-    size: 'large',
-    disabled: true,
-  },
-};
-
-export const Application: Story = {
   args: {
     placeholder: '请输入工作目录',
     style: { width: 300 },
@@ -86,18 +49,24 @@ export const Application: Story = {
     const [value, setValue] = useState<ParameterInputValue | undefined>('');
 
     const onClick = () => {
-      setValue({
+      const value = {
         value: 'storybook',
         showValue: 'storybook',
         fromSelect: true,
-      });
+        otherValue: 'others',
+      };
+      setValue(value);
+      action('onChange')(value);
     };
     return (
       <>
         <ParameterInput
           {...args}
           value={value}
-          onChange={(value) => setValue(value)}
+          onChange={(value) => {
+            setValue(value);
+            action('onChange')(value);
+          }}
         ></ParameterInput>
         <Button type="primary" style={{ display: 'block', marginTop: 10 }} onClick={onClick}>
           模拟从全局参数选择
@@ -106,3 +75,18 @@ export const Application: Story = {
     );
   },
 };
+
+export const Disabled: Story = {
+  args: {
+    placeholder: '请输入工作目录',
+    style: { width: 300 },
+    value: {
+      value: 'storybook',
+      showValue: 'storybook',
+      fromSelect: true,
+    },
+    canInput: true,
+    size: 'large',
+    disabled: true,
+  },
+};
diff --git a/react-ui/src/stories/ResourceSelect.stories.tsx b/react-ui/src/stories/ResourceSelect.stories.tsx
index 8b87f990..3eafc0f7 100644
--- a/react-ui/src/stories/ResourceSelect.stories.tsx
+++ b/react-ui/src/stories/ResourceSelect.stories.tsx
@@ -76,6 +76,7 @@ export const Primary: Story = {
     canInput: false,
     textArea: false,
     size: 'large',
+    placeholder: '请选择数据集',
     style: { width: 400 },
   },
   render: function Render(args) {
@@ -120,7 +121,6 @@ export const InForm: Story = {
                 type={ResourceSelectorType.Dataset}
                 placeholder="请选择"
                 canInput={false}
-                size="large"
                 onChange={onChange}
               />
             </Form.Item>
@@ -133,7 +133,6 @@ export const InForm: Story = {
                 type={ResourceSelectorType.Model}
                 placeholder="请选择"
                 canInput={false}
-                size="large"
                 onChange={onChange}
               />
             </Form.Item>
@@ -146,7 +145,6 @@ export const InForm: Story = {
                 type={ResourceSelectorType.Mirror}
                 placeholder="请选择"
                 canInput={false}
-                size="large"
                 onChange={onChange}
               />
             </Form.Item>