From c547c75fce3c2d9badcb496da7d8e5443e22dbfc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 八月 2024 17:10:41 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/share/tabtransfer/index.jsx | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/custom/components/share/tabtransfer/index.jsx b/src/tabviews/custom/components/share/tabtransfer/index.jsx
index 9157f43..56a17af 100644
--- a/src/tabviews/custom/components/share/tabtransfer/index.jsx
+++ b/src/tabviews/custom/components/share/tabtransfer/index.jsx
@@ -128,8 +128,8 @@
let param = getStructuredParams(params, config, BID)
if (config.$cache && config.$time) {
- Api.getLCacheConfig(params[0].uuid, config.$time).then(res => {
- if (!res) {
+ Api.getLCacheConfig(params[0].uuid, config.$time, BID).then(res => {
+ if (!res.valid) {
this.getMainData(param, params, config.uuid)
}
})
@@ -168,6 +168,10 @@
MKEmitter.emit('transferSyncData', tabId)
if (!result.message) return
+
+ if (/灏嗘埅鏂瓧绗︿覆鎴栦簩杩涘埗鏁版嵁/ig.test(result.message)) {
+ result.message = result.message + '璇锋鏌ュ瓧娈甸泦'
+ }
if (result.ErrCode === 'N') {
Modal.error({
title: result.message,
@@ -290,9 +294,7 @@
)
} else if (item.type === 'group' && item.subtype === 'normalgroup') {
return (
- <Col span={item.width} style={style} key={item.uuid}>
- <NormalGroup config={item}/>
- </Col>
+ <NormalGroup config={item} style={style} key={item.uuid}/>
)
} else if (item.type === 'form' && item.subtype === 'simpleform') {
return (
@@ -384,7 +386,7 @@
}
return (
- <Row className="component-wrap" id={'anchor' + config.uuid} gutter={8}>{this.getComponents(config.components)}</Row>
+ <Row className="component-wrap" id={'anchor' + config.uuid}>{this.getComponents(config.components)}</Row>
)
}
}
--
Gitblit v1.8.0