diff --git a/src/components/Common/CommonComponent/index.js b/src/components/Common/CommonComponent/index.js index 689ffbf..13fd3cb 100644 --- a/src/components/Common/CommonComponent/index.js +++ b/src/components/Common/CommonComponent/index.js @@ -1971,6 +1971,9 @@ export default class CommonComponent extends Component { extraClassName = "sideInfoTitle"; } } else { + if( this.props.showConfig.sName === 'sMemo'){ + extraClassName = "memoInfoTitle"; + } // if (showNameNew?.length > 7) { // titleStyle.fontSize = 14; // } else if (showNameNew?.length > 6) { diff --git a/src/indexNew.less b/src/indexNew.less index 1f385a8..6cb161c 100644 --- a/src/indexNew.less +++ b/src/indexNew.less @@ -117,6 +117,12 @@ flex-flow: row nowrap; } + .memoInfoTitle{ + .ant-form-item-label:not(.skipFlexBasis) { + height: auto !important; // 干掉固定40px,由父flex拉伸高度 + } + } + .ant-form-item-label:not(.skipFlexBasis) { background-color: var(--form-label-bgColor, #EEEEEE) !important; // flex-basis: 160px !important; diff --git a/src/mes/common/commonModalComponent/index.js b/src/mes/common/commonModalComponent/index.js index bfc5a82..21baf95 100644 --- a/src/mes/common/commonModalComponent/index.js +++ b/src/mes/common/commonModalComponent/index.js @@ -6,7 +6,7 @@ import RouterComponent from "@/routes/mes/routerComponent"; import * as commonUtils from "@/utils/utils"; const CommonModalComponent = props => { - const bSmall = props?.sModelsId ==='17211911815017669983448000'; + const bSmall = props?.sModelsId ==='17211911815017669983448000' || '172117190122117805553443590'; const { visible, title,