From c62724a2cdbafa3c660538955acbedafa5a01871 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 01 六月 2024 15:25:21 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/card/balcony/index.jsx | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/tabviews/custom/components/card/balcony/index.jsx b/src/tabviews/custom/components/card/balcony/index.jsx
index 3b9b8f7..e868204 100644
--- a/src/tabviews/custom/components/card/balcony/index.jsx
+++ b/src/tabviews/custom/components/card/balcony/index.jsx
@@ -25,7 +25,6 @@
data: {},
BData: null,
syncData: [],
- show: true,
checked: false
}
@@ -112,7 +111,6 @@
}
}
- let show = true
let syncConfig = null
if (_config.wrap.linkType === 'sync') {
syncConfig = _config.syncConfig
@@ -123,12 +121,9 @@
}
return item
})
- } else if (_config.wrap.linkType === 'sup' && _config.wrap.supControl === 'hidden') {
- show = false
}
this.setState({
- show,
syncConfig,
data: _data,
BID: BID || '',
@@ -330,10 +325,6 @@
} else {
if (!config.wrap.supModule || config.wrap.supModule !== MenuID) return
- if (config.wrap.supControl === 'hidden') {
- this.setState({ show: id ? true : false })
- }
-
if (id !== this.state.BID || id !== '') {
this.setState({ BID: id, BData: data }, () => {
this.loadData()
@@ -461,9 +452,10 @@
}
render() {
- const { config, loading, data, show, syncConfig, syncData, checked } = this.state
+ const { config, loading, data, syncConfig, syncData, checked, BID } = this.state
if (config.wrap.empty === 'hidden' && (!data || data.$$empty)) return null
+ if (config.wrap.supControl === 'hidden' && !BID) return null
let style = {...config.style}
if (config.wrap.bgField) {
@@ -471,7 +463,7 @@
}
return (
- <div className={'custom-balcony-box' + (!show ? ' hidden' : '')} id={'anchor' + config.uuid} style={style} onClick={this.triggerButton}>
+ <div className="custom-balcony-box" id={'anchor' + config.uuid} style={style} onClick={this.triggerButton}>
{loading ?
<div className="loading-mask" onClick={(e) => e.stopPropagation()}>
<div className="ant-spin-blur"></div>
--
Gitblit v1.8.0