From e0e5aa28cbd509579c7a83672a93241c9a5ed7e9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 06 七月 2020 15:09:49 +0800
Subject: [PATCH] 2020-07-06
---
src/mob/login/index.jsx | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/src/mob/login/index.jsx b/src/mob/login/index.jsx
index 11f7869..152a2d9 100644
--- a/src/mob/login/index.jsx
+++ b/src/mob/login/index.jsx
@@ -59,9 +59,10 @@
const { card } = this.props
e.stopPropagation()
let element = {
+ ...fromJS(card.logo.style).toJS(),
+ componentId: card.uuid,
uuid: card.logo.uuid,
- items: ['picture'],
- item: fromJS(card.logo).toJS()
+ items: []
}
this.props.triggerEdit(element)
}
@@ -70,9 +71,10 @@
const { card } = this.props
e.stopPropagation()
let element = {
+ ...fromJS(card.title.style).toJS(),
+ componentId: card.uuid,
uuid: card.title.uuid,
items: ['font'],
- item: fromJS(card.title).toJS()
}
this.props.triggerEdit(element)
}
@@ -81,9 +83,22 @@
const { card } = this.props
e.stopPropagation()
let element = {
+ ...fromJS(card.copyright.style).toJS(),
+ componentId: card.uuid,
uuid: card.copyright.uuid,
items: ['font'],
- item: fromJS(card.copyright).toJS()
+ }
+ this.props.triggerEdit(element)
+ }
+
+ editLogin = (e) => {
+ const { card } = this.props
+ e.stopPropagation()
+ let element = {
+ ...fromJS(card.login.style).toJS(),
+ componentId: card.uuid,
+ uuid: card.login.uuid,
+ items: ['font', 'background']
}
this.props.triggerEdit(element)
}
@@ -92,9 +107,10 @@
const { card } = this.props
e.stopPropagation()
let element = {
+ ...fromJS(card.box.style).toJS(),
+ componentId: card.uuid,
uuid: card.box.uuid,
items: ['font', 'padding', 'background'],
- item: fromJS(card.box).toJS()
}
this.props.triggerEdit(element)
}
@@ -109,12 +125,12 @@
const { rember } = this.state
return (
- <div className="mob-login" onClick={this.editBox} style={{paddingTop: `calc(17vh - 10px)`}}>
+ <div className="mob-login" onClick={this.editBox} style={card.box.style}>
{card.logo ? <div className={'logo ' + (editId === card.logo.uuid ? 'editing' : '')} onClick={this.editLogo}>
<ContentUpdate element={card.logo} updateContent={(ele) => this.updateContent({...card, logo: ele})}/>
<img src={card.logo.content} alt=""/>
</div> : null}
- {card.title ? <div className={'plat-name ' + (editId === card.title.uuid ? 'editing' : '')} onClick={this.editTitle}>
+ {card.title ? <div className={'plat-name ' + (editId === card.title.uuid ? 'editing' : '')} style={card.title.style} onClick={this.editTitle}>
<ContentUpdate element={card.title} updateContent={(ele) => this.updateContent({...card, title: ele})}/>
{card.title.content}
</div> : null}
@@ -149,10 +165,19 @@
<List.Item className="lang">涓枃绠�浣�</List.Item>
<div className="clear-both"></div>
</div>
- <Button type="primary" onDoubleClick={() => this.props.doubleClickCard(card.login)}>鐧诲綍</Button>
- {card.copyright ? <div className={'company-msg ' + (editId === card.copyright.uuid ? 'editing' : '')} onClick={this.editMsg}>
+ <Button
+ type="primary"
+ className={'login ' + (editId === card.login.uuid ? 'editing' : '')}
+ onDoubleClick={() => this.props.doubleClickCard(card.login)}
+ style={card.login.style}
+ onClick={this.editLogin}
+ >
+ <ContentUpdate element={card.login} deletable={false} updateContent={(ele) => this.updateContent({...card, login: ele})}/>
+ {card.login.content}
+ </Button>
+ {card.copyright ? <div className={'company-msg ' + (editId === card.copyright.uuid ? 'editing' : '')} style={card.copyright.style} onClick={this.editMsg}>
<ContentUpdate element={card.copyright} updateContent={(ele) => this.updateContent({...card, copyright: ele})}/>
- <p>{card.copyright.content}</p>
+ {card.copyright.content}
</div> : null}
</div>
)
--
Gitblit v1.8.0