Commit 5613152f authored by wuyongsheng's avatar wuyongsheng

Merge branch 'feat-20221012-environment' into 'release'

Feat 20221012 environment

See merge request !168
parents a8b40bbf 7e9b1bd1
......@@ -2,7 +2,7 @@
* @Author: 吴永生 15770852798@163.com
* @Date: 2022-10-19 17:09:23
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-10-27 11:23:29
* @LastEditTime: 2022-10-31 11:22:34
* @FilePath: /bkunyun/src/api/resourceCenter.ts
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -118,9 +118,9 @@ const getWorkflowspecList = (params: {productId?: string, title?: string}) => {
// API_WORKFLOWSPEC_LIST
// 新增应用环境
const saveOperator = (params: any, isEdit: boolean) => {
const saveOperator = (params: any) => {
return request({
url: `${Api.API_SAVE_OPERATOR}?isEdit=${isEdit}`,
url: `${Api.API_SAVE_OPERATOR}`,
method: "post",
data: params,
});
......
......@@ -15,6 +15,7 @@ import { ThemeProvider, createTheme } from "@mui/material/styles";
import { TabContext, TabList, TabPanel } from "@mui/lab";
import { Typography } from "@mui/material";
import classNames from "classnames";
import { useNavigate } from "react-router-dom";
import styles from "./index.module.css";
......@@ -46,6 +47,8 @@ interface IProps {
tabPanelSx?: any;
/** 是否允许空值 */
allowNullValue?: boolean;
/** 路由地址 配合navigate和MyTabs组件的defaultValue组合使用、F5刷新也可以保存激活的tab */
navigateUrl?: string;
}
const theme = createTheme({
......@@ -101,8 +104,11 @@ const Tabs = (props: IProps) => {
tabPanelSx = { padding: "20px 0 0 0" },
title,
titleClass,
navigateUrl,
} = props;
const navigate = useNavigate();
const [tabValue, setTabValue] = useState(
defaultValue
? defaultValue
......@@ -116,6 +122,10 @@ const Tabs = (props: IProps) => {
const onTabChange = (val: string) => {
setTabValue(val);
onChange && onChange(val);
navigateUrl &&
navigate(navigateUrl, {
state: { defaultTab: val },
});
};
const getImgSrc = useCallback(
......
......@@ -2,7 +2,7 @@
* @Author: 吴永生 15770852798@163.com
* @Date: 2022-10-18 16:12:55
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-10-31 09:38:48
* @LastEditTime: 2022-10-31 11:23:34
* @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
*/
......@@ -326,7 +326,7 @@ const AddOperator = observer((props: IAddOperator) => {
body: positionTransform(params?.parameters || []),
});
} else {
runSaveOperator(params, detailsId ? true : false);
runSaveOperator(params);
}
}, [
batchBuildType,
......@@ -499,7 +499,7 @@ const AddOperator = observer((props: IAddOperator) => {
style={{
position: "absolute",
fontSize: "14px",
bottom: "7px",
top: "96px",
right: "12px",
color:
Number(formData?.description?.length) >= 300
......
......@@ -79,7 +79,6 @@ const WorkflowOperator = observer(() => {
<div>
<SearchInput
sx={{ width: 340, marginRight: "16px" }}
placeholder="输入关键词搜索"
value={searchParams.keyword}
onKeyUp={handleKeyWordChangeKeyUp}
onChange={(e) => {
......
......@@ -40,6 +40,7 @@ const UserResources = () => {
tabList={tabList}
defaultValue={location?.state?.defaultTab || "USERRESOURCES_TEMPLATE"}
tabPanelSx={{ padding: "0" }}
navigateUrl="/utility/resourceCenter/userResources"
/>
{/* <OperatorDetails /> */}
</div>
......
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