Browse Source

feat: 代码配置公开还是私有的字段有code_repo_vis改为is_public

pull/219/head
cp3hnu 8 months ago
parent
commit
ca63880245
6 changed files with 20 additions and 23 deletions
  1. +2
    -3
      react-ui/src/components/CodeConfigItem/index.tsx
  2. +1
    -1
      react-ui/src/pages/CodeConfig/List/index.tsx
  3. +8
    -9
      react-ui/src/pages/CodeConfig/components/AddCodeConfigModal/index.tsx
  4. +2
    -3
      react-ui/src/pages/CodeConfig/components/CodeConfigItem/index.tsx
  5. +2
    -2
      react-ui/src/stories/docs/Less.mdx
  6. +5
    -5
      react-ui/src/stories/mockData.ts

+ 2
- 3
react-ui/src/components/CodeConfigItem/index.tsx View File

@@ -1,4 +1,3 @@
import { AvailableRange } from '@/enums';
import { type CodeConfigData } from '@/pages/CodeConfig/List';
import { Flex, Typography } from 'antd';
import classNames from 'classnames';
@@ -24,12 +23,12 @@ function CodeConfigItem({ item, onClick }: CodeConfigItemProps) {
<div
className={classNames(
styles['code-config-item__tag'],
item.code_repo_vis === AvailableRange.Public
item.is_public
? styles['code-config-item__tag--public']
: styles['code-config-item__tag--private'],
)}
>
{item.code_repo_vis === AvailableRange.Public ? '公开' : '私有'}
{item.is_public ? '公开' : '私有'}
</div>
</Flex>
<Typography.Paragraph


+ 1
- 1
react-ui/src/pages/CodeConfig/List/index.tsx View File

@@ -22,7 +22,7 @@ import styles from './index.less';
export type CodeConfigData = {
id: number;
code_repo_name: string;
code_repo_vis: number;
is_public: boolean;
git_url: string;
git_branch: string;
git_user_name: string;


+ 8
- 9
react-ui/src/pages/CodeConfig/components/AddCodeConfigModal/index.tsx View File

@@ -1,5 +1,4 @@
import KFModal from '@/components/KFModal';
import { AvailableRange } from '@/enums';
import { type CodeConfigData } from '@/pages/CodeConfig/List';
import { addCodeConfigReq, updateCodeConfigReq } from '@/services/codeConfig';
import { to } from '@/utils/promise';
@@ -27,7 +26,7 @@ interface AddCodeConfigModalProps extends Omit<ModalProps, 'onOk'> {

function AddCodeConfigModal({ opType, codeConfigData, onOk, ...rest }: AddCodeConfigModalProps) {
const [form] = Form.useForm();
const isPublic = Form.useWatch('code_repo_vis', form) === AvailableRange.Public;
const isPublic = Form.useWatch('is_public', form) as boolean;

const urlExample = useMemo(
() =>
@@ -57,7 +56,7 @@ function AddCodeConfigModal({ opType, codeConfigData, onOk, ...rest }: AddCodeCo
...formData,
};
// 清除多余的信息
if (formData.code_repo_vis === AvailableRange.Public) {
if (formData.is_public) {
omit(params, ['verify_mode', 'git_user_name', 'git_password', 'ssh_key']);
}
if (formData.verify_mode === VerifyMode.Password) {
@@ -83,7 +82,7 @@ function AddCodeConfigModal({ opType, codeConfigData, onOk, ...rest }: AddCodeCo

// 设置初始值
const initialValues: FormData = codeConfigData ?? {
code_repo_vis: AvailableRange.Public,
is_public: true,
verify_mode: VerifyMode.Password,
};
if (initialValues.verify_mode === undefined || initialValues.verify_mode === null) {
@@ -125,7 +124,7 @@ function AddCodeConfigModal({ opType, codeConfigData, onOk, ...rest }: AddCodeCo
</Form.Item>
<Form.Item
label="代码仓库可见性"
name="code_repo_vis"
name="is_public"
rules={[
{
required: true,
@@ -134,8 +133,8 @@ function AddCodeConfigModal({ opType, codeConfigData, onOk, ...rest }: AddCodeCo
]}
>
<Radio.Group>
<Radio value={AvailableRange.Public}>公开</Radio>
<Radio value={AvailableRange.Private}>私有</Radio>
<Radio value={true}>公开</Radio>
<Radio value={false}>私有</Radio>
</Radio.Group>
</Form.Item>
<Form.Item
@@ -171,11 +170,11 @@ function AddCodeConfigModal({ opType, codeConfigData, onOk, ...rest }: AddCodeCo
<Form.Item
noStyle
shouldUpdate={(prevValues, currentValues) =>
prevValues?.code_repo_vis !== currentValues?.code_repo_vis
prevValues?.is_public !== currentValues?.is_public
}
>
{({ getFieldValue }) => {
return getFieldValue('code_repo_vis') === AvailableRange.Private ? (
return getFieldValue('is_public') === false ? (
<>
<Form.Item
label="验证方式"


+ 2
- 3
react-ui/src/pages/CodeConfig/components/CodeConfigItem/index.tsx View File

@@ -1,7 +1,6 @@
import clock from '@/assets/img/clock.png';
import creatByImg from '@/assets/img/creatBy.png';
import KFIcon from '@/components/KFIcon';
import { AvailableRange } from '@/enums';
import { type CodeConfigData } from '@/pages/CodeConfig/List';
import { formatDate } from '@/utils/date';
import { Button, Flex, Typography } from 'antd';
@@ -33,12 +32,12 @@ function CodeConfigItem({ item, onClick, onEdit, onRemove }: CodeConfigItemProps
<div
className={classNames(
styles['code-config-item__tag'],
item.code_repo_vis === AvailableRange.Public
item.is_public
? styles['code-config-item__tag--public']
: styles['code-config-item__tag--private'],
)}
>
{item.code_repo_vis === AvailableRange.Public ? '公开' : '私有'}
{item.is_public ? '公开' : '私有'}
</div>
<Button
type="text"


+ 2
- 2
react-ui/src/stories/docs/Less.mdx View File

@@ -165,12 +165,12 @@ function CodeConfigItem({ item, onClick }: CodeConfigItemProps) {
<div
className={classNames(
styles['code-config-item__tag'],
item.code_repo_vis === AvailableRange.Public
item.is_public
? styles['code-config-item__tag--public']
: styles['code-config-item__tag--private'],
)}
>
{item.code_repo_vis === AvailableRange.Public ? '公开' : '私有'}
{item.is_public ? '公开' : '私有'}
</div>
</Flex>
<Typography.Paragraph


+ 5
- 5
react-ui/src/stories/mockData.ts View File

@@ -450,7 +450,7 @@ export const codeListData = {
{
id: 2,
code_repo_name: '介电材料代码',
code_repo_vis: 1,
is_public: true,
git_url: 'https://gitlink.org.cn/fuli/ML_for_Materials.git',
git_branch: 'master',
verify_mode: null,
@@ -466,7 +466,7 @@ export const codeListData = {
{
id: 3,
code_repo_name: '生物活性材料代码',
code_repo_vis: 1,
is_public: true,
git_url: 'https://gitlink.org.cn/zhaoyihan/test_mole_pre.git',
git_branch: 'parse_dataset',
verify_mode: null,
@@ -482,7 +482,7 @@ export const codeListData = {
{
id: 4,
code_repo_name: '数据处理',
code_repo_vis: 1,
is_public: true,
git_url: 'https://openi.pcl.ac.cn/somunslotus/somun202304241505581.git',
git_branch: 'train_ci_test',
verify_mode: null,
@@ -498,7 +498,7 @@ export const codeListData = {
{
id: 5,
code_repo_name: '手写体识别部署',
code_repo_vis: 1,
is_public: true,
git_url: 'https://gitlink.org.cn/somunslotus/mnist-inference.git',
git_branch: 'master',
verify_mode: null,
@@ -514,7 +514,7 @@ export const codeListData = {
{
id: 7,
code_repo_name: '手写体识别训练',
code_repo_vis: 1,
is_public: true,
git_url: 'https://openi.pcl.ac.cn/somunslotus/somun202304241505581.git',
git_branch: 'train_ci_test',
verify_mode: null,


Loading…
Cancel
Save