From 68d839ab51dab23bcb12cfe243b318203025451b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 17 十二月 2020 18:39:54 +0800
Subject: [PATCH] 2020-12-17
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 29 ++++++++++++++++++-----------
src/tabviews/custom/components/card/prop-card/index.jsx | 2 +-
src/components/header/index.jsx | 17 ++++++++++++++++-
src/tabviews/custom/components/card/data-card/index.jsx | 2 +-
4 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index 12a849a..f9fdafa 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -585,7 +585,22 @@
}
changeSystem = (system) => {
- let href = system.LinkUrl1 + 'index.html#/ssologin/' + window.btoa(window.encodeURIComponent(JSON.stringify({
+ let url = system.LinkUrl1
+
+ if (!url) {
+ notification.warning({
+ top: 92,
+ message: '绯荤粺鍦板潃涓嶅瓨鍦紒',
+ duration: 5
+ })
+ return
+ } else if (/index\.html/ig.test(url)) {
+ url = url.replace(/index\.html.*/ig, '')
+ } else if (!/\/$/ig.test(url)) {
+ url = url + '/'
+ }
+
+ let href = url + 'index.html#/ssologin/' + window.btoa(window.encodeURIComponent(JSON.stringify({
UserID: sessionStorage.getItem('UserID'),
LoginUID: sessionStorage.getItem('LoginUID'),
User_Name: sessionStorage.getItem('User_Name'),
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 0b3b3ac..14b4bdb 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -94,18 +94,25 @@
duration: 5
})
return
- } else {
- url = data.LinkUrl1 + 'index.html#/ssologin/' + window.btoa(window.encodeURIComponent(JSON.stringify({
- UserID: sessionStorage.getItem('UserID'),
- LoginUID: sessionStorage.getItem('LoginUID'),
- User_Name: sessionStorage.getItem('User_Name'),
- Full_Name: sessionStorage.getItem('Full_Name'),
- avatar: sessionStorage.getItem('avatar'),
- dataM: data.dataM ? 'true' : '',
- debug: data.debug || '',
- role_id: data.role_id || ''
- })))
}
+
+ let _url = data.LinkUrl1
+ if (/index\.html/ig.test(_url)) {
+ _url = _url.replace(/index\.html.*/ig, '')
+ } else if (!/\/$/ig.test(_url)) {
+ _url = _url + '/'
+ }
+
+ url = _url + 'index.html#/ssologin/' + window.btoa(window.encodeURIComponent(JSON.stringify({
+ UserID: sessionStorage.getItem('UserID'),
+ LoginUID: sessionStorage.getItem('LoginUID'),
+ User_Name: sessionStorage.getItem('User_Name'),
+ Full_Name: sessionStorage.getItem('Full_Name'),
+ avatar: sessionStorage.getItem('avatar'),
+ dataM: data.dataM ? 'true' : '',
+ debug: data.debug || '',
+ role_id: data.role_id || ''
+ })))
} else {
let Id = ''
let con = '?'
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 0e5a924..348ed3f 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -349,7 +349,7 @@
getexceloutparam={this.getexceloutparam}
/> : null
}
- <div className={`data-zoom ${config.wrap.cardType} ${config.wrap.scale}`}>
+ <div className={`data-zoom ${config.wrap.cardType || ''} ${config.wrap.scale || ''}`}>
{switchable ? <div className={'prev-page ' + (pageIndex === 1 ? 'disabled' : '')} onClick={this.prevPage}><div><div><img src={preImg} alt=""/></div></div></div> : null}
{data && data.length > 0 ? <div className="card-row-list">
{data.map((item, index) => (
diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index f072388..757af64 100644
--- a/src/tabviews/custom/components/card/prop-card/index.jsx
+++ b/src/tabviews/custom/components/card/prop-card/index.jsx
@@ -263,7 +263,7 @@
<Spin />
</div> : null
}
- <div className={`card-row-list ${config.wrap.cardType} ${config.wrap.scale}`}>
+ <div className={`card-row-list ${config.wrap.cardType || ''} ${config.wrap.scale || ''}`}>
{config.subcards.map((item, index) => (
<Col className={activeKey === index ? 'active' : ''} key={index} span={item.setting.width || 6} offset={item.offset || 0} onClick={() => {this.changeCard(index, item)}}>
<CardItem card={item} cards={config} data={data} updateStatus={this.updateStatus}/>
--
Gitblit v1.8.0