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 | 80 +++++++++++++++++++++------------------
1 files changed, 43 insertions(+), 37 deletions(-)
diff --git a/src/tabviews/custom/components/carousel/prop-card/index.jsx b/src/tabviews/custom/components/carousel/prop-card/index.jsx
index dcbb04b..1371a71 100644
--- a/src/tabviews/custom/components/carousel/prop-card/index.jsx
+++ b/src/tabviews/custom/components/carousel/prop-card/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Spin, notification, Carousel, Modal, Checkbox, Button } from 'antd'
+import { Spin, Carousel, Modal, Checkbox, Button } from 'antd'
import { LeftOutlined, RightOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
@@ -49,13 +49,17 @@
}
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) || []
if (_config.$cache) {
- Api.writeCacheConfig(_config.uuid, fromJS(_data).toJS())
+ Api.writeCacheConfig(_config.uuid, fromJS(_data).toJS(), BID)
}
_config.setting.sync = 'false'
@@ -66,16 +70,32 @@
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'
- delete _config.style.height
}
+ delete _config.style.height
_config.subcards.forEach(card => {
card.style.height = _config.wrap.height
@@ -139,13 +159,13 @@
}
initExec = () => {
- const { config } = this.state
+ const { config, BID } = this.state
if (config.wrap.datatype === 'dynamic') {
if (config.$cache) {
if (config.$time) {
if (!this.loaded) {
- Api.getLCacheConfig(config.uuid, config.$time).then(res => {
+ Api.getLCacheConfig(config.uuid, config.$time, BID).then(res => {
if (!res.valid && config.setting.onload === 'true') {
setTimeout(() => {
this.loadData('init')
@@ -164,7 +184,7 @@
}
} else {
if (!this.loaded) {
- Api.getLCacheConfig(config.uuid, 0).then(res => {
+ Api.getLCacheConfig(config.uuid, 0, BID).then(res => {
if (!res.data || this.loaded) return
let _data = res.data[0] || {$$empty: true}
@@ -204,7 +224,7 @@
let _data = window.GLOB.SyncData.get(config.dataName) || []
if (config.$cache) {
- Api.writeCacheConfig(config.uuid, fromJS(_data).toJS())
+ Api.writeCacheConfig(config.uuid, fromJS(_data).toJS(), BID)
}
_data = _data[0] || {$$empty: true}
@@ -270,8 +290,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()
}
@@ -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 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
@@ -356,7 +384,7 @@
this.loaded = true
if (config.$cache && type === 'init') {
- Api.writeCacheConfig(config.uuid, result.data || [])
+ Api.writeCacheConfig(config.uuid, result.data || [], BID)
}
if (!result.data || !result.data[0]) {
@@ -382,37 +410,15 @@
this.timer && this.timer.stop()
}
}
- if (result.message) {
- if (result.ErrCode === 'Y') {
- Modal.success({
- title: result.message
- })
- } else if (result.ErrCode === 'S') {
- notification.success({
- top: 92,
- message: result.message,
- duration: 2
- })
- }
- }
+
+ UtilsDM.querySuccess(result)
} else {
this.setState({
loading: false
})
this.timer && this.timer.stop()
- if (!result.message) return
- if (result.ErrCode === 'N') {
- Modal.error({
- title: result.message,
- })
- } else if (result.ErrCode !== '-2') {
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
- }
+ UtilsDM.queryFail(result)
}
}
--
Gitblit v1.8.0