From b0c7a660750a8b29e7f8b3a648296d56c50fd2ca Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 29 十一月 2022 18:43:10 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/form/simple-form/index.jsx | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/form/simple-form/index.jsx b/src/menu/components/form/simple-form/index.jsx
index ac0ecf3..beaab97 100644
--- a/src/menu/components/form/simple-form/index.jsx
+++ b/src/menu/components/form/simple-form/index.jsx
@@ -476,7 +476,8 @@
let param = {
func: 's_debug_sql',
exec_type: 'y',
- LText: res.dataSource
+ LText: `declare @mk_organization nvarchar(512)
+ ${res.dataSource}`
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
@@ -584,7 +585,8 @@
}
updateWrap = (res) => {
- let _card = {...this.state.card, wrap: res}
+ let _card = fromJS(this.state.card).toJS()
+ _card.wrap = res
if (res.datatype === 'static') {
if (res.supModule && res.supModule.length > 0) {
@@ -600,6 +602,12 @@
_card.subcards[0].setting.enable = _card.wrap.enable
_card.subcards[0].setting.verticalSpace = _card.wrap.verticalSpace
+ if (_card.wrap.closeEnable === 'true' && !_card.subcards[0].closeButton) {
+ _card.subcards[0].closeButton = {label: '鍏抽棴', enable: 'true', type: 'close', style: {backgroundColor: '#ffffff', color: 'rgba(0,0,0,0.65)', borderColor: '#d9d9d9', borderWidth: '1px', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px', marginLeft: '10px'}}
+ } else if (_card.subcards[0].closeButton) {
+ _card.subcards[0].closeButton.enable = _card.wrap.closeEnable
+ }
+
this.updateComponent(_card)
}
--
Gitblit v1.8.0