From d5edf87014863eceaa44f28809ae4b54a39b9a8e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 五月 2025 10:54:05 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/datasource/verifycard/settingform/index.jsx | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/menu/datasource/verifycard/settingform/index.jsx b/src/menu/datasource/verifycard/settingform/index.jsx
index 786e56e..92b8896 100644
--- a/src/menu/datasource/verifycard/settingform/index.jsx
+++ b/src/menu/datasource/verifycard/settingform/index.jsx
@@ -219,6 +219,7 @@
sm: { span: 16 }
}
}
+ let hasUp = !['balcony', 'menubar', 'commonbar', 'tabbar', 'invTable'].includes(config.subtype) && (!config.wrap || config.wrap.supType !== 'multi') && MenuType !== 'billPrint'
return (
<div className="model-datasource-setting-form-box">
@@ -474,7 +475,7 @@
</Radio.Group>)}
</Form.Item>
</Col> : null}
- {!['balcony', 'menubar', 'commonbar', 'tabbar', 'invTable'].includes(config.subtype) && (!config.wrap || config.wrap.supType !== 'multi') && MenuType !== 'billPrint' ? <Col span={8}>
+ {hasUp ? <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title={'璇ョ粍浠跺鏋滃彈鍏朵粬缁勪欢鎺у埗锛岃閫夐」鐩稿簲鐨勭粍浠讹紝娌℃湁鏃堕�夆�滄棤鈥濄��'}>
<QuestionCircleOutlined className="mk-form-tip" />
@@ -679,7 +680,7 @@
</Col> : null}
{config.subtype === 'dualdatacard' ? <Col span={8}>
<Form.Item label={
- <Tooltip placement="topLeft" title="瀛愯〃鍦ㄤ富琛ㄤ腑鐨勬暟鎹泦鍚嶇О锛屼娇鐢� sub_data_string 鏃舵暟鎹互 JSON 瀛楃涓插舰寮忚繑鍥烇紙瀛楁闆嗕腑闇�娣诲姞 sub_data_string 瀛楁锛夈��">
+ <Tooltip placement="topLeft" title="瀛愯〃鍦ㄤ富琛ㄤ腑鐨勬暟鎹泦鍚嶇О锛屼娇鐢� sub_data_string 鏃舵暟鎹互 JSON 瀛楃涓插舰寮忚繑鍥烇紙瀛楁闆嗕腑闇�娣诲姞 sub_data_string 瀛楁锛夛紱褰撲富琛ㄥ瓧娈靛瓨鍦� sub_data_string 涓斿�间笉涓虹┖鏃讹紝浼樺厛浣跨敤涓昏〃鐨� sub_data_string銆�">
<QuestionCircleOutlined className="mk-form-tip" />
瀛愯〃瀛楁
</Tooltip>
@@ -737,6 +738,20 @@
})(<InputNumber min={0} max={60000} precision={0} />)}
</Form.Item>
</Col> : null}
+ {hasUp && setting.supModule && setting.supModule[0] && setting.supModule[0] !== 'empty' ? <Col span={8}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="鏈幏鍙栧埌涓婄骇涓婚敭鍊肩殑鎻愮ず鏂囨湰銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 涓婄骇绌哄�兼彁绀�
+ </Tooltip>
+ }>
+ {getFieldDecorator('supModTip', {
+ initialValue: setting.supModTip || ''
+ })(
+ <Input placeholder={''} autoComplete="off" />
+ )}
+ </Form.Item>
+ </Col> : null}
</Row>
</Form>
<Modal
--
Gitblit v1.8.0