From 812070dc565f03bafb0b62696004aa676ed1b787 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 19 八月 2021 15:50:16 +0800
Subject: [PATCH] 2021-08-19
---
src/menu/components/form/tab-form/index.jsx | 59 +++++++++++++++--------------------------------------------
1 files changed, 15 insertions(+), 44 deletions(-)
diff --git a/src/menu/components/form/tab-form/index.jsx b/src/menu/components/form/tab-form/index.jsx
index bb2b210..5397c8c 100644
--- a/src/menu/components/form/tab-form/index.jsx
+++ b/src/menu/components/form/tab-form/index.jsx
@@ -11,17 +11,17 @@
import { resetStyle } from '@/utils/utils-custom.js'
import MKEmitter from '@/utils/events.js'
import Utils from '@/utils/utils.js'
+import getWrapForm from '../normal-form/options'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
import './index.scss'
const ModalForm = asyncComponent(() => import('@/templates/zshare/modalform'))
const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
-const WrapComponent = asyncIconComponent(() => import('@/menu/components/form/wrapsetting'))
+const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
const CardComponent = asyncComponent(() => import('@/templates/modalconfig/dragelement'))
const MobCardComponent = asyncComponent(() => import('@/mob/components/formdragelement'))
const FormTitle = asyncComponent(() => import('../dragtitle'))
-const GroupForm = asyncComponent(() => import('./groupform'))
const FormAction = asyncComponent(() => import('../formaction'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const PasteComponent = asyncIconComponent(() => import('@/menu/components/share/pastecomponent'))
@@ -216,8 +216,7 @@
this.setState({
card,
- group: newcard,
- groupvisible: true
+ group: newcard
})
this.props.updateConfig(card)
}
@@ -236,13 +235,6 @@
selectGroup = (item) => {
this.setState({
group: item
- })
- }
-
- changeGroup = (item) => {
- this.setState({
- group: item,
- groupvisible: true
})
}
@@ -280,21 +272,6 @@
this.setState({card, group})
this.props.updateConfig(card)
- }
-
- handleGroupSubmit = () => {
- let group = fromJS(this.state.group).toJS()
-
- this.groupRef.handleConfirm().then(res => {
- group.subButton.enable = res.subEnable
-
- delete res.subEnable
-
- group.setting = res
-
- this.setState({groupvisible: false})
- this.updateGroup(group)
- })
}
changecols = (type) => {
@@ -639,6 +616,14 @@
})
}
+ getWrapForms = () => {
+ return getWrapForm(this.state.card)
+ }
+
+ updateWrap = (res) => {
+ this.updateComponent({...this.state.card, wrap: res})
+ }
+
clickComponent = (e) => {
if (sessionStorage.getItem('style-control') === 'true' || sessionStorage.getItem('style-control') === 'component') {
e.stopPropagation()
@@ -654,7 +639,9 @@
<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" />
- <WrapComponent config={card} updateConfig={this.updateComponent} />
+ <NormalForm title="琛ㄥ崟璁剧疆" width={800} update={this.updateWrap} getForms={this.getWrapForms}>
+ <Icon type="edit" style={{color: '#1890ff'}} title="缂栬緫"/>
+ </NormalForm>
<CopyComponent type="propcard" card={card}/>
<PasteComponent config={card} options={['form']} updateConfig={this.pasteForm} />
<Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
@@ -671,7 +658,7 @@
tabtype={card.wrap.tabtype || ''}
selectId={group ? group.uuid : ''}
handleList={this.changecards}
- handleGroup={this.changeGroup}
+ handleGroup={this.updateGroup}
closeGroup={this.closeGroup}
selectGroup={this.selectGroup}
/>
@@ -702,22 +689,6 @@
/>}
<FormAction config={card} group={group} updateconfig={this.updateGroup}/>
</div> : null}
- <Modal
- title="鍒嗙粍缂栬緫"
- visible={this.state.groupvisible}
- width={850}
- maskClosable={false}
- onCancel={() => this.setState({groupvisible: false})}
- onOk={this.handleGroupSubmit}
- destroyOnClose
- >
- <GroupForm
- dict={dict}
- group={group}
- inputSubmit={this.handleGroupSubmit}
- wrappedComponentRef={(inst) => this.groupRef = inst}
- />
- </Modal>
<Modal
title={this.state.dict['model.edit']}
visible={this.state.visible}
--
Gitblit v1.8.0