Commit 73308b0d authored by chenshouchao's avatar chenshouchao

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

parents 40510537 1de5044d
.FSBox {
width: 900px;
height: 650px;
max-height: 550px;
position: relative;
}
......
......@@ -447,6 +447,7 @@ const FileSelect = observer((props: FileSelectProps) => {
)}
</div>
<Table
tableContainerStyle={{height: 470}}
footer={false}
rowHover={true}
nopadding={true}
......
......@@ -138,7 +138,8 @@ export default function EnhancedTable(props: ITableProps) {
(rows.length === 0 && !load) && <TableRow>
<TableCell
sx={{
borderBottom: '1px solid #F0F2F5'
borderBottom: '1px solid #F0F2F5',
textAlign: 'center'
}}
colSpan={headCells?.filter((k: any) => k.id === "checkbox")?.length === 0 ? headCells?.length : headCells?.length + 1}
className={classes.TypographyStyle}
......
......@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-05-31 10:18:13
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-08-30 17:13:59
* @LastEditTime: 2022-08-31 18:27:26
* @FilePath: /bkunyun/src/views/Project/ProjectSetting/index.tsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -162,6 +162,7 @@ const AddMember = observer((props: IProps) => {
/>
<div style={{ overflowY: "scroll", maxHeight: 400 }}>
<MyTable
tableContainerStyle={{height: 346}}
checkboxData={(val: string[]) => setCheckData(val)}
param="username"
disabledParam={"enabled"}
......
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