feat: 模型列表固定表头设置批量按钮完成,遍历Vnode比对刷新节点key添加,分步表单整体样式初步完成调整

develop
zhoux 2 years ago
parent 7fb0fad3c3
commit 5cea7c19a5

@ -1,3 +1,11 @@
<!--
* @Author: zhoux zhouxia@supervision.ltd
* @Date: 2023-11-01 13:56:33
* @LastEditors: zhoux zhouxia@supervision.ltd
* @LastEditTime: 2023-11-03 11:09:56
* @FilePath: \general-ai-platform-web\README.md
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
# General-AI-Platform-Web
通用算法平台前端仓库 develop
@ -17,6 +25,11 @@
### 具体实现
1. 筛选表单区: 列表在columns配置初始数据时需要筛选的表单项统一使用renderFormItem属性基于renderFormItem去配置表单项field, 【searchFormItemProps】属性统一配置自定义业务
{
@ -31,4 +44,15 @@
3. 列表action有多个按钮显示更多
暂时使用默认超过3个显示更多如需统一处理或者权限控制下的按钮显示隐藏导致的按钮数量不一致可根据需要独立封装TableActionComp
4. 列表多选悬浮展示在底部,顶部隐藏处理 【待处理】
## ProTable 固定列表
1. 固定表头 scroll={{ y: 500 }}
批量选择确认按钮固定,列表头内容固定
2. 批量选择 tableAlertOptionRender
配置多选操作选项区
## ProForm 表单

@ -1,3 +1,11 @@
/*
* @Author: zhoux zhouxia@supervision.ltd
* @Date: 2023-11-01 13:56:33
* @LastEditors: zhoux zhouxia@supervision.ltd
* @LastEditTime: 2023-11-03 14:24:30
* @FilePath: \general-ai-platform-web\src\locales\zh-CN\menu.ts
* @Description: ,`customMade`, koroFileHeader : https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
export default {
'menu.welcome': '欢迎',
'menu.more-blocks': '更多区块',
@ -60,5 +68,6 @@ export default {
'menu.list.system.dictionary-list': '字典列表',
'menu.list.system.department-list': '部门列表',
'menu.list.staff': '人力资源',
'menu.list.staff.employee-list': '员工列表'
'menu.list.staff.employee-list': '员工列表',
'menu.device.device-relation-list': '设备版本列表',
};

@ -1,19 +1,22 @@
import {ModalForm, ProForm, ProFormList, ProFormUploadButton} from '@ant-design/pro-components';
import {ProFormText, StepsForm, ProFormTreeSelect, ProFormUploadDragger} from '@ant-design/pro-components';
import { postDeviceGroupGetDeviceGroupTree } from '@/services/device/DeviceGroup';
import { postProjectCreateProject } from '@/services/project/Project';
import { postAlgorithmModelGetAlgorithmModelFkSelect } from '@/services/resource/AlgorithmModel';
import { beforeUploadFile } from '@/utils/common';
import { CloseOutlined, SnippetsOutlined } from '@ant-design/icons';
import type { ProFormInstance } from '@ant-design/pro-components';
import {postAlgorithmModelGetAlgorithmModelFkSelect} from "@/services/resource/AlgorithmModel";
import {ProFormSwitch} from '@ant-design/pro-components';
import {
ProForm,
ProFormList,
ProFormSwitch,
ProFormText,
ProFormUploadDragger,
StepsForm,
} from '@ant-design/pro-components';
import { FormattedMessage, useIntl } from '@umijs/max';
import {postProjectCreateProject, putProjectUpdateProjectGroup} from "@/services/project/Project";
import React, {useState, useRef, useEffect} from 'react';
import {Button, Form, message, Modal, Transfer, Tree} from 'antd';
import {Switch} from 'antd';
import { Modal, Switch, Transfer, Tree, message } from 'antd';
import type { TransferDirection } from 'antd/es/transfer';
import {DataNode} from "antd/es/tree";
import {postMenuGetMenuTree} from "@/services/system/Menu";
import {postDeviceGroupGetDeviceGroupTree} from "@/services/device/DeviceGroup";
import {CloseOutlined, SnippetsOutlined} from "@ant-design/icons";
import {beforeUploadFile, imageInit} from "@/utils/common";
import { DataNode } from 'antd/es/tree';
import React, { useEffect, useRef, useState } from 'react';
// @ts-ignore
import cookie from 'react-cookies';
interface RecordType {
@ -47,6 +50,11 @@ const waitTime = (time: number = 100) => {
});
};
/**styles 配置 */
const formContainerWidth: number = 755
const stepFormItemStyleProps: Record<string, any> = {
width: formContainerWidth,
};
const treeData1: any[] = [
{
@ -102,7 +110,6 @@ const treeData1: any[] = [
{ title: '0-0-1-0', key: '0-0-1-33' },
{ title: '0-0-1-1', key: '0-0-1-34' },
{ title: '0-0-1-2', key: '0-0-1-35' },
],
},
{
@ -126,13 +133,12 @@ const treeData1: any[] = [
},
];
const MyCreateForm: React.FC<CreateFormProps> = (props) => {
const [treeData, setTreeData] = React.useState<DataNode[]>([]);
const [modalData, setModalData] = useState<RecordType[]>([]);
const [targetKeys, setTargetKeys] = useState<string[]>([]);
const [selectKeys, setSelectKeys] = useState([]);
const [filePath, setFilePath] = useState('')
const [filePath, setFilePath] = useState('');
const [configData, setConfigData] = useState<ProjectConfig>({ params: [] });
const intl = useIntl();
const [isAuto, setIsAuto] = useState(true);
@ -147,10 +153,10 @@ const MyCreateForm: React.FC<CreateFormProps> = (props) => {
key: v.id,
title: v.name,
chosen: false,
}
})
};
});
setModalData(result);
})
});
// setMockData(tempMockData);
// setTargetKeys(tempTargetKeys);
};
@ -159,16 +165,18 @@ const MyCreateForm: React.FC<CreateFormProps> = (props) => {
setTargetKeys(newTargetKeys);
};
useEffect(() => {
setTargetKeys([])
setTargetKeys([]);
if (props.createModalOpen) {
getModelData();
postDeviceGroupGetDeviceGroupTree().then((resp: API.Response)=>{
setTreeData(resp.data.tree)
}).catch(()=>{})
postDeviceGroupGetDeviceGroupTree()
.then((resp: API.Response) => {
setTreeData(resp.data.tree);
})
.catch(() => {});
} else {
formRef.current?.resetFields()
formRef.current?.resetFields();
}
}, [props.createModalOpen])
}, [props.createModalOpen]);
const handleSearch = (dir: TransferDirection, value: string) => {
postAlgorithmModelGetAlgorithmModelFkSelect({ keyword: value }).then((res) => {
console.log(444, res);
@ -177,16 +185,18 @@ const MyCreateForm: React.FC<CreateFormProps> = (props) => {
key: v.id,
title: v.name,
chosen: false,
}
})
};
});
setModalData(result);
})
});
};
return (
<StepsForm<{
name: string;
}>
stepsProps={{}}
stepsProps={{
labelPlacement: 'vertical',
}}
current={current}
onCurrentChange={setCurrent}
onFinish={async () => {
@ -195,14 +205,16 @@ const MyCreateForm: React.FC<CreateFormProps> = (props) => {
formData.inferConfig = { models: targetKeys, params: configData?.params || [] };
formData.groupIds = selectKeys;
formData.projectFilePath = filePath;
postProjectCreateProject(formData).then(()=>{
message.success(intl.formatMessage({id: 'common.success', defaultMessage: '$$$'}))
postProjectCreateProject(formData)
.then(() => {
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '$$$' }));
props.handleModal();
props.reload()
}).catch(()=>{
message.error(intl.formatMessage({id: 'common.failure', defaultMessage: '$$$'}))
return false
props.reload();
})
.catch(() => {
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '$$$' }));
return false;
});
}
return true;
}}
@ -215,11 +227,11 @@ const MyCreateForm: React.FC<CreateFormProps> = (props) => {
return (
<Modal
title="分步表单"
width={1000}
width={803}
onCancel={() => {
setCurrent(0)
formRef.current?.resetFields()
formRef3.current?.resetFields()
setCurrent(0);
formRef.current?.resetFields();
formRef3.current?.resetFields();
props.handleModal();
}}
open={props.createModalOpen}
@ -231,7 +243,7 @@ const MyCreateForm: React.FC<CreateFormProps> = (props) => {
);
}}
>
{/* 创建项目数据 */}
<StepsForm.StepForm<{
name: string;
}>
@ -248,7 +260,18 @@ const MyCreateForm: React.FC<CreateFormProps> = (props) => {
}}
>
<ProForm.Group>
<ProFormText width="md" name="name" label={<FormattedMessage id="project.project.table.list.name" defaultMessage="$$$"/>} placeholder={`${intl.formatMessage({id: 'common.please_input', defaultMessage: '$$$'})}${intl.formatMessage({id: 'project.project.table.list.name', defaultMessage: '$$$'})}`} required={true}
<ProFormText
{...stepFormItemStyleProps}
name="name"
label={<FormattedMessage id="project.project.table.list.name" defaultMessage="$$$" />}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
})}${intl.formatMessage({
id: 'project.project.table.list.name',
defaultMessage: '$$$',
})}`}
required={true}
rules={[
{
required: true,
@ -261,8 +284,24 @@ const MyCreateForm: React.FC<CreateFormProps> = (props) => {
},
]}
/>
<ProFormText width="md" name="code" label={<FormattedMessage id="project.project.table.list.code" defaultMessage="$$$"/>} placeholder={`${intl.formatMessage({id: 'common.please_input', defaultMessage: '$$$'})}${intl.formatMessage({id: 'project.project.table.list.code', defaultMessage: '$$$'})}`} required={!isAuto} initialValue='' disabled={isAuto}
rules={isAuto?[]:[
<ProFormText
width={680}
name="code"
label={<FormattedMessage id="project.project.table.list.code" defaultMessage="$$$" />}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
})}${intl.formatMessage({
id: 'project.project.table.list.code',
defaultMessage: '$$$',
})}`}
required={!isAuto}
initialValue=""
disabled={isAuto}
rules={
isAuto
? []
: [
{
required: true,
message: (
@ -272,14 +311,29 @@ const MyCreateForm: React.FC<CreateFormProps> = (props) => {
/>
),
},
]}
addonAfter={<Switch
]
}
addonAfter={
<Switch
checked={isAuto}
checkedChildren={<FormattedMessage id="common.auto" defaultMessage="$$$" />}
unCheckedChildren={<FormattedMessage id="common.edit" defaultMessage="$$$" />}
onChange={setIsAuto}
/>}/>
<ProFormText width="md" name="info" label={<FormattedMessage id="project.project.table.list.info" defaultMessage="$$$"/>} placeholder={`${intl.formatMessage({id: 'common.please_input', defaultMessage: '$$$'})}${intl.formatMessage({id: 'project.project.table.list.info', defaultMessage: '$$$'})}`} required={true}
/>
}
/>
<ProFormText
{...stepFormItemStyleProps}
name="info"
label={<FormattedMessage id="project.project.table.list.info" defaultMessage="$$$" />}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
})}${intl.formatMessage({
id: 'project.project.table.list.info',
defaultMessage: '$$$',
})}`}
required={true}
rules={[
{
required: true,
@ -292,13 +346,32 @@ const MyCreateForm: React.FC<CreateFormProps> = (props) => {
},
]}
/>
<ProFormText width="md" name="remark" label={<FormattedMessage id="project.project.table.list.remark" defaultMessage="$$$"/>} placeholder={`${intl.formatMessage({id: 'common.please_input', defaultMessage: '$$$'})}${intl.formatMessage({id: 'project.project.table.list.remark', defaultMessage: '$$$'})}`} required={false}/>
<ProFormText
{...stepFormItemStyleProps}
name="remark"
label={<FormattedMessage id="project.project.table.list.remark" defaultMessage="$$$" />}
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
})}${intl.formatMessage({
id: 'project.project.table.list.remark',
defaultMessage: '$$$',
})}`}
required={false}
/>
</ProForm.Group>
<ProForm.Group>
<ProFormSwitch width="md" name="isEnable" label={<FormattedMessage id="project.project.table.list.isEnable" defaultMessage="$$$"/>} initialValue={true}/>
<ProFormSwitch
width="lg"
name="isEnable"
label={
<FormattedMessage id="project.project.table.list.isEnable" defaultMessage="$$$" />
}
initialValue={true}
/>
</ProForm.Group>
</StepsForm.StepForm>
{/* 关联算法模型 */}
<StepsForm.StepForm<{
model: string;
}>
@ -311,38 +384,56 @@ const MyCreateForm: React.FC<CreateFormProps> = (props) => {
return true;
}}
>
<Transfer
dataSource={modalData}
showSearch
titles={['未选模型', '已选模型']}
locale={{ itemUnit: '项', itemsUnit: '项', searchPlaceholder: '请输入搜索内容' }}
targetKeys={targetKeys}
onChange={handleChange}
onSearch={handleSearch}
style={{ marginBottom: '20px' }}
listStyle={{width: 289, height: 300}}
operationStyle={{width: 100, alignItems: 'center'}}
render={(item) => item.title}
/>
</StepsForm.StepForm>
{/* 上传业务代码 */}
<StepsForm.StepForm<{
project_file: string;
}>
name="project_file"
title="上传业务代码"
style={{width: stepFormItemStyleProps.width}}
stepProps={{
description: '上传业务代码格式为(.zip,.tar.gz)',
}}
onFinish={async (values: any) => {
if ('projectFilePath' in values && values['projectFilePath'].length > 0) {
let projectFilePath = values['projectFilePath'][0]?.response?.data?.path || ''
setFilePath(projectFilePath) }
let projectFilePath = values['projectFilePath'][0]?.response?.data?.path || '';
setFilePath(projectFilePath);
}
return true;
}}
>
<ProFormUploadDragger label="上传文件" name="projectFilePath" action="/api/v1/file/uploadFile" max={1}
fieldProps={{name: 'file', beforeUpload: beforeUploadFile, data: {path: 'project/files'},
headers: { 'X-CSRFToken': cookie.load('csrftoken') , Authorization: `Bearer ${localStorage.getItem('access') || ''}`},}}
<ProFormUploadDragger
label="上传文件"
name="projectFilePath"
action="/api/v1/file/uploadFile"
max={1}
fieldProps={{
name: 'file',
beforeUpload: beforeUploadFile,
data: { path: 'project/files' },
headers: {
'X-CSRFToken': cookie.load('csrftoken'),
Authorization: `Bearer ${localStorage.getItem('access') || ''}`,
},
}}
/>
</StepsForm.StepForm>
{/* 业务参数配置 */}
<StepsForm.StepForm<{
config: string;
}>
@ -352,11 +443,14 @@ const MyCreateForm: React.FC<CreateFormProps> = (props) => {
description: '业务参数配置',
}}
onFinish={async (values: any) => {
setConfigData(values)
setConfigData(values);
return true;
}}
>
{/* <Icon type="delete" /> */}
{/* TODO 图标需要替换 */}
<ProFormList
style={{width: stepFormItemStyleProps.width}}
copyIconProps={{
Icon: SnippetsOutlined,
}}
@ -365,17 +459,16 @@ const MyCreateForm: React.FC<CreateFormProps> = (props) => {
}}
name="params"
label="模型参数"
initialValue={[
]}
initialValue={[]}
>
<ProForm.Group>
<ProFormText key="name" name="name" label="键名" />
<ProFormText key="default" name="default" label="默认值" />
<ProFormText key="remark" name="remark" label="备注" />
</ProForm.Group>
</ProFormList>
</StepsForm.StepForm>
{/* 关联网点 */}
<StepsForm.StepForm<{
group: string;
}>
@ -387,8 +480,10 @@ const MyCreateForm: React.FC<CreateFormProps> = (props) => {
onFinish={async () => {
return true;
}}
style={{width: stepFormItemStyleProps.width}}
formRef={formRef3}
>
<div style={{paddingBottom: 10}}>{'选择网点'}</div>
<Tree
checkable
defaultExpandAll={true}
@ -396,7 +491,7 @@ const MyCreateForm: React.FC<CreateFormProps> = (props) => {
autoExpandParent={true}
onCheck={(checkedKeys: any) => {
// form.setFieldsValue({menuIds: checkedKeys})
setSelectKeys(checkedKeys)
setSelectKeys(checkedKeys);
// formRef3.current?.setFieldValue('groupIds', checkedKeys)
}}
treeData={treeData}
@ -406,6 +501,6 @@ const MyCreateForm: React.FC<CreateFormProps> = (props) => {
/>
</StepsForm.StepForm>
</StepsForm>
)
}
);
};
export default MyCreateForm;

@ -1,18 +1,17 @@
import {deleteProjectDeleteProject, postProjectGetProjectList, deleteProjectDeleteProjectByIds} from '@/services/project/Project';
import {
deleteProjectDeleteProject,
deleteProjectDeleteProjectByIds,
postProjectGetProjectList,
} from '@/services/project/Project';
import { PlusOutlined } from '@ant-design/icons';
import type { ActionType, ProColumns } from '@ant-design/pro-components';
import {
FooterToolbar,
PageContainer,
ProTable,
ProFormSelect,
} from '@ant-design/pro-components';
import { FormattedMessage, useIntl, useAccess, Access, history } from '@umijs/max';
import { FooterToolbar, PageContainer, ProTable } from '@ant-design/pro-components';
import { Access, FormattedMessage, history, useAccess, useIntl } from '@umijs/max';
import { Button, message } from 'antd';
import React, { useRef, useState } from 'react';
import { ColumnDrawer } from './components/ColumnDrawer';
import MyCreateForm from './components/MyCreateForm';
import UpdateForm from './components/UpdateForm';
import MyCreateForm from "./components/MyCreateForm";
import {ColumnDrawer} from "./components/ColumnDrawer";
const ProjectList: React.FC = () => {
/**
* @en-US Pop-up window of new window
@ -37,44 +36,43 @@ const ProjectList: React.FC = () => {
const handleUpdateModal = () => {
if (updateModalOpen) {
setUpdateModalOpen(false)
setCurrentRow(undefined)
setUpdateModalOpen(false);
setCurrentRow(undefined);
} else {
setUpdateModalOpen(true)
}
setUpdateModalOpen(true);
}
};
const handleCreateModal = () => {
if (createModalOpen) {
setCreateModalOpen(false)
setCurrentRow(undefined)
setCreateModalOpen(false);
setCurrentRow(undefined);
} else {
setCreateModalOpen(true)
}
setCreateModalOpen(true);
}
};
const handleColumnDrawer = () => {
if (showDetail) {
setShowDetail(false)
setCurrentRow(undefined)
setShowDetail(false);
setCurrentRow(undefined);
} else {
setShowDetail(true)
}
setShowDetail(true);
}
};
const handleDestroy = async (selectedRow: API.Project) => {
deleteProjectDeleteProject({id: selectedRow.id}).then(()=>{
message.success(intl.formatMessage({id: 'common.success', defaultMessage: '$$$'}))
actionRef.current?.reload()
}).catch(()=>{
message.error(intl.formatMessage({id: 'common.failure', defaultMessage: '$$$'}))
deleteProjectDeleteProject({ id: selectedRow.id })
.then(() => {
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '$$$' }));
actionRef.current?.reload();
})
.catch(() => {
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '$$$' }));
});
};
const columns: ProColumns<API.Project>[] = [
{
title: (<FormattedMessage
id="project.project.table.list.id"
defaultMessage="id"/>),
dataIndex: "id",
title: <FormattedMessage id="project.project.table.list.id" defaultMessage="id" />,
dataIndex: 'id',
sorter: true,
render: (dom, entity) => {
return (
@ -91,92 +89,72 @@ const columns: ProColumns<API.Project>[] = [
},
{
title: (<FormattedMessage
id="project.project.table.list.name"
defaultMessage="$$$"/>),
dataIndex: "name",
title: <FormattedMessage id="project.project.table.list.name" defaultMessage="$$$" />,
dataIndex: 'name',
hideInSearch: true,
},
{
title: (<FormattedMessage
id="project.project.table.list.code"
defaultMessage="$$$"/>),
dataIndex: "code",
title: <FormattedMessage id="project.project.table.list.code" defaultMessage="$$$" />,
dataIndex: 'code',
hideInSearch: true,
},
{
title: (<FormattedMessage
id="project.project.table.list.info"
defaultMessage="$$$"/>),
dataIndex: "info",
title: <FormattedMessage id="project.project.table.list.info" defaultMessage="$$$" />,
dataIndex: 'info',
hideInSearch: true,
},
{
title: (<FormattedMessage
id="project.project.table.list.inferConfig"
defaultMessage="$$$"/>),
dataIndex: "inferConfig",
title: <FormattedMessage id="project.project.table.list.inferConfig" defaultMessage="$$$" />,
dataIndex: 'inferConfig',
hideInSearch: true,
hideInTable: true,
hideInDescriptions: true,
},
{
title: (<FormattedMessage
id="project.project.table.list.isEnable"
defaultMessage="$$$"/>),
dataIndex: "isEnable",
filters: true, onFilter: true,
title: <FormattedMessage id="project.project.table.list.isEnable" defaultMessage="$$$" />,
dataIndex: 'isEnable',
filters: true,
onFilter: true,
hideInSearch: true,
valueType: 'switch',
},
{
title: (<FormattedMessage
id="project.project.table.list.remark"
defaultMessage="$$$"/>),
dataIndex: "remark",
title: <FormattedMessage id="project.project.table.list.remark" defaultMessage="$$$" />,
dataIndex: 'remark',
hideInSearch: true,
},
{
title: (<FormattedMessage
id="project.project.table.list.createTime"
defaultMessage="$$$"/>),
dataIndex: "createTime",
title: <FormattedMessage id="project.project.table.list.createTime" defaultMessage="$$$" />,
dataIndex: 'createTime',
sorter: true,
hideInSearch: true,
valueType: 'dateTime',
},
{
title: (<FormattedMessage
id="project.project.table.list.updateTime"
defaultMessage="$$$"/>),
dataIndex: "updateTime",
title: <FormattedMessage id="project.project.table.list.updateTime" defaultMessage="$$$" />,
dataIndex: 'updateTime',
sorter: true,
hideInSearch: true,
valueType: 'dateTime',
},
{
title: <FormattedMessage id="pages.searchTable.titleOption" defaultMessage="Operating" />,
dataIndex: 'option',
valueType: 'option',
fixed: 'right',
render: (_, record) => [
<Access accessible={access.canUpdate(history.location.pathname)} key={`${history.location.pathname}-add`}>
<Access
accessible={access.canUpdate(history.location.pathname)}
key={`${history.location.pathname}-add`}
>
<a
key="update"
onClick={() => {
@ -189,16 +167,15 @@ const columns: ProColumns<API.Project>[] = [
<a
key="destroy"
onClick={() => {
handleDestroy(record).then(()=>{})
}}>
<FormattedMessage
id="pages.searchTable.destroy"
defaultMessage="Destroy"
/>
handleDestroy(record).then(() => {});
}}
>
<FormattedMessage id="pages.searchTable.destroy" defaultMessage="Destroy" />
</a>
</Access>
</Access>,
],
},];
},
];
return (
<PageContainer>
<ProTable<API.Project>
@ -212,20 +189,20 @@ return (
search={{
labelWidth: 120,
}}
onDataSourceChange={(data)=>{
}}
onDataSourceChange={() => {}}
pagination={{
showSizeChanger: true,
pageSize: 10,
}}
columnsState={{
persistenceKey: 'project_list',
persistenceType: 'localStorage'
persistenceType: 'localStorage',
}}
toolBarRender={() => [
<Access accessible={access.canUpdate(history.location.pathname)} key={`${history.location.pathname}-add`}>
<Access
accessible={access.canUpdate(history.location.pathname)}
key={`${history.location.pathname}-add`}
>
<Button
type="primary"
key="primary"
@ -235,32 +212,31 @@ return (
>
<PlusOutlined /> <FormattedMessage id="pages.searchTable.new" defaultMessage="New" />
</Button>
</Access>
</Access>,
]}
request={async (params = {}, sort) => {
const {current, ...rest} = params
const { current, ...rest } = params;
const reqParams = {
page: current,
desc: false,
orderKey: "",
orderKey: '',
...rest,
}
};
if (sort && Object.keys(sort).length) {
reqParams.orderKey = Object.keys(sort)[0]
let sort_select = sort[reqParams.orderKey]
reqParams.orderKey = Object.keys(sort)[0];
let sort_select = sort[reqParams.orderKey];
reqParams.desc = sort_select === 'descend';
}
let resp = await postProjectGetProjectList({...reqParams})
let resp = await postProjectGetProjectList({ ...reqParams });
return {
data: resp.data.list.map((v: API.Project) => {
return {...v, key: v.id}
return { ...v, key: v.id };
}),
success: resp.success,
total: resp.data.total,
current: resp.data.page,
pageSize: resp.data.pageSize
pageSize: resp.data.pageSize,
};
}}
columns={columns}
rowSelection={{
@ -281,9 +257,13 @@ return (
>
<Button
onClick={async () => {
deleteProjectDeleteProjectByIds({ids: selectedRowsState.map((v: API.Project)=>{return v.id as number})}).then(()=>{
deleteProjectDeleteProjectByIds({
ids: selectedRowsState.map((v: API.Project) => {
return v.id as number;
}),
}).then(() => {
actionRef.current?.reloadAndRest?.();
})
});
}}
>
<FormattedMessage
@ -312,7 +292,6 @@ return (
columns={columns}
currentRow={currentRow}
/>
</PageContainer>
);
};

@ -0,0 +1,493 @@
import { ColumnDrawer as ModelCategoryColumnDrawer } from '@/pages/Resource/ModelCategoryList/components/ColumnDrawer';
import { ModelCategoryColumns } from '@/pages/Resource/ModelCategoryList/components/Columns';
import {
deleteAlgorithmModelDeleteAlgorithmModel,
deleteAlgorithmModelDeleteAlgorithmModelByIds,
postAlgorithmModelGetAlgorithmModelList,
} from '@/services/resource/AlgorithmModel';
import {
postModelCategoryGetModelCategoryById,
postModelCategoryGetModelCategoryFkSelect,
postModelCategoryGetModelCategoryNames,
} from '@/services/resource/ModelCategory';
import { ExclamationCircleOutlined, PlusOutlined } from '@ant-design/icons';
import type { ActionType, ProColumns } from '@ant-design/pro-components';
import { PageContainer, ProFormSelect, ProFormText, ProTable } from '@ant-design/pro-components';
import { Access, FormattedMessage, history, useAccess, useIntl } from '@umijs/max';
import { Button, Modal, Popconfirm, message } from 'antd';
import React, { useRef, useState } from 'react';
import { ColumnDrawer } from './components/ColumnDrawer';
import CreateForm from './components/CreateForm';
import UpdateForm from './components/UpdateForm';
const AlgorithmModelList: React.FC = () => {
/**
* @en-US Pop-up window of new window
* @zh-CN
* */
const [createModalOpen, setCreateModalOpen] = useState<boolean>(false);
/**
* @en-US The pop-up window of the distribution update window
* @zh-CN
* */
const [updateModalOpen, setUpdateModalOpen] = useState<boolean>(false);
const [showDetail, setShowDetail] = useState<boolean>(false);
/**
* @en-US International configuration
* @zh-CN
* */
const access = useAccess();
const intl = useIntl();
const actionRef = useRef<ActionType>();
// TODO 动态设置每页数量
const [currentPageSize, setCurrentPageSize] = useState<number>(10);
const [currentRow, setCurrentRow] = useState<API.AlgorithmModel>();
const [selectedRowsState, setSelectedRows] = useState<API.AlgorithmModel[]>([]);
const [category_fk_id_open, set_category_fk_id_open] = useState(false);
const [category_fk_id, set_category_fk_id] = useState<API.ModelCategory>();
const [category_fk_id_column_open, set_category_fk_id_column_open] = useState(false);
const [categoryFkIdIds, setCategoryFkIdIds] = useState([]);
const [categoryFkIdMap, setCategoryFkIdMap] = useState<{ [key: number]: string }>({});
const handle_category_fk_id = (id: any) => {
if (category_fk_id_open) {
set_category_fk_id(undefined);
set_category_fk_id_open(false);
} else {
postModelCategoryGetModelCategoryById({ id: id }).then((resp) => {
set_category_fk_id(resp.data.modelCategory);
set_category_fk_id_open(true);
});
}
};
const handle_category_fk_id_column_open = () => {
if (category_fk_id_column_open) {
set_category_fk_id_column_open(false);
} else {
postModelCategoryGetModelCategoryNames({ ids: categoryFkIdIds }).then((resp) => {
let a: any = {};
resp.data.list.forEach((v: any) => {
if (v.id) {
a[v.id] = v.name;
}
});
setCategoryFkIdMap(a);
});
set_category_fk_id_column_open(true);
}
};
const handleUpdateModal = () => {
if (updateModalOpen) {
setUpdateModalOpen(false);
setCurrentRow(undefined);
} else {
setUpdateModalOpen(true);
}
};
const handleCreateModal = () => {
if (createModalOpen) {
setCreateModalOpen(false);
setCurrentRow(undefined);
} else {
setCreateModalOpen(true);
}
};
const handleColumnDrawer = () => {
if (showDetail) {
setShowDetail(false);
setCurrentRow(undefined);
} else {
setShowDetail(true);
}
};
const handleDestroy = async (selectedRow: API.AlgorithmModel) => {
deleteAlgorithmModelDeleteAlgorithmModel({ id: selectedRow.id })
.then(() => {
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '$$$' }));
actionRef.current?.reload();
})
.catch(() => {
message.error(intl.formatMessage({ id: 'common.failure', defaultMessage: '$$$' }));
});
};
const columns: ProColumns<API.AlgorithmModel>[] = [
{
title: <FormattedMessage id="resource.algorithm_model.table.list.id" defaultMessage="id" />,
dataIndex: 'id',
sorter: true,
render: (dom, entity) => {
return (
<a
onClick={() => {
setCurrentRow(entity);
setShowDetail(true);
}}
>
{dom}
</a>
);
},
//TODO 默认使用renderFormItem update1101
renderFormItem: () => {
return (
<>
<ProFormText
width="md"
labelCol={{ span: 4 }}
wrapperCol={{ span: 22 }}
name="id"
placeholder={`${intl.formatMessage({
id: 'common.please_input',
defaultMessage: '$$$',
})}`}
required={false}
/>
</>
);
},
},
{
title: (
<FormattedMessage id="resource.algorithm_model.table.list.name" defaultMessage="$$$" />
),
dataIndex: 'name',
hideInSearch: true,
},
{
title: (
<FormattedMessage
id="resource.algorithm_model.table.list.categoryFkId"
defaultMessage="$$$"
/>
),
dataIndex: 'categoryFkId',
hideInSearch: false,
render: (text, record) => {
if (category_fk_id_column_open) {
return (
<a
onClick={() => {
handle_category_fk_id(record.categoryFkId);
}}
>
{record?.categoryFkId ? categoryFkIdMap[record.categoryFkId] : undefined}
</a>
);
} else {
return (
<a
onClick={() => {
handle_category_fk_id(record.categoryFkId);
}}
>
{record.categoryFkId}
</a>
);
}
},
renderFormItem: () => {
return (
// value 和 onchange 会通过 form 自动注入。
<ProFormSelect
width="md"
labelCol={{ span: 4 }}
wrapperCol={{ span: 22 }}
placeholder={`${intl.formatMessage({
id: 'common.please_select',
defaultMessage: '$$$',
})}`}
required={false}
showSearch
debounceTime={1000}
request={async (keyWord) => {
const resp = await postModelCategoryGetModelCategoryFkSelect({
keyword: keyWord?.keyWords || '',
});
return resp.data.list.map((v: any) => {
return {
label: v.name,
value: v.id,
};
});
}}
/>
);
},
},
{
title: (
<FormattedMessage
id="resource.algorithm_model.table.list.defaultVersionFkId"
defaultMessage="$$$"
/>
),
dataIndex: 'defaultVersionFkId',
hideInSearch: true,
},
{
title: (
<FormattedMessage id="resource.algorithm_model.table.list.remark" defaultMessage="$$$" />
),
dataIndex: 'remark',
hideInSearch: true,
},
{
title: (
<FormattedMessage
id="resource.algorithm_model.table.list.createTime"
defaultMessage="$$$"
/>
),
dataIndex: 'createTime',
sorter: true,
hideInSearch: true,
valueType: 'dateTime',
},
{
title: (
<FormattedMessage
id="resource.algorithm_model.table.list.updateTime"
defaultMessage="$$$"
/>
),
dataIndex: 'updateTime',
sorter: true,
hideInSearch: true,
valueType: 'dateTime',
},
{
title: <FormattedMessage id="pages.searchTable.titleOption" defaultMessage="Operating" />,
dataIndex: 'option',
valueType: 'option',
fixed: 'right',
render: (_, record) => [
<Access
accessible={access.canUpdate(history.location.pathname)}
key={`${history.location.pathname}-add`}
>
<a
key="update"
onClick={() => {
setUpdateModalOpen(true);
setCurrentRow(record);
}}
>
<FormattedMessage id="pages.searchTable.update" defaultMessage="Update" />
</a>
{/* update1101 */}
<Popconfirm
placement="topLeft"
title={'提示'}
description={`确认要删除么?`}
okText="确定"
cancelText="取消"
onConfirm={() => {
handleDestroy(record).then(() => {});
}}
>
<Button key="destroy" type="text" danger>
<FormattedMessage id="pages.searchTable.destroy" defaultMessage="Destroy" />
</Button>
</Popconfirm>
</Access>,
],
},
];
return (
<PageContainer>
<ProTable<API.AlgorithmModel>
headerTitle={intl.formatMessage({
id: 'pages.searchTable.title',
defaultMessage: '$$$',
})}
scroll={{ y: 500 }}
options={{ fullScreen: true, setting: true, density: true, reload: true }}
actionRef={actionRef}
rowKey="key"
search={{
labelWidth: 120,
}}
onDataSourceChange={(data) => {
let CategoryFkIdIds: any = data.map((v) => {
return v.categoryFkId;
});
setCategoryFkIdIds(CategoryFkIdIds);
}}
pagination={{
showSizeChanger: true,
pageSize: currentPageSize,
onChange: (page, pageSize) => setCurrentPageSize(pageSize),
}}
columnsState={{
persistenceKey: 'algorithm_model_list',
persistenceType: 'localStorage',
}}
tableAlertOptionRender={() => {
return (
<>
{selectedRowsState?.length > 0 && (
<Button
danger
onClick={async () => {
Modal.confirm({
icon: <ExclamationCircleOutlined />,
title: "确定要删除此模型吗?",
content: ("确定删除这个模型吗,删除后将无法找回,请谨慎操作"),
cancelText: '',
onOk() {
// TODO 未对接批量删除接口
deleteAlgorithmModelDeleteAlgorithmModelByIds({
ids: selectedRowsState.map((v: API.AlgorithmModel) => {
return v.id as number;
}),
}).then(() => {
actionRef.current?.reloadAndRest?.();
});
},
onCancel() {
console.log('Cancel');
},
});
}}
>
<FormattedMessage
id="pages.searchTable.batchDeletion"
defaultMessage="Batch deletion"
/>
</Button>
)}
</>
);
}}
toolBarRender={() => [
<Access
accessible={access.canUpdate(history.location.pathname)}
key={`${history.location.pathname}-add`}
>
<Button
type="primary"
key="category_fk_id_show"
onClick={() => {
handle_category_fk_id_column_open();
}}
>
{category_fk_id_column_open ? (
<FormattedMessage id="common.hide" defaultMessage="$$$" />
) : (
<FormattedMessage id="common.show" defaultMessage="$$$" />
)}
<FormattedMessage
id="resource.algorithm_model.table.list.categoryFkId"
defaultMessage="$$$"
/>
</Button>
<Button
type="primary"
key="primary"
onClick={() => {
setCreateModalOpen(true);
}}
>
<PlusOutlined /> <FormattedMessage id="pages.searchTable.new" defaultMessage="New" />
</Button>
</Access>,
]}
request={async (params = {}, sort) => {
const { current, ...rest } = params;
const reqParams = {
page: current,
desc: false,
orderKey: '',
...rest,
};
if (sort && Object.keys(sort).length) {
reqParams.orderKey = Object.keys(sort)[0];
let sort_select = sort[reqParams.orderKey];
reqParams.desc = sort_select === 'descend';
}
let resp = await postAlgorithmModelGetAlgorithmModelList({ ...reqParams });
return {
data: resp.data.list.map((v: API.AlgorithmModel) => {
return { ...v, key: v.id };
}),
success: resp.success,
total: resp.data.total,
current: resp.data.page,
pageSize: resp.data.pageSize,
};
}}
columns={columns}
rowSelection={{
onChange: (_, selectedRows) => {
setSelectedRows(selectedRows);
},
}}
/>
{/* TODO 不明显需要重新设计 底部已选项操作固定栏 */}
{/* {selectedRowsState?.length > 0 && (
<FooterToolbar
extra={
<div>
<FormattedMessage id="pages.searchTable.chosen" defaultMessage="Chosen" />{' '}
<a style={{ fontWeight: 600 }}>{selectedRowsState.length}</a>{' '}
<FormattedMessage id="pages.searchTable.item" defaultMessage="$$$" />
</div>
}
>
<Button
onClick={async () => {
deleteAlgorithmModelDeleteAlgorithmModelByIds({
ids: selectedRowsState.map((v: API.AlgorithmModel) => {
return v.id as number;
}),
}).then(() => {
actionRef.current?.reloadAndRest?.();
});
}}
>
<FormattedMessage
id="pages.searchTable.batchDeletion"
defaultMessage="Batch deletion"
/>
</Button>
</FooterToolbar>
)} */}
{/* 列表关联操作项组件 */}
<CreateForm
createModalOpen={createModalOpen}
values={currentRow || {}}
handleModal={handleCreateModal}
reload={actionRef.current?.reload}
/>
<UpdateForm
updateModalOpen={updateModalOpen}
values={currentRow || {}}
handleModal={handleUpdateModal}
reload={actionRef.current?.reload}
/>
<ColumnDrawer
handleDrawer={handleColumnDrawer}
isShowDetail={showDetail}
columns={columns}
currentRow={currentRow}
/>
<ModelCategoryColumnDrawer
handleDrawer={handle_category_fk_id}
isShowDetail={category_fk_id_open}
columns={ModelCategoryColumns}
currentRow={category_fk_id}
/>
</PageContainer>
);
};
export default AlgorithmModelList;

@ -10,7 +10,7 @@ import {
postModelCategoryGetModelCategoryFkSelect,
postModelCategoryGetModelCategoryNames,
} from '@/services/resource/ModelCategory';
import { PlusOutlined } from '@ant-design/icons';
import { ExclamationCircleOutlined, PlusOutlined } from '@ant-design/icons';
import type { ActionType, ProColumns } from '@ant-design/pro-components';
import {
FooterToolbar,
@ -20,7 +20,7 @@ import {
ProTable,
} from '@ant-design/pro-components';
import { Access, FormattedMessage, history, useAccess, useIntl } from '@umijs/max';
import { Button, Popconfirm, message } from 'antd';
import { Button, Modal, Popconfirm, message } from 'antd';
import React, { useRef, useState } from 'react';
import { ColumnDrawer } from './components/ColumnDrawer';
import {ModelVersionListDrawer} from "./components/ModelVersionListDrawer";
@ -324,6 +324,7 @@ const AlgorithmModelList: React.FC = () => {
id: 'pages.searchTable.title',
defaultMessage: '$$$',
})}
scroll={{ y: 500 }}
options={{ fullScreen: true, setting: true, density: true, reload: true }}
actionRef={actionRef}
rowKey="key"
@ -345,6 +346,44 @@ const AlgorithmModelList: React.FC = () => {
persistenceKey: 'algorithm_model_list',
persistenceType: 'localStorage',
}}
tableAlertOptionRender={() => {
return (
<>
{selectedRowsState?.length > 0 && (
<Button
danger
onClick={async () => {
Modal.confirm({
icon: <ExclamationCircleOutlined />,
title: "确定要删除此模型吗?",
content: ("确定删除这个模型吗,删除后将无法找回,请谨慎操作"),
cancelText: '',
onOk() {
// TODO 未对接批量删除接口
deleteAlgorithmModelDeleteAlgorithmModelByIds({
ids: selectedRowsState.map((v: API.AlgorithmModel) => {
return v.id as number;
}),
}).then(() => {
actionRef.current?.reloadAndRest?.();
});
},
onCancel() {
console.log('Cancel');
},
});
}}
>
<FormattedMessage
id="pages.searchTable.batchDeletion"
defaultMessage="Batch deletion"
/>
</Button>
)}
</>
);
}}
toolBarRender={() => [
<Access
accessible={access.canUpdate(history.location.pathname)}
@ -410,35 +449,6 @@ const AlgorithmModelList: React.FC = () => {
},
}}
/>
{/* TODO 不明显需要重新设计 底部已选项操作固定栏 */}
{selectedRowsState?.length > 0 && (
<FooterToolbar
extra={
<div>
<FormattedMessage id="pages.searchTable.chosen" defaultMessage="Chosen" />{' '}
<a style={{ fontWeight: 600 }}>{selectedRowsState.length}</a>{' '}
<FormattedMessage id="pages.searchTable.item" defaultMessage="$$$" />
</div>
}
>
<Button
onClick={async () => {
deleteAlgorithmModelDeleteAlgorithmModelByIds({
ids: selectedRowsState.map((v: API.AlgorithmModel) => {
return v.id as number;
}),
}).then(() => {
actionRef.current?.reloadAndRest?.();
});
}}
>
<FormattedMessage
id="pages.searchTable.batchDeletion"
defaultMessage="Batch deletion"
/>
</Button>
</FooterToolbar>
)}
{/* 列表关联操作项组件 */}
<CreateForm
createModalOpen={createModalOpen}

@ -148,8 +148,8 @@ const ModelVersionList: React.FC = () => {
});
return (
<>
{prevActions.map((item) => {
return <>{item}</>;
{prevActions.map((item,index) => {
return <div key={index}>{item}</div>;
})}
<Dropdown menu={{items: moreActions}}>
<a><DownOutlined/></a>

Loading…
Cancel
Save