From 4366981fbe7d406e90487fd94450fab6eb31120d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 29 八月 2023 17:19:35 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
index b5bd01f..081c790 100644
--- a/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
+++ b/src/templates/sharecomponent/searchcomponent/dragsearch/card.jsx
@@ -1,6 +1,6 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
-import { Select, DatePicker, Input, Popover, Form } from 'antd'
+import { Select, DatePicker, Input, Popover, Form, Switch, Radio, Checkbox } from 'antd'
import { EditOutlined, CopyOutlined, CloseOutlined } from '@ant-design/icons'
import moment from 'moment'
@@ -113,6 +113,18 @@
} else if (card.type === 'checkcard') {
type = 'checkcard'
formItem = <CheckCard config={card} />
+ } else if (card.type === 'switch') {
+ formItem = (<Switch checkedChildren={card.openText || ''} unCheckedChildren={card.closeText || ''} checked={card.initval === card.openVal}/>)
+ } else if (card.type === 'radio') {
+ let options = card.options
+ if (options.length === 0) {
+ options = [{Value: '1', Text: '閫夐」1'}, {Value: '2', Text: '閫夐」2'}]
+ }
+ formItem = (<Radio.Group value={card.initval} style={{lineHeight: '36px'}}>
+ {options.map((item, i) => (<Radio key={i} value={item.Value}> {item.Text} </Radio>))}
+ </Radio.Group>)
+ } else if (card.type === 'check') {
+ formItem = <Checkbox style={{lineHeight: '36px'}} checked={card.initval === card.openVal}>{card.checkTip || ''}</Checkbox>
}
let labelwidth = card.labelwidth || 33.3
--
Gitblit v1.8.0