From f9816a4078fdba44115c69025d9982997f23b484 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 29 四月 2024 16:00:49 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/modalconfig/settingform/index.jsx | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/templates/modalconfig/settingform/index.jsx b/src/templates/modalconfig/settingform/index.jsx
index 4ac0090..7baf400 100644
--- a/src/templates/modalconfig/settingform/index.jsx
+++ b/src/templates/modalconfig/settingform/index.jsx
@@ -347,8 +347,13 @@
)}
</Form.Item>
</Col> : null}
- {display === 'drawer' && appType !== 'mob' ? <Col span={12}>
- <Form.Item label="琛ㄥ崟绫诲瀷">
+ {appType !== 'mob' && (display === 'drawer' || display === 'modal') ? <Col span={12}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="閫夋嫨鏌ョ湅鏃惰〃鍗曞潎涓哄彧璇伙紝浠呯敤浜庢暟鎹睍绀恒��">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 琛ㄥ崟绫诲瀷
+ </Tooltip>
+ }>
{getFieldDecorator('formType', {
initialValue: config.setting.formType || 'edit'
})(
@@ -359,6 +364,20 @@
)}
</Form.Item>
</Col> : null}
+ {display === 'prompt' ? <Col span={12}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="鎻愮ず妗嗙殑纭鎻愮ず淇℃伅銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 纭鎻愮ず
+ </Tooltip>
+ }>
+ {getFieldDecorator('tipTitle', {
+ initialValue: config.setting.tipTitle || ''
+ })(
+ <Input autoComplete="off" onPressEnter={this.handleSubmit} />
+ )}
+ </Form.Item>
+ </Col> : null}
{!this.props.isSubTab && !appType && this.state.viewType !== 'popview' && display === 'modal' ? <Col span={12}>
<Form.Item label="鎸傝浇瀵硅薄">
{getFieldDecorator('container', {
--
Gitblit v1.8.0