Merge pull request '合并' (#212) from dev-zw into dev

react-ui/src/pages/AutoML/components/AutoMLBasic/index.tsx

@@ -212,6 +212,11 @@ function AutoMLBasic({ info, className, runStatus, isInstance = false }: AutoMLB
           value: info.dataset,
           format: formatDataset,
         },
+        {
+          label: '资源规格',
+          value: info.computing_resource_id,
+          format: getResourceDescription,
+        },
         {
           label: '类别数量',
           value: info.num_classes,

react-ui/src/pages/AutoML/components/CreateForm/VideoExecuteConfig.tsx

@@ -1,3 +1,4 @@
+import ParameterSelect from '@/components/ParameterSelect';
 import ResourceSelect, {
   ResourceSelectorType,
   requiredValidator,
@@ -36,6 +37,23 @@ function VideoExecuteConfig() {
         </Col>
       </Row>
 
+      <Row gutter={8}>
+        <Col span={10}>
+          <Form.Item
+            label="资源规格"
+            name="computing_resource_id"
+            rules={[
+              {
+                required: true,
+                message: '请选择资源规格',
+              },
+            ]}
+          >
+            <ParameterSelect dataType="resource" placeholder="请选择资源规格" />
+          </Form.Item>
+        </Col>
+      </Row>
+
       <Row gutter={8}>
         <Col span={10}>
           <Form.Item

react-ui/src/pages/ModelDeployment/CreateVersion/index.tsx

@@ -48,6 +48,12 @@ type ServiceVersionCache = ServiceVersionData & {
   lastPage: CreateServiceVersionFrom;
 };
 
+// 参数表单数据
+export type FormEnvVariable = {
+  key: string; // 参数名
+  value: string; // 参数值
+};
+
 function CreateServiceVersion() {
   const navigate = useNavigate();
   const [form] = Form.useForm();
@@ -430,11 +436,32 @@ function CreateServiceVersion() {
                               name={[name, 'key']}
                               style={{ flex: 1 }}
                               rules={[
-                                { required: true, message: '请输入变量名' },
                                 {
-                                  pattern: /^[a-zA-Z_][a-zA-Z0-9_-]*$/,
-                                  message:
-                                    '变量名只支持字母、数字、下划线、中横线且开头必须是字母或下划线',
+                                  validator: (_, value) => {
+                                    if (!value) {
+                                      return Promise.reject(new Error('请输入变量名'));
+                                    }
+                                    if (!/^[a-zA-Z_][a-zA-Z0-9_-]*$/.test(value)) {
+                                      return Promise.reject(
+                                        new Error(
+                                          '变量名只支持字母、数字、下划线、中横线并且必须以字母或下划线开头',
+                                        ),
+                                      );
+                                    }
+                                    // 判断不能重名
+                                    const list = form
+                                      .getFieldValue('env_variables')
+                                      .filter(
+                                        (item: FormEnvVariable | undefined) =>
+                                          item !== undefined && item !== null,
+                                      );
+
+                                    const names = list.map((item: FormEnvVariable) => item.key);
+                                    if (new Set(names).size !== names.length) {
+                                      return Promise.reject(new Error('名称不能重复'));
+                                    }
+                                    return Promise.resolve();
+                                  },
                                 },
                               ]}
                             >