From f30bc9d11d18e93626e4530dd2de54d479c2521d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 08 十一月 2021 21:48:22 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/mob/modalconfig/index.jsx | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/mob/modalconfig/index.jsx b/src/mob/modalconfig/index.jsx
index bb1cd4f..8c0c7ae 100644
--- a/src/mob/modalconfig/index.jsx
+++ b/src/mob/modalconfig/index.jsx
@@ -91,6 +91,7 @@
let _config = fromJS(this.state.config).toJS()
if (list.length > _config.fields.length) {
+ _config.fields = list
this.setState({
config: _config
}, () => {
@@ -427,8 +428,9 @@
<div className="mob-shell" style={{width: window.GLOB.shellWidth, height: window.GLOB.shellHeight}}>
<div className="mob-shell-inner">
<div className="am-navbar">
- <Icon type="close" />
+ <Icon type="left" />
<div className="am-navbar-title">{config.setting.title}</div>
+ {config.setting.btnPosition === 'top' ? <Button className="modal-submit-top">{config.setting.btnName || '纭畾'}</Button> : null}
</div>
<DragElement
list={config.fields}
@@ -439,10 +441,10 @@
handleForm={this.handleForm}
closeForm={this.closeForm}
/>
- <div className="modal-btns">
+ {config.setting.btnPosition !== 'top' ? <div className="modal-btns">
<Button className="modal-reset" type="default">閲嶇疆</Button>
<Button className="modal-submit" type="primary">{config.setting.btnName || '纭畾'}</Button>
- </div>
+ </div> : null}
</div>
</div>
</div>
--
Gitblit v1.8.0