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 ++++++++++++++++++++-----------
 1 files changed, 41 insertions(+), 22 deletions(-)

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>

--
Gitblit v1.8.0