From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/form/simple-form/index.jsx | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/form/simple-form/index.jsx b/src/menu/components/form/simple-form/index.jsx
index 120d9f4..a6de6f5 100644
--- a/src/menu/components/form/simple-form/index.jsx
+++ b/src/menu/components/form/simple-form/index.jsx
@@ -348,10 +348,7 @@
index = i
}
- let label = item.label || ''
- if (item.field && item.field.toLowerCase() !== label.toLowerCase()) {
- label = label + ' (' + item.field + ')'
- }
+ let label = `${item.field || ''}锛�${item.label}锛塦
if (['text', 'number', 'textarea', 'color'].includes(item.type) && _item.field !== item.field) {
_inputfields.push({
@@ -476,11 +473,13 @@
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')
param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${param.timestamp}'`)
+ param.LText = param.LText.replace(/\n/g, ' ')
param.LText = Utils.formatOptions(param.LText)
param.secretkey = Utils.encrypt('', param.timestamp)
@@ -583,7 +582,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) {
@@ -599,6 +599,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