diff --git a/src/components/Common/CommonComponent/index.js b/src/components/Common/CommonComponent/index.js index b010303..9fca28b 100644 --- a/src/components/Common/CommonComponent/index.js +++ b/src/components/Common/CommonComponent/index.js @@ -2755,6 +2755,7 @@ export default class CommonComponent extends Component { // top: this.props.name === 'slaveInfo' ? '1px' : '', // left: this.props.name === 'slaveInfo' ? '2px' : this.props.name === 'master' ? '1px' : '', position: 'absolute', + width:'100%', height: '100%', overflow: 'hidden', }} diff --git a/src/components/Common/CommonHooks/useCommonBase.js b/src/components/Common/CommonHooks/useCommonBase.js index 67d6208..437630f 100644 --- a/src/components/Common/CommonHooks/useCommonBase.js +++ b/src/components/Common/CommonHooks/useCommonBase.js @@ -3011,6 +3011,9 @@ const useCommonBase = props => { }); } + console.log('111', sControlName); + + // 预览 if (sControlName.toLowerCase().includes("preview")) { const [, , targetField] = sControlName.split("."); diff --git a/src/default.less b/src/default.less index 1add3ee..b6bfc0d 100644 --- a/src/default.less +++ b/src/default.less @@ -234,7 +234,7 @@ background: #f1f2f8 !important; } } - + } input[disabled] { color: #000 !important; @@ -372,9 +372,9 @@ margin-left: 6px; margin-top: 6px; } - + } - + .ant-modal { max-width: unset; } @@ -949,17 +949,19 @@ } .masterLinkSpan { + font-size: 20px; width: auto; height: 26px; - line-height: 26px; + line-height: 37px; overflow: hidden; color: #2f54eb; position: absolute; - padding-right: 2px; + padding-right: 3px; z-index: 10; cursor: pointer; + background: #fff; + left: 8px; } - /* checkBill commonView区域 */ .checkbillStyle .masterLinkSpan { width: 100%; @@ -1032,4 +1034,4 @@ background: #f1f2f8 !important; } } -} \ No newline at end of file +}