Commit 5588b1cf authored by jiangzijing's avatar jiangzijing

Merge branch 'feat-20220801' of http://120.77.149.83/root/bkunyun into feat-20220801

parents d4335b00 db2eadfd
/* 修改滚动条样式 */
div::-webkit-scrollbar,
main::-webkit-scrollbar {
width: 4px;
height: 5px !important;
width: 6px;
height: 5px !important;
}
div::-webkit-scrollbar-track,
main::-webkit-scrollbar-track {
background-color: #fff;
-webkit-border-radius: 2em;
-moz-border-radius: 2em;
border-radius: 2em;
background-color: #fff;
-webkit-border-radius: 3em;
-moz-border-radius: 3em;
border-radius: 3em;
}
div::-webkit-scrollbar-thumb,
main::-webkit-scrollbar-thumb {
background-color: #C2C6CC;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
height: 5px !important;
width: 4px!important;
background-color: #c2c6cc;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
height: 5px !important;
width: 6px !important;
}
body,
......@@ -48,15 +48,15 @@ input,
textarea,
th,
td {
margin: 0;
padding: 0;
margin: 0;
padding: 0;
}
body,
button,
input,
select,
textarea {
font: 12px/1.5tahoma, arial, \5b8b\4f53;
font: 12px/1.5tahoma, arial, \5b8b\4f53;
}
h1,
h2,
......@@ -64,73 +64,73 @@ h3,
h4,
h5,
h6 {
font-size: 100%;
font-size: 100%;
}
address,
cite,
dfn,
em,
var {
font-style: normal;
font-style: normal;
}
code,
kbd,
pre,
samp {
font-family: couriernew, courier, monospace;
font-family: couriernew, courier, monospace;
}
small {
font-size: 12px;
font-size: 12px;
}
ul,
ol {
list-style: none;
list-style: none;
}
a {
text-decoration: none;
text-decoration: none;
}
a:hover {
text-decoration: underline;
text-decoration: underline;
}
sup {
vertical-align: text-top;
vertical-align: text-top;
}
sub {
vertical-align: text-bottom;
vertical-align: text-bottom;
}
legend {
color: #000;
color: #000;
}
fieldset,
img {
border: 0;
border: 0;
}
button,
input,
select,
textarea {
font-size: 100%;
font-size: 100%;
}
table {
border-collapse: collapse;
border-spacing: 0;
border-collapse: collapse;
border-spacing: 0;
}
input::-webkit-input-placeholder {
color: #c2c6cc;
color: #c2c6cc;
}
input::-moz-placeholder {
/* Mozilla Firefox 19+ */
color: #c2c6cc;
/* Mozilla Firefox 19+ */
color: #c2c6cc;
}
input:-moz-placeholder {
/* Mozilla Firefox 4 to 18 */
color: #c2c6cc;
/* Mozilla Firefox 4 to 18 */
color: #c2c6cc;
}
input:-ms-input-placeholder {
/* Internet Explorer 10-11 */
color: #c2c6cc;
/* Internet Explorer 10-11 */
color: #c2c6cc;
}
......@@ -38,7 +38,7 @@
background-color: #fff;
border-radius: 16px 0 0 0;
box-sizing: border-box;
overflow: scroll;
overflow: overlay;
animation: showDrawer 0.31s ease;
-webkit-animation: showDrawer 0.31s ease;
margin: 0 auto;
......
......@@ -38,7 +38,7 @@ const useStyles = makeStyles({
contentWrap: {
padding: "8px 0", height: 0, transition: "all 1s", position: "absolute", zIndex: 9, width: "100%",
backgroundColor: "#FFFFFF", boxShadow: "0px 2px 3px 0px rgba(0, 0, 0, 0.16)", borderRadius: "4px",
overflowY: "scroll",
overflowY: "overlay",
maxHeight: "398px"
},
contentWrapOpenPosition:{top:"-400px"},
......
......@@ -32,7 +32,7 @@ const useStyles = makeStyles({
contentWrap: {
padding: "8px 0", height: 0, transition: "all 1s", position: "absolute", zIndex: 9, width: "100%",
backgroundColor: "#FFFFFF", boxShadow: "0px 2px 3px 0px rgba(0, 0, 0, 0.16)", borderRadius: "4px",
overflowY: "auto",
overflowY: "overlay",
maxHeight: "400px"
},
contentWrapOpen: { height: "auto" },
......
......@@ -42,7 +42,7 @@ const useStyles = makeStyles({
contentWrap: {
padding: "8px 0", transition: "all 1s", position: "fixed", zIndex: 9, width: "552px",
backgroundColor: "#FFFFFF", boxShadow: "0px 2px 3px 0px rgba(0, 0, 0, 0.16)", borderRadius: "4px",
overflowY: "scroll",
overflowY: "overlay",
maxHeight: "398px",
// position: "fixed",
// width: "552px"
......
......@@ -23,7 +23,7 @@ const theme = createTheme({
MuiMenu: {
styleOverrides: {
root: {
overflowY: "scroll",
overflow: "overlay",
},
},
},
......
......@@ -14,7 +14,7 @@ const theme = createTheme({
MuiMenu: {
styleOverrides: {
root: {
overflowY: "scroll",
overflow: "overlay",
},
},
},
......
......@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-05-31 10:18:13
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-08-31 20:25:56
* @LastEditTime: 2022-09-01 11:20:24
* @FilePath: /bkunyun/src/views/Project/ProjectSetting/index.tsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -28,7 +28,7 @@ interface ITabList {
interface IProps {
value?: string;
onChange?: (val: string)=> void;
onChange?: (val: string) => void;
tabList: ITabList[];
defaultValue?: string;
tabPanelSx?: any;
......@@ -88,27 +88,34 @@ const Tabs = (props: IProps) => {
: tabList.filter((e) => !e.hide)[0].value
);
const [hoverValue, setHoverValue] = useState('')
const [hoverValue, setHoverValue] = useState("");
const onTabChange = (val: string) => {
setTabValue(val)
setTabValue(val);
onChange && onChange(val);
};
const getImgSrc = useCallback((item: ITabList)=>{
let result = item.icon
if(value === item.value){
result = item.iconed
}
if(hoverValue === item.value){
result = item.iconHover
}
return result
},[hoverValue, value])
const getImgSrc = useCallback(
(item: ITabList) => {
let result = item.icon;
if (value === item.value || tabValue === item.value) {
result = item.iconed;
}
if (hoverValue === item.value) {
result = item.iconHover;
}
return result;
},
[hoverValue, value, tabValue]
);
const labelRender = (item: ITabList, key: number) => {
return (
<div style={{ display: "flex", alignItems: "center" }} onMouseOver={()=>setHoverValue(item.value)} onMouseOut={()=>setHoverValue('')}>
<div
style={{ display: "flex", alignItems: "center" }}
onMouseOver={() => setHoverValue(item.value)}
onMouseOut={() => setHoverValue("")}
>
{item.icon ? (
<img
style={{ width: "16px", marginRight: "8px" }}
......
/*
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-06-10 18:05:21
* @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
* @LastEditTime: 2022-07-21 11:28:21
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-09-01 14:09:28
* @FilePath: /bkunyun/src/views/ConsoleLayout/components/TransferList/index.tsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -43,11 +43,11 @@ const TranSferList = observer(() => {
size="small"
/>
</Box>
<Box style={{ height: 400, overflowY: "auto" }}>
<div style={{ height: 400, overflow: "overlay" }}>
{uploadInfoStore?.fileList.map((item) => {
return <FileItem fileItemInfo={item} key={item.id} />;
})}
</Box>
</div>
</Box>
);
});
......
......@@ -32,7 +32,7 @@
}
.list {
height: calc(100% - 55px);
overflow-y: auto;
overflow-y: overlay;
padding: 15px 20px;
box-sizing: border-box;
}
......
......@@ -13,7 +13,7 @@
.content {
flex: 1;
height: calc(100vh - 57px);
overflow: scroll;
overflow: overlay;
}
.listItem {
padding: 8px 25px;
......
......@@ -42,7 +42,7 @@
}
.table {
flex: 1;
overflow-y: auto;
overflow-y: overlay;
display: flex;
flex-direction: column;
}
......@@ -101,7 +101,7 @@
}
.datasetLiDataList {
flex: 1;
overflow: auto;
overflow: overlay;
}
.noDataList {
flex: 1;
......
......@@ -50,10 +50,6 @@
box-sizing: border-box;
position: relative;
}
/* .tableBox {
height: 300px;
overflow: scroll;
} */
.fileIconBox {
display: flex;
justify-content: flex-start;
......
.logView {
position: absolute;
top: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, .5);
z-index: 1002;
position: absolute;
top: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.5);
z-index: 1002;
}
.logViewBox {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
width: 900px;
height: 600px;
background: #282C34;
box-shadow: 2px 4px 20px 0px rgba(0, 15, 45, 0.1200);
border-radius: 8px;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
width: 900px;
height: 600px;
background: #282c34;
box-shadow: 2px 4px 20px 0px rgba(0, 15, 45, 0.12);
border-radius: 8px;
}
.close {
position: absolute;
right: 0;
top: -28px;
cursor: pointer;
color: #fff;
position: absolute;
right: 0;
top: -28px;
cursor: pointer;
color: #fff;
}
.logViewTop {
/* height: 30px; */
background-color: #1D2126;
border-radius: 8px 8px 0 0;
display: flex;
font-size: 12px;
color: #8A9099;
overflow: auto;
/* height: 30px; */
background-color: #1d2126;
border-radius: 8px 8px 0 0;
display: flex;
font-size: 12px;
color: #8a9099;
overflow: overlay;
}
.logViewTop::-webkit-scrollbar-track {
background-color: #282C34;
}
background-color: #282c34;
}
.logTitle {
display: flex;
align-items: center;
height: 30px;
line-height: 20px;
padding: 0 24px;
cursor: pointer;
display: flex;
align-items: center;
height: 30px;
line-height: 20px;
padding: 0 24px;
cursor: pointer;
}
.logTitleSelected {
background: #282C34;
color: #FFFFFF;
background: #282c34;
color: #ffffff;
}
.fileIcon{
width: 14px!important;
margin-right: 4px;
.fileIcon {
width: 14px !important;
margin-right: 4px;
}
.logViewContent {
position: relative;
box-sizing: border-box;
height: 510px;
padding: 16px 24px 0;
color: #D1D6DE;
white-space:pre-wrap;
word-break: break-word;
overflow: auto;
font-size: 14px;
line-height: 22px;
position: relative;
box-sizing: border-box;
height: 510px;
padding: 16px 24px 0;
color: #d1d6de;
white-space: pre-wrap;
word-break: break-word;
overflow: overlay;
font-size: 14px;
line-height: 22px;
}
.logViewContentMask{
height: 16px;
width: 852px;
background-color: #282C34;
position: absolute;
top: 30px;
left: 24px;
z-index: 1005;
.logViewContentMask {
height: 16px;
width: 852px;
background-color: #282c34;
position: absolute;
top: 30px;
left: 24px;
z-index: 1005;
}
.logViewContent::-webkit-scrollbar-track {
background-color: #282C34;
background-color: #282c34;
}
.logViewBottom {
display: flex;
align-items: center;
justify-content: end;
height: 60px;
padding-right: 24px;
}
\ No newline at end of file
display: flex;
align-items: center;
justify-content: end;
height: 60px;
padding-right: 24px;
}
......@@ -6,7 +6,7 @@
width: 100vw;
height: 100vh;
background-color: RGBA(247, 248, 250, 1);
overflow-y: auto;
overflow-y: overlay;
}
.swHeader {
z-index: 1001;
......@@ -41,7 +41,7 @@
background-color: #fff;
border-right: 1xp solid rgba(235, 237, 240, 1);
width: 360px;
overflow-y: scroll;
overflow-y: overlay;
box-sizing: border-box;
padding: 24px;
}
......@@ -74,7 +74,7 @@
color: rgba(19, 112, 255, 1);
font-size: 14px;
}
.outputItemName{
.outputItemName {
max-width: 172px;
white-space: nowrap;
display: block;
......@@ -164,7 +164,7 @@
position: absolute;
top: 33px;
max-height: 230px;
overflow-y: scroll;
overflow-y: overlay;
padding: 8px 0px;
background: #ffffff;
box-shadow: 0px 3px 10px 0px rgba(0, 24, 57, 0.14);
......
.cardBox {
display: flex;
margin: 16px 16px 0;
height: 156px;
background: #FFFFFF;
box-shadow: 2px 2px 6px 0px rgba(0, 25, 57, 0.0300);
border-radius: 4px;
display: flex;
margin: 16px 16px 0;
height: 156px;
background: #ffffff;
box-shadow: 2px 2px 6px 0px rgba(0, 25, 57, 0.03);
border-radius: 4px;
}
.dividingLine {
height: 156px;
border-left: 1px solid #EBEDF0;
position: relative;
height: 156px;
border-left: 1px solid #ebedf0;
position: relative;
}
.arrow {
position: absolute;
top: 65px;
left: -13px;
width: 26px;
height: 26px;
background-color: #fff;
border-top: 1px solid #EBEDF0;
border-right: 1px solid #EBEDF0;
transform: rotate(45deg);
position: absolute;
top: 65px;
left: -13px;
width: 26px;
height: 26px;
background-color: #fff;
border-top: 1px solid #ebedf0;
border-right: 1px solid #ebedf0;
transform: rotate(45deg);
}
.cardLeft {
flex: 1;
padding: 16px 24px;
flex: 1;
padding: 16px 24px;
}
.topLine {
display: flex;
justify-content: space-between;
display: flex;
justify-content: space-between;
}
.taskName {
min-width: 100px;
font-size: 14px;
line-height: 22px;
font-weight: 500;
cursor: pointer;
min-width: 100px;
font-size: 14px;
line-height: 22px;
font-weight: 500;
cursor: pointer;
}
.taskName:hover{
color: #1370FF;
.taskName:hover {
color: #1370ff;
}
.taskStatus {
display: flex;
align-items: center;
justify-content: center;
width: 78px;
height: 22px;
border-radius: 2px;
font-size: 12px;
display: flex;
align-items: center;
justify-content: center;
width: 78px;
height: 22px;
border-radius: 2px;
font-size: 12px;
}
.statusImg {
width: 10px;
height: 10px;
margin-right: 5px;
width: 10px;
height: 10px;
margin-right: 5px;
}
.taskCreator {
font-size: 12px;
line-height: 20px;
color: #1E2633;
margin-top: 4px;
font-size: 12px;
line-height: 20px;
color: #1e2633;
margin-top: 4px;
}
.taskProgress {
height: 32px;
margin: 12px 0;
height: 32px;
margin: 12px 0;
}
.progressInfo {
display: flex;
justify-content: space-between;
margin-bottom: 8px;
font-size: 12px;
color: #565C66;
display: flex;
justify-content: space-between;
margin-bottom: 8px;
font-size: 12px;
color: #565c66;
}
.bottomLine {
display: flex;
font-size: 12px;
color: #565C66;
display: flex;
font-size: 12px;
color: #565c66;
}
.bottomInfo {
margin: 0 40px 0 4px;
margin: 0 40px 0 4px;
}
.cardRight {
flex: 1;
display: flex;
position: relative;
overflow: auto;
flex: 1;
display: flex;
position: relative;
overflow: overlay;
}
.noResult {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
font-size: 14px;
color: #8A9099;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
font-size: 14px;
color: #8a9099;
}
.resultBox {
padding: 16px 24px 16px 42px;
width: 100%;
display: flex;
flex-wrap: wrap;
align-content: flex-start;
padding: 16px 24px 16px 42px;
width: 100%;
display: flex;
flex-wrap: wrap;
align-content: flex-start;
}
.result {
box-sizing: border-box;
font-size: 12px;
color: #1E2633;
cursor: pointer;
height: 30px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
padding-right: 8px;
box-sizing: border-box;
font-size: 12px;
color: #1e2633;
cursor: pointer;
height: 30px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
padding-right: 8px;
}
@media screen and (max-width:1220px) {
.result {
width: 100%;
}
@media screen and (max-width: 1220px) {
.result {
width: 100%;
}
}
@media screen and (min-width:1220px) and (max-width:1600px) {
.result {
width: 50%;
}
@media screen and (min-width: 1220px) and (max-width: 1600px) {
.result {
width: 50%;
}
}
@media screen and (min-width:1600px) {
.result {
width: 33.33%;
}
@media screen and (min-width: 1600px) {
.result {
width: 33.33%;
}
}
.result:hover {
color: #1370FF;
color: #1370ff;
}
.outputLeftImg {
vertical-align: middle;
margin-right: 8px;
}
\ No newline at end of file
vertical-align: middle;
margin-right: 8px;
}
......@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-05-31 10:18:13
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-08-31 18:27:26
* @LastEditTime: 2022-09-01 14:09:34
* @FilePath: /bkunyun/src/views/Project/ProjectSetting/index.tsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -160,9 +160,9 @@ const AddMember = observer((props: IProps) => {
placeholder="搜索项目成员"
sx={{ mb: 2 }}
/>
<div style={{ overflowY: "scroll", maxHeight: 400 }}>
<div style={{ overflow: "overlay", maxHeight: 400 }}>
<MyTable
tableContainerStyle={{height: 346}}
tableContainerStyle={{ height: 346 }}
checkboxData={(val: string[]) => setCheckData(val)}
param="username"
disabledParam={"enabled"}
......
......@@ -6,7 +6,7 @@
width: 100vw;
height: 100vh;
background-color: RGBA(247, 248, 250, 1);
overflow-y: auto;
overflow-y: overlay;
}
.swHeader {
z-index: 1001;
......@@ -53,7 +53,7 @@
background-color: #fff;
border-right: 1xp solid rgba(235, 237, 240, 1);
width: 608px;
overflow-y: scroll;
overflow-y: overlay;
box-sizing: border-box;
padding: 36px;
}
......
......@@ -2,7 +2,7 @@
* @Author: rocosen
* @Date: 2022-06-12 10:05:13
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-09-01 09:31:56
* @LastEditTime: 2022-09-01 11:51:16
* @FilePath: /bkunyun/src/views/Project/ProjectSetting/index.tsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -50,7 +50,7 @@ const ProjectWorkbench = observer(() => {
}, [isPass]);
return (
<div style={{ padding: "28px 24px 24px", height: "100%" }}>
<div style={{ padding: "28px 24px 24px" }}>
<div style={{ display: "flex", alignItems: "center" }}>
<span
style={{
......
/* .headerBox { */
/* margin-bottom: 20px; */
/* margin-bottom: 20px; */
/* } */
.tabHeader {
display: flex;
align-items: center;
justify-content: space-between;
display: flex;
align-items: center;
justify-content: space-between;
}
.tabHeaderSelect {
margin-left: 16px;
margin-left: 16px;
}
.body {
margin-top: 24px;
border-top: 1px solid #F0F2F5;
overflow: hidden;
overflow-y: auto;
height: calc(100vh - 325px);
margin-top: 24px;
border-top: 1px solid #f0f2f5;
overflow: hidden;
overflow-y: overlay;
height: calc(100vh - 325px);
}
.tabBox {
padding: 16px 0px 16px 24px;
display: flex;
align-items: center;
width: 100%;
border-bottom: 1px solid #F0F2F5;
padding: 16px 0px 16px 24px;
display: flex;
align-items: center;
width: 100%;
border-bottom: 1px solid #f0f2f5;
}
.tabBox:hover {
background-color: #F5F6F7;
background-color: #f5f6f7;
}
.tabBoxInfo {
width: 24%;
min-width: 280px;
width: 24%;
min-width: 280px;
}
.tabBoxDescInfo {
display: flex;
display: flex;
}
.tabBoxTitle {
font-size: 14px;
line-height: 22px;
font-weight: 600;
color: #1E2633;
margin-bottom: 8px;
font-size: 14px;
line-height: 22px;
font-weight: 600;
color: #1e2633;
margin-bottom: 8px;
}
.tabBoxDesc {
font-size: 12px;
line-height: 20px;
white-space: nowrap;
font-weight: 400;
color: #8A9099;
font-size: 12px;
line-height: 20px;
white-space: nowrap;
font-weight: 400;
color: #8a9099;
}
.tabBoxTime {
font-size: 12px;
line-height: 20px;
font-weight: 400;
color: #565C66;
margin-left: 8px;
font-size: 12px;
line-height: 20px;
font-weight: 400;
color: #565c66;
margin-left: 8px;
}
.tabBoxMiddle {
display: flex;
align-items: center;
width: 10%;
min-width: 105px;
white-space: nowrap;
display: flex;
align-items: center;
width: 10%;
min-width: 105px;
white-space: nowrap;
}
.tabBoxJobStatus {
display: flex;
align-items: center;
width: 46%;
min-width: 180px;
display: flex;
align-items: center;
width: 46%;
min-width: 180px;
}
.tabBoxStatusText {
font-size: 12px;
line-height: 20px;
font-weight: 400;
color: #1E2633;
margin: 0px 16px 0px 8px;
white-space: nowrap;
font-size: 12px;
line-height: 20px;
font-weight: 400;
color: #1e2633;
margin: 0px 16px 0px 8px;
white-space: nowrap;
}
.tabBoxJobOperate {
width: 10%;
display: flex;
justify-content: center;
width: 10%;
display: flex;
justify-content: center;
}
.tabUpdate {
cursor: pointer;
width: 32px;
height: 32px;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
width: 32px;
height: 32px;
display: flex;
align-items: center;
justify-content: center;
}
.tabUpdate:hover {
background: #F0F2F5;
border-radius: 4px;
}
\ No newline at end of file
background: #f0f2f5;
border-radius: 4px;
}
......@@ -11,13 +11,13 @@
}
.headerBoxShadow {
box-shadow: 0 5px 4px -4px rgb(0, 0, 0, .15);
box-shadow: 0 5px 4px -4px rgb(0, 0, 0, 0.15);
}
.templateBox {
padding: 0 32px;
height: calc(100vh - 168px);
overflow: auto;
overflow: overlay;
}
.templateList {
......
......@@ -16,6 +16,14 @@
margin-bottom: 24px;
}
.templateBox {
display: flex;
flex-wrap: wrap;
/* max-height: calc(100vh - 276px); */
margin: 0 -8px;
overflow-y: overlay;
}
.template {
padding: 0 8px;
box-sizing: border-box;
......@@ -24,7 +32,7 @@
.templateBlock {
height: 194px;
background: #ffffff;
box-shadow: 0px 3px 10px 0px rgba(0, 24, 57, 0.0400);
box-shadow: 0px 3px 10px 0px rgba(0, 24, 57, 0.04);
border-radius: 4px;
border: 1px solid #ebedf0;
padding: 16px 20px;
......@@ -36,19 +44,19 @@
box-sizing: border-box;
}
@media screen and (max-width:1220px) {
@media screen and (max-width: 1220px) {
.template {
width: 50%;
}
}
@media screen and (min-width:1220px) and (max-width:1600px) {
@media screen and (min-width: 1220px) and (max-width: 1600px) {
.template {
width: 33.33333%;
}
}
@media screen and (min-width:1600px) {
@media screen and (min-width: 1600px) {
.template {
width: 25%;
}
......@@ -113,4 +121,4 @@
align-items: center;
flex-direction: column;
cursor: pointer;
}
\ No newline at end of file
}
......@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-05-31 10:18:13
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-08-18 10:01:36
* @LastEditTime: 2022-09-01 10:49:46
* @FilePath: /bkunyun/src/views/Project/ProjectSetting/index.tsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -141,7 +141,7 @@ const ProjectMembers = observer(() => {
</Box>
)}
{templateList.length > 0 && (
<Box sx={{ display: "flex", flexWrap: "wrap", margin: "0 -8px" }}>
<Box className={styles.templateBox}>
{templateList &&
templateList.length > 0 &&
templateList.map((item, key) => {
......
.projectBox {
width: calc(100vw - 220px);
height: calc(100vh - 57px);
background-color: rgba(0, 0, 0, .5);
background-color: rgba(0, 0, 0, 0.5);
/* width: 260px;
height: calc(100vh - 57px); */
/* width: 260px;
......@@ -12,14 +12,14 @@
flex-direction: column; */
}
.mainBox{
.mainBox {
width: 260px;
height: calc(100vh - 57px);
background-color: #fff;
border-right: 1px solid #ebedf0;
display: flex;
flex-direction: column;
border-left: 1px solid #DDE1E6;;
border-left: 1px solid #dde1e6;
}
.searchBox {
......@@ -56,7 +56,7 @@
}
.projectlist {
flex: 1;
overflow-y: scroll;
overflow-y: overlay;
border-top: 1px solid #f0f2f5;
}
.projectli {
......
......@@ -34,11 +34,11 @@
.versionBox {
display: inline-block;
color: #1E2633;
color: #1e2633;
border-radius: 2px;
font-size: 12px;
padding: 2px 8px;
background-color: #F0F2F5;
background-color: #f0f2f5;
}
.searchBox {
......@@ -57,7 +57,7 @@
}
.listBox {
overflow-y: scroll;
overflow-y: overlay;
height: calc(100% - 48px);
position: relative;
}
......
......@@ -3,7 +3,7 @@
height: calc(100vh - 140px);
width: 360px;
box-sizing: border-box;
overflow-y: scroll;
overflow-y: overlay;
padding: 0 24px;
}
.taskInfo {
......@@ -129,10 +129,10 @@
line-height: 20px;
color: rgba(255, 78, 78, 1);
}
.noParameters{
.noParameters {
font-size: 12px;
text-align: center;
color: #C2C6CC;
color: #c2c6cc;
line-height: 84px;
}
......
......@@ -6,7 +6,7 @@
width: 100vw;
height: 100vh;
background-color: RGBA(247, 248, 250, 1);
overflow-y: auto;
overflow-y: overlay;
}
.swHeader {
z-index: 1001;
......
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