From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/appmanage/submutilform/index.jsx | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/views/appmanage/submutilform/index.jsx b/src/views/appmanage/submutilform/index.jsx
index 8f21434..59809f0 100644
--- a/src/views/appmanage/submutilform/index.jsx
+++ b/src/views/appmanage/submutilform/index.jsx
@@ -138,20 +138,20 @@
initialValue: card ? card.css : 'bg_black_style_blue'
})(
<Select>
- <Select.Option value="bg_black_style_blue">钃濊壊</Select.Option>
- <Select.Option value="bg_black_style_red">绾㈣壊</Select.Option>
- <Select.Option value="bg_black_style_orange_red">姗欑孩鑹�</Select.Option>
- <Select.Option value="bg_black_style_orange">姗欒壊</Select.Option>
- <Select.Option value="bg_black_style_orange_yellow">姗欓粍鑹�</Select.Option>
- <Select.Option value="bg_black_style_yellow">榛勮壊</Select.Option>
- <Select.Option value="bg_black_style_yellow_green">榛勭豢鑹�</Select.Option>
- <Select.Option value="bg_black_style_green">缁胯壊</Select.Option>
- <Select.Option value="bg_black_style_cyan">闈掕壊</Select.Option>
- <Select.Option value="bg_black_style_blue_purple">钃濈传鑹�</Select.Option>
- <Select.Option value="bg_black_style_purple">绱壊</Select.Option>
- <Select.Option value="bg_black_style_magenta">娲嬬孩鑹�</Select.Option>
- <Select.Option value="bg_black_style_grass_green">鑽夌豢鑹�</Select.Option>
- <Select.Option value="bg_black_style_deep_red">娣辩孩鑹�</Select.Option>
+ <Select.Option value="bg_black_style_blue"><span className="color-block" style={{background: '#1890ff'}}></span>钃濊壊</Select.Option>
+ <Select.Option value="bg_black_style_red"><span className="color-block" style={{background: '#f5222d'}}></span>绾㈣壊</Select.Option>
+ <Select.Option value="bg_black_style_orange_red"><span className="color-block" style={{background: '#fa541c'}}></span>姗欑孩鑹�</Select.Option>
+ <Select.Option value="bg_black_style_orange"><span className="color-block" style={{background: '#fa8c16'}}></span>姗欒壊</Select.Option>
+ <Select.Option value="bg_black_style_orange_yellow"><span className="color-block" style={{background: '#faad14'}}></span>姗欓粍鑹�</Select.Option>
+ <Select.Option value="bg_black_style_yellow"><span className="color-block" style={{background: '#fadb14'}}></span>榛勮壊</Select.Option>
+ <Select.Option value="bg_black_style_yellow_green"><span className="color-block" style={{background: '#a0d911'}}></span>榛勭豢鑹�</Select.Option>
+ <Select.Option value="bg_black_style_green"><span className="color-block" style={{background: '#52c41a'}}></span>缁胯壊</Select.Option>
+ <Select.Option value="bg_black_style_cyan"><span className="color-block" style={{background: '#13c2c2'}}></span>闈掕壊</Select.Option>
+ <Select.Option value="bg_black_style_blue_purple"><span className="color-block" style={{background: '#2f54eb'}}></span>钃濈传鑹�</Select.Option>
+ <Select.Option value="bg_black_style_purple"><span className="color-block" style={{background: '#722ed1'}}></span>绱壊</Select.Option>
+ <Select.Option value="bg_black_style_magenta"><span className="color-block" style={{background: '#eb2f96'}}></span>娲嬬孩鑹�</Select.Option>
+ <Select.Option value="bg_black_style_grass_green"><span className="color-block" style={{background: '#aeb303'}}></span>鑽夌豢鑹�</Select.Option>
+ <Select.Option value="bg_black_style_deep_red"><span className="color-block" style={{background: '#c32539'}}></span>娣辩孩鑹�</Select.Option>
</Select>
)}
</Form.Item>
@@ -237,7 +237,12 @@
</Form.Item>
</Col> : null}
{exts.includes('share') ? <Col span={12}>
- <Form.Item label="鍒嗕韩閾炬帴">
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="鍒嗕韩鐨勯摼鎺ヤ负鐢ㄦ埛娴忚鐨勯〉闈㈠湴鍧�鎴栧綋鍓嶅簲鐢ㄧ殑鍏ュ彛鍦板潃銆傛敞锛氬彲鍦ㄩ〉闈腑鑷畾涔夎缃��">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 鍒嗕韩閾炬帴
+ </Tooltip>
+ }>
{getFieldDecorator('share_link', {
initialValue: card ? card.share_link || 'main' : 'main'
})(
@@ -282,7 +287,7 @@
</Tooltip>
}>
{getFieldDecorator('delay', {
- initialValue: card ? card.delay || 0 : 0
+ initialValue: card ? card.delay || 0 : 200
})(<InputNumber min={0} max={5000} precision={0} onPressEnter={this.handleSubmit}/>)}
</Form.Item>
</Col> : null}
--
Gitblit v1.8.0