From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/carousel/prop-card/index.jsx | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/custom/components/carousel/prop-card/index.jsx b/src/tabviews/custom/components/carousel/prop-card/index.jsx
index e42ca31..1371a71 100644
--- a/src/tabviews/custom/components/carousel/prop-card/index.jsx
+++ b/src/tabviews/custom/components/carousel/prop-card/index.jsx
@@ -49,8 +49,12 @@
}
if (_config.wrap.datatype === 'dynamic') {
- _config.setting.onload = _config.setting.sync === 'true' ? 'false' : 'true'
+ _config.setting.onload = _config.setting.sync === 'true' ? 'false' : _config.setting.onload || 'true'
+ if (_config.setting.supModule && !BID) {
+ _config.setting.onload = 'false'
+ }
+
if (_config.setting.sync === 'true' && window.GLOB.SyncData.has(_config.dataName)) {
_data = window.GLOB.SyncData.get(_config.dataName) || []
@@ -66,11 +70,27 @@
window.GLOB.SyncData.delete(_config.dataName)
}
+ } else {
+ _config.subcards.forEach(card => {
+ card.elements.forEach(ele => {
+ if (ele.eleType === 'button') return
+ if (ele.datatype === 'dynamic' && ele.field) {
+ ele.field = ele.field.toLowerCase()
+ }
+ })
+ })
}
_data.$$uuid = _data[_config.setting.primaryKey] || ''
_data.$$BID = BID || ''
_data.$$BData = BData || ''
+
+ if (_config.wrap.datatype === 'static' && BData) {
+ Object.keys(BData).forEach(key => {
+ if (/\$/.test(key)) return
+ _data[key.toLowerCase()] = BData[key]
+ })
+ }
if (!_config.wrap.height) { // 鍏煎
_config.wrap.height = _config.style.height || '300px'
@@ -319,8 +339,16 @@
const { config, BID, BData } = this.state
if (config.wrap.datatype === 'static') {
+ let _data = {$$BID: BID || '', $$BData: BData, $$empty: true}
+ if (BData) {
+ Object.keys(BData).forEach(key => {
+ if (/\$/.test(key)) return
+ _data[key.toLowerCase()] = BData[key]
+ })
+ }
+
this.setState({
- data: {$$BID: BID || '', $$BData: BData, $$empty: true}
+ data: _data
})
return
} else if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
--
Gitblit v1.8.0