Commit 8003468f authored by wuyongsheng's avatar wuyongsheng

feat: 添加下拉列表

parent 8a43ce98
......@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-06-13 09:56:57
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-10-27 11:23:23
* @LastEditTime: 2023-02-15 16:45:58
* @FilePath: /bkunyun/src/api/api_manager.ts
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -62,6 +62,7 @@ const RESTAPI = {
API_WORKFLOWSPEC_DETAIL:`${BACKEND_API_URI_PREFIX}/cpp/workbench/workflowspec`, // 删除模板
API_OPERATOR_DETAILS:`${BACKEND_API_URI_PREFIX}/cpp/workflow/actorspec/detail`, // 获取算子详情
API_RESOURCE_OPERATOR_LIST:`${BACKEND_API_URI_PREFIX}/cpp/workflow/actorspecs/list`, // 获取算子列表
API_STREAM_ACTOR_PARAMETERS:`${BACKEND_API_URI_PREFIX}/cpp/workflow/getStreamActorParameters`, // 获取环境配置参数
};
export default RESTAPI;
......@@ -318,7 +318,7 @@ const saveBatchActor = (params: saveBatchParams) => {
});
};
// 获取项目成员
// 通过应用环境获取参数列表
const fetchProjectUsersList = (params: {id: string}) => {
return request({
url: Api.API_PROJECT_USERS_LIST,
......@@ -328,6 +328,16 @@ const fetchProjectUsersList = (params: {id: string}) => {
};
// 获取项目成员
const getStreamActorParameters = (params: {envId?: string}) => {
return request({
url: Api.API_STREAM_ACTOR_PARAMETERS,
method: "get",
params,
});
};
// 修改项目成员信息
const addProjectUser = (id: string, params: any) => {
return request({
......@@ -383,5 +393,6 @@ export {
fetchProjectUsersList,
addProjectUser,
fetchProjectPower,
getHardwreList
getHardwreList,
getStreamActorParameters
};
......@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2021-12-04 15:46:25
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-10-24 17:39:24
* @LastEditTime: 2023-02-15 17:58:11
* @FilePath: /lionet-slb-pc/src/components/SearchView/components/Collapse.tsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -225,7 +225,7 @@ export default function MySelect(props: IProps) {
size="small"
multiple={multiple}
{...other}
value={value || insideValue || ""}
value={value !== undefined ? value : insideValue || ""}
onChange={handleChange}
>
{options.length
......
......@@ -13,6 +13,7 @@ type IDownloadProps = {
path: string;
name: string;
selectIds: Array<any>;
isPoses: boolean;
open: boolean;
setOpen: any;
};
......@@ -33,6 +34,7 @@ const Download = (props: IDownloadProps) => {
token,
fileToken,
selectIds,
isPoses,
name,
open,
setOpen,
......@@ -60,8 +62,19 @@ const Download = (props: IDownloadProps) => {
label: "MOL2",
value: "MOL2",
},
{
label: "PDBQT",
value: "PDBQT",
},
];
if(isPoses) {
options.push({
label: "PDBQT(DOCKING POSES)",
value: "POSES",
})
}
const handleChange = (e: any) => {
setDownloadType(e);
};
......
......@@ -54,6 +54,7 @@ const SeeDataset = observer((props: ISeeDatasetProps) => {
field: null,
order: null,
});
const [isPoses, setIsPoses] = useState<boolean>(false)
const [querylist, setQuerylist] = useState<Array<IQuery>>([]); // 高级筛选
const [queryInit, setQueryInit] = useState<IQuery>({
// 高级筛选初始化数据
......@@ -83,6 +84,12 @@ const SeeDataset = observer((props: ISeeDatasetProps) => {
}
};
useEffect(()=>{
if(list?.length) {
setIsPoses(!!list[0]?.poses)
}
},[list])
// 页码改变
const pageChange = (value: number) => {
getList(value - 1);
......@@ -516,6 +523,7 @@ const SeeDataset = observer((props: ISeeDatasetProps) => {
)}
{downloadOpen && (
<Download
isPoses={isPoses}
type={productId as string}
projectId={projectId}
token={token}
......
......@@ -2,7 +2,7 @@
* @Author: 吴永生 15770852798@163.com
* @Date: 2022-10-18 16:12:55
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-11-04 15:07:53
* @LastEditTime: 2023-02-15 18:20:05
* @FilePath: /bkunyun/src/views/ResourceCenter/UserResources/WorkflowOperator/components/AddOperator/index.tsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -30,7 +30,7 @@ import {
getOperatorDetail,
saveOperator,
} from "@/api/resourceCenter";
import { IOperatorAddFormData } from "../../interface";
import { IOperatorAddFormData, IEnvParameters } from "../../interface";
import {
checkFormData,
checkParamsConfig,
......@@ -43,7 +43,7 @@ import flowOperator from "@/assets/resourceCenter/flowOperator.svg";
import { useMessage } from "@/components/MySnackbar";
import CloseIcon from "@mui/icons-material/Close";
import useCheckOperator from "@/views/CustomOperator/useCheckOperator";
import { saveBatchActor } from "@/api/project_api";
import { saveBatchActor, getStreamActorParameters } from "@/api/project_api";
import positionTransform from "@/views/CustomOperator/utils";
import MyTooltip from "@/components/mui/MyTooltip";
......@@ -87,7 +87,8 @@ const AddOperator = observer((props: IAddOperator) => {
const [parametersError, setParametersError] = useState<string>("");
/** 流程编排错误提示 */
const [flowParametersError, setFlowParametersError] = useState<string>("");
/** 流选择环境参数 */
const [envParameters, setEnvParameters] = useState<IEnvParameters>()
/** 运行脚本 */
const [command, setCommand] = useState<string>("");
......@@ -124,6 +125,18 @@ const AddOperator = observer((props: IAddOperator) => {
[formData]
);
useEffect(()=>{
if(!formData.envId || taskType === 'BATCH') return
getStreamActorParameters({envId:formData.envId}).then(({data })=>{
setEnvParameters({
path: data.path || '',
actorClass: data.actorClass || '',
name: data.name || '',
});
setCode(JSON.stringify(data?.parameters, null, "\t"));
})
},[formData.envId])
/** 获取算子详情 */
const { run: fetchOperatorDetail } = useMyRequest(getOperatorDetail, {
onSuccess: (res: any) => {
......@@ -312,6 +325,7 @@ const AddOperator = observer((props: IAddOperator) => {
? operatorList
: newParameters,
type: taskType,
...(taskType === 'FLOW' ? envParameters : {})
};
/** 基于流算子没有应用环境字段 */
......@@ -355,7 +369,6 @@ const AddOperator = observer((props: IAddOperator) => {
} catch (err) {
console.log(err);
}
console.log(newText, "newText");
return <pre>{newText}</pre>;
}, [code]);
......@@ -370,6 +383,8 @@ const AddOperator = observer((props: IAddOperator) => {
active={taskType}
setActive={(e: "BATCH" | "FLOW") => {
setBatchBuildType("ENVIRONMENT");
setFormData({ ...formData, envId: '' });
setCode(JSON.stringify(initCode, null, "\t"));
setTaskType(e);
}}
goBack={() => setPageType("")}
......
......@@ -2,7 +2,7 @@
* @Author: 吴永生 15770852798@163.com
* @Date: 2022-10-20 17:36:14
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-11-02 13:51:42
* @LastEditTime: 2023-02-15 17:23:07
* @FilePath: /bkunyun/src/views/ResourceCenter/UserResources/WorkflowOperator/components/AddOperator/utils.ts
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -114,7 +114,7 @@ export const checkParamsConfig = (val: string) => {
if( !['PATH','DATASET','FILE','INPUT','SELECT','MULTIPLESELECT','RADIO','CHECKBOX'].includes(item?.domType )){
result.push(`domType: ${item?.domType}`)
}
if( !['in', 'out', 'basis', 'senior'].includes(item?.parameterGroup )){
if( !['in', 'out', 'basis', 'senior', 'hardware'].includes(item?.parameterGroup )){
result.push(`parameterGroup: ${item?.parameterGroup}`)
}
})
......
......@@ -2,7 +2,7 @@
* @Author: 吴永生 15770852798@163.com
* @Date: 2022-10-19 20:50:18
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-11-01 14:45:41
* @LastEditTime: 2023-02-15 18:17:06
* @FilePath: /bkunyun/src/views/ResourceCenter/UserResources/WorkflowOperator/interface.ts
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -41,3 +41,9 @@ export interface IOperatorAddFormData {
envId?: string;
parameters?: any
}
export interface IEnvParameters {
name?: string;
actorClass?: string;
path?: string;
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment