From 79e4981aa6cc9354276fc54cdf6d14eb08ab7fee Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 22 六月 2023 15:59:04 +0800
Subject: [PATCH] Merge branch 'develop' of ssh://121.36.20.145:29418/~jinfei/pc-plat into develop
---
src/tabviews/custom/components/iframe/index.jsx | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/tabviews/custom/components/iframe/index.jsx b/src/tabviews/custom/components/iframe/index.jsx
index 62981a9..b8397f3 100644
--- a/src/tabviews/custom/components/iframe/index.jsx
+++ b/src/tabviews/custom/components/iframe/index.jsx
@@ -65,6 +65,10 @@
}
}
+ if (_config.wrap.height === '100vh') {
+ _config.wrap.height = 'calc(100vh - 92px)'
+ }
+
this.setState({
linkUrl: linkUrl,
sync: _sync,
@@ -257,7 +261,7 @@
</div> : null}
<div className="iframe-wrap" style={{height: config.wrap.height}}>
{loading ? <div className="mask"><Spin size="large" /></div> : null}
- {linkUrl ? <iframe title="mk" className="iframe" src={linkUrl} frameBorder="0"></iframe> : <Empty description={false}/>}
+ {linkUrl ? <iframe title="mk" className="iframe" src={linkUrl.replace(/@userid@/ig, sessionStorage.getItem('UserID')).replace(/@loginuid@/ig, sessionStorage.getItem('LoginUID'))} frameBorder="0"></iframe> : <Empty description={false}/>}
</div>
</div>
)
--
Gitblit v1.8.0