From abe961768cb069e84ed958f4c768c512cc3db598 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 04 八月 2021 18:24:57 +0800
Subject: [PATCH] 2021-08-04
---
src/menu/components/card/cardcomponent/index.jsx | 72 +++++++++++++++---------------------
1 files changed, 30 insertions(+), 42 deletions(-)
diff --git a/src/menu/components/card/cardcomponent/index.jsx b/src/menu/components/card/cardcomponent/index.jsx
index 6bfc194..de93665 100644
--- a/src/menu/components/card/cardcomponent/index.jsx
+++ b/src/menu/components/card/cardcomponent/index.jsx
@@ -1,18 +1,17 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Modal, Popover, Icon, Switch, Col } from 'antd'
+import { Popover, Icon, Switch, Col } from 'antd'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
-import SettingForm from './settingform'
import { resetStyle } from '@/utils/utils-custom.js'
+import getSettingForm from './options'
import Utils from '@/utils/utils.js'
import MKEmitter from '@/utils/events.js'
import './index.scss'
+const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
const CardCellComponent = asyncComponent(() => import('../cardcellcomponent'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const PasteComponent = asyncIconComponent(() => import('./pastecomponent'))
@@ -28,12 +27,9 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null, // 鍗＄墖淇℃伅锛屽寘鎷鍙嶉潰
formlist: null, // 璁剧疆琛ㄥ崟淇℃伅
elements: null, // 缂栬緫缁�
- visible: false, // 妯℃�佹鎺у埗
- settingVisible: false,
side: 'front'
}
@@ -194,24 +190,33 @@
MKEmitter.emit('changeStyle', [cards.uuid, card.uuid], options, _style)
}
- settingSubmit = () => {
+ getSettingForms = () => {
+ const { cards } = this.props
+ const { setting } = this.state.card
+
+ return getSettingForm(setting, cards.subtype === 'propcard')
+ }
+
+ updateSetting = (res) => {
const { card, side } = this.state
- this.settingRef.handleConfirm().then(res => {
- this.setState({
- settingVisible: false,
- card: {...card, setting: res}
- })
+ if (res.appmenu) {
+ res.menu = res.appmenu
+ delete res.appmenu
+ }
- if (side === 'back' && res.type === 'simple') {
- this.setState({
- side: 'front',
- elements: fromJS(card.elements).toJS()
- })
- }
-
- this.props.updateElement({...card, setting: res})
+ this.setState({
+ card: {...card, setting: res}
})
+
+ if (side === 'back' && res.type === 'simple') {
+ this.setState({
+ side: 'front',
+ elements: fromJS(card.elements).toJS()
+ })
+ }
+
+ this.props.updateElement({...card, setting: res})
}
clickComponent = (e) => {
@@ -231,7 +236,7 @@
render() {
const { cards, offset } = this.props
- const { card, elements, side, settingVisible, dict } = this.state
+ const { card, elements, side } = this.state
let _style = {...card.style}
@@ -256,7 +261,9 @@
<div className="mk-popover-control">
<Icon className="plus" title="娣诲姞鍏冪礌" onClick={this.addElement} type="plus" />
<Icon className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} type="plus-square" />
- <Icon className="edit" title="缂栬緫" type="edit" onClick={() => this.setState({settingVisible: true})} />
+ <NormalForm title="鍗＄墖璁剧疆" width={800} update={this.updateSetting} getForms={this.getSettingForms}>
+ <Icon type="edit" className="edit" title="缂栬緫"/>
+ </NormalForm>
<CopyComponent type="cardcell" card={card}/>
<PasteComponent elements={elements} options={['action', 'customCardElement']} updateConfig={(list) => this.updateCard(list, 'paste')} />
<Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
@@ -276,25 +283,6 @@
</Popover>
</div>
</div>
- <Modal
- wrapClassName="popview-modal"
- title={'鍗＄墖璁剧疆'}
- visible={settingVisible}
- width={800}
- maskClosable={false}
- okText={dict['model.submit']}
- onOk={this.settingSubmit}
- onCancel={() => { this.setState({ settingVisible: false }) }}
- destroyOnClose
- >
- <SettingForm
- dict={dict}
- cards={cards}
- setting={card.setting}
- inputSubmit={this.settingSubmit}
- wrappedComponentRef={(inst) => this.settingRef = inst}
- />
- </Modal>
</Col>
)
}
--
Gitblit v1.8.0