Commit b48854d1c70d25e6141d149e04e0003352c1bce3
1 parent
4f5e7cf7
1.处理弹窗备注框样式
Showing
3 changed files
with
10 additions
and
1 deletions
src/components/Common/CommonComponent/index.js
| @@ -1971,6 +1971,9 @@ export default class CommonComponent extends Component { | @@ -1971,6 +1971,9 @@ export default class CommonComponent extends Component { | ||
| 1971 | extraClassName = "sideInfoTitle"; | 1971 | extraClassName = "sideInfoTitle"; |
| 1972 | } | 1972 | } |
| 1973 | } else { | 1973 | } else { |
| 1974 | + if( this.props.showConfig.sName === 'sMemo'){ | ||
| 1975 | + extraClassName = "memoInfoTitle"; | ||
| 1976 | + } | ||
| 1974 | // if (showNameNew?.length > 7) { | 1977 | // if (showNameNew?.length > 7) { |
| 1975 | // titleStyle.fontSize = 14; | 1978 | // titleStyle.fontSize = 14; |
| 1976 | // } else if (showNameNew?.length > 6) { | 1979 | // } else if (showNameNew?.length > 6) { |
src/indexNew.less
| @@ -117,6 +117,12 @@ | @@ -117,6 +117,12 @@ | ||
| 117 | flex-flow: row nowrap; | 117 | flex-flow: row nowrap; |
| 118 | } | 118 | } |
| 119 | 119 | ||
| 120 | + .memoInfoTitle{ | ||
| 121 | + .ant-form-item-label:not(.skipFlexBasis) { | ||
| 122 | + height: auto !important; // 干掉固定40px,由父flex拉伸高度 | ||
| 123 | + } | ||
| 124 | + } | ||
| 125 | + | ||
| 120 | .ant-form-item-label:not(.skipFlexBasis) { | 126 | .ant-form-item-label:not(.skipFlexBasis) { |
| 121 | background-color: var(--form-label-bgColor, #EEEEEE) !important; | 127 | background-color: var(--form-label-bgColor, #EEEEEE) !important; |
| 122 | // flex-basis: 160px !important; | 128 | // flex-basis: 160px !important; |
src/mes/common/commonModalComponent/index.js
| @@ -6,7 +6,7 @@ import RouterComponent from "@/routes/mes/routerComponent"; | @@ -6,7 +6,7 @@ import RouterComponent from "@/routes/mes/routerComponent"; | ||
| 6 | import * as commonUtils from "@/utils/utils"; | 6 | import * as commonUtils from "@/utils/utils"; |
| 7 | 7 | ||
| 8 | const CommonModalComponent = props => { | 8 | const CommonModalComponent = props => { |
| 9 | - const bSmall = props?.sModelsId ==='17211911815017669983448000'; | 9 | + const bSmall = props?.sModelsId ==='17211911815017669983448000' || '172117190122117805553443590'; |
| 10 | const { | 10 | const { |
| 11 | visible, | 11 | visible, |
| 12 | title, | 12 | title, |