From 5d48f8215284ca8de312f1c85f78e07215a0faf1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 20 五月 2021 11:07:04 +0800
Subject: [PATCH] 2021-05-20

---
 src/mob/components/formdragelement/card.jsx |  118 ++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 77 insertions(+), 41 deletions(-)

diff --git a/src/mob/components/formdragelement/card.jsx b/src/mob/components/formdragelement/card.jsx
index 4af435e..888976c 100644
--- a/src/mob/components/formdragelement/card.jsx
+++ b/src/mob/components/formdragelement/card.jsx
@@ -1,16 +1,11 @@
 import React from 'react'
 import { useDrag, useDrop } from 'react-dnd'
-import { Icon, DatePicker, Button, Popover, Switch, Radio, Checkbox, Form } from 'antd'
-import { InputItem, TextareaItem } from 'antd-mobile'
+import { Icon, Button, Popover, Switch, Checkbox, Form } from 'antd'
 import moment from 'moment'
 
 import asyncComponent from '@/utils/asyncComponent'
 import './index.scss'
 
-const { MonthPicker } = DatePicker
-
-const Editor = asyncComponent(() => import('@/components/editor'))
-const ColorSketch = asyncComponent(() => import('@/mob/colorsketch'))
 const CheckCard = asyncComponent(() => import('@/templates/modalconfig/checkCard'))
 
 const Card = ({ id, card, moveCard, findCard, editCard, closeCard, copyCard, showField }) => {
@@ -50,7 +45,7 @@
   }
 
   let selectval = ''
-  if (card.type === 'multiselect' || card.type === 'select' || card.type === 'link') {
+  if (card.type === 'select' || card.type === 'link') {
     if (card.initval) {
       let _option = card.options.filter(option => option.Value === card.initval)[0]
       if (_option) {
@@ -64,55 +59,96 @@
   }
 
   let formItem = null
-  if (card.type === 'text') {
-    formItem = (<InputItem value={card.initval}>{card.label}</InputItem>)
-  } else if (card.type === 'number') {
-    formItem = (<InputItem type="number" value={card.initval}>{card.label}</InputItem>)
-  } else if (card.type === 'multiselect' || card.type === 'select' || card.type === 'link') {
-    formItem = (<div className="am-list-item am-list-item-middle"><div className="am-list-line"><div className="am-list-content">{card.label}</div><div className="am-list-extra">{selectval || '璇烽�夋嫨'}</div><div className="am-list-arrow am-list-arrow-horizontal"></div></div></div>)
-  } else if (card.type === 'color') {
-    formItem = (<ColorSketch value={card.initval || 'transparent'}/>)
+  if (card.type === 'text' || card.type === 'number') {
+    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.cursor}>{card.initval}</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">{card.label}</div><div className="am-input-control">{selectval || '璇烽�夋嫨'}</div><div className="am-list-extra"><Icon type="right" /></div></div></div>)
   } else if (card.type === 'date') {
-    formItem = (<DatePicker value={card.initval ? moment().subtract(card.initval, 'days') : null} />)
+    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') : '璇烽�夋嫨'}</div><div className="am-list-extra"><Icon type="right" /></div></div></div>)
   } else if (card.type === 'datemonth') {
-    formItem = (<MonthPicker value={card.initval ? moment().subtract(card.initval, 'month') : null} />)
+    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"><Icon type="right" /></div></div></div>)
   } else if (card.type === 'datetime') {
-    formItem = (<DatePicker showTime value={card.initval ? moment().subtract(card.initval, 'days') : null} />)
+    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"><Icon type="right" /></div></div></div>)
   } else if (card.type === 'textarea') {
-    formItem = (<TextareaItem title={card.label} autoHeight />)
-  } else if (card.type === 'brafteditor') {
-    formItem = (<Editor />)
+    // formItem = (<TextareaItem title={card.label} autoHeight />)
   } else if (card.type === 'fileupload') {
     formItem = (<Button style={{marginTop: '3px'}}><Icon type="upload" /> 鐐瑰嚮涓婁紶 </Button>)
   } else if (card.type === 'funcvar') {
-    formItem = (<InputItem type="number" value={card.linkfield}>{card.label}</InputItem>)
+    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 = (<Switch checkedChildren={card.openText || ''} unCheckedChildren={card.closeText || ''} style={{marginTop: '8px'}} checked={card.initval}/>)
+    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') {
-    formItem = card.options && card.options.length > 0 ? (<Radio.Group value={card.initval}>
-      {card.options.map(cell => <Radio key={cell.key} value={cell.Value}>{cell.Text}</Radio>)}
-    </Radio.Group>) : (<Radio.Group value={1}>
-      <Radio value={1}>A</Radio>
-      <Radio value={2}>B</Radio>
-      <Radio value={3}>C</Radio>
-      <Radio value={4}>D</Radio>
-    </Radio.Group>)
+    let options = null
+    if (card.options && card.options.length > 0) {
+      options = card.options
+    } else {
+      options = [
+        {key: 'A', Value: 'A', Text: 'A'},
+        {key: 'B', Value: 'B', Text: 'B'},
+        {key: 'C', Value: 'C', Text: 'C'}
+      ]
+    }
+
+    formItem = (
+    <div className="am-list-item checkbox">
+      <div className="am-list-line">
+        <div className="am-input-label">{card.label}</div>
+        <div className="am-input-control">
+          <div className="mk-radio-group">
+            {options.map(cell => (<div key={cell.key} className="mk-radio-wrapper">
+              <span className="radio-value">{cell.Text}</span>
+              <span className={'radio-check ' + (card.initval === cell.Value ? 'checked' : '')}></span>
+            </div>))}
+          </div>
+        </div>
+      </div>
+    </div>)
   } else if (card.type === 'checkbox') {
     let _val = card.initval ? card.initval.split(',') : []
-    formItem = card.options && card.options.length > 0 ? (<Checkbox.Group value={_val}>
-      {card.options.map(cell => <Checkbox key={cell.key} value={cell.Value}>{cell.Text}</Checkbox>)}
-    </Checkbox.Group>) : (<Checkbox.Group value={['A', 'C']}>
-      <Checkbox value="A">A</Checkbox>
-      <Checkbox value="B">B</Checkbox>
-      <Checkbox value="C">C</Checkbox>
-      <Checkbox value="D">D</Checkbox>
-    </Checkbox.Group>)
+    let options = null
+    if (card.options && card.options.length > 0) {
+      options = card.options
+    } else {
+      options = [
+        {key: 'A', Value: 'A', Text: 'A'},
+        {key: 'B', Value: 'B', Text: 'B'},
+        {key: 'C', Value: 'C', Text: 'C'}
+      ]
+    }
+
+    formItem = (
+      <div className="am-list-item checkbox">
+        <div className="am-list-line">
+          <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>)}
+            </Checkbox.Group>}
+          </div>
+        </div>
+      </div>
+    )
+    
   } else if (card.type === 'hint') {
-    formItem = <div style={{marginTop: '10px', color: 'rgba(0, 0, 0, 0.85)', lineHeight: '1.5'}}>{card.message}</div>
+    formItem = <div className="am-list-item hint">
+      <div className="am-list-line">
+        <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">{card.label}</div>
   } else if (card.type === 'checkcard') {
-    formItem = <CheckCard width={card.width} ratio={card.ratio} display={card.display} fields={card.fields} options={card.options} />
+    formItem = (<div className="am-list-item check-card">
+      <div className="am-list-line">
+        <div className="am-input-label">{card.label}</div>
+        <div className="am-input-control">
+          <CheckCard width={card.width} ratio={card.ratio} display={card.display} fields={card.fields} options={card.options} />  
+        </div>
+      </div>
+    </div>)
   }
 
   return (

--
Gitblit v1.8.0