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, div::-webkit-scrollbar,
main::-webkit-scrollbar { main::-webkit-scrollbar {
width: 4px; width: 6px;
height: 5px !important; height: 5px !important;
} }
div::-webkit-scrollbar-track, div::-webkit-scrollbar-track,
main::-webkit-scrollbar-track { main::-webkit-scrollbar-track {
background-color: #fff; background-color: #fff;
-webkit-border-radius: 2em; -webkit-border-radius: 3em;
-moz-border-radius: 2em; -moz-border-radius: 3em;
border-radius: 2em; border-radius: 3em;
} }
div::-webkit-scrollbar-thumb, div::-webkit-scrollbar-thumb,
main::-webkit-scrollbar-thumb { main::-webkit-scrollbar-thumb {
background-color: #C2C6CC; background-color: #c2c6cc;
-webkit-border-radius: 2px; -webkit-border-radius: 3px;
-moz-border-radius: 2px; -moz-border-radius: 3px;
border-radius: 2px; border-radius: 3px;
height: 5px !important; height: 5px !important;
width: 4px!important; width: 6px !important;
} }
body, body,
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
background-color: #fff; background-color: #fff;
border-radius: 16px 0 0 0; border-radius: 16px 0 0 0;
box-sizing: border-box; box-sizing: border-box;
overflow: scroll; overflow: overlay;
animation: showDrawer 0.31s ease; animation: showDrawer 0.31s ease;
-webkit-animation: showDrawer 0.31s ease; -webkit-animation: showDrawer 0.31s ease;
margin: 0 auto; margin: 0 auto;
......
...@@ -38,7 +38,7 @@ const useStyles = makeStyles({ ...@@ -38,7 +38,7 @@ const useStyles = makeStyles({
contentWrap: { contentWrap: {
padding: "8px 0", height: 0, transition: "all 1s", position: "absolute", zIndex: 9, width: "100%", 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", backgroundColor: "#FFFFFF", boxShadow: "0px 2px 3px 0px rgba(0, 0, 0, 0.16)", borderRadius: "4px",
overflowY: "scroll", overflowY: "overlay",
maxHeight: "398px" maxHeight: "398px"
}, },
contentWrapOpenPosition:{top:"-400px"}, contentWrapOpenPosition:{top:"-400px"},
......
...@@ -32,7 +32,7 @@ const useStyles = makeStyles({ ...@@ -32,7 +32,7 @@ const useStyles = makeStyles({
contentWrap: { contentWrap: {
padding: "8px 0", height: 0, transition: "all 1s", position: "absolute", zIndex: 9, width: "100%", 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", backgroundColor: "#FFFFFF", boxShadow: "0px 2px 3px 0px rgba(0, 0, 0, 0.16)", borderRadius: "4px",
overflowY: "auto", overflowY: "overlay",
maxHeight: "400px" maxHeight: "400px"
}, },
contentWrapOpen: { height: "auto" }, contentWrapOpen: { height: "auto" },
......
...@@ -42,7 +42,7 @@ const useStyles = makeStyles({ ...@@ -42,7 +42,7 @@ const useStyles = makeStyles({
contentWrap: { contentWrap: {
padding: "8px 0", transition: "all 1s", position: "fixed", zIndex: 9, width: "552px", 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", backgroundColor: "#FFFFFF", boxShadow: "0px 2px 3px 0px rgba(0, 0, 0, 0.16)", borderRadius: "4px",
overflowY: "scroll", overflowY: "overlay",
maxHeight: "398px", maxHeight: "398px",
// position: "fixed", // position: "fixed",
// width: "552px" // width: "552px"
......
...@@ -23,7 +23,7 @@ const theme = createTheme({ ...@@ -23,7 +23,7 @@ const theme = createTheme({
MuiMenu: { MuiMenu: {
styleOverrides: { styleOverrides: {
root: { root: {
overflowY: "scroll", overflow: "overlay",
}, },
}, },
}, },
......
...@@ -14,7 +14,7 @@ const theme = createTheme({ ...@@ -14,7 +14,7 @@ const theme = createTheme({
MuiMenu: { MuiMenu: {
styleOverrides: { styleOverrides: {
root: { root: {
overflowY: "scroll", overflow: "overlay",
}, },
}, },
}, },
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-05-31 10:18:13 * @Date: 2022-05-31 10:18:13
* @LastEditors: 吴永生 15770852798@163.com * @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 * @FilePath: /bkunyun/src/views/Project/ProjectSetting/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
*/ */
...@@ -28,7 +28,7 @@ interface ITabList { ...@@ -28,7 +28,7 @@ interface ITabList {
interface IProps { interface IProps {
value?: string; value?: string;
onChange?: (val: string)=> void; onChange?: (val: string) => void;
tabList: ITabList[]; tabList: ITabList[];
defaultValue?: string; defaultValue?: string;
tabPanelSx?: any; tabPanelSx?: any;
...@@ -88,27 +88,34 @@ const Tabs = (props: IProps) => { ...@@ -88,27 +88,34 @@ const Tabs = (props: IProps) => {
: tabList.filter((e) => !e.hide)[0].value : tabList.filter((e) => !e.hide)[0].value
); );
const [hoverValue, setHoverValue] = useState('') const [hoverValue, setHoverValue] = useState("");
const onTabChange = (val: string) => { const onTabChange = (val: string) => {
setTabValue(val) setTabValue(val);
onChange && onChange(val); onChange && onChange(val);
}; };
const getImgSrc = useCallback((item: ITabList)=>{ const getImgSrc = useCallback(
let result = item.icon (item: ITabList) => {
if(value === item.value){ let result = item.icon;
result = item.iconed if (value === item.value || tabValue === item.value) {
result = item.iconed;
} }
if(hoverValue === item.value){ if (hoverValue === item.value) {
result = item.iconHover result = item.iconHover;
} }
return result return result;
},[hoverValue, value]) },
[hoverValue, value, tabValue]
);
const labelRender = (item: ITabList, key: number) => { const labelRender = (item: ITabList, key: number) => {
return ( 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 ? ( {item.icon ? (
<img <img
style={{ width: "16px", marginRight: "8px" }} style={{ width: "16px", marginRight: "8px" }}
......
/* /*
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-06-10 18:05:21 * @Date: 2022-06-10 18:05:21
* @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com * @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-07-21 11:28:21 * @LastEditTime: 2022-09-01 14:09:28
* @FilePath: /bkunyun/src/views/ConsoleLayout/components/TransferList/index.tsx * @FilePath: /bkunyun/src/views/ConsoleLayout/components/TransferList/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
*/ */
...@@ -43,11 +43,11 @@ const TranSferList = observer(() => { ...@@ -43,11 +43,11 @@ const TranSferList = observer(() => {
size="small" size="small"
/> />
</Box> </Box>
<Box style={{ height: 400, overflowY: "auto" }}> <div style={{ height: 400, overflow: "overlay" }}>
{uploadInfoStore?.fileList.map((item) => { {uploadInfoStore?.fileList.map((item) => {
return <FileItem fileItemInfo={item} key={item.id} />; return <FileItem fileItemInfo={item} key={item.id} />;
})} })}
</Box> </div>
</Box> </Box>
); );
}); });
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
} }
.list { .list {
height: calc(100% - 55px); height: calc(100% - 55px);
overflow-y: auto; overflow-y: overlay;
padding: 15px 20px; padding: 15px 20px;
box-sizing: border-box; box-sizing: border-box;
} }
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
.content { .content {
flex: 1; flex: 1;
height: calc(100vh - 57px); height: calc(100vh - 57px);
overflow: scroll; overflow: overlay;
} }
.listItem { .listItem {
padding: 8px 25px; padding: 8px 25px;
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
} }
.table { .table {
flex: 1; flex: 1;
overflow-y: auto; overflow-y: overlay;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
} }
.datasetLiDataList { .datasetLiDataList {
flex: 1; flex: 1;
overflow: auto; overflow: overlay;
} }
.noDataList { .noDataList {
flex: 1; flex: 1;
......
...@@ -50,10 +50,6 @@ ...@@ -50,10 +50,6 @@
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
} }
/* .tableBox {
height: 300px;
overflow: scroll;
} */
.fileIconBox { .fileIconBox {
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
top: 0; top: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: rgba(0, 0, 0, .5); background-color: rgba(0, 0, 0, 0.5);
z-index: 1002; z-index: 1002;
} }
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
width: 900px; width: 900px;
height: 600px; height: 600px;
background: #282C34; background: #282c34;
box-shadow: 2px 4px 20px 0px rgba(0, 15, 45, 0.1200); box-shadow: 2px 4px 20px 0px rgba(0, 15, 45, 0.12);
border-radius: 8px; border-radius: 8px;
} }
...@@ -29,17 +29,17 @@ ...@@ -29,17 +29,17 @@
.logViewTop { .logViewTop {
/* height: 30px; */ /* height: 30px; */
background-color: #1D2126; background-color: #1d2126;
border-radius: 8px 8px 0 0; border-radius: 8px 8px 0 0;
display: flex; display: flex;
font-size: 12px; font-size: 12px;
color: #8A9099; color: #8a9099;
overflow: auto; overflow: overlay;
} }
.logViewTop::-webkit-scrollbar-track { .logViewTop::-webkit-scrollbar-track {
background-color: #282C34; background-color: #282c34;
} }
.logTitle { .logTitle {
display: flex; display: flex;
...@@ -51,12 +51,12 @@ ...@@ -51,12 +51,12 @@
} }
.logTitleSelected { .logTitleSelected {
background: #282C34; background: #282c34;
color: #FFFFFF; color: #ffffff;
} }
.fileIcon{ .fileIcon {
width: 14px!important; width: 14px !important;
margin-right: 4px; margin-right: 4px;
} }
...@@ -65,18 +65,18 @@ ...@@ -65,18 +65,18 @@
box-sizing: border-box; box-sizing: border-box;
height: 510px; height: 510px;
padding: 16px 24px 0; padding: 16px 24px 0;
color: #D1D6DE; color: #d1d6de;
white-space:pre-wrap; white-space: pre-wrap;
word-break: break-word; word-break: break-word;
overflow: auto; overflow: overlay;
font-size: 14px; font-size: 14px;
line-height: 22px; line-height: 22px;
} }
.logViewContentMask{ .logViewContentMask {
height: 16px; height: 16px;
width: 852px; width: 852px;
background-color: #282C34; background-color: #282c34;
position: absolute; position: absolute;
top: 30px; top: 30px;
left: 24px; left: 24px;
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
} }
.logViewContent::-webkit-scrollbar-track { .logViewContent::-webkit-scrollbar-track {
background-color: #282C34; background-color: #282c34;
} }
.logViewBottom { .logViewBottom {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
background-color: RGBA(247, 248, 250, 1); background-color: RGBA(247, 248, 250, 1);
overflow-y: auto; overflow-y: overlay;
} }
.swHeader { .swHeader {
z-index: 1001; z-index: 1001;
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
background-color: #fff; background-color: #fff;
border-right: 1xp solid rgba(235, 237, 240, 1); border-right: 1xp solid rgba(235, 237, 240, 1);
width: 360px; width: 360px;
overflow-y: scroll; overflow-y: overlay;
box-sizing: border-box; box-sizing: border-box;
padding: 24px; padding: 24px;
} }
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
color: rgba(19, 112, 255, 1); color: rgba(19, 112, 255, 1);
font-size: 14px; font-size: 14px;
} }
.outputItemName{ .outputItemName {
max-width: 172px; max-width: 172px;
white-space: nowrap; white-space: nowrap;
display: block; display: block;
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
position: absolute; position: absolute;
top: 33px; top: 33px;
max-height: 230px; max-height: 230px;
overflow-y: scroll; overflow-y: overlay;
padding: 8px 0px; padding: 8px 0px;
background: #ffffff; background: #ffffff;
box-shadow: 0px 3px 10px 0px rgba(0, 24, 57, 0.14); box-shadow: 0px 3px 10px 0px rgba(0, 24, 57, 0.14);
......
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
display: flex; display: flex;
margin: 16px 16px 0; margin: 16px 16px 0;
height: 156px; height: 156px;
background: #FFFFFF; background: #ffffff;
box-shadow: 2px 2px 6px 0px rgba(0, 25, 57, 0.0300); box-shadow: 2px 2px 6px 0px rgba(0, 25, 57, 0.03);
border-radius: 4px; border-radius: 4px;
} }
.dividingLine { .dividingLine {
height: 156px; height: 156px;
border-left: 1px solid #EBEDF0; border-left: 1px solid #ebedf0;
position: relative; position: relative;
} }
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
width: 26px; width: 26px;
height: 26px; height: 26px;
background-color: #fff; background-color: #fff;
border-top: 1px solid #EBEDF0; border-top: 1px solid #ebedf0;
border-right: 1px solid #EBEDF0; border-right: 1px solid #ebedf0;
transform: rotate(45deg); transform: rotate(45deg);
} }
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
cursor: pointer; cursor: pointer;
} }
.taskName:hover{ .taskName:hover {
color: #1370FF; color: #1370ff;
} }
.taskStatus { .taskStatus {
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
.taskCreator { .taskCreator {
font-size: 12px; font-size: 12px;
line-height: 20px; line-height: 20px;
color: #1E2633; color: #1e2633;
margin-top: 4px; margin-top: 4px;
} }
...@@ -80,13 +80,13 @@ ...@@ -80,13 +80,13 @@
justify-content: space-between; justify-content: space-between;
margin-bottom: 8px; margin-bottom: 8px;
font-size: 12px; font-size: 12px;
color: #565C66; color: #565c66;
} }
.bottomLine { .bottomLine {
display: flex; display: flex;
font-size: 12px; font-size: 12px;
color: #565C66; color: #565c66;
} }
.bottomInfo { .bottomInfo {
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
flex: 1; flex: 1;
display: flex; display: flex;
position: relative; position: relative;
overflow: auto; overflow: overlay;
} }
.noResult { .noResult {
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
left: 50%; left: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
font-size: 14px; font-size: 14px;
color: #8A9099; color: #8a9099;
} }
.resultBox { .resultBox {
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
.result { .result {
box-sizing: border-box; box-sizing: border-box;
font-size: 12px; font-size: 12px;
color: #1E2633; color: #1e2633;
cursor: pointer; cursor: pointer;
height: 30px; height: 30px;
overflow: hidden; overflow: hidden;
...@@ -129,26 +129,26 @@ ...@@ -129,26 +129,26 @@
padding-right: 8px; padding-right: 8px;
} }
@media screen and (max-width:1220px) { @media screen and (max-width: 1220px) {
.result { .result {
width: 100%; width: 100%;
} }
} }
@media screen and (min-width:1220px) and (max-width:1600px) { @media screen and (min-width: 1220px) and (max-width: 1600px) {
.result { .result {
width: 50%; width: 50%;
} }
} }
@media screen and (min-width:1600px) { @media screen and (min-width: 1600px) {
.result { .result {
width: 33.33%; width: 33.33%;
} }
} }
.result:hover { .result:hover {
color: #1370FF; color: #1370ff;
} }
.outputLeftImg { .outputLeftImg {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-05-31 10:18:13 * @Date: 2022-05-31 10:18:13
* @LastEditors: 吴永生 15770852798@163.com * @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 * @FilePath: /bkunyun/src/views/Project/ProjectSetting/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
*/ */
...@@ -160,9 +160,9 @@ const AddMember = observer((props: IProps) => { ...@@ -160,9 +160,9 @@ const AddMember = observer((props: IProps) => {
placeholder="搜索项目成员" placeholder="搜索项目成员"
sx={{ mb: 2 }} sx={{ mb: 2 }}
/> />
<div style={{ overflowY: "scroll", maxHeight: 400 }}> <div style={{ overflow: "overlay", maxHeight: 400 }}>
<MyTable <MyTable
tableContainerStyle={{height: 346}} tableContainerStyle={{ height: 346 }}
checkboxData={(val: string[]) => setCheckData(val)} checkboxData={(val: string[]) => setCheckData(val)}
param="username" param="username"
disabledParam={"enabled"} disabledParam={"enabled"}
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
background-color: RGBA(247, 248, 250, 1); background-color: RGBA(247, 248, 250, 1);
overflow-y: auto; overflow-y: overlay;
} }
.swHeader { .swHeader {
z-index: 1001; z-index: 1001;
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
background-color: #fff; background-color: #fff;
border-right: 1xp solid rgba(235, 237, 240, 1); border-right: 1xp solid rgba(235, 237, 240, 1);
width: 608px; width: 608px;
overflow-y: scroll; overflow-y: overlay;
box-sizing: border-box; box-sizing: border-box;
padding: 36px; padding: 36px;
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: rocosen * @Author: rocosen
* @Date: 2022-06-12 10:05:13 * @Date: 2022-06-12 10:05:13
* @LastEditors: 吴永生 15770852798@163.com * @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 * @FilePath: /bkunyun/src/views/Project/ProjectSetting/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
*/ */
...@@ -50,7 +50,7 @@ const ProjectWorkbench = observer(() => { ...@@ -50,7 +50,7 @@ const ProjectWorkbench = observer(() => {
}, [isPass]); }, [isPass]);
return ( return (
<div style={{ padding: "28px 24px 24px", height: "100%" }}> <div style={{ padding: "28px 24px 24px" }}>
<div style={{ display: "flex", alignItems: "center" }}> <div style={{ display: "flex", alignItems: "center" }}>
<span <span
style={{ style={{
......
/* .headerBox { */ /* .headerBox { */
/* margin-bottom: 20px; */ /* margin-bottom: 20px; */
/* } */ /* } */
.tabHeader { .tabHeader {
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
.body { .body {
margin-top: 24px; margin-top: 24px;
border-top: 1px solid #F0F2F5; border-top: 1px solid #f0f2f5;
overflow: hidden; overflow: hidden;
overflow-y: auto; overflow-y: overlay;
height: calc(100vh - 325px); height: calc(100vh - 325px);
} }
...@@ -25,11 +25,11 @@ ...@@ -25,11 +25,11 @@
display: flex; display: flex;
align-items: center; align-items: center;
width: 100%; width: 100%;
border-bottom: 1px solid #F0F2F5; border-bottom: 1px solid #f0f2f5;
} }
.tabBox:hover { .tabBox:hover {
background-color: #F5F6F7; background-color: #f5f6f7;
} }
.tabBoxInfo { .tabBoxInfo {
...@@ -41,12 +41,11 @@ ...@@ -41,12 +41,11 @@
display: flex; display: flex;
} }
.tabBoxTitle { .tabBoxTitle {
font-size: 14px; font-size: 14px;
line-height: 22px; line-height: 22px;
font-weight: 600; font-weight: 600;
color: #1E2633; color: #1e2633;
margin-bottom: 8px; margin-bottom: 8px;
} }
...@@ -55,14 +54,14 @@ ...@@ -55,14 +54,14 @@
line-height: 20px; line-height: 20px;
white-space: nowrap; white-space: nowrap;
font-weight: 400; font-weight: 400;
color: #8A9099; color: #8a9099;
} }
.tabBoxTime { .tabBoxTime {
font-size: 12px; font-size: 12px;
line-height: 20px; line-height: 20px;
font-weight: 400; font-weight: 400;
color: #565C66; color: #565c66;
margin-left: 8px; margin-left: 8px;
} }
...@@ -85,7 +84,7 @@ ...@@ -85,7 +84,7 @@
font-size: 12px; font-size: 12px;
line-height: 20px; line-height: 20px;
font-weight: 400; font-weight: 400;
color: #1E2633; color: #1e2633;
margin: 0px 16px 0px 8px; margin: 0px 16px 0px 8px;
white-space: nowrap; white-space: nowrap;
} }
...@@ -106,6 +105,6 @@ ...@@ -106,6 +105,6 @@
} }
.tabUpdate:hover { .tabUpdate:hover {
background: #F0F2F5; background: #f0f2f5;
border-radius: 4px; border-radius: 4px;
} }
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
} }
.headerBoxShadow { .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 { .templateBox {
padding: 0 32px; padding: 0 32px;
height: calc(100vh - 168px); height: calc(100vh - 168px);
overflow: auto; overflow: overlay;
} }
.templateList { .templateList {
......
...@@ -16,6 +16,14 @@ ...@@ -16,6 +16,14 @@
margin-bottom: 24px; margin-bottom: 24px;
} }
.templateBox {
display: flex;
flex-wrap: wrap;
/* max-height: calc(100vh - 276px); */
margin: 0 -8px;
overflow-y: overlay;
}
.template { .template {
padding: 0 8px; padding: 0 8px;
box-sizing: border-box; box-sizing: border-box;
...@@ -24,7 +32,7 @@ ...@@ -24,7 +32,7 @@
.templateBlock { .templateBlock {
height: 194px; height: 194px;
background: #ffffff; 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-radius: 4px;
border: 1px solid #ebedf0; border: 1px solid #ebedf0;
padding: 16px 20px; padding: 16px 20px;
...@@ -36,19 +44,19 @@ ...@@ -36,19 +44,19 @@
box-sizing: border-box; box-sizing: border-box;
} }
@media screen and (max-width:1220px) { @media screen and (max-width: 1220px) {
.template { .template {
width: 50%; width: 50%;
} }
} }
@media screen and (min-width:1220px) and (max-width:1600px) { @media screen and (min-width: 1220px) and (max-width: 1600px) {
.template { .template {
width: 33.33333%; width: 33.33333%;
} }
} }
@media screen and (min-width:1600px) { @media screen and (min-width: 1600px) {
.template { .template {
width: 25%; width: 25%;
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-05-31 10:18:13 * @Date: 2022-05-31 10:18:13
* @LastEditors: 吴永生 15770852798@163.com * @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 * @FilePath: /bkunyun/src/views/Project/ProjectSetting/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
*/ */
...@@ -141,7 +141,7 @@ const ProjectMembers = observer(() => { ...@@ -141,7 +141,7 @@ const ProjectMembers = observer(() => {
</Box> </Box>
)} )}
{templateList.length > 0 && ( {templateList.length > 0 && (
<Box sx={{ display: "flex", flexWrap: "wrap", margin: "0 -8px" }}> <Box className={styles.templateBox}>
{templateList && {templateList &&
templateList.length > 0 && templateList.length > 0 &&
templateList.map((item, key) => { templateList.map((item, key) => {
......
.projectBox { .projectBox {
width: calc(100vw - 220px); width: calc(100vw - 220px);
height: calc(100vh - 57px); height: calc(100vh - 57px);
background-color: rgba(0, 0, 0, .5); background-color: rgba(0, 0, 0, 0.5);
/* width: 260px; /* width: 260px;
height: calc(100vh - 57px); */ height: calc(100vh - 57px); */
/* width: 260px; /* width: 260px;
...@@ -12,14 +12,14 @@ ...@@ -12,14 +12,14 @@
flex-direction: column; */ flex-direction: column; */
} }
.mainBox{ .mainBox {
width: 260px; width: 260px;
height: calc(100vh - 57px); height: calc(100vh - 57px);
background-color: #fff; background-color: #fff;
border-right: 1px solid #ebedf0; border-right: 1px solid #ebedf0;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
border-left: 1px solid #DDE1E6;; border-left: 1px solid #dde1e6;
} }
.searchBox { .searchBox {
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
} }
.projectlist { .projectlist {
flex: 1; flex: 1;
overflow-y: scroll; overflow-y: overlay;
border-top: 1px solid #f0f2f5; border-top: 1px solid #f0f2f5;
} }
.projectli { .projectli {
......
...@@ -34,11 +34,11 @@ ...@@ -34,11 +34,11 @@
.versionBox { .versionBox {
display: inline-block; display: inline-block;
color: #1E2633; color: #1e2633;
border-radius: 2px; border-radius: 2px;
font-size: 12px; font-size: 12px;
padding: 2px 8px; padding: 2px 8px;
background-color: #F0F2F5; background-color: #f0f2f5;
} }
.searchBox { .searchBox {
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
} }
.listBox { .listBox {
overflow-y: scroll; overflow-y: overlay;
height: calc(100% - 48px); height: calc(100% - 48px);
position: relative; position: relative;
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
height: calc(100vh - 140px); height: calc(100vh - 140px);
width: 360px; width: 360px;
box-sizing: border-box; box-sizing: border-box;
overflow-y: scroll; overflow-y: overlay;
padding: 0 24px; padding: 0 24px;
} }
.taskInfo { .taskInfo {
...@@ -129,10 +129,10 @@ ...@@ -129,10 +129,10 @@
line-height: 20px; line-height: 20px;
color: rgba(255, 78, 78, 1); color: rgba(255, 78, 78, 1);
} }
.noParameters{ .noParameters {
font-size: 12px; font-size: 12px;
text-align: center; text-align: center;
color: #C2C6CC; color: #c2c6cc;
line-height: 84px; line-height: 84px;
} }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
background-color: RGBA(247, 248, 250, 1); background-color: RGBA(247, 248, 250, 1);
overflow-y: auto; overflow-y: overlay;
} }
.swHeader { .swHeader {
z-index: 1001; 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