From b4e3f033de13167a9346cc8e976e04bc4d368d1d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 24 五月 2022 12:33:38 +0800
Subject: [PATCH] 2022-05-24
---
src/mob/components/formdragelement/card.jsx | 63 +++++++++++++-------
src/tabviews/zshare/mutilform/index.jsx | 7 ++
src/mob/components/topbar/normal-navbar/index.jsx | 2
src/mob/components/formdragelement/index.scss | 31 +++++++--
src/templates/zshare/formconfig.jsx | 44 +++++++-------
src/templates/modalconfig/dragelement/card.jsx | 2
src/menu/stylecontroller/styleInput/index.jsx | 2
7 files changed, 96 insertions(+), 55 deletions(-)
diff --git a/src/menu/stylecontroller/styleInput/index.jsx b/src/menu/stylecontroller/styleInput/index.jsx
index 6d9dee9..8eea049 100644
--- a/src/menu/stylecontroller/styleInput/index.jsx
+++ b/src/menu/stylecontroller/styleInput/index.jsx
@@ -106,7 +106,7 @@
const { unit } = this.state
let val = e.target.value
- if (/\d+\.$|^-$/.test(val)) {
+ if (/\d+\.$|^-$|^-0$/.test(val)) {
this.setState({
value: val
})
diff --git a/src/mob/components/formdragelement/card.jsx b/src/mob/components/formdragelement/card.jsx
index 4c35773..6780a3f 100644
--- a/src/mob/components/formdragelement/card.jsx
+++ b/src/mob/components/formdragelement/card.jsx
@@ -1,5 +1,6 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
+import { fromJS } from 'immutable'
import { Button, Popover, Switch, Checkbox, Form, Rate } from 'antd'
import { ScanOutlined, RightOutlined, PlusOutlined, StarFilled, EditOutlined, CopyOutlined, CloseOutlined, FontColorsOutlined } from '@ant-design/icons'
import moment from 'moment'
@@ -48,9 +49,17 @@
}
const changeStyle = () => {
- let options = ['font']
+ let options = ['font1', 'margin']
+ let style = fromJS(card.style || {}).toJS()
- MKEmitter.emit('changeStyle', ['form', card.uuid], options, card.style || {})
+ if (card.marginTop && !style.marginTop) { // 澶栬竟璺濊缃浆绉�
+ style.marginTop = card.marginTop
+ }
+ if (card.marginBottom && !style.marginBottom) {
+ style.marginBottom = card.marginBottom
+ }
+
+ MKEmitter.emit('changeStyle', ['form', card.uuid], options, style)
}
let selectval = ''
@@ -67,13 +76,13 @@
let formItem = null
if (card.type === 'text' || card.type === 'linkMain') {
- formItem = (<div className={'am-list-item input ' + (card.place || '')}><div className="am-list-line"><div className="am-input-label" style={card.style}>{card.label}</div><div className={'am-input-control ' + card.cursor}>{card.initval ? card.initval : <span style={{color: '#bcbcbc'}}>{card.placeholder || <span style={{color: 'transparent'}}>input</span>}</span> }</div>{card.scan && card.scan !== 'false' ? <div className="am-list-extra"><ScanOutlined /></div> : null}</div></div>)
+ formItem = (<div className={'am-list-item input ' + (card.place || '')}><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className={'am-input-control ' + card.cursor}>{card.initval ? card.initval : <span style={{color: '#bcbcbc'}}>{card.placeholder || <span style={{color: 'transparent'}}>input</span>}</span> }</div>{card.scan && card.scan !== 'false' ? <div className="am-list-extra"><ScanOutlined /></div> : null}</div></div>)
} else if (card.type === 'number') {
- formItem = (<div className={'am-list-item input ' + (card.place || '')}><div className="am-list-line"><div className="am-input-label" style={card.style}>{card.label}</div><div className={'am-input-control ' + card.cursor}>{card.initval ? card.initval : <span style={{color: '#bcbcbc'}}><span style={{color: 'transparent'}}>input</span></span> }</div>{card.placeholder ? <div className="am-list-extra" style={{color: '#999999', width: 'auto', lineHeight: 1.5}}>{card.placeholder}</div> : null}</div></div>)
+ formItem = (<div className={'am-list-item input ' + (card.place || '')}><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className={'am-input-control ' + card.cursor}>{card.initval ? card.initval : <span style={{color: '#bcbcbc'}}><span style={{color: 'transparent'}}>input</span></span> }</div>{card.placeholder ? <div className="am-list-extra" style={{color: '#999999', width: 'auto', lineHeight: 1.5}}>{card.placeholder}</div> : null}</div></div>)
} else if (card.type === 'number') {
- formItem = (<div className="am-list-item input"><div className="am-list-line"><div className="am-input-label" style={card.style}>{card.label}</div><div className={'am-input-control ' + card.cursor}>{card.initval || <span style={{color: 'transparent'}}>input</span>}</div></div></div>)
+ formItem = (<div className="am-list-item input"><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className={'am-input-control ' + card.cursor}>{card.initval || <span style={{color: 'transparent'}}>input</span>}</div></div></div>)
} else if (card.type === 'select' || card.type === 'link') {
- formItem = (<div className="am-list-item"><div className="am-list-line"><div className="am-input-label" style={card.style}>{card.label}</div><div className="am-input-control">{selectval || '璇烽�夋嫨'}</div><div className="am-list-extra"><RightOutlined /></div></div></div>)
+ formItem = (<div className="am-list-item"><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className="am-input-control">{selectval || '璇烽�夋嫨'}</div><div className="am-list-extra"><RightOutlined /></div></div></div>)
} else if (card.type === 'date') {
let format = 'YYYY-MM-DD'
if (card.precision === 'hour') {
@@ -83,16 +92,16 @@
} else if (card.precision === 'second') {
format = 'YYYY-MM-DD HH:mm:ss'
}
- formItem = (<div className="am-list-item"><div className="am-list-line"><div className="am-input-label" style={card.style}>{card.label}</div><div className="am-input-control">{card.initval ? moment().subtract(card.initval, 'days').format(format) : '璇烽�夋嫨'}</div><div className="am-list-extra"><RightOutlined /></div></div></div>)
+ formItem = (<div className="am-list-item"><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className="am-input-control">{card.initval ? moment().subtract(card.initval, 'days').format(format) : '璇烽�夋嫨'}</div><div className="am-list-extra"><RightOutlined /></div></div></div>)
} else if (card.type === 'datemonth') {
- formItem = (<div className="am-list-item"><div className="am-list-line"><div className="am-input-label" style={card.style}>{card.label}</div><div className="am-input-control">{card.initval ? moment().subtract(card.initval, 'month').format('YYYY-MM') : '璇烽�夋嫨'}</div><div className="am-list-extra"><RightOutlined /></div></div></div>)
+ formItem = (<div className="am-list-item"><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className="am-input-control">{card.initval ? moment().subtract(card.initval, 'month').format('YYYY-MM') : '璇烽�夋嫨'}</div><div className="am-list-extra"><RightOutlined /></div></div></div>)
} else if (card.type === 'datetime') {
- formItem = (<div className="am-list-item"><div className="am-list-line"><div className="am-input-label" style={card.style}>{card.label}</div><div className="am-input-control">{card.initval ? moment().subtract(card.initval, 'days').format('YYYY-MM-DD HH:mm') : '璇烽�夋嫨'}</div><div className="am-list-extra"><RightOutlined /></div></div></div>)
+ formItem = (<div className="am-list-item"><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className="am-input-control">{card.initval ? moment().subtract(card.initval, 'days').format('YYYY-MM-DD HH:mm') : '璇烽�夋嫨'}</div><div className="am-list-extra"><RightOutlined /></div></div></div>)
} else if (card.type === 'textarea') {
let height = (card.maxRows || 2) * 25
formItem = (<div className="am-list-item check-card">
<div className="am-list-line">
- <div className="am-input-label" style={card.style}>{card.label}</div>
+ <div className="am-input-label">{card.label}</div>
<div className="am-input-control">
<div style={{textAlign: 'left', position: 'relative', height, lineHeight: 1.5}}>
{card.initval ? card.initval : <span style={{color: '#bcbcbc'}}>{card.placeholder || ''}</span> }
@@ -102,14 +111,14 @@
</div>
</div>)
} else if (card.type === 'rate') {
- formItem = (<div className={'am-list-item ' + (card.place || '')}><div className="am-list-line"><div className="am-input-label" style={card.style}>{card.label}</div><div style={{textAlign: 'left'}} className={'am-input-control ' + (card.place === 'up_down' ? 'left' : '')}>
+ formItem = (<div className={'am-list-item ' + (card.place || '')}><div className="am-list-line"><div className="am-input-label">{card.label}</div><div style={{textAlign: 'left'}} className={'am-input-control ' + (card.place === 'up_down' ? 'left' : '')}>
<Rate value={card.initval || 0} count={card.rateCount || 5} character={card.character ? <MkIcon type={card.character}/> : <StarFilled />} allowHalf={card.allowHalf === 'true'} />
</div></div></div>)
} else if (card.type === 'fileupload') {
formItem = (
<div className="am-list-item checkbox">
<div className="am-list-line">
- <div className="am-input-label" style={card.style}>{card.label}</div>
+ <div className="am-input-label">{card.label}</div>
<div className="am-input-control" style={{textAlign: 'left'}}>
<Button style={{width: '100px', marginBottom: '10px', height: '100px', fontSize: '50px', color: '#d9d9d9'}}><PlusOutlined /></Button>
</div>
@@ -117,9 +126,9 @@
</div>
)
} else if (card.type === 'funcvar') {
- formItem = (<div className="am-list-item"><div className="am-list-line"><div className="am-input-label" style={card.style}>{card.label}</div><div className="am-input-control">{card.linkfield}</div></div></div>)
+ formItem = (<div className="am-list-item"><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className="am-input-control">{card.linkfield}</div></div></div>)
} else if (card.type === 'switch') {
- formItem = (<div className="am-list-item"><div className="am-list-line"><div className="am-input-label" style={card.style}>{card.label}</div><div className="am-list-switch"><Switch checked={card.initval}/></div></div></div>)
+ formItem = (<div className="am-list-item"><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className="am-list-switch"><Switch checked={card.initval}/></div></div></div>)
} else if (card.type === 'radio') {
let options = null
if (card.options && card.options.length > 0) {
@@ -135,7 +144,7 @@
formItem = (
<div className={'am-list-item checkbox mk-radio ' + (card.arrange || '')}>
<div className="am-list-line">
- <div className="am-input-label" style={card.style}>{card.label}</div>
+ <div className="am-input-label">{card.label}</div>
<div className="am-input-control">
{card.arrange !== 'line' ? <Checkbox.Group value={[card.initval]}>
{options.map(cell => <Checkbox key={cell.key} value={cell.Value}>{cell.Text}</Checkbox>)}
@@ -164,7 +173,7 @@
formItem = (
<div className={'am-list-item checkbox ' + (card.arrange || '')}>
<div className="am-list-line">
- <div className="am-input-label" style={card.style}>{card.label}</div>
+ <div className="am-input-label">{card.label}</div>
<div className="am-input-control">
{<Checkbox.Group value={_val}>
{options.map(cell => <Checkbox key={cell.key} value={cell.Value}>{cell.Text}</Checkbox>)}
@@ -177,23 +186,32 @@
} else if (card.type === 'hint') {
formItem = <div className="am-list-item hint">
<div className="am-list-line">
- <div className="am-input-label" style={card.style}>{card.label}</div>
- <div className="am-input-control" style={card.style}>
+ <div className="am-input-label">{card.label}</div>
+ <div className="am-input-control">
{card.message}
</div>
</div>
</div>
} else if (card.type === 'split') {
- formItem = <div className="split-line" style={card.style}>{card.label}</div>
+ formItem = <div className="split-line">{card.label}</div>
} else if (card.type === 'checkcard') {
formItem = (<div className="am-list-item check-card">
<div className="am-list-line">
- {card.hidelabel !== 'true' ? <div className="am-input-label" style={card.style}>{card.label}</div> : null}
+ {card.hidelabel !== 'true' ? <div className="am-input-label">{card.label}</div> : null}
<div className="am-input-control">
<CheckCard config={card} />
</div>
</div>
</div>)
+ }
+
+ let style = {...card.style}
+
+ if (card.marginTop && !style.marginTop) { // 澶栬竟璺濊缃浆绉�
+ style.marginTop = card.marginTop
+ }
+ if (card.marginBottom && !style.marginBottom) {
+ style.marginBottom = card.marginBottom
}
return (
@@ -208,8 +226,9 @@
<div className="page-card" style={{ opacity: opacity}}>
<div ref={node => drag(drop(node))} style={{ border: '0.5px solid transparent'}} onDoubleClick={edit}>
<Form.Item
- style={{marginTop: card.marginTop || 0, marginBottom: card.marginBottom || 0}}
- className={'ant-form-item' + (card.required === 'true' ? ' required' : '') + (card.splitline === 'false' ? ' no-boder' : '')}
+ style={style}
+ // style={{marginTop: card.marginTop || 0, marginBottom: card.marginBottom || 0}}
+ className={(card.required === 'true' ? ' required' : '') + (card.type === 'split' ? ' split-wrap' : '') + (card.splitline === 'false' ? ' no-boder' : '')}
>
{formItem}
<div></div>
diff --git a/src/mob/components/formdragelement/index.scss b/src/mob/components/formdragelement/index.scss
index e4b9d51..44ab7f8 100644
--- a/src/mob/components/formdragelement/index.scss
+++ b/src/mob/components/formdragelement/index.scss
@@ -26,8 +26,7 @@
}
}
.am-list-item {
- font-size: 16px;
- // padding-left: 10px;
+ // font-size: 16px;
position: relative;
display: flex;
height: 44px;
@@ -49,8 +48,6 @@
overflow: hidden;
.am-input-label {
width: 28%;
- color: #000;
- font-size: 16px;
margin-left: 0;
margin-right: 5px;
text-align: left;
@@ -58,16 +55,21 @@
overflow: hidden;
padding: 2px 0;
text-overflow: ellipsis;
+ color: inherit;
+ font-size: inherit;
+ font-weight: inherit;
}
.am-list-switch {
flex: 1;
text-align: right;
}
.am-input-control {
- font-size: 16px;
flex: 1 1;
text-align: right;
padding-right: 15px;
+ font-size: 16px;
+ font-weight: normal;
+ color: rgba(0, 0, 0, 0.65);
}
.am-input-control.left {
text-align: left;
@@ -77,6 +79,9 @@
width: 15px;
height: 15px;
margin-left: 8px;
+ font-size: 16px;
+ font-weight: normal;
+ color: rgba(0, 0, 0, 0.65);
.anticon {
vertical-align: top;
}
@@ -124,10 +129,12 @@
line-height: 2;
}
.am-input-control {
- font-size: 14px;
line-height: 1.5;
text-align: left;
padding-bottom: 5px;
+ color: inherit;
+ font-size: inherit;
+ font-weight: inherit;
}
}
}
@@ -231,8 +238,9 @@
}
}
.split-line {
- color: #1890ff;
- font-size: 16px;
+ color: inherit;
+ font-size: inherit;
+ font-weight: inherit;
padding-left: 10px;
padding-top: 10px;
border-bottom: 1px solid #e9e9e9;
@@ -240,10 +248,17 @@
.check-card-edit-box .card-cell span {
line-height: 1.5;
}
+ .split-wrap.ant-form-item {
+ color: #1890ff;
+ font-size: 16px;
+ }
.ant-form-item {
cursor: move;
display: flex;
margin-bottom: 0px;
+ color: #000;
+ font-weight: normal;
+ font-size: 14px;
.ant-form-item-control-wrapper::after {
content: '';
position: absolute;
diff --git a/src/mob/components/topbar/normal-navbar/index.jsx b/src/mob/components/topbar/normal-navbar/index.jsx
index b8ece4c..74d41ac 100644
--- a/src/mob/components/topbar/normal-navbar/index.jsx
+++ b/src/mob/components/topbar/normal-navbar/index.jsx
@@ -232,7 +232,7 @@
</Popover>
<div className="am-navbar">
<div className="am-navbar-left">
- {card.wrap.back !== 'false' && card.wrap.menuPosition !== 'left' ? <LeftOutlined /> : null}
+ {card.wrap.back === 'true' && card.wrap.menuPosition !== 'left' ? <LeftOutlined /> : null}
{card.wrap.menuPosition === 'left' ? <div className="img" style={{backgroundImage: `url(${avatar})`}}></div> : null}
</div>
{card.wrap.type !== 'search' ?
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index b5a2231..04a4f3e 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -77,6 +77,13 @@
linkFields[item.linkField].push({field: item.field, uuid: item.uuid})
}
+ if (item.style) {
+ delete item.style.marginTop
+ delete item.style.marginBottom
+ delete item.style.marginLeft
+ delete item.style.marginRight
+ }
+
if (item.type === 'split') return true
if (item.type === 'hint') {
if (item.field && data && data[item.field]) {
diff --git a/src/templates/modalconfig/dragelement/card.jsx b/src/templates/modalconfig/dragelement/card.jsx
index bbd5db0..9545c7c 100644
--- a/src/templates/modalconfig/dragelement/card.jsx
+++ b/src/templates/modalconfig/dragelement/card.jsx
@@ -53,7 +53,7 @@
}
const changeStyle = () => {
- let options = ['font']
+ let options = ['font1']
MKEmitter.emit('changeStyle', ['form', card.uuid], options, card.style || {})
}
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index c8dbbd5..1aef42a 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -3460,28 +3460,28 @@
initVal: card.linkSubField || [],
options: inputfields
},
- {
- type: 'number',
- key: 'marginTop',
- label: '涓婅竟璺濓紙px锛�',
- initVal: card.marginTop || 0,
- min: -100,
- max: 1000,
- precision: 0,
- required: false,
- forbid: appType !== 'mob'
- },
- {
- type: 'number',
- key: 'marginBottom',
- label: '涓嬭竟璺濓紙px锛�',
- initVal: card.marginBottom || 0,
- min: -100,
- max: 1000,
- precision: 0,
- required: false,
- forbid: appType !== 'mob'
- },
+ // {
+ // type: 'number',
+ // key: 'marginTop',
+ // label: '涓婅竟璺濓紙px锛�',
+ // initVal: card.marginTop || 0,
+ // min: -100,
+ // max: 1000,
+ // precision: 0,
+ // required: false,
+ // forbid: appType !== 'mob'
+ // },
+ // {
+ // type: 'number',
+ // key: 'marginBottom',
+ // label: '涓嬭竟璺濓紙px锛�',
+ // initVal: card.marginBottom || 0,
+ // min: -100,
+ // max: 1000,
+ // precision: 0,
+ // required: false,
+ // forbid: appType !== 'mob'
+ // },
{
type: 'multiselect',
key: 'blacklist',
--
Gitblit v1.8.0