Merge branch 'feature/v1.2' into 'main'

Feature/v1.2

See merge request apipark/APIPark!38
This commit is contained in:
杨梦洁
2024-10-23 18:23:12 +08:00
2 changed files with 29 additions and 13 deletions
+12 -7
View File
@@ -274,14 +274,19 @@ a{
}
.login-block{
background-color: rgba(255, 255, 255, 0.1);
background: rgba(255, 255, 255, 0.1) !important;
.login-input{
color:#fff;
background-color: rgba(255, 255, 255, 0.1);
border: 1px solid rgba(255, 255, 255, 0.1);
color:#fff !important;
background: rgba(255, 255, 255, 0.1) !important;
border: 1px solid rgba(255, 255, 255, 0.1) !important;
&:hover, &:focus, &.ant-input-status-error, &.ant-input-status-error:hover, &.ant-input-status-error:focus-within{
background-color: rgba(255, 255, 255, 0.2);
border: 1px solid rgba(255, 255, 255, 0.2);
background: rgba(255, 255, 255, 0.2) !important;
border: 1px solid rgba(255, 255, 255, 0.2) !important;
}
}
}
input:-webkit-autofill,
input:-webkit-autofill:focus {
transition: background-color 0s 600000s, color 0s 600000s !important;
}
}
@@ -3,7 +3,7 @@ import {forwardRef, useEffect, useImperativeHandle, useMemo, useState} from "re
import {App, Button, Form, Input, Radio, Row, Select, TreeSelect, Upload} from "antd";
import { Link, useLocation, useNavigate, useParams} from "react-router-dom";
import {RouterParams} from "@core/components/aoplatform/RenderRoutes.tsx";
import {BasicResponse, DELETE_TIPS, PLACEHOLDER, RESPONSE_TIPS, STATUS_CODE, VALIDATE_MESSAGE} from "@common/const/const.tsx";
import {BasicResponse, DELETE_TIPS, PLACEHOLDER, RESPONSE_TIPS, STATUS_CODE} from "@common/const/const.tsx";
import {useFetch} from "@common/hooks/http.ts";
import {DefaultOptionType} from "antd/es/cascader";
import { EntityItem, MemberItem, SimpleTeamItem} from "@common/const/type.ts";
@@ -13,7 +13,7 @@ import { validateUrlSlash } from "@common/utils/validate.ts";
import { normFile } from "@common/utils/uploadPic.ts";
import { useBreadcrumb } from "@common/contexts/BreadcrumbContext.tsx";
import { useSystemContext } from "../../contexts/SystemContext.tsx";
import { SERVICE_APPROVAL_OPTIONS, SERVICE_KIND_OPTIONS, SERVICE_VISUALIZATION_OPTIONS } from "@core/const/system/const.tsx";
import { SERVICE_APPROVAL_OPTIONS, SERVICE_KIND_OPTIONS } from "@core/const/system/const.tsx";
import { RcFile, UploadChangeParam, UploadFile, UploadProps } from "antd/es/upload/interface";
import { LoadingOutlined } from "@ant-design/icons";
import { getImgBase64 } from "@common/utils/dataTransfer.ts";
@@ -257,7 +257,8 @@ const SystemConfig = forwardRef<SystemConfigHandle>((_,ref) => {
setOnEdit(false);
const id = uuidv4()
form.setFieldValue('id',id);
form.setFieldValue('serviceKind',serviceTypeOptions[0].value)
form.setFieldValue('serviceKind','ai')
setShowAI(true)
form.setFieldValue('prefix',`${id.split('-')[0]}/`)
form.setFieldValue('team',teamId);
form.setFieldValue('serviceType','public');
@@ -285,7 +286,7 @@ const SystemConfig = forwardRef<SystemConfigHandle>((_,ref) => {
})
}
const serviceTypeOptions = useMemo(()=>SERVICE_KIND_OPTIONS.map((x)=>({...x, label:$t(x.label)})),[state.language]);
// const serviceTypeOptions = useMemo(()=>SERVICE_KIND_OPTIONS.map((x)=>({...x, label:$t(x.label)})),[state.language]);
// const visualizationOptions = useMemo(()=>SERVICE_VISUALIZATION_OPTIONS.map((x)=>({...x, label:$t(x.label)})),[state.language])
const approvalOptions = useMemo(()=>SERVICE_APPROVAL_OPTIONS.map((x)=>({...x, label:$t(x.label)})),[state.language])
@@ -324,8 +325,18 @@ const SystemConfig = forwardRef<SystemConfigHandle>((_,ref) => {
name="serviceKind"
rules={[{required: true}]}
>
<Select className="w-INPUT_NORMAL" disabled={onEdit} placeholder={$t(PLACEHOLDER.input)} options={serviceTypeOptions} onChange={(value)=>setShowAI(value === 'ai')}>
</Select>
<Radio.Group disabled={onEdit} onChange={(e)=>{setShowAI(e.target.value === 'ai')}} >
<Radio.Button className="w-[180px] h-[100px] mr-btnbase" value="ai">
<div className="w-full h-full flex flex-col items-center justify-center text-black">
<Icon icon="icon-park-outline:robot-one" height={50} width={50} />
<span>{$t('AI 服务')}</span></div>
</Radio.Button>
<Radio.Button className="w-[180px] h-[100px]" value="rest">
<div className="w-full h-full flex flex-col items-center justify-center text-black">
<Icon icon="bx:server" height={50} width={50} />
<span>{$t('REST 服务')}</span></div>
</Radio.Button>
</Radio.Group>
</Form.Item>
}
{showAI && <Form.Item<AiServiceConfigFieldType>