Commit 7bd76622 authored by wuyongsheng's avatar wuyongsheng

fix: bug修改

parent 21c868ea
...@@ -52,7 +52,13 @@ const OperatorList = (props: IProps) => { ...@@ -52,7 +52,13 @@ const OperatorList = (props: IProps) => {
}; };
}); });
setIsLastPage(res?.data?.last); setIsLastPage(res?.data?.last);
/** 兼容更改其他条件初始化,重置数据 */
if (res?.data?.pageable?.pageNumber === 0) {
setList(arr);
} else {
setList([...list, ...arr]); setList([...list, ...arr]);
}
}, },
}); });
......
...@@ -33,12 +33,12 @@ ...@@ -33,12 +33,12 @@
.content { .content {
display: flex; display: flex;
/* position: relative; */ position: relative;
/* overflow: hidden; */
border-radius: 4px; border-radius: 4px;
margin-bottom: 20px; margin-bottom: 20px;
height: 600px; height: 600px;
} }
.form { .form {
width: 368px; width: 368px;
min-width: 368px; min-width: 368px;
...@@ -109,3 +109,23 @@ ...@@ -109,3 +109,23 @@
.react-flow > div:last-child { .react-flow > div:last-child {
display: none; display: none;
} }
.formOpen {
position: absolute;
height: 100%;
left: -420px;
}
.formClose {
height: 100%;
}
.helpOpen {
height: 100%;
}
.helpClose {
position: absolute;
height: 100%;
right: -420px;
}
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴永生 15770852798@163.com * @Author: 吴永生 15770852798@163.com
* @Date: 2022-10-18 16:12:55 * @Date: 2022-10-18 16:12:55
* @LastEditors: 吴永生 15770852798@163.com * @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-10-31 11:23:34 * @LastEditTime: 2022-10-31 19:54:43
* @FilePath: /bkunyun/src/views/ResourceCenter/UserResources/WorkflowOperator/components/AddOperator/index.tsx * @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 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
...@@ -392,12 +392,13 @@ const AddOperator = observer((props: IAddOperator) => { ...@@ -392,12 +392,13 @@ const AddOperator = observer((props: IAddOperator) => {
/> />
</div> </div>
) : null} ) : null}
<div className={style.content}> <div className={style.content}>
<div <div
className={classNames({ className={classNames({
[style.form]: batchBuildType === "ENVIRONMENT", [style.form]: batchBuildType === "ENVIRONMENT",
[style.newForm]: batchBuildType !== "ENVIRONMENT", [style.newForm]: batchBuildType !== "ENVIRONMENT",
[style.formOpen]: tipsOpen,
[style.formClose]: !tipsOpen,
})} })}
> >
<FormItemBox <FormItemBox
...@@ -585,8 +586,15 @@ const AddOperator = observer((props: IAddOperator) => { ...@@ -585,8 +586,15 @@ const AddOperator = observer((props: IAddOperator) => {
</FormItemBox> </FormItemBox>
</div> </div>
)} )}
{/* <div style={{ width: "368px", backgroundColor: "red" }}></div> */} <div
style={{ width: "368px", backgroundColor: "red" }}
className={classNames({
[style.helpOpen]: tipsOpen,
[style.helpClose]: !tipsOpen,
})}
></div>
</div> </div>
{taskType === "FLOW" ? null : ( {taskType === "FLOW" ? null : (
<div <div
className={style.parameterConfigBox} className={style.parameterConfigBox}
......
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