Commit 161c6ae3 by zhaochengxiang

样式调整

parent 05948e99
......@@ -177,7 +177,7 @@ tr.drop-over-upward td {
.tooltip-common {
max-width: 450px;
max-height: 700px;
max-height: 300px;
.yy-popover-inner-content {
padding: 8px !important;
......
......@@ -717,7 +717,7 @@ const ImportActionTable = (props) => {
},
{
title: 'Not Null',
width: 70,
width: 80,
dataIndex: 'notNull',
editable: (type==='model'?true:false),
render: (notNull, record, index) => {
......@@ -1019,15 +1019,10 @@ const ImportActionTable = (props) => {
const mergedColumns = () => {
const hasValidateReports = (validateReports||[]).filter(report => report.type==='DataModelAttribute').length>0;
if (editable || action==='flow') {
if (editable) {
let _columns = hasValidateReports ? includeValidateEditableColumn: editableColumn;
//审批页面不显示重点关注
if (action==='flow') {
_columns = _columns.filter((col) => col.dataIndex!=='needAttention');
}
return _columns.map((col) => {
if (!col.editable) {
return col;
......@@ -1048,7 +1043,11 @@ const ImportActionTable = (props) => {
});
}
return hasValidateReports ? includeValidateColumn : columns;
//非编辑状态下 隐藏重点关注
let _columns = hasValidateReports ? includeValidateColumn: columns;
_columns = _columns.filter((col) => col.dataIndex!=='needAttention');
return _columns;
}
const moveRow = useCallback(
......
......@@ -47,7 +47,7 @@ const ModelNameColumn = (props) => {
let _textComponent = <span>{text}</span>;
if (data.digest) {
_textComponent = <div style={{ width: 400, maxHeight: 600, overflow: 'auto' }}>
_textComponent = <div style={{ width: 400, maxHeight: 300, overflow: 'auto' }}>
<Descriptions className='model-digest-descritpion' column={2} size='small'>
<Descriptions.Item label='模型名称'>
{ data.digest.name||'' }
......
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