From 46f79b491173d284a4900d19e7aecf7509481438 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 一月 2022 17:21:25 +0800
Subject: [PATCH] 2022-01-21
---
src/menu/components/form/normal-form/index.jsx | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/menu/components/form/normal-form/index.jsx b/src/menu/components/form/normal-form/index.jsx
index 16de6bf..47d8a42 100644
--- a/src/menu/components/form/normal-form/index.jsx
+++ b/src/menu/components/form/normal-form/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Popover, Modal, Button, Switch, notification } from 'antd'
+import { Popover, Modal, Button, Switch, notification } from 'antd'
+import { PlusOutlined, SettingOutlined, EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -91,6 +92,10 @@
_card.wrap = config.wrap
_card.wrap.name = card.name
_card.style = config.style
+
+ _card.setting = config.setting
+ _card.columns = config.columns
+ _card.scripts = config.scripts
_card.subcards = config.subcards.map(scard => {
scard.uuid = Utils.getuuid()
@@ -393,7 +398,6 @@
initval: '',
type: 'text',
resourceType: '0',
- setAll: 'false',
span: span,
labelwidth: 33.3,
options: [],
@@ -429,10 +433,7 @@
let _inputfields = []
let _tabfields = []
let _linkableFields = []
- let _linksupFields = [{
- field: '',
- label: '绌�'
- }]
+ let _linksupFields = []
let standardform = null
let uniq = new Map()
@@ -471,8 +472,16 @@
_tabIndex++
}
}
+
+ if (item.type === 'switch') {
+ _linksupFields.push({
+ field: item.field,
+ label: _linkIndex + '銆�' + item.label
+ })
+ }
if (!['select', 'link', 'radio', 'checkcard'].includes(item.type)) return
+ if (item.type === 'checkcard' && item.multiple === 'true') return // 閫夐」鍗″閫�
if (item.field && !uniq.has(item.field)) {
uniq.set(item.field, true)
@@ -660,20 +669,20 @@
<div className="menu-normal-form-edit-box" style={resetStyle(card.style)} onClick={this.clickComponent} id={card.uuid}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <Icon className="plus" title="娣诲姞鍒嗙粍" onClick={this.addCard} type="plus" />
+ <PlusOutlined className="plus" title="娣诲姞鍒嗙粍" onClick={this.addCard}/>
<NormalForm title="琛ㄥ崟璁剧疆" width={800} update={this.updateWrap} getForms={this.getWrapForms}>
- <Icon type="edit" style={{color: '#1890ff'}} title="缂栬緫"/>
+ <EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
</NormalForm>
<CopyComponent type="stepform" card={card}/>
<PasteComponent config={card} options={['form']} updateConfig={this.pasteForm} />
- <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
<UserComponent config={card}/>
- <Icon className="close" title="鍒犻櫎缁勪欢" type="delete" onClick={() => this.props.deletecomponent(card.uuid)} />
+ <DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} />
{card.wrap.datatype !== 'static' ? <SettingComponent config={card} updateConfig={this.updateComponent} /> : null}
- {card.wrap.datatype === 'static' ? <Icon style={{color: '#eeeeee', cursor: 'not-allowed'}} type="setting"/> : null}
+ {card.wrap.datatype === 'static' ? <SettingOutlined style={{color: '#eeeeee', cursor: 'not-allowed'}}/> : null}
</div>
} trigger="hover">
- <Icon type="tool" />
+ <ToolOutlined />
</Popover>
<FormTitle
list={card.subcards}
@@ -684,7 +693,7 @@
selectGroup={this.selectGroup}
/>
{group ? <div className="form-area">
- <Icon className="plus" title="娣诲姞琛ㄥ崟" onClick={this.addForm} type="plus" />
+ <PlusOutlined className="plus" title="娣诲姞琛ㄥ崟" onClick={this.addForm}/>
<FieldsComponent config={group} type="form" plusFields={this.plusFields} />
<Switch checkedChildren={dict['model.switch.open']} unCheckedChildren={dict['model.switch.close']} defaultChecked={this.state.showField} onChange={(val) => this.setState({showField: val})} />
{appType !== 'mob' ? <Button className="mk-cols-change" onClick={() => this.changecols(1)}>1鍒�</Button> : null}
--
Gitblit v1.8.0