From 8a6ce370f1aa1c061b76fa3e9d2d4d1df53ca4c5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 五月 2024 16:38:09 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/card/prop-card/index.jsx | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index 7885b03..cda84d4 100644
--- a/src/tabviews/custom/components/card/prop-card/index.jsx
+++ b/src/tabviews/custom/components/card/prop-card/index.jsx
@@ -72,6 +72,14 @@
this.loaded = true
} else if (_config.wrap.datatype === 'static') {
this.loaded = true
+ _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.$$BID = BID || ''
@@ -80,7 +88,7 @@
if (_config.wrap.datatype === 'static' && BData) {
Object.keys(BData).forEach(key => {
if (/\$/.test(key)) return
- _data[key] = BData[key]
+ _data[key.toLowerCase()] = BData[key]
})
}
@@ -434,8 +442,8 @@
if (config.uuid !== menuId) return
- if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+ MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
} else {
this.loadData('', btn)
}
@@ -506,7 +514,7 @@
if (BData) {
Object.keys(BData).forEach(key => {
if (/\$/.test(key)) return
- _data[key] = BData[key]
+ _data[key.toLowerCase()] = BData[key]
})
}
--
Gitblit v1.8.0