Skip to content

B
bkunyun
Commit 382d066d authored by wuyongsheng's avatar wuyongsheng
Browse files
Options

feat: 接口调整

parent c90ef8bf
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 73 deletions
src/api/api_manager.ts
View file @ 382d066d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-06-13 09:56:57 * @Date: 2022-06-13 09:56:57
* @LastEditors: 吴永生 15770852798@163.com * @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-10-26 18:28:43 * @LastEditTime: 2022-10-27 11:23:23
* @FilePath: /bkunyun/src/api/api_manager.ts * @FilePath: /bkunyun/src/api/api_manager.ts
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
...@@ -38,7 +38,7 @@ const RESTAPI = { ...@@ -38,7 +38,7 @@ const RESTAPI = {
API_WORKBENCH_CANCEL_WORKFLOWJOB: `${BACKEND_API_URI_PREFIX}/cpp/workflow/cancel`, //取消工作流 API_WORKBENCH_CANCEL_WORKFLOWJOB: `${BACKEND_API_URI_PREFIX}/cpp/workflow/cancel`, //取消工作流
API_SUBMIT_WORKFLOW: `${BACKEND_API_URI_PREFIX}/cpp/workflow/submit`, //提交工作流 API_SUBMIT_WORKFLOW: `${BACKEND_API_URI_PREFIX}/cpp/workflow/submit`, //提交工作流
API_WORKBENCH_WORKFLOW_TASKINFO: `${BACKEND_API_URI_PREFIX}/cpp/workbench/workflowjob/task-info`, //查询任务某个算子详情 API_WORKBENCH_WORKFLOW_TASKINFO: `${BACKEND_API_URI_PREFIX}/cpp/workbench/workflowjob/task-info`, //查询任务某个算子详情
API_OPERATOR_LIST:`${BACKEND_API_URI_PREFIX}/cpp/workflow/actorspecs/list`, // 获取算子列表 API_OPERATOR_LIST:`${BACKEND_API_URI_PREFIX}/cpp/workflow/actorspecs`, // 获取算子列表
API_VERSION_OPERATOR:`${BACKEND_API_URI_PREFIX}/cpp/workflow/actorversion`, // 获取指定版本算子 API_VERSION_OPERATOR:`${BACKEND_API_URI_PREFIX}/cpp/workflow/actorversion`, // 获取指定版本算子
API_SAVE_USERSPEC:`${BACKEND_API_URI_PREFIX}/cpp/workflow/saveuserspec`, // 保存用户自定义工作流模板 API_SAVE_USERSPEC:`${BACKEND_API_URI_PREFIX}/cpp/workflow/saveuserspec`, // 保存用户自定义工作流模板
API_OVERVIEW_GET:`${BACKEND_API_URI_PREFIX}/cpp/basicInformation`, // 获取概览基本信息 API_OVERVIEW_GET:`${BACKEND_API_URI_PREFIX}/cpp/basicInformation`, // 获取概览基本信息
...@@ -61,6 +61,7 @@ const RESTAPI = { ...@@ -61,6 +61,7 @@ const RESTAPI = {
API_WORKFLOWSPEC_DELETE:`${BACKEND_API_URI_PREFIX}/cpp/workbench/workflowspec/delete`, // 删除模板 API_WORKFLOWSPEC_DELETE:`${BACKEND_API_URI_PREFIX}/cpp/workbench/workflowspec/delete`, // 删除模板
API_WORKFLOWSPEC_DETAIL:`${BACKEND_API_URI_PREFIX}/cpp/workbench/workflowspec`, // 删除模板 API_WORKFLOWSPEC_DETAIL:`${BACKEND_API_URI_PREFIX}/cpp/workbench/workflowspec`, // 删除模板
API_OPERATOR_DETAILS:`${BACKEND_API_URI_PREFIX}/cpp/workflow/actorspec/detail`, // 获取算子详情 API_OPERATOR_DETAILS:`${BACKEND_API_URI_PREFIX}/cpp/workflow/actorspec/detail`, // 获取算子详情
API_RESOURCE_OPERATOR_LIST:`${BACKEND_API_URI_PREFIX}/cpp/workflow/actorspecs/list`, // 获取算子列表
}; };
export default RESTAPI; export default RESTAPI;
src/api/resourceCenter.ts
View file @ 382d066d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴永生 15770852798@163.com * @Author: 吴永生 15770852798@163.com
* @Date: 2022-10-19 17:09:23 * @Date: 2022-10-19 17:09:23
* @LastEditors: 吴永生 15770852798@163.com * @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-10-26 19:07:50 * @LastEditTime: 2022-10-27 11:23:29
* @FilePath: /bkunyun/src/api/resourceCenter.ts * @FilePath: /bkunyun/src/api/resourceCenter.ts
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
...@@ -82,7 +82,7 @@ const deleteActorenv = (params: {id: string}) => { ...@@ -82,7 +82,7 @@ const deleteActorenv = (params: {id: string}) => {
// 获取算子列表 // 获取算子列表
const getOperatorList = (params: IOperatorListParams) => { const getOperatorList = (params: IOperatorListParams) => {
return request({ return request({
url: Api.API_OPERATOR_LIST, url: Api.API_RESOURCE_OPERATOR_LIST,
method: "get", method: "get",
params params
}); });
......
src/views/ResourceCenter/UserResources/WorkflowOperator/components/AddOperator/utils.ts
View file @ 382d066d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴永生 15770852798@163.com * @Author: 吴永生 15770852798@163.com
* @Date: 2022-10-20 17:36:14 * @Date: 2022-10-20 17:36:14
* @LastEditors: 吴永生 15770852798@163.com * @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-10-26 13:56:10 * @LastEditTime: 2022-10-27 11:30:07
* @FilePath: /bkunyun/src/views/ResourceCenter/UserResources/WorkflowOperator/components/AddOperator/utils.ts * @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 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
...@@ -114,6 +114,9 @@ export const checkParamsConfig = (val: string) => { ...@@ -114,6 +114,9 @@ export const checkParamsConfig = (val: string) => {
if( !['PATH','DATASET','FILE','INPUT','SELECT','MULTIPLESELECT','RADIO','CHECKBOX'].includes(item?.domType )){ if( !['PATH','DATASET','FILE','INPUT','SELECT','MULTIPLESELECT','RADIO','CHECKBOX'].includes(item?.domType )){
result.push(`domType: ${item?.domType}`) result.push(`domType: ${item?.domType}`)
} }
if( !['in', 'out', 'basis', 'senior'].includes(item?.parameterGroup )){
result.push(`parameterGroup: ${item?.parameterGroup}`)
}
}) })
} catch(error){ } catch(error){
console.log(error) console.log(error)
...@@ -128,8 +131,9 @@ export const initCode = [{ ...@@ -128,8 +131,9 @@ export const initCode = [{
"defaultValue" : 10000, "defaultValue" : 10000,
"description" : "", "description" : "",
"hidden" : true, "hidden" : true,
"title" : "", "title" : "这里填参数标题",
"order" : 0, "order" : 0,
"parameterGroup": "in",
"domType" : "INPUT", "domType" : "INPUT",
"choices" : [ "choices" : [
{ {
...@@ -152,9 +156,9 @@ export const initCode = [{ ...@@ -152,9 +156,9 @@ export const initCode = [{
export const text = `{ export const text = `{
// 参数名, 必填，在15字符以内，仅限大小写字母、数字、"_",且只能以大小写字母开头 // 参数名, 必填, 在15字符以内，仅限大小写字母、数字、"_",且只能以大小写字母开头
"name" : "timeout", "name" : "timeout",
/** 参数类型。可选值有 STRING：字符串、FILE：文件、DATASET：数据集、INT：整型、FLOAT：单精度浮点型、 /** 参数类型, 必填, 可选值有 STRING：字符串、FILE：文件、DATASET：数据集、INT：整型、FLOAT：单精度浮点型、
* DOUBLE：多精度浮点型、BOOLEAN：布尔值、ARRAY_STRING：字符串数组、ARRAY_FILE：文件数组、ARRAY_DATASET：数据集数组、 * DOUBLE：多精度浮点型、BOOLEAN：布尔值、ARRAY_STRING：字符串数组、ARRAY_FILE：文件数组、ARRAY_DATASET：数据集数组、
* ARRAY_INT：整型数组、ARRAY_FLOAT：单精度浮点型数组、ARRAY_DOUBLE：多精度浮点型数组、ARRAY_BOOLEAN：布尔值数组 * ARRAY_INT：整型数组、ARRAY_FLOAT：单精度浮点型数组、ARRAY_DOUBLE：多精度浮点型数组、ARRAY_BOOLEAN：布尔值数组
*/ */
...@@ -165,14 +169,16 @@ export const text = `{ ...@@ -165,14 +169,16 @@ export const text = `{
"defaultValue" : 10000, "defaultValue" : 10000,
// 参数描述。在300字符以内 // 参数描述。在300字符以内
"description" : "", "description" : "",
// 是否隐藏，隐藏就在页面不显示该参数 必填 // 是否隐藏, 必填, 隐藏就在页面不显示该参数 必填
"hidden" : true, "hidden" : true,
// 页面展示的参数的名称 // 页面展示的参数的名称 必填, 在15字符以内，仅限大小写字母、数字、中文
"title" : "", "title" : "",
// 参数展示的顺序优先级 // 参数展示的顺序优先级
"order" : 0, "order" : 0,
// 参数分组 必填, 可选值有 in： 输入、out：输出、basis：基础、senior：高级
"parameterGroup": "in",
/** /**
* 前端填值的方式 PATH：路径选择器、DATASET：数据集选择器、FILE：文件选择器、INPUT：输入框、 * 前端填值的方式, 必填, 可选值有 PATH：路径选择器、DATASET：数据集选择器、FILE：文件选择器、INPUT：输入框、
* SELECT：下拉框、MULTIPLESELECT：多选下拉框、RADIO：单选按钮、CHECKBOX：多选按钮 * SELECT：下拉框、MULTIPLESELECT：多选下拉框、RADIO：单选按钮、CHECKBOX：多选按钮
*/ */
"domType" : "INPUT", "domType" : "INPUT",
......
src/views/ResourceCenter/UserResources/WorkflowOperator/index.tsx
View file @ 382d066d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴永生 15770852798@163.com * @Author: 吴永生 15770852798@163.com
* @Date: 2022-10-17 14:35:11 * @Date: 2022-10-17 14:35:11
* @LastEditors: 吴永生 15770852798@163.com * @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-10-26 19:17:49 * @LastEditTime: 2022-10-27 10:10:08
* @FilePath: /bkunyun/src/views/ResourceCenter/UserResources/WorkflowOperator/index.tsx * @FilePath: /bkunyun/src/views/ResourceCenter/UserResources/WorkflowOperator/index.tsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
...@@ -12,7 +12,6 @@ import { observer } from "mobx-react"; ...@@ -12,7 +12,6 @@ import { observer } from "mobx-react";
import _ from "lodash"; import _ from "lodash";
import Add from "@mui/icons-material/Add"; import Add from "@mui/icons-material/Add";
import noFile from "@/assets/project/noFile.svg";
import SearchInput from "@/components/BusinessComponents/SearchInput"; import SearchInput from "@/components/BusinessComponents/SearchInput";
import MySelect from "@/components/mui/MySelect"; import MySelect from "@/components/mui/MySelect";
import MyButton from "@/components/mui/MyButton"; import MyButton from "@/components/mui/MyButton";
...@@ -74,65 +73,65 @@ const WorkflowOperator = observer(() => { ...@@ -74,65 +73,65 @@ const WorkflowOperator = observer(() => {
return ( return (
<> <>
<MyCircularProgress loading={loading}> <div className={styles.indexBox}>
<div className={styles.indexBox}> <div className={styles.headerBox}>
<div className={styles.headerBox}> <div>
<div> <SearchInput
<SearchInput sx={{ width: 340, marginRight: "16px" }}
sx={{ width: 340, marginRight: "16px" }} placeholder="输入关键词搜索"
placeholder="输入关键词搜索" value={searchParams.keyword}
value={searchParams.keyword} onKeyUp={handleKeyWordChangeKeyUp}
onKeyUp={handleKeyWordChangeKeyUp} onChange={(e) => {
onChange={(e) => { setSearchParams({ ...searchParams, keyword: e.target.value });
setSearchParams({ ...searchParams, keyword: e.target.value }); }}
}} />
/> <MySelect
<MySelect title="所属产品"
title="所属产品" isTitle={true}
isTitle={true} options={
options={ [
[
{ label: "全部", value: "all" },
...productListStore?.productList,
] || []
}
value={searchParams.productId}
onChange={(e) => {
setSearchParams({ ...searchParams, productId: e });
}}
className={styles.searchSelectBox}
sx={{ width: "150px", height: "32px" }}
/>
<MySelect
title="环境类型"
isTitle={true}
value={searchParams.type}
onChange={(e) => {
setSearchParams({ ...searchParams, type: e });
}}
options={[
{ label: "全部", value: "all" }, { label: "全部", value: "all" },
{ ...productListStore?.productList,
label: "批式", ] || []
value: "BATCH", }
}, value={searchParams.productId}
{ onChange={(e) => {
label: "流式", setSearchParams({ ...searchParams, productId: e });
value: "FLOW", }}
}, className={styles.searchSelectBox}
]} sx={{ width: "150px", height: "32px" }}
sx={{ width: "150px", height: "32px" }} />
/> <MySelect
</div> title="环境类型"
<MyButton isTitle={true}
text="构建算子" value={searchParams.type}
startIcon={<Add />} onChange={(e) => {
onClick={() => { setSearchParams({ ...searchParams, type: e });
setPageType("add");
setDetailsId("");
}} }}
></MyButton> options={[
{ label: "全部", value: "all" },
{
label: "批式",
value: "BATCH",
},
{
label: "流式",
value: "FLOW",
},
]}
sx={{ width: "150px", height: "32px" }}
/>
</div> </div>
<MyButton
text="构建算子"
startIcon={<Add />}
onClick={() => {
setPageType("add");
setDetailsId("");
}}
></MyButton>
</div>
<MyCircularProgress loading={loading}>
{list?.length ? ( {list?.length ? (
<div className={styles.contentBox}> <div className={styles.contentBox}>
{list?.map((item) => { {list?.map((item) => {
...@@ -150,8 +149,8 @@ const WorkflowOperator = observer(() => { ...@@ -150,8 +149,8 @@ const WorkflowOperator = observer(() => {
<NoData text="暂无工作流算子"></NoData> <NoData text="暂无工作流算子"></NoData>
</div> </div>
)} )}
</div> </MyCircularProgress>
</MyCircularProgress> </div>
{pageType && ( {pageType && (
<AddOperator <AddOperator
getList={newGetList} getList={newGetList}
......
yarn.lock
View file @ 382d066d
...@@ -3421,7 +3421,7 @@ check-types@^11.1.1: ...@@ -3421,7 +3421,7 @@ check-types@^11.1.1:
resolved "https://registry.npmjs.org/check-types/-/check-types-11.1.2.tgz" resolved "https://registry.npmjs.org/check-types/-/check-types-11.1.2.tgz"
integrity sha512-tzWzvgePgLORb9/3a0YenggReLKAIb2owL03H2Xdoe5pKcUyWRSEQ8xfCar8t2SIAuEDwtmx2da1YB52YuHQMQ== integrity sha512-tzWzvgePgLORb9/3a0YenggReLKAIb2owL03H2Xdoe5pKcUyWRSEQ8xfCar8t2SIAuEDwtmx2da1YB52YuHQMQ==
chokidar@^3.4.2, chokidar@^3.5.3: "chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.2, chokidar@^3.5.3:
version "3.5.3" version "3.5.3"
resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz" resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"
integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
...@@ -5441,6 +5441,11 @@ immer@^9.0.12, immer@^9.0.7: ...@@ -5441,6 +5441,11 @@ immer@^9.0.12, immer@^9.0.7:
resolved "https://registry.npmjs.org/immer/-/immer-9.0.12.tgz" resolved "https://registry.npmjs.org/immer/-/immer-9.0.12.tgz"
integrity sha512-lk7UNmSbAukB5B6dh9fnh5D0bJTOFKxVg2cyJWTYrWRfhLrLMBquONcUs3aFq507hNoIZEDDh8lb8UtOizSMhA== integrity sha512-lk7UNmSbAukB5B6dh9fnh5D0bJTOFKxVg2cyJWTYrWRfhLrLMBquONcUs3aFq507hNoIZEDDh8lb8UtOizSMhA==
immutable@^4.0.0:
version "4.1.0"
resolved "https://registry.npmmirror.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef"
integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==
import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
version "3.3.0" version "3.3.0"
resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz" resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"
...@@ -8032,6 +8037,7 @@ react-flow-renderer@^10.3.7: ...@@ -8032,6 +8037,7 @@ react-flow-renderer@^10.3.7:
d3-selection "^3.0.0" d3-selection "^3.0.0"
d3-zoom "^3.0.0" d3-zoom "^3.0.0"
zustand "^3.7.2" zustand "^3.7.2"
react-is@^16.13.1, react-is@^16.7.0: react-is@^16.13.1, react-is@^16.7.0:
version "16.13.1" version "16.13.1"
resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz" resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"
...@@ -8360,6 +8366,15 @@ sass-loader@^12.3.0: ...@@ -8360,6 +8366,15 @@ sass-loader@^12.3.0:
klona "^2.0.4" klona "^2.0.4"
neo-async "^2.6.2" neo-async "^2.6.2"
sass@^1.55.0:
version "1.55.0"
resolved "https://registry.npmmirror.com/sass/-/sass-1.55.0.tgz#0c4d3c293cfe8f8a2e8d3b666e1cf1bff8065d1c"
integrity sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A==
dependencies:
chokidar ">=3.0.0 <4.0.0"
immutable "^4.0.0"
source-map-js ">=0.6.2 <2.0.0"
sax@~1.2.4: sax@~1.2.4:
version "1.2.4" version "1.2.4"
resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz" resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"
...@@ -8576,7 +8591,7 @@ source-list-map@^2.0.0, source-list-map@^2.0.1: ...@@ -8576,7 +8591,7 @@ source-list-map@^2.0.0, source-list-map@^2.0.1:
resolved "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz" resolved "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz"
integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
source-map-js@^1.0.1, source-map-js@^1.0.2: "source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.0.2:
version "1.0.2" version "1.0.2"
resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz" resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
......
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