Skip to content

B
bkunyun
Commit 7a6757f1 authored by wuyongsheng's avatar wuyongsheng
Browse files
Options

Merge branch 'feat-20220801' into 'release' 

Feat 20220801

See merge request !94
parents 505cbafb 73f1eb5b
Hide whitespace changes
Inline Side-by-side
Showing with 178 additions and 66 deletions
src/components/CommonComponents/RadioGroupOfButtonStyle/index.module.css
View file @ 7a6757f1
......@@ -31,6 +31,7 @@
color: #1370ff;
background-color: #fff;
box-shadow: 2px 4px 12px 0px rgba(0, 27, 63, 0.06);
position: relative;
}
.border {
width: 1px;
......
src/components/mui/MyCheckBox.tsx
View file @ 7a6757f1
......@@ -63,12 +63,13 @@ const theme = createTheme({
},
MuiCheckbox: {
styleOverrides: {
colorPrimary: {
color: "rgba(209, 214, 222, 1)",
root: {
"&.Mui-checked .MuiSvgIcon-root": {
color: "rgba(19, 110, 250, 1)",
},
},
},
},
// MuiCheckbox-colorPrimary
},
});
......
src/components/mui/MyRadio.tsx
View file @ 7a6757f1
......@@ -61,6 +61,15 @@ const theme = createTheme({
},
},
},
MuiRadio: {
styleOverrides: {
root: {
"&.Mui-checked span": {
color: "rgba(19, 110, 250, 1)",
},
},
},
},
},
});
......
src/views/ConsoleLayout/index.tsx
View file @ 7a6757f1
import React, { useEffect, useState } from "react";
import React, { useEffect } from "react";
import { Outlet, useLocation, useNavigate } from "react-router-dom";
import { observer } from "mobx-react-lite";
import Avatar from "@mui/material/Avatar";
......
src/views/Project/ProjectJobDetail/LogView/index.module.css
View file @ 7a6757f1
......@@ -20,38 +20,72 @@
}
.logViewTop {
/* height: 30px; */
position: relative;
width: 100vw;
background-color: #1d2126;
/* border-radius: 8px 8px 0 0; */
display: flex;
font-size: 12px;
color: #8a9099;
/* overflow: overlay; */
overflow: hidden;
}
.logViewTop::-webkit-scrollbar-track {
background-color: #282c34;
.leftButton {
width: 48px;
height: 32px;
flex-shrink: 0;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
border-right: 1px solid #10141A;
background-color: #1d2126;
}
.rightButton {
width: 48px;
height: 32px;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
border-left: 1px solid #10141A;
background-color: #1d2126;
}
.middleFixed {
width: calc(100vw - 98px);
position: relative;
overflow: hidden;
}
.middleDynamic{
display: flex;
position: absolute;
left: 0;
}
.logTitle {
display: flex;
/* width: 0; */
/* max-width: 200px; */
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
/* flex: 1; */
flex-shrink: 0;
align-items: center;
height: 32px;
line-height: 20px;
padding: 0 32px;
padding: 0 20px;
cursor: pointer;
border-right: 1px solid #10141A;
}
.logName {
max-width: 90px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.logTitleSelected {
flex-shrink: 0;
background: #282c34;
color: #ffffff;
}
......
src/views/Project/ProjectJobDetail/LogView/index.tsx
View file @ 7a6757f1
......@@ -8,17 +8,17 @@ import CloudEController from "@/api/fileserver/CloudEController";
import { useStores } from "@/store";
import { toJS } from "mobx";
import FullScreenDrawer from "@/components/CommonComponents/FullScreenDrawer";
import ChevronLeftIcon from '@mui/icons-material/ChevronLeft';
import ChevronRightIcon from '@mui/icons-material/ChevronRight';
type LogViewProps = {
isshow: boolean;
handleClose: () => void;
logs: any[];
setShowAddTemplate: any;
setShowLogView: any;
};
const LogView = (props: LogViewProps) => {
const { isshow, handleClose, logs, setShowAddTemplate } = props;
const { logs, setShowLogView } = props;
const { currentProjectStore } = useStores();
const fileToken = toJS(currentProjectStore.currentProjectInfo.filetoken);
const projectId = toJS(currentProjectStore.currentProjectInfo.id);
......@@ -65,22 +65,28 @@ const LogView = (props: LogViewProps) => {
}
return (
<FullScreenDrawer handleClose={setShowAddTemplate} zIndex={1002}>
<FullScreenDrawer handleClose={setShowLogView} zIndex={1002}>
<div className={style.logViewBox}>
<div className={style.logViewContentMask}></div>
<div className={style.logViewTop}>
{logs.map((item: any, index: number) => {
return <div
key={index}
onClick={() => { setLogCurrent(index) }}
className={classnames({
[style.logTitle]: true,
[style.logTitleSelected]: index === logCurrent,
})}>
<InsertDriveFileOutlinedIcon className={style.fileIcon} />
<span>{item.logName}</span>
<div className={style.leftButton}><ChevronLeftIcon /></div>
<div className={style.middleFixed}>
<div className={style.middleDynamic}>
{logs.map((item: any, index: number) => {
return <div
key={index}
onClick={() => { setLogCurrent(index) }}
className={classnames({
[style.logTitle]: true,
[style.logTitleSelected]: index === logCurrent,
})}>
<InsertDriveFileOutlinedIcon className={style.fileIcon} />
<span className={style.logName}>{item.logName}</span>
</div>
})}
</div>
})}
</div>
<div className={style.rightButton}><ChevronRightIcon /></div>
</div>
<div className={style.logViewContent}>
{logText}
......
src/views/Project/ProjectJobDetail/index.module.css
View file @ 7a6757f1
......@@ -28,8 +28,19 @@
.goBackIcon {
cursor: pointer;
}
.goBackIconBox {
width: 32px;
height: 32px;
border-radius: 4px;
display: flex;
align-items: center;
justify-content: center;
}
.goBackIconBox:hover {
background-color: rgb(240, 242, 245);
}
.swTemplateTitle {
margin: 0 19px 0 8px;
margin: 0 19px 0 3px;
line-height: 20px;
font-size: 14px;
color: rgba(30, 38, 51, 1);
......@@ -200,6 +211,7 @@
right: 24px;
bottom: 24px;
padding: 8px;
box-shadow: 0px 3px 10px 0px rgba(0, 24, 57, 0.06);
}
.fullScreenBox:hover {
opacity: 0.6;
......
src/views/Project/ProjectJobDetail/index.tsx
View file @ 7a6757f1
......@@ -445,13 +445,14 @@ const ProjectSubmitWork = observer(() => {
{fullScreenShow ? null : (
<div className={styles.swHeader}>
<div className={styles.swHeaderLeft}>
<img
onClick={onBack}
className={styles.goBackIcon}
src={goback}
alt=""
/>
<div className={styles.goBackIconBox}>
<img
onClick={onBack}
className={styles.goBackIcon}
src={goback}
alt=""
/>
</div>
<div className={styles.swTemplateTitle}>{name}</div>
</div>
{returnPermission && (
......@@ -779,10 +780,8 @@ const ProjectSubmitWork = observer(() => {
)}
{showLogView && (
<LogView
isshow={showLogView}
handleClose={handleClose}
logs={logs}
setShowAddTemplate={handleClose}
setShowLogView={handleClose}
/>
)}
</div>
......
src/views/Project/ProjectSetting/index.tsx
View file @ 7a6757f1
......@@ -39,7 +39,9 @@ const ProjectSetting = observer(() => {
if (currentProjectStore.currentProjectInfo.name) {
return (
<div style={{ padding: "28px 24px 24px" }}>
<div style={{ display: "flex", alignItems: "center" }}>
<div
style={{ display: "flex", alignItems: "center", marginBottom: "3px" }}
>
<span
style={{
fontSize: "18px",
......
src/views/Project/ProjectSubmitWork/index.module.css
View file @ 7a6757f1
......@@ -25,8 +25,22 @@
justify-content: flex-start;
align-items: center;
}
.goBackIcon {
cursor: pointer;
}
.goBackIconBox {
width: 32px;
height: 32px;
border-radius: 4px;
display: flex;
align-items: center;
justify-content: center;
}
.goBackIconBox:hover {
background-color: rgb(240, 242, 245);
}
.swTemplateTitle {
margin: 0 19px 0 8px;
margin: 0 19px 0 3px;
line-height: 20px;
font-size: 14px;
color: rgba(30, 38, 51, 1);
......@@ -70,6 +84,7 @@
right: 24px;
bottom: 24px;
padding: 8px;
box-shadow: 0px 3px 10px 0px rgba(0, 24, 57, 0.06);
}
.fullScreenBox:hover {
opacity: 0.6;
......
src/views/Project/ProjectSubmitWork/index.tsx
View file @ 7a6757f1
......@@ -261,18 +261,20 @@ const ProjectSubmitWork = observer(() => {
{fullScreenShow ? null : (
<div className={styles.swHeader}>
<div className={styles.swHeaderLeft}>
<img
className={styles.goBackIcon}
src={goback}
alt=""
onClick={(e: any) =>
handleShowPopper(
e,
"返回将放弃当前页面所有操作，确认返回吗？",
"bottom-end"
)
}
/>
<div className={styles.goBackIconBox}>
<img
className={styles.goBackIcon}
src={goback}
alt=""
onClick={(e: any) =>
handleShowPopper(
e,
"返回将放弃当前页面所有操作，确认返回吗？",
"bottom-end"
)
}
/>
</div>
<div className={styles.swTemplateTitle}>
{templateConfigInfo?.title}
</div>
......
src/views/Project/components/Flow/components/BatchNode/index.tsx
View file @ 7a6757f1
......@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-07-12 11:20:29
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-08-31 17:09:26
* @LastEditTime: 2022-09-07 10:06:13
* @FilePath: /bkunyun/src/views/Project/components/Flow/components/BatchNode.tsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -63,7 +63,7 @@ const BatchNode = (props: IBatchNode) => {
{inParamsArr?.length
? inParamsArr.map((item, index) => {
return (
<MyTooltip title={item.name} key={uuid()}>
<MyTooltip title={item.title} key={uuid()}>
<Handle
className={styles.handleBox}
id={item.name}
......@@ -95,7 +95,7 @@ const BatchNode = (props: IBatchNode) => {
{outParamsArr?.length
? outParamsArr.map((item, index) => {
return (
<MyTooltip title={item.name} key={uuid()}>
<MyTooltip title={item.title} key={uuid()}>
<Handle
className={styles.handleBox}
id={item.name}
......
src/views/Project/components/Flow/components/FlowNode/index.tsx
View file @ 7a6757f1
......@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-07-12 11:29:46
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-09-02 14:23:07
* @LastEditTime: 2022-09-07 10:44:23
* @FilePath: /bkunyun/src/views/Project/components/Flow/components/FlowNode/index.tsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -81,7 +81,7 @@ const FlowNode = (props: any) => {
{inParamsArr?.length
? inParamsArr.map((item: any, index: number) => {
return (
<MyTooltip title={item.name} key={uuid()}>
<MyTooltip title={item.title} key={uuid()}>
<Handle
className={styles.handleBox}
id={item.name}
......@@ -117,7 +117,7 @@ const FlowNode = (props: any) => {
{outParamsArr?.length
? outParamsArr.map((item: any, index: number) => {
return (
<MyTooltip title={item.name} key={uuid()}>
<MyTooltip title={item.title} key={uuid()}>
<Handle
className={styles.handleBox}
id={item.name}
......
src/views/Project/components/Flow/index.module.css
View file @ 7a6757f1
.reactFlowBox > div:last-child {
display: none;
}
/* .reactFlowBox > div:first-child {
margin-top: 32px;
} */
src/views/Project/components/ProjectListPopper/index.module.css
View file @ 7a6757f1
......@@ -12,6 +12,8 @@
display: flex;
flex-direction: column;
border-left: 1px solid #dde1e6;
animation: myfirst 0.4s;
-webkit-animation: myfirst 0.4s; /* Safari and Chrome */
}
.searchBox {
......@@ -119,3 +121,21 @@
line-height: 20px;
font-size: 12px;
}
@keyframes myfirst {
from {
width: 0;
}
to {
width: 260px;
}
}
@-webkit-keyframes myfirst /* Safari and Chrome */ {
from {
width: 0;
}
to {
width: 260px;
}
}
src/views/WorkFlowEdit/index.module.css
View file @ 7a6757f1
......@@ -26,12 +26,20 @@
align-items: center;
}
.goBackIcon {
margin-right: 8px;
cursor: pointer;
}
/* .goBackIcon:hover:{
color: ;
} */
.goBackIconBox {
width: 32px;
height: 32px;
border-radius: 4px;
display: flex;
align-items: center;
justify-content: center;
margin-right: 3px;
}
.goBackIconBox:hover {
background-color: rgb(240, 242, 245);
}
.goBack {
cursor: pointer;
color: #1e2633;
......
src/views/WorkFlowEdit/index.tsx
View file @ 7a6757f1
......@@ -197,7 +197,9 @@ const WorkFlowEdit = observer((props: IProps) => {
)
}
>
<img className={styles.goBackIcon} src={goback} alt="" />
<div className={styles.goBackIconBox}>
<img className={styles.goBackIcon} src={goback} alt="" />
</div>
<span className={styles.goBack}>返回</span>
</div>
<div className={styles.swHeaderRight}>
......
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