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

react-ui/src/components/ParameterSelect/config.tsx

@@ -16,14 +16,17 @@ export type SelectPropsConfig = {
   getLabel?: (value: any) => string; // 对象类型时，获取其 label
 };
 
-export type ParameterSelectDataType =
-  | 'dataset'
-  | 'model'
-  | 'service'
-  | 'resource'
-  | 'remote-image'
-  | 'remote-resource-type'
-  | 'remote-resource';
+export const ParameterSelectTypeList = [
+  'dataset',
+  'model',
+  'service',
+  'resource',
+  'remote-image',
+  'remote-resource-type',
+  'remote-resource',
+] as const;
+
+export type ParameterSelectDataType = (typeof ParameterSelectTypeList)[number];
 
 export const paramSelectConfig: Record<ParameterSelectDataType, SelectPropsConfig> = {
   dataset: {

react-ui/src/components/ParameterSelect/index.tsx

@@ -13,7 +13,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import FormInfo from '../FormInfo';
 import { paramSelectConfig, type ParameterSelectDataType } from './config';
 
-export { type ParameterSelectDataType };
+export { ParameterSelectTypeList, type ParameterSelectDataType } from './config';
 
 export type ParameterSelectObject = {
   value: any;

react-ui/src/pages/Pipeline/components/PipelineNodeDrawer/index.tsx

@@ -4,6 +4,7 @@ import ParameterInput, { requiredValidator } from '@/components/ParameterInput';
 import ParameterSelect, {
   type ParameterSelectDataType,
   type ParameterSelectObject,
+  ParameterSelectTypeList,
 } from '@/components/ParameterSelect';
 import ResourceSelectorModal, {
   ResourceSelectorType,
@@ -43,17 +44,6 @@ type PipelineNodeParameterProps = {
   onFormChange: (data: PipelineNodeModelSerialize) => void;
 };
 
-// 自定义的下拉组件类型
-const parameterSelectList = [
-  'dataset',
-  'model',
-  'service',
-  'resource',
-  'remote-resource-type',
-  'remote-image',
-  'remote-resource',
-];
-
 const PipelineNodeParameter = forwardRef(({ onFormChange }: PipelineNodeParameterProps, ref) => {
   const [form] = Form.useForm();
   const [stagingItem, setStagingItem] = useState<PipelineNodeModelSerialize>(
@@ -402,7 +392,7 @@ const PipelineNodeParameter = forwardRef(({ onFormChange }: PipelineNodeParamete
           </Flex>
         )}
         {item.value.type === ComponentType.Select &&
-          (parameterSelectList.includes(item.value.item_type) ? (
+          (ParameterSelectTypeList.includes(item.value.item_type as ParameterSelectDataType) ? (
             <Form.Item name={[parentName, item.key]} rules={getFormRules(item)} noStyle>
               <ParameterSelect
                 dataType={item.value.item_type as ParameterSelectDataType}

react-ui/src/services/external/index.ts

@@ -2,9 +2,11 @@
 
 import { request } from '@umijs/max';
 
+const jccBaseUrl = 'https://jcc.jointcloud.net';
+
 // 云际系统登录
 export function jccLoginReq() {
-  return request(`http://119.45.255.234:30180/jcc-admin/admin/login`, {
+  return request(`${jccBaseUrl}/jcc-admin/admin/login`, {
     method: 'POST',
     data: {
       username: 'iflytek',
@@ -20,7 +22,7 @@ export function jccLoginReq() {
 
 // 云际系统获取资源类型
 export function jccGetResourceTypesReq(token: string, userId: number) {
-  return request(`http://119.45.255.234:30180/jsm/jobSet/resourceRange`, {
+  return request(`${jccBaseUrl}/jsm/jobSet/resourceRange`, {
     method: 'POST',
     data: {
       userID: userId,
@@ -36,7 +38,7 @@ export function jccGetResourceTypesReq(token: string, userId: number) {
 
 // 云际系统获取资源镜像
 export function jccGetImagesReq(token: string, cardTypes: string[]) {
-  return request(`http://119.45.255.234:30180/jsm/jobSet/queryImages`, {
+  return request(`${jccBaseUrl}/jsm/jobSet/queryImages`, {
     method: 'POST',
     data: {
       cardTypes: cardTypes,
@@ -52,7 +54,7 @@ export function jccGetImagesReq(token: string, cardTypes: string[]) {
 
 // 云际系统获取资源列表
 export function jccGetResourcesReq(token: string, cardType: string) {
-  return request(`http://119.45.255.234:30180/jsm/jobSet/queryResource`, {
+  return request(`${jccBaseUrl}/jsm/jobSet/queryResource`, {
     method: 'POST',
     data: {
       queryResource: {