From 4d201e812c323b3d73e53607b83e6341568f2ab1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 19 十一月 2019 22:26:05 +0800
Subject: [PATCH] 2019-11-19update

---
 src/components/sidemenu/comtableconfig/editcard/index.jsx |   37 +++++++++++++++++++------------------
 1 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/components/sidemenu/comtableconfig/editcard/index.jsx b/src/components/sidemenu/comtableconfig/editcard/index.jsx
index 304fe7a..0e81e79 100644
--- a/src/components/sidemenu/comtableconfig/editcard/index.jsx
+++ b/src/components/sidemenu/comtableconfig/editcard/index.jsx
@@ -7,19 +7,19 @@
     super(props)
 
     this.state = {
-      selected: false,
-      card: props.card
+      card: props.card,
+      type: props.type
     }
   }
 
   changeSelect = () => {
+    const { card } = this.state
     this.setState({
-      selected: !this.state.selected
+      card: {...card, selected: !card.selected}
     })
   }
 
   changeType = (e) => {
-    console.log(e.target.value)
     const { card } = this.state
     this.setState({
       card: {...card, type: e.target.value}
@@ -27,20 +27,24 @@
   }
 
   render() {
-    const { card } = this.state
+    const { card, type } = this.state
     return (
-      <div className={'ant-card ant-card-bordered ' + (this.state.selected ? 'selected' : '')} >
+      <div className={'ant-card ant-card-bordered ' + (card.selected ? 'selected' : '')} >
         <div className="base" onClick={this.changeSelect}>
           <Icon type="check" />
-          <p>瀛楁鍚�: {card.label}</p>
-          <p>鎻愮ず鏂囧瓧: {card.field}</p>
+          <p title={card.field}>瀛楁鍚�: {card.field}</p>
+          <p title={card.label}>鎻愮ず鏂囧瓧: {card.label}</p>
         </div>
-        <label>绫诲瀷:</label>
-        <Radio.Group onChange={this.changeType} value={this.state.card.type} disabled={!this.state.selected}>
+        {type === 'search' && <Radio.Group onChange={this.changeType} value={card.type} disabled={!card.selected}>
           <Radio value="text">text</Radio>
           <Radio value="select">select</Radio>
           <Radio value="date">date</Radio>
-        </Radio.Group>
+          <Radio value="datetime">datetime</Radio>
+        </Radio.Group>}
+        {type === 'columns' && <Radio.Group onChange={this.changeType} value={card.type} disabled={!card.selected}>
+          <Radio value="text">text</Radio>
+          <Radio value="picture">picture</Radio>
+        </Radio.Group>}
       </div>
     )
   }
@@ -52,30 +56,27 @@
 
     this.state = {
       dataSource: props.data,
-      title: props.title
+      type: props.type
     }
   }
 
   getSelectedCard = () => {
     let box = []
     this.state.dataSource.forEach((item, index) => {
-      if (this.refs['cellCard' + index].state.selected) {
-        box.push(this.refs['cellCard' + index].state.card)
-      }
+      box.push(this.refs['cellCard' + index].state.card)
     })
     return box
   }
 
   render() {
-    const { dataSource, title } = this.state
+    const { dataSource, type } = this.state
 
     return (
       <div className="common-modal-edit-card">
-        {title && <h4>{title}</h4>}
         <Row>
           {dataSource.map((item, index) => (
             <Col key={index} span={8}>
-              <EditCardCell ref={'cellCard' + index} card={item} />
+              <EditCardCell ref={'cellCard' + index} type={type} card={item} />
             </Col>
           ))}
         </Row>

--
Gitblit v1.8.0