From 5064543dd5f85cb0754153bf033328ec9224484c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 13:49:32 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/views/tabledesign/index.jsx | 14 ++++---
src/tabviews/custom/components/card/double-data-card/index.scss | 1
src/api/index.js | 6 ++
src/views/pcdesign/index.jsx | 14 ++++---
src/tabviews/custom/components/card/double-data-card/index.jsx | 7 +++
src/tabviews/custom/components/card/data-card/index.scss | 1
src/views/mobdesign/index.jsx | 16 +++++---
src/views/menudesign/index.jsx | 14 ++++---
src/tabviews/custom/components/card/data-card/index.jsx | 7 +++
src/tabviews/custom/components/card/table-card/index.scss | 7 +++
10 files changed, 58 insertions(+), 29 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 814b0dd..c8b3c80 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -48,7 +48,11 @@
axios.interceptors.response.use((response) => {
if (response.data.ErrCode === 'LoginError') {
- if (window.debugger === true || window.GLOB.saving) {
+ if (window.debugger === true) {
+ response.data.ErrCode = 'E'
+ return Promise.resolve(response.data)
+ } else if (window.GLOB.developing) {
+ sessionStorage.setItem('devError', 'true')
response.data.ErrCode = 'E'
return Promise.resolve(response.data)
} else if (!sessionStorage.getItem('loginError')) {
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 6d1c6ea..9b84661 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -81,6 +81,7 @@
}
_config.$extend = false
+ _config.$empty = true
_config.subcards.forEach(item => {
if (item.setting.click === 'button' && !item.setting.linkbtn) {
@@ -98,9 +99,13 @@
_card = item
} else if (!_card) {
_config.$extend = true
+ if (item.setting.width !== 24) {
+ _config.$empty = false
+ }
precards.push(item)
} else {
_config.$extend = true
+ _config.$empty = false
nextcards.push(item)
}
})
@@ -1045,8 +1050,8 @@
))}
</Row>
{switchable ? <div className={'prev-page ' + (total <= _total ? 'disabled' : '')} onClick={this.nextPage}><div><div><img src={nextImg} alt=""/></div></div></div> : null}
- {!config.$extend && (!data || data.length === 0) ? <Empty description={false}/> : null}
</div>
+ {config.$empty && (!data || data.length === 0) ? <Empty description={false}/> : null}
{config.wrap.pagestyle === 'page' && data ? <Pagination size="small" total={total} showTotal={(t, range) => total > 0 ? `${range[0]}-${range[1]} 鍏� ${total} 鏉 : `鍏� ${total} 鏉} pageSize={pageSize} showSizeChanger={true} pageSizeOptions={this.state.pageOptions} onChange={this.changePageIndex} onShowSizeChange={this.pageSizeChange} current={pageIndex}/> : null}
{config.wrap.pagestyle === 'more' && data && data.length > 0 ? <div className={'mk-more' + (pageSize * pageIndex >= total ? ' disabled' : '')} onClick={this.loadMore}>鏌ョ湅鏇村<DownOutlined/></div> : null}
</div>
diff --git a/src/tabviews/custom/components/card/data-card/index.scss b/src/tabviews/custom/components/card/data-card/index.scss
index 34a81cf..bb71f96 100644
--- a/src/tabviews/custom/components/card/data-card/index.scss
+++ b/src/tabviews/custom/components/card/data-card/index.scss
@@ -104,7 +104,6 @@
}
.ant-empty {
- width: 100%;
min-height: 100px;
padding-top: 15px;
diff --git a/src/tabviews/custom/components/card/double-data-card/index.jsx b/src/tabviews/custom/components/card/double-data-card/index.jsx
index 33637fa..ddf5d2d 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -79,6 +79,7 @@
}
_config.$extend = false
+ _config.$empty = true
_config.subcards.forEach(item => {
if (item.setting.click === 'button' && !item.setting.linkbtn) {
@@ -96,9 +97,13 @@
_card = item
} else if (!_card) {
_config.$extend = true
+ if (item.setting.width !== 24) {
+ _config.$empty = false
+ }
precards.push(item)
} else {
_config.$extend = true
+ _config.$empty = false
nextcards.push(item)
}
})
@@ -1056,8 +1061,8 @@
</Col>
))}
</Row>
- {!config.$extend && (!data || data.length === 0) ? <Empty description={false}/> : null}
</div>
+ {config.$empty && (!data || data.length === 0) ? <Empty description={false}/> : null}
</div>
{config.wrap.pagestyle === 'page' && data ? <Pagination size="small" total={total} showTotal={(t, range) => total > 0 ? `${range[0]}-${range[1]} 鍏� ${total} 鏉 : `鍏� ${total} 鏉} pageSize={pageSize} showSizeChanger={true} pageSizeOptions={this.state.pageOptions} onChange={this.changePageIndex} onShowSizeChange={this.pageSizeChange} current={pageIndex}/> : null}
{config.wrap.pagestyle === 'more' && data && data.length > 0 ? <div className={'mk-more' + (pageSize * pageIndex >= total ? ' disabled' : '')} onClick={this.loadMore}>鏌ョ湅鏇村<DownOutlined/></div> : null}
diff --git a/src/tabviews/custom/components/card/double-data-card/index.scss b/src/tabviews/custom/components/card/double-data-card/index.scss
index b3a5b8a..0ee2e47 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.scss
+++ b/src/tabviews/custom/components/card/double-data-card/index.scss
@@ -76,7 +76,6 @@
}
.ant-empty {
- width: 100%;
min-height: 100px;
padding-top: 15px;
diff --git a/src/tabviews/custom/components/card/table-card/index.scss b/src/tabviews/custom/components/card/table-card/index.scss
index c7b6fc8..088083a 100644
--- a/src/tabviews/custom/components/card/table-card/index.scss
+++ b/src/tabviews/custom/components/card/table-card/index.scss
@@ -105,6 +105,13 @@
cursor: not-allowed;
color: #bcbcbc;
}
+ .ant-empty {
+ min-height: 100px;
+ padding-top: 15px;
+ .ant-empty-image {
+ height: 60px;
+ }
+ }
}
.custom-card-box::after {
diff --git a/src/views/menudesign/index.jsx b/src/views/menudesign/index.jsx
index eac50e4..fdf22ba 100644
--- a/src/views/menudesign/index.jsx
+++ b/src/views/menudesign/index.jsx
@@ -73,6 +73,13 @@
}
UNSAFE_componentWillMount() {
+ if (sessionStorage.getItem('devError') === 'true') {
+ sessionStorage.clear()
+ window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
+ window.location.reload()
+ return
+ }
+
if (!sessionStorage.getItem('UserID')) {
sessionStorage.removeItem('isEditState')
sessionStorage.removeItem('appType')
@@ -87,6 +94,7 @@
window.GLOB.TabsMap = new Map() // 缂撳瓨鐢ㄦ埛鎿嶄綔鐨勬爣绛鹃〉
window.GLOB.urlFields = [] // url鍙橀噺
window.GLOB.customMenu = null // 淇濆瓨鑿滃崟淇℃伅
+ window.GLOB.developing = true
try {
let param = JSON.parse(window.decodeURIComponent(window.atob(this.props.match.params.param)))
@@ -864,8 +872,6 @@
menuloading: true
})
- window.GLOB.saving = true
-
setTimeout(() => {
let _pass = this.verifyConfig(config)
@@ -1029,8 +1035,6 @@
menuloading: false
})
- window.GLOB.saving = false
-
if (!res) return
if (res.status) {
@@ -1055,8 +1059,6 @@
this.setState({
menuloading: false
})
-
- window.GLOB.saving = false
if (!error) {
notification.warning({
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index 9fca5e9..7c8d241 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -81,6 +81,13 @@
}
UNSAFE_componentWillMount() {
+ if (sessionStorage.getItem('devError') === 'true') {
+ sessionStorage.clear()
+ window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
+ window.location.reload()
+ return
+ }
+
if (!sessionStorage.getItem('UserID')) {
sessionStorage.removeItem('isEditState')
sessionStorage.removeItem('editMenuType')
@@ -90,6 +97,9 @@
}
if (memberLevel < 30) return
+
+ window.GLOB.developing = true
+
try {
let param = JSON.parse(window.decodeURIComponent(window.atob(this.props.match.params.param)))
@@ -1440,8 +1450,6 @@
menuloading: true
})
- window.GLOB.saving = true
-
setTimeout(() => {
let _pass = this.verifyConfig(config)
@@ -1699,8 +1707,6 @@
menuloading: false
})
- window.GLOB.saving = false
-
if (!res) return
if (res.status) {
@@ -1735,8 +1741,6 @@
this.setState({
menuloading: false
})
-
- window.GLOB.saving = false
if (!error) {
notification.warning({
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index 2badd14..a8dcca3 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -76,6 +76,13 @@
}
UNSAFE_componentWillMount() {
+ if (sessionStorage.getItem('devError') === 'true') {
+ sessionStorage.clear()
+ window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
+ window.location.reload()
+ return
+ }
+
if (!sessionStorage.getItem('UserID')) {
sessionStorage.removeItem('isEditState')
sessionStorage.removeItem('appType')
@@ -92,6 +99,7 @@
window.GLOB.CacheIndependent = new Map()
window.GLOB.urlFields = [] // url鍙橀噺
window.GLOB.customMenu = null // 淇濆瓨鑿滃崟淇℃伅
+ window.GLOB.developing = true
try {
let param = JSON.parse(window.decodeURIComponent(window.atob(this.props.match.params.param)))
@@ -1178,8 +1186,6 @@
menuloading: true
})
- window.GLOB.saving = true
-
setTimeout(() => {
let _pass = this.verifyConfig(config)
@@ -1419,8 +1425,6 @@
menuloading: false
})
- window.GLOB.saving = false
-
if (!res) return
if (res.status) {
@@ -1456,8 +1460,6 @@
menuloading: false
})
- window.GLOB.saving = false
-
if (!error) {
notification.warning({
top: 92,
diff --git a/src/views/tabledesign/index.jsx b/src/views/tabledesign/index.jsx
index 25d0d54..759be21 100644
--- a/src/views/tabledesign/index.jsx
+++ b/src/views/tabledesign/index.jsx
@@ -63,6 +63,13 @@
}
UNSAFE_componentWillMount() {
+ if (sessionStorage.getItem('devError') === 'true') {
+ sessionStorage.clear()
+ window.history.replaceState(null, null, window.location.href.split('#')[0] + '#/login')
+ window.location.reload()
+ return
+ }
+
if (!sessionStorage.getItem('UserID')) {
sessionStorage.removeItem('isEditState')
sessionStorage.removeItem('appType')
@@ -77,6 +84,7 @@
window.GLOB.TabsMap = new Map() // 缂撳瓨鐢ㄦ埛鎿嶄綔鐨勬爣绛鹃〉
window.GLOB.urlFields = [] // url鍙橀噺
window.GLOB.customMenu = null // 淇濆瓨鑿滃崟淇℃伅
+ window.GLOB.developing = true
try {
let param = JSON.parse(window.decodeURIComponent(window.atob(this.props.match.params.param)))
@@ -576,8 +584,6 @@
menuloading: true
})
- window.GLOB.saving = true
-
setTimeout(() => {
let _pass = this.verifyConfig(config)
@@ -680,8 +686,6 @@
menuloading: false
})
- window.GLOB.saving = false
-
if (!res) return
if (res.status) {
@@ -706,8 +710,6 @@
this.setState({
menuloading: false
})
-
- window.GLOB.saving = false
if (!error) {
notification.warning({
--
Gitblit v1.8.0