From 07acb5f4dc11e484801ccfcd95eee8845128c62a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 26 十一月 2019 22:41:29 +0800
Subject: [PATCH] 2019-11-26-01
---
src/templates/comtableconfig/dragelement/index.jsx | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/templates/comtableconfig/dragelement/index.jsx b/src/templates/comtableconfig/dragelement/index.jsx
index 6b0d6f3..edbdf44 100644
--- a/src/templates/comtableconfig/dragelement/index.jsx
+++ b/src/templates/comtableconfig/dragelement/index.jsx
@@ -7,7 +7,7 @@
import ItemTypes from './itemtypes'
import './index.scss'
-const Container = ({list, type, placeholder, handleList, handleMenu }) => {
+const Container = ({list, setting, type, placeholder, handleList, handleMenu }) => {
let target = null
const [cards, setCards] = useState(list)
const moveCard = (id, atIndex) => {
@@ -73,6 +73,14 @@
let newcard = {}
if (item.type === 'search') {
+ let _match = 'like'
+ if (item.subType === 'select' || item.subType === 'link') {
+ _match = '='
+ } else if (item.subType === 'date' || item.subType === 'datemonth') {
+ _match = '>='
+ } else if (item.subType === 'dateweek' || item.subType === 'daterange') {
+ _match = 'between'
+ }
newcard.uuid = Utils.getuuid()
newcard.label = 'fieldName'
newcard.field = ''
@@ -87,6 +95,7 @@
newcard.valueText = ''
newcard.orderBy = ''
newcard.orderType = 'asc'
+ newcard.match = _match
newcard.display = 'dropdown'
} else if (item.type === 'action') {
newcard.uuid = Utils.getuuid()
@@ -99,6 +108,9 @@
newcard.class = 'default'
newcard.intertype = 'inner'
newcard.interface = ''
+ newcard.position = 'toolbar'
+ newcard.execSuccess = 'grid'
+ newcard.execError = 'never'
newcard.callbackFunc = ''
newcard.pageTemplate = ''
} else if (item.type === 'columns') {
@@ -181,10 +193,15 @@
{type === 'columns' && cards.length > 0 &&
columns.map((column, i) => (
<div key={i} className="column-box">
- {i === 0 &&
+ {/* 澶氶�� */}
+ {i === 0 && setting.tableType === 'checkbox' ?
<div className="page-card" style={{flex: 60}}>
<span className="ant-checkbox-inner"></span>
- </div>
+ </div> : null
+ }
+ {/* 鍗曢�� */}
+ {i === 0 && setting.tableType === 'radio' ?
+ <div className="page-card" style={{flex: 60}}></div> : null
}
{column.map(card => (
<Card
--
Gitblit v1.8.0