From d3edd6d592db12fbec67e2700d168e07546aed29 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 15 十一月 2019 09:46:00 +0800
Subject: [PATCH] 2019-11-15
---
src/components/sidemenu/comtableconfig/dragelement/card.jsx | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/components/sidemenu/comtableconfig/dragelement/card.jsx b/src/components/sidemenu/comtableconfig/dragelement/card.jsx
index 9cc00e2..cb1c735 100644
--- a/src/components/sidemenu/comtableconfig/dragelement/card.jsx
+++ b/src/components/sidemenu/comtableconfig/dragelement/card.jsx
@@ -1,6 +1,6 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
-import { Icon, Button, Select, DatePicker } from 'antd'
+import { Icon, Button, Select, DatePicker, Input } from 'antd'
import moment from 'moment'
import ItemTypes from './itemtypes'
import './index.scss'
@@ -43,14 +43,10 @@
</div>
<div className="ant-col ant-form-item-control-wrapper">
{card.type === 'text' &&
- <div className="ant-form-item-control">
- <span className="ant-form-item-children">
- <input placeholder="" autoComplete="off" type="text" readOnly={true} className="ant-input" />
- </span>
- </div>
+ <Input style={{marginTop: '4px'}} defaultValue={card.initval} />
}
- {card.type === 'select' &&
- <Select defaultValue="lucy"></Select>
+ {(card.type === 'select' || card.type === 'link') &&
+ <Select defaultValue={card.initval}></Select>
}
{card.type === 'dateday' &&
<DatePicker defaultValue={card.initval ? moment(card.initval, 'YYYY-MM-DD') : null} />
@@ -70,7 +66,7 @@
}
{type === 'columns' &&
<span className="ant-table-header-column">
- <div className="ant-table-column-sorters" style={{textAlign: card.Align}}>
+ <div className="ant-table-column-sorters" title={card.label} style={{textAlign: card.Align}}>
<span className="ant-table-column-title">{card.label}</span>
{card.IsSort === 'true' && <span className="ant-table-column-sorter">
<Icon type="caret-up" />
--
Gitblit v1.8.0