From 9a11e62adeb8d435b52a361eb62d5b59e1deef2a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 23 五月 2024 21:14:50 +0800
Subject: [PATCH] 2024-05-23
---
src/menu/components/form/tab-form/index.jsx | 85 ++++++++++--------------------------------
1 files changed, 20 insertions(+), 65 deletions(-)
diff --git a/src/menu/components/form/tab-form/index.jsx b/src/menu/components/form/tab-form/index.jsx
index e9af1d4..8671d15 100644
--- a/src/menu/components/form/tab-form/index.jsx
+++ b/src/menu/components/form/tab-form/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Popover, Modal, Button, Switch, notification, message } from 'antd'
-import { PlusOutlined, SettingOutlined, EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
+import { PlusOutlined, SettingOutlined, EditOutlined, ToolOutlined, DeleteOutlined, SwapOutlined, FontColorsOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
@@ -20,6 +20,7 @@
const MobCardComponent = asyncComponent(() => import('@/mob/components/formdragelement'))
const FormTitle = asyncComponent(() => import('../dragtitle'))
const FormAction = asyncComponent(() => import('../formaction'))
+// const FormFork = asyncComponent(() => import('@/menu/modalconfig/formfork'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const PasteComponent = asyncIconComponent(() => import('@/menu/components/share/pastecomponent'))
const FieldsComponent = asyncComponent(() => import('@/templates/sharecomponent/fieldscomponent'))
@@ -453,69 +454,13 @@
*/
handleForm = (_item) => {
const { card, group } = this.state
+
let _form = fromJS(_item).toJS()
- let _inputfields = []
- let _tabfields = []
- let _linkableFields = []
- let _linksupFields = []
-
- group.fields.forEach((item, i) => {
- if (!item.field || _form.field === item.field) return
-
- if (['text', 'number', 'textarea', 'select'].includes(item.type)) {
- _inputfields.push({
- field: item.field,
- label: item.label
- })
- }
- if (item.hidden !== 'true' && ['text', 'number', 'select', 'link'].includes(item.type)) {
- _tabfields.push({
- field: item.field,
- label: item.label
- })
- }
-
- if (['switch', 'check', 'popSelect'].includes(item.type)) {
- _linksupFields.push({
- field: item.field,
- label: item.label
- })
- }
-
- if (!['select', 'link', 'radio', 'checkcard', 'multiselect'].includes(item.type)) return
-
- _linksupFields.push({
- field: item.field,
- label: item.label
- })
-
- if (item.type === 'multiselect' || (item.type === 'checkcard' && item.multiple === 'true')) return
-
- _linkableFields.push({
- field: item.field,
- label: item.label + '-琛ㄥ崟'
- })
- })
-
- let _fields = _linkableFields.map(cell => cell.field)
- card.columns.forEach(col => {
- if (col.field && !_fields.includes(col.field)) {
- _linkableFields.push({
- field: col.field,
- label: col.label + '-鏄剧ず鍒�'
- })
- }
- })
-
- if (_form.linkSubField && _form.linkSubField.length > 0) {
- let fields = _inputfields.map(item => item.field)
- _form.linkSubField = _form.linkSubField.filter(item => fields.includes(item))
- }
this.setState({
visible: true,
editform: _form,
- formlist: getModalForm(_form, _inputfields, _tabfields, _linkableFields, _linksupFields, card.columns)
+ formlist: getModalForm(_form, group.fields, card.columns)
})
}
@@ -723,12 +668,22 @@
{group ? <div className={`form-area mk-${card.wrap.formStyle || ''}`}>
<PlusOutlined className="plus" title="娣诲姞琛ㄥ崟" onClick={this.addForm}/>
<FieldsComponent config={group} type="form" plusFields={this.plusFields} />
- <span style={{color: 'red', marginLeft: '30px', cursor: 'pointer'}} onClick={this.clearGroup}>娓呯┖</span>
- <Switch checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={this.state.showField} onChange={(val) => this.setState({showField: val})} />
- {appType !== 'mob' ? <Button className="mk-cols-change" onClick={() => this.changecols(1)}>1鍒�</Button> : null}
- {appType !== 'mob' ? <Button className="mk-cols-change" onClick={() => this.changecols(2)}>2鍒�</Button> : null}
- {appType !== 'mob' ? <Button className="mk-cols-change" onClick={() => this.changecols(3)}>3鍒�</Button> : null}
- {appType !== 'mob' ? <Button className="mk-cols-change" onClick={() => this.changecols(4)}>4鍒�</Button> : null}
+ <div className="mk-form-tool">
+ <DeleteOutlined title="娓呯┖" onClick={this.clearGroup} />
+ {appType !== 'mob' ? <Popover title="鍒囨崲甯冨眬" overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
+ <>
+ <Button style={{marginRight: '10px'}} onClick={() => this.changecols(1)}>1鍒�</Button>
+ <Button style={{marginRight: '10px'}} onClick={() => this.changecols(2)}>2鍒�</Button>
+ <Button style={{marginRight: '10px'}} onClick={() => this.changecols(3)}>3鍒�</Button>
+ <Button onClick={() => this.changecols(4)}>4鍒�</Button>
+ </>
+ } trigger="hover">
+ <SwapOutlined />
+ </Popover> : null}
+ {/* <FormFork forms={group.fields}/> */}
+ {/* <CopyOutlined title="澶嶅埗" onClick={this.triggerCopy} /> */}
+ <Switch checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={this.state.showField} onChange={(val) => this.setState({showField: val})} />
+ </div>
<div style={{clear: 'both'}}></div>
{appType !== 'mob' ? <CardComponent
list={group.fields}
--
Gitblit v1.8.0